diff --git a/.gitattributes b/.gitattributes index 3cb68a29e1..4c0a6c3120 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,7 +3,6 @@ tools/mangoapp/** text=auto eol=lf tools/comet/LICENSE whitespace=-blank-at-eof tools/comet/droiddeck.patch whitespace=-blank-at-eol,-blank-at-eof -# These helpers are packaged verbatim and executed inside the Linux runtime. tools/linuxfs/overlay/** text eol=lf tools/linuxfs/desktop/** text eol=lf tools/mangoapp/mangoapp text eol=lf diff --git a/.github/trusted-test-builds.txt b/.github/trusted-test-builds.txt index 9b09f6132b..f91528f395 100644 --- a/.github/trusted-test-builds.txt +++ b/.github/trusted-test-builds.txt @@ -1,4 +1,3 @@ -# GitHub PR openers trusted for automatic release-signed test builds. FX192 K11MCH1 kingokksa diff --git a/.github/workflows/build-fex.yml b/.github/workflows/build-fex.yml index 8ec3369a1a..deb099100a 100644 --- a/.github/workflows/build-fex.yml +++ b/.github/workflows/build-fex.yml @@ -1,8 +1,5 @@ name: Build FEX (x86-64 Steam client) -# Checks tools/fex: the same build DroidDeck-Components' build-fex.yml runs from this repository to publish FEX -# (its single `fex` release and fex.json, which the app follows). Nothing is published from here. - on: push: paths: @@ -31,7 +28,6 @@ jobs: with: persist-credentials: false - name: Build in Arch Linux ARM - # Inputs reach the shell as environment variables, never pasted into the script. env: FEX_EXTRA_CXXFLAGS: ${{ inputs.cxxflags }} FEX_THUNKS: ${{ inputs.thunks == 'true' && '1' || '0' }} diff --git a/.github/workflows/build-gamescope.yml b/.github/workflows/build-gamescope.yml index 0a91fea431..57dd575010 100644 --- a/.github/workflows/build-gamescope.yml +++ b/.github/workflows/build-gamescope.yml @@ -2,8 +2,11 @@ name: Build gamescope (patched) on: push: + branches: [main] paths: - - 'tools/gamescope/**' + - 'tools/gamescope/build-in-arch.sh' + - 'tools/gamescope/patches/**' + - 'tools/gamescope/runtime-sonames.txt' - '.github/workflows/build-gamescope.yml' workflow_dispatch: inputs: @@ -15,6 +18,10 @@ on: permissions: contents: write +concurrency: + group: ${{ inputs.tag && format('gamescope-tag-{0}', inputs.tag) || format('gamescope-{0}-{1}', github.event_name, github.ref) }} + cancel-in-progress: ${{ github.event_name == 'push' }} + jobs: build: runs-on: ubuntu-24.04-arm diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fee8a691c..7418c5bfb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,6 +63,8 @@ jobs: echo "base-sha=$(git rev-parse origin/main)" >> "$GITHUB_OUTPUT" git config user.name "ci" git config user.email "ci@users.noreply.github.com" + # Partial clone: a merged blob that only exists in a fork's history can't be lazily fetched (GitHub: "not our ref"); merge-tree writes it locally first. + git merge-tree --write-tree HEAD origin/main >/dev/null || true git merge --no-ff --no-edit origin/main - name: Resolve trusted manifest base id: trusted @@ -100,6 +102,7 @@ jobs: git fetch --no-tags origin "$BUILD_BASE_SHA" git config user.name "ci" git config user.email "ci@users.noreply.github.com" + git merge-tree --write-tree HEAD FETCH_HEAD >/dev/null || true git merge --no-ff --no-edit FETCH_HEAD - name: Verify pinned source tree env: @@ -158,6 +161,7 @@ jobs: git fetch --no-tags origin "$BUILD_BASE_SHA" git config user.name "ci" git config user.email "ci@users.noreply.github.com" + git merge-tree --write-tree HEAD FETCH_HEAD >/dev/null || true git merge --no-ff --no-edit FETCH_HEAD - name: Verify pinned source tree env: @@ -165,6 +169,8 @@ jobs: run: test "$(git rev-parse 'HEAD^{tree}')" = "$SOURCE_TREE" - name: Resolve the pinned Android NDK run: bash tools/ci/resolve-ndk.sh + - name: Check out MaliBridge + run: git submodule update --init external/MaliBridge - name: Plan component identities id: plan @@ -228,6 +234,7 @@ jobs: ${{ steps.preloads.outputs.cache-hit != 'true' && 'runtime' || '' }} ${{ steps.component-preloads.outputs.arm64 != 'true' && 'arm64-preloads' || '' }} ${{ steps.comet.outputs.cache-hit != 'true' && 'comet' || '' }} + vkbridge run: python3 tools/components/prepare.py tools - name: Build changed ARM64 preloads @@ -238,6 +245,9 @@ jobs: if: steps.preloads.outputs.cache-hit != 'true' run: python3 tools/components/prepare.py runtime + - name: Build the Mali bridge's Linux side + run: python3 tools/components/prepare.py vkbridge + - name: Fetch the Debian image the preloads build in if: steps.component-preloads.outputs.x86 != 'true' env: @@ -269,11 +279,20 @@ jobs: run: | set -euo pipefail bash tools/linuxfs/check-preloads.sh app/src/main/assets/linuxfs + D=app/src/main/assets/linuxfs + VKB="$D/usr/local/lib/vkbridge/libvulkan_droidbridge.so" + test -f "$VKB" && test -f "$D/usr/local/share/vkbridge/droidbridge_icd.json" && test -f "$D/usr/local/bin/droiddeck-vkbridge-smoke" + VKB_NEED=$(readelf -d "$VKB" | sed -n 's/.*NEEDED.*\[\(.*\)\]/\1/p' | grep -vx 'libc.so.6' | grep -vx 'ld-linux-aarch64.so.1' || true) + [ -z "$VKB_NEED" ] || { echo "::error::the bridge ICD needs $VKB_NEED"; exit 1; } + [ "$(readelf -Ws "$VKB" | awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {sub(/@.*/, "", $8); print $8}' | grep -c '^vk_icd')" = 3 ] || { echo "::error::the bridge ICD does not export the loader interface"; exit 1; } - name: Build GOG Galaxy companion if: steps.comet.outputs.cache-hit != 'true' run: python3 tools/components/prepare.py comet + - name: Build the DiRT 3 / DiRT Showdown ws2_32 stand-in + run: python3 tools/components/prepare.py dirt-ws2 + - name: Prepare graphics driver variants run: python3 tools/quest/build-driver.py "$ANDROID_HOME/ndk/$NDK_VERSION" - name: Record and pack prepared components @@ -304,6 +323,7 @@ jobs: !/docs/releases/media/ sparse-checkout-cone-mode: false persist-credentials: false + submodules: recursive - name: Check human authorship env: @@ -364,6 +384,7 @@ jobs: git fetch --no-tags origin "$BUILD_BASE_SHA" BASE=$(git rev-parse --short FETCH_HEAD) HEAD=$(git rev-parse --short HEAD) + git merge-tree --write-tree HEAD FETCH_HEAD >/dev/null || true if git merge --no-ff --no-edit FETCH_HEAD >/tmp/merge.out 2>&1; then { echo "### Mergeable" @@ -433,6 +454,7 @@ jobs: id: build-label env: PR_NUMBER: ${{ github.event.pull_request.number }} + PR_TITLE: ${{ github.event.pull_request.title }} PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} BUILD_REF: ${{ github.ref_name }} BUILD_SHA: ${{ github.sha }} @@ -451,6 +473,7 @@ jobs: echo "label=$label" >> "$GITHUB_OUTPUT" echo "DROIDDECK_SOURCE_COMMIT=${PR_HEAD_SHA:-$BUILD_SHA}" >> "$GITHUB_ENV" echo "DROIDDECK_PR_NUMBER=${PR_NUMBER:-0}" >> "$GITHUB_ENV" + echo "DROIDDECK_PR_TITLE=${PR_TITLE//$'\n'/ }" >> "$GITHUB_ENV" echo "Build: \`$label\`" >> "$GITHUB_STEP_SUMMARY" - name: Rust toolchain for the store engines (aarch64-linux-android) @@ -514,6 +537,30 @@ jobs: - name: Build the add-on packs run: bash tools/packs/build.sh app/build/packs + - name: Pin the Syncthing source + id: syncthing-src + run: | + set -euo pipefail + git submodule update --init --recursive tools/syncthing/syncthing-android + echo "commit=$(git -C tools/syncthing/syncthing-android/syncthing/src/github.com/syncthing/syncthing rev-parse HEAD)" >> "$GITHUB_OUTPUT" + - name: Cache Syncthing + id: syncthing + uses: actions/cache@v4 + with: + path: app/src/main/jniLibs/arm64-v8a/libsyncthingnative.so + key: syncthing-${{ env.NDK_VERSION }}-${{ hashFiles('tools/syncthing/build.sh', 'tools/syncthing/syncthing-android/gradle/libs.versions.toml') }}-${{ steps.syncthing-src.outputs.commit }} + - uses: actions/setup-go@v5 + if: steps.syncthing.outputs.cache-hit != 'true' + with: + go-version: stable + cache: false + - name: Build Syncthing + if: steps.syncthing.outputs.cache-hit != 'true' + run: | + set -euo pipefail + export NDK="$ANDROID_HOME/ndk/$NDK_VERSION" + tools/syncthing/build.sh app/src/main/jniLibs/arm64-v8a + - name: Note when the proot pack pin is behind this build run: | set -euo pipefail @@ -524,6 +571,9 @@ jobs: 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: Check out MaliBridge + run: git submodule update --init external/MaliBridge + - name: Build id: build env: @@ -664,6 +714,7 @@ jobs: git fetch --no-tags origin "$BUILD_BASE_SHA" git config user.name "ci" git config user.email "ci@users.noreply.github.com" + git merge-tree --write-tree HEAD FETCH_HEAD >/dev/null || true git merge --no-ff --no-edit FETCH_HEAD - name: Verify backend and test source match env: @@ -717,6 +768,7 @@ jobs: git fetch --no-tags origin "$BUILD_BASE_SHA" git config user.name "ci" git config user.email "ci@users.noreply.github.com" + git merge-tree --write-tree HEAD FETCH_HEAD >/dev/null || true git merge --no-ff --no-edit FETCH_HEAD - name: Verify backend and test source match env: @@ -760,7 +812,7 @@ jobs: checks: name: Compile and test APK needs: [build, python-tests] - if: ${{ always() && (github.event_name != 'pull_request' || !github.event.pull_request.draft) }} + if: ${{ !cancelled() && (github.event_name != 'pull_request' || !github.event.pull_request.draft) }} runs-on: ubuntu-24.04 timeout-minutes: 5 steps: diff --git a/.github/workflows/publish-packs.yml b/.github/workflows/publish-packs.yml index 7bf219ef7c..de4adb3b21 100644 --- a/.github/workflows/publish-packs.yml +++ b/.github/workflows/publish-packs.yml @@ -1,11 +1,5 @@ name: Publish add-on packs -# The add-on packs (tools/packs/build.sh) a Build APK run made, published to DroidDeck-Components under -# content-addressed tags (pack--). The APK from that run pins each pack's -# SHA-256 and downloads it from that tag. A tag is created once and never replaced. -# Only main and release builds publish here; a PR test build attaches the packs main has not published -# to its pr-N release on DroidDeck-CI (pr-release-publish.yml), which is deleted when the PR closes. - on: workflow_call: inputs: diff --git a/.gitignore b/.gitignore index e5bdbfffc9..bfeee76414 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ app/src/main/jniLibs/arm64-v8a/libproot.so app/src/main/jniLibs/arm64-v8a/.proot-inputs app/src/main/jniLibs/arm64-v8a/.proot-outputs app/src/main/jniLibs/arm64-v8a/libproot-loader.so +app/src/main/jniLibs/arm64-v8a/libsyncthingnative.so +app/src/main/jniLibs/arm64-v8a/.syncthing-inputs app/src/main/jniLibs/arm64-v8a/libdirectaudiorelay.so app/src/main/rust/stores/target/ app/src/main/assets/droiddeck-esync/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..de75c26af5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "external/MaliBridge"] + path = external/MaliBridge + url = https://github.com/ASEbrahim/MaliBridge.git +[submodule "tools/syncthing/syncthing-android"] + path = tools/syncthing/syncthing-android + url = https://github.com/researchxxl/syncthing-android diff --git a/.signing.env.example b/.signing.env.example new file mode 100644 index 0000000000..7b497c6a74 --- /dev/null +++ b/.signing.env.example @@ -0,0 +1,4 @@ +# Copy to .signing.env, fill in, chmod 600 .signing.env +RELEASE_KEYSTORE=/path/to/release.p12 +RELEASE_STORE_PASSWORD=change-me +RELEASE_KEY_ALIAS=droiddeck diff --git a/README.md b/README.md index d16155c46a..cc233c380c 100644 --- a/README.md +++ b/README.md @@ -5,82 +5,155 @@

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

Join the DroidDeck Discord

+

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

- Star History Rank + Download DroidDeck 0.6.9 + Join the DroidDeck Discord

- Droid-Deck%2FDroidDeck | Trendshift - Droid-Deck%2FDroidDeck | Trendshift + Star History Rank

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

-

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

+

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

-> Note: DroidDeck does not have a stand-alone website. Do not click on any download links from websites claiming to be the DroidDeck team. +> DroidDeck has no website. Only download it from this repository's [Releases](https://github.com/Droid-Deck/DroidDeck/releases). -## Requirements and install +

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

-Use Android 9 or newer on a supported Adreno device (730 or newer, or 8xx). Adreno 6xx is experimental: DirectX 11 uses DXVK 2 and may run, and DirectX 12 games can still crash. Mali, Xclipse, PowerVR, and Adreno 710 are unsupported. No root is required. Allow about 3 GB for the runtime and 1.1 GB more for the desktop and emulators. Install the APK from [Releases](https://github.com/Droid-Deck/DroidDeck/releases), install the Linux runtime, then press **Play** and sign in. Steam downloads on first launch. Install **Desktop & apps** to use the desktop and emulators. The **Store** installs Linux apps and games from Flathub (ARM64 builds) with Flatpak; with additional options to install Appimages and set up scripts. **Stores** (Setup › Stores › "Show Stores in the rail") signs in to GOG, Epic Games and Amazon Games and downloads games into the Games storage. Epic keeps its direct API install path. Opening Epic Stores prepares Epic’s official Linux launcher preview. When installed, Epic games launched from DroidDeck use that client, and games installed in the client are imported into DroidDeck’s library and shortcuts. The x86-64 client runs through FEX on ARM and DroidDeck retains its Proton hooks; this preview and ARM setup are outside Epic’s listed Linux support. The cog on a store’s chip row sets its opening tab and download speed tier. +## Install -On Android 14 and newer, before Steam launches, you must turn on **Disable child process restrictions** in Developer options. If this option is not available in developer settings (Android 12 and 13 devices), first launch of Steam will present a "Fix it for me" button, which will help automate the setup process. +1. Android 9 or newer on Adreno 730 or newer, or any 8xx. Adreno 6xx is experimental. Mali, Xclipse, PowerVR and Adreno 710 are unsupported. No root needed. +2. About 3 GB free for the runtime, plus 1.1 GB for the desktop and emulators. +3. Install the [APK](https://github.com/Droid-Deck/DroidDeck/releases/download/0.6.7/DroidDeck-0.6.7.apk), install the Linux runtime, press **Play** and sign in to Steam. +4. On Android 14 and newer, turn on **Disable child process restrictions** in Developer options. On Android 12 and 13, Steam's first launch shows a **Fix it for me** button that walks you through it. -## Physical button shortcuts +Smart glasses setup is in the [support matrix](docs/smart-glasses-support.md). Release notes are in [docs/releases](docs/releases). -Open the launcher's **Controls** settings, **Setup → Controller → Button mapping**, or the session drawer's **Controller** page. Each menu action has one row showing **Custom** or **Default**. Select the current value beside **Steam menu**, **Open Quick Access Menu**, or **DroidDeck menu**, then press and release a physical button. The assignment saves automatically on release; confirmation is only required if the button already opens another menu. Assignments are stored per controller; each action has one assigned button per controller. A mapped button performs the shortcut instead of sending its normal input to the game. Steam shortcuts only apply in Steam sessions, and shortcuts are inactive while loading, suspended, or using the on-screen keyboard or other input dialogs. - -Unassigned buttons keep their existing behavior, including the Back button's single/double-press setting and Select-to-Steam option. While the session drawer is open, A selects the focused item even if it has a shortcut assignment. Select an action's current value and use **Reset** beside an assignment to restore that behavior without changing touch layouts or other controller settings. **Close** exits capture without changing an assignment; it does not undo an assignment already applied. The touchscreen remains available for configuration and recovery. - -Extra buttons such as M1/M2 work only if Android exposes distinct key events to the app. Android Home, volume and other reserved system keys cannot be assigned; making DroidDeck the default launcher retains its existing Home-to-Steam behavior. Firmware that intercepts a button or makes it duplicate another button cannot be overridden here. During capture, the detected device and button name are shown. If a controller disconnects before release, use **Try another button** to restart capture; **Reset** remains available for existing assignments. Capture and shortcut-action diagnostics, including key and scan codes, are included in session logs when capture runs inside a session. If a button is not detected, record its physical label, firmware/controller mode, and whether it leaves the app, then share the session logs. - -## Smart glasses - -Use **Setup → Smart glasses** for app-wide virtual-screen settings across DroidDeck menus, launchers, desktop sessions, and games. Supported VITURE, RayNeo, XREAL, and Rokid connections provide 3DoF; Luma Ultra adds optional experimental 6DoF and stereo-assisted hand/Joy-Con tracking. Model support and SDK requirements differ: see the [smart-glasses support matrix](docs/smart-glasses-support.md) for supported devices, controls, setup, and limitations. - -## Community - -Join the [DroidDeck Discord](https://discord.gg/JRGAvawjsm) for help, Preview builds, and device reports. Bug reports go in its **#bug-reports** forum; attach the zip from **Share logs** (Setup, or the session drawer) so the logs come with it. +Help, Preview builds and device reports are on [Discord](https://discord.gg/JRGAvawjsm). For bugs, post in **#bug-reports** with the zip from **Share logs**. ## Build -Run `tools/build_local.sh` with Docker, Java 17, the Android SDK/NDK, Rust through rustup, GitHub CLI, Python 3, and `zstd` installed. It prepares the same native libraries, pinned components and audio sinks as CI, then checks the APK's assets, JNI exports and dependencies. The APK is at `app/build/outputs/apk/release/app-release.apk`. Set `DROIDDECK_PA13_SOURCE_DIR` to an existing PulseAudio 13.0 source directory to skip downloading it. Set `DROIDDECK_SIGNING_ENV` to a signing environment file to install over a release build; relative keystore paths resolve beside that file. To install on an attached device, run `tools/deploy_local.sh`. +Needs Docker, Java 17, the Android SDK and NDK, Rust via rustup, GitHub CLI, Python 3 and `zstd`. -After preparation, ordinary `./gradlew :app:assembleRelease` builds can reuse the verified inputs. If native sources, component pins or staged files change, packaging stops with instructions to rerun the helper. Generated audio stays under `app/build/`; the tracked base bundle is never modified. `./gradlew -PskipRust=true :app:testDebugUnitTest` needs no native preparation. For an APK without store engines, use `DROIDDECK_SKIP_RUST=1 tools/build_local.sh`; it omits cached engine libraries too. +```bash +tools/build_local.sh +``` -For the prepared Windows checkout, run `./tools/run_windows.ps1` (optionally with `-Serial `), or select **DroidDeck XR** in Android Studio and run the **app** module on the connected phone. Machine-specific options live in the ignored `local.properties`: `droiddeck.python` selects a Python executable, `droiddeck.skipRust=true` omits the optional store download engines, and `droiddeck.debugApplicationIdSuffix=.xr` installs **DroidDeck XR Dev** alongside the signed release. The development app has its own runtime and Steam login. The local Java selection is in `.gradle/config.properties`. +The APK lands in `app/build/outputs/apk/release/`. Install it with `tools/deploy_local.sh`. After the first run, `./gradlew :app:assembleRelease` reuses the prepared inputs. Unit tests run with `./gradlew -PskipRust=true :app:testDebugUnitTest`, and the helper and preload suite with `bash tools/test_local.sh`. -`python tools/prepare_windows_runtime.py` restores this checkout's audited runtime inputs from the pinned CI APK, three locally rebuilt preload libraries, and the checksum-pinned Gamescope archive in `build/windows-setup/`. Start Docker Desktop's Linux engine first: preparation now rebuilds DroidDeck's ARM64 VR driver and Vulkan layer from current source and runs their native regression tests. The compiler image is built automatically on first use. Vulkan headers come from the NDK beside `--llvm-strip`, or from an explicit `--vk-include ` directory. - -To reuse that build, pass `--rebuilt-vr build/windows-setup/vr`. Preparation verifies its `vr-build.json` against the current Git revision, source files, Vulkan headers, output checksums, and ARM64 architecture; missing or stale builds fail instead of falling back to the donor's VR libraries. The script checks the actual donor CI merge tree, still rejects unrelated unaudited runtime changes, and records component provenance in `app/build/windows-runtime-provenance.json`. Preserve these ignored preparation files when rebuilding locally; `clean` removes the prepared assets and their verification manifest. - -Run the helper and preload regression suite with `bash tools/test_local.sh`. On macOS it runs in Linux through Docker, matching the helpers' runtime and CI instead of compiling Linux preloads against macOS headers. +On Windows, see `tools/run_windows.ps1` and `tools/prepare_windows_runtime.py`. ## Limits -Compatibility and performance vary by device; hardware validation is limited. Desktop compositing uses software rendering. Firefox sandboxing is reduced under proot. Logs are kept app-private (`files/logs/`, the last 30 sessions); **Share logs** packs the newest session, with the stores and tool logs, into one scrubbed zip. +Compatibility and performance vary by device. Desktop compositing is software rendered, and Firefox sandboxing is reduced under proot. ## Credits and licence -GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. 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. The in-game performance HUD is [@The412Banner](https://github.com/The412Banner)'s [FusionHUD](https://github.com/The412Banner/FusionHUD) (GPL-3.0 with an attribution term), Bannerlator's HUD; its frame rate, frame times and readings are taken from the same sources, and worked out the same way, as Valve's [MangoHud](https://github.com/flightlessmango/MangoHud) build (MIT) that runs Steam's performance overlay in a DroidDeck session, with the frame times shared by gamescope patch 0125; when gamescope sends no frames for two seconds, the HUD counts the frames DroidDeck's compositor shows instead, which stop at the screen's refresh rate. 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. The KDE desktop's pacman repository is a snapshot of [Arch Linux ARM](https://archlinuxarm.org)'s core, extra and alarm repositories and installs their signed packages with [pacman](https://gitlab.archlinux.org/pacman/pacman) (GPL-2.0-or-later). [KWin](https://invent.kde.org/plasma/kwin) (GPL-2.0-or-later) is patched to pass on the scroll source, wheel steps and scroll stops its nested backend's `wayland_backend.cpp` leaves as a TODO. How Qt apps handle wheel and cancelled touch events was read in [Qt](https://code.qt.io/cgit/qt/qtbase.git)'s `qwaylandinputdevice.cpp` and `qguiapplication.cpp` and [Konsole](https://invent.kde.org/utilities/konsole)'s `TerminalDisplay.cpp`, and KWin's texture upload crash was traced through [Mesa](https://gitlab.freedesktop.org/mesa/mesa)'s `u_threaded_context.c` and Zink's `zink_resource.c`, without taking their code. The desktop's Steam Keyboard window rule follows Valve's `steamdeck-kde-presets` with the update from [Bazzite](https://github.com/ublue-os/bazzite)'s `0001-steam-virtual-keyboard.patch`, so the keyboard stays above other windows without taking focus. The butler add-on pack for itch.io patch updates ships butler's own `7z.so`, itch.io's build of [7-Zip](https://www.7-zip.org) by Igor Pavlov (LGPL-2.1, with the unRAR licence restriction on its RAR code), unmodified; DroidDeck unpacks itch.io ZIP, 7z, tar, gzip, bzip2 and xz downloads with Apache Commons Compress, and RAR, and 7z too large for it, with the runtime's bsdtar (libarchive). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. +DroidDeck is [GPL-3.0](LICENSE). Steam and Proton belong to Valve Corporation. VITURE, RayNeo, XREAL, Rokid, REDMAGIC, Nintendo Switch and Joy-Con are trademarks of their owners. This project is not affiliated with any of them. -XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them. +
+Runtime, Wine and Proton -Joy-Con VR controllers port the arm model of Google's [Google VR SDK for Unity](https://github.com/googlevr/gvr-unity-sdk) (Apache-2.0), adapt the hand skeleton of Valve's [OpenVR](https://github.com/ValveSoftware/openvr) `handskeletonsimulation` sample (BSD-3-Clause), which follows Moshi Turner's hand simulation in [Monado](https://gitlab.freedesktop.org/monado/monado), and use the Index controller offsets from Monado's `vive_poses.c` (BSL-1.0). Joy-Con behaviour was researched in Linux's [hid-nintendo](https://github.com/torvalds/linux/blob/master/drivers/hid/hid-nintendo.c) driver by Daniel J. Ogorchock, [@dekuNukem](https://github.com/dekuNukem)'s [Nintendo_Switch_Reverse_Engineering](https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering), [SDL](https://github.com/libsdl-org/SDL) and the Android Open Source Project, and checked against [ALVR](https://github.com/alvr-org/ALVR), [OpenComposite](https://gitlab.com/znixian/OpenOVR), [PSMoveSteamVRBridge](https://github.com/HipsterSloth/PSMoveSteamVRBridge), [@F8LEFT](https://github.com/F8LEFT)'s [JoyConVr](https://github.com/F8LEFT/JoyConVr), [@krnelpan1c](https://github.com/krnelpan1c)'s [Daydream-Controller-SteamVR](https://github.com/krnelpan1c/Daydream-Controller-SteamVR), [@yoyobuae](https://github.com/yoyobuae)'s [joyconvr](https://github.com/yoyobuae/joyconvr), [Moonlight](https://github.com/moonlight-stream/moonlight-android) and [Dolphin](https://github.com/dolphin-emu/dolphin); see [docs/third-party/joycon](docs/third-party/joycon/README.md). Nintendo Switch and Joy-Con are trademarks of Nintendo; this project is not affiliated with Nintendo. +- Runtime, shim, input and controller work build on WinNative and Bannerlator by maxjivi05. +- mmap ring buffer controller input by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). +- [FEX](https://github.com/FEX-Emu/FEX) (MIT) runs x86 code. DroidDeck's build puts the platform name under `AT_PLATFORM` so [sharun](https://github.com/VHSgunzo/sharun) AppImages by VHSgunzo (MIT) start through its [userland-execve](https://crates.io/crates/userland-execve) loader (MIT). FEX's code disk cache was checked in its source. +- x86 AppImages, and arm64 ones whose runtime can't unpack on Android, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence. +- x86 programs linking OpenSSL 3 use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt). x86 Linux games get the `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes. +- `WriteProcessMemory` hooks fall back to `/proc//mem` the way [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` did before Wine 11. +- Wine write watches use userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later). libblsession supplies the arm64 syscall number and answers `PAGEMAP_SCAN` from `/proc/self/pagemap`. +- libblsession runs Wine's arm64 `SIGUSR2` context handler (`dlls/ntdll/unix/signal_arm64.c`, LGPL-2.1-or-later) in place on a frame laid out like [Linux](https://github.com/torvalds/linux)'s `arch/arm64/kernel/signal.c`, and serves `fill_vm_counters` in `dlls/ntdll/unix/process.c` the kernel's own `/proc//status`. +- droiddeck-ntsync follows the [Linux](https://github.com/torvalds/linux) ntsync semantics in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). +- The proot fast path orders bindings like [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later). +- DiRT 3 and DiRT Showdown keep their telemetry socket the way RoccoC's DiRTTelemetryErrorFix (MIT) does, based on the fix by Carsten Gottschling. +- Games use [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's per render pass memory choice. The Steam client keeps `TU_DEBUG=sysmem`. +- Black Ops III and Dark Souls Remastered start without [umu-protonfixes](https://github.com/Open-Wine-Components/umu-protonfixes) (BSD-2-Clause), whose `311210.py` and `570940.py` fail under ARM64 Proton. +- [ReSkate](https://github.com/Dingo-Shenanigans/ReSkate) (GPL-3.0) by Dingo Shenanigans uses the launch option from its README and D3D12 feature level 12_1. +- The arm64 client's sign in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). -Camera hand tracking runs Google's [MediaPipe](https://github.com/google-ai-edge/mediapipe) Tasks Vision library with its Pose Landmarker (Lite) model, BlazePose GHUM 3D, and its Hand Landmarker model (all Apache-2.0), on frames from AndroidX [CameraX](https://developer.android.com/jetpack/androidx/releases/camera) (Apache-2.0); MediaPipe's usage reports are switched off. The design was checked against [@F8LEFT](https://github.com/F8LEFT)'s [JoyConVr](https://github.com/F8LEFT/JoyConVr) camera app (MIT), and the short Joy-Con movements follow the accelerometer mode of the [Google VR SDK for Unity](https://github.com/googlevr/gvr-unity-sdk)'s arm model, Eric Foxlin's zero-velocity updates and Frosio, Pedersini and Borghese's accelerometer autocalibration, and the camera and Joy-Con are joined by a Kalman filter (R. E. Kalman, 1960). Bare camera hands take their gestures after [ALVR](https://github.com/alvr-org/ALVR)'s `hand_gestures.rs` (MIT) and Meta Quest's menu pinch, with distances checked on photos from the [HaGRID](https://github.com/hukenovs/hagrid) gesture set (CC BY-SA 4.0, not included), fit the palm with Horn's quaternion method (1987) and smooth it with the 1€ filter (Casiez, Roussel and Vogel, 2012); the white glove model follows Valve's OpenVR render model reference and Index controller poses, is meshed with surface nets (Gibson, 1998; Mikola Lysenko) and blends and shades it with Inigo Quilez's smooth minimum and distance-field ambient occlusion, porting his polygon distance (MIT); see [docs/third-party/handtracking](docs/third-party/handtracking/README.md). +
-The Store installs and runs apps with [Flatpak](https://github.com/flatpak/flatpak) (LGPL-2.1). Its sandbox goes through DroidDeck's own bubblewrap shim, which follows how Flatpak hands bwrap its environment. Chromium and Electron apps from Flathub start their browser processes through [zypak](https://github.com/refi64/zypak) by [@refi64](https://github.com/refi64) (BSD-3-Clause); its source was read to see that it always spawns them through Flatpak's spawn portal, which is why DroidDeck starts them directly without Chromium's sandbox instead. +
+Stores -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). +- Epic Games and GOG build on [Phobos](https://github.com/phobos665)'s adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl). GOG install script registry entries are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher) (GPL-3.0) reads them. +- Epic's official Linux launcher preview runs through FEX. That setup is outside Epic's listed Linux support. +- Battle.net is by [@kayakyakr](https://github.com/kayakyakr). It runs Blizzard's own client in Proton (downloaded from Blizzard, not included) and shows key art from the [Battle.net Shop](https://shop.battle.net). Without Steam, its games see the pad as an Xbox 360 controller via `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. +- Battle.net installs drive Blizzard's Agent the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) does, with requests from [wowdev.wiki](https://wowdev.wiki/Agent). Read without taking code: [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader. +- Xbox games load [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) modules (LGPL-2.1-or-later), including `wintypes.dll`. Minecraft's GameInput setup was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). +- The Xbox Cloud Gaming player uses the WebRTC client of [@unknownskl](https://github.com/unknownskl)'s [Greenlight](https://github.com/unknownskl/greenlight) (MIT), and its offer tweaks and sharpening follow [@redphx](https://github.com/redphx)'s [Better xCloud](https://github.com/redphx/better-xcloud) (MIT). See `tools/xcloud-player/NOTICE.md`. +- The itch.io butler pack ships butler's `7z.so`, itch.io's build of [7-Zip](https://www.7-zip.org) by Igor Pavlov (LGPL-2.1, unRAR restriction on RAR code), unmodified. Other archives use Apache Commons Compress and the runtime's bsdtar (libarchive). +- The Store uses [Flatpak](https://github.com/flatpak/flatpak) (LGPL-2.1) through DroidDeck's own bubblewrap shim. Chromium and Electron apps start directly, since [zypak](https://github.com/refi64/zypak) by [@refi64](https://github.com/refi64) (BSD-3-Clause) always uses Flatpak's spawn portal. +- Folder sync runs [Syncthing](https://github.com/syncthing/syncthing) (MPL-2.0), built from [@researchxxl](https://github.com/researchxxl)'s [syncthing-android](https://github.com/researchxxl/syncthing-android) fork (MPL-2.0). -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. +
+Audio, video and HUD + +- Steam audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink`. +- The DroidDeck HUD is [@The412Banner](https://github.com/The412Banner)'s [FusionHUD](https://github.com/The412Banner/FusionHUD) (GPL-3.0 with an attribution term). Its readings match Valve's [MangoHud](https://github.com/flightlessmango/MangoHud) build (MIT), with frame times from gamescope patch 0125. +- The HUD's CPU, GPU load, thermal and battery readers come from [@xXJSONDeruloXx](https://github.com/xXJSONDeruloXx)'s work. +- LSFG frame generation comes from Camille LaVey and the [Eden](https://eden-emu.dev) project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported by [@maxjivi05](https://github.com/maxjivi05). It needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. +- Remote Play decodes through Android's MediaCodec or the [FFmpeg](https://ffmpeg.org) (LGPL-2.1-or-later) in Steam's runtime. Qualcomm low latency settings follow [Moonlight](https://github.com/moonlight-stream/moonlight-android) (GPL-3.0). +- [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) sockets use the settings in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions. + +
+ +
+Desktop + +- The KDE pacman repository snapshots [Arch Linux ARM](https://archlinuxarm.org) and installs with [pacman](https://gitlab.archlinux.org/pacman/pacman) (GPL-2.0-or-later). +- [KWin](https://invent.kde.org/plasma/kwin) (GPL-2.0-or-later) is patched to pass on the scroll data its `wayland_backend.cpp` leaves as a TODO. +- Read without taking code: [Qt](https://code.qt.io/cgit/qt/qtbase.git)'s `qwaylandinputdevice.cpp` and `qguiapplication.cpp`, [Konsole](https://invent.kde.org/utilities/konsole)'s `TerminalDisplay.cpp`, and [Mesa](https://gitlab.freedesktop.org/mesa/mesa)'s `u_threaded_context.c` and `zink_resource.c`. +- The Steam Keyboard window rule follows Valve's `steamdeck-kde-presets` with [Bazzite](https://github.com/ublue-os/bazzite)'s `0001-steam-virtual-keyboard.patch`. +- Steam's Browse buttons open a GTK 3 file chooser via PyGObject (LGPL-2.1-or-later), shown over Steam by [gamescope](https://github.com/ValveSoftware/gamescope) (BSD-2-Clause) through `GetAppIdFromReaper`. +- The AYN Odin 2 phantom second display was confirmed by [@SapphireRhodonite](https://github.com/SapphireRhodonite)'s [WatermelonDS 0.0.5](https://github.com/SapphireRhodonite/WatermelonDS/releases/tag/0.0.5) notes and [iiSU #363](https://github.com/iisu-network/iiSU/issues/363), without taking their code. + +
+ +
+Smart glasses + +- Builds on WinNative's VITURE work. Protocol checked against [@wheaney](https://github.com/wheaney)'s [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver), [@badicsalex](https://github.com/badicsalex)'s [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and [go-macos/iokit](https://pkg.go.dev/github.com/go-macos/iokit/viture). The optional VITURE SDK is not included. +- The VITURE protocol V2 frames adapt [@elasticjava](https://github.com/elasticjava)'s [viture-v2](https://github.com/elasticjava/viture-v2) (MIT) by Holger Bartnick. See `docs/third-party/viture-v2`. +- RayNeo adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0). See [docs/third-party/rayneo](docs/third-party/rayneo/README.md). +- XREAL 1S references XRLinuxDriver and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [@rohitsangwan01](https://github.com/rohitsangwan01)'s [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) (MIT) and [@0xcaff](https://github.com/0xcaff)'s [xr-tools](https://github.com/0xcaff/xr-tools). +- Rokid follows ar-drivers-rs, @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/) and Monado's Rokid driver. +- REDMAGIC display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). + +
+ +
+VR, Joy-Con and hand tracking + +- Joy-Con VR ports the arm model from Google's [GVR SDK for Unity](https://github.com/googlevr/gvr-unity-sdk) (Apache-2.0) and adapts the hand skeleton from Valve's [OpenVR](https://github.com/ValveSoftware/openvr) `handskeletonsimulation` sample (BSD-3-Clause), which follows Moshi Turner's work in Monado. Index offsets come from Monado's `vive_poses.c` (BSL-1.0). +- Joy-Con research: Linux's [hid-nintendo](https://github.com/torvalds/linux/blob/master/drivers/hid/hid-nintendo.c) by Daniel J. Ogorchock, [@dekuNukem](https://github.com/dekuNukem)'s [Nintendo_Switch_Reverse_Engineering](https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering), [SDL](https://github.com/libsdl-org/SDL) and AOSP. Checked against [ALVR](https://github.com/alvr-org/ALVR), [OpenComposite](https://gitlab.com/znixian/OpenOVR), [PSMoveSteamVRBridge](https://github.com/HipsterSloth/PSMoveSteamVRBridge), [@F8LEFT](https://github.com/F8LEFT)'s [JoyConVr](https://github.com/F8LEFT/JoyConVr), [@krnelpan1c](https://github.com/krnelpan1c)'s [Daydream-Controller-SteamVR](https://github.com/krnelpan1c/Daydream-Controller-SteamVR), [@yoyobuae](https://github.com/yoyobuae)'s [joyconvr](https://github.com/yoyobuae/joyconvr), [Moonlight](https://github.com/moonlight-stream/moonlight-android) and [Dolphin](https://github.com/dolphin-emu/dolphin). See [docs/third-party/joycon](docs/third-party/joycon/README.md). +- Camera hand tracking runs Google's [MediaPipe](https://github.com/google-ai-edge/mediapipe) Pose Landmarker (Lite), BlazePose GHUM 3D and Hand Landmarker (Apache-2.0) on [CameraX](https://developer.android.com/jetpack/androidx/releases/camera) frames (Apache-2.0), with usage reports off. Checked against JoyConVr's camera app (MIT). +- Tracking math: the GVR arm model's accelerometer mode, Eric Foxlin's zero velocity updates, Frosio, Pedersini and Borghese's accelerometer autocalibration, a Kalman filter (Kalman, 1960), Horn's quaternion method (1987) and the 1€ filter (Casiez, Roussel and Vogel, 2012). +- Gestures follow [ALVR](https://github.com/alvr-org/ALVR)'s `hand_gestures.rs` (MIT) and Meta Quest's menu pinch, tuned on [HaGRID](https://github.com/hukenovs/hagrid) photos (CC BY-SA 4.0, not included). +- The glove model follows OpenVR's render model reference, is meshed with surface nets (Gibson, 1998; Mikola Lysenko), and uses Inigo Quilez's smooth minimum, distance field ambient occlusion and polygon distance (MIT). See [docs/third-party/handtracking](docs/third-party/handtracking/README.md). + +
+ +## Star history + + + + + Star history chart + + diff --git a/app/build.gradle b/app/build.gradle index 7334c8db4e..736d728ba2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,6 @@ plugins { apply plugin: 'kotlin-android' apply plugin: 'org.jetbrains.kotlin.plugin.compose' -// Machine-specific tooling and optional CI-prepared inputs stay out of version control. def localBuildOptions = new Properties() def localBuildOptionsFile = rootProject.layout.projectDirectory.file('local.properties') if (localBuildOptionsFile.asFile.exists()) { @@ -78,6 +77,10 @@ def escapedBuildLabel = buildLabel.replace('\\', '\\\\').replace('"', '\\"') def sourceCommit = providers.environmentVariable('DROIDDECK_SOURCE_COMMIT').getOrNull() ?: providers.environmentVariable('GITHUB_SHA').getOrNull() ?: gitValue(['rev-parse', 'HEAD']) ?: '' def prNumber = (providers.environmentVariable('DROIDDECK_PR_NUMBER').getOrNull() ?: '0').with { it.isInteger() ? it : '0' } +def prTitle = providers.environmentVariable('DROIDDECK_PR_TITLE').getOrNull() ?: '' +def buildBranch = providers.environmentVariable('GITHUB_HEAD_REF').getOrNull()?.trim() + ?: gitValue(['branch', '--show-current']) ?: '' +def escapeJava = { String value -> value.replace('\\', '\\\\').replace('"', '\\"').replace('\n', ' ').replace('\r', ' ') } def ciBuild = providers.environmentVariable('GITHUB_ACTIONS').getOrNull() == 'true' def releaseSigner = rootProject.file('keystore/release-signer.sha256').text.trim() def commitTime = (gitValue(['show', '-s', '--format=%ct', '--end-of-options', sourceCommit]) ?: '0').with { it.isLong() ? it : '0' } @@ -94,8 +97,6 @@ def addonPacks = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler'] 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]] } @@ -130,11 +131,13 @@ android { applicationId "com.droiddeck.launcher" minSdkVersion 26 targetSdkVersion 28 - versionCode 16 - versionName "0.6.7" + versionCode 17 + versionName "0.6.9" buildConfigField "String", "BUILD_LABEL", "\"${escapedBuildLabel}\"" buildConfigField "String", "SOURCE_COMMIT", "\"${sourceCommit}\"" buildConfigField "int", "PR_NUMBER", "${prNumber}" + buildConfigField "String", "PR_TITLE", "\"${escapeJava(prTitle)}\"" + buildConfigField "String", "BUILD_BRANCH", "\"${escapeJava(buildBranch)}\"" buildConfigField "boolean", "CI_BUILD", "${ciBuild}" buildConfigField "String", "RELEASE_SIGNER", "\"${releaseSigner}\"" buildConfigField "long", "COMMIT_TIME", "${commitTime}L * 1000L" @@ -202,7 +205,6 @@ android { } androidResources { - // aapt's default ignore list, plus the trees shipped as add-on packs (tools/packs). ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*~:droiddeck-xbox:droiddeck-comet:directaudio' } @@ -213,7 +215,6 @@ android { jniLibs { useLegacyPackaging = true pickFirsts += ['**/libtermux.so'] - // Shipped in the proot and tracking packs (tools/packs) and run or loaded from there. excludes += ['**/libproot.so', '**/libproot-loader.so', '**/libopencv_java4.so', '**/libmediapipe_tasks_jni.so'] } } @@ -232,7 +233,6 @@ android { outputs.upToDateWhen { false } outputs.doNotCacheIf('CI executes the test suite on every run') { true } } - // Robolectric keeps a sandbox per SDK level the tests ask for; seven no longer fit in Gradle's default 512 MB. maxHeapSize = '2g' maxParallelForks = 2 def logTarget = providers.systemProperty('robolectric.logging').orNull @@ -249,7 +249,6 @@ android { } } -// Vendor binaries remain in the user's SDK directory; never vendor them into Git. if (vitureSdkDir) { android.sourceSets.main.jniLibs.srcDir(new File(vitureSdkDir, 'android')) def stageVitureNotices = tasks.register('stageVitureNotices', Copy) { @@ -294,10 +293,21 @@ def stageGogNotices = tasks.register('stageGogNotices', Copy) { android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('gogNotices')) tasks.named('preBuild').configure { dependsOn(stageGogNotices) } +if (!ciBuild) { + def stageLocalPacks = tasks.register('stageLocalPacks', Sync) { + from(layout.buildDirectory.dir('packs')) { include '*.tar.zst' } + into(layout.buildDirectory.dir('localPackAssets/packs')) + } + android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('localPackAssets')) + tasks.named('preBuild').configure { dependsOn(stageLocalPacks) } +} + def verifyRuntimeInputs = tasks.register('verifyRuntimeInputs', Exec) { mustRunAfter(stageSessionScripts, stageRuntimeAssets) workingDir rootProject.projectDir - commandLine pythonExecutable, 'tools/release/runtime_inputs.py', 'verify' + def allowStale = (project.findProperty('allowStaleRuntime') + ?: localBuildOptions.getProperty('droiddeck.allowStaleRuntime', 'false')).toString().toBoolean() + commandLine([pythonExecutable, 'tools/release/runtime_inputs.py', 'verify'] + (allowStale ? ['--allow-stale-sources'] : [])) } tasks.configureEach { task -> if (task.name in ['packageDebug', 'packageRelease']) task.dependsOn(verifyRuntimeInputs) @@ -335,6 +345,21 @@ def buildRustStores = tasks.register('buildRustStores', Exec) { if (!skipRust) android.sourceSets.main.jniLibs.srcDir(rustJniLibsDir) tasks.named('preBuild').configure { dependsOn(buildRustStores) } +def maliBridgeDir = rootProject.file('external/MaliBridge') +def vkbridgeJniLibsDir = layout.buildDirectory.dir('vkbridgeJniLibs') +def buildVkBridgeServer = tasks.register('buildVkBridgeServer', Exec) { + description = 'Builds the Vulkan bridge server (libvkbridge_server.so) with the NDK.' + inputs.dir(new File(maliBridgeDir, 'common')) + inputs.dir(new File(maliBridgeDir, 'server')) + inputs.dir(new File(maliBridgeDir, 'third_party')) + inputs.file(new File(maliBridgeDir, 'scripts/build-server-android.sh')) + outputs.dir(vkbridgeJniLibsDir) + commandLine 'bash', new File(maliBridgeDir, 'scripts/build-server-android.sh').absolutePath, + android.ndkDirectory.absolutePath, vkbridgeJniLibsDir.get().asFile.absolutePath +} +android.sourceSets.main.jniLibs.srcDir(vkbridgeJniLibsDir) +tasks.named('preBuild').configure { dependsOn(buildVkBridgeServer) } + dependencies { implementation "org.opencv:opencv:${trackingPack.OPENCV_VERSION}" implementation 'org.khronos.openxr:openxr_loader_for_android:1.1.49' @@ -356,11 +381,11 @@ dependencies { implementation 'androidx.camera:camera-camera2:1.4.2' implementation 'androidx.camera:camera-lifecycle:1.4.2' implementation 'androidx.webkit:webkit:1.12.1' - // Google's WebRTC (BSD) for the native Xbox Cloud Gaming player (XboxNativePlayerActivity). implementation 'io.github.webrtc-sdk:android:125.6422.07' implementation("com.google.mediapipe:tasks-vision:${trackingPack.MEDIAPIPE_VERSION}") { exclude group: 'com.google.auto.value', module: 'auto-value' } + implementation 'com.google.zxing:core:3.5.3' testImplementation 'junit:junit:4.13.2' testImplementation 'org.robolectric:robolectric:4.16.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 95984f02e0..a187dc15b0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,12 +3,21 @@ xmlns:tools="http://schemas.android.com/tools"> + + + + + + + + + @@ -60,6 +69,19 @@ + + + + + + + + + + + + + + + + + + @@ -179,6 +216,13 @@ android:resizeableActivity="true" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden|navigation|uiMode|density" /> + + + + @@ -288,6 +337,10 @@ android:name=".stores.download.StoreDownloadService" android:exported="false" android:foregroundServiceType="dataSync" /> + SPIR-V translator is zlib licensed (vendored under thirdparty/dxbc). add_subdirectory(thirdparty/dxbc) set(DDFG_UPSTREAM "v0.3.0") @@ -37,13 +36,14 @@ target_link_libraries(sdnative log) add_library(deviceinfo SHARED deviceinfo/vkinfo.c) target_link_libraries(deviceinfo dl) +add_library(gpuclock SHARED gpuclock/kgsl_clock.c gpuclock/kgsl_busy.c) + add_library(termux SHARED termux/termux.c) add_library(ddvenc SHARED venc/venc_server.cpp) target_compile_features(ddvenc PRIVATE cxx_std_17) target_link_libraries(ddvenc mediandk log) -# The optional proprietary SDK is supplied locally; its headers/libraries are not vendored. if(DROIDDECK_VITURE_SDK_DIR) add_library(droiddeck_viture SHARED viture/sdk_bridge.cpp) target_compile_features(droiddeck_viture PRIVATE cxx_std_17) diff --git a/app/src/main/cpp/deviceinfo/vkinfo.c b/app/src/main/cpp/deviceinfo/vkinfo.c index 81ccc6b0dd..5846e055da 100644 --- a/app/src/main/cpp/deviceinfo/vkinfo.c +++ b/app/src/main/cpp/deviceinfo/vkinfo.c @@ -62,6 +62,7 @@ Java_com_droiddeck_launcher_gpu_VulkanInfo_nativeQuery(JNIEnv *env, jclass clazz LINE("driver_version=%u.%u.%u\n", p.driverVersion >> 22, (p.driverVersion >> 12) & 0x3ff, p.driverVersion & 0xfff); LINE("vendor_id=0x%04x\ndevice_id=0x%08x\n", p.vendorID, p.deviceID); LINE("max_image_2d=%u\n", p.limits.maxImageDimension2D); + LINE("max_push_constants=%u\n", p.limits.maxPushConstantsSize); uint32_t extCount = 0; if (vkEnumerateDeviceExtensionProperties) vkEnumerateDeviceExtensionProperties(device, NULL, &extCount, NULL); @@ -91,6 +92,7 @@ Java_com_droiddeck_launcher_gpu_VulkanInfo_nativeQuery(JNIEnv *env, jclass clazz vkGetPhysicalDeviceFeatures(device, &f); LINE("geometry_shader=%s\ntessellation_shader=%s\ntexture_bc=%s\n", f.geometryShader ? "yes" : "no", f.tessellationShader ? "yes" : "no", f.textureCompressionBC ? "yes" : "no"); + LINE("shader_int64=%s\n", f.shaderInt64 ? "yes" : "no"); } if (vkGetPhysicalDeviceMemoryProperties) { VkPhysicalDeviceMemoryProperties m; diff --git a/app/src/main/cpp/fakeinput_steam.cpp b/app/src/main/cpp/fakeinput_steam.cpp index f8371f8f87..9558d780c4 100644 --- a/app/src/main/cpp/fakeinput_steam.cpp +++ b/app/src/main/cpp/fakeinput_steam.cpp @@ -78,7 +78,6 @@ static constexpr uint8_t GAMEPAD_AXIS_COUNT = 8; static constexpr uint8_t GAMEPAD_BUTTON_COUNT = 11; static constexpr uint32_t FAKE_INPUT_RING_MAGIC = 0x46494252; static constexpr uint32_t FAKE_INPUT_RING_VERSION = 2; -// Rings hold the 64-bit input_event layout that the arm64 writers use; 32-bit guests convert on read. struct RingEvent { int64_t sec; int64_t usec; @@ -391,7 +390,6 @@ send_vibration(int strong, int weak, uint16_t duration_ms, uint16_t slot) { syscall(SYS_close, sock); } -// Must match RumbleComponent.HOLD_MS: play until the slot's next effect or stop. static constexpr uint16_t RUMBLE_HOLD_MS = 0xffff; __attribute__((visibility("hidden"))) static void send_ff_effect(const struct ff_effect &effect, uint16_t slot) { @@ -1243,7 +1241,6 @@ static constexpr int TRITON_REPORT_ID_BYTES = 1; static constexpr int TRITON_STATE_BYTES = 45; static constexpr int TRITON_REPORT_INTERVAL_US = 4000; static constexpr int TRITON_FEATURE_TIMEOUT_MS = 500; -// The app clears output_length once it has taken a report; a writer waits this long for that before overwriting. static constexpr int TRITON_OUTPUT_TIMEOUT_MS = 50; static constexpr const char *TRITON_NAME = "Steam Controller"; static constexpr const char *TRITON_SERIAL = "DROIDDECKSC01"; @@ -2673,9 +2670,6 @@ __attribute__((visibility("hidden"))) static int triton_get_feature(DeckHidraw & static constexpr uint32_t TRITON_HWID = 72; static constexpr uint32_t TRITON_FW_TIMESTAMP = 0x6AC686B3; -// Steam compares the controller's firmware with TRITON_FW_TS in its bundled hardwareupdater.cfg (and blocks -// with a required update below MUST_UPDATE_TRITON_FW_TS), so the emulated pad reports at least the build -// Steam ships. static uint32_t triton_fw_timestamp() { static const uint32_t timestamp = [] { std::vector roots; @@ -3683,7 +3677,6 @@ EXPORT int ioctl(int fd, ioctl_request_t op, ...) { Logger::log("Hooking ioctl EVIOCGRAB for event %s\n", event); return 0; } else if (type == 0x6A && !strncmp(event, "event", 5)) { - // Older SDL2 builds treat any JSIOCGNAME answer as a joydev node and skip EVIOCGID, then drop the pad as 0000:0000. Logger::log("Rejecting joydev ioctl %d for event %s\n", number, event); guard.unlock(); errno = EINVAL; diff --git a/app/src/main/cpp/framegen/ddfg/record_impl.inc b/app/src/main/cpp/framegen/ddfg/record_impl.inc index 734d94cdc9..f366d9a9c4 100644 --- a/app/src/main/cpp/framegen/ddfg/record_impl.inc +++ b/app/src/main/cpp/framegen/ddfg/record_impl.inc @@ -267,8 +267,6 @@ void FrameGen::record(VkCommandBuffer cmd, VkImageView prevView, VkImageView cur pFlowReg_, flowRegA_, flowRegB_, gmSsbo_, kLevels, cfg_); } - // Every generation of one real frame is recorded into the same command buffer, so the flow - // between prev and curr is computed once and each generation gets its own synth UBO and set. if (reuseFlow && !g_scratch.flowReady) return; if (!reuseFlow) { bool gmEngaged = updateGlobalMotion(gmSlot, extent_); diff --git a/app/src/main/cpp/framegen/lsfg/lsfg_dll.cpp b/app/src/main/cpp/framegen/lsfg/lsfg_dll.cpp index 3a37f032a6..f9ee32463c 100644 --- a/app/src/main/cpp/framegen/lsfg/lsfg_dll.cpp +++ b/app/src/main/cpp/framegen/lsfg/lsfg_dll.cpp @@ -1,5 +1,4 @@ -// LSFG from Camille LaVey / the Eden Emulator Project, following upstream lsfg-vk (PancakeTAS). -// Ported to WinNative and DroidDeck by @maxjivi05. GPL-3.0-or-later. +// LSFG from Camille LaVey / the Eden Emulator Project, following upstream lsfg-vk (PancakeTAS). Ported to WinNative and DroidDeck by @maxjivi05. GPL-3.0-or-later. #include "lsfg_dll.h" #include "lsfg_dxbc.h" diff --git a/app/src/main/cpp/framegen/lsfg/lsfg_dll.h b/app/src/main/cpp/framegen/lsfg/lsfg_dll.h index a20a6c6311..81bf6781d6 100644 --- a/app/src/main/cpp/framegen/lsfg/lsfg_dll.h +++ b/app/src/main/cpp/framegen/lsfg/lsfg_dll.h @@ -1,5 +1,4 @@ -// LSFG from Camille LaVey / the Eden Emulator Project, following upstream lsfg-vk (PancakeTAS). -// Ported to WinNative and DroidDeck by @maxjivi05. GPL-3.0-or-later. +// LSFG from Camille LaVey / the Eden Emulator Project, following upstream lsfg-vk (PancakeTAS). Ported to WinNative and DroidDeck by @maxjivi05. GPL-3.0-or-later. #pragma once diff --git a/app/src/main/cpp/framegen/lsfg/lsfg_dxbc.h b/app/src/main/cpp/framegen/lsfg/lsfg_dxbc.h index 17ba1876d4..2f5286b26c 100644 --- a/app/src/main/cpp/framegen/lsfg/lsfg_dxbc.h +++ b/app/src/main/cpp/framegen/lsfg/lsfg_dxbc.h @@ -1,5 +1,4 @@ #pragma once -// DXVK's dxbc subset is zlib licensed; vendored under cpp/thirdparty/dxbc. #include #include diff --git a/app/src/main/cpp/gpuclock/kgsl_busy.c b/app/src/main/cpp/gpuclock/kgsl_busy.c new file mode 100644 index 0000000000..ec652c8d1b --- /dev/null +++ b/app/src/main/cpp/gpuclock/kgsl_busy.c @@ -0,0 +1,154 @@ +// Whole-GPU busy share without root on Adreno (KGSL) devices whose kgsl sysfs is blocked for apps: a thread +// samples the memstore timestamps (kgsl_busy.h) once a millisecond while running. Ringbuffer entries are used where +// the kernel writes them; on hardware-scheduled kernels, which leave them at 0, the contexts' own entries are used. +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../adrenotools/src/hook/kgsl.h" +#include "kgsl_busy.h" + +#define SAMPLE_NS 1000000L +// Context mode: how many samples between scans of the context entries. +#define SCAN_EVERY 200 + +enum { MODE_RINGBUFFER = 1, MODE_CONTEXTS = 2 }; + +struct reader { + int fd; + void *map; + size_t bytes; + int first; + int mode; + uint32_t last[KGSL_BUSY_SLOTS]; + uint32_t *seen, *ctx_last; + int live[KGSL_BUSY_MAX_LIVE]; + int live_count; + pthread_mutex_t lock; + pthread_t thread; + int thread_on; + atomic_int run; + atomic_uint_fast64_t busy, samples, moves; +}; + +static void *sample_loop(void *arg) { + struct reader *r = arg; + const struct timespec gap = {0, SAMPLE_NS}; + int until_scan = 0; + while (atomic_load(&r->run)) { + int moved = 0, busy; + if (r->mode == MODE_CONTEXTS) { + if (until_scan-- <= 0) { + r->live_count = kgsl_busy_scan_contexts(r->map, r->first, r->seen, r->live, KGSL_BUSY_MAX_LIVE); + until_scan = SCAN_EVERY; + } + busy = kgsl_busy_sample_contexts(r->map, r->live, r->live_count, r->ctx_last, &moved); + } else { + busy = kgsl_busy_sample(r->map, r->first, r->last, &moved); + } + if (busy) atomic_fetch_add(&r->busy, 1); + if (moved) atomic_fetch_add(&r->moves, 1); + atomic_fetch_add(&r->samples, 1); + nanosleep(&gap, NULL); + } + return NULL; +} + +static void reader_run(struct reader *r, int on) { + pthread_mutex_lock(&r->lock); + if (on && !r->thread_on) { + atomic_store(&r->run, 1); + if (pthread_create(&r->thread, NULL, sample_loop, r) == 0) r->thread_on = 1; + else atomic_store(&r->run, 0); + } else if (!on && r->thread_on) { + atomic_store(&r->run, 0); + pthread_join(r->thread, NULL); + r->thread_on = 0; + } + pthread_mutex_unlock(&r->lock); +} + +static void reader_close(struct reader *r) { + if (!r) return; + reader_run(r, 0); + if (r->map && r->map != MAP_FAILED) munmap(r->map, r->bytes); + if (r->fd >= 0) close(r->fd); + free(r->seen); + free(r->ctx_last); + pthread_mutex_destroy(&r->lock); + free(r); +} + +// Returns 0 or a negative errno; *out is set on success. +static int reader_open(struct reader **out) { + struct reader *r = calloc(1, sizeof(*r)); + if (!r) return -ENOMEM; + pthread_mutex_init(&r->lock, NULL); + r->fd = open("/dev/kgsl-3d0", O_RDWR | O_CLOEXEC); + if (r->fd < 0) { int e = -errno; reader_close(r); return e; } + struct kgsl_shadowprop shadow; + memset(&shadow, 0, sizeof(shadow)); + struct kgsl_device_getproperty prop = {.type = KGSL_PROP_DEVICE_SHADOW, .value = &shadow, .sizebytes = sizeof(shadow)}; + if (ioctl(r->fd, IOCTL_KGSL_DEVICE_GETPROPERTY, &prop)) { int e = -errno; reader_close(r); return e; } + r->bytes = shadow.size; + r->first = kgsl_busy_first_slot(shadow.size); + if (r->first < 0) { reader_close(r); return -ERANGE; } + r->map = mmap(NULL, r->bytes, PROT_READ, MAP_SHARED, r->fd, (off_t)shadow.gpuaddr); + if (r->map == MAP_FAILED) { int e = -errno; reader_close(r); return e; } + int moved = 0, started = 0; + kgsl_busy_sample(r->map, r->first, r->last, &moved); + for (int i = 0; i < KGSL_BUSY_SLOTS; i++) started |= r->last[i] != 0; + if (started) { + r->mode = MODE_RINGBUFFER; + } else { + r->seen = calloc((size_t)r->first, sizeof(uint32_t)); + r->ctx_last = calloc((size_t)r->first, sizeof(uint32_t)); + if (!r->seen || !r->ctx_last) { reader_close(r); return -ENOMEM; } + r->live_count = kgsl_busy_scan_contexts(r->map, r->first, r->seen, r->live, KGSL_BUSY_MAX_LIVE); + kgsl_busy_sample_contexts(r->map, r->live, r->live_count, r->ctx_last, &moved); + r->mode = MODE_CONTEXTS; + } + *out = r; + return 0; +} + +#ifndef KGSL_BUSY_NO_JNI +#include + +JNIEXPORT jlong JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeOpen(JNIEnv *env, jclass cls, jintArray error) { + struct reader *r = NULL; + int e = reader_open(&r); + if (e && error && (*env)->GetArrayLength(env, error) > 0) { + jint v = e; + (*env)->SetIntArrayRegion(env, error, 0, 1, &v); + } + return e ? 0 : (jlong)(intptr_t)r; +} + +JNIEXPORT jint JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeMode(JNIEnv *env, jclass cls, jlong handle) { + return handle ? ((struct reader *)(intptr_t)handle)->mode : 0; +} + +JNIEXPORT void JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeRun(JNIEnv *env, jclass cls, jlong handle, jboolean on) { + if (handle) reader_run((struct reader *)(intptr_t)handle, on ? 1 : 0); +} + +JNIEXPORT jboolean JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeRead(JNIEnv *env, jclass cls, jlong handle, jlongArray out) { + if (!handle || !out || (*env)->GetArrayLength(env, out) < 3) return JNI_FALSE; + struct reader *r = (struct reader *)(intptr_t)handle; + jlong v[3] = {(jlong)atomic_load(&r->busy), (jlong)atomic_load(&r->samples), (jlong)atomic_load(&r->moves)}; + (*env)->SetLongArrayRegion(env, out, 0, 3, v); + return JNI_TRUE; +} + +JNIEXPORT void JNICALL Java_com_droiddeck_launcher_session_KgslBusy_nativeClose(JNIEnv *env, jclass cls, jlong handle) { + reader_close((struct reader *)(intptr_t)handle); +} +#endif diff --git a/app/src/main/cpp/gpuclock/kgsl_busy.h b/app/src/main/cpp/gpuclock/kgsl_busy.h new file mode 100644 index 0000000000..0ca7bfb067 --- /dev/null +++ b/app/src/main/cpp/gpuclock/kgsl_busy.h @@ -0,0 +1,77 @@ +#ifndef DROIDDECK_KGSL_BUSY_H +#define DROIDDECK_KGSL_BUSY_H +// kgsl lets any client map its memstore read-only (KGSL_PROP_DEVICE_SHADOW). The CP writes a ringbuffer's +// start-of-pipe timestamp there before each submission's command buffers and its end-of-pipe timestamp after them +// (adreno_gen7_ringbuffer.c gen7_ringbuffer_addcmds), so start != end means that ringbuffer has work on the GPU. +// Ringbuffer entries start at KGSL_MEMSTORE_MAX: entries - 2 - 4 levels, or entries - 1 - 4 on kernels without the +// LPAC slot. Entries - 6 .. entries - 2 cover both; a context entry in that range follows the same start/end rule. +#include +#include + +#define KGSL_BUSY_ENTRY_WORDS 10 +#define KGSL_BUSY_SOP 0 +#define KGSL_BUSY_EOP 2 +#define KGSL_BUSY_SLOTS 5 + +static inline int kgsl_busy_first_slot(size_t bytes) { + size_t entries = bytes / (KGSL_BUSY_ENTRY_WORDS * sizeof(uint32_t)); + return entries < 8 ? -1 : (int)(entries - 6); +} + +// 1 when a watched slot has a submission between its start and end timestamps. *moved is set when a start +// timestamp differs from last[], which then holds the new ones. +static inline int kgsl_busy_sample(const volatile uint32_t *memstore, int first, uint32_t last[KGSL_BUSY_SLOTS], int *moved) { + int busy = 0; + for (int i = 0; i < KGSL_BUSY_SLOTS; i++) { + const volatile uint32_t *entry = memstore + (size_t)(first + i) * KGSL_BUSY_ENTRY_WORDS; + uint32_t sop = entry[KGSL_BUSY_SOP], eop = entry[KGSL_BUSY_EOP]; + if (sop != eop) busy = 1; + if (sop != last[i]) { + *moved = 1; + last[i] = sop; + } + } + return busy; +} + +// Hardware-scheduled kernels (every gen8 GPU and some gen7 ones: .gpudev = *_hwsched_gpudev in adreno-gpulist.h) +// leave the ringbuffer entries at 0. The GMU firmware writes each context's own entry instead +// (gen8_hwsched_hfi.c send_context_pointers). Context ids run from 1 below the ringbuffer entries, lowest free first, +// and kgsl zeroes an entry when its context is created or destroyed. +#define KGSL_BUSY_MAX_LIVE 64 + +// Collects the contexts to sample: every entry below first with a non-zero start stamp (kgsl zeroes an entry when its +// context is created or destroyed). Entries whose start stamp changed since the previous scan (seen[]) or that are +// busy now come first, so the max_live cap only drops idle ones. Returns how many ids went into live[]. +static inline int kgsl_busy_scan_contexts(const volatile uint32_t *memstore, int first, uint32_t *seen, int *live, int max_live) { + int n = 0, idle = 0; + int idle_ids[KGSL_BUSY_MAX_LIVE]; + for (int id = 1; id < first; id++) { + const volatile uint32_t *entry = memstore + (size_t)id * KGSL_BUSY_ENTRY_WORDS; + uint32_t sop = entry[KGSL_BUSY_SOP], eop = entry[KGSL_BUSY_EOP]; + int changed = sop != seen[id]; + seen[id] = sop; + if ((changed || sop != eop) && n < max_live) live[n++] = id; + else if (sop != 0 && idle < KGSL_BUSY_MAX_LIVE) idle_ids[idle++] = id; + } + for (int i = 0; i < idle && n < max_live; i++) live[n++] = idle_ids[i]; + return n; +} + +// 1 when a live context has a submission between its start and end timestamps. *moved is set when a start +// timestamp differs from last[] (indexed by context id), which then holds the new ones. +static inline int kgsl_busy_sample_contexts(const volatile uint32_t *memstore, const int *live, int count, uint32_t *last, int *moved) { + int busy = 0; + for (int i = 0; i < count; i++) { + const volatile uint32_t *entry = memstore + (size_t)live[i] * KGSL_BUSY_ENTRY_WORDS; + uint32_t sop = entry[KGSL_BUSY_SOP], eop = entry[KGSL_BUSY_EOP]; + if (sop != eop) busy = 1; + if (sop != last[live[i]]) { + *moved = 1; + last[live[i]] = sop; + } + } + return busy; +} + +#endif diff --git a/app/src/main/cpp/gpuclock/kgsl_clock.c b/app/src/main/cpp/gpuclock/kgsl_clock.c new file mode 100644 index 0000000000..e70a1d537c --- /dev/null +++ b/app/src/main/cpp/gpuclock/kgsl_clock.c @@ -0,0 +1,159 @@ +// GPU clock without root on Adreno (KGSL) devices whose kgsl sysfs is blocked for apps. +// +// kgsl lets any app reserve a performance counter (IOCTL_KGSL_PERFCOUNTER_GET) but refuses to read it back while +// /sys/class/kgsl/kgsl-3d0/perfcounter is 0, and clears the counters whenever the GPU switches to another process. +// So the counter is read by the GPU itself: a small command buffer copies CP_ALWAYS_ON_COUNTER (19.2 MHz) and the +// RBBM ALWAYS_COUNT counter (GPU core cycles) to memory, runs a block of NOP packets, and copies both again. +// clock = cycles / always-on ticks * 19.2 MHz. Both reads sit in one command buffer, so a counter clear between +// them only happens if the buffer is preempted; such samples fail the range checks and are dropped. +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../adrenotools/src/hook/kgsl.h" +#include "kgsl_layout.h" + +#define CP_TYPE7_PKT 0x70000000u +#define CP_NOP 0x10u +#define CP_REG_TO_MEM 0x3eu +#define XO_HZ 19200000.0 +#define NOP_DWORDS 0x3fffu +#define NOP_BLOCKS 4 + +struct sampler { + int fd; + const struct kgsl_layout *layout; + unsigned context; + unsigned counter_reg; + struct kgsl_gpumem_alloc_id ib, out; + uint32_t *ib_map; + volatile uint64_t *out_map; + size_t ib_bytes; +}; + +static unsigned odd_parity(unsigned v) { + v ^= v >> 16; + v ^= v >> 8; + v ^= v >> 4; + v &= 0xf; + return (~0x6996u >> v) & 1u; +} + +static uint32_t pkt7(unsigned op, unsigned count) { + return CP_TYPE7_PKT | count | odd_parity(count) << 15 | (op & 0x7f) << 16 | odd_parity(op) << 23; +} + +static void sampler_close(struct sampler *s) { + if (!s) return; + if (s->fd >= 0) { + if (s->ib_map && s->ib_map != MAP_FAILED) munmap(s->ib_map, s->ib.mmapsize); + if (s->out_map && s->out_map != MAP_FAILED) munmap((void *)s->out_map, s->out.mmapsize); + if (s->ib.id) { struct kgsl_gpumem_free_id f = {.id = s->ib.id}; ioctl(s->fd, IOCTL_KGSL_GPUMEM_FREE_ID, &f); } + if (s->out.id) { struct kgsl_gpumem_free_id f = {.id = s->out.id}; ioctl(s->fd, IOCTL_KGSL_GPUMEM_FREE_ID, &f); } + if (s->context) { struct kgsl_drawctxt_destroy d = {.drawctxt_id = s->context}; ioctl(s->fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &d); } + if (s->counter_reg) { + struct kgsl_perfcounter_put p = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = s->layout->cycles}; + ioctl(s->fd, IOCTL_KGSL_PERFCOUNTER_PUT, &p); + } + close(s->fd); + } + free(s); +} + +static void emit_reads(struct sampler *s, size_t *n, unsigned pass) { + const unsigned regs[2] = {s->layout->always_on, s->counter_reg}; + for (unsigned k = 0; k < 2; k++) { + uint64_t dst = s->out.gpuaddr + (uint64_t)(pass * 2 + k) * sizeof(uint64_t); + s->ib_map[(*n)++] = pkt7(CP_REG_TO_MEM, 3); + s->ib_map[(*n)++] = regs[k] | (2u << 18) | (1u << 30); // two dwords, 64-bit read + s->ib_map[(*n)++] = (uint32_t)dst; + s->ib_map[(*n)++] = (uint32_t)(dst >> 32); + } +} + +// Returns 0 or a negative errno; *out is set on success. +static int sampler_open(struct sampler **out) { + struct sampler *s = calloc(1, sizeof(*s)); + if (!s) return -ENOMEM; + s->fd = open("/dev/kgsl-3d0", O_RDWR | O_CLOEXEC); + if (s->fd < 0) { int e = -errno; s->fd = -1; sampler_close(s); return e; } + struct kgsl_devinfo info; + memset(&info, 0, sizeof(info)); + struct kgsl_device_getproperty prop = {.type = KGSL_PROP_DEVICE_INFO, .value = &info, .sizebytes = sizeof(info)}; + if (ioctl(s->fd, IOCTL_KGSL_DEVICE_GETPROPERTY, &prop)) { int e = -errno; sampler_close(s); return e; } + s->layout = kgsl_layout_for(info.chip_id); + if (!s->layout) { sampler_close(s); return -ENOTSUP; } + struct kgsl_perfcounter_get get = {.groupid = KGSL_PERFCOUNTER_GROUP_RBBM, .countable = s->layout->cycles}; + if (ioctl(s->fd, IOCTL_KGSL_PERFCOUNTER_GET, &get)) { int e = -errno; sampler_close(s); return e; } + s->counter_reg = get.offset; + if (!get.offset || get.offset > s->layout->readable_last) { sampler_close(s); return -ERANGE; } + struct kgsl_drawctxt_create ctx = {.flags = KGSL_CONTEXT_NO_GMEM_ALLOC | KGSL_CONTEXT_PREAMBLE}; + if (ioctl(s->fd, IOCTL_KGSL_DRAWCTXT_CREATE, &ctx)) { int e = -errno; sampler_close(s); return e; } + s->context = ctx.drawctxt_id; + s->ib_bytes = (16 + NOP_BLOCKS * (NOP_DWORDS + 1)) * sizeof(uint32_t); + s->ib.size = (s->ib_bytes + 4095) & ~(size_t)4095; + s->out.size = 4096; + if (ioctl(s->fd, IOCTL_KGSL_GPUMEM_ALLOC_ID, &s->ib)) { int e = -errno; s->ib.id = 0; sampler_close(s); return e; } + if (ioctl(s->fd, IOCTL_KGSL_GPUMEM_ALLOC_ID, &s->out)) { int e = -errno; s->out.id = 0; sampler_close(s); return e; } + s->ib_map = mmap(NULL, s->ib.mmapsize, PROT_READ | PROT_WRITE, MAP_SHARED, s->fd, (off_t)s->ib.id << 12); + s->out_map = mmap(NULL, s->out.mmapsize, PROT_READ | PROT_WRITE, MAP_SHARED, s->fd, (off_t)s->out.id << 12); + if (s->ib_map == MAP_FAILED || s->out_map == MAP_FAILED) { int e = -errno; sampler_close(s); return e; } + size_t n = 0; + emit_reads(s, &n, 0); + for (unsigned b = 0; b < NOP_BLOCKS; b++) { + s->ib_map[n++] = pkt7(CP_NOP, NOP_DWORDS); + memset(&s->ib_map[n], 0, NOP_DWORDS * sizeof(uint32_t)); + n += NOP_DWORDS; + } + emit_reads(s, &n, 1); + s->ib_bytes = n * sizeof(uint32_t); + *out = s; + return 0; +} + +// MHz, or a negative value: -errno from kgsl, or -1000 for a sample that failed the range checks. +static int sampler_mhz(struct sampler *s) { + for (int i = 0; i < 4; i++) s->out_map[i] = 0; + struct kgsl_command_object cmd = {.gpuaddr = s->ib.gpuaddr, .size = s->ib_bytes, .flags = KGSL_CMDLIST_IB}; + struct kgsl_gpu_command submit = { + .cmdlist = (uint64_t)(uintptr_t)&cmd, .cmdsize = sizeof(cmd), .numcmds = 1, .context_id = s->context, + }; + if (ioctl(s->fd, IOCTL_KGSL_GPU_COMMAND, &submit)) return -errno; + struct kgsl_device_waittimestamp_ctxtid wait = {.context_id = s->context, .timestamp = submit.timestamp, .timeout = 250}; + if (ioctl(s->fd, IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID, &wait)) return -errno; + uint64_t xo0 = s->out_map[0], cyc0 = s->out_map[1], xo1 = s->out_map[2], cyc1 = s->out_map[3]; + if (xo1 <= xo0 || cyc1 <= cyc0) return -1000; + uint64_t xo = xo1 - xo0, cycles = cyc1 - cyc0; + // 5 us .. 50 ms of always-on time, and a clock between 50 MHz and 2 GHz. + if (xo < 96 || xo > 960000) return -1000; + double mhz = (double)cycles / (double)xo * XO_HZ / 1e6; + if (mhz < 50 || mhz > 2000) return -1000; + return (int)(mhz + 0.5); +} + +#ifndef KGSL_CLOCK_NO_JNI +#include + +JNIEXPORT jlong JNICALL Java_com_droiddeck_launcher_session_KgslClock_nativeOpen(JNIEnv *env, jclass cls, jintArray error) { + struct sampler *s = NULL; + int r = sampler_open(&s); + if (r && error && (*env)->GetArrayLength(env, error) > 0) { + jint e = r; + (*env)->SetIntArrayRegion(env, error, 0, 1, &e); + } + return r ? 0 : (jlong)(intptr_t)s; +} + +JNIEXPORT jint JNICALL Java_com_droiddeck_launcher_session_KgslClock_nativeSample(JNIEnv *env, jclass cls, jlong handle) { + return handle ? sampler_mhz((struct sampler *)(intptr_t)handle) : -EBADF; +} + +JNIEXPORT void JNICALL Java_com_droiddeck_launcher_session_KgslClock_nativeClose(JNIEnv *env, jclass cls, jlong handle) { + sampler_close((struct sampler *)(intptr_t)handle); +} +#endif diff --git a/app/src/main/cpp/gpuclock/kgsl_layout.h b/app/src/main/cpp/gpuclock/kgsl_layout.h new file mode 100644 index 0000000000..f486ddfdb2 --- /dev/null +++ b/app/src/main/cpp/gpuclock/kgsl_layout.h @@ -0,0 +1,27 @@ +#ifndef DROIDDECK_KGSL_LAYOUT_H +#define DROIDDECK_KGSL_LAYOUT_H +#include + +// Register layout per GPU generation. A counter kgsl places outside the range the kernel's CP protection lets +// command buffers read (adreno-gpulist.h *_protected_regs) is not read. +struct kgsl_layout { + unsigned always_on; // CP_ALWAYS_ON_COUNTER + unsigned cycles; // RBBM countable that counts GPU cycles + unsigned readable_last; // last register of the readable range starting at 0 +}; +// A6xx/A7xx: CP_ALWAYS_ON_COUNTER 0x980, RBBM countable 0 = ALWAYS_COUNT, 0x000-0x4ff readable (gen7 list). +static const struct kgsl_layout KGSL_LAYOUT_A7XX = {0x980u, 0u, 0x4ffu}; +// A8xx: CP_ALWAYS_ON_COUNTER 0x8e7 (gen8_reg.h), RBBM countable 1 = US_ALWAYS_COUNT (0 is NEVER_COUNT, Mesa +// a8xx_perfcntrs.xml), 0x000-0x3a3 readable (gen8_0_0_protected_regs). +static const struct kgsl_layout KGSL_LAYOUT_A8XX = {0x8e7u, 1u, 0x3a3u}; + +// The KGSL chip id's top byte: 0x44 on every A8xx (Adreno 810/829/830/840, Mesa freedreno_devices.py), +// 0x43 or the generation number on A6xx/A7xx. Later generations are not known, so nothing is read there. +static inline const struct kgsl_layout *kgsl_layout_for(unsigned chip_id) { + unsigned core = chip_id >> 24; + if (core == 0x44u) return &KGSL_LAYOUT_A8XX; + if (core > 0x44u) return NULL; + return &KGSL_LAYOUT_A7XX; +} + +#endif diff --git a/app/src/main/cpp/questxr/gpu_frames.h b/app/src/main/cpp/questxr/gpu_frames.h index dc69dbbfb6..77d7a6db6a 100644 --- a/app/src/main/cpp/questxr/gpu_frames.h +++ b/app/src/main/cpp/questxr/gpu_frames.h @@ -76,7 +76,6 @@ public: } lastFrame_ = frame.header.frame_id; if (state == XrGpuFrameState::Stale) { - // No GPU read was submitted, so the producer can safely reclaim a dropped frame. dropped_++; if (!xr_gpu_send(peer_, &frame.header.frame_id, sizeof(frame.header.frame_id))) Disconnect(); return false; @@ -88,7 +87,6 @@ public: glBindImageTexture(0, raw_, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_RGBA8); glDispatchCompute((width_ + 7) / 8, (height_ + 7) / 8, 1); glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT); - // The producer may overwrite this slot only after the native GPU has finished reading it. glFinish(); if (glGetError() != GL_NO_ERROR) { rejected_++; Disconnect(); return false; } if (!xr_gpu_send(peer_, &frame.header.frame_id, sizeof(frame.header.frame_id))) Disconnect(); diff --git a/app/src/main/cpp/venc/venc_proto.h b/app/src/main/cpp/venc/venc_proto.h index 47fb6ef241..e69bbd822c 100644 --- a/app/src/main/cpp/venc/venc_proto.h +++ b/app/src/main/cpp/venc/venc_proto.h @@ -3,10 +3,6 @@ #include -/* SOCK_SEQPACKET between the guest's Remote Play hooks and the app: the emulated /dev/video-enc0 and - * MediaCodec encoder, and remote touches. A config carries the buffer memfds (inputs first) as SCM_RIGHTS; - * every frame gets one reply, touches get none. */ - #define VENC_MAX_BUFFERS 16 enum venc_msg { VENC_CONFIG = 1, VENC_FRAME = 2, VENC_DONE = 3, VENC_BITRATE = 4, VENC_TOUCH = 5, VDEC_CONFIG = 6, VDEC_CAPTURE = 7, VDEC_PACKET = 8, VDEC_RESULT = 9 }; @@ -45,7 +41,6 @@ struct venc_bitrate { uint32_t bitrate; }; -/* Remote Play's touch-as-mouse turned back into a touch; x and y are fractions of the screen in 1/65535. */ struct venc_touch { uint32_t type; uint32_t action; diff --git a/app/src/main/cpp/venc/venc_server.cpp b/app/src/main/cpp/venc/venc_server.cpp index 17a5d7eed1..fd3a9ad133 100644 --- a/app/src/main/cpp/venc/venc_server.cpp +++ b/app/src/main/cpp/venc/venc_server.cpp @@ -33,8 +33,8 @@ struct Mapping { constexpr int32_t kColorFormatYuv420SemiPlanar = 21; constexpr uint32_t kBufferFlagKeyFrame = 1; constexpr uint32_t kBufferFlagCodecConfig = 2; -constexpr int kTouchWidth = 1920, kTouchHeight = 1080; // InputSpace.kt -constexpr int kRemoteTouchId = 31; // the compositor's last touch slot (MAX_TOUCH_POINTS 32) +constexpr int kTouchWidth = 1920, kTouchHeight = 1080; +constexpr int kRemoteTouchId = 31; int32_t avc_profile(int32_t v4l2) { switch (v4l2) { @@ -549,7 +549,7 @@ void serve(int listener) { } } -} // namespace +} extern "C" JNIEXPORT jboolean JNICALL Java_com_droiddeck_launcher_session_VideoEncodeBridge_nativeStart(JNIEnv *env, jobject, jstring jpath) { diff --git a/app/src/main/cpp/viture/display_modes.h b/app/src/main/cpp/viture/display_modes.h index 3a78e03aee..b6b2288e21 100644 --- a/app/src/main/cpp/viture/display_modes.h +++ b/app/src/main/cpp/viture/display_modes.h @@ -1,20 +1,18 @@ #pragma once -// Our controller uses the standard display-mode vocabulary, even for Beast. -// Native mode reuses some numbers with different meanings; never pass them through. namespace droiddeck::viture { constexpr int to_native_mode(int standard) { switch (standard) { - case 0x31: return 0x31; // 1080p 60 - case 0x33: return 0x32; // 1080p 90 - case 0x34: return 0x33; // 1080p 120 - case 0x32: return 0x37; // 1080p SBS 60 - case 0x35: return 0x38; // 1080p SBS 90 - case 0x41: return 0x34; // 1200p 60 - case 0x43: return 0x35; // 1200p 90 - case 0x44: return 0x36; // 1200p 120 - case 0x42: return 0x3a; // 1200p SBS 60 - case 0x45: return 0x3b; // 1200p SBS 90 + case 0x31: return 0x31; + case 0x33: return 0x32; + case 0x34: return 0x33; + case 0x32: return 0x37; + case 0x35: return 0x38; + case 0x41: return 0x34; + case 0x43: return 0x35; + case 0x44: return 0x36; + case 0x42: return 0x3a; + case 0x45: return 0x3b; default: return -4; } } @@ -30,7 +28,7 @@ constexpr int from_native_mode(int native) { case 0x36: return 0x44; case 0x3a: return 0x42; case 0x3b: return 0x45; - default: return -4; // Ultrawide is not stereo. + default: return -4; } } } diff --git a/app/src/main/cpp/viture/mjpeg_payload.h b/app/src/main/cpp/viture/mjpeg_payload.h index a451a4eeea..470ecf550f 100644 --- a/app/src/main/cpp/viture/mjpeg_payload.h +++ b/app/src/main/cpp/viture/mjpeg_payload.h @@ -5,7 +5,6 @@ inline std::size_t mjpeg_payload_size(const uint8_t* bytes, std::size_t size) { if (!bytes || size < 4 || size > 4*1024*1024 || bytes[0] != 0xff || bytes[1] != 0xd8) return 0; std::size_t end = size; - // Luma Ultra UVC frames can pad the JPEG to an eight-byte boundary with zeros. while (end > 4 && size-end < 7 && bytes[end-1] == 0) --end; return bytes[end-2] == 0xff && bytes[end-1] == 0xd9 ? end : 0; } diff --git a/app/src/main/cpp/viture/sdk_bridge.cpp b/app/src/main/cpp/viture/sdk_bridge.cpp index 053c283358..04ee47a359 100644 --- a/app/src/main/cpp/viture/sdk_bridge.cpp +++ b/app/src/main/cpp/viture/sdk_bridge.cpp @@ -30,7 +30,6 @@ #include "stereo_frame_gate.h" namespace { -// SDK callbacks have no user-data parameter. Only one provider may exist at a time. std::mutex api_mutex; std::mutex pose_mutex; std::array latest_pose{}; @@ -64,7 +63,6 @@ void on_pose(float* data, uint64_t) { std::lock_guard lock(pose_mutex); if (!accepting_pose) return; std::copy_n(data + 3, 4, latest_pose.begin()); - // SDK device ticks are not Android's elapsed-realtime clock. latest_time = now_ns(); } @@ -234,8 +232,6 @@ int set_display(Session& s, int standard) { if (mode == 0) { int rc = xr_device_provider_set_display_mode(s.device, standard); if (rc != VITURE_GLASSES_ERROR_NOT_SUPPORTED) return rc; - // Older Beast firmware exposes fewer bypass modes. Fall back to its - // separate native table only when the SDK explicitly rejects the mode. } const int native = droiddeck::viture::to_native_mode(standard); if (native < 0) return native; diff --git a/app/src/main/cpp/waylandcomp/CMakeLists.txt b/app/src/main/cpp/waylandcomp/CMakeLists.txt index a4de38ca14..fd0b2f20a9 100644 --- a/app/src/main/cpp/waylandcomp/CMakeLists.txt +++ b/app/src/main/cpp/waylandcomp/CMakeLists.txt @@ -18,6 +18,7 @@ add_library(droiddeckwayland SHARED src/wl_color_mgmt.c src/hdr_compose.c src/blend_pass.c + src/gpu_busy.c generated/color-management-v1-protocol.c generated/xdg-shell-protocol.c generated/linux-dmabuf-v1-protocol.c @@ -43,6 +44,7 @@ target_include_directories(droiddeckwayland PRIVATE prebuilt/include src ${CMAKE_CURRENT_SOURCE_DIR}/../shaders + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../tools/gpuload/src ) set(DROIDDECK_FRAMEGEN_LSFG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../framegen/lsfg) diff --git a/app/src/main/cpp/waylandcomp/src/cardboard.c b/app/src/main/cpp/waylandcomp/src/cardboard.c index fc09d2f030..982c3bc47c 100644 --- a/app/src/main/cpp/waylandcomp/src/cardboard.c +++ b/app/src/main/cpp/waylandcomp/src/cardboard.c @@ -34,7 +34,6 @@ void cardboard_clamp(struct cardboard_params *p) { p->screen_width_m = clampf(p->screen_width_m, 0.2f, 60.0f); p->k1 = clampf(p->k1, -1.0f, 2.0f); p->k2 = clampf(p->k2, -1.0f, 2.0f); - // Optical vertical FOV on supported glasses can be as low as ~22 degrees. p->fov_deg = clampf(p->fov_deg, 20.0f, 140.0f); p->lens_inset = clampf(p->lens_inset, -0.25f, 0.25f); p->chroma = clampf(p->chroma, 0.0f, 0.05f); @@ -186,6 +185,13 @@ int vkp_cardboard_active(void) { return on; } +int vkp_cardboard_source(void) { + pthread_mutex_lock(&g_lock); + const int source = g_set.enabled ? g_set.source : CARDBOARD_SOURCE_SCREEN; + pthread_mutex_unlock(&g_lock); + return source; +} + int vkp_cardboard_pose_changed(void) { if (!g_changed) return 0; g_changed = 0; diff --git a/app/src/main/cpp/waylandcomp/src/cardboard.h b/app/src/main/cpp/waylandcomp/src/cardboard.h index 88d5ea3ff7..2950faec2f 100644 --- a/app/src/main/cpp/waylandcomp/src/cardboard.h +++ b/app/src/main/cpp/waylandcomp/src/cardboard.h @@ -27,6 +27,7 @@ void vkp_cardboard_set_render_height(int height); void vkp_cardboard_bind_device(VkDevice dev, const VkPhysicalDeviceMemoryProperties *memprops); int vkp_cardboard_active(void); +int vkp_cardboard_source(void); int vkp_cardboard_pose_changed(void); void vkp_cardboard_begin_frame(void); VkImage vkp_cardboard_run(VkCommandBuffer cmd, VkImage src, int src_w, int src_h, int out_w, int out_h); diff --git a/app/src/main/cpp/waylandcomp/src/cardboard_frag.h b/app/src/main/cpp/waylandcomp/src/cardboard_frag.h index f74676d6a9..fb098c4a37 100644 --- a/app/src/main/cpp/waylandcomp/src/cardboard_frag.h +++ b/app/src/main/cpp/waylandcomp/src/cardboard_frag.h @@ -1,4 +1,3 @@ - // 1115.1.0 #pragma once const uint32_t cardboard_frag_code[] = { 0x07230203,0x00010000,0x0008000b,0x000001ba,0x00000000,0x00020011,0x00000001,0x0006000b, diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index e354eb0d67..471748a6d0 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -289,7 +289,6 @@ 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; @@ -446,6 +445,12 @@ static int g_cursor_w, g_cursor_h; static int g_cursor_hidden = 1; static int g_cursor_serial; +#define CURSOR_MAX_DRAWS 2 +static struct vkp_image *g_cursor_img; +static int g_cursor_img_w, g_cursor_img_h, g_cursor_img_serial = -1; +static atomic_int g_cursor_composite; +static atomic_int g_cursor_composite_want; + static void cursor_publish_shown(void) { pthread_mutex_lock(&g_cursor_lock); if (g_cursor_w > 0) { g_cursor_hidden = 0; g_cursor_serial++; } @@ -1736,6 +1741,8 @@ static void bind_output(struct wl_client *c, void *data, uint32_t ver, uint32_t struct draw_list { struct vkp_draw *d; int n, cap; }; +static int add_cursor(struct draw_list *dl, int scene_w); + static struct vkp_image *surface_image(struct surface *s) { if (!s->has_content) return NULL; if (s->shm_img) return s->shm_img; @@ -1909,7 +1916,7 @@ static int hdr_plan(const struct draw_list *dl, int w, int h, int fx_on, int fra } if (un && g_zero_copy) { hs->color = droiddeck_color_of(un->resource); hs->who = un; return 3; } hs->hf.tonemap = !droiddeck_color_output(); - if (dl->n <= 0 || !(hs->is_hdr = calloc((size_t)dl->n, 1))) return 0; + if (dl->n <= 0 || !(hs->is_hdr = calloc((size_t)dl->n + CURSOR_MAX_DRAWS, 1))) return 0; for (int i = 0; i < dl->n; i++) { struct surface *s = surface_for_image(dl->d[i].img); if (!is_hdr_surface(s)) continue; @@ -2011,12 +2018,6 @@ static void hdr_count_copied(const struct draw_list *dl, const char *reason) { } } -/* - * Stream mode (the Xbox Cloud Gaming native player, in its own process): no Wayland clients, the scene is one - * picture handed over as AHardwareBuffers (ImageReader images of the decoded video). Each buffer is imported once - * and kept while the reader cycles through its few buffers; the newest frame is the scene, so the screen effects - * and frame generation apply to it as to a game. - */ #define STREAM_SLOTS 6 static pthread_mutex_t g_stream_lock = PTHREAD_MUTEX_INITIALIZER; static atomic_int g_stream_on; @@ -2036,7 +2037,6 @@ static void stream_forget_all(void) { g_stream_img = NULL; } -/* Compositor thread: the newest handed-over buffer becomes the scene picture. */ static void stream_take(void) { pthread_mutex_lock(&g_stream_lock); AHardwareBuffer *ahb = g_stream_pending; @@ -2050,7 +2050,7 @@ static void stream_take(void) { if (g_stream_slots[i].used < g_stream_slots[oldest].used) oldest = i; } if (slot >= 0) { - AHardwareBuffer_release(ahb); /* the slot keeps its own reference */ + AHardwareBuffer_release(ahb); } else { struct vkp_image *img = vkp_image_from_ahb(ahb); if (!img) { @@ -2062,7 +2062,7 @@ static void stream_take(void) { droiddeck_log("stream", "decoded frame buffer imported (%dx%d)", vkp_image_width(img), vkp_image_height(img)); slot = oldest; if (g_stream_slots[slot].img) { - vkp_wait_idle(); /* the GPU may still read the picture being replaced */ + vkp_wait_idle(); if (g_stream_img == g_stream_slots[slot].img) g_stream_img = NULL; vkp_image_destroy(g_stream_slots[slot].img); } @@ -2108,7 +2108,6 @@ void droiddeck_stream_set(int on) { (void)n; } -/* Any thread: hands over one decoded frame (acquires its own reference). */ void droiddeck_stream_frame(AHardwareBuffer *ahb) { if (!ahb || !atomic_load(&g_stream_on) || g_input_pipe[1] < 0) return; AHardwareBuffer_acquire(ahb); @@ -2116,7 +2115,7 @@ void droiddeck_stream_frame(AHardwareBuffer *ahb) { AHardwareBuffer *dropped = g_stream_pending; g_stream_pending = ahb; pthread_mutex_unlock(&g_stream_lock); - if (dropped) { AHardwareBuffer_release(dropped); return; } /* a wake-up is already queued */ + if (dropped) { AHardwareBuffer_release(dropped); return; } struct input_msg m = { 20, 0, 0, 0, 0 }; ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); (void)n; @@ -2124,7 +2123,21 @@ void droiddeck_stream_frame(AHardwareBuffer *ahb) { unsigned droiddeck_stream_frames(void) { return atomic_load(&g_stream_frames); } +static int64_t g_scene_due_ns; + +static int scene_held_for_limit(int64_t now, int64_t due, int limit, int unpaced) { + if (limit <= 0 || unpaced || due <= 0) return 0; + return now < due - 1000000LL; +} + +static int64_t scene_next_due(int64_t now, int64_t due, int limit) { + if (limit <= 0) return 0; + const int64_t interval = 1000000000LL / limit; + return due > 0 && now - due < interval ? due + interval : now + interval; +} + static void render_scene(void) { + g_scene_due_ns = scene_next_due(now_ns(), g_scene_due_ns, g_fps_limit); if (atomic_load(&g_stream_on)) { g_dirty_since_ns = 0; render_stream(); return; } struct draw_list dl = {0}; struct surface *s; @@ -2171,6 +2184,28 @@ static void render_scene(void) { hdr_note_precedence(hdr_route == 3 ? hs.who : NULL, fx_on, framegen); } if (hdr_route == 3) { fx_on = 0; framegen = 0; } + struct surface *ahb_only = ahb_layer_only_candidate(w, h); + struct surface *layer_only = ahb_only ? ahb_only : hdr_unimported_fullscreen(&dl, w, h); + const int cursor_on = hdr_route == 3 || layer_only ? 0 : add_cursor(&dl, w); + static int cursor_layer_said; + if (layer_only && atomic_load(&g_cursor_composite) && !cursor_layer_said) { + cursor_layer_said = 1; + droiddeck_log("cursor", "the pointer stays out of the picture: the game's frames cannot be imported, " + "so the game is shown on its own display layer"); + } else if (!layer_only) { + cursor_layer_said = 0; + } + static int cursor_hdr_said; + if (cursor_on && hdr_route == 0 && hs.n_hdr > 0 && !cardboard) { + hdr_route = 2; + if (!cursor_hdr_said) { + cursor_hdr_said = 1; + droiddeck_log("cursor", "the pointer needs a composed scene: the HDR picture goes through the screen " + "swapchain instead of the game's own display layer"); + } + } else { + cursor_hdr_said = 0; + } if (hdr_route == 1) { static int fell_back; vkp_apply_window_request(); @@ -2196,21 +2231,19 @@ static void render_scene(void) { else if (rendered && how == 2) droiddeck_color_frame_shown(hs.color, DROIDDECK_HDR_TONEMAPPED, 0); else if (rendered) hdr_copy = "the HDR composition pass is unavailable on this driver"; } - if (hdr_route == 0 && vkp_quest_layer_presentation() && !framegen && !cardboard && - !ahb_layer_only_candidate(w, h)) { - /* The complete SDR scene stays on one display layer. Do not hide/re-show GAME - * on each desktop frame just because it is not a single fullscreen window. */ + if (hdr_route == 0 && vkp_quest_layer_presentation() && !framegen && !cardboard && !cursor_on && + !ahb_only) { rendered = vkp_render(w, h, dl.d, dl.n) == 0; } else if (hdr_route == 0 || hdr_route == 3) { const int pass_on = fx_on || framegen; - int li = (g_zero_copy && !framegen && !cardboard) ? layer_candidate(&dl, w, h) : -1; + int li = (g_zero_copy && !framegen && !cardboard && !cursor_on) ? layer_candidate(&dl, w, h) : -1; int over = li >= 0 ? dl.n - 1 - li : 0; const int fx_blocks = (li >= 0 && fx_on && over > 0); if (fx_blocks) { li = -1; over = 0; } const int ov_blocks = (li >= 0 && over > 0 && !fx_blocks && !sc_layer_overlay_affordable()); if (ov_blocks) { li = -1; over = 0; } const int blocked = framegen ? 1 : (fx_blocks ? 2 : (ov_blocks ? 3 : 0)); - if (g_zero_copy && blocked != g_zero_copy_paused) { + if (g_zero_copy && !cursor_on && blocked != g_zero_copy_paused) { g_zero_copy_paused = blocked; if (blocked == 1) droiddeck_log("framegen", "zero-copy paused: frame generation needs the compositor pass"); @@ -2223,9 +2256,9 @@ static void render_scene(void) { droiddeck_log("effects", "zero-copy resumed: the game is back on its own display layer"); } struct surface *ls = li >= 0 ? surface_for_image(dl.d[li].img) : NULL; - if (li < 0) ls = ahb_layer_only_candidate(w, h); - if (li < 0 && !ls) ls = hdr_unimported_fullscreen(&dl, w, h); + if (li < 0) ls = layer_only; if (cardboard) ls = NULL; + if (cursor_on) ls = NULL; if (ls && pass_on && li < 0 && !g_zero_copy_fx_skip_said) { g_zero_copy_fx_skip_said = 1; droiddeck_log(framegen ? "framegen" : "effects", @@ -2302,12 +2335,12 @@ static void render_scene(void) { static int on_fallback_timer(void *data) { g_fallback_armed = 0; - if (g_dirty) render_scene(); + if (!g_dirty) return 0; + if (scene_held_for_limit(now_ns(), g_scene_due_ns, g_fps_limit, g_release_unpaced)) schedule_render(); + else render_scene(); return 0; } -/* A new frame is drawn when it arrives instead of at the next screen tick, at most once per refresh, - while frames go straight back to the game (no compositor limit), without streaming or frame generation. */ static int commit_renders_on(void) { return g_render_on_commit && g_release_unpaced && !atomic_load(&g_stream_on) && !vkp_framegen_active(); } @@ -2366,10 +2399,6 @@ static void on_vsync(int64_t frame_time_ns) { if (vkp_effects_sync()) tick_change = 1; if (vkp_cardboard_pose_changed()) tick_change = 1; if (tick_change) g_dirty = 1; - /* A frame that arrived after this refresh was already drawn is left for the next arrival to draw; - drawing it here would block that arrival too and keep every frame waiting for the tick. A client - that draws again only after its frame callback sends no such arrival: once a held frame is still - waiting at the next tick, the tick draws every frame for a second before holding one again. */ if (g_tick_held && g_dirty) g_hold_missed_ns = now; g_tick_held = 0; if (!tick_change && commit_renders_on() && g_dirty_since_ns && now - g_dirty_since_ns < g_refresh_ns && @@ -2377,6 +2406,7 @@ static void on_vsync(int64_t frame_time_ns) { g_tick_held = 1; return; } + if (g_dirty && scene_held_for_limit(now, g_scene_due_ns, g_fps_limit, g_release_unpaced)) return; if (g_dirty && !scene_waits_for_game(now)) render_scene(); } @@ -2392,6 +2422,7 @@ static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint3 if (g_cursor_surface) g_cursor_surface->role = ROLE_NONE; g_cursor_surface = NULL; cursor_publish_hidden(); + if (atomic_load(&g_cursor_composite)) schedule_render(); return; } struct surface *s = wl_resource_get_user_data(surface); @@ -2399,8 +2430,10 @@ static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint3 if (s->role != ROLE_NONE && s->role != ROLE_CURSOR) return; s->role = ROLE_CURSOR; g_cursor_surface = s; + pthread_mutex_lock(&g_cursor_lock); g_cursor_hx = hx; g_cursor_hy = hy; + pthread_mutex_unlock(&g_cursor_lock); struct wl_resource *buffer = surface_take_idle(s); if (buffer) { cursor_publish_buffer(s, buffer); @@ -2411,6 +2444,7 @@ static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint3 cursor_publish_pixels((const uint8_t *)s->idle_px, s->idle_w, s->idle_h, (size_t)s->idle_w * 4, hx, hy); g_cursor_shown = s; } + if (atomic_load(&g_cursor_composite)) schedule_render(); } static void pointer_release(struct wl_client *c, struct wl_resource *r) { wl_resource_destroy(r); } static const struct wl_pointer_interface pointer_impl = { @@ -2592,6 +2626,97 @@ static int g_ptr_known; static double g_raw_x, g_raw_y; static int g_raw_valid; +static int pointer_locked_for_cursor(void) { + return g_active_constraint && g_active_constraint->is_lock; +} + +static int cursor_scene_positions(int scene_w, int source, int ptr_x, int hx, int out[2]) { + out[0] = ptr_x - hx; out[1] = -1; + if (source != CARDBOARD_SOURCE_SBS || scene_w <= 1) return 1; + const int half = scene_w / 2; + out[1] = (ptr_x < half ? ptr_x + half : ptr_x - half) - hx; + return 2; +} + +static int cursor_clip_to_eye(int scene_w, int eye, int x0, int w, int *dx, int *sx, int *dw) { + int left = x0, right = x0 + w; + if (eye >= 0 && scene_w > 1) { + const int half = scene_w / 2; + const int band = eye ? half : 0; + if (left < band) left = band; + if (right > band + half) right = band + half; + } + if (right <= left) return 0; + *dx = left; + *sx = left - x0; + *dw = right - left; + return 1; +} + +static int add_cursor(struct draw_list *dl, int scene_w) { + if (!atomic_load(&g_cursor_composite) || !g_ptr_known || pointer_locked_for_cursor()) return 0; + + int hidden, w, h, hx, hy, serial; + uint32_t *copy = NULL; + pthread_mutex_lock(&g_cursor_lock); + hidden = g_cursor_hidden; + w = g_cursor_w; h = g_cursor_h; + hx = g_cursor_hx; hy = g_cursor_hy; + serial = g_cursor_serial; + if (!hidden && w > 0 && h > 0 && serial != g_cursor_img_serial) { + copy = malloc((size_t)w * (size_t)h * 4); + if (copy) memcpy(copy, g_cursor_px, (size_t)w * (size_t)h * 4); + } + pthread_mutex_unlock(&g_cursor_lock); + if (hidden || w <= 0 || h <= 0) return 0; + + if (copy) { + if (g_cursor_img && (g_cursor_img_w != w || g_cursor_img_h != h)) { + vkp_wait_idle(); + vkp_image_destroy(g_cursor_img); + g_cursor_img = NULL; + } + if (!g_cursor_img) g_cursor_img = vkp_image_create_shm(w, h); + if (g_cursor_img) { + g_cursor_img_w = w; g_cursor_img_h = h; + vkp_image_upload_shm(g_cursor_img, copy, w * 4); + g_cursor_img_serial = serial; + } + free(copy); + } + if (!g_cursor_img || g_cursor_img_serial != serial) return 0; + + int xs[CURSOR_MAX_DRAWS]; + const int source = vkp_cardboard_source(); + const int ptr_x = (int)(g_ptr_x + 0.5); + const int count = cursor_scene_positions(scene_w, source, ptr_x, hx, xs); + static int said_w = -1, said_source = -1, said_count = -1; + if (scene_w != said_w || source != said_source || count != said_count) { + said_w = scene_w; said_source = source; said_count = count; + droiddeck_log("cursor", "pointer drawn %d time(s) in a %d wide scene (%s picture)", count, scene_w, + source == CARDBOARD_SOURCE_SBS ? "side-by-side" : "single"); + } + if (dl->n + count > dl->cap) { + int cap = dl->cap ? dl->cap : 32; + while (cap < dl->n + count) cap *= 2; + struct vkp_draw *d = realloc(dl->d, (size_t)cap * sizeof(*d)); + if (!d) return 0; + dl->d = d; dl->cap = cap; + } + const int sbs = source == CARDBOARD_SOURCE_SBS && scene_w > 1; + const int pointer_eye = ptr_x < scene_w / 2 ? 0 : 1; + int appended = 0; + for (int i = 0; i < count; i++) { + int dx, sx, cw; + const int eye = sbs ? (i ? 1 - pointer_eye : pointer_eye) : -1; + if (!cursor_clip_to_eye(scene_w, eye, xs[i], w, &dx, &sx, &cw)) continue; + dl->d[dl->n++] = (struct vkp_draw){g_cursor_img, (float)sx, 0, (float)cw, (float)h, + dx, (int)(g_ptr_y + 0.5) - hy, cw, h, 1}; + appended++; + } + return appended ? 1 : 0; +} + extern void droiddeck_on_pointer_lock(int locked, int x, int y); static void sync_lock_notify(void) { @@ -2600,6 +2725,7 @@ static void sync_lock_notify(void) { if (locked == last) return; last = locked; droiddeck_on_pointer_lock(locked, (int)g_ptr_x, (int)g_ptr_y); + if (atomic_load(&g_cursor_composite)) schedule_render(); } static void constraint_describe(const struct constraint *k, char *out, size_t size) { @@ -2679,7 +2805,10 @@ static void constraint_activate(struct constraint *k) { constraint_end(g_active_constraint, 1, "replaced by a newer request"); k->active = 1; g_active_constraint = k; + const double was_x = g_ptr_x, was_y = g_ptr_y; if (!k->is_lock) confine_clamp(k, &g_ptr_x, &g_ptr_y); + if ((g_ptr_x != was_x || g_ptr_y != was_y) && atomic_load(&g_cursor_composite)) + schedule_render(); constraint_origin(k, &ox, &oy); pointer_focus(k->surface->resource, wl_fixed_from_double(g_ptr_x - ox), wl_fixed_from_double(g_ptr_y - oy)); int focused = 0; @@ -2738,6 +2867,7 @@ static void constraints_pointer_gone(struct wl_resource *pointer) { static void constraints_surface_commit(struct surface *s) { struct constraint *k; + const double was_x = g_ptr_x, was_y = g_ptr_y; wl_list_for_each(k, &g_constraints, link) { if (k->surface != s) continue; if (k->pending_hint_set) { @@ -2761,6 +2891,8 @@ static void constraints_surface_commit(struct surface *s) { if (k->active && !k->is_lock) confine_clamp(k, &g_ptr_x, &g_ptr_y); } } + if ((g_ptr_x != was_x || g_ptr_y != was_y) && atomic_load(&g_cursor_composite)) + schedule_render(); } static void constraint_resource_destroy(struct wl_resource *r) { @@ -2946,6 +3078,7 @@ static void pointer_input(double x, double y, int relative, uint32_t button, int if (k) confine_clamp(k, &x, &y); g_ptr_x = x; g_ptr_y = y; g_ptr_known = 1; + if (atomic_load(&g_cursor_composite)) schedule_render(); if (k) { target = k->surface; } else if (g_desktop) { @@ -2968,10 +3101,6 @@ static void pointer_input(double x, double y, int relative, uint32_t button, int uint32_t t = now_ms(); pointer_focus(target->resource, fx, fy); - // A button-only input must not replay a cached absolute position. A game - // may have warped its cursor since the last motion (before taking lock, - // or while releasing it), so that replay can become an unintended pan. - // Absolute touch events still carry their position, including on clicks. int rel_consumed = send_relative_motion(client, dx, dy); if (!(k && k->is_lock) && !(relative && rel_consumed) && (!relative || dx != 0 || dy != 0)) for_each_pointer_of(client, sp) wl_pointer_send_motion(sp->ptr, t, fx, fy); @@ -3003,9 +3132,6 @@ static void pointer_button(uint32_t button, int pressed) { pointer_input(0, 0, 1, button, pressed); return; } - // Releases also clean up interrupted gestures. Deliver them to the existing - // pointer focus without motion or hit-testing: native touch has independent - // coordinates, so replaying g_ptr_x/y here can warp the game cursor. uint32_t t = now_ms(); for (int i = 0; i < g_nptrs; i++) { struct seat_pointer *sp = &g_ptrs[i]; @@ -3425,6 +3551,7 @@ static int on_input_readable(int fd, uint32_t mask, void *data) { case 12: axis_event(m.p1, m.p2, 1); break; case 20: stream_take(); break; case 21: if (!m.p1) stream_forget_all(); schedule_render(); break; + case 22: schedule_render(); break; default: deliver_pointer(&m); break; } } @@ -3499,6 +3626,17 @@ void droiddeck_wayland_send_scene_input(int type, int a, int b) { (void)n; } +void droiddeck_wayland_set_cursor_composite(int on) { + const int want = on ? 1 : 0; + if (atomic_exchange(&g_cursor_composite_want, want) == want) return; + atomic_store(&g_cursor_composite, want); + droiddeck_log("cursor", "compositing the pointer into the output: %s", on ? "on" : "off"); + if (g_input_pipe[1] < 0) return; + struct input_msg m = { 22, on ? 1 : 0, 0, 0, 0 }; + ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); + (void)n; +} + const char *droiddeck_client_name(struct wl_client *client) { return client_name(client); } struct wl_display *droiddeck_get_display(void) { return g_display; } @@ -3678,8 +3816,6 @@ int droiddeck_wayland_run(void) { open_session_log(); if (vkp_ready() != 0) WLOGE("renderer unavailable; clients will connect but nothing is drawn"); - /* Presentation compatibility is not HDR capability. Set the initial layer mode before - * clients bind, including when Desktop is the first session in this app process. */ if (vkp_quest_layer_presentation() && sc_layer_available()) g_zero_copy = 1; struct wl_display *display = wl_display_create(); diff --git a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c index 9de2824d78..eceb796398 100644 --- a/app/src/main/cpp/waylandcomp/src/framegen_bridge.c +++ b/app/src/main/cpp/waylandcomp/src/framegen_bridge.c @@ -374,16 +374,11 @@ int vkp_framegen_run(VkCommandBuffer cmd, VkImage scene, VkImageView scene_view, mark_failed(kind); return 0; } - /* The ring and the engine's images are new on this frame. Dispatching into them now - * null-dereferenced Turnip (vkp_framegen_run, first Steam frame, 2560x1440 to the panel). - * Show this frame as it is; generation starts once the size has settled. */ if (size_changed || ring == 2) { FGLOG("frame generation catches up at %dx%d; this frame is shown as it is", w, h); return 0; } - /* The pacer's source rate must be the game's, not this loop's: a loop slowed by its own - * generations would otherwise read as a slower game and justify even more generations. */ ++g_source_frames; const uint64_t game_frames = droiddeck_game_frames(); uint32_t n_gen = fge_plan(g_ring_n, game_frames ? game_frames : g_source_frames, g_presented_rate); diff --git a/app/src/main/cpp/waylandcomp/src/gpu_busy.c b/app/src/main/cpp/waylandcomp/src/gpu_busy.c new file mode 100644 index 0000000000..48d565c20a --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/gpu_busy.c @@ -0,0 +1,89 @@ +#include "gpu_busy.h" + +#include +#include +#include + +#include "gpuload_ring.h" + +static pthread_mutex_t g_lock = PTHREAD_MUTEX_INITIALIZER; +static struct gpuload_vk g_v; +static struct gpuload_ring g_ring; +static uint32_t g_family, g_bits; +static PFN_vkQueueSubmit g_submit; +static int g_was_on; +static _Atomic int g_on, g_lost, g_timing; +static _Atomic uint64_t g_busy_ns; + +static VkResult VKAPI_CALL timed_submit(VkQueue queue, uint32_t count, const VkSubmitInfo *infos, VkFence fence) { + if (!count || !atomic_load(&g_on) || atomic_load(&g_lost)) return g_submit(queue, count, infos, fence); + pthread_mutex_lock(&g_lock); + if (!atomic_load(&g_on) || atomic_load(&g_lost)) { + pthread_mutex_unlock(&g_lock); + return g_submit(queue, count, infos, fence); + } + if (g_ring.state == 0 && gpuload_ring_setup(&g_ring, &g_v, g_family, g_bits)) atomic_store(&g_timing, 1); + VkSubmitInfo *mine = NULL; + uint32_t used = 0; + if (g_ring.state == 1) { + uint64_t ns = gpuload_ring_harvest(&g_ring, &g_v); + if (g_was_on) atomic_fetch_add(&g_busy_ns, ns); // the first harvest after a pause holds work timed before it + g_was_on = 1; + mine = gpuload_ring_wrap(&g_ring, count, infos, &used); + } + VkResult r = g_submit(queue, count, mine ? mine : infos, fence); + if (mine && r != VK_SUCCESS) gpuload_ring_unwind(&g_ring, used); + pthread_mutex_unlock(&g_lock); + free(mine); + return r; +} + +void vkp_gpu_busy_device(VkPhysicalDevice pd, VkDevice dev, uint32_t family) { + pthread_mutex_lock(&g_lock); + memset(&g_ring, 0, sizeof(g_ring)); + g_was_on = 0; + atomic_store(&g_timing, 0); + atomic_store(&g_lost, 0); + PFN_vkGetDeviceProcAddr gdpa = g_vk.GetDeviceProcAddr; + g_v = (struct gpuload_vk){ + .device = dev, + .create_pool = g_vk.CreateCommandPool, + .destroy_pool = (PFN_vkDestroyCommandPool)gdpa(dev, "vkDestroyCommandPool"), + .alloc_cmds = g_vk.AllocateCommandBuffers, + .begin = g_vk.BeginCommandBuffer, + .end = g_vk.EndCommandBuffer, + .cmd_reset = (PFN_vkCmdResetQueryPool)gdpa(dev, "vkCmdResetQueryPool"), + .cmd_timestamp = (PFN_vkCmdWriteTimestamp)gdpa(dev, "vkCmdWriteTimestamp"), + .create_queries = (PFN_vkCreateQueryPool)gdpa(dev, "vkCreateQueryPool"), + .destroy_queries = (PFN_vkDestroyQueryPool)gdpa(dev, "vkDestroyQueryPool"), + .results = (PFN_vkGetQueryPoolResults)gdpa(dev, "vkGetQueryPoolResults"), + }; + VkPhysicalDeviceProperties props; + g_vk.GetPhysicalDeviceProperties(pd, &props); + gpuload_vk_period(&g_v, props.limits.timestampPeriod); + VkQueueFamilyProperties families[16]; + uint32_t n = 16; + g_vk.GetPhysicalDeviceQueueFamilyProperties(pd, &n, families); + g_family = family; + g_bits = family < n ? families[family].timestampValidBits : 0; + // vk_loader_load_device has just put the driver's function back. + if (g_vk.QueueSubmit != timed_submit) g_submit = g_vk.QueueSubmit; + if (g_submit) g_vk.QueueSubmit = timed_submit; + pthread_mutex_unlock(&g_lock); +} + +void vkp_gpu_busy_device_lost(void) { + atomic_store(&g_lost, 1); + atomic_store(&g_timing, 0); +} + +JNIEXPORT jlong JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeGpuBusyNs(JNIEnv *env, jclass cls) { + return atomic_load(&g_timing) ? (jlong)atomic_load(&g_busy_ns) : -1; +} + +JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetGpuTiming(JNIEnv *env, jclass cls, jboolean on) { + pthread_mutex_lock(&g_lock); + if (!on) g_was_on = 0; + atomic_store(&g_on, on ? 1 : 0); + pthread_mutex_unlock(&g_lock); +} diff --git a/app/src/main/cpp/waylandcomp/src/gpu_busy.h b/app/src/main/cpp/waylandcomp/src/gpu_busy.h new file mode 100644 index 0000000000..a477d52366 --- /dev/null +++ b/app/src/main/cpp/waylandcomp/src/gpu_busy.h @@ -0,0 +1,9 @@ +#ifndef GPU_BUSY_H +#define GPU_BUSY_H +#include "vk_loader.h" + +// Times the compositor's own GPU work for the HUD (tools/gpuload/src/gpuload_ring.h); call after the device and its +// functions are loaded. Off until WaylandCompositor.nativeSetGpuTiming(true). +void vkp_gpu_busy_device(VkPhysicalDevice pd, VkDevice dev, uint32_t family); +void vkp_gpu_busy_device_lost(void); +#endif diff --git a/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c index 0f8e1f61bf..8ce2269223 100644 --- a/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c +++ b/app/src/main/cpp/waylandcomp/src/gpu_clock_pin.c @@ -103,7 +103,6 @@ static bool prepare_pin(void) { (off_t)pin.memory << 12); if (commands == MAP_FAILED) return false; pin.commands = commands; - // A3xx/A4xx use type-3 CP_NOP; newer cores use type-7 with zero odd-parity bits. uint32_t *words = commands; words[0] = pin.nop; words[1] = 0; @@ -124,7 +123,6 @@ static void *hold_pin(void *unused) { if (errno == EINTR || errno == ETIMEDOUT) continue; break; } - // Constraints expire after idle_timer (normally 80 ms); renew with a NOP, keeping devfreq alive. usleep(25000); if (atomic_load(&running) && !submit_pin()) break; } diff --git a/app/src/main/cpp/waylandcomp/src/headpose_shm.h b/app/src/main/cpp/waylandcomp/src/headpose_shm.h index 824232b431..22088dc6b3 100644 --- a/app/src/main/cpp/waylandcomp/src/headpose_shm.h +++ b/app/src/main/cpp/waylandcomp/src/headpose_shm.h @@ -24,7 +24,6 @@ struct droiddeck_headpose { float eye_aspect; uint32_t eye_w, eye_h; float display_hz; - // Uses a formerly reserved word; older publishers leave this zero. uint32_t render_height; uint32_t reserved[10]; }; diff --git a/app/src/main/cpp/waylandcomp/src/hudframes.c b/app/src/main/cpp/waylandcomp/src/hudframes.c index 5a6fc4e99b..ffbb657a58 100644 --- a/app/src/main/cpp/waylandcomp/src/hudframes.c +++ b/app/src/main/cpp/waylandcomp/src/hudframes.c @@ -8,7 +8,6 @@ #include "hudframes.h" -/* Layout written by gamescope patch 0125 (tools/gamescope/patches). */ #define HUD_FRAMES_MAGIC 0x46484444u #define HUD_FRAMES_HEADER 128u #define HUD_FRAMES_ENTRY 16u @@ -69,7 +68,6 @@ int hud_frames_poll(struct hud_frames *h, int64_t *frametimes, int64_t *times, i memcpy(&frametimes[n], e, 8); memcpy(×[n], e + 8, 8); } - /* The writer may have lapped the ring while we copied: drop what it overwrote. */ uint64_t after = load64(h->map + 16); uint64_t valid = after > cap ? after - cap : 0; if (from < valid) { diff --git a/app/src/main/cpp/waylandcomp/src/hudframes.h b/app/src/main/cpp/waylandcomp/src/hudframes.h index d0b1ff5bd1..518f7be52d 100644 --- a/app/src/main/cpp/waylandcomp/src/hudframes.h +++ b/app/src/main/cpp/waylandcomp/src/hudframes.h @@ -8,9 +8,7 @@ struct hud_frames; struct hud_frames *hud_frames_open(const char *path); void hud_frames_close(struct hud_frames *h); -/* New frames since the last poll, oldest first; -1 while the file holds no valid ring. */ int hud_frames_poll(struct hud_frames *h, int64_t *frametimes, int64_t *times, int max); -/* info: pid, output width, output height, refresh mHz, Steam focused. */ int hud_frames_info(const struct hud_frames *h, int32_t *info, char *engine, size_t engine_len); #endif diff --git a/app/src/main/cpp/waylandcomp/src/quest_device.h b/app/src/main/cpp/waylandcomp/src/quest_device.h index ee9c37b10a..bcdcee239d 100644 --- a/app/src/main/cpp/waylandcomp/src/quest_device.h +++ b/app/src/main/cpp/waylandcomp/src/quest_device.h @@ -3,7 +3,6 @@ #include #include -/* Presentation only; this does not select a GPU driver or expand driver support. */ static inline int quest_device_matches(const char *model, const char *device, const char *maker) { return !strcasecmp(model, "Quest 2") || !strcasecmp(model, "Quest 3") || !strcasecmp(model, "Quest 3S") || diff --git a/app/src/main/cpp/waylandcomp/src/sc_layer.c b/app/src/main/cpp/waylandcomp/src/sc_layer.c index f9d203ba1d..c760d91c22 100644 --- a/app/src/main/cpp/waylandcomp/src/sc_layer.c +++ b/app/src/main/cpp/waylandcomp/src/sc_layer.c @@ -291,7 +291,7 @@ int sc_layer_base_black(int width, int height) { ARect src = {0, 0, 16, 16}, dst = {0, 0, width, height}; api.setBuffer(tx, g_base_sc, black, -1); api.setBufferTransparency(tx, g_base_sc, ASC_TRANSPARENCY_OPAQUE); - api.setZOrder(tx, g_base_sc, 0); /* GAME = 1, OVERLAY = 2 */ + api.setZOrder(tx, g_base_sc, 0); api.setGeometry(tx, g_base_sc, &src, &dst, 0); api.setVisibility(tx, g_base_sc, ASC_VISIBILITY_SHOW); api.txApply(tx); api.txDelete(tx); @@ -381,6 +381,26 @@ static int sniff_modifier(const struct droiddeck_native_handle *h, uint64_t *mod return 1; } +#define SC_MOD_GRALLOC (~0ULL - 1) + +static const char *pool_kind(uint64_t mod) { + return mod == MOD_QCOM_COMPRESSED ? "UBWC" : mod == SC_MOD_GRALLOC ? "gralloc-laid-out" : "linear"; +} + +static void describe_handle(const struct droiddeck_native_handle *h, char *out, size_t n) { + size_t o = 0; + out[0] = 0; + if (!h) { snprintf(out, n, "no handle"); return; } + for (int i = 0; i < h->numFds && i < 4 && o < n; i++) { + off_t sz = lseek(h->data[i], 0, SEEK_END); + if (sz >= 0) lseek(h->data[i], 0, SEEK_SET); + o += (size_t)snprintf(out + o, n - o, "%sfd%d %lld bytes", i ? ", " : "", i, (long long)sz); + } + if (o < n) o += (size_t)snprintf(out + o, n - o, "; ints"); + for (int i = 0; i < h->numInts && i < 8 && o < n; i++) + o += (size_t)snprintf(out + o, n - o, " %#x", (unsigned)h->data[h->numFds + i]); +} + static int g_alloc_failed; enum { TIER_UBWC, TIER_PLAIN, TIER_LINEAR }; @@ -416,22 +436,54 @@ static int alloc_slot(struct layer *l, struct slot *s, int w, int h, uint32_t fm AHardwareBuffer_Desc got; AHardwareBuffer_describe(ahb, &got); const struct droiddeck_native_handle *nh = api.getNativeHandle(ahb); uint64_t mod = MOD_LINEAR; - if (!sniff_modifier(nh, &mod)) { - if (tier < TIER_LINEAR) { + struct vkp_image *img = NULL; + const char *path; + char info[160] = ""; + if (sniff_modifier(nh, &mod)) { + img = vkp_image_import_dmabuf(nh->data[0], fmt == AHB_RGB10A2 ? DRM_ABGR2101010 : DRM_ABGR8888, mod, w, h, + got.stride * 4, 0, 1); + path = "dma-buf (QTI handle)"; + } else { + if (tier == TIER_UBWC) { + char hd[256]; + describe_handle(nh, hd, sizeof(hd)); + droiddeck_log("layer", "%s: gralloc handle is not a QTI one (%d fds, %d ints: %s): no UBWC request; " + "pool buffers are imported %s", l->name, nh ? nh->numFds : -1, nh ? nh->numInts : -1, hd, + vkp_can_import_ahb() ? "as AHardwareBuffers (the driver takes gralloc's own layout)" + : "as linear dma-bufs (this driver has no AHardwareBuffer import)"); AHardwareBuffer_release(ahb); - l->alloc_tier = TIER_LINEAR; - droiddeck_log("layer", "%s: gralloc handle layout unknown (%d fds, %d ints): using linear pool buffers", - l->name, nh ? nh->numFds : -1, nh ? nh->numInts : -1); + l->alloc_tier = vkp_can_import_ahb() ? TIER_PLAIN : TIER_LINEAR; continue; } - mod = MOD_LINEAR; + mod = SC_MOD_GRALLOC; + path = "AHardwareBuffer"; + img = vkp_image_import_ahb(ahb, info, sizeof(info)); + if (!img && tier == TIER_LINEAR) { + const off_t need = (off_t)got.stride * 4 * h; + int fd = -1, which = -1; + for (int i = 0; nh && i < nh->numFds; i++) { + off_t sz = lseek(nh->data[i], 0, SEEK_END); + if (sz >= 0) lseek(nh->data[i], 0, SEEK_SET); + if (sz >= need) { fd = nh->data[i]; which = i; break; } + } + if (fd < 0 && nh && nh->numFds > 0) { fd = nh->data[0]; which = 0; } + mod = MOD_LINEAR; + path = "linear dma-buf"; + img = fd >= 0 ? vkp_image_import_dmabuf(fd, fmt == AHB_RGB10A2 ? DRM_ABGR2101010 : DRM_ABGR8888, mod, + w, h, got.stride * 4, 0, 1) : NULL; + snprintf(info, sizeof(info), "handle fd %d of %d", which, nh ? nh->numFds : 0); + if (vkp_can_import_ahb()) + droiddeck_log("layer", "%s: AHardwareBuffer import failed: the linear dma-buf in the handle's fd %d " + "(of %d) -> %s", l->name, which, nh ? nh->numFds : 0, img ? "imported" : "failed too"); + } } - int fd = (nh && nh->numFds > 0) ? nh->data[0] : -1; - struct vkp_image *img = fd >= 0 ? vkp_image_import_dmabuf(fd, fmt == AHB_RGB10A2 ? DRM_ABGR2101010 : DRM_ABGR8888, - mod, w, h, got.stride * 4, 0, 1) : NULL; if (!img) { - droiddeck_log("layer", "%s: import of a %s %dx%d pool buffer (stride %u px) into the compositor's Turnip failed", - l->name, mod == MOD_QCOM_COMPRESSED ? "UBWC" : "linear", w, h, got.stride); + char hd[256]; + describe_handle(nh, hd, sizeof(hd)); + droiddeck_log("layer", "%s: import of a %s %dx%d pool buffer (stride %u px, %s, usage %#llx) into the " + "compositor's Turnip failed via %s; gralloc handle %d fds / %d ints: %s", l->name, + pool_kind(mod), w, h, got.stride, tier_name(tier), (unsigned long long)got.usage, path, + nh ? nh->numFds : -1, nh ? nh->numInts : -1, hd); AHardwareBuffer_release(ahb); if (tier < TIER_LINEAR) { l->alloc_tier = tier + 1; continue; } g_alloc_failed = 1; @@ -442,10 +494,11 @@ static int alloc_slot(struct layer *l, struct slot *s, int w, int h, uint32_t fm if (l->logged_w != w || l->logged_h != h || l->logged_fmt != fmt || l->logged_mod != mod || l->logged_tier != tier) { l->logged_w = w; l->logged_h = h; l->logged_fmt = fmt; l->logged_mod = mod; l->logged_tier = tier; - droiddeck_log("layer", "%s: pool buffers %dx%d%s: %s (%s), stride %u px, up to %d buffers (gralloc handle %d fds / %d ints)", - l->name, w, h, fmt == AHB_RGB10A2 ? " 10-bit RGBA1010102" : "", - mod == MOD_QCOM_COMPRESSED ? "UBWC (QCOM_COMPRESSED)" : "linear", tier_name(tier), - got.stride, l->pool_n, nh ? nh->numFds : -1, nh ? nh->numInts : -1); + droiddeck_log("layer", "%s: pool buffers %dx%d%s: %s (%s), stride %u px, up to %d buffers (gralloc handle %d fds / " + "%d ints), imported as %s%s%s%s", l->name, w, h, fmt == AHB_RGB10A2 ? " 10-bit RGBA1010102" : "", + mod == MOD_QCOM_COMPRESSED ? "UBWC (QCOM_COMPRESSED)" : pool_kind(mod), tier_name(tier), + got.stride, l->pool_n, nh ? nh->numFds : -1, nh ? nh->numInts : -1, path, + info[0] ? " (" : "", info, info[0] ? ")" : ""); } return 0; } @@ -814,7 +867,7 @@ int sc_layer_present(struct vkp_image *src, int scene_w, int scene_h, const stru l->first_logged = 1; droiddeck_log("layer", "presenting %dx%d game frames on their own SurfaceControl layer (%s pool, %d buffers); " "HUD and pointer stay Android views above it", sw, sh, - l->pool_modifier == MOD_QCOM_COMPRESSED ? "UBWC" : "linear", l->pool_n); + pool_kind(l->pool_modifier), l->pool_n); } vkp_signal_first_frame(); return 0; @@ -836,7 +889,7 @@ int sc_layer_present_pass(const struct vkp_draw *draws, int n, int scene_w, int l->first_logged = 1; droiddeck_log("layer", "presenting %dx%d frames on their own SurfaceControl layer (%s pool, %d buffers); " "HUD and pointer stay Android views above it", rw, rh, - l->pool_modifier == MOD_QCOM_COMPRESSED ? "UBWC" : "linear", l->pool_n); + pool_kind(l->pool_modifier), l->pool_n); } vkp_signal_first_frame(); return 0; @@ -874,12 +927,12 @@ int sc_layer_present_hdr_scene(const struct vkp_draw *draws, int n, const struct if (tm) droiddeck_log("color", "tone-mapped picture on the game's display layer: %dx%d, %s 8-bit buffers, untagged " "(sRGB) - HDR output is switched off", rw, rh, - l->pool_modifier == MOD_QCOM_COMPRESSED ? "UBWC" : "linear"); + pool_kind(l->pool_modifier)); else { char cov[96]; coverage_text(l, cov, sizeof(cov)); droiddeck_log("color", "HDR picture on its own display layer: %dx%d, %s %s buffers, tagged %s%s%s", rw, rh, - l->pool_modifier == MOD_QCOM_COMPRESSED ? "UBWC" : "linear", + pool_kind(l->pool_modifier), g_hdr_pool_fmt == AHB_RGB10A2 ? "10-bit" : "8-bit", color && color->dataspace == DROIDDECK_ADATASPACE_BT2020_PQ ? "BT2020_PQ" : "HDR", cov[0] ? ", " : "", cov); @@ -973,7 +1026,7 @@ void sc_layer_hide_overlay(void) { } void sc_layer_window_gone(void) { - base_hide(1); /* the backdrop belongs to the old window, just like GAME and OVERLAY */ + base_hide(1); if (api.state != 1) return; layers_init(); for (int i = SC_LAYER_COUNT - 1; i >= 0; i--) retire_sc(&g_layers[i]); diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c index 8d6b3480a8..895e1f6b47 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -7,6 +7,7 @@ #include "framegen_bridge.h" #include "hdr_compose.h" #include "blend_pass.h" +#include "gpu_busy.h" #include "droiddeck_color.h" #include "quest_device.h" #include @@ -70,8 +71,6 @@ static int g_first_frame_done; static int g_base_black; int vkp_quest_layer_presentation(void) { - /* Compositor thread only; this is a process-wide device property, not a session setting. - * Quest 2 still needs its separate A6xx driver: this gate only chooses presentation. */ static int enabled = -1; if (enabled < 0) { char model[PROP_VALUE_MAX] = {0}, device[PROP_VALUE_MAX] = {0}, maker[PROP_VALUE_MAX] = {0}; @@ -94,6 +93,9 @@ static int g_black_state; static PFN_vkImportSemaphoreFdKHR g_import_sem_fd; static VkSemaphore g_wait_sem; +#define VKP_VENDOR_QUALCOMM 0x5143 +static uint32_t g_vendor_id; + static struct vkp_perf g_perf; static int64_t perf_now(void) { struct timespec ts; @@ -461,6 +463,7 @@ static int dev_init(void) { { VkPhysicalDeviceProperties props; g_vk.GetPhysicalDeviceProperties(g_pd, &props); + g_vendor_id = props.vendorID; snprintf(g_gpu_name, sizeof(g_gpu_name), "%s", props.deviceName); droiddeck_log("gpu", "compositor renders on %s with %s", props.deviceName, g_library_name ? g_library_name : "the system Vulkan driver"); @@ -476,7 +479,6 @@ static int dev_init(void) { g_vk.EnumerateDeviceExtensionProperties(g_pd, NULL, &ne, NULL); VkExtensionProperties *exts = calloc(ne ? ne : 1, sizeof(*exts)); g_vk.EnumerateDeviceExtensionProperties(g_pd, NULL, &ne, exts); - /* Only what the driver has: the system driver lacks the dma-buf ones, which the cloud player never needs. */ for (unsigned i = 0; i < 4; i++) { if (has_ext(exts, ne, import_exts[i])) dev_exts[n_dev_exts++] = import_exts[i]; else LOGE("present: driver MISSING %s (dmabuf import will fail)", import_exts[i]); @@ -488,7 +490,6 @@ static int dev_init(void) { } const int want_sem_fd = has_ext(exts, ne, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME); if (want_sem_fd) dev_exts[n_dev_exts++] = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME; - /* The cloud player's decoded frames arrive as AHardwareBuffers (vkp_image_from_ahb). */ g_ahb_import = has_ext(exts, ne, VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME) && has_ext(exts, ne, VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME); if (g_ahb_import) { @@ -517,6 +518,7 @@ static int dev_init(void) { } vk_loader_load_device(g_dev); g_vk.GetDeviceQueue(g_dev, g_qfam, 0, &g_queue); + vkp_gpu_busy_device(g_pd, g_dev, g_qfam); if (want_sem_fd) { g_import_sem_fd = (PFN_vkImportSemaphoreFdKHR)g_vk.GetDeviceProcAddr(g_dev, "vkImportSemaphoreFdKHR"); VkSemaphoreCreateInfo wsci = {.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO}; @@ -991,8 +993,9 @@ struct vkp_image *vkp_image_import_dmabuf(int fd, uint32_t drm_format, uint64_t .allocationSize = req.size, .memoryTypeIndex = (uint32_t)idx}; VkResult mr = g_vk.AllocateMemory(g_dev, &mai, NULL, &img->mem); if (mr != VK_SUCCESS) { - LOGE("%s: importing the %s dma-buf (%dx%d, %llu bytes) -> %s", as_blit_dst ? "layer" : "dmabuf", - vkp_modifier_name(modifier), w, h, (unsigned long long)req.size, vk_result_name(mr)); + LOGE("%s: importing the %s dma-buf (%dx%d, pitch %u, offset %u, %llu bytes, memory type %d of image types " + "%#x & fd types %#x) -> %s", as_blit_dst ? "layer" : "dmabuf", vkp_modifier_name(modifier), w, h, + stride, offset, (unsigned long long)req.size, idx, req.memoryTypeBits, allowed, vk_result_name(mr)); g_vk.DestroyImage(g_dev, img->image, NULL); close(dupfd); free(img); return NULL; } VkResult br = g_vk.BindImageMemory(g_dev, img->image, img->mem, 0); @@ -1059,6 +1062,101 @@ struct vkp_image *vkp_image_from_ahb(AHardwareBuffer *ahb) { return img; } +int vkp_can_import_ahb(void) { + return dev_init() == 0 && g_vendor_id != VKP_VENDOR_QUALCOMM && g_ahb_import && + g_vk.GetAndroidHardwareBufferPropertiesANDROID; +} + +struct vkp_image *vkp_image_import_ahb(struct AHardwareBuffer *ahb, char *info, size_t info_n) { + if (info && info_n) info[0] = 0; + if (!ahb || !vkp_can_import_ahb()) return NULL; + AHardwareBuffer_Desc d; + AHardwareBuffer_describe(ahb, &d); + VkAndroidHardwareBufferFormatPropertiesANDROID fp = { + .sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID}; + VkAndroidHardwareBufferPropertiesANDROID hp = { + .sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID, .pNext = &fp}; + VkResult pr = g_vk.GetAndroidHardwareBufferPropertiesANDROID(g_dev, ahb, &hp); + if (pr != VK_SUCCESS) { + LOGE("layer: vkGetAndroidHardwareBufferPropertiesANDROID(%ux%u, AHB format %#x, usage %#llx) -> %s", d.width, + d.height, d.format, (unsigned long long)d.usage, vk_result_name(pr)); + return NULL; + } + if (fp.format == VK_FORMAT_UNDEFINED) { + LOGE("layer: the driver reports the %ux%u AHB (format %#x) as external format %#llx only: no blit target", + d.width, d.height, d.format, (unsigned long long)fp.externalFormat); + return NULL; + } + const VkImageUsageFlags usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT; + if (g_vk.GetPhysicalDeviceImageFormatProperties2) { + VkPhysicalDeviceExternalImageFormatInfo ext = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO, + .handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID}; + VkPhysicalDeviceImageFormatInfo2 qi = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2, .pNext = &ext, .format = fp.format, + .type = VK_IMAGE_TYPE_2D, .tiling = VK_IMAGE_TILING_OPTIMAL, .usage = usage}; + VkExternalImageFormatProperties extp = {.sType = VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES}; + VkImageFormatProperties2 ip = {.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2, .pNext = &extp}; + VkResult qr = g_vk.GetPhysicalDeviceImageFormatProperties2(g_pd, &qi, &ip); + if (qr != VK_SUCCESS || + !(extp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT)) { + LOGE("layer: VkFormat %d as an imported AHB blit target is not supported (%s, external features %#x)", + (int)fp.format, vk_result_name(qr), extp.externalMemoryProperties.externalMemoryFeatures); + return NULL; + } + } + + struct vkp_image *img = calloc(1, sizeof(*img)); + if (!img) return NULL; + img->w = (int)d.width; img->h = (int)d.height; + img->dmabuf = 1; img->blit_dst = 1; + img->fmt = fp.format; + VkExternalMemoryImageCreateInfo extImg = { + .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO, + .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID}; + VkImageCreateInfo ici = { + .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, .pNext = &extImg, + .imageType = VK_IMAGE_TYPE_2D, .format = fp.format, .extent = {d.width, d.height, 1}, + .mipLevels = 1, .arrayLayers = 1, .samples = VK_SAMPLE_COUNT_1_BIT, + .tiling = VK_IMAGE_TILING_OPTIMAL, + .usage = usage, .sharingMode = VK_SHARING_MODE_EXCLUSIVE, .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED}; + VkResult cr = g_vk.CreateImage(g_dev, &ici, NULL, &img->image); + if (cr != VK_SUCCESS) { + LOGE("layer: vkCreateImage(AHB %ux%u, VkFormat %d) -> %s", d.width, d.height, (int)fp.format, + vk_result_name(cr)); + free(img); return NULL; + } + int idx = -1; + for (int i = 0; i < 32; i++) if (hp.memoryTypeBits & (1u << i)) { idx = i; break; } + if (idx < 0) { + LOGE("layer: no memory type can import the %ux%u AHB (memoryTypeBits 0)", d.width, d.height); + g_vk.DestroyImage(g_dev, img->image, NULL); free(img); return NULL; + } + VkImportAndroidHardwareBufferInfoANDROID imp = { + .sType = VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID, .buffer = ahb}; + VkMemoryDedicatedAllocateInfo ded = {.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO, + .pNext = &imp, .image = img->image}; + VkMemoryAllocateInfo mai = {.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .pNext = &ded, + .allocationSize = hp.allocationSize, .memoryTypeIndex = (uint32_t)idx}; + VkResult mr = g_vk.AllocateMemory(g_dev, &mai, NULL, &img->mem); + if (mr != VK_SUCCESS) { + LOGE("layer: importing the %ux%u AHB (VkFormat %d, %llu bytes, memory type %d of memoryTypeBits %#x) -> %s", + d.width, d.height, (int)fp.format, (unsigned long long)hp.allocationSize, idx, hp.memoryTypeBits, + vk_result_name(mr)); + g_vk.DestroyImage(g_dev, img->image, NULL); free(img); return NULL; + } + VkResult br = g_vk.BindImageMemory(g_dev, img->image, img->mem, 0); + if (br != VK_SUCCESS) { + LOGE("layer: vkBindImageMemory(AHB) -> %s", vk_result_name(br)); + g_vk.FreeMemory(g_dev, img->mem, NULL); g_vk.DestroyImage(g_dev, img->image, NULL); + free(img); return NULL; + } + if (info && info_n) + snprintf(info, info_n, "VkFormat %d, %llu bytes, memory type %d of memoryTypeBits %#x", (int)fp.format, + (unsigned long long)hp.allocationSize, idx, hp.memoryTypeBits); + return img; +} + static int shm_sampled(void) { static int known; if (!known) { @@ -1311,6 +1409,7 @@ static void device_lost(const char *where) { g_dev_state = -2; g_base_black = 0; vkp_framegen_device_lost(); + vkp_gpu_busy_device_lost(); droiddeck_log("error", "GPU device lost (VK_ERROR_DEVICE_LOST in %s): the compositor has stopped presenting; " "restart the session", where); for (uint32_t i = 0; i < g_nimg; i++) blendp_forget_image(g_images[i]); @@ -1698,9 +1797,6 @@ static int render_impl(int scene_w, int scene_h, const struct vkp_draw *draws, i VkImageLayout result_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; if (fx) { int mapped_w = (int)(scene_w * g_map.kx + 0.5f), mapped_h = (int)(scene_h * g_map.ky + 0.5f); - /* Frame generation samples every output pixel. Upscaling first made it interpolate - * the whole panel (3200x1440 on a 1440p phone) and rebuild on Steam's first frame. - * Grade at the game's size instead; the screen blit still scales to the panel. */ if (fg) { mapped_w = scene_w; mapped_h = scene_h; } vkp_effects_set_formats(scene_fmt, scene_fmt); result = vkp_effects_run(cmd, scene_img, scene_w, scene_h, mapped_w, mapped_h, &rw, &rh); @@ -1800,9 +1896,6 @@ static int render_impl(int scene_w, int scene_h, const struct vkp_draw *draws, i int vkp_render(int scene_w, int scene_h, const struct vkp_draw *draws, int n) { if (vkp_quest_layer_presentation() && !vkp_framegen_active() && !vkp_cardboard_active()) { - /* The desktop (multiple windows), overlays and an empty scene must also avoid WSI. - * Merely enabling zero-copy handles only a single fullscreen window and leaves both - * the letterbox and every fallback frame going through the corrupted swapchain. */ vkp_apply_window_request(); sc_layer_hide_overlay(); if (n > 0) { @@ -1814,9 +1907,6 @@ int vkp_render(int scene_w, int scene_h, const struct vkp_draw *draws, int n) { } else { sc_layer_hide(); } - /* sc_layer_present_pass signals only after submitting client content. - * A backdrop alone, or a successful no-op while a layer slot is unavailable, - * must not dismiss the app's loading UI or mark Steam's window as shown. */ return vkp_base_black(scene_w, scene_h); } return render_impl(scene_w, scene_h, draws, n, NULL, NULL); @@ -1853,8 +1943,6 @@ void vkp_signal_first_frame(void) { int vkp_update_map(int scene_w, int scene_h) { if (g_dev_state == -2 || dev_init() != 0 || !g_window || scene_w <= 0 || scene_h <= 0) return -1; if (vkp_quest_layer_presentation()) { - /* Layer geometry needs the window size, not a Vulkan swapchain. In particular, do - * not create/present a swapchain just to paint black under an otherwise clean layer. */ int w = ANativeWindow_getWidth(g_window), h = ANativeWindow_getHeight(g_window); if (w <= 0 || h <= 0) return -1; g_extent = (VkExtent2D){(uint32_t)w, (uint32_t)h}; diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.h b/app/src/main/cpp/waylandcomp/src/vk_present.h index 5cc06ddb32..ac975c93d8 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.h +++ b/app/src/main/cpp/waylandcomp/src/vk_present.h @@ -1,6 +1,7 @@ #ifndef VK_PRESENT_H #define VK_PRESENT_H #include +#include #include void vk_present_set_driver(const char *driver_path, const char *library_name, const char *native_lib_dir); @@ -33,6 +34,9 @@ struct vkp_image *vkp_image_import_dmabuf(int fd, uint32_t drm_format, uint64_t int w, int h, uint32_t stride, uint32_t offset, int as_blit_dst); int vkp_image_is_dmabuf(const struct vkp_image *img); +struct AHardwareBuffer; +int vkp_can_import_ahb(void); +struct vkp_image *vkp_image_import_ahb(struct AHardwareBuffer *ahb, char *info, size_t info_n); struct vkp_image *vkp_image_create_shm(int w, int h); struct AHardwareBuffer; diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index e3d0f5c5f4..5d69098a62 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -30,6 +30,7 @@ extern void droiddeck_wayland_send_key(int evdev, int state); extern int droiddeck_focus_takes_touch(void); extern int droiddeck_cursor_input_pos(int *x, int *y); extern void droiddeck_wayland_send_scene_input(int type, int a, int b); +extern void droiddeck_wayland_set_cursor_composite(int on); extern void droiddeck_wayland_vsync(int64_t frame_time_ns); extern void droiddeck_stream_set(int on); extern void droiddeck_stream_frame(AHardwareBuffer *ahb); @@ -292,6 +293,13 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeCursorSerial(JNIEnv return droiddeck_cursor_serial(); } +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetCursorComposite( + JNIEnv *env, jclass clazz, jboolean on) { + (void)env; (void)clazz; + droiddeck_wayland_set_cursor_composite(on ? 1 : 0); +} + JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSendKey( JNIEnv *env, jclass clazz, jint evdev, jint state) { @@ -690,7 +698,6 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetGpuTurbo(JNIEnv * jclass error = (*env)->FindClass(env, "java/lang/IllegalStateException"); if (error) (*env)->ThrowNew(env, error, strerror(saved_errno)); } - // Clear a legacy global pin when recovering its marker after an app upgrade or crash. if (on != JNI_TRUE) adrenotools_set_turbo(false); } @@ -717,7 +724,6 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetCardboardSpatialP vkp_cardboard_set_spatial_pose(m, p, live ? 1 : 0); } -/* The Xbox Cloud Gaming native player: its decoded frames are the whole scene (no Wayland clients). */ JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeStreamMode(JNIEnv *env, jclass clazz, jboolean on) { droiddeck_stream_set(on ? 1 : 0); diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index ca648e3f11..0d099cbf0b 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -17,7 +17,8 @@ class App : Application() { override fun onCreate() { super.onCreate() com.droiddeck.launcher.ui.Themes.loadGradient(this) - // Helper processes must not initialize the main USB provider or guest graphics context. + com.droiddeck.launcher.ui.BuildWatermark.install(this) + HomeApp.trackRecents(this) val process = if (android.os.Build.VERSION.SDK_INT >= 28) Application.getProcessName() else (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager) .runningAppProcesses?.firstOrNull { it.pid == android.os.Process.myPid() }?.processName @@ -30,12 +31,13 @@ class App : Application() { return } if (process == "$packageName:xcloudnative") { - // The native cloud player: the stores log and nothing that touches the Linux session. com.droiddeck.launcher.stores.StoresState.init(this) return } - if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic") return + if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic" || + process == "$packageName:shortcuts_sync" || process == "$packageName:bottom_desktop") return CrashHandler.install(this) + com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) com.droiddeck.launcher.session.QuestExperimental.initialize(this) com.droiddeck.launcher.session.SessionPrefs.applyNtsyncDefault(this) com.droiddeck.launcher.session.SessionPrefs.settleGpuDriverMode(this) @@ -53,11 +55,12 @@ class App : Application() { com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.epic.EpicBackend) 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.gamejolt.GameJoltBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.xbox.XboxBackend) + com.droiddeck.launcher.sync.Syncthing.init(this) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.battlenet.BattleNetBackend) } - /** Fetches the packs an existing setup already relies on, so the first use after an update does not wait. */ private fun prefetchAddonPacks() { val app = this Thread({ diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 344aa7452a..200deb55aa 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -65,7 +65,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl } fun state() = GpuDriversState( - gpuName = gpu.displayName(activity), gpuFamily = gpu.family.label(activity), soc = gpu.soc, supportText = gpu.supportText(activity), + gpuName = gpu.displayName(activity), gpuFamily = gpu.family.label(activity), soc = gpu.soc, supportText = gpu.supportText(activity, com.droiddeck.launcher.core.DeviceSupport.vkBridge(activity)), supported = gpu.support == GpuInfo.Support.TESTED, unsupported = gpu.support == GpuInfo.Support.UNSUPPORTED, auto = mode == SessionPrefs.GPU_DRIVERS_AUTO, pairs = pairRows, busy = pairBusy, percent = pairPercent, autoStatus = autoStatus, releaseStatus = releaseStatus.ifEmpty { activity.getString(R.string.drivers_not_checked) }, checking = releaseChecking, @@ -264,7 +264,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl return } if (DriverPairs.recommendedKey(gpu, emptyList()) == null) { - autoStatus = activity.getString(R.string.drivers_none_to_set, gpu.supportText(activity).lowercase()) + autoStatus = activity.getString(R.string.drivers_none_to_set, gpu.supportText(activity, com.droiddeck.launcher.core.DeviceSupport.vkBridge(activity)).lowercase()) return } releaseChecking = true diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 2e969fecc4..db25be9ca9 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -78,6 +78,7 @@ import com.droiddeck.launcher.session.SessionArtifacts import com.droiddeck.launcher.session.SessionPhase import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.session.GameStorage +import com.droiddeck.launcher.session.SteamLibraries import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenDisplays @@ -161,6 +162,10 @@ class FrontEndActivity : ComponentActivity() { private var gameCores by mutableStateOf>(emptySet()) private var tuSysmem by mutableStateOf(false) private var zinkLazy by mutableStateOf(false) + private var vkBridge by mutableStateOf(false) + private var vkBridgeSafe by mutableStateOf(true) + private var bridgeProtonDxvk by mutableStateOf(false) + private val adrenoGpu by lazy { com.droiddeck.launcher.core.DeviceSupport.adreno() } private var noXalia by mutableStateOf(true) private var fastSync by mutableStateOf(false) private var syncFallback by mutableStateOf(true) @@ -194,7 +199,7 @@ class FrontEndActivity : ComponentActivity() { private var navRequest by mutableStateOf(null) private var storesShowMature by mutableStateOf(false) private var storesSort by mutableStateOf(SessionPrefs.STORES_SORTS.first()) - private var storesView by mutableStateOf(SessionPrefs.STORES_VIEWS.first()) + private var storesView by mutableStateOf(SessionPrefs.DEFAULT_STORES_VIEW) private var mic by mutableStateOf(false) private var wifiDiscovery by mutableStateOf(false) private var wifiDiscoveryPermission by mutableStateOf(false) @@ -315,15 +320,11 @@ class FrontEndActivity : ComponentActivity() { 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.HOME -> if (HomeApp.isDefault(this)) HomeApp.openSystemHomeSettings(this) else offerHomeScreen() 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) + SteamIntegration.setShortcutsListed(this, true) + integrationSettings(SteamIntegration.shortcutSettings(this), android.provider.Settings.ACTION_ACCESSIBILITY_SETTINGS) } } } @@ -456,7 +457,7 @@ class FrontEndActivity : ComponentActivity() { private var fexPreset by mutableStateOf("") private var forceSsbs by mutableStateOf(false) private var steamClientArch by mutableStateOf("arm64") - private var runSteamAtStartup by mutableStateOf(false) + private var startupSession by mutableStateOf(SessionPrefs.STARTUP_OFF) private var bootMovie by mutableStateOf(com.droiddeck.launcher.session.BootMovie.DROIDDECK_30) private var bootMovieSound by mutableStateOf(true) private var bootMovieCustomName by mutableStateOf(null) @@ -472,6 +473,7 @@ class FrontEndActivity : ComponentActivity() { private var suspendPolicy by mutableStateOf(SessionPrefs.SUSPEND_MANUAL) private var steamDownloadsInBackground by mutableStateOf(false) private var oscMode by mutableStateOf(SessionPrefs.OSC_AUTO) + private var backHold by mutableStateOf(true) private var backActionsInverted by mutableStateOf(false) private var gameStorage by mutableStateOf("") private var slowUsb by mutableStateOf(null) @@ -489,6 +491,40 @@ class FrontEndActivity : ComponentActivity() { private val pickGameStorage = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data)?.let { path -> setGameStorage(path, GameStorage.labelFor(this, path)) } } + private var steamLibraries by mutableStateOf>(emptyList()) + private var foundSteamLibraries by mutableStateOf>(emptyList()) + private var allFilesAccessMissing by mutableStateOf(false) + private var steamLibraryScan = 0 + private val pickSteamLibrary = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> + val path = if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data) else null + if (path != null) addSteamLibrary(path) + } + + private fun addSteamLibrary(path: String) { + Thread({ + val result = SteamLibraries.add(this, path) + ui.post { + steamLibraries = SteamLibraries.list(this) + refreshFoundSteamLibraries() + refresh() + when { + result is SteamLibraries.AddResult.Refused -> + android.widget.Toast.makeText(this, getString(R.string.main_storage_not_usable, result.reason), android.widget.Toast.LENGTH_LONG).show() + result is SteamLibraries.AddResult.Added && result.entry.path != path -> + android.widget.Toast.makeText(this, getString(R.string.libraries_used_inner, result.entry.label), android.widget.Toast.LENGTH_LONG).show() + } + } + }, "steam-library-add").start() + } + + private fun refreshFoundSteamLibraries() { + allFilesAccessMissing = com.droiddeck.launcher.files.AllFilesAccess.missing() + val scan = ++steamLibraryScan + Thread({ + val found = SteamLibraries.found(this) + ui.post { if (scan == steamLibraryScan) foundSteamLibraries = found } + }, "steam-library-scan").start() + } private var romsDir by mutableStateOf(null) private var steamGames by mutableStateOf>(emptyList()) private var steamGamesX64 by mutableStateOf(false) @@ -529,7 +565,7 @@ class FrontEndActivity : ComponentActivity() { private var dualDisplayId by mutableStateOf(-1) private var dualScreenDevice by mutableStateOf(false) private var dualScreenMode by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO) - private var dualScreenLauncher by mutableStateOf(true) + private var dualScreenSessions by mutableStateOf(com.droiddeck.launcher.input.DualScreen.MODE_AUTO) private var dualScreenControls by mutableStateOf(true) private var launcherStarted = false private lateinit var displayManager: DisplayManager @@ -538,10 +574,25 @@ class FrontEndActivity : ComponentActivity() { override fun onDisplayRemoved(displayId: Int) = refreshSecondScreenDisplays() override fun onDisplayChanged(displayId: Int) = refreshSecondScreenDisplays() } + private val bottomScreenListener: () -> Unit = { refreshSecondScreenDisplays() } + private val secondScreenTouchListener = object : android.hardware.input.InputManager.InputDeviceListener { + override fun onInputDeviceAdded(deviceId: Int) = refreshSecondScreenDisplays() + override fun onInputDeviceRemoved(deviceId: Int) = refreshSecondScreenDisplays() + override fun onInputDeviceChanged(deviceId: Int) = refreshSecondScreenDisplays() + } private val homeRoleRequest = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { + homeChoiceOpen = false + HomeApp.releaseUnusedHomeEntry(this) refreshHomeAppState() } + private val gameSpaceAdd = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { + homeChoiceOpen = false + if (HomeApp.inGameSpace(this)) enableHomeScreen() + else refreshHomeAppState() + } + private var homeChoiceOpen = false + private var gameSpaceOffered = false override fun startActivity(intent: Intent?) { val compat = protons.protonBusyId != null || ProtonExtras.installInProgress @@ -707,7 +758,6 @@ class FrontEndActivity : ComponentActivity() { LauncherIcon.set(this, style) launcherIcon = LauncherIcon.current(this) if (launcherIcon == before) return false - // Android finishes activities started through the alias that was just disabled. startActivity(Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER) .setComponent(LauncherIcon.activity(this)) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK) @@ -739,7 +789,10 @@ class FrontEndActivity : ComponentActivity() { if (id == null) { syncDualPanel() android.widget.Toast.makeText(this, R.string.game_link_invalid, android.widget.Toast.LENGTH_LONG).show() - } else refresh() + } else { + handleGameLink(steamGames, scanned = false) + refresh() + } } } }, "game-launch-file").start() @@ -942,9 +995,10 @@ class FrontEndActivity : ComponentActivity() { ui.postDelayed(poll, SESSION_SWITCH_POLL_MS) } - private fun handleGameLink(games: List) { + private fun handleGameLink(games: List, scanned: Boolean = true) { if (!lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) return val id = pendingGameLink ?: return + if (!scanned && games.none { it.gameIdString == id }) return gameLinkTried = true ui.postDelayed({ if (!isDestroyed && lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) syncDualPanel() @@ -972,6 +1026,8 @@ class FrontEndActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + homeChoiceOpen = savedInstanceState?.getBoolean(STATE_HOME_CHOICE_OPEN) == true + gameSpaceOffered = savedInstanceState?.getBoolean(STATE_GAME_SPACE_OFFERED) == true if (savedInstanceState == null) readIntegrationIntent(intent) readGameIntent(intent) gameSyncFolder = GameFileSync.folder(this) @@ -1027,6 +1083,7 @@ class FrontEndActivity : ComponentActivity() { FrontEndScreen( FrontEndState( installed = installed, ready = ready, available = available?.version, removalPending = removalPending, runtimeActionsBlocked = runtimeChangesBlocked(), + vkBridge = vkBridge, vkBridgeSafe = vkBridgeSafe, bridgeProtonDxvk = bridgeProtonDxvk, adreno = adrenoGpu, shortcutPicker = shortcutPicker, shortcutLibraryScanning = shortcutLibraryScanning, gameSyncFolder = gameSyncFolder, @@ -1054,7 +1111,7 @@ class FrontEndActivity : ComponentActivity() { dualScreen = dualDisplayId >= 0 && com.droiddeck.launcher.ui.DualScreenPanel.available, dualScreenDevice = dualScreenDevice, dualScreenMode = dualScreenMode, - dualScreenLauncher = dualScreenLauncher, + dualScreenSessions = dualScreenSessions, dualScreenControls = dualScreenControls, packages = packageRows, packageCatalogLoading = catalogLoading, @@ -1175,6 +1232,15 @@ class FrontEndActivity : ComponentActivity() { onInstallPackage = { id -> installPackage(id) }, onRemovePackage = { id -> removePackage(id) }, onRuntime = { onRuntimeButton() }, + onVkBridge = { on -> + SessionPrefs.setVkBridge(this, on); vkBridge = on + if (!on) com.droiddeck.launcher.session.ComponentsManager.settleAutoDxvk(this) + }, + onVkBridgeSafe = { on -> SessionPrefs.setVkBridgeSafe(this, on); vkBridgeSafe = on }, + onBridgeProtonDxvk = { on -> + SessionPrefs.setBridgeProtonDxvk(this, on); bridgeProtonDxvk = on + if (on) com.droiddeck.launcher.session.ComponentsManager.settleAutoDxvk(this) + }, onFrameGenPick = { mode -> FrameGen.set(this, mode) frameGenLabel = FrameGen.label(this) @@ -1288,8 +1354,8 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setDualScreenMode(this, mode) refreshSecondScreenDisplays() }, - onDualScreenLauncher = { on -> - SessionPrefs.setDualScreenLauncher(this, on) + onDualScreenSessions = { mode -> + SessionPrefs.setDualScreenSessionMode(this, mode) refreshSecondScreenDisplays() }, onDualScreenControls = { on -> @@ -1327,8 +1393,11 @@ class FrontEndActivity : ComponentActivity() { integrationState = readIntegration() }, onHomeScreen = { on -> - HomeApp.setHomeScreenEnabled(this, on) - refreshHomeAppState() + if (on && HomeApp.hasGameSpace(this)) offerHomeScreen() + else { + HomeApp.setHomeScreenEnabled(this, on) + refreshHomeAppState() + } }, onAndroidApp = { app, displayId -> launchAndroidApp(app, displayId) }, onBackActionsInverted = { inverted -> @@ -1493,7 +1562,7 @@ class FrontEndActivity : ComponentActivity() { } } - if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled() } + if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled(cold = true) } else { restoreCompatLaunch(savedInstanceState) pendingSwitch = savedIntent(savedInstanceState, KEY_PENDING_SWITCH) @@ -1536,9 +1605,14 @@ class FrontEndActivity : ComponentActivity() { startSteamAtStartupIfEnabled() } - private fun startSteamAtStartupIfEnabled() { - if (intent.action != Intent.ACTION_MAIN) return - if (SessionPrefs.runSteamAtStartup(this) && !isFinishing && !isDestroyed) startSteamSession() + private fun startSteamAtStartupIfEnabled(cold: Boolean = false) { + if (intent.action != Intent.ACTION_MAIN && !(cold && intent.action == null)) return + if (isFinishing || isDestroyed) return + when (SessionPrefs.startupSession(this)) { + SessionPrefs.STARTUP_STEAM -> startSteamSession() + SessionPrefs.STARTUP_DESKTOP -> startSession(Intent(this, SessionActivity::class.java) + .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_DESKTOP)) + } } private fun playSteam() { @@ -1560,9 +1634,28 @@ class FrontEndActivity : ComponentActivity() { startSession(Intent(this, SessionActivity::class.java).putExtra(SessionActivity.EXTRA_STEAMVR, steamVr), steamSession = true) } + @Suppress("OVERRIDE_DEPRECATION") + override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) { + val outside = com.droiddeck.launcher.ui.DualScreenPanel.shownOn >= 0 && + com.droiddeck.launcher.ui.DualScreenPanel.opensOutside(packageName, intent.component?.packageName ?: intent.`package` ?: intent.resolveActivity(packageManager)?.packageName) + if (outside) { + com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, true) + window.decorView.postDelayed({ if (hasWindowFocus()) com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) }, 1500) + } + try { + super.startActivityForResult(intent, requestCode, options) + } catch (e: RuntimeException) { + if (outside) com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) + throw e + } + } + override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus) - if (hasFocus) applyLauncherFullscreen() + if (hasFocus) { + com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) + applyLauncherFullscreen() + } } private fun applyLauncherFullscreen() { @@ -1621,16 +1714,24 @@ class FrontEndActivity : ComponentActivity() { override fun onPause() { compatLaunchVisible = false + if (android.os.Build.VERSION.SDK_INT >= 29) com.droiddeck.launcher.ui.DualScreenPanel.ownerPaused(taskId, true) super.onPause() } override fun onResume() { super.onResume() + if (!homeChoiceOpen) { + HomeApp.releaseUnusedHomeEntry(this) + refreshHomeAppState() + } + if (settingsMode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() compatLaunchVisible = true com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) + com.droiddeck.launcher.ui.DualScreenPanel.ownerPaused(taskId, false) orientation = SessionPrefs.orientation(this) launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) requestedOrientation = launcherOrientation + SteamIntegration.syncShortcutsListing(this) refreshWifiDiscovery() com.droiddeck.launcher.stores.StoresState.refresh(this) com.droiddeck.launcher.stores.StoresState.libraryListener = { refreshAddedGames(); refresh() } @@ -1682,6 +1783,8 @@ class FrontEndActivity : ComponentActivity() { addDataScheme("file") }) displayManager.registerDisplayListener(secondScreenDisplayListener, ui) + com.droiddeck.launcher.input.DualScreen.watchTaken(bottomScreenListener) + getSystemService(android.hardware.input.InputManager::class.java)?.registerInputDeviceListener(secondScreenTouchListener, ui) launcherStarted = true refreshSecondScreenDisplays() getSystemService(android.content.pm.LauncherApps::class.java).registerCallback(packageCallback, ui) @@ -1697,6 +1800,8 @@ class FrontEndActivity : ComponentActivity() { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) + outState.putBoolean(STATE_HOME_CHOICE_OPEN, homeChoiceOpen) + outState.putBoolean(STATE_GAME_SPACE_OFFERED, gameSpaceOffered) if (slowUsbNever) SessionPrefs.setSlowUsbWarningOff(this) saveCompatLaunch(outState) pendingSwitch?.let { outState.putParcelable(KEY_PENDING_SWITCH, it) } @@ -1716,7 +1821,13 @@ class FrontEndActivity : ComponentActivity() { super.onDestroy() } + override fun onRestart() { + super.onRestart() + homeChoiceOpen = false + } + override fun onStop() { + if (!homeChoiceOpen) HomeApp.releaseUnusedHomeEntry(this) unregisterReceiver(wifiLocationReceiver) unregisterReceiver(mediaReceiver) getSystemService(android.content.pm.LauncherApps::class.java).unregisterCallback(packageCallback) @@ -1725,6 +1836,8 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.stores.StoresState.libraryListener = null com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null displayManager.unregisterDisplayListener(secondScreenDisplayListener) + com.droiddeck.launcher.input.DualScreen.unwatchTaken(bottomScreenListener) + getSystemService(android.hardware.input.InputManager::class.java)?.unregisterInputDeviceListener(secondScreenTouchListener) launcherStarted = false com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) flood = null @@ -1758,15 +1871,14 @@ class FrontEndActivity : ComponentActivity() { private fun refreshSecondScreenDisplays() { if (!::displayManager.isInitialized) return - // The launcher can itself be shown on a non-default display (DeX, an external monitor); that one is not a "second screen". val ownDisplayId = if (android.os.Build.VERSION.SDK_INT >= 30) display?.displayId ?: android.view.Display.DEFAULT_DISPLAY else @Suppress("DEPRECATION") windowManager.defaultDisplay.displayId dualScreenMode = SessionPrefs.dualScreenMode(this) secondScreenDisplays = SecondScreenDisplays.available(displayManager, ownDisplayId) dualScreenDevice = com.droiddeck.launcher.input.DualScreen.anyDisplay(displayManager, ownDisplayId) != null - dualScreenLauncher = SessionPrefs.dualScreenLauncher(this) + dualScreenSessions = SessionPrefs.dualScreenSessionMode(this) dualScreenControls = SessionPrefs.dualScreenSessionControls(this) val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, ownDisplayId) - dualDisplayId = if (dualScreenLauncher) target?.displayId ?: -1 else -1 + dualDisplayId = target?.displayId ?: -1 syncDualPanel() } @@ -1795,12 +1907,32 @@ class FrontEndActivity : ComponentActivity() { } } + private fun offerHomeScreen() { + if (!gameSpaceOffered && HomeApp.hasGameSpace(this) && !HomeApp.inGameSpace(this)) { + gameSpaceOffered = true + val opened = runCatching { gameSpaceAdd.launch(HomeApp.gameSpaceAddIntent()) }.isSuccess + if (opened) { + homeChoiceOpen = true + android.widget.Toast.makeText(this, R.string.setup_home_game_space_first, android.widget.Toast.LENGTH_LONG).show() + return + } + } + enableHomeScreen() + } + + private fun enableHomeScreen() { + HomeApp.setHomeScreenEnabled(this, true) + refreshHomeAppState() + manageHomeApp() + } + private fun manageHomeApp() { + homeChoiceOpen = true val request = HomeApp.roleRequestIntent(this) if (request != null) { homeRoleRequest.launch(request) - } else { - HomeApp.openSystemHomeSettings(this) + } else if (runCatching { homeRoleRequest.launch(HomeApp.settingsIntent()) }.isFailure) { + homeChoiceOpen = false } } @@ -2066,6 +2198,7 @@ class FrontEndActivity : ComponentActivity() { unfoldedControls = if (mode == SessionService.MODE_STEAM) unfoldedControls else null, unfoldedControlsWithController = unfoldedControlsWithController, oscMode = if (mode == SessionService.MODE_STEAM) oscMode else null, + backHold = backHold, backActionsInverted = backActionsInverted, directAudio = if (mode == SessionService.MODE_STEAM) directAudio else null, picturePosition = if (mode == SessionService.MODE_STEAM) picturePosition else null, @@ -2073,6 +2206,9 @@ class FrontEndActivity : ComponentActivity() { mic = if (mode == SessionService.MODE_STEAM) mic else null, gameStorage = if (mode == SessionService.MODE_STEAM) gameStorage else null, storageOptions = storageOptions, + steamLibraries = steamLibraries, + foundSteamLibraries = foundSteamLibraries, + allFilesAccessMissing = allFilesAccessMissing, storageDiagnostics = mode == SessionService.MODE_STEAM && storageDiagnostics, fexPreset = if (mode == SessionService.MODE_STEAM) fexPreset else null, forceSsbs = forceSsbs, @@ -2083,7 +2219,7 @@ class FrontEndActivity : ComponentActivity() { steamRepairQueued = steamRepairQueued, mangoapp = mangoapp, steamController = if (mode == SessionService.MODE_STEAM) steamController else null, - runSteamAtStartup = mode == SessionService.MODE_STEAM && runSteamAtStartup, + startupSession = startupSession, bootMovie = if (mode == SessionService.MODE_STEAM) bootMovie else null, bootMovieSound = bootMovieSound, bootMovieCustomName = bootMovieCustomName, @@ -2118,6 +2254,7 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setUnfoldedControlsWithController(this, on); unfoldedControlsWithController = on }, onOsc = { o -> SessionPrefs.setOscMode(this, o); oscMode = o }, + onBackHold = { on -> SessionPrefs.setBackHold(this, on); backHold = on }, onBackActionsInverted = { inverted -> SessionPrefs.setBackActionsInverted(this, inverted) backActionsInverted = inverted @@ -2136,6 +2273,22 @@ class FrontEndActivity : ComponentActivity() { onPickGameStorageFolder = { pickGameStorage.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.main_pick_game_storage), gameStorage.ifEmpty { null })) }, + onAddSteamLibrary = { + pickSteamLibrary.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.libraries_pick), null)) + }, + onAddFoundSteamLibrary = { path -> addSteamLibrary(path) }, + onAllowAllFilesAccess = { com.droiddeck.launcher.files.AllFilesAccess.open(this) }, + onRenameSteamLibrary = { id, label -> + SteamLibraries.rename(this, id, label) + steamLibraries = SteamLibraries.list(this) + refresh() + }, + onRemoveSteamLibrary = { id -> + SteamLibraries.remove(this, id) + steamLibraries = SteamLibraries.list(this) + refresh() + refreshFoundSteamLibraries() + }, onStorageDiagnostics = { on -> SessionPrefs.setStorageDiagnosticsEnabled(this, on) storageDiagnostics = on @@ -2159,9 +2312,9 @@ class FrontEndActivity : ComponentActivity() { onReturnAfterGame = { on -> SessionPrefs.setReturnAfterGame(this, on); returnAfterGame = on }, onShaderPrecache = { on -> SessionPrefs.setShaderPrecache(this, on); shaderPrecache = on }, onSteamController = { id -> SessionPrefs.setSteamController(this, id); steamController = id }, - onRunSteamAtStartup = { on -> - SessionPrefs.setRunSteamAtStartup(this, on) - runSteamAtStartup = on + onStartupSession = { id -> + SessionPrefs.setStartupSession(this, id) + startupSession = id }, onBootMovie = { id -> com.droiddeck.launcher.session.BootMovie.select(this, id); loadBootMovie() }, onBootMovieSound = { on -> SessionPrefs.setBootMovieSound(this, on); bootMovieSound = on }, @@ -2352,7 +2505,7 @@ class FrontEndActivity : ComponentActivity() { returnAfterGame = SessionPrefs.returnAfterGame(this) loadShaderPrecache(mode) steamController = SessionPrefs.steamController(this) - runSteamAtStartup = SessionPrefs.runSteamAtStartup(this) + startupSession = SessionPrefs.startupSession(this) loadBootMovie() hdrOn = SessionPrefs.hdr(this, mode) upscaler = SessionPrefs.upscaler(this) @@ -2362,6 +2515,7 @@ class FrontEndActivity : ComponentActivity() { suspendPolicy = SessionPrefs.suspendPolicy(this, mode) steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) oscMode = SessionPrefs.oscMode(this) + backHold = SessionPrefs.backHold(this) backActionsInverted = SessionPrefs.backActionsInverted(this) directAudio = SessionPrefs.directAudio(this) picturePosition = SessionPrefs.picturePosition(this) @@ -2369,6 +2523,8 @@ class FrontEndActivity : ComponentActivity() { mic = SessionPrefs.micEnabled(this) refreshWifiDiscovery() gameStorage = SessionPrefs.gameStorage(this) + steamLibraries = SteamLibraries.list(this) + if (mode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() storageDiagnostics = SessionPrefs.storageDiagnosticsEnabled(this) settingsMode = mode Thread({ @@ -2399,6 +2555,7 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setGameStorage(this, path, label) gameStorage = path checkUsbLink() + if (settingsMode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() } private fun checkUsbLink() { @@ -2422,6 +2579,9 @@ class FrontEndActivity : ComponentActivity() { gameCores = CpuCores.parse(SessionPrefs.gameCpus(this)).ifEmpty { CpuCores.all.toSet() } tuSysmem = SessionPrefs.tuSysmem(this) zinkLazy = SessionPrefs.zinkLazy(this) + vkBridge = SessionPrefs.vkBridge(this) + vkBridgeSafe = SessionPrefs.vkBridgeSafe(this) + bridgeProtonDxvk = SessionPrefs.bridgeProtonDxvk(this) noXalia = SessionPrefs.noXalia(this) fastSync = SessionPrefs.fastSync(this) syncFallback = SessionPrefs.syncFallback(this) @@ -2443,7 +2603,6 @@ class FrontEndActivity : ComponentActivity() { !SessionPaths.currentSessionLogsRetained(this) private fun refresh() { - // Until the scan finishes, the other client's games would launch in this one. val listX64 = SessionPrefs.activeSteamClientArch(this) == "x86_64" if (listX64 != steamGamesX64) { steamGamesX64 = listX64 @@ -2459,6 +2618,9 @@ class FrontEndActivity : ComponentActivity() { offline = OfflineMode.enabled(this) installed = LinuxRuntimeInstaller.installedVersion(this) ready = LinuxRuntime.isInstalled(this) + vkBridge = SessionPrefs.vkBridge(this) + vkBridgeSafe = SessionPrefs.vkBridgeSafe(this) + bridgeProtonDxvk = SessionPrefs.bridgeProtonDxvk(this) removalPending = LinuxRuntimeInstaller.hasRemovalPending(this) ui.post { autoUpdateRuntime() } frameGenLabel = FrameGen.label(this) @@ -2503,7 +2665,7 @@ class FrontEndActivity : ComponentActivity() { } val scannedArch = SessionPrefs.activeSteamClientArch(this) val scannedX64 = scannedArch == "x86_64" - val games = if (ready) Library.launchableGames(this, arch = scannedArch) else emptyList() + val games = if (ready || com.droiddeck.launcher.runtime.LinuxRuntime.hasRootfs(this)) Library.launchableGames(this, arch = scannedArch) else emptyList() val all = games.distinctBy { it.gameId } if (ready && scanGeneration == libraryScanGeneration) com.droiddeck.launcher.frontend.LibraryCache.save(this, all, scannedX64) val endedSession = SessionState.sessionId.takeIf { !SessionState.running && it != null && it != componentSweepSession } @@ -2563,7 +2725,7 @@ class FrontEndActivity : ComponentActivity() { Thread({ checkCatalog() }, "catalog").start() return } - if (installed == null && !com.droiddeck.launcher.core.DeviceSupport.adreno()) { showNonAdreno = release; return } + if (installed == null && !com.droiddeck.launcher.core.DeviceSupport.canDraw(this)) { showNonAdreno = release; return } install(release) } @@ -2582,7 +2744,7 @@ class FrontEndActivity : ComponentActivity() { showPhantomGate = true return false } - val warn = installed == null && !com.droiddeck.launcher.core.DeviceSupport.adreno() + val warn = installed == null && !com.droiddeck.launcher.core.DeviceSupport.canDraw(this) if (warn && available != null) { showNonAdreno = available; return false } startActivity(intent) return true @@ -2704,6 +2866,8 @@ class FrontEndActivity : ComponentActivity() { } companion object { + private const val STATE_HOME_CHOICE_OPEN = "home_choice_open" + private const val STATE_GAME_SPACE_OFFERED = "game_space_offered" private const val TAG = "MainActivity" private const val MEDIA_SETTLE_MS = 1500L private const val COMPONENT_RESTORE_MS = 60_000L diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 9d0ae53c1c..9a724d9044 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -24,6 +24,9 @@ import kotlin.math.roundToInt object HomeApp { private const val ICON_DP = 72 + private const val GAME_SPACE = "cn.nubia.gamelauncher" + private const val GAME_SPACE_ADD = "cn.nubia.gamelauncher.action.GAME_MANAGER" + private val GAME_SPACE_GAMES = Uri.parse("content://cn.nubia.gamelauncher.db.AppAddProvider/appadd") data class LaunchableApp( val label: String, @@ -54,6 +57,24 @@ object HomeApp { ) } + fun hasGameSpace(context: Context): Boolean = + runCatching { context.packageManager.getPackageInfo(GAME_SPACE, 0) }.isSuccess + + fun inGameSpace(context: Context): Boolean = + runCatching { + context.contentResolver.query(GAME_SPACE_GAMES, arrayOf("component"), null, null, null)?.use { rows -> + val prefix = context.packageName + "," + generateSequence { if (rows.moveToNext()) rows.getString(0) else null }.any { it.startsWith(prefix) } + } + }.getOrNull() ?: true + + fun gameSpaceAddIntent(): Intent = Intent(GAME_SPACE_ADD).setPackage(GAME_SPACE) + + fun releaseUnusedHomeEntry(context: Context) { + if (isHomeScreenEnabled(context) && !isDefault(context) && hasGameSpace(context)) + setHomeScreenEnabled(context, false) + } + fun isDefault(context: Context): Boolean { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { val roles = context.getSystemService(RoleManager::class.java) @@ -147,8 +168,62 @@ object HomeApp { .getShortcutIconDrawable(info, context.resources.displayMetrics.densityDpi)?.toBitmap(px, px) }.getOrNull() + fun trackRecents(app: android.app.Application) { + app.registerActivityLifecycleCallbacks(object : android.app.Application.ActivityLifecycleCallbacks { + override fun onActivityCreated(activity: android.app.Activity, savedInstanceState: android.os.Bundle?) = Unit + override fun onActivityStarted(activity: android.app.Activity) = Unit + override fun onActivityResumed(activity: android.app.Activity) = syncRecents(activity) + override fun onActivityPaused(activity: android.app.Activity) { if (activity is FrontEndActivity) syncRecents(activity) } + override fun onActivityStopped(activity: android.app.Activity) = Unit + override fun onActivitySaveInstanceState(activity: android.app.Activity, outState: android.os.Bundle) = Unit + override fun onActivityDestroyed(activity: android.app.Activity) = Unit + }) + } + + private fun syncRecents(activity: android.app.Activity) = + keepOutOfRecents(activity, activity is FrontEndActivity && !SessionState.running && isDefault(activity)) + + internal enum class RecentsStep { HIDE, SHOW, FORGET, NONE } + + internal fun recentsStep(hidden: Boolean, owned: Boolean, excluded: Boolean): RecentsStep = when { + hidden && !excluded -> RecentsStep.HIDE + !hidden && owned && excluded -> RecentsStep.SHOW + !hidden && owned -> RecentsStep.FORGET + else -> RecentsStep.NONE + } + + fun keepOutOfRecents(activity: android.app.Activity, hidden: Boolean) { + val prefs = activity.getSharedPreferences("home-recents", Context.MODE_PRIVATE) + val owned = prefs.getStringSet("tasks", null).orEmpty() + val id = activity.taskId.toString() + if (!hidden && id !in owned) return + runCatching { + @Suppress("DEPRECATION") + fun idOf(task: android.app.ActivityManager.AppTask) = + if (Build.VERSION.SDK_INT >= 29) task.taskInfo.taskId else task.taskInfo.persistentId + val tasks = activity.getSystemService(android.app.ActivityManager::class.java).appTasks + val task = tasks.firstOrNull { idOf(it) == activity.taskId } ?: return + val excluded = task.taskInfo.baseIntent.flags and Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS != 0 + val step = recentsStep(hidden, id in owned, excluded) + if (step == RecentsStep.NONE) return + if (step != RecentsStep.FORGET) task.setExcludeFromRecents(step == RecentsStep.HIDE) + val live = tasks.map { idOf(it).toString() }.toSet() + val next = owned.filter { it in live && it != id }.toMutableSet() + if (step == RecentsStep.HIDE) next += id + prefs.edit().putStringSet("tasks", next).apply() + } + } + fun startShortcut(context: Context, info: ShortcutInfo) { - context.getSystemService(LauncherApps::class.java).startShortcut(info, null, null) + val task = generateSequence(context) { (it as? android.content.ContextWrapper)?.baseContext } + .filterIsInstance().firstOrNull()?.taskId + task?.let { com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(it, true) } + try { + context.getSystemService(LauncherApps::class.java).startShortcut(info, null, null) + } catch (e: Exception) { + task?.let { com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(it, false) } + throw e + } } fun openAppInfo(context: Context, app: LaunchableApp) { diff --git a/app/src/main/java/com/droiddeck/launcher/HomePins.kt b/app/src/main/java/com/droiddeck/launcher/HomePins.kt index 1040995e87..38acb18137 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomePins.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomePins.kt @@ -12,7 +12,6 @@ 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 "" diff --git a/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt b/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt index 8f79f4354b..886f5f0e89 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeWidgets.kt @@ -197,7 +197,6 @@ object HomeWidgets { 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 diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 8e8efc80c2..5251b50da3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -20,7 +20,6 @@ internal class ProtonMenu( private val ui: Handler, private val idle: () -> Boolean = { true }, ) { - // Install workers and their results outlive the activity that starts them. private object Operation { val rows = mutableStateOf>(emptyList()) val busyId = mutableStateOf(null) diff --git a/app/src/main/java/com/droiddeck/launcher/QuestXrActivity.kt b/app/src/main/java/com/droiddeck/launcher/QuestXrActivity.kt index 28270e195c..98e5a0b227 100644 --- a/app/src/main/java/com/droiddeck/launcher/QuestXrActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/QuestXrActivity.kt @@ -71,7 +71,6 @@ class QuestXrActivity : NativeActivity() { } } finally { synchronized(steamVrLock) { - // A retiring activity must not stop a replacement's SteamVR session. if (steamVrOwner === this) { if (sessionAlive()) SteamVr.run(this, "stop") steamVrOwner = null diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 5ad7ee59e8..2d0ffcc636 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher import androidx.compose.foundation.background import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth import android.hardware.input.InputManager import android.hardware.display.DisplayManager import android.content.Intent @@ -37,6 +38,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Modifier +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.unit.dp @@ -67,7 +69,6 @@ import com.droiddeck.launcher.gpu.ScreenEffectLooks import com.droiddeck.launcher.gpu.ScreenEffects import com.droiddeck.launcher.gpu.Lossless import com.droiddeck.launcher.gpu.TurnipDriver -import com.droiddeck.launcher.input.EvdevKeys import com.droiddeck.launcher.input.HomeGuideInput import com.droiddeck.launcher.input.InputSpace import com.droiddeck.launcher.input.KeyboardHost @@ -103,8 +104,8 @@ import com.droiddeck.launcher.input.TouchscreenGestures import com.droiddeck.launcher.input.ScrollTouchGestures import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.LoadingState -import com.droiddeck.launcher.hud.FusionHudConfig -import com.droiddeck.launcher.hud.FusionHudHost +import com.droiddeck.launcher.hud.DroidDeckHudConfig +import com.droiddeck.launcher.hud.DroidDeckHudHost import com.droiddeck.launcher.session.PerfMode import com.droiddeck.launcher.session.SteamRepair import com.droiddeck.launcher.session.GameEnvironmentStore @@ -131,6 +132,10 @@ import com.droiddeck.launcher.ui.LoadingOverlay import com.droiddeck.launcher.ui.SessionDrawer import com.droiddeck.launcher.ui.SessionPausedOverlay import com.droiddeck.launcher.ui.SecondScreenPresentation +import com.droiddeck.launcher.ui.BottomDashboard +import com.droiddeck.launcher.ui.BottomPage +import com.droiddeck.launcher.ui.sessionBottomPages +import com.droiddeck.launcher.ui.BottomPageActions import com.droiddeck.launcher.ui.DroidDeckTheme import com.droiddeck.launcher.wayland.CompositorHost import com.droiddeck.launcher.wayland.WaylandCompositor @@ -205,7 +210,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private lateinit var surfaceView: SurfaceView private lateinit var sessionOverlay: ComposeView private lateinit var loading: LoadingState - private lateinit var hud: FusionHudHost + private lateinit var hud: DroidDeckHudHost private lateinit var memoryHud: com.droiddeck.launcher.session.MemoryHud private var padBridge: PadBridge? = null private val physicalShortcuts = PhysicalShortcutRouter() @@ -258,11 +263,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private lateinit var touchscreenGestures: TouchscreenGestures private var gestureConfig = com.droiddeck.launcher.input.TouchGestureConfig() private var gestureGame: String? = null - private var steamUiFocused = false + private var gameStarts by mutableIntStateOf(0) private var gestureSettingsOpen by mutableStateOf(false) private var steamImportAsk by mutableStateOf(null) private var steamImportAnswered: String? = null private var directHoldBehavior by mutableStateOf(com.droiddeck.launcher.input.TouchGestureConfig.MOUSE_BEHAVIOR_CLICK) + private var relativeMouseMode by mutableIntStateOf(0) + @Volatile private var appliedRelativeMouseMode: Int? = null private var screenKeyPickerOpen by mutableStateOf(false) private var screenKeyBind: List? = null private var screenKeyDir: Int? = null @@ -296,21 +303,29 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val cursorPosBuf = IntArray(2) private var cursorSerial = 0 private var clientHidesCursor = false + private var mouseOwnsCursor = false private var pointerLocked = false + private var desktopGrabTapAt = 0L + private var desktopGrabTaps = 0 + private var desktopMousePlaced = false private val pointerLockListener = WaylandCompositor.PointerLockListener { locked, _, _ -> uiHandler.post { if (pointerLocked == locked) return@post gesturePointerReady = false pointerLocked = locked Log.i(TAG, "pointer lock " + if (locked) "taken by a program" else "released") - if (locked) openEvdevMouse() else closeEvdevMouse() + if (locked) desktopGrabTaps = 0 + if (programLocksPointer()) openEvdevMouse() else closeEvdevMouse() padMouseCheckedAt = 0L if (::padMouse.isInitialized) padMouseMode() - // Touchpad deltas are measured from the middle while locked (moveLockedPointer). if (locked && ::touchpad.isInitialized) { drawnRect()?.let { touchpad.place(it.centerX(), it.centerY()) } cursorVisible = false } + if (!locked && mouseOwnsCursor) { + uiHandler.removeCallbacks(cursorResync) + uiHandler.post(cursorResync) + } updatePointerCapture() } } @@ -323,6 +338,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun run() { if (syncClientCursor() && clientHidesCursor) { cursorVisible = false + if (!mouseOwnsCursor) return + } + if (mouseOwnsCursor) { + if (pointerLocked) return + alignCursorToGuest() + if (!clientHidesCursor) cursorVisible = true + uiHandler.postDelayed(this, 60) return } if (touchDrivesPointer()) return @@ -336,9 +358,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun alignCursorToGuest(): Boolean { if (pointerLocked || !CompositorHost.isStarted) return false if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return false - if (surfaceView.width <= 0 || surfaceView.height <= 0) return false - val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width - val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + if (outputView().width <= 0 || outputView().height <= 0) return false + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * outputView().width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * outputView().height if (kotlin.math.abs(x - cursorPos.x) < 0.75f && kotlin.math.abs(y - cursorPos.y) < 0.75f) return false cursorPos = androidx.compose.ui.geometry.Offset(x, y) return true @@ -350,6 +372,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onTap = { performBackAction(double = it) }, doubleTapMs = { backDoubleTapMs.toLong() }, onCancel = { padBridge?.cancelBackQam() }, + holds = { backHold }, ) private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN private var drawerDirectionDownTime = 0L @@ -382,13 +405,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerOpenState by mutableStateOf(false) private var typingReturnMode: SecondScreenMode? = null private var drawerDocked by mutableStateOf(false) + private var drawerPinned by mutableStateOf(false) private var drawerLayerOpen = false private var drawerBackRequests by mutableIntStateOf(0) private var drawerOpen: Boolean get() = drawerOpenState set(value) { - if (value == drawerOpenState) return + if (value == drawerOpenState) { + if (!value && drawerPinned) { + drawerPinned = false + if (drawerDocked) closeDockedMenu() + } + return + } drawerLayerOpen = false + drawerPinned = false if (value) drawerDocked = dockDrawer() && openDockedMenu() drawerOpenState = value if (!value && drawerDocked) closeDockedMenu() @@ -403,11 +434,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerGameProfileId by mutableStateOf(null) private var fpsLimit by mutableStateOf(SessionState.fpsLimit) - private fun noSteamSession(): Boolean = SessionState.mode == SessionService.MODE_RUN && + private fun noSteamSession(): Boolean = (SessionState.mode == SessionService.MODE_RUN && SessionState.program in setOf( com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN, com.droiddeck.launcher.session.NoSteamLaunch.EPIC, com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET, - ) + )) || SessionState.mode == SessionService.MODE_DESKTOP private val drawerGameInventory = GameProfileInventoryCache() private var drawerGameInventoryRevision = 0L private var drawerGameFexPresetSaving by mutableStateOf(false) @@ -428,6 +459,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val drawerGameProfileRefreshes = LatestRequestCoordinator() private var drawerPage by mutableStateOf(SessionDrawerPage.CONTROLLER) private var drawerControllerActive by mutableStateOf(false) + private var backHold by mutableStateOf(true) private var backActionsInverted by mutableStateOf(false) private var backDoubleTapMs by mutableStateOf(500) private var lowLatency by mutableStateOf(true) @@ -461,6 +493,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var glassesSettings by mutableStateOf(Glasses.settings.value) private var glassesScreen: GlassesScreen? = null private var glassesOutputActive by mutableStateOf(false) + private var bottomGame: com.droiddeck.launcher.ui.BottomGameScreen? = null + private var bottomOutputActive by mutableStateOf(false) + private val topDesktopKeys = mutableSetOf>() + private var bottomRecoveries = 0 + private var gameOnBottom by mutableStateOf(SessionState.gameOnBottom) + private var bottomSwapAvailable by mutableStateOf(false) private var pausedFrame by mutableStateOf(null) private var pausedFrameWanted = false private var pauseAnimated by mutableStateOf(false) @@ -498,6 +536,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { importLossless(it) } } private var frameGen by mutableStateOf(FrameGen.Mode.OFF) + private var frameGenPip = false + private val frameGenRequests = java.util.concurrent.atomic.AtomicInteger() private var fexPreset by mutableStateOf("") private var suspendPolicy by mutableStateOf(SessionPrefs.SUSPEND_MANUAL) private var steamDownloadsInBackground by mutableStateOf(false) @@ -507,9 +547,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var secondScreenDisplays by mutableStateOf>(emptyList()) private var selectedSecondScreenDisplay by mutableStateOf(SessionState.secondScreenDisplay) private var started = false + private var dualControlsProvisional: Boolean + get() = SessionState.secondScreenProvisional + set(value) { SessionState.secondScreenProvisional = value } private var sessionActivityDisplayId = Display.DEFAULT_DISPLAY private lateinit var displayManager: DisplayManager private var secondScreenPresentation: SecondScreenPresentation? = null + private val bottomScreenListener: () -> Unit = { + if (secondScreenPresentation?.display?.displayId?.let(com.droiddeck.launcher.input.DualScreen::taken) == true) closeSecondScreen(reset = false) + updateBottomGame() + refreshSecondScreenDisplays() + } + private val displayListener = object : DisplayManager.DisplayListener { override fun onDisplayAdded(displayId: Int) { notifyActivityDisplayStateChanged(displayId) @@ -524,6 +573,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onDisplayChanged(displayId: Int) { notifyActivityDisplayStateChanged(displayId) followPanelRefresh(displayId) + updateBottomGame() refreshSecondScreenDisplays() } } @@ -547,8 +597,6 @@ 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() @@ -557,7 +605,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun followPanelRefresh(displayId: Int) { if (!CompositorHost.isStarted) return - val output = glassesScreen?.display + val output = bottomGame?.takeIf { bottomOutputActive }?.display ?: glassesScreen?.display ?: (if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay) ?: return if (output.displayId != displayId) return applyOutputPacing() @@ -573,10 +621,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { refreshControls() updatePointerCapture() updateHandCamera() + refreshSecondScreenDisplays() } override fun onInputDeviceRemoved(deviceId: Int) { physicalShortcuts.onDeviceRemoved(deviceId) Log.i(TAG, "input device $deviceId disconnected") + dropMouseCursor() backQamInput.onDeviceRemoved(deviceId) joyConVr?.refresh() physicalInputBindings?.disconnected(deviceId) @@ -585,10 +635,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { refreshControls() updatePointerCapture() updateHandCamera() + refreshSecondScreenDisplays() } override fun onInputDeviceChanged(deviceId: Int) { joyConVr?.refresh() refreshControls() + refreshSecondScreenDisplays() } } @@ -603,7 +655,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { finish() return } - // A cancelled install keeps its thread until the download stops; a new launch would reuse its stop flag and close itself. if (savedInstanceState == null && SessionState.installing != null && !SessionState.running) { runtimeRemovalBlocked = true android.widget.Toast.makeText(this, R.string.main_wait_desktop_install, android.widget.Toast.LENGTH_SHORT).show() @@ -614,6 +665,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val mode = intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM SessionState.programArgs = intent.getStringArrayExtra(SessionService.EXTRA_PROGRAM_ARGS)?.toList().orEmpty() SessionEvents.begin(this, mode, SessionPaths.label(mode, intent.getStringExtra(SessionService.EXTRA_PROGRAM))) + SessionState.secondScreenAutoOpened = false + SessionState.secondScreenProvisional = false + SessionState.gameOnBottom = false + gameOnBottom = false } if (!SessionState.running && SessionState.phase in setOf(SessionPhase.IDLE, SessionPhase.FAILED)) { SessionState.program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) @@ -635,7 +690,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { fpsLimit = 0 } applyOutputPacing() - if (!SessionState.running) SessionState.followScreen = followChoice() + if (!SessionState.running) { + SessionState.followScreen = followChoice() + SessionState.followScale = followScale() + } applyFollowOrientation(resources.configuration) goFullscreen() volumeControlStream = android.media.AudioManager.STREAM_MUSIC @@ -650,6 +708,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun dispatchPointerCaptureChanged(hasCapture: Boolean) { super.dispatchPointerCaptureChanged(hasCapture) Log.i(TAG, "pointer capture " + if (hasCapture) "on" else "off") + if (!hasCapture) uiHandler.postDelayed(::updatePointerCapture, 250) } } sessionRoot = root @@ -703,7 +762,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } keys.onAdd = { screenKeyPickerOpen = true } keys.onSelect = { codes -> screenKeyEdit = screenKeys?.stateOf(codes) } - keys.onEditingChanged = { if (!it) screenKeyEdit = null } + keys.onEditingChanged = { touchEditorChanged(); if (!it) screenKeyEdit = null } keys.steamStyle = { steamTouchControls?.style } keys.visibility = if (screenKeysShown) View.VISIBLE else View.GONE root.addView(keys) @@ -741,8 +800,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { ViewConfiguration.get(this).scaledTouchSlop.toFloat(), gestureOutput, ) refreshGestureConfig() - // A real touch target lets FrameLayout split fingers between the - // game surface and on-screen buttons, in either finger-down order. root.isMotionEventSplittingEnabled = true surfaceView.setOnTouchListener { _, event -> if (!event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { @@ -761,9 +818,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }) scrollTouch = ScrollTouchGestures(PointerGestures.slop(this), android.view.ViewConfiguration.get(this).scaledMinimumFlingVelocity.toFloat(), scrollListener) - val noCursor = android.view.PointerIcon.getSystemIcon(this, android.view.PointerIcon.TYPE_NULL) - root.pointerIcon = noCursor - surfaceView.pointerIcon = noCursor + applyPlatformPointer(appUiOwnsPointer()) loading = LoadingState(this, steam = loadingMode() == SessionService.MODE_STEAM) if (!SessionState.running) { @@ -779,8 +834,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val needProton = protonUser && com.droiddeck.launcher.runtime.DesktopCatalog.protonSeedNeeded(this) if (needRuntime || needResume || needDesktop || needProton) installThenStart(needRuntime, needDesktop, needProton, needResume) } - hud = FusionHudHost(this) - hud.onConfigChanged = { hudConfig = FusionHudConfig.load(this) } + hud = DroidDeckHudHost(this) + hud.onConfigChanged = { hudConfig = DroidDeckHudConfig.load(this) } hud.passesTouchAt = ::controlTakesTouchAt hud.attach(root, root.childCount) memoryHud = com.droiddeck.launcher.session.MemoryHud(this) @@ -863,15 +918,25 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { isFocusableInTouchMode = true defaultFocusHighlightEnabled = false setContent { + val uiPointer = appUiOwnsPointer() androidx.compose.runtime.SideEffect { com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity, (drawerOpen || achievementsOpen || pcKeyboardOpen) && !pipUi && steamVrStatus != SteamVr.Status.RUNNING) } + androidx.compose.runtime.SideEffect { applyPlatformPointer(uiPointer) } androidx.compose.runtime.DisposableEffect(Unit) { onDispose { com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity, false) } } - androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi) { updatePointerCapture() } - androidx.compose.runtime.LaunchedEffect(pipUi) { hud.setHidden(pipUi) } + androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, inputSettingsOpen, pipUi, bottomOutputActive) { updatePointerCapture() } + androidx.compose.runtime.LaunchedEffect(bottomOutputActive) { hud.setHidden(pipUi || bottomOutputActive) } + androidx.compose.runtime.LaunchedEffect(pipUi) { + hud.setHidden(pipUi || bottomOutputActive) + applyOutputPacing() + if (pipUi != frameGenPip) { + frameGenPip = pipUi + if (FrameGen.engine(this@SessionActivity) != FrameGen.ENGINE_OFF && ::surfaceView.isInitialized) applyFrameGen() + } + } androidx.compose.runtime.LaunchedEffect(AgentGuest.steamKeyboard) { updateOnScreenControls() } androidx.compose.runtime.LaunchedEffect(AgentGuest.desktopTextField) { onDesktopTextField(AgentGuest.desktopTextField) } androidx.compose.runtime.LaunchedEffect(pipUi, pcKeyboardOpen) { updateDesktopKeyboardButton() } @@ -890,15 +955,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } androidx.compose.runtime.LaunchedEffect(picturePosition, SessionState.running, pipUi, cardboard.enabled) { applyGameAlignment() } - androidx.compose.runtime.LaunchedEffect(AgentGuest.focusRevision) { - val steamUi = SessionState.mode == SessionService.MODE_STEAM && kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { - AgentGuest.focus(this@SessionActivity)?.optLong("focusedApp")?.let { it <= 0 || it == 769L } ?: true - } - if (steamUi != steamUiFocused) { - steamUiFocused = steamUi - applySteamUiPacing() - } - } DroidDeckTheme { if (pipUi) { if (SessionState.suspended) androidx.compose.foundation.layout.Box( @@ -910,9 +966,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } else { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { - CursorOverlay({ cursorPos }, cursorVisible, resources.displayMetrics.density, + CursorOverlay({ cursorPos }, cursorVisible && !uiPointer && !bottomOutputActive, + resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) if (memoryHud.text.isNotEmpty()) HudText(memoryHud.text, hudColor, hudOpacity) + if (bottomOutputActive && !loading.visible) SwappedTopPanel() val phonePanel = glassesOutputActive && !loading.visible && !drawerOpen && !pcKeyboardOpen if (phonePanel) GlassesPhonePanel(glasses, steamVrStatus == SteamVr.Status.RUNNING, headTracking) if (trackingRecovery != null && !drawerOpen && !pcKeyboardOpen && !loading.visible) { @@ -950,7 +1008,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(android.graphics.Color.BLACK)) }, ) - LaunchedEffect(AgentGuest.focusRevision) { + LaunchedEffect(AgentGuest.focusRevision, secondScreenDisplays.isNotEmpty()) { val nextGame = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { if (SessionState.mode == SessionService.MODE_RUN) SessionState.program?.let { "program:$it" } else { @@ -963,7 +1021,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } } - if (nextGame != gestureGame) { gestureGame = nextGame; refreshGestureConfig() } + if (nextGame != gestureGame) { + if (nextGame != null) gameStarts++ + gestureGame = nextGame + refreshGestureConfig() + } + if (secondScreenDisplays.isNotEmpty()) kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { + runCatching { com.droiddeck.launcher.session.TelemetryOutput.applyAutomatic(this@SessionActivity, nextGame) } + } } LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, gestureSettingsOpen, inputSettingsOpen, pipUi, SessionState.suspended, resumed) { padBridge?.setInputEnabled(resumed && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen && !inputSettingsOpen && !pipUi && !SessionState.suspended) @@ -1141,7 +1206,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionAchievements(inFront.game, inFront.title, onClose = ::closeAchievements) } com.droiddeck.launcher.ui.AchievementNotificationOverlay() - // Auto and Native resume on their own as the session comes back; only a failed resume needs the button. val autoResume = suspendPolicy == SessionPrefs.SUSPEND_AUTO || suspendPolicy == SessionPrefs.SUSPEND_NATIVE LaunchedEffect(SessionState.manualPause, SessionState.suspended) { if (!SessionState.manualPause && !SessionState.suspended) pauseAnimated = false @@ -1181,7 +1245,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { @androidx.compose.runtime.Composable private fun SessionMenu(docked: Boolean) { - SessionDrawer(drawerOpen, drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, docked = docked, + SessionDrawer(drawerOpen || (docked && drawerPinned), drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, docked = docked, backRequest = drawerBackRequests, onLayerChange = { drawerLayerOpen = it }, a = DrawerActions( steam = SessionState.mode == SessionService.MODE_STEAM, direct = noSteamSession(), @@ -1218,11 +1282,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct), fexPreset = fexPreset, secondScreenMode = secondScreenMode, + secondScreenNone = !bottomOutputActive && !dockDrawer(), + gameOnBottom = bottomOutputActive, + gameSwapAvailable = bottomSwapAvailable, + onGameOnBottom = { on -> drawerOpen = false; putGameOnBottom(on) }, + dashboardAvailable = bottomPages().isNotEmpty(), + desktopAvailable = com.droiddeck.launcher.session.BottomDesktop.available(), secondScreenDisplays = secondScreenDisplays, selectedSecondScreenDisplay = selectedSecondScreenDisplay, onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() }, - onHudSetting = { key, value -> hudConfig = FusionHudConfig.set(this@SessionActivity, key, value); hud.applyConfig() }, - onHudReset = { hudConfig = FusionHudConfig.reset(this@SessionActivity); hud.applyConfig() }, + onHudSetting = { key, value -> hudConfig = DroidDeckHudConfig.set(this@SessionActivity, key, value); hud.applyConfig() }, + onHudReset = { hudConfig = DroidDeckHudConfig.reset(this@SessionActivity); hud.applyConfig() }, onHudExport = { exportHudDiagnostics() }, onUpscaler = { m -> SessionPrefs.setUpscaler(this@SessionActivity, m); upscaler = m @@ -1289,6 +1359,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.session.InputSysfsComponent.padTypeChanged(SessionPrefs.padType(id)) padType = id }, + backHold = backHold, + onBackHold = { on -> + SessionPrefs.setBackHold(this@SessionActivity, on) + backHold = on + }, backActionsInverted = backActionsInverted, backDoubleTapMs = backDoubleTapMs, onBackDoubleTapMs = { ms -> @@ -1309,7 +1384,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onEvdevMouse = { on -> SessionPrefs.setEvdevMouse(this@SessionActivity, on) evdevMouseOn = on - if (on) { if (pointerLocked) openEvdevMouse() } else releaseEvdevMouse() + if (on) { if (programLocksPointer()) openEvdevMouse() } else releaseEvdevMouse() }, directCursor = directCursorOn, onDirectCursor = { on -> @@ -1348,7 +1423,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.input.GesturePrefs.save(this@SessionActivity, gestureGame, base.copy(directHoldBehavior = value)) refreshGestureConfig() }, - onScreenKeys = { drawerOpen = false; screenKeys?.startEditing() }, + relativeMouseMode = relativeMouseMode, + onRelativeMouseMode = { mode -> + val base = com.droiddeck.launcher.input.GesturePrefs.read(this@SessionActivity, gestureGame) + com.droiddeck.launcher.input.GesturePrefs.save(this@SessionActivity, gestureGame, base.copy(relativeMouseMode = mode)) + relativeMouseMode = mode + setRelativeMouse(mode) + }, + onScreenKeys = { if (screenKeysShown) { drawerOpen = false; screenKeys?.startEditing() } }, screenKeysShown = screenKeysShown, onScreenKeysShown = { shown -> screenKeysShown = shown @@ -1409,6 +1491,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } }, onClose = { drawerOpen = false }, + onDismissScreen = if (docked) ({ selectSecondScreenMode(SecondScreenMode.NONE) }) else null, components = drawerComponents, onComponentsRefresh = { refreshDrawerComponents() @@ -1493,7 +1576,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { )) } - /** The SteamVR driver switches pad sticks between hands and game on both stick clicks together. */ private fun switchVrSticks() { padBridge?.triggerVrStickSwitch() } @@ -1855,7 +1937,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { unfoldedControlsWithController = SessionPrefs.unfoldedControlsWithController(this) picturePosition = SessionPrefs.picturePosition(this) hudOn = SessionPrefs.hudEnabled(this) - hudConfig = FusionHudConfig.load(this) + hudConfig = DroidDeckHudConfig.load(this) hudColor = SessionPrefs.hudColor(this) hudOpacity = SessionPrefs.hudOpacity(this) upscaler = SessionPrefs.upscaler(this) @@ -1891,6 +1973,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode) steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) oscMode = SessionPrefs.oscMode(this) + backHold = SessionPrefs.backHold(this) backActionsInverted = SessionPrefs.backActionsInverted(this) physicalShortcuts.bindings = PhysicalShortcuts.read(this) backDoubleTapMs = SessionPrefs.backDoubleTapMs(this) @@ -1940,7 +2023,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } if (problem == null) SessionEvents.record("package.ready") else failedComponent = "package" } - if (problem == null && desktop && !SessionState.stopRequested) { + if (problem == null && desktop && !SessionState.stopRequested && + !((runtime || resume) && com.droiddeck.launcher.runtime.DesktopCatalog.desktopInstalled(this))) { if (activeInstallWorker === worker) SessionState.installing = "desktop" SessionEvents.transition(SessionPhase.INSTALLING_RUNTIME, "desktop.installing", mapOf("component" to "desktop")) problem = installDesktop() @@ -2085,7 +2169,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { 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() + if (!SessionState.running) SessionState.refreshHz = refreshHz(holder) val panel = panelBounds() SessionState.upscaleRatio = maxOf(panel.width(), panel.height()).toFloat() / maxOf(size.first, size.second).coerceAtLeast(1) Thread({ @@ -2135,7 +2219,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { CompositorHost.startOrAttach( this, holder.surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, - applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(), outputFpsLimit(), steamUiLimit(refreshHz()), + applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(holder), outputFpsLimit(), ) onOutputAttached(holder) if (SessionState.running && size != previous) { @@ -2177,8 +2261,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun windowOutputSize(width: Int, height: Int): Pair? { if (isInPictureInPictureMode || width <= 0 || height <= 0) return null + if (bottomGame != null) return when { + SessionState.followScreen -> + com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, false, SessionState.followScale) + resolutionChoice() == com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN -> + (width and 1.inv()) to (height and 1.inv()) + else -> null + } return if (SessionState.followScreen) - com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, controlsBelowWanted()) + com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, controlsBelowWanted(), SessionState.followScale) else if (glassesScreen == null) outputSize() else null } @@ -2193,10 +2284,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { WaylandCompositor.nativeResizeOutput(size.first, size.second) } + private fun followScale(): Float { + val mode = displayMode() + val choice = SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) + return com.droiddeck.launcher.session.SessionDisplay.followScale(choice) ?: 1f + } + private fun followChoice(): Boolean { val mode = displayMode() - return SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) == - com.droiddeck.launcher.session.SessionDisplay.FOLLOW_SCREEN + return com.droiddeck.launcher.session.SessionDisplay.isFollow( + SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this))) } private fun applyFollowOrientation(config: android.content.res.Configuration) { @@ -2216,19 +2313,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun surfaceDestroyed(holder: SurfaceHolder) { - // Hiding the phone surface after a handoff delivers a late destruction - // callback. It must not reset the new output's size or attachment. if (holder !== outputHolder()) return - cancelTouchGestures() + cancelOutputTouches() surfaceW = 0 surfaceH = 0 glassesOutputActive = false + bottomOutputActive = false + if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(false) CompositorHost.detach(holder.surface) + bottomGame?.takeIf { it.holder === holder }?.let { screen -> uiHandler.post { recoverBottomOutput(screen) } } } private fun cancelTouchGestures() { if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel() if (::touchpad.isInitialized) touchpad.cancel() + if (::directTouchHold.isInitialized) directTouchHold.cancel() if (::scrollTouch.isInitialized) scrollTouch.cancel() scrollTouchGesture = false gesturePointerReady = false @@ -2246,19 +2345,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun displayMode(): String = SessionPrefs.displayMode(this, intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM, intent.getStringExtra(SessionService.EXTRA_PROGRAM)) - private fun outputSize(): Pair { + private fun outputSize(): Pair = + com.droiddeck.launcher.session.SessionDisplay.resolveChoice(com.droiddeck.launcher.session.SessionDisplay.panelSize(this), + resolutionChoice(), SessionPrefs.portrait(this) && !controlsBelowWanted()) + + private fun resolutionChoice(): String { val mode = displayMode() - val panel = com.droiddeck.launcher.session.SessionDisplay.panelSize(this) val program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) - val choice = if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && + return if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && 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, - SessionPrefs.portrait(this) && !controlsBelowWanted()) + else SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) } - private fun refreshHz(): Float { + private fun refreshHz(): Float = refreshHz(null) + + private fun refreshHz(holder: SurfaceHolder?): Float { + bottomGame?.takeIf { if (holder != null) holder === it.holder else bottomOutputActive } + ?.hz?.takeIf { it > 1f }?.let { return minOf(it, PerfMode.peakRefreshCap(this)) } glassesScreen?.hz?.takeIf { it > 1f }?.let { return it } val display = if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay val wanted = window.attributes.preferredDisplayModeId @@ -2273,25 +2377,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun mirrorRefreshLimit(): Int = GlassesRendering.mirrorRefreshLimit(glassesSettings, glasses, glassesScreen != null) - private fun outputFpsLimit(): Int = SessionPrefs.compositorFpsLimit(mirrorRefreshLimit(), if (noSteamSession()) SessionState.fpsLimit else 0) + private fun outputFpsLimit(): Int = outputFpsLimit(pipUi) - private fun steamUiLimit(hz: Float): Int = - if (steamUiFocused && SessionPrefs.steamUiPacing(this)) SessionPrefs.steamUiFpsLimit(hz) else 0 - - private fun applySteamUiPacing() { - if (!CompositorHost.isStarted) return - val hz = refreshHz() - val limit = steamUiLimit(hz) - CompositorHost.updatePacing(hz, outputFpsLimit(), limit) - Log.i(TAG, "pacing: " + if (limit > 0) "Steam UI at $limit fps on a ${Math.round(hz)} Hz screen" else "uncapped") - } + private fun outputFpsLimit(pip: Boolean): Int = + SessionPrefs.compositorFpsLimit(mirrorRefreshLimit(), if (noSteamSession()) SessionState.fpsLimit else 0, pip) private fun applyOutputPacing() { - Log.i(TAG, "perf: " + PerfMode.apply(this, outputFpsLimit(), mirrorRefreshLimit())) + Log.i(TAG, "perf: " + PerfMode.apply(this, outputFpsLimit(false), mirrorRefreshLimit())) if (CompositorHost.isStarted) { val hz = refreshHz() val changed = kotlin.math.abs(SessionState.refreshHz - hz) > 0.1f - CompositorHost.updatePacing(hz, outputFpsLimit(), steamUiLimit(hz)) + CompositorHost.updatePacing(hz, outputFpsLimit()) pushCardboard(activeCardboard) if (changed && ::surfaceView.isInitialized) applyFrameGen() } @@ -2299,8 +2395,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun applyFrameGen() { val hz = refreshHz() + val pip = pipUi && mirrorRefreshLimit() <= 0 + val request = frameGenRequests.incrementAndGet() Thread({ - val problem = FrameGen.apply(this, hz) + val problem = synchronized(frameGenRequests) { + if (request != frameGenRequests.get()) return@Thread + if (pip) FrameGen.apply(this, FrameGen.Mode.OFF, hz) else FrameGen.apply(this, hz) + } val state = Lossless.state(this) runOnUiThread { lossless = state @@ -2621,38 +2722,39 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return true } if ((pcKeyboardOpen || achievementsOpen || inputSettingsOpen) && fromController) return super.dispatchKeyEvent(event) + if (!fromController && event.keyCode != KeyEvent.KEYCODE_BACK && sendToTopDesktop(event)) return true if (joyConVr?.onKeyEvent(event) == true) return true if (fromController && event.keyCode != KeyEvent.KEYCODE_BACK && padMouseMode() && padMouse.onKey(event)) return true if (event.keyCode != KeyEvent.KEYCODE_BACK && padBridge?.onKeyEvent(event) == true) return true - if (CompositorHost.isStarted && event.keyCode != KeyEvent.KEYCODE_BACK && !fromController) { + val keyboardKey = event.keyCode != KeyEvent.KEYCODE_BACK || + com.droiddeck.launcher.input.GuestKeys.isKeyboardEscape(event.keyCode, event.scanCode) + if (CompositorHost.isStarted && keyboardKey && !fromController) { val down = event.action == KeyEvent.ACTION_DOWN if (down && event.repeatCount > 0) return true - if (down || event.action == KeyEvent.ACTION_UP) { - var evdev = EvdevKeys.fromKeyCode(event.keyCode) - val ch = event.unicodeChar - val plain = if (ch > 0) EvdevKeys.unshiftedChar(ch) else 0 - if (evdev <= 0 && ch > 0) { - val code = EvdevKeys.fromKeyCode(EvdevKeys.keycodeForChar(if (plain != 0) plain else ch)) - if (code > 0) evdev = code - } - val shiftEvdev = if (evdev > 0 && plain != 0 && event.deviceId <= 0) 42 else 0 - if (evdev <= 0 && event.scanCode > 0) evdev = event.scanCode - if (evdev > 0) { - val owner = if (event.deviceId <= 0) 16 else 8 - if (down) { - if (shiftEvdev != 0) sendGuestKey(shiftEvdev, true, owner) - sendGuestKey(evdev, true, owner) - } else { - sendGuestKey(evdev, false, owner) - if (shiftEvdev != 0) sendGuestKey(shiftEvdev, false, owner) - } - return true - } - } + val owner = if (event.deviceId <= 0) 16 else 8 + if (com.droiddeck.launcher.input.GuestKeys.send(event) { code, pressed -> sendGuestKey(code, pressed, owner) }) return true } return super.dispatchKeyEvent(event) } + private fun sendToTopDesktop(event: KeyEvent): Boolean { + val key = event.deviceId to event.keyCode + val owned = if (event.action == KeyEvent.ACTION_UP) topDesktopKeys.remove(key) else topDesktopFocused() + if (!owned || !super.dispatchKeyEvent(event)) return false + if (event.action == KeyEvent.ACTION_DOWN) topDesktopKeys += key + return true + } + + private fun topDesktopFocused(): Boolean { + if (!bottomOutputActive) return false + var view: View? = currentFocus + while (view != null) { + if (view is com.droiddeck.launcher.ui.BottomDesktopPanel) return true + view = view.parent as? View + } + return false + } + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { if (pipUi) return true notePress(event) @@ -2675,14 +2777,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (joyConVr?.onMotionEvent(event) == true) return true if (PadBridge.isControllerMotionEvent(event) && padMouseMode() && padMouse.onMotion(event)) return true if (padBridge?.onMotionEvent(event) == true) return true - if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE) && !drawerOpen && onMouse(event)) return true + if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE) && !drawerOpen) { + if (appUiOwnsPointer()) { + if (super.dispatchGenericMotionEvent(event)) return true + if (touchEditorOpen) return false + if (onMouse(event)) return true + return false + } + if (onMouse(event)) return true + } return super.dispatchGenericMotionEvent(event) } override fun dispatchTrackballEvent(event: MotionEvent): Boolean = onCapturedPointer(event) || super.dispatchTrackballEvent(event) - /** Whether one of the on-screen control layers takes a finger going down at this screen point. */ private fun controlTakesTouchAt(rawX: Float, rawY: Float): Boolean { val at = IntArray(2) fun takes(view: View, hit: (Float, Float) -> Boolean): Boolean { @@ -2790,16 +2899,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun focusDrawer(): Boolean = dockedMenu()?.focusMenu() ?: sessionOverlay.requestFocus() private fun dockDrawer(): Boolean { - if (pipUi || !started || glassesScreen != null || !::displayManager.isInitialized) return false - if (!SessionPrefs.dualScreenLauncher(this)) return false - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return false + if (pipUi || !started || glassesScreen != null || bottomGame != null || !::displayManager.isInitialized) return false + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return false if (secondScreenDisplays.none { it.id == target.displayId }) return false val shown = secondScreenPresentation?.display?.displayId return shown == null || shown == target.displayId } private fun openDockedMenu(): Boolean { - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return false + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return false return try { val presentation = secondScreenPresentation ?: secondScreenPresentation(target).also { selectedSecondScreenDisplay = target.displayId @@ -2826,9 +2934,48 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun layoutNames(): List = com.droiddeck.launcher.input.ControllerPrefs.screenLayouts(this).keys.sorted() + private val relativeMouseRequests = java.util.concurrent.Executors.newSingleThreadExecutor { runnable -> + Thread(runnable, "relative-mouse").apply { isDaemon = true } + } + @Volatile private var desiredRelativeMouseMode = 0 + + @Volatile private var relativeMouseRetries = 0 + + private fun setRelativeMouse(mode: Int) { + desiredRelativeMouseMode = mode + relativeMouseRetries = 0 + requestRelativeMouse() + } + + private fun requestRelativeMouse() { + runCatching { relativeMouseRequests.execute { applyRelativeMouse() } } + } + + private fun applyRelativeMouse() { + val mode = desiredRelativeMouseMode + if (appliedRelativeMouseMode == mode) return + val request = org.json.JSONObject() + .put("kind", "exec") + .put("argv", org.json.JSONArray(listOf("gamescopectl", "relative_mouse", mode.toString()))) + .put("timeout", 5.0) + val result = runCatching { AgentGuest.call(this, request, 8_000, trusted = true) } + val answer = result.getOrNull() + val applied = answer?.optBoolean("ok") == true + && answer.optInt("exitCode", -1) == 0 + && !answer.optBoolean("timedOut") + if (applied) appliedRelativeMouseMode = mode + else { + Log.w(TAG, "gamescope did not take relative mouse $mode: ${result.exceptionOrNull() ?: answer}") + if (relativeMouseRetries++ < RELATIVE_MOUSE_MAX_RETRIES) uiHandler.postDelayed({ requestRelativeMouse() }, 2_000) + } + if (desiredRelativeMouseMode != mode) requestRelativeMouse() + } + private fun refreshGestureConfig() { gestureConfig = com.droiddeck.launcher.input.GesturePrefs.read(this, gestureGame) directHoldBehavior = gestureConfig.directHoldBehavior + relativeMouseMode = gestureConfig.relativeMouseMode + setRelativeMouse(relativeMouseMode) gestureTouchStreamGate.reset() if (::touchscreenGestures.isInitialized) touchscreenGestures.configure(gestureConfig) if (::directTouchHold.isInitialized) directTouchHold.configure(gestureConfig) @@ -2860,9 +3007,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun prepareRelativePan() { if (pointerLocked) return val rect = drawnRect() ?: return - // Gamescope retains the last absolute position while a game can warp - // its own cursor to the center. Its first unlocked motion must start - // from that same origin, before the game switches to pointer lock. moveTo(rect.centerX(), rect.centerY()) } override fun key(code: Int, down: Boolean) { @@ -2889,6 +3033,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onWheel(steps: Int) { sendSceneWheel(steps) } override fun onScroll(dx: Float, dy: Float) = fingerScroll(dx, dy) override fun onScrollEnd() = fingerScrollEnd() + override fun onThreeFingerTap(): Boolean { + uiHandler.post { togglePcKeyboard() } + return true + } override fun onZoom(steps: Int) { heldKeys.set(128, KEY_LEFTCTRL, true) sendSceneWheel(steps) @@ -2905,7 +3053,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) - WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) cursorVisible = false } override fun onButton(button: Int, pressed: Boolean) { @@ -2933,7 +3081,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { scrollRestY = 0f val rect = drawnRect() ?: return val x = rect.left + rect.width() * PAD_SCROLL_POINTER_X - WaylandCompositor.nativeSendPointer(1, InputSpace.x(x, surfaceView.width), InputSpace.y(rect.centerY(), surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(x, outputView().width), InputSpace.y(rect.centerY(), outputView().height)) cursorVisible = false } override fun onScroll(dx: Float, dy: Float) = scrollListener.onScroll(dx, dy) @@ -2986,10 +3134,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun placeTouchpadAtGuest(rect: android.graphics.RectF) { - if (pointerLocked || !CompositorHost.isStarted || surfaceView.width <= 0 || surfaceView.height <= 0) return + if (pointerLocked || !CompositorHost.isStarted || outputView().width <= 0 || outputView().height <= 0) return if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return - val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width - val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * outputView().width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * outputView().height if (rect.contains(x, y)) touchpad.place(x, y) } @@ -3001,12 +3149,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { cursorVisible = false } - private fun movePointer(x: Float, y: Float) { + private fun movePointer(x: Float, y: Float, fromMouse: Boolean = false) { val rect = drawnRect() ?: return val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) - WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) - showCursor(cx, cy) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) + showCursor(cx, cy, fromMouse) } private fun moveInputPointer(dx: Float, dy: Float) { @@ -3029,21 +3177,34 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (inputUsesPointer && !pointerLocked) return lastPadInputMs = android.os.SystemClock.uptimeMillis() uiHandler.removeCallbacks(cursorHide) + mouseOwnsCursor = false cursorVisible = false } - private fun showCursor(x: Float, y: Float) { + private fun moveCapturedMouse(dx: Float, dy: Float) { + val rect = drawnRect() ?: return + val scale = sceneScale(rect) + WaylandCompositor.sendPointerDelta(dx, dy) + showCursor( + (cursorPos.x + dx / scale).coerceIn(rect.left, rect.right), + (cursorPos.y + dy / scale).coerceIn(rect.top, rect.bottom), + fromMouse = true, + ) + } + + private fun showCursor(x: Float, y: Float, fromMouse: Boolean = false) { cursorPos = androidx.compose.ui.geometry.Offset(x, y) syncClientCursor() + mouseOwnsCursor = fromMouse uiHandler.removeCallbacks(cursorResync) cursorResyncIdle = 0 - if (!touchDrivesPointer()) uiHandler.postDelayed(cursorResync, 60) + if (fromMouse || !touchDrivesPointer()) uiHandler.postDelayed(cursorResync, 60) if (clientHidesCursor) { cursorVisible = false; return } - if (!inputUsesPointer && directTouchCursorHidden()) { cursorVisible = false; return } + if (!inputUsesPointer && !fromMouse && directTouchCursorHidden()) { cursorVisible = false; return } if (!inputUsesPointer && android.os.SystemClock.uptimeMillis() - lastPadInputMs < CURSOR_PAD_HOLD_MS) return cursorVisible = true uiHandler.removeCallbacks(cursorHide) - if (SessionState.mode == SessionService.MODE_STEAM && SessionState.steamUi != "desktop") uiHandler.postDelayed(cursorHide, 2500) + if (!fromMouse && SessionState.mode == SessionService.MODE_STEAM && SessionState.steamUi != "desktop") uiHandler.postDelayed(cursorHide, 2500) } private fun touchDrivesPointer(): Boolean = @@ -3093,25 +3254,41 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { .filter { glassesScreen == null || it.id != glasses.displayId } val oldIds = secondScreenDisplays.map { it.id }.toSet() secondScreenDisplays = candidates + bottomSwapAvailable = bottomGame != null || bottomGameDisplay() != null val newIds = candidates.map { it.id }.toSet() if (secondScreenMode != SecondScreenMode.NONE && oldIds.isNotEmpty() && selectedSecondScreenDisplay !in newIds) { closeSecondScreen(reset = true) + SessionState.secondScreenAutoOpened = false return } if (selectedSecondScreenDisplay !in newIds) selectedSecondScreenDisplay = candidates.firstOrNull()?.id ?: -1 - if (secondScreenMode != SecondScreenMode.NONE && candidates.isEmpty()) closeSecondScreen(reset = true) - else if (started && secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode) + if (secondScreenMode != SecondScreenMode.NONE && candidates.isEmpty()) { + closeSecondScreen(reset = true) + SessionState.secondScreenAutoOpened = false + } else if (started && secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode) + else if (started && !ended && ::loading.isInitialized && !loading.visible) openDualScreenControls() updateKeyboardRoute() } private fun openDualScreenControls() { if (SessionState.secondScreenAutoOpened || secondScreenMode != SecondScreenMode.NONE || pipUi) return if (!SessionPrefs.dualScreenSessionControls(this)) return - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return if (secondScreenDisplays.none { it.id == target.displayId }) return SessionState.secondScreenAutoOpened = true selectedSecondScreenDisplay = target.displayId - selectSecondScreenMode(SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad)) + selectSecondScreenMode(SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad, bottomPages().isNotEmpty(), + com.droiddeck.launcher.session.BottomDesktop.available())) + dualControlsProvisional = ::loading.isInitialized && loading.visible + } + + private fun settleDualScreenControls() { + if (!dualControlsProvisional || pipUi || !started || (::loading.isInitialized && loading.visible)) return + dualControlsProvisional = false + if (secondScreenMode == SecondScreenMode.NONE) return + val wanted = SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad, bottomPages().isNotEmpty(), + com.droiddeck.launcher.session.BottomDesktop.available()) + if (wanted != secondScreenMode) selectSecondScreenMode(wanted) else secondScreenPresentation?.retryTerminal() } private fun selectSecondScreenDisplay(displayId: Int) { @@ -3121,7 +3298,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (secondScreenMode != SecondScreenMode.NONE) showSecondScreen(secondScreenMode) } + private fun closeBottomPanel() { + if (dockDrawer()) drawerOpen = true else selectSecondScreenMode(SecondScreenMode.NONE) + } + private fun selectSecondScreenMode(mode: SecondScreenMode) { + dualControlsProvisional = false if (mode == SecondScreenMode.NONE) { closeSecondScreen(reset = true) return @@ -3143,6 +3325,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) return } + if (com.droiddeck.launcher.input.DualScreen.taken(target.displayId) || bottomGame?.display?.displayId == target.displayId) { + if (secondScreenPresentation != null) closeSecondScreen(reset = false) + secondScreenMode = mode + SessionState.secondScreenMode = mode + return + } var presentation = secondScreenPresentation if (presentation?.display?.displayId != target.displayId) { dropDockedDrawer() @@ -3170,20 +3358,117 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { sendWheel = ::sendSceneWheel, onSteamMenu = ::tapSteamButton, onQam = ::tapQam, - onClose = { selectSecondScreenMode(SecondScreenMode.NONE) }, + onClose = ::closeBottomPanel, pad = padBridge, - pointerPosition = { - drawnRect()?.takeIf { cursorPos.x >= 0f && cursorPos.y >= 0f }?.let { - androidx.compose.ui.geometry.Offset((cursorPos.x - it.left) / it.width(), (cursorPos.y - it.top) / it.height()) + pointerPosition = ::secondScreenPointerPosition, + onKeyboardClosed = ::bottomKeyboardClosed, + onMenu = { drawerOpen = true }, + onMenuTouched = { + if (drawerPinned) { + drawerPinned = false + drawerOpenState = true + updateKeyboardRoute() } }, - onKeyboardClosed = ::bottomKeyboardClosed, - onMenu = if (dockDrawer()) ({ drawerOpen = true }) else null, menu = { DroidDeckTheme { SessionMenu(docked = true) } }, + onSwap = if (bottomSwapAvailable && com.droiddeck.launcher.input.DualScreen.builtIn(target)) ({ putGameOnBottom(true) }) else null, + dashboard = if (bottomPages().isEmpty()) null else ({ + DroidDeckTheme { + BottomDashboard( + bottomPages(), com.droiddeck.launcher.ui.SessionBottomTab.picked(SessionState.sessionId), + gameStarts = gameStarts, + onPage = { com.droiddeck.launcher.ui.SessionBottomTab.pick(SessionState.sessionId, it) }, + strip = { pageId -> + com.droiddeck.launcher.ui.SessionBottomStrip(pageId) { if (::hud.isInitialized) hud.liveFps else null } + }, + ) + } + }), ) + private fun bottomPages(): List = sessionBottomPages(BottomPageActions( + takeScreenshot = ::captureScreenshot, + fps = { if (::hud.isInitialized) hud.liveFps else null }, + openSettings = ::openSettingsBelow, + runningGame = { gestureGame }, + )) + + private fun openSettingsBelow(intent: android.content.Intent, done: () -> Boolean) { + val presentation = secondScreenPresentation + if (presentation == null) { + if (!bottomOutputActive) return + listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { + runCatching { startActivity(android.content.Intent(it)) } + .onFailure { e -> Log.w(TAG, "could not open ${it.action}", e) } + .isSuccess + } + return + } + val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(presentation.display.displayId) + val opened = listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { + runCatching { startActivity(android.content.Intent(it).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK), options.toBundle()) } + .onFailure { e -> Log.w(TAG, "could not open ${it.action} on display ${presentation.display.displayId}", e) } + .isSuccess + } + if (!opened) return + presentation.hide() + var checks = 0 + fun showAgain() { + try { + presentation.show() + } catch (e: Exception) { + Log.w(TAG, "could not show the dashboard again", e) + if (secondScreenPresentation === presentation) closeSecondScreen(reset = true) + } + } + uiHandler.postDelayed(object : Runnable { + override fun run() { + if (secondScreenPresentation !== presentation || presentation.isShowing) return + if (done()) { + showAgain() + return + } + if (++checks < SETTINGS_WATCH_CHECKS) uiHandler.postDelayed(this, SETTINGS_WATCH_MS) else showAgain() + } + }, SETTINGS_WATCH_MS) + } + + private fun captureScreenshot(onDone: (Boolean) -> Unit) { + val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (bottomOutputActive) bottomGame?.surfaceView + else if (::surfaceView.isInitialized) surfaceView else null + val width = source?.width ?: 0 + val height = source?.height ?: 0 + if (source == null || width <= 0 || height <= 0 || source.holder.surface?.isValid != true) { + onDone(false) + return + } + val bitmap = try { + android.graphics.Bitmap.createBitmap(width, height, android.graphics.Bitmap.Config.ARGB_8888) + } catch (_: OutOfMemoryError) { + onDone(false) + return + } + try { + android.view.PixelCopy.request(source, bitmap, { result -> + if (result != android.view.PixelCopy.SUCCESS) { + bitmap.recycle() + onDone(false) + return@request + } + Thread { + val saved = com.droiddeck.launcher.session.BottomScreenshots.save(applicationContext, bitmap) + bitmap.recycle() + runOnUiThread { onDone(saved) } + }.start() + }, uiHandler) + } catch (_: IllegalArgumentException) { + bitmap.recycle() + onDone(false) + } + } + private fun tapSteamButton() { if (SessionState.mode == SessionService.MODE_STEAM) padBridge?.triggerSteamMenu() } @@ -3222,7 +3507,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun controlsBelowWanted(): Boolean { - if (!::sessionRoot.isInitialized || glassesScreen != null || cardboard.enabled) return false + if (!::sessionRoot.isInitialized || glassesScreen != null || bottomGame != null || cardboard.enabled) return false return SessionPrefs.controlsBelowWanted(this, SessionState.mode, sessionRoot.width, sessionRoot.height, pipUi || isInPictureInPictureMode) } @@ -3253,7 +3538,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (panel == null) { panel = com.droiddeck.launcher.ui.DeckControlsPanel(this, onClose = { chooseUnfoldedControls(false) }, onSteamMenu = ::tapSteamButton, onQam = ::tapQam, pad = padBridge, inputRole = InputRole.PRIMARY, - portraitDock = !com.droiddeck.launcher.session.SessionDisplay.foldable(this)) + portraitDock = !com.droiddeck.launcher.session.SessionDisplay.foldable(this), onMenu = { drawerOpen = true }) sessionRoot.addView(panel, sessionRoot.indexOfChild(surfaceView) + 1) unfoldedPanel = panel updateOnScreenControls() @@ -3261,6 +3546,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { panel.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, height - gameHeight, Gravity.BOTTOM) } + private fun secondScreenPointerPosition(): androidx.compose.ui.geometry.Offset? = + drawnRect()?.takeIf { cursorPos.x >= 0f && cursorPos.y >= 0f }?.let { + androidx.compose.ui.geometry.Offset((cursorPos.x - it.left) / it.width(), (cursorPos.y - it.top) / it.height()) + } + private fun moveSecondScreenPointer(x: Float, y: Float, width: Float, height: Float) { if (width <= 0f || height <= 0f) return val nx = (x / width).coerceIn(0f, 1f) @@ -3268,15 +3558,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val px = rect.left + nx * rect.width() val py = rect.top + ny * rect.height() - WaylandCompositor.nativeSendPointer(1, InputSpace.x(px, surfaceView.width), InputSpace.y(py, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(px, outputView().width), InputSpace.y(py, outputView().height)) showCursor(px, py) } private fun openBottomKeyboard() { if (!started) return if (secondScreenPresentation?.showsKeyboard != true && dockDrawer()) { - val target = com.droiddeck.launcher.input.DualScreen.display(this, displayManager, shownOnDisplayId) ?: return - if (drawerOpen) drawerOpen = false + val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return + if (drawerOpen || drawerPinned) drawerOpen = false typingReturnMode = secondScreenMode selectedSecondScreenDisplay = target.displayId selectSecondScreenMode(SecondScreenMode.KEYBOARD_TRACKPAD) @@ -3301,6 +3591,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun dropDockedDrawer() { + drawerPinned = false if (!drawerDocked) return drawerDocked = false drawerLayerOpen = false @@ -3436,8 +3727,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun drawnRect(): android.graphics.RectF? { - val width = surfaceView.width.takeIf { it > 0 } ?: return null - val height = surfaceView.height.takeIf { it > 0 } ?: return null + val width = outputView().width.takeIf { it > 0 } ?: return null + val height = outputView().height.takeIf { it > 0 } ?: return null topPictureMapped = CompositorHost.isStarted && WaylandCompositor.nativeGamePictureRect(gamePictureBounds) if (topPictureMapped) return android.graphics.RectF( gamePictureBounds[0], gamePictureBounds[1], gamePictureBounds[2], gamePictureBounds[3]) @@ -3451,12 +3742,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private var ignoreGameTouch = false + private var lockedTouchTurns = false + private var touchEditorOpen by mutableStateOf(false) + private var lockedSwipeUsed = false + private var lockedSwipeX = 0f + private var lockedSwipeY = 0f private var dismissTouch = false override fun onTouchEvent(event: MotionEvent): Boolean { if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE)) return onMouse(event) if (drawerOpen && drawerDocked && event.actionMasked == MotionEvent.ACTION_DOWN) { - drawerOpen = false + drawerLayerOpen = false + drawerOpenState = false + drawerPinned = true + updateKeyboardRoute() dismissTouch = true } if (dismissTouch) { @@ -3490,11 +3789,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } com.droiddeck.launcher.input.TouchRouter.Route.SCROLL -> scrollTouch.onTouch(event) else -> { + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + val inPicture = drawnRect()?.let { !topPictureMapped || it.contains(event.x, event.y) } ?: false + lockedTouchTurns = programLocksPointer() && inPicture && route != com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD + } if (com.droiddeck.launcher.input.TouchRouter.steamKeyboardZone(snapshot)) { val wasActive = threeFingerTap.active if (threeFingerTap.onTouch(event)) padBridge?.triggerSteamKeyboard() if (threeFingerTap.active && !wasActive) { - if (route == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD) touchpad.cancel() + if (route == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD || lockedTouchTurns) touchpad.cancel() else { directTouchHold.cancel() WaylandCompositor.nativeSendTouch(3, -1, 0, 0) @@ -3502,7 +3805,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } if (threeFingerTap.active || wasActive) return true } - if (route == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD) { + if (route == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD || lockedTouchTurns) { val rect = drawnRect() ?: return false if (touchpad.bounds != rect) { val fresh = touchpad.bounds.width() <= 1f @@ -3533,7 +3836,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) WaylandCompositor.nativeSendTouch(action, pointerId, - InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) showCursor(cx, cy) } @@ -3554,8 +3857,25 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun forwardTouch(event: MotionEvent, rect: android.graphics.RectF): Boolean { + val swipeX = lockedSwipeX + val swipeY = lockedSwipeY + lockedSwipeX = event.x + lockedSwipeY = event.y + if ((event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) && lockedSwipeUsed) { + lockedSwipeUsed = false + directTouchHold.cancel() + return true + } + if (event.actionMasked == MotionEvent.ACTION_DOWN) lockedSwipeUsed = false + if (programLocksPointer() && event.actionMasked == MotionEvent.ACTION_MOVE) { + lockedSwipeUsed = true + directTouchHold.cancelPendingHold() + val scale = sceneScale(rect) + sendSceneDelta((event.x - swipeX) * scale, (event.y - swipeY) * scale) + return true + } if (event.actionMasked == MotionEvent.ACTION_DOWN) { - showCursor(event.x.coerceIn(rect.left, rect.right), event.y.coerceIn(rect.top, rect.bottom)) + if (!pointerLocked) showCursor(event.x.coerceIn(rect.left, rect.right), event.y.coerceIn(rect.top, rect.bottom)) if (WaylandCompositor.nativeFocusTakesTouch()) { listOf(PointerGestures.BTN_LEFT, PointerGestures.BTN_RIGHT, PointerGestures.BTN_MIDDLE).forEach { heldButtons.set(1, it, false) @@ -3569,12 +3889,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun onMouse(event: MotionEvent): Boolean { when (event.actionMasked) { MotionEvent.ACTION_HOVER_MOVE, MotionEvent.ACTION_MOVE, MotionEvent.ACTION_HOVER_ENTER -> - if (evdevMouseActive) sendMouseDelta(event.x, event.y) else movePointer(event.x, event.y) + if (evdevMouseActive) sendMouseDelta(event.x, event.y) else movePointer(event.x, event.y, fromMouse = true) MotionEvent.ACTION_BUTTON_PRESS, MotionEvent.ACTION_BUTTON_RELEASE -> { - if (evdevMouseActive) sendMouseDelta(event.x, event.y) else movePointer(event.x, event.y) + if (evdevMouseActive) sendMouseDelta(event.x, event.y) else movePointer(event.x, event.y, fromMouse = true) val button = when (event.actionButton) { MotionEvent.BUTTON_SECONDARY -> PointerGestures.BTN_RIGHT MotionEvent.BUTTON_TERTIARY -> PointerGestures.BTN_MIDDLE + MotionEvent.BUTTON_BACK -> BTN_SIDE + MotionEvent.BUTTON_FORWARD -> BTN_EXTRA else -> PointerGestures.BTN_LEFT } heldButtons.set(8, button, event.actionMasked == MotionEvent.ACTION_BUTTON_PRESS) @@ -3589,21 +3911,92 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return true } - private fun mouseAttached(): Boolean = InputDevice.getDeviceIds().any { id -> + private fun isHardwareMouse(d: InputDevice?): Boolean = + d != null && !d.isVirtual && (d.supportsSource(InputDevice.SOURCE_MOUSE) || d.supportsSource(InputDevice.SOURCE_MOUSE_RELATIVE)) + + private fun mouseAttached(): Boolean = InputDevice.getDeviceIds().any { isHardwareMouse(InputDevice.getDevice(it)) } + + private fun relativeMouseAttached(): Boolean = !isInMultiWindowMode && !glassesOutputActive && InputDevice.getDeviceIds().any { id -> val d = InputDevice.getDevice(id) - d != null && !d.isVirtual && d.supportsSource(InputDevice.SOURCE_MOUSE) + isHardwareMouse(d) && d?.supportsSource(InputDevice.SOURCE_TOUCHPAD) != true } private fun updatePointerCapture() { if (!::surfaceView.isInitialized) return val view = window.decorView - val want = pointerLocked && resumed && hasWindowFocus() && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !pipUi && mouseAttached() + val want = (pointerLocked || relativeMouseAttached()) && resumed && hasWindowFocus() && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !inputSettingsOpen && !pipUi && !bottomOutputActive && !touchEditorOpen && mouseAttached() + releaseDesktopMouseGrab() if (want == view.hasPointerCapture()) return if (want) view.requestPointerCapture() else view.releasePointerCapture() } + private fun programLocksPointer(): Boolean = + pointerLocked && SessionState.mode != SessionService.MODE_DESKTOP + + private fun desktopMouseGrabAllowed(): Boolean = + SessionState.mode == SessionService.MODE_DESKTOP && relativeMouseAttached() && !bottomOutputActive + + private fun tapDesktopGrabKey() { + val now = android.os.SystemClock.uptimeMillis() + if (now - desktopGrabTapAt < DESKTOP_GRAB_TAP_MS) return + desktopGrabTapAt = now + desktopGrabTaps++ + WaylandCompositor.nativeSendKey(KEY_RIGHTCTRL, 1) + uiHandler.postDelayed({ WaylandCompositor.nativeSendKey(KEY_RIGHTCTRL, 0) }, DESKTOP_GRAB_KEY_HOLD_MS) + } + + private fun grabDesktopMouse() { + if (!desktopMouseGrabAllowed()) return + if (desktopGrabTaps >= DESKTOP_GRAB_MAX_TAPS) { + if (android.os.SystemClock.uptimeMillis() - desktopGrabTapAt < DESKTOP_GRAB_RETRY_MS) return + desktopGrabTaps = 0 + } + if (!desktopMousePlaced) { + desktopMousePlaced = true + drawnRect()?.let { movePointer(it.centerX(), it.centerY()) } + } + tapDesktopGrabKey() + } + + private fun releaseDesktopMouseGrab() { + if (pointerLocked && SessionState.mode == SessionService.MODE_DESKTOP && !desktopMouseGrabAllowed()) tapDesktopGrabKey() + } + + private fun dropMouseCursor() { + if (!mouseOwnsCursor || mouseAttached()) return + mouseOwnsCursor = false + uiHandler.removeCallbacks(cursorResync) + cursorVisible = false + } + + override fun onMultiWindowModeChanged(isInMultiWindowMode: Boolean, newConfig: android.content.res.Configuration) { + super.onMultiWindowModeChanged(isInMultiWindowMode, newConfig) + updatePointerCapture() + } + + private var platformPointerShown: Boolean? = null + + private fun touchEditorChanged() { + touchEditorOpen = screenKeys?.isEditing == true || steamTouchControls?.isEditing == true + updatePointerCapture() + applyPlatformPointer(appUiOwnsPointer()) + } + + private fun appUiOwnsPointer(): Boolean = + drawerOpen || pcKeyboardOpen || achievementsOpen || inputSettingsOpen || pipUi || glassesOutputActive || bottomOutputActive || touchEditorOpen + + private fun applyPlatformPointer(shown: Boolean) { + if (!::sessionRoot.isInitialized || !::surfaceView.isInitialized) return + if (shown == platformPointerShown) return + platformPointerShown = shown + val icon = if (shown) null + else android.view.PointerIcon.getSystemIcon(this, android.view.PointerIcon.TYPE_NULL) + sessionRoot.pointerIcon = icon + surfaceView.pointerIcon = icon + } + private fun onCapturedPointer(event: MotionEvent): Boolean { - if (!pointerLocked || !event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE)) return false + if (!event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE)) return false notePress(event) when (event.actionMasked) { MotionEvent.ACTION_MOVE -> { @@ -3613,7 +4006,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { dx += event.getHistoricalX(i) dy += event.getHistoricalY(i) } - sendSceneDelta(dx, dy) + if (pointerLocked) sendSceneDelta(dx, dy) + else { + grabDesktopMouse() + moveCapturedMouse(dx, dy) + } } MotionEvent.ACTION_BUTTON_PRESS, MotionEvent.ACTION_BUTTON_RELEASE -> { val button = when (event.actionButton) { @@ -3644,6 +4041,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val device = com.droiddeck.launcher.input.SteamTouchDevice.current ?: return null steamTouchControls?.let { view -> if (view.device === device) return view + view.cancelEditing() view.releaseAll() (view.parent as? android.view.ViewGroup)?.removeView(view) steamTouchControls = null @@ -3652,6 +4050,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val view = com.droiddeck.launcher.input.SteamTouchControls(this, device, onMenu = { drawerOpen = true }, onKeyboard = ::togglePcKeyboard) view.visibility = View.GONE + view.onEditingChanged = { touchEditorChanged() } view.onOptions = { options -> steamTouchOptions = options applyTouchRouting() @@ -3698,7 +4097,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onScreenButtonsVisible = false controls.releaseAll() controls.visibility = View.GONE - steamTouchControls?.let { it.releaseAll(); it.visibility = View.GONE } + steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE } com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false screenKeys?.followSteam = false applyTouchRouting() @@ -3712,7 +4111,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { uiHandler.postDelayed(steamTouchRetry, 1000) } if (steam == null) { - steamTouchControls?.let { it.releaseAll(); it.visibility = View.GONE } + steamTouchControls?.let { it.cancelEditing(); it.releaseAll(); it.visibility = View.GONE } com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false applyTouchRouting() } @@ -3731,7 +4130,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (steam != null) { screenKeys?.followSteam = drawn if (controls.visibility == View.VISIBLE) { controls.releaseAll(); controls.visibility = View.GONE } - if (!drawn) steam.releaseAll() + if (!drawn) { steam.cancelEditing(); steam.releaseAll() } steam.visibility = if (drawn) View.VISIBLE else View.GONE com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = show applyTouchRouting() @@ -3806,15 +4205,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun keyboardCoversPad() = SessionState.mode == SessionService.MODE_STEAM && AgentGuest.steamKeyboard - private fun sendGuestKey(code: Int, down: Boolean, owner: Int = 1) { + private fun sendGuestKey(key: Int, down: Boolean, owner: Int = 1) { if (down && pipUi) return + val code = if (key == KEY_RIGHTCTRL && SessionState.mode == SessionService.MODE_DESKTOP) KEY_LEFTCTRL else key if (owner == 1) { if (down) guestKeysDown.add(code) else guestKeysDown.remove(code) } heldKeys.set(owner, code, down) } - // The frozen game cannot draw again, so the paused overlay shows a copy taken while the surface still holds its frame. private fun capturePausedFrame(manual: Boolean = false) { - if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive) return + if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive || bottomOutputActive) return if (SessionState.suspended && pausedFrame != null) return if ((suspendPolicy == SessionPrefs.SUSPEND_NEVER && !manual && !SessionState.manualPause) || !::surfaceView.isInitialized) return if (surfaceView.holder.surface?.isValid != true) return @@ -3857,8 +4256,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionService.pause(this) } - // Sessions that froze from picture-in-picture, or before onPause could copy a frame, have none; the - // compositor shows the frozen frame again once its output is back, so copy it from there. private fun requestPausedFrame() { if (pausedFrame != null) return pausedFrameWanted = true @@ -3914,7 +4311,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) updateOnScreenControls() if (resumed) { sessionClipboard.start(); updatePadMotion() } - if (started) refreshSecondScreenDisplays() + if (started) { + settleDualScreenControls() + refreshSecondScreenDisplays() + } if (CompositorHost.isStarted) applyFrameGen() } } @@ -3930,6 +4330,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (!inPip && surfaceW > 0) resizeOutputForWindow(surfaceW, surfaceH) applyUnfoldedControls() updateGlassesScreen() + updateBottomGame() } override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) { @@ -3947,16 +4348,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::hud.isInitialized) hud.setBackgrounded(false) refreshActivityDisplayId() displayManager.registerDisplayListener(displayListener, Handler(Looper.getMainLooper())) + com.droiddeck.launcher.input.DualScreen.watchTaken(bottomScreenListener) for (name in arrayOf("peak_refresh_rate", "min_refresh_rate")) { contentResolver.registerContentObserver(android.provider.Settings.System.getUriFor(name), false, refreshSettingObserver) } + settleDualScreenControls() refreshSecondScreenDisplays() if (secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode) - else if (::loading.isInitialized && !loading.visible) openDualScreenControls() + else openDualScreenControls() startedScreens++ SessionService.setActivityVisible(this, true, sessionActivityDisplayId) Glasses.rescan() updateGlassesScreen() + updateBottomGame() updateHandCamera() } @@ -3966,10 +4370,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::hud.isInitialized) hud.setBackgrounded(true) updateHandCamera() displayManager.unregisterDisplayListener(displayListener) + com.droiddeck.launcher.input.DualScreen.unwatchTaken(bottomScreenListener) contentResolver.unregisterContentObserver(refreshSettingObserver) closeSecondScreen(reset = false) startedScreens = (startedScreens - 1).coerceAtLeast(0) updateGlassesScreen() + updateBottomGame() if (startedScreens == 0) SessionService.setActivityVisible(this, false, sessionActivityDisplayId) super.onStop() } @@ -4002,6 +4408,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onResume() { super.onResume() + com.droiddeck.launcher.input.SystemKeyCapture.attach(this, { hasWindowFocus() && !appUiOwnsPointer() && CompositorHost.isStarted }) { event -> + com.droiddeck.launcher.input.GuestKeys.send(event) { code, down -> sendGuestKey(code, down, 8) } + } if (refreshActivityDisplayId() && started) { SessionService.setActivityDisplay(this, sessionActivityDisplayId) } @@ -4017,6 +4426,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } (getSystemService(INPUT_SERVICE) as? InputManager) ?.registerInputDeviceListener(deviceListener, Handler(Looper.getMainLooper())) + refreshSecondScreenDisplays() if (SessionState.guestPid > 1) padBridge?.syncConnectedControllers() joyConVr?.refresh() onScreenControls?.reload() @@ -4045,6 +4455,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onPause() { + com.droiddeck.launcher.input.SystemKeyCapture.detach(this) com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) if (runtimeRemovalBlocked) { super.onPause(); return } physicalShortcuts.clear() @@ -4098,8 +4509,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { Glasses.cancelSteamVrStart() } if (glasses.present) { - // Optional stereo starts only after RUNNING is observed. READY can - // arrive repeatedly while the launch worker is still starting VR. if (action == "install") steamVrStatus = SteamVr.Status.INSTALLING runSteamVrAction(action, ::currentRequest) { val ok = SteamVr.run(this, action) @@ -4286,16 +4695,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { glassesScreen?.trackingRecovery?.update(trackingRecovery, glasses.sbs) } - private fun outputHolder(): SurfaceHolder = glassesScreen?.holder ?: surfaceView.holder + private fun outputHolder(): SurfaceHolder = glassesScreen?.holder ?: bottomGame?.holder ?: surfaceView.holder + + private fun outputView(): SurfaceView = bottomGame?.takeIf { bottomOutputActive }?.surfaceView ?: surfaceView private fun onOutputAttached(holder: SurfaceHolder) { if (holder !== outputHolder()) return glassesOutputActive = glassesScreen?.holder === holder - // Keep the phone's layout for touch/controller coordinates, but remove - // its SurfaceView so it cannot retain the last game frame under the hint. - surfaceView.visibility = if (glassesOutputActive) View.INVISIBLE else View.VISIBLE + bottomOutputActive = bottomGame?.holder === holder + updatePointerCapture() + if (bottomOutputActive) bottomRecoveries = 0 + if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(glassesOutputActive || bottomOutputActive) + surfaceView.visibility = if (glassesOutputActive || bottomOutputActive) View.INVISIBLE else View.VISIBLE Log.i(TAG, "compositor output attached: " + - if (glassesOutputActive) "glasses display ${glassesScreen?.display?.displayId}" else "phone") + if (glassesOutputActive) "glasses display ${glassesScreen?.display?.displayId}" + else if (bottomOutputActive) "bottom screen display ${bottomGame?.display?.displayId}" else "phone") if (pausedFrameWanted) uiHandler.postDelayed({ if (pausedFrameWanted && pausedFrame == null && resumed) capturePausedFrame() }, PAUSED_FRAME_REDRAW_MS) @@ -4313,6 +4727,183 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (surfaceView.holder.surface?.isValid == true) surfaceCreated(surfaceView.holder) } + private fun bottomGameDisplay(): Display? { + if (!::displayManager.isInitialized) return null + return com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) + ?.takeIf { it.isValid && com.droiddeck.launcher.input.DualScreen.builtIn(it) } + } + + private fun putGameOnBottom(on: Boolean) { + if (on && bottomGame == null && bottomGameDisplay() == null) { + android.widget.Toast.makeText(this, R.string.swap_screens_unavailable, android.widget.Toast.LENGTH_SHORT).show() + return + } + SessionState.gameOnBottom = on + gameOnBottom = on + Log.i(TAG, "game screen: " + if (on) "bottom" else "top") + updateBottomGame() + } + + private fun updateBottomGame() { + if (!::surfaceView.isInitialized) return + val target = bottomGameDisplay() + val want = com.droiddeck.launcher.ui.GameScreenSwap.wanted( + requested = gameOnBottom, + activityStarted = started && !runtimeRemovalBlocked, + sessionEnded = ended, + inPip = pipUi || isInPictureInPictureMode, + glassesOutput = glassesScreen != null, + bottomScreenFree = target != null, + ) + val shown = if (want) target else null + val current = bottomGame + if (current != null && current.display.displayId == shown?.displayId) return + if (current != null || shown != null) cancelOutputTouches() + if (current != null) { + restoreTopOutput(current) + runCatching { current.dismiss() } + } + if (shown != null) { + closeSecondScreen(reset = false) + val screen = com.droiddeck.launcher.ui.BottomGameScreen(this, shown, this, ::onBottomGameTouch) + bottomGame = screen + surfaceW = 0 + surfaceH = 0 + screen.setOnDismissListener { + if (bottomGame === screen) { + restoreTopOutput(screen) + refreshSecondScreenDisplays() + } + } + try { + screen.show() + } catch (e: Exception) { + restoreTopOutput(screen) + runCatching { screen.dismiss() } + Log.w(TAG, "could not show the game on ${shown.name}", e) + } + if (bottomGame === screen) Log.i(TAG, "requested game output on the bottom screen (display ${shown.displayId})") + } + refreshSecondScreenDisplays() + } + + private fun cancelOutputTouches() { + cancelTouchGestures() + if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() + if (CompositorHost.isStarted && deliversTouches(routedTouchMode)) WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } + + private fun recoverBottomOutput(screen: com.droiddeck.launcher.ui.BottomGameScreen) { + if (bottomGame !== screen || bottomOutputActive || !started || screen.holder.surface?.isValid == true) return + Log.i(TAG, "bottom screen surface gone - game back on the top screen") + restoreTopOutput(screen) + runCatching { screen.dismiss() } + refreshSecondScreenDisplays() + if (++bottomRecoveries <= BOTTOM_RECOVERY_TRIES) uiHandler.postDelayed({ updateBottomGame() }, BOTTOM_RECOVERY_MS) + } + + private fun restoreTopOutput(screen: com.droiddeck.launcher.ui.BottomGameScreen) { + if (bottomGame !== screen) return + bottomGame = null + bottomOutputActive = false + surfaceW = 0 + surfaceH = 0 + CompositorHost.detach(screen.holder.surface) + if (glassesScreen != null) return + surfaceView.visibility = View.VISIBLE + applyOutputPacing() + if (surfaceView.holder.surface?.isValid == true) surfaceCreated(surfaceView.holder) + } + + private fun onBottomGameTouch(event: MotionEvent): Boolean { + if (pipUi) return true + if (!event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) return false + notePress(event) + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + drawerControllerActive = false + gestureTouchStreamGate.reset() + } + if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SURFACE, event)) return false + return onTouchEvent(event) + } + + @androidx.compose.runtime.Composable + private fun SwappedTopPanel() { + val pages = bottomPages() + val swapBack = { putGameOnBottom(false) } + val steam = SessionState.mode == SessionService.MODE_STEAM + val openMenu = { drawerOpen = true } + fun bar(title: String?, extras: List = emptyList()) = com.droiddeck.launcher.ui.BottomBarModel( + title, openMenu, openMenu, if (steam) ({ tapSteamButton() }) else null, if (steam) ({ tapQam() }) else null, + extras + com.droiddeck.launcher.ui.BarExtra(getString(R.string.swap_screens), icon = R.drawable.ic_bottom_swap, onClick = swapBack), + ) + val keyboardExtra = com.droiddeck.launcher.ui.BarExtra(getString(R.string.second_show_keyboard), icon = R.drawable.ic_bottom_keyboard) { + keyboard?.toggle() + } + androidx.compose.foundation.layout.Box( + Modifier.fillMaxSize().background(androidx.compose.ui.graphics.Color.Black) + .pointerInput(Unit) { awaitPointerEventScope { while (true) awaitPointerEvent() } }, + ) { + when { + secondScreenMode == SecondScreenMode.DESKTOP && com.droiddeck.launcher.session.BottomDesktop.available() -> + androidx.compose.ui.viewinterop.AndroidView( + factory = { context -> + com.droiddeck.launcher.ui.BottomDesktopPanel(context, openMenu, openMenu, + (({ tapSteamButton() }) to ({ tapQam() })).takeIf { steam }, swapBack, fullResolution = true) + }, + modifier = Modifier.fillMaxSize(), + ) + secondScreenMode == SecondScreenMode.CUSTOM_CONTROLS || + (secondScreenMode == SecondScreenMode.DECK_CONTROLS && SessionState.deckPad) -> { + val layout = if (secondScreenMode == SecondScreenMode.CUSTOM_CONTROLS) + com.droiddeck.launcher.input.InputSurfaceLayout.read(this@SessionActivity, inputProfile.id) else null + androidx.compose.runtime.key(secondScreenMode, layout) { + androidx.compose.ui.viewinterop.AndroidView( + factory = { context -> + com.droiddeck.launcher.ui.DeckControlsPanel(context, onClose = openMenu, onSteamMenu = ::tapSteamButton, + onQam = ::tapQam, pad = padBridge, customLayout = layout, + onMenu = openMenu, onSwap = swapBack) + }, + modifier = Modifier.fillMaxSize(), + ) + } + } + secondScreenMode == SecondScreenMode.KEYBOARD_TRACKPAD -> androidx.compose.foundation.layout.Column(Modifier.fillMaxSize()) { + com.droiddeck.launcher.ui.BottomScreenBar(bar(getString(SecondScreenMode.KEYBOARD_TRACKPAD.label), listOf(keyboardExtra))) + androidx.compose.ui.viewinterop.AndroidView( + factory = { context -> + com.droiddeck.launcher.ui.SessionTrackpadView(context, ::moveSecondScreenPointer, + { button, pressed -> heldButtons.set(2, button, pressed) }, + ::sendSceneWheel, ::secondScreenPointerPosition) + }, + modifier = Modifier.fillMaxWidth().weight(1f), + ) + } + secondScreenMode == SecondScreenMode.TERMINAL -> androidx.compose.foundation.layout.Column(Modifier.fillMaxSize()) { + var terminal by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(null) } + com.droiddeck.launcher.ui.BottomScreenBar(bar(getString(SecondScreenMode.TERMINAL.label), listOf( + com.droiddeck.launcher.ui.BarExtra(getString(R.string.drawer_keyboard), icon = R.drawable.ic_bottom_keyboard) { terminal?.showKeyboard() }, + ))) + androidx.compose.ui.viewinterop.AndroidView( + factory = { context -> com.droiddeck.launcher.ui.SessionTerminalPanel(context).also { terminal = it } }, + modifier = Modifier.fillMaxWidth().weight(1f), + ) + } + pages.isEmpty() -> com.droiddeck.launcher.ui.BottomScreenBar(bar(null)) + else -> BottomDashboard( + pages, com.droiddeck.launcher.ui.SessionBottomTab.picked(SessionState.sessionId), + gameStarts = gameStarts, + onPage = { com.droiddeck.launcher.ui.SessionBottomTab.pick(SessionState.sessionId, it) }, + bar = bar(getString(R.string.second_mode_dashboard)), + strip = { pageId -> + com.droiddeck.launcher.ui.SessionBottomStrip(pageId) { if (::hud.isInitialized) hud.liveFps else null } + }, + ) + } + } + } + private fun glassesOutputSize(): Pair? { if (glassesScreen == null || glasses.width <= 0 || glasses.height <= 0) return null val panel = (if (glasses.sbs) glasses.width / 2 else glasses.width) to glasses.height @@ -4320,7 +4911,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val display = com.droiddeck.launcher.session.SessionDisplay val choice = SessionPrefs.resolutionChoice(this, mode, panel) val size = display.resolveChoice(panel, choice) - val fixed = choice != display.MATCH_SCREEN && choice != display.FOLLOW_SCREEN && display.presetHeight(choice) == null + val fixed = choice != display.MATCH_SCREEN && !display.isFollow(choice) && display.presetHeight(choice) == null return if (fixed) display.resolve(panel, minOf(size.first, size.second), SessionPrefs.SHAPE_AUTO) else size } @@ -4370,9 +4961,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { runCatching { current.dismiss() } } if (target != null) { + bottomGame?.let { restoreTopOutput(it); runCatching { it.dismiss() } } val screen = GlassesScreen(this, target, Glasses.outputHz(), this, Glasses.outputResolution()) - // show() can create the surface synchronously. Select its holder - // first, otherwise surfaceCreated() rejects the glasses callback. glassesScreen = screen applyOutputPacing() surfaceW = 0 @@ -4397,6 +4987,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { applyOutputPacing() refreshSecondScreenDisplays() applyCardboard(cardboard) + if (target == null) updateBottomGame() } private fun onGlassesSteamVr(now: SteamVr.Status) { @@ -4485,12 +5076,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { loading.visible = false hud.start() memoryHud.start() - if (started) openDualScreenControls() + if (started) { + settleDualScreenControls() + openDualScreenControls() + } } } override fun onDestroy() { com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) + relativeMouseRequests.shutdownNow() backQamInput.cancel() steamVrRecovery.close() uiHandler.removeCallbacks(steamTouchRetry) @@ -4505,6 +5100,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) glassesScope.cancel() glassesScreen?.let { screen -> glassesScreen = null; runCatching { screen.dismiss() } } + bottomGame?.let { screen -> bottomGame = null; runCatching { screen.dismiss() } } headTracker?.stop() if (::hud.isInitialized) hud.stop() if (::memoryHud.isInitialized) memoryHud.stop() @@ -4595,6 +5191,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val TEXT_FIELD_TAP_MS = 1_000L private const val PAUSED_FRAME_MAX_EDGE = 1920f private const val PAUSED_FRAME_REDRAW_MS = 150L + private const val SETTINGS_WATCH_MS = 1_000L + private const val SETTINGS_WATCH_CHECKS = 600 + private const val BOTTOM_RECOVERY_MS = 1_000L + private const val BOTTOM_RECOVERY_TRIES = 3 private const val TAG = "SessionActivity" private var startedScreens = 0 @Volatile private var activeInstallWorker: Any? = null @@ -4607,6 +5207,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val PAD_SCROLL_HEIGHTS_PER_S = 3f private const val AXIS_UNITS_PER_PIXEL = 3f private const val KEY_LEFTCTRL = 29 + private const val KEY_RIGHTCTRL = 97 + private const val BTN_SIDE = 0x113 + private const val BTN_EXTRA = 0x114 + private const val DESKTOP_GRAB_TAP_MS = 500L + private const val DESKTOP_GRAB_MAX_TAPS = 8 + private const val DESKTOP_GRAB_RETRY_MS = 30_000L + private const val DESKTOP_GRAB_KEY_HOLD_MS = 40L + private const val RELATIVE_MOUSE_MAX_RETRIES = 5 private const val DRAWER_HAT_THRESHOLD = 0.5f private const val DRAWER_STICK_ENTER_THRESHOLD = 0.55f private const val DRAWER_STICK_EXIT_THRESHOLD = 0.35f diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt index 0842f6b5a4..05d5d4e77b 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt @@ -18,7 +18,6 @@ object AgentEnv { private const val TAG = "AgentEnv" private const val FILE = "agent-env.json" private const val GUEST_BIN = "/opt/droiddeck-agent/bin" - private const val BASE_PATH = "/usr/local/bin:/usr/bin:/bin" private val NAME = Regex("[A-Za-z0-9._-]{1,64}") private val KEY = Regex("[A-Za-z_][A-Za-z0-9_]*") private val lock = Any() @@ -160,7 +159,7 @@ object AgentEnv { } private fun pathOf(lines: List) = - lines.lastOrNull { it.startsWith("PATH=") }?.substringAfter('=')?.takeIf { it.isNotBlank() } ?: BASE_PATH + lines.lastOrNull { it.startsWith("PATH=") }?.substringAfter('=')?.takeIf { it.isNotBlank() } ?: LinuxRuntime.GUEST_PATH private fun bin(context: Context): File { val root = LinuxRuntime.rootDir(context).canonicalFile.toPath() diff --git a/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java index f8f1b2a3e1..8d9ddcb1f0 100644 --- a/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java +++ b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java @@ -118,7 +118,6 @@ public class DirectAudioRelayComponent extends SessionPart { } } - // Android keeps the input stream's wake lock while a frozen helper still has it started. public boolean awaitMicReleased(long timeoutMs) { long deadline = System.currentTimeMillis() + timeoutMs; synchronized (micLock) { diff --git a/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioTiming.kt b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioTiming.kt new file mode 100644 index 0000000000..56fbedbe6d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioTiming.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.audio + +import android.media.AudioAttributes +import android.media.AudioFormat +import android.media.AudioTrack +import android.util.Log + +object DirectAudioTiming { + private const val TAG = "DirectAudioTiming" + const val PERIOD_ENV = "AUDIO_DIRECT_PERIOD_MS" + const val BUFFER_ENV = "AUDIO_DIRECT_MS" + const val SLOW_OUTPUT_PERIOD_MS = 20 + const val SLOW_OUTPUT_BUFFER_MS = 60 + + fun environment(lowLatencyOutput: Boolean): List = + if (lowLatencyOutput) emptyList() + else listOf("$PERIOD_ENV=$SLOW_OUTPUT_PERIOD_MS", "$BUFFER_ENV=$SLOW_OUTPUT_BUFFER_MS") + + fun lowLatencyOutput(): Boolean = try { + val track = AudioTrack.Builder() + .setAudioAttributes(AudioAttributes.Builder() + .setUsage(AudioAttributes.USAGE_GAME) + .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) + .build()) + .setAudioFormat(AudioFormat.Builder() + .setEncoding(AudioFormat.ENCODING_PCM_FLOAT) + .setSampleRate(48000) + .setChannelMask(AudioFormat.CHANNEL_OUT_STEREO) + .build()) + .setPerformanceMode(AudioTrack.PERFORMANCE_MODE_LOW_LATENCY) + .setTransferMode(AudioTrack.MODE_STREAM) + .build() + try { + track.performanceMode == AudioTrack.PERFORMANCE_MODE_LOW_LATENCY + } finally { + track.release() + } + } catch (e: Exception) { + Log.w(TAG, "audio: could not check for low-latency output; DirectAudio keeps its defaults", e) + true + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt index 8f2da0d688..383dd98bbd 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt @@ -13,15 +13,10 @@ import kotlinx.coroutines.launch import java.io.File import java.io.FileInputStream -/** - * A pack built by CI alongside this APK (tools/packs). Main and release builds publish it to - * DroidDeck-Components under a content-addressed tag; a PR test build attaches packs that are not there - * yet to its pr-N release on DroidDeck-CI. The APK pins the pack's SHA-256, so only the bytes this build - * was made with install, whichever host serves them. - */ internal class AddonPack( val name: String, private val sha256: String, val size: Long, private val required: List, private val reuseDeviceCopy: Boolean = sha256.isEmpty() && !BuildConfig.CI_BUILD, + private val bundle: (Context) -> java.io.InputStream = { it.assets.open("packs/$name.tar.zst") }, ) { sealed interface State { data object Missing : State @@ -42,13 +37,11 @@ internal class AddonPack( ) private fun root(context: Context) = File(context.filesDir, "addons/$name") - /** App-private and written only after the archive matched the pinned digest. */ fun dir(context: Context) = File(root(context), version(context)) fun file(context: Context, relative: String) = File(dir(context), relative) fun installed(context: Context): Boolean = version(context).isNotEmpty() && File(dir(context), COMPLETE).isFile - // A build made outside CI pins no packs, so it runs the newest one a CI build already verified and installed. private fun version(context: Context): String = if (!reuseDeviceCopy) sha256 else deviceCopy(context).orEmpty() private fun deviceCopy(context: Context): String? = root(context).listFiles().orEmpty() @@ -65,7 +58,6 @@ internal class AddonPack( .also { mutableState.value = it } } - /** Starts the download in the background unless the pack is already present or on its way. */ fun ensure(context: Context, onReady: (Context) -> Unit = {}) { val app = context.applicationContext synchronized(lock) { @@ -80,7 +72,6 @@ internal class AddonPack( } } - /** Blocks a worker thread until the pack is installed, starting the download if needed. */ @JvmOverloads fun await(context: Context, running: () -> Boolean = { true }, onState: (State) -> Unit = {}): Boolean { if (installed(context)) return true @@ -104,7 +95,7 @@ internal class AddonPack( } val root = root(context).apply { mkdirs() } val archive = File(root, "$sha256.tar.zst") - val downloaded = urls.any { url -> + val downloaded = bundled(context, archive) || urls.any { url -> Downloader.downloadFile(url, archive, true, sha256) { p -> mutableState.value = State.Downloading(p.coerceIn(0f, 1f)) } .also { if (!it) archive.delete() } } @@ -126,6 +117,16 @@ internal class AddonPack( return true } + internal fun bundled(context: Context, archive: File): Boolean { + val copied = runCatching { + bundle(context).use { input -> archive.outputStream().use { input.copyTo(it) } } + }.isSuccess + if (copied && Hashes.sha256(archive).equals(sha256, ignoreCase = true)) return true + if (copied) Log.w(TAG, "$name: the bundled pack does not match the pinned digest") + archive.delete() + return false + } + companion object { private const val TAG = "AddonPack" private const val REPO = "Droid-Deck/DroidDeck-Components" 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 4163eb4a3e..309716d3fc 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -42,7 +42,6 @@ object DeviceReport { } } - /** Name of an ApplicationExitInfo reason code, so a report says "LOW_MEMORY" instead of "3". */ internal fun exitReasonName(reason: Int): String = when (reason) { 0 -> "UNKNOWN" 1 -> "EXIT_SELF" @@ -209,7 +208,7 @@ object DeviceReport { h("Drivers") val gpu = com.droiddeck.launcher.gpu.GpuInfo.detect() - k("GPU", "${gpu.name} · ${gpu.family.label} · ${gpu.supportText}" + if (gpu.oneUi8Gen2) " · One UI 8 Gen 2" else "") + k("GPU", "${gpu.name} · ${gpu.family.label} · ${gpu.supportText(SessionPrefs.vkBridge(context))}" + if (gpu.oneUi8Gen2) " · One UI 8 Gen 2" else "") if (gpu.model == 740) { val hint = com.droiddeck.launcher.gpu.TpUbwcHint k("TP UBWC hint", hint.forThisDevice(context) ?: "driver default") diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt index 325ed7d43d..ee214fedfe 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt @@ -6,8 +6,20 @@ import com.droiddeck.launcher.R import java.io.File object DeviceSupport { - fun adreno(): Boolean = + private val adrenoGpu by lazy { File("/sys/class/kgsl/kgsl-3d0").exists() || File("/vendor/lib64/hw/vulkan.adreno.so").exists() + } + + private val maliGpu by lazy { !adrenoGpu && File("/dev/mali0").exists() } + + fun adreno(): Boolean = adrenoGpu + + fun mali(): Boolean = maliGpu + + fun vkBridge(context: Context): Boolean = + !adreno() && com.droiddeck.launcher.session.SessionPrefs.vkBridge(context) + + fun canDraw(context: Context): Boolean = adreno() || vkBridge(context) fun gpuName(context: Context): String { val soc = if (Build.VERSION.SDK_INT >= 31) Build.SOC_MODEL.takeIf { it.isNotBlank() && it != Build.UNKNOWN } else null 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 b11e3113af..d71f451200 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt @@ -126,11 +126,9 @@ object DownloadSource { fun isGithub(url: String): Boolean = GITHUB_HOSTS.any { url.startsWith("https://$it/") } - /** Catalogs carry the digests everything else is checked against, so a mirror must never supply one. */ fun isCatalog(url: String): Boolean = CATALOGS.any { url.startsWith(it) } fun candidates(target: String): List { - // GitHub API metadata carries executable URLs and digests; never proxy it. if (isCatalog(target) || target.startsWith("https://api.github.com/")) return listOf(target) val prefs = prefs() ?: return listOf(target) if (!isGithub(target)) return listOf(target) @@ -184,7 +182,6 @@ object DownloadSource { 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? { 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 31e8f45f55..19cec5acbe 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java +++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java @@ -91,7 +91,6 @@ public final class Downloader { if (isCancelled(cancelled)) return null; if (i > 0) Log.i(TAG, "retrying " + url + " via " + sources.get(i)); Fetch fetch = fetch(sources.get(i), cancelled); - // A cancelled fetch says nothing about the source, so it must not count as a failure. if (isCancelled(cancelled)) return null; if (fetch.body != null) { DownloadSource.INSTANCE.succeeded(sources.get(i)); @@ -103,7 +102,6 @@ public final class Downloader { return null; } - /** Fetches without the mirror list, for a URL whose body is a digest the payload is checked against. */ public static String downloadDirect(String url) { return fetch(url).body; } @@ -113,13 +111,11 @@ public final class Downloader { return downloadFile(url, destination, resume, null, progress); } - /** Verify each candidate before accepting it, so a bad mirror can fall back. */ public static boolean downloadFile(String url, File destination, boolean resume, String expectedSha256, java.util.function.Consumer progress) { return downloadFile(url, destination, resume, expectedSha256, null, progress); } - /** {@code cancelled} is polled while bytes arrive; a cancel stops at once and leaves the partial file for the caller. */ public static boolean downloadFile(String url, File destination, boolean resume, String expectedSha256, java.util.function.BooleanSupplier cancelled, java.util.function.Consumer progress) { @@ -128,13 +124,11 @@ public final class Downloader { return downloadCandidates(url, sources(url, expectedSha256), destination, resume, expectedSha256, cancelled, progress); } - /** A third-party mirror may only serve bytes that can be checked against a digest from a direct source. */ static List sources(String url, String expectedSha256) { return expectedSha256 == null ? java.util.Collections.singletonList(url) : DownloadSource.INSTANCE.candidates(url); } - // Package-private for the local multi-source HTTP test. static boolean downloadCandidates(String original, List sources, File destination, boolean resume, String expectedSha256, java.util.function.Consumer progress) { return downloadCandidates(original, sources, destination, resume, expectedSha256, null, progress); @@ -149,7 +143,6 @@ public final class Downloader { if (isCancelled(cancelled)) return false; if (i > 0) Log.i(TAG, "retrying " + original + " via " + source); Outcome outcome = attempt(source, destination, resume, identity, expectedSha256, cancelled, progress); - // 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) { @@ -192,7 +185,6 @@ public final class Downloader { return value != null && !value.isEmpty() && !value.startsWith("W/"); } - /** Only reuse saved bytes when we persisted a strong validator and their source. */ private static Identity loadIdentity(File dest, boolean resume, String expectedSha256) { Identity identity = new Identity(); File marker = resumeFile(dest); @@ -213,7 +205,6 @@ public final class Downloader { return identity; } } catch (IOException e) { - // Legacy partials or interrupted metadata writes have no trustworthy identity. } if (!discardPartial(dest, identity)) Log.w(TAG, "could not discard unidentified partial " + dest); return identity; @@ -239,7 +230,7 @@ public final class Downloader { try (FileOutputStream out = new FileOutputStream(marker)) { p.store(out, "DroidDeck partial download validator"); } catch (IOException e) { - marker.delete(); // No valid metadata means no future resume. + marker.delete(); Log.w(TAG, "cannot persist download validator", e); } } @@ -252,7 +243,6 @@ public final class Downloader { long have = resume && destination.isFile() ? destination.length() : 0; try { if (have > 0 && (!url.equals(identity.source) || !strongETag(identity.etag))) { - // A new source or unvalidated bytes must restart from byte zero. if (!discardPartial(destination, identity)) return Outcome.RETRY; have = 0; } @@ -286,7 +276,6 @@ public final class Downloader { return attempt(url, destination, false, identity, expectedSha256, cancelled, progress); } if (!appending && have > 0) { - // If-Range may legitimately return full 200 when representation changed. if (!discardPartial(destination, identity)) return Outcome.RETRY; have = 0; } @@ -333,14 +322,12 @@ public final class Downloader { } } - /** True when a `Content-Range: bytes START-END/TOTAL` header starts exactly at {@code start}. */ static boolean rangeStartsAt(String contentRange, long start) { if (contentRange == null) return false; java.util.regex.Matcher m = java.util.regex.Pattern.compile("^\\s*bytes\\s+(\\d+)-\\d+/(?:\\d+|\\*)\\s*$").matcher(contentRange); return m.matches() && Long.parseLong(m.group(1)) == start; } - /** The complete length in a `Content-Range` header, or -1 when the header leaves it unknown. */ static long rangeTotal(String contentRange) { if (contentRange == null) return -1; java.util.regex.Matcher m = java.util.regex.Pattern.compile("^\\s*bytes\\s+\\d+-\\d+/(\\d+)\\s*$").matcher(contentRange); @@ -390,7 +377,6 @@ public final class Downloader { } private static HttpURLConnection open(String url, int readTimeoutMs) throws java.io.IOException { - // 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()); 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 bcf3a0448c..5958c5e99b 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt @@ -34,6 +34,8 @@ object GameEnvironmentOptions { Option("MESA_EXTENSION_MAX_YEAR", "", 0, Type.TEXT), Option("MESA_GL_VERSION_OVERRIDE", "", 0, Type.TEXT), Option("PULSE_LATENCY_MSEC", "", 0, Type.NUMBER), + Option("AUDIO_DIRECT_MS", "", 0, Type.NUMBER), + Option("AUDIO_DIRECT_PERIOD_MS", "", 0, Type.NUMBER), Option("DROIDDECK_GAME_CORES", "", R.string.game_env_cores, Type.TEXT), Option("DROIDDECK_ANTICHEAT_OFFLINE", "1", R.string.game_env_anticheat_offline, Type.TOGGLE, listOf("0", "1")), Option("WINE_LARGE_ADDRESS_AWARE", "0", 0, Type.TOGGLE, listOf("0", "1")), diff --git a/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt b/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt index 8cbf9bf39d..3e4bb53051 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GlobalSettings.kt @@ -5,7 +5,6 @@ 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 -> @@ -19,6 +18,5 @@ object GlobalSettings { 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/LogRedactor.kt b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt index f579adff00..3230e8ea47 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt @@ -11,7 +11,6 @@ object LogRedactor { size > 32 } - // Android matchers own native state, so reuse them instead of creating one for every log line. private val matchers = object : ThreadLocal() { override fun initialValue(): MatcherCache = MatcherCache() } @@ -145,7 +144,6 @@ object LogRedactor { val needs = name.lowercase().takeIf { name.all { it.code < 0x80 } } Learned(Regex("(?i)(? Boolean = { Environment.isExternalStorageManager() }): Boolean = + sdk >= Build.VERSION_CODES.R && !granted() + + fun open(context: Context) { + val app = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION, Uri.parse("package:" + context.packageName)) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + runCatching { context.startActivity(app) }.recoverCatching { + context.startActivity(Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt index b1d93fdaba..8484da0ebc 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt @@ -311,87 +311,3 @@ fun CollapsibleRail( } } -@Composable -fun RailTopTabs( - items: List, - modifier: Modifier = Modifier, - links: List = emptyList(), -) { - Column(modifier = modifier.fillMaxWidth()) { - Row( - modifier = Modifier.fillMaxWidth().padding(horizontal = 2.dp, vertical = 2.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - items.forEach { item -> - TopTabCell( - icon = item.icon, - label = item.label, - selected = item.selected, - onClick = item.onClick, - modifier = Modifier.weight(1f), - ) - } - if (links.isNotEmpty()) { - Box( - modifier = Modifier - .padding(horizontal = 2.dp) - .width(1.dp) - .height(30.dp) - .background(MaterialTheme.colorScheme.outline.copy(alpha = 0.4f)), - ) - links.forEach { link -> - TopTabCell(link.icon, link.label, selected = false, onClick = link.onClick, isTab = false, modifier = Modifier.weight(1f)) - } - } - } - HorizontalDivider() - } -} - -@Composable -private fun TopTabCell( - icon: ImageVector, - label: String, - selected: Boolean, - onClick: () -> Unit, - modifier: Modifier = Modifier, - isTab: Boolean = true, -) { - val tint = if (selected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant - Column( - horizontalAlignment = Alignment.CenterHorizontally, - modifier = modifier - .clip(RoundedCornerShape(9.dp)) - .background(if (selected) MaterialTheme.colorScheme.primary.copy(alpha = 0.14f) else Color.Transparent) - .focusGlide(RoundedCornerShape(9.dp)) - .then( - if (isTab) { - Modifier.selectable(selected = selected, role = androidx.compose.ui.semantics.Role.Tab, onClick = onClick) - } else { - Modifier.clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onClick) - }, - ) - .padding(vertical = 6.dp, horizontal = 1.dp), - ) { - Icon(icon, contentDescription = label, tint = tint, modifier = Modifier.size(20.dp)) - Spacer(Modifier.height(3.dp)) - Text( - label, - color = tint, - fontSize = 8.5.sp, - fontWeight = FontWeight.Bold, - letterSpacing = 0.2.sp, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - textAlign = TextAlign.Center, - ) - Spacer(Modifier.height(2.dp)) - Box( - modifier = Modifier - .height(2.dp) - .width(if (selected) 16.dp else 0.dp) - .clip(RoundedCornerShape(3.dp)) - .background(if (selected) MaterialTheme.colorScheme.primary else Color.Transparent), - ) - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 4ea75ab1ce..2d6cd6d2c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -498,6 +498,25 @@ fun FileManagerScreen( onDispose { lifecycleOwner.lifecycle.removeObserver(observer) } } val drives = remember(storageTick) { StorageRoots.list(context) } + var accessDrive by remember { mutableStateOf(null) } + fun unreadable(drive: StorageRoot) { + if (AllFilesAccess.missing()) accessDrive = drive.label + else Toast.makeText(context, context.getString(R.string.fm_drive_not_readable, drive.label), Toast.LENGTH_SHORT).show() + } + accessDrive?.let { label -> + OutlinedAlertDialog( + onDismissRequest = { accessDrive = null }, + title = { Text(stringResource(R.string.fm_drive_access_title, label)) }, + text = { Text(stringResource(R.string.fm_drive_access_text)) }, + confirmButton = { + TextButton(onClick = { + accessDrive = null + AllFilesAccess.open(context) + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.upd_open_settings)) } + }, + dismissButton = { TextButton(onClick = { accessDrive = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, + ) + } val linuxRoot = remember(storageTick) { com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context).takeIf { File(it, "usr").isDirectory } } @@ -747,11 +766,7 @@ fun FileManagerScreen( if (drive.readable) { openDrive(drive.dir) } else { - Toast.makeText( - context, - context.getString(R.string.fm_drive_not_readable, drive.label), - Toast.LENGTH_SHORT, - ).show() + unreadable(drive) } }, modifier = Modifier.focusGlide(), @@ -1072,7 +1087,7 @@ fun FileManagerScreen( add(locItem(stringResource(R.string.fm_drive_internal), Icons.Filled.Smartphone, File("/storage/emulated/0"))) drives.filter { it.removable }.forEach { d -> add(RailItem(d.label, Icons.Filled.SdStorage, !showFavorites && currentRoot.absolutePath == d.dir.absolutePath) { - showFavorites = false; if (d.readable) openDrive(d.dir) + showFavorites = false; if (d.readable) openDrive(d.dir) else unreadable(d) }) } linuxRoot?.let { add(locItem(stringResource(R.string.fm_drive_linux), Icons.Filled.Terminal, it)) } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt index 05d467ef51..6f5988fc16 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt @@ -57,7 +57,6 @@ object FileOps { return true } if (!copyWithProgress(src, dst, progress, isCancelled)) return false - // Once the destination is committed, finish deleting the source. return delete(src) } 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 273917b007..b19a2e9874 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt @@ -63,7 +63,6 @@ object StorageRoots { } return true } - // vold-managed locations only hold removable volumes, whatever the fstype is. return path.startsWith("/storage/") || path.startsWith("/mnt/media_rw/") } @@ -92,8 +91,6 @@ object StorageRoots { .forEachIndexed { index, volume -> val uuid = volume.uuid?.takeIf { it.isNotBlank() } 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._-]+"), "-") @@ -108,8 +105,6 @@ object StorageRoots { 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 } } @@ -122,8 +117,6 @@ 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 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 28eb1bf723..a4385fbb2d 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt @@ -243,6 +243,8 @@ object AddedGameArt { val steam: (String, File, Set) -> Boolean, val sgdbGame: (String, Int?, String) -> Int?, val sgdb: (String, Int, File, Set) -> Boolean, + val sgdbExactGame: (String, Int?, String) -> Int? = { _, _, _ -> null }, + val battleNetArt: (Context, BattleNet.Title) -> Boolean = { _, _ -> false }, ) private val network = Sources( @@ -251,6 +253,8 @@ object AddedGameArt { steam = ::download, sgdbGame = SteamGridDb::gameId, sgdb = SteamGridDb::download, + sgdbExactGame = SteamGridDb::exactGameId, + battleNetArt = { context, title -> BattleNet.fetchCovers(context, listOf(BattleNet.artTitle(title))) }, ) private val EXTRAS = setOf(Slot.LOGO, Slot.ICON) @@ -287,14 +291,20 @@ object AddedGameArt { var sgdbDown = false var changed = false for (game in games) { + if (forgetOtherAppsArt(context, game)) changed = true + if (forgetNameMatchedBattleNetArt(context, game)) changed = true + val battleNetTitle = game.storeId?.takeIf { game.source == Store.BATTLENET.id }?.let(BattleNet::title) + if (battleNetTitle != null && runCatching { sources.battleNetArt(context, battleNetTitle) }.getOrDefault(false)) changed = true + val cache = cacheDir(context, game) val start = missing(context, game) + val again = refetch(cache) intersect start + if (again.isEmpty()) File(cache, REFETCH).delete() val full = Slot.COVER in start - val allowed = if (full) Slot.values().toSet() else EXTRAS + val allowed = if (full) Slot.values().toSet() else EXTRAS + again var need = start intersect allowed if (need.isEmpty() || (need == setOf(Slot.ICON) && sgdbKey.isEmpty())) continue - val cache = cacheDir(context, game) val tried = File(cache, EXTRAS_TRIED) - if (!full && tried.isFile && tried.lastModified() >= keyChangedAt && System.currentTimeMillis() - tried.lastModified() < RETRY_AFTER_MS) continue + if (!full && again.isEmpty() && tried.isFile && tried.lastModified() >= keyChangedAt && System.currentTimeMillis() - tried.lastModified() < RETRY_AFTER_MS) continue cache.mkdirs() if (Slot.LOGO in need && game.source != Library.ADDED && runCatching { sources.storeLogo(game) }.getOrDefault(false)) { changed = true @@ -315,7 +325,7 @@ object AddedGameArt { if (need.isNotEmpty() && sgdbKey.isNotEmpty()) { if (sgdbDown) asked = false else try { val gridId = remembered(File(cache, "sgdb-id"), keyChangedAt) { - sources.sgdbGame(sgdbKey, match.appId, game.name)?.toString() + (if (battleNetTitle != null) sources.sgdbExactGame else sources.sgdbGame)(sgdbKey, match.appId, game.name)?.toString() }?.toIntOrNull() if (gridId != null && sources.sgdb(sgdbKey, gridId, cache, need)) changed = true } catch (e: Exception) { @@ -324,11 +334,57 @@ object AddedGameArt { asked = false } } - if ((missing(context, game) intersect EXTRAS).isEmpty()) tried.delete() else if (asked) tried.writeText("") + val left = missing(context, game) + if (again.isNotEmpty()) keepRefetch(cache, again intersect left) + if ((left intersect EXTRAS).isEmpty()) tried.delete() else if (asked) tried.writeText("") } return changed } + internal const val REFETCH = "refetch" + + private fun refetch(cache: File): Set = + runCatching { File(cache, REFETCH).readText() }.getOrDefault("").split(',').mapNotNull { key -> Slot.values().firstOrNull { it.key == key } }.toSet() + + private fun keepRefetch(cache: File, slots: Set) { + if (slots.isEmpty()) File(cache, REFETCH).delete() else File(cache, REFETCH).writeText(slots.joinToString(",") { it.key }) + } + + internal const val BATTLENET_ART_CHECKED = "battlenet-art-2" + + internal fun forgetNameMatchedBattleNetArt(context: Context, game: AddedGames.Game): Boolean { + val title = game.storeId?.takeIf { game.source == Store.BATTLENET.id }?.let(BattleNet::title) ?: return false + val cache = cacheDir(context, game) + val checked = File(cache, BATTLENET_ART_CHECKED) + if (title.steam != null || checked.isFile) return false + val dropped = EXTRAS.filter { File(cache, SteamGridDb.cacheName(it)).delete() } + EXTRAS.forEach { File(cache, SteamGridDb.cacheName(it) + ".src").delete() } + listOf("sgdb-id", EXTRAS_TRIED).forEach { File(cache, it).delete() } + cache.mkdirs() + checked.writeText("") + return dropped.isNotEmpty() + } + + internal fun forgetOtherAppsArt(context: Context, game: AddedGames.Game): Boolean { + val cache = cacheDir(context, game) + val recorded = SteamMatch.get(context, game.folder.path)?.takeIf { it.appId != null } + val legacy = runCatching { File(cache, "steam-appid").readText().trim().toInt() }.getOrNull()?.takeIf { it > 0 } + val before = recorded?.appId ?: legacy ?: return false + val identity = runCatching { GameIdentifier.identify(game.exe) }.getOrNull() + val now = identity?.appId + val fromFiles = recorded?.certainty == SteamMatch.Certainty.FILES || before == GameIdentifier.SPACEWAR + if (now == before || (now == null && !fromFiles)) return false + SteamMatch.put(context, game.folder.path, + if (identity != null && now != null) SteamMatch.Match(now, SteamMatch.Certainty.FILES, identity.source.name.lowercase(), System.currentTimeMillis()) + else SteamMatch.Match(null, SteamMatch.Certainty.NONE, "", 0)) + val dropped = Slot.values().filter { File(cache, SteamGridDb.cacheName(it)).delete() }.toSet() + Slot.values().forEach { File(cache, SteamGridDb.cacheName(it) + ".src").delete() } + listOf("sgdb-id", "steam-appid", EXTRAS_TRIED).forEach { File(cache, it).delete() } + keepRefetch(cache, refetch(cache) + dropped) + Log.i(TAG, "${game.name}: its files no longer name Steam app $before; its art is fetched again") + return dropped.isNotEmpty() + } + internal fun steamMatch(context: Context, game: AddedGames.Game, search: (String) -> Int?): SteamMatch.Match { if (game.source == Store.BATTLENET.id) { val id = game.storeId?.let(BattleNet::title)?.steam 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 94b5bba6ee..29974a4a54 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -6,6 +6,7 @@ import com.droiddeck.launcher.runtime.LinuxRuntime import org.json.JSONObject import com.droiddeck.launcher.session.GameStorage import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SteamLibraries import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreInstallRoot @@ -69,6 +70,10 @@ object AddedGames { if (path.startsWith("$roms/")) return "/root/ROMs/" + path.removePrefix("$roms/") } StoreInstallRoot.externalGuestPath(context, host)?.let { return it } + for (lib in SteamLibraries.list(context)) { + if (path == lib.path) return lib.guest + if (path.startsWith("${lib.path}/")) return lib.guest + "/" + path.removePrefix("${lib.path}/") + } GameStorage.effective(context)?.let { lib -> if (path.startsWith("${lib.path}/")) return "$LIBRARY/" + path.removePrefix("${lib.path}/") } @@ -83,6 +88,7 @@ object AddedGames { if (!guest.startsWith("/") || guest.split('/').any { it == ".." }) return null val mapped = roots(context).map { it.host to it.guest } + StoreInstallRoot.externalRoots(context) + listOfNotNull(GameStorage.effective(context)?.let { File(it.path) to LIBRARY }) + + SteamLibraries.list(context).map { it.host to it.guest } + (android.os.Environment.getExternalStorageDirectory() to "/root/Storage") for ((host, root) in mapped.sortedByDescending { it.second.length }) { if (guest == root) return host @@ -170,9 +176,9 @@ object AddedGames { val files = folder.listFiles() ?: return null if (files.any { it.isFile && it.name.endsWith(".exe", ignoreCase = true) && !skipExe(it.name) }) return null if (declaredExes(folder).isNotEmpty()) return null - val dirs = files.filter { it.isDirectory && !it.name.startsWith(".") }.sortedBy { it.name.lowercase() } - if (dirs.size < 2 || dirs.any { it.name.lowercase() in GAME_PARTS }) return null - return dirs.takeIf { all -> all.all { rank(it).exes.isNotEmpty() } } + val dirs = files.filter { it.isDirectory && !it.name.startsWith(".") && !isSteamLibraryFolder(it.name) }.sortedBy { it.name.lowercase() } + if (dirs.any { it.name.lowercase() in GAME_PARTS || GameExePicker.auxiliaryDir(it) }) return null + return dirs.filter { rank(it).exes.isNotEmpty() }.takeIf { it.size >= 2 } } private fun expand(folder: File, entries: Set): List = @@ -180,7 +186,9 @@ object AddedGames { private fun entryFolders(context: Context): Set = AddedExes.list(context).map { it.folder }.toSet() - /** The card's Steam libraries: the arm64 client's steamapps and the x86-64 client's own folder beside it. */ + private fun libraryDepotInstalls(context: Context): List = + SteamLibraries.list(context).flatMap { SteamLibraries.depotInstalls(File(it.path, "steamapps/common")) } + internal fun isSteamLibraryFolder(name: String): Boolean = name.equals("steamapps", ignoreCase = true) || name == com.droiddeck.launcher.session.GameStorage.X64_CARD_DIR @@ -208,6 +216,7 @@ object AddedGames { if (folder.path in removed || !folder.isDirectory) continue scanGame(context, folder, out, single = entry) } + for (folder in libraryDepotInstalls(context)) if (folder.path !in removed) scanGame(context, folder, out) 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) @@ -254,6 +263,7 @@ object AddedGames { entries.map { File(it.folder) }.filter(::owns).maxByOrNull { canonical(it).length }?.let { return it } SessionPrefs.removedAddedGames(context).map { File(it) }.filter { owns(it) && groupGames(it) == null }.maxByOrNull { canonical(it).length }?.let { return it } StoreInstallRoot.gameFolders(context).firstOrNull(::holds)?.let { return it } + libraryDepotInstalls(context).firstOrNull(::holds)?.let { return it } val removed = SessionPrefs.removedAddedGames(context) val dirs = listOfNotNull( GameStorage.effective(context)?.let { File(it.path, "steamapps/common") }, @@ -315,7 +325,6 @@ object AddedGames { fun addFolder(context: Context, dir: File, onGame: (Game) -> Unit = {}, onChecking: (String?) -> Unit = {}, showHidden: Boolean = false): FolderResult { val app = context.applicationContext - // Binds are mounted at session start, so a new one reaches the session from the next start. if (guestPath(app, dir) == null) bindFolder(app, dir) val removed = SessionPrefs.removedAddedGames(app).toSet() val listed = listedFolders(app, removed) @@ -372,6 +381,7 @@ object AddedGames { } AddedExes.list(context).filter { it.folder !in removed }.forEach { out.add(canonical(File(it.folder))) } StoreInstallRoot.gameFolders(context).forEach { out.add(canonical(it)) } + libraryDepotInstalls(context).filter { it.path !in removed }.forEach { out.add(canonical(it)) } return out } @@ -416,7 +426,14 @@ object AddedGames { ?.takeIf { SessionPrefs.adoptAddedGameExe(context, folder.path, picked, it.path, rev) } val exe = adopted ?: found val guestExe = if (adopted != null) guestPath(context, adopted) ?: return else foundGuest + val storeExe = sidecar?.exeFile(folder) + val launched = adopted ?: chosen ?: storeExe?.takeIf { it.isFile } + val storeOwnExe = launched != null && storeExe != null && canonical(launched) == canonical(storeExe) + val sidecarDir = sidecar?.workdir?.takeIf { storeOwnExe }?.let { dir -> + guestPath(context, if (dir.isEmpty()) folder else File(folder, dir)) + } val guestDir = SessionPrefs.addedGameStartIn(context, folder.path).takeIf { sidecar == null && it.isNotEmpty() } + ?: sidecarDir ?: guestPath(context, (if (adopted != null) adopted else launch).parentFile ?: folder) ?: return val steamId = config?.let { steamRoute(it, appId) } out.add(Game(folder, name, exe, guestExe, guestDir, appId, 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 69ccb08c9c..1d4fb5ef55 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt @@ -111,10 +111,7 @@ object AutoComponents { @VisibleForTesting internal var gameRunning: () -> Boolean = { gameProcessRunning() } - private fun gameProcessRunning(): Boolean = File("/proc").listFiles()?.any { p -> - p.name.all(Char::isDigit) && runCatching { String(File(p, "cmdline").readBytes()).replace('\u0000', ' ') }.getOrNull() - ?.let { it.contains("SteamLaunch AppId=") || it.contains("proton waitforexitandrun") } == true - } == true + private fun gameProcessRunning(): Boolean = com.droiddeck.launcher.session.SteamGameProcess.running() fun queueInSession(context: Context, game: Library.SteamGame) { if (appKey(game) == null) return diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt b/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt index 330265a0fd..0983a29975 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt @@ -54,21 +54,6 @@ object DependencyDetector { "d3dx9", "d3dx11", "xact", "xact_x64", "xna31", "xna40", "physx", "oalinst", "XLiveRedist", ) - fun detectForExe(exeFile: File): List { - val start = exeFile.absoluteFile.parentFile ?: return emptyList() - var d: File? = start - var depth = 0 - while (d != null && depth < 4) { - val hasRedistContainer = try { - d.listFiles()?.any { it.isDirectory && REDIST_DIR_RE.matches(it.name.lowercase(Locale.US)) } == true - } catch (_: Throwable) { false } - if (hasRedistContainer) return detect(d) - d = d.parentFile - depth++ - } - return detect(start) - } - fun detect(gameDir: File): List { if (!gameDir.isDirectory) return emptyList() val hits = LinkedHashMap() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameExePicker.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameExePicker.kt index f692c75234..2466c8df8b 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameExePicker.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameExePicker.kt @@ -89,6 +89,8 @@ object GameExePicker { return score } + internal fun auxiliaryDir(dir: File): Boolean = skipDir(dir, dir.name) + private fun skipDir(dir: File, relative: String): Boolean { val name = dir.name.lowercase().trim() if (name in SKIP_DIRS || SKIP_DIR_PREFIX.any { name.startsWith(it) }) return true diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt index c8faf20e71..90735d1e54 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt @@ -5,6 +5,7 @@ import java.io.File object GameIdentifier { private const val MAX_PARENT_DEPTH = 6 + internal const val SPACEWAR = 480 enum class Source { STEAM_APPID_TXT, STEAM_MANIFEST_ACF, STEAM_EMU_INI, GOG_INFO, PE_VERSION, FILENAME, NONE } enum class Confidence { HIGH, MEDIUM, LOW } @@ -92,7 +93,7 @@ object GameIdentifier { for (candidate in arrayOf(File(dir, "steam_appid.txt"), File(dir, "steam_settings/steam_appid.txt"))) { val id = readSmallTextFile(candidate)?.removePrefix("\uFEFF")?.trim() ?.takeWhile { it.isDigit() }?.toIntOrNull() - if (id != null && id > 0) return id + if (id != null && id > 0 && id != SPACEWAR) return id } return null } @@ -111,7 +112,7 @@ object GameIdentifier { for (f in candidates) { val text = readSmallTextFile(f) ?: continue val id = re.find(text)?.groupValues?.getOrNull(1)?.toIntOrNull() - if (id != null && id > 0) return id + if (id != null && id > 0 && id != SPACEWAR) return id } return null } @@ -133,7 +134,8 @@ object GameIdentifier { val match = manifests.firstOrNull { m -> val text = readSmallTextFile(m) ?: return@firstOrNull false val installdir = vdfValue(text, "installdir") - gameFolder != null && installdir != null && installdir.equals(gameFolder, ignoreCase = true) + gameFolder != null && installdir != null && installdir.equals(gameFolder, ignoreCase = true) && + vdfValue(text, "appid")?.toIntOrNull() != SPACEWAR } ?: return null val text = readSmallTextFile(match) ?: return null diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GamesFolderMigration.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GamesFolderMigration.kt index 2c544b0104..91e5469579 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GamesFolderMigration.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GamesFolderMigration.kt @@ -24,15 +24,33 @@ object GamesFolderMigration { for (root in roots) { var n = 0 val steamInstalls = AddedGames.steamInstallDirs(root.host) - for (folder in root.host.listFiles { f -> f.isDirectory }?.sortedBy { it.name.lowercase() }.orEmpty()) { - if (AddedGames.isSteamLibraryFolder(folder.name) || folder.name.lowercase() in steamInstalls) continue - if (folder.absolutePath in storeRoots || StoreGameSidecar.read(folder) != null) continue - if (folder.path in entries) continue - val picked = SessionPrefs.addedGameExe(context, folder.path).takeIf { it.isNotEmpty() }?.let { File(it) }?.takeIf { it.isFile } - val exe = picked ?: AddedGames.rank(folder).exes.firstOrNull() ?: continue - AddedExes.put(context, AddedExes.Entry(folder.path, exe.path, picked = picked != null)) - entries.add(folder.path) - if (folder.path !in removed) n++ + for (top in root.host.listFiles { f -> f.isDirectory }?.sortedBy { it.name.lowercase() }.orEmpty()) { + if (AddedGames.isSteamLibraryFolder(top.name) || top.name.lowercase() in steamInstalls) continue + if (top.absolutePath in storeRoots || StoreGameSidecar.read(top) != null) continue + if (top.path in entries) continue + val topPick = SessionPrefs.addedGameExe(context, top.path).takeIf { it.isNotEmpty() }?.let { File(it) }?.takeIf { it.isFile } + val groups = AddedGames.groupGames(top) + val played = topPick ?: groups?.let { AddedGames.rank(top).exes.firstOrNull() } + val owner = played?.let { exe -> top.listFiles { f -> f.isDirectory }?.firstOrNull { exe.path.startsWith(it.path + File.separator) } } + val folders = when { + groups == null -> listOf(top) + topPick == null || owner in groups -> groups + owner == null || owner.name.startsWith(".") || AddedGames.isSteamLibraryFolder(owner.name) -> listOf(top) + else -> (groups + owner).sortedBy { it.name.lowercase() } + } + for (folder in folders) { + if (folder.absolutePath in storeRoots || StoreGameSidecar.read(folder) != null) continue + if (folder.path in entries) continue + val picked = SessionPrefs.addedGameExe(context, folder.path).takeIf { it.isNotEmpty() }?.let { File(it) }?.takeIf { it.isFile } + ?: topPick?.takeIf { it.path.startsWith(folder.path + File.separator) } + val ranked = AddedGames.rank(folder).exes.firstOrNull() + val exe = picked ?: played?.takeIf { folder == owner } ?: ranked ?: continue + AddedExes.put(context, AddedExes.Entry(folder.path, exe.path, picked = picked != null || exe != ranked)) + entries.add(folder.path) + if (folder != top && folder == owner) SessionPrefs.inheritAddedGame(context, top.path, folder.path) + if (folder != top && top.path in removed) SessionPrefs.setAddedGameRemoved(context, folder.path, true) + else if (folder.path !in removed) n++ + } } Log.i(TAG, "games: migrated ${root.host} → $n games") } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 958e1c5ae2..723181f080 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -5,6 +5,7 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.GameStorage import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SteamLibraries import com.droiddeck.launcher.session.SecondaryLibrary import java.io.File @@ -87,13 +88,14 @@ object Library { internal fun steamLibraries(context: Context, arch: String = SessionPrefs.activeSteamClientArch(context)): List> { val root = SessionPrefs.steamRoot(context, arch) - // The session gives the x86-64 client only its card folder; the games folders stay the arm64 client's. val card = GameStorage.effective(context) - if (arch == "x86_64") return listOfNotNull(root to "internal", card?.let { File(it.path, GameStorage.X64_CARD_DIR) to it.label }) + val added = SteamLibraries.list(context).filter { it.host.isDirectory } + if (arch == "x86_64") return listOfNotNull(root to "internal", card?.let { File(it.path, GameStorage.X64_CARD_DIR) to it.label }) + + added.map { it.x64Host to it.label } return listOfNotNull( root to "internal", card?.let { File(it.path) to it.label }, - ) + GameStorage.gamesFolderLibraries(context).map { it.host to it.label } + ) + added.map { it.host to it.label } + GameStorage.gamesFolderLibraries(context).map { it.host to it.label } } fun protonPrefix( @@ -101,15 +103,21 @@ object Library { libraries: List = steamLibraries(context).map { it.first }, ): File? { val ids = listOf(appId.toString(), java.lang.Integer.toString(appId.toInt())).distinct() + return prefixRoots(context, libraries, preferredLibrary).asSequence() + .flatMap { root -> ids.asSequence().map { id -> File(root, "steamapps/compatdata/$id/pfx") } } + .firstOrNull { it.isDirectory } + } + + fun compatdataDirs(context: Context, libraries: List = steamLibraries(context).map { it.first }): List = + prefixRoots(context, libraries).map { File(it, "steamapps/compatdata") }.filter { it.isDirectory } + + private fun prefixRoots(context: Context, libraries: List, preferredLibrary: File? = null): List { val secondary = libraries.drop(1).mapNotNull { runCatching { it.canonicalPath }.getOrNull() }.toSet() fun prefixRoot(root: File): File = if (runCatching { root.canonicalPath }.getOrNull() in secondary) SecondaryLibrary.privateRoot(context.filesDir, root).takeIf { File(it, "steamapps/compatdata").isDirectory } ?: root else root - val roots = (listOfNotNull(preferredLibrary) + libraries).map(::prefixRoot) + return (listOfNotNull(preferredLibrary) + libraries).map(::prefixRoot) .distinctBy { runCatching { it.canonicalPath }.getOrDefault(it.absolutePath) } - return roots.asSequence() - .flatMap { root -> ids.asSequence().map { id -> File(root, "steamapps/compatdata/$id/pfx") } } - .firstOrNull { it.isDirectory } } fun steamGames( @@ -172,7 +180,6 @@ object Library { } } - /** Apps the user hid (the "hidden" collection) or marked private in Steam. */ internal fun concealedSteamApps(root: File): Set { val config = AddedGames.accountConfig(root) ?: return emptySet() val hidden = runCatching { @@ -213,7 +220,6 @@ object Library { 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() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt b/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt index cd30e400cf..6fa35c753a 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/LibraryCache.kt @@ -10,7 +10,6 @@ object LibraryCache { private const val TAG = "LibraryCache" private fun file(context: Context) = File(context.filesDir, "library-cache.json") - /** The cached games and whether they are the x86-64 client's; a cache written as a bare list is arm64's. */ @Synchronized fun snapshot(context: Context): Pair, Boolean> = runCatching { val f = file(context) @@ -36,7 +35,6 @@ object LibraryCache { fun listedX64(context: Context): Boolean = snapshot(context).second - /** Without [x64] the list keeps the client already recorded. */ @Synchronized fun save(context: Context, games: List, x64: Boolean? = null) { runCatching { diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/LogoPosition.kt b/app/src/main/java/com/droiddeck/launcher/frontend/LogoPosition.kt index a047da09e4..64491df82c 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/LogoPosition.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/LogoPosition.kt @@ -2,7 +2,6 @@ package com.droiddeck.launcher.frontend import org.json.JSONObject -/** Where Steam pins a game's logo on its hero image and how big it draws it; the same JSON Steam keeps in `.json`. */ object LogoPosition { enum class Pin(val steam: String) { UPPER_LEFT("UpperLeft"), UPPER_CENTER("UpperCenter"), CENTER("CenterCenter"), BOTTOM_LEFT("BottomLeft"), BOTTOM_CENTER("BottomCenter"); @@ -17,7 +16,6 @@ object LogoPosition { const val MIN_PCT = 10 const val MAX_PCT = 100 - /** What Steam draws when a game has no custom position. */ val DEFAULT = Value(Pin.BOTTOM_LEFT, 50, 50) private const val VERSION = 1 @@ -25,7 +23,6 @@ object LogoPosition { fun sized(pin: Pin, size: Int): Value = size.coerceIn(MIN_PCT, MAX_PCT).let { Value(pin, it, it) } - /** `{"nVersion":1,"logoPosition":{...}}`, with whatever else [into] already held kept as it was. */ fun toJson(value: Value, into: JSONObject = JSONObject()): JSONObject = into .put("nVersion", VERSION) .put(KEY, JSONObject().put("pinnedPosition", value.pin.steam).put("nWidthPct", value.widthPct).put("nHeightPct", value.heightPct)) @@ -39,7 +36,6 @@ object LogoPosition { return Value(pin, inner.optInt("nWidthPct").coerceIn(MIN_PCT, MAX_PCT), inner.optInt("nHeightPct").coerceIn(MIN_PCT, MAX_PCT)) } - /** [existing] without the logo position; null when nothing but the version number would be left. */ fun without(existing: JSONObject): JSONObject? { existing.remove(KEY) val rest = existing.keys().asSequence().filter { it != "nVersion" }.toList() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt index 88526f1bf7..e52defb7df 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt @@ -7,11 +7,9 @@ import org.json.JSONObject import java.io.File import java.util.UUID -/** Steam keeps a game's custom art in `userdata//config/grid`; this is where DroidDeck's choices and Steam's meet. */ object SteamGrid { private const val TAG = "SteamGrid" - /** Every change to a game's art, here or in a scan, takes this first so two of them never interleave. */ internal val lock = Any() private const val MANIFEST = ".droiddeck-art.json" private val SUFFIX = mapOf(AddedGameArt.Slot.COVER to "p", AddedGameArt.Slot.WIDE to "", AddedGameArt.Slot.BACKGROUND to "_hero", AddedGameArt.Slot.LOGO to "_logo") @@ -36,7 +34,6 @@ object SteamGrid { private fun signature(file: File?) = if (file == null) "" else "${file.length()}:${file.lastModified()}" - /** Each Steam client has its own grid folder, so what was last seen there is kept per client. */ private fun sigName(context: Context, key: String) = if (SessionPrefs.activeSteamClientArch(context) == "x86_64") "grid-x86_64-$key" else "grid-$key" @@ -45,10 +42,6 @@ object SteamGrid { private const val GRID_ID = ".droiddeck-grid" private const val UNKNOWN_GRID = "?" - /** - * A random id kept in the grid folder, so a record made against another account's folder, or one wiped with the - * runtime, reads as "not seen yet" instead of "removed in Steam". "?" never matches, so nothing is dropped. - */ private fun gridId(grid: File): String = runCatching { val f = File(grid, GRID_ID) f.takeIf { it.isFile }?.readText()?.trim()?.takeIf { it.isNotEmpty() } ?: UUID.randomUUID().toString().also { id -> @@ -83,7 +76,6 @@ object SteamGrid { manifest.keys().asSequence().filter { name -> File(grid, name).let { it.isFile && it.length() == manifest.optLong(name, -1L) } }.toSet() }.getOrDefault(emptySet()) - /** Puts a choice (or, with null, the lack of one) where Steam reads it, whether or not Steam is running. */ fun write(context: Context, target: Target, slot: AddedGameArt.Slot, file: File?): Boolean = synchronized(lock) { place(context, target, slot, file) } private fun place(context: Context, target: Target, slot: AddedGameArt.Slot, file: File?): Boolean { @@ -116,7 +108,6 @@ object SteamGrid { private fun positionIn(file: File): LogoPosition.Value? = file.takeIf { it.isFile }?.let { runCatching { it.readText() }.getOrNull() }?.let(LogoPosition::parse) - /** The logo position chosen here (or taken over from Steam) for a game; null when Steam's own default applies. */ fun position(target: Target): LogoPosition.Value? = positionIn(File(target.artDir, POSITION)) private fun positionRecorded(context: Context, grid: File, target: Target): String? = @@ -132,12 +123,10 @@ object SteamGrid { return runCatching { file.writeText(LogoPosition.toJson(value).toString()) }.isSuccess } - /** Sets (or with null, clears) a game's logo position here and in the client's grid folder, whether or not Steam is running. */ fun writePosition(context: Context, target: Target, value: LogoPosition.Value?): Boolean = synchronized(lock) { placePosition(context, target, value) && storePosition(target, value) } - /** Steam keeps the position in `.json`; anything else that file holds is left as it was. */ private fun placePosition(context: Context, target: Target, value: LogoPosition.Value?): Boolean { val grid = dir(context) ?: return true val file = positionFile(grid, target.id) @@ -160,7 +149,6 @@ object SteamGrid { return true } - /** A `logoPosition` this version cannot read (a pin it does not know, say) is left alone rather than read as "removed". */ private fun hasUnknownPosition(file: File): Boolean { val json = runCatching { JSONObject(file.readText()) }.getOrNull() ?: return false return json.has("logoPosition") && LogoPosition.parse(json) == null @@ -176,7 +164,6 @@ object SteamGrid { when { before == null && own != null && theirs == null -> placePosition(context, target, own) before == null || now != before -> { - // Recorded only once the local side agrees, so a failed take-over is tried again on the next scan. if (theirs != null) { if (own == theirs || storePosition(target, theirs)) recordPosition(context, grid, target, now) } else { @@ -187,7 +174,6 @@ object SteamGrid { } } - /** Takes over what changed in Steam since the last look; returns true when a choice was added, replaced or dropped. */ fun sync(context: Context, targets: List): Boolean = synchronized(lock) { reconcile(context, targets) } private fun reconcile(context: Context, targets: List): Boolean { diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGridDb.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGridDb.kt index 2eaa89410d..0afe9837a0 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGridDb.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGridDb.kt @@ -70,15 +70,22 @@ object SteamGridDb { if (!tmp.renameTo(f)) { f.delete(); tmp.renameTo(f) } } - fun gameId(key: String, steamAppId: Int?, name: String): Int? { + fun gameId(key: String, steamAppId: Int?, name: String): Int? = gameId(key, steamAppId, name, ::match) + + fun exactGameId(key: String, steamAppId: Int?, name: String): Int? = gameId(key, steamAppId, name, ::exactMatch) + + private fun gameId(key: String, steamAppId: Int?, name: String, pick: (String, List>) -> Int?): Int? { if (steamAppId != null) { json(key, "$API/games/steam/$steamAppId")?.optJSONObject("data")?.optInt("id")?.takeIf { it > 0 }?.let { return it } } val term = URLEncoder.encode(name, "UTF-8").replace("+", "%20") val results = json(key, "$API/search/autocomplete/$term")?.optJSONArray("data") ?: return null - return match(name, (0 until results.length()).map { results.getJSONObject(it) }.map { it.optInt("id") to it.optString("name") }) + return pick(name, (0 until results.length()).map { results.getJSONObject(it) }.map { it.optInt("id") to it.optString("name") }) } + internal fun exactMatch(name: String, results: List>): Int? = + results.firstOrNull { (id, got) -> id > 0 && AddedGameArt.nameMatch(name, got) == 3 }?.first + internal fun match(name: String, results: List>): Int? = results.map { (id, got) -> id to AddedGameArt.nameMatch(name, got) } .filter { it.second > 0 && it.first > 0 } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt new file mode 100644 index 0000000000..cc832db347 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt @@ -0,0 +1,162 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.stores.SteamLiveShortcuts +import java.io.File +import java.nio.file.Files +import java.nio.file.StandardCopyOption + +object SteamLaunchOptions { + private const val TAG = "SteamLaunchOptions" + private val STEAM = listOf("UserLocalConfigStore", "Software", "Valve", "Steam") + + fun current(context: Context, appId: Int): String = + SteamLiveShortcuts.launchOptions(context, appId.toLong()) ?: steam(SessionPrefs.activeSteamRoot(context), appId).orEmpty() + + enum class Saved { YES, NO, DESKTOP } + + fun set(context: Context, appId: Int, options: String, shown: String): Saved { + val value = options.trim() + if (SessionState.running && SessionState.mode == SessionService.MODE_DESKTOP) return Saved.DESKTOP + if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) { + val live = SteamLiveShortcuts.launchOptions(context, appId.toLong()) ?: return Saved.NO + if (live.trim() != shown.trim()) return Saved.NO + return if (SteamLiveShortcuts.setLaunchOptions(context, appId.toLong(), value)) Saved.YES else Saved.NO + } + val home = SessionPrefs.activeSteamRoot(context) + if (steam(home, appId).orEmpty().trim() != shown.trim()) return Saved.NO + return if (write(home, appId, value)) Saved.YES else Saved.NO + } + + internal fun steam(steamHome: File, appId: Int): String? { + val config = AddedGames.accountConfig(steamHome) ?: return null + val text = runCatching { File(config, "localconfig.vdf").readText() }.getOrNull() ?: return null + return launchOptions(text, appId) + } + + internal fun write(steamHome: File, appId: Int, options: String): Boolean { + val config = AddedGames.accountConfig(steamHome)?.let { File(it, "localconfig.vdf") } ?: return false + val text = runCatching { config.readText() }.getOrNull() ?: return false + val updated = withLaunchOptions(text, appId, options) ?: return false + if (updated == text) return true + val staged = File(config.parentFile, config.name + ".staged") + return try { + staged.writeText(updated) + if (config.readText() != text) { + staged.delete() + return false + } + Files.move(staged.toPath(), config.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + true + } catch (e: Exception) { + staged.delete() + Log.w(TAG, "could not write launch options to ${config.path}", e) + false + } + } + + internal fun launchOptions(text: String, appId: Int): String? { + val app = section(text, STEAM + "apps" + appId.toString()) ?: return null + return entries(text, app.valueStart, app.end).firstOrNull { !it.section && it.key.equals("LaunchOptions", true) } + ?.let { unescape(text.substring(it.valueStart + 1, it.end)) } + } + + internal fun withLaunchOptions(text: String, appId: Int, options: String): String? { + val newline = if (text.contains("\r\n")) "\r\n" else "\n" + var updated = text + var path = STEAM + for (key in listOf("apps", appId.toString())) { + updated = withSection(updated, section(updated, path) ?: return null, key, newline) ?: return null + path = path + key + } + val app = section(updated, path) ?: return null + val value = "\"" + escape(options) + "\"" + entries(updated, app.valueStart, app.end).firstOrNull { !it.section && it.key.equals("LaunchOptions", true) }?.let { + return updated.replaceRange(it.valueStart, it.end + 1, value) + } + val lineStart = closingLine(updated, app) ?: return null + val indent = updated.substring(lineStart, app.end) + "\t" + return updated.substring(0, lineStart) + indent + "\"LaunchOptions\"\t\t" + value + newline + updated.substring(lineStart) + } + + private class Entry(val key: String, val valueStart: Int, val end: Int, val section: Boolean) + + private fun section(text: String, path: List): Entry? { + var found: Entry? = null + for (key in path) { + found = entries(text, found?.valueStart ?: -1, found?.end ?: text.length) + .firstOrNull { it.section && it.key.equals(key, true) } ?: return null + } + return found + } + + private fun entries(text: String, open: Int, close: Int): List { + val found = ArrayList() + var key: String? = null + var i = open + 1 + while (i < close) { + when { + text[i] == '"' -> { + val end = stringEnd(text, i) ?: return found + if (key == null) key = unescape(text.substring(i + 1, end)) else { found += Entry(key, i, end, false); key = null } + i = end + 1 + } + text[i] == '{' -> { + val end = sectionEnd(text, i) ?: return found + key?.let { found += Entry(it, i, end, true) } + key = null + i = end + 1 + } + text.startsWith("//", i) -> i = text.indexOf('\n', i).let { if (it < 0) close else it } + else -> i++ + } + } + return found + } + + private fun stringEnd(text: String, open: Int): Int? { + var i = open + 1 + while (i < text.length) { + when (text[i]) { + '\\' -> i += 2 + '"' -> return i + else -> i++ + } + } + return null + } + + private fun sectionEnd(text: String, open: Int): Int? { + var depth = 0 + var i = open + while (i < text.length) { + when (text[i]) { + '"' -> i = stringEnd(text, i) ?: return null + '{' -> depth++ + '}' -> if (--depth == 0) return i + } + i++ + } + return null + } + + private fun withSection(text: String, parent: Entry, key: String, newline: String): String? { + if (entries(text, parent.valueStart, parent.end).any { it.section && it.key.equals(key, true) }) return text + val lineStart = closingLine(text, parent) ?: return null + val indent = text.substring(lineStart, parent.end) + "\t" + return text.substring(0, lineStart) + "$indent\"$key\"$newline$indent{$newline$indent}$newline" + text.substring(lineStart) + } + + private fun closingLine(text: String, section: Entry): Int? { + val lineStart = text.lastIndexOf('\n', section.end - 1) + 1 + return lineStart.takeIf { lineStart > section.valueStart && text.substring(lineStart, section.end).all { it == '\t' || it == ' ' } } + } + + private fun escape(value: String) = value.replace("\\", "\\\\").replace("\"", "\\\"") + + private fun unescape(value: String) = value.replace(Regex("\\\\(.)"), "$1") +} diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt index c0c83676dc..8371288e2d 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt @@ -45,15 +45,15 @@ object SteamMatch { identity?.appId?.let { id -> return Match(id, Certainty.FILES, identity.source.name.lowercase(), now).also { put(context, key, it) } } - val known = get(context, key) + val known = get(context, key)?.takeUnless { it.appId == GameIdentifier.SPACEWAR } if (known != null && known.certainty == Certainty.NAME) return known if (known != null && known.certainty == Certainty.NONE && now - known.checkedAt < RETRY_AFTER_MS) return known - legacy?.takeIf { it.isFile }?.let { runCatching { it.readText().trim().toInt() }.getOrNull() }?.takeIf { it > 0 }?.let { id -> + legacy?.takeIf { it.isFile }?.let { runCatching { it.readText().trim().toInt() }.getOrNull() }?.takeIf { it > 0 && it != GameIdentifier.SPACEWAR }?.let { id -> return Match(id, Certainty.NAME, "store search", now).also { put(context, key, it) } } if (search == null) return known?.takeIf { it.certainty != Certainty.FILES } ?: Match(null, Certainty.NONE, "", 0) val id = runCatching { search(name) }.getOrNull() - val match = if (id != null && id > 0) Match(id, Certainty.NAME, "store search", now) else Match(null, Certainty.NONE, "", now) + val match = if (id != null && id > 0 && id != GameIdentifier.SPACEWAR) Match(id, Certainty.NAME, "store search", now) else Match(null, Certainty.NONE, "", now) put(context, key, match) return match } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt index e022ebc8ec..a287c2299e 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt @@ -15,7 +15,6 @@ object SteamRedists { "228989" to ("vcredist2022_dll" to "VC++ 2022"), "228990" to ("d3dx9" to "DirectX (June 2010)"), ) - /** Redists a game's own install script runs on Windows that its shared depots don't name. */ val SCRIPTED = mapOf( 72850 to listOf("xact" to "DirectX XACT audio"), 489830 to listOf("xact_x64" to "DirectX XACT audio (64-bit)"), @@ -28,7 +27,6 @@ object SteamRedists { return File(steamapps, "appmanifest_$appId.acf").takeIf { it.isFile } } - /** Redists the game's own install script has Steam run on Windows, from its "Run Process" entries. */ fun installScript(gameDir: File?): List> = gameDir?.listFiles { f -> f.isFile && f.length() < 1L shl 20 && f.name.lowercase().let { it.startsWith("installscript") && it.endsWith(".vdf") } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt index 8e91102f3b..22044c76d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt @@ -51,10 +51,8 @@ object WinCompSources { fun installer(path: String): List = if (UE_PREREQ.containsMatchIn(path)) listOf("vcredist2022", "d3dx9") else DependencyDetector.componentsFor(path) private val XBOX_KNOWN = Regex("""> { val config = folder?.listFiles().orEmpty().firstOrNull { it.isFile && it.name.equals("MicrosoftGame.config", ignoreCase = true) && it.length() < 1L shl 20 } val declared = config?.let { file -> runCatching { XBOX_KNOWN.findAll(file.readText()).map { it.groupValues[1] }.toList() }.getOrNull() }.orEmpty() diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt b/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt index fe09a7809e..f14d92da2f 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/Glasses.kt @@ -563,7 +563,6 @@ object Glasses { val device = selected?.first val m = selected?.second val controllable = m?.let(::canOpenModel) == true - // XREAL uses Android's Ethernet sockets, without opening or claiming USB interfaces. val permitted = controllable && device != null && (m === XrealModel || usb.hasPermission(device)) val identity = device?.let { GlassesModeState.Device(it.productId, if (permitted) runCatching { it.serialNumber }.getOrNull() else null) @@ -677,8 +676,6 @@ object Glasses { internal fun selectGlassesDisplay(displays: List, usbPresent: Boolean): Display? { val candidates = displays .filter { it.displayId != Display.DEFAULT_DISPLAY && it.flags and Display.FLAG_PRESENTATION != 0 } - // Android can expose the glasses name on either the logical display or - // its product metadata. A generic label on one must not hide the other. return candidates.firstOrNull { display -> isGlassesDisplayName(display.name) || (Build.VERSION.SDK_INT >= 31 && display.deviceProductInfo?.let { product -> @@ -728,7 +725,6 @@ object Glasses { if (device.productId == VitureProtocol.PRO2_PRODUCT_ID) { VitureV2Link.open(usb, device, v2Listener(generation)) } else if ((model as? VitureProtocol.Model)?.needsSdk == true) { - // Android can evict cacheDir while the SDK is running. Log.i(TAG, "opening VITURE SDK pid=0x%04X spatial=%s".format(device.productId, spatial)) VitureSdkLink.open(usb, device, File(app.noBackupFilesDir, "viture"), sdkListener(generation), (model as? VitureProtocol.Model)?.family, spatial) @@ -854,7 +850,6 @@ object Glasses { if (generation != linkGeneration) return@post closeLink() publish { it.copy(controlError = app.getString(R.string.glasses_connection_failed)) } - // Let a reconnect or explicit Allow retry restart the SDK, not an endless failure loop. } } @@ -974,7 +969,6 @@ object Glasses { } if (!s.usable || s.sbs || modeState.pendingStereo) return val hz = _settings.value.refreshHz - // Native 30 Hz is selected by the Android presentation, without a vendor mode command. if (hz == 30 && GlassesRendering.native30HzAvailable(_settings.value, s)) return if (glassesMode == m.mode(hz, false, outputResolution())) return if (!force) { diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesHardware.kt b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesHardware.kt index 5de0f03f52..3bf992cbd3 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesHardware.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesHardware.kt @@ -1,6 +1,5 @@ package com.droiddeck.launcher.glasses -/** Hardware properties; display refresh is selected from Android's advertised modes. */ interface GlassesModel { val name: String val controllable: Boolean @@ -18,9 +17,6 @@ interface GlassesModel { fun modeForStep(step: Int): Int? } -/** The command IDs here are the existing glasses controller's internal vocabulary. - * Each transport translates them to its own wire protocol; unsupported controls return false. - */ internal interface GlassesLink { val hasImu: Boolean val badFrames: Long get() = 0L diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesMenuSurface.kt b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesMenuSurface.kt index cefe3d9329..501aaae1b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesMenuSurface.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesMenuSurface.kt @@ -63,7 +63,6 @@ class GlassesMenuSurface( override fun onDetachedFromWindow() { close() super.onDetachedFromWindow() - // GLSurfaceView may exit its GL thread before queued cleanup is consumed. releaseInput() } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt index b07221556d..01df9fe56b 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt @@ -2,7 +2,6 @@ package com.droiddeck.launcher.glasses import com.droiddeck.launcher.gpu.Cardboard -/** Share the actual picture mode with settings so controls match the rendered view. */ internal object GlassesRendering { enum class Picture { FLAT, DUPLICATED, VIRTUAL_SCREEN, STEREO } @@ -51,11 +50,7 @@ internal object GlassesRendering { outputActive: Boolean, steamVrRunning: Boolean, ): Cardboard { - // Mirror output still uses the glasses' picture and sensors during VR. if (!usesGlasses(state, outputActive, steamVrRunning)) { - // SteamVR uses the renderer's enabled flag as headset proximity. - // A flat phone preview still needs an active HMD and one SBS eye; - // otherwise SteamVR enters standby and leaves a frozen frame. return if (steamVrRunning && !base.enabled) base.copy( enabled = true, source = Cardboard.SOURCE_SBS, diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesScreen.kt b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesScreen.kt index c15e9c623f..43f80bfc38 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesScreen.kt @@ -36,7 +36,6 @@ class GlassesScreen(context: Context, display: Display, refreshHz: Int, private fun prefer(hz: Int, resolution: GlassesResolution? = null) { wantHz = hz wantResolution = resolution - // A 2D/SBS transition can replace the active mode without changing Hz. applyMode() } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/HandImageBuffer.kt b/app/src/main/java/com/droiddeck/launcher/glasses/HandImageBuffer.kt index b6aa9844a5..a3d94cd6a6 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/HandImageBuffer.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/HandImageBuffer.kt @@ -51,7 +51,6 @@ internal class HandImageBuffer { pixels.clear() pixels.put(rgb) pixels.rewind() - // MediaPipe applies the model metadata's float normalization to these RGB bytes. return ByteBufferImageBuilder(pixels, width, height, MPImage.IMAGE_FORMAT_RGB).build() } } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/LumaRgbDiagnostic.kt b/app/src/main/java/com/droiddeck/launcher/glasses/LumaRgbDiagnostic.kt index 6a483a1a04..5f6175474a 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/LumaRgbDiagnostic.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/LumaRgbDiagnostic.kt @@ -150,7 +150,6 @@ class LumaRgbCaptureService : Service() { intent?.getIntExtra("durationMs",5000) ?: 5000) } finally { stopSelf() - // SDK 2.4.0 can crash while cancelling failed USB transfers; isolate each diagnostic. android.os.Process.killProcess(android.os.Process.myPid()) } }, "luma-rgb-diagnostic").start() diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoCalibration.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoCalibration.kt index 8e579aee39..23ebcce819 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoCalibration.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoCalibration.kt @@ -40,12 +40,9 @@ internal data class RayNeoCalibration(val gyroBiasDps: Vec3, val level: Quaterni internal class RayNeoCalibrationStore(private val prefs: SharedPreferences) { companion object { - // GT and GT Max can share USB identity fields. Keep the non-Max mounting - // correction separate from existing Max profiles and their legacy keys. fun profileKey(base: String, gtUsb: Boolean, boardId: Int): String = if (gtUsb && boardId == RayNeoProtocol.BOARD_GT) "$base:gt-standard-v1" else base } - // A serial isolates physical units. Devices without one share their model profile. fun key(vid: Int, pid: Int, serial: String?, modelName: String = ""): String = "rayneo-cal-v1:$vid:$pid:${serial?.takeIf { it.isNotBlank() } ?: "model:$modelName"}" fun load(key: String): RayNeoCalibration? = RayNeoCalibration.decode(prefs.getString(key, null)) @@ -55,7 +52,6 @@ internal class RayNeoCalibrationStore(private val prefs: SharedPreferences) { } } -/** One upside-down stationary pose estimates gyro bias and tilt, never yaw or accelerometer scale. */ internal class RayNeoCalibrationCollector(private val axes: RayNeoSensorAxes, private val beganMs: Long) { var phase = CalibrationPhase.SETTLING; private set var progress = 0; private set diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoLink.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoLink.kt index c9770ed224..78c2275b44 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoLink.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoLink.kt @@ -6,7 +6,6 @@ import android.hardware.usb.UsbManager import android.os.SystemClock import android.util.Log -/** RayNeo command/response and IMU share one endpoint. Keep reads on a single worker. */ internal class RayNeoLink private constructor( private val connection: UsbDeviceConnection, private val endpoints: RayNeoEndpointSelection, @@ -52,7 +51,6 @@ internal class RayNeoLink private constructor( ready && (mode == RayNeoProtocol.CMD_SWITCH_TO_3D || mode == RayNeoProtocol.CMD_SWITCH_TO_2D) && command(mode) } - // No VITURE brightness, volume, film, rate or raw command is sent to RayNeo. else -> false } } @@ -159,7 +157,6 @@ internal class RayNeoLink private constructor( } val wxyz = filter.update(packet.sample) if (wantImu && collector == null && lastSensor >= warmupUntil) { - // Normalize basis and component order at the hardware boundary. listener.onPose(raw, RayNeoOrientationFilter.glassesPose(wxyz), SystemClock.elapsedRealtimeNanos()) } @@ -176,7 +173,6 @@ internal class RayNeoLink private constructor( override fun close() { synchronized(writeLock) { if (!running) return - // Best effort: stop the sensor before releasing the claimed interface. if (ready) runCatching { command(RayNeoProtocol.CMD_CLOSE_IMU) } running = false } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoModel.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoModel.kt index ccb19f7445..72c88b34b1 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoModel.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoModel.kt @@ -8,8 +8,6 @@ object RayNeoModel { fun model(vid: Int, pid: Int, name: String?): GlassesModel? { if (!isVendor(vid)) return null - // GT's identity is confirmed by verncat's SDK; do not claim other products - // from that vendor just because their name resembles a supported model. val gt = RayNeoProtocol.isGt(vid, pid) if (vid == RayNeoProtocol.GT_VENDOR_ID && !gt) return null if (!(vid == RayNeoProtocol.VENDOR_ID && pid == RayNeoProtocol.PRODUCT_ID) && @@ -23,8 +21,6 @@ object RayNeoModel { name.contains("rayneo", ignoreCase = true) || name.contains("ray neo", ignoreCase = true) || modelName.containsMatchIn(name) - // Observed on GT Max: Android exposes an unbranded EDID monitor name. - // Match its product metadata, not every display called SmartGlasses/TCL. fun isDisplayProduct(name: String?, manufacturer: String?, productId: String?): Boolean = name?.trim().equals("SmartGlasses", ignoreCase = true) && manufacturer.equals("TCL", ignoreCase = true) && productId == "980" @@ -33,7 +29,7 @@ object RayNeoModel { override val controllable = true override val brightnessMax = 0 override val volumeMax = 0 - override val diagonalFovDeg = 46f // Conservative existing default, not a calibrated model profile. + override val diagonalFovDeg = 46f override val sbs90 = false override fun mode(hz: Int, sbs: Boolean) = if (sbs) RayNeoProtocol.CMD_SWITCH_TO_3D else RayNeoProtocol.CMD_SWITCH_TO_2D diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilter.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilter.kt index 96bff85009..22a3a8965a 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilter.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilter.kt @@ -1,5 +1,4 @@ -// Adapted from informalTechCode/RayNeo-Air-Series-3DoF-Scaffold (Apache-2.0). -// See docs/third-party/rayneo/. Returns scaffold quaternions in (w, x, y, z) order. +// Adapted from informalTechCode/RayNeo-Air-Series-3DoF-Scaffold (Apache-2.0); see docs/third-party/rayneo/ for license and attribution. package com.droiddeck.launcher.glasses import kotlin.math.cos @@ -123,10 +122,6 @@ internal class RayNeoOrientationFilter( private var lastRealtimeNs: Long = 0L companion object { - /** Scaffold: right +X, up +Y, back +Z. VITURE: right -Y, up +Z, back -X. - * Conjugate by HeadPose.GLASSES_AXES before entering the unchanged VITURE pose path. - * This is a basis conversion, not a projection or seated-origin adjustment. - */ fun glassesPose(wxyz: FloatArray): FloatArray = floatArrayOf(-wxyz[3], -wxyz[1], wxyz[2], wxyz[0]) } @@ -168,8 +163,6 @@ internal class RayNeoOrientationFilter( if (accelNorm > 1e-3f) { val measuredUp = accel.normalized() if (!gravityInitialized) { - // Align gravity before publishing the first pose. Starting at - // identity and settling after recenter can rotate the horizon. val axis = measuredUp.cross(worldUp) q = if (measuredUp.y < -0.9999f) { Quaternion.fromAxisAngle(Vec3(1f, 0f, 0f), Math.PI.toFloat()) @@ -179,7 +172,6 @@ internal class RayNeoOrientationFilter( gravityInitialized = true } val predictedUp = q.conjugate().rotate(worldUp).normalized() - // q maps body to world: measured x predicted reduces gravity error. val correction = measuredUp.cross(predictedUp) gyro += correction * accelGain } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoProtocol.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoProtocol.kt index 9f65b04dfc..781f0555d2 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoProtocol.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RayNeoProtocol.kt @@ -40,14 +40,13 @@ data class RayNeoEndpointSelection( object RayNeoProtocol { const val VENDOR_ID = 0x1BBB const val PRODUCT_ID = 0xAF50 - // verncat/RayNeo-Air-3S-Pro-OpenVR PR #3 (MIT), tested on GT hardware. const val GT_VENDOR_ID = 0x3941 private const val GT_CONTROL_INTERFACE = 5 fun isGt(vid: Int, pid: Int) = vid == GT_VENDOR_ID && pid == PRODUCT_ID const val BOARD_AIR_4_PRO = 0x3A - const val BOARD_GT = 0x40 // Observed on the user's non-Max GT. + const val BOARD_GT = 0x40 const val PKT_MAGIC = 0x99 const val PKT_SENSOR = 0x65 @@ -131,7 +130,6 @@ object RayNeoProtocol { endpoint.type != UsbConstants.USB_ENDPOINT_XFER_BULK) { continue } - // Exclude small button reports from GT's protocol transport. if (gt && endpoint.maxPacketSize < 64) continue if (endpoint.direction == UsbConstants.USB_DIR_IN && inEndpoint == null) { @@ -159,8 +157,6 @@ object RayNeoProtocol { } } - // Interface numbers can change with firmware. Use a unique protocol-sized - // pair when interface 5 is absent, never an arbitrary composite interface. return if (gt) gtCandidates.singleOrNull() else fallback } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RokidLink.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RokidLink.kt index dbf10a6e65..3b1002ebaa 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RokidLink.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RokidLink.kt @@ -9,7 +9,6 @@ import android.hardware.usb.UsbManager import android.os.SystemClock import android.util.Log -/** Controls are vendor control transfers; the HID interrupt endpoint streams IMU reports unprompted. */ internal class RokidLink private constructor( private val connection: UsbDeviceConnection, private val usbInterface: UsbInterface, @@ -44,7 +43,7 @@ internal class RokidLink private constructor( ?.let { listener.onValue(VitureProtocol.MSG_BRIGHTNESS, RokidModel.brightnessStep(it)) } != null VitureProtocol.MSG_BRIGHTNESS -> value in 0..RokidModel.BRIGHTNESS_STEPS && control(RokidModel.REQUEST_SET_BRIGHTNESS, RokidModel.brightnessRaw(value), RokidModel.INDEX_BRIGHTNESS) - else -> false // Volume is the glasses' USB audio device; there is no film or IMU-rate control. + else -> false } } @@ -54,7 +53,6 @@ internal class RokidLink private constructor( if (!running) return null val buffer = ByteArray(64) val count = connection.controlTransfer(VENDOR_IN, request, 0, index, buffer, buffer.size, TIMEOUT_MS) - // Display mode is reported in the second byte, brightness in the first. val offset = if (request == RokidModel.REQUEST_GET_DISPLAY) 1 else 0 if (count > offset) buffer[offset].toInt() and 0xff else null } @@ -90,7 +88,6 @@ internal class RokidLink private constructor( if (enabled && !wasTracking) fusion = ImuFusion() wasTracking = enabled if (!enabled) continue - // Max captures: already right/up/back; level gravity +Y, turn left +gyroY, look up +gyroX, roll right -gyroZ. fusion.update(sample.timeNs, sample.accel, sample.gyro)?.let { if (running && tracking) listener.onPose(buffer.copyOf(count), it, SystemClock.elapsedRealtimeNanos()) } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt index 35227206b7..62d5ab81db 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt @@ -3,7 +3,6 @@ package com.droiddeck.launcher.glasses import java.nio.ByteBuffer import java.nio.ByteOrder -/** Rokid Air/Max share one USB identity; Max 2 has a separate product ID. */ internal class RokidModel private constructor(override val name: String, private val max: Boolean) : GlassesModel { override val controllable = true override val brightnessMax = BRIGHTNESS_STEPS @@ -36,7 +35,6 @@ internal class RokidModel private constructor(override val name: String, private const val MAX2_PRODUCT_ID = 0x2002 const val BRIGHTNESS_STEPS = 10 - // Vendor control requests, device recipient. const val REQUEST_SET_DISPLAY = 0x01 const val REQUEST_GET_DISPLAY = 0x81 const val REQUEST_SET_BRIGHTNESS = 0x02 @@ -51,7 +49,6 @@ internal class RokidModel private constructor(override val name: String, private const val MODE_SBS_1200_60 = 5 val MODES = setOf(MODE_2D_60, MODE_SBS_1080_60, MODE_2D_120, MODE_SBS_1200_90, MODE_SBS_1200_60) - // 0x04d2 is a shared vendor ID, so the Rokid product string is required too. fun model(vid: Int, pid: Int, name: String?): GlassesModel? { if (vid != VENDOR_ID || (pid != PRODUCT_ID && pid != MAX2_PRODUCT_ID)) return null val product = name?.trim()?.takeIf { it.startsWith("Rokid", ignoreCase = true) } ?: return null @@ -60,7 +57,6 @@ internal class RokidModel private constructor(override val name: String, private fun isDisplay(name: String) = name.contains("Rokid", ignoreCase = true) - /** Device brightness is 0..100; the shared slider uses ten steps. */ fun brightnessStep(raw: Int): Int = ((raw.coerceIn(0, 100) + 5) / 10).coerceIn(0, BRIGHTNESS_STEPS) fun brightnessRaw(step: Int): Int = step.coerceIn(0, BRIGHTNESS_STEPS) * 10 } @@ -74,7 +70,6 @@ internal object RokidProtocol { private const val SENSOR_ACCEL = 1 private const val SENSOR_GYRO = 2 - /** Max sends one combined report; Air sends accel and gyro reports that share a timestamp. */ class Parser { private var accel: Vec3? = null private var accelTime = -1L @@ -87,7 +82,7 @@ internal object RokidProtocol { return when (packet[0].toInt() and 0xff) { COMBINED -> Sample(b.getLong(1), vec(b, 9), vec(b, 21), packet[59].toInt() and 0xff) SEPARATE -> { - val time = b.getLong(9) * 1000 // Air reports microseconds; Max reports nanoseconds. + val time = b.getLong(9) * 1000 when (packet[1].toInt() and 0xff) { SENSOR_ACCEL -> { accel = vec(b, 21); accelTime = time } SENSOR_GYRO -> { gyro = vec(b, 21); gyroTime = time } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/StereoCalibration.kt b/app/src/main/java/com/droiddeck/launcher/glasses/StereoCalibration.kt index 027f0b92e1..8c08316d57 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/StereoCalibration.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/StereoCalibration.kt @@ -26,7 +26,6 @@ internal class StereoCalibration(val identity: String, val width: Int, val heigh val source get() = if (bundledBase && !verified) "luma-ultra-base" else "device" private val p1 = Mat.zeros(3, 4, CvType.CV_64F) private val p2 = Mat.zeros(3, 4, CvType.CV_64F) - private val undistortionMaps = Array(2) { arrayOf(Mat(),Mat()) } init { val a = Mat.eye(3, 4, CvType.CV_64F) val b = Mat.zeros(3, 4, CvType.CV_64F) @@ -35,18 +34,6 @@ internal class StereoCalibration(val identity: String, val width: Int, val heigh Core.gemm(k1, a, 1.0, empty, 0.0, p1); Core.gemm(k2, b, 1.0, empty, 0.0, p2) a.release(); b.release(); empty.release() } - fun undistort(src: Mat, dst: Mat, right: Boolean) { - val k = if (right) k2 else k1; val d = if (right) d2 else d1 - val maps=undistortionMaps[if(right) 1 else 0] - if(maps[0].empty()) { - val identity=Mat.eye(3,3,CvType.CV_64F) - try { - if(fisheye) Calib3d.fisheye_initUndistortRectifyMap(k,d,identity,k,src.size(),CvType.CV_16SC2,maps[0],maps[1]) - else Calib3d.initUndistortRectifyMap(k,d,identity,k,src.size(),CvType.CV_16SC2,maps[0],maps[1]) - } finally { identity.release() } - } - Imgproc.remap(src,dst,maps[0],maps[1],Imgproc.INTER_LINEAR) - } fun triangulateRaw(left: List, right: List): List? { val points = triangulateLandmarksRaw(left,right) ?: return null return if(points.any { it == null }) null else points.filterNotNull() @@ -74,10 +61,6 @@ internal class StereoCalibration(val identity: String, val width: Int, val heigh return triangulatePoints(l.toList(),r.toList()) } finally { l.release(); r.release(); identity.release() } } - fun triangulate(left: List, right: List): List? { - val points = triangulatePoints(left,right) ?: return null - return if(points.any { it == null }) null else points.filterNotNull() - } private fun triangulatePoints(left: List, right: List): List? { if (left.size != right.size || left.isEmpty()) return null val a = Mat(2, left.size, CvType.CV_64F); val b = Mat(2, right.size, CvType.CV_64F); val out = Mat() @@ -105,7 +88,7 @@ internal class StereoCalibration(val identity: String, val width: Int, val heigh val tmp = File(file.parentFile,file.name+".tmp"); tmp.writeText(j.toString()) java.nio.file.Files.move(tmp.toPath(),file.toPath(),java.nio.file.StandardCopyOption.REPLACE_EXISTING) } - override fun close() { (listOf(k1,d1,k2,d2,r,t,p1,p2)+undistortionMaps.flatMap { it.toList() }).forEach { it.release() } } + override fun close() { listOf(k1,d1,k2,d2,r,t,p1,p2).forEach { it.release() } } companion object { fun load(file: File, identity: String, width: Int, height: Int): StereoCalibration? = runCatching { StereoCalibrationProfile.parse(file.readText(), identity, width, height)?.let(::fromProfile) }.getOrNull() @@ -286,7 +269,6 @@ internal class StereoCalibrator(private val context: Context) : AutoCloseable { Mat().also { output -> corrected.add(output); Calib3d.fisheye_undistortPoints(pixels,output,k,d,identity,k) } } try { - // OpenCV 4.13 fisheye stereo fitting assumes equal corner counts in every view. Calib3d.stereoCalibrate(objects,images(left,k1,d1),images(right,k2,d2),k1,if(fish)zero else d1,k2,if(fish)zero else d2, size,r,t,e,f,Calib3d.CALIB_FIX_INTRINSIC) } finally { (corrected+listOf(e,f,identity,zero)).forEach(Mat::release) } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/StereoHandEngine.kt b/app/src/main/java/com/droiddeck/launcher/glasses/StereoHandEngine.kt index becad63a04..78aad3f617 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/StereoHandEngine.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/StereoHandEngine.kt @@ -383,7 +383,6 @@ internal class StereoHandEngine(private val context: Context, private val token: message=context.getString(R.string.spatial_frame_changed) calibrationProgress = calibrationProgress.copy(collecting = false, capturing = false, captureMessage = message) } - // The callback pose's basis is undocumented; use canonical GL pose history. val observation=HandObservation(time,generation,trackingFrame) var captureHead=observation.headPose(SpatialTracking.session,metadata[6]>0) val w=metadata[0].toInt();val h=metadata[1].toInt() @@ -499,7 +498,6 @@ internal class StereoHandEngine(private val context: Context, private val token: dl=pair.first.hands;dr=pair.second.hands if(scheduled) inferenceSchedule.observe(stamp,dl.map { it.side },dr.map { it.side },pair.first.rawCount,pair.second.rawCount) val inferenceMs=(System.nanoTime()-inferenceStart)/1e6f - // VIO callbacks can arrive during inference; verify this exact camera stamp before publishing. captureHead=observation.headPose(SpatialTracking.session, metadata[6]>0 || VitureSdk.nativeCameraSynchronized(token,metadata[2])) val hands=Array(2) { SpatialHand() } @@ -631,7 +629,7 @@ internal class StereoHandEngine(private val context: Context, private val token: SpatialTracking.publish(System.nanoTime()) } } - } catch(e: InterruptedException) { /* Shutdown interrupts the idle wait. */ } + } catch(e: InterruptedException) { } catch(e: Throwable) { message=context.getString(R.string.spatial_hand_error, e.message.orEmpty()) val unavailable=HandObservationDiagnostic(HandObservationOutcome.INFERENCE_UNAVAILABLE) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/StereoInferenceRunner.kt b/app/src/main/java/com/droiddeck/launcher/glasses/StereoInferenceRunner.kt index 351fe332e5..a8c994504b 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/StereoInferenceRunner.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/StereoInferenceRunner.kt @@ -31,7 +31,6 @@ internal class StereoInferenceRunner : AutoCloseable { catch (e: ExecutionException) { throw e.cause ?: e } } } finally { - // Native inference must finish before either camera's pixels or detector can be reused. if (interrupted) Thread.currentThread().interrupt() } } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/UvcRgbDiagnostic.kt b/app/src/main/java/com/droiddeck/launcher/glasses/UvcRgbDiagnostic.kt index 6bd9c6b151..ce119c044b 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/UvcRgbDiagnostic.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/UvcRgbDiagnostic.kt @@ -12,8 +12,6 @@ internal object UvcRgbDiagnostic { internal data class UvcStreamHealth(val observationMs: Double, val observedFps: Double, val maximumGapMs: Double, val healthy: Boolean) { companion object { - // Health requires the full requested window, 80% of requested FPS, and no gap - // (including the final silent interval) above max(250 ms, three frame periods). fun assess(metadata: LongArray, requestedFps: Int, durationMs: Int): UvcStreamHealth { require(metadata.size == 14 && requestedFps > 0 && durationMs > 0) val first = metadata[7] diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/VitureProtocol.kt b/app/src/main/java/com/droiddeck/launcher/glasses/VitureProtocol.kt index 573f0f8dcf..55302dfc39 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/VitureProtocol.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/VitureProtocol.kt @@ -81,7 +81,6 @@ object VitureProtocol { } } - /** SDK validates the PID before returning this market name. Never guess a new PID. */ fun sdkModel(marketName: String): Model? { val family = when (marketName) { "One", "Lite" -> Family.ONE diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdk.kt b/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdk.kt index 1b5f09e3d9..bdad575c13 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdk.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdk.kt @@ -3,7 +3,6 @@ package com.droiddeck.launcher.glasses import android.util.Log import kotlin.math.sqrt -/** JNI adapter to VITURE's Android C SDK. The vendor binary is a local build input. */ internal object VitureSdk { val available: Boolean by lazy { runCatching { @@ -27,7 +26,6 @@ internal object VitureSdk { external fun nativeSpatialDiagnostics(token: Long): DoubleArray? external fun nativeTracking(token: Long, enabled: Boolean): Int external fun nativeCommand(token: Long, command: Int, value: Int): Int - /** Returns CLOCK_BOOTTIME receipt time, zero for no new pose, or a negative SDK error. */ external fun nativePose(token: Long, wxyz: FloatArray): Long external fun nativeNextState(token: Long, event: IntArray): Int external fun nativeClose(token: Long) @@ -48,12 +46,9 @@ internal object VitureSpatialIdentity { } internal object VitureSdkPose { - // Pro 2 hardware captures use OpenGL axes despite the generic Gen2 callback's - // NWU documentation. Keep that model-specific exception out of other Gen2 devices. fun usesOpenGlAxes(carina: Boolean, family: VitureProtocol.Family?) = carina || family == VitureProtocol.Family.PRO2 - /** SDK quaternions are wxyz; normalize their coordinate basis at the boundary. */ fun toGlasses(wxyz: FloatArray, openGlAxes: Boolean): FloatArray? { if (wxyz.size != 4 || wxyz.any { !it.isFinite() }) return null val length = sqrt(wxyz.sumOf { it.toDouble() * it }.toFloat()) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdkLink.kt b/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdkLink.kt index 36ceedf6e7..fe42adc71e 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdkLink.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/VitureSdkLink.kt @@ -7,7 +7,6 @@ import android.os.SystemClock import android.util.Log import java.io.File -/** SDK owns interface selection (including Ultra bulk endpoints) and all USB I/O. */ internal class VitureSdkLink private constructor( private val connection: UsbDeviceConnection, private val token: Long, @@ -47,7 +46,6 @@ internal class VitureSdkLink private constructor( if (rc == 0 || !wanted) tracking = wanted return result("tracking", rc) } - // Frequency is negotiated against SDK capabilities, including Pro 2's pose limit. VitureProtocol.MSG_IMU_RATE -> return tracking VitureProtocol.MSG_GET_IMU -> return true } @@ -89,7 +87,6 @@ internal class VitureSdkLink private constructor( if (VitureSdk.nativeNextState(token, event) == 1) when (event[0]) { 0 -> listener.onValue(VitureProtocol.MSG_GET_BRIGHTNESS, event[1]) 1 -> listener.onValue(VitureProtocol.MSG_GET_VOLUME, event[1]) - // A device event can use a different display-mode namespace. 2 -> send(VitureProtocol.MSG_GET_DISPLAY) 3 -> listener.onValue(VitureProtocol.MSG_FILM, event[1]) } @@ -122,7 +119,6 @@ internal class VitureSdkLink private constructor( if (!running) return running = false VitureSdk.nativeClose(token) - // Keep Java's descriptor alive until the SDK and its worker threads have stopped. connection.close() } if (Thread.currentThread() !== worker) worker.join(1000) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Link.kt b/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Link.kt index d46c246b7c..16bd1195a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Link.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Link.kt @@ -69,7 +69,6 @@ internal class VitureV2Link internal constructor( return true } if (msgId == VitureProtocol.MSG_GET_IMU) return true - // Keep the measured 120 Hz mode; the generic controller requests 240 Hz. if (msgId == VitureProtocol.MSG_IMU_RATE) return false val query = when (msgId) { VitureProtocol.MSG_GET_BRIGHTNESS -> VitureV2Protocol.MSG_GET_BRIGHTNESS @@ -146,9 +145,7 @@ internal class VitureV2Link internal constructor( tracking(true) if (becameReady) listener.onReady() val q = pose.quaternion - // Upstream right/up/back pose converted to the shared VITURE legacy basis. val shared = floatArrayOf(-q[2], -q[0], q[1], q[3]) - // Upstream does not establish device tick units; use host monotonic receipt time. if (running && wanted && streamOn) listener.onPose(received.bytes, shared, received.timeNs) return } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Protocol.kt b/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Protocol.kt index 548ad6b918..e2e4fdbfcd 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Protocol.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/VitureV2Protocol.kt @@ -1,5 +1,4 @@ -// Adapted from elasticjava/viture-v2, MIT, Copyright (c) 2026 Holger Bartnick. -// Source: ece8c30485f7d357fefa362ae74f3eabac9b3899; see docs/third-party/viture-v2/. +// Adapted from elasticjava/viture-v2, MIT, Copyright (c) 2026 Holger Bartnick. Source: ece8c30485f7d357fefa362ae74f3eabac9b3899; see docs/third-party/viture-v2/. package com.droiddeck.launcher.glasses import kotlin.math.sqrt @@ -37,7 +36,6 @@ object VitureV2Protocol { val success: Boolean get() = status == 0 } - // Device ticks have no established time unit; quaternion is xyzw with no axis remapping. class Pose internal constructor( val deviceTick: Long, val quaternion: FloatArray, @@ -64,7 +62,6 @@ object VitureV2Protocol { } fun imuControl(streams: Int, rate: Rate = Rate.HZ_120): ByteArray { - // Upstream measured that stream mask 3 ACKs but produces no events on Pro 2. require(streams == STREAM_OFF || streams == STREAM_POSE || streams == STREAM_RAW) require(streams != STREAM_POSE || rate.hz <= 240) val wireRate = if (streams == STREAM_OFF) 0 else rate.wireValue diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/XrealConnection.kt b/app/src/main/java/com/droiddeck/launcher/glasses/XrealConnection.kt index 3dbd22eb3b..e972cd4509 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/XrealConnection.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/XrealConnection.kt @@ -24,7 +24,6 @@ internal interface XrealConnector : Closeable { internal class XrealNetworkMissing : IOException("XREAL USB Ethernet network is not available") -/** Bind individual sockets, never the process: Steam must retain its Internet network. */ internal class AndroidXrealConnector(context: Context) : XrealConnector { private val manager = context.getSystemService(ConnectivityManager::class.java) private val address = InetAddress.getByName(XrealProtocol.HOST) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/XrealLink.kt b/app/src/main/java/com/droiddeck/launcher/glasses/XrealLink.kt index 86f93fbef5..18ce636eed 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/XrealLink.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/XrealLink.kt @@ -7,7 +7,6 @@ import java.util.concurrent.ArrayBlockingQueue import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference -/** One connection owns two TCP channels. All control requests are serialized off the UI thread. */ internal class XrealLink internal constructor( private val connector: XrealConnector, private val listener: Listener, @@ -47,7 +46,7 @@ internal class XrealLink internal constructor( VitureProtocol.MSG_DISPLAY -> value in 2..5 || value == XrealModel.NATIVE_60HZ VitureProtocol.MSG_BRIGHTNESS -> value in 0..9 VitureProtocol.MSG_FILM -> value in 0..1 - else -> false // No guessed volume, sensor-rate, or VITURE wire commands. + else -> false } return valid && commands.offer(Command(msgId, value)) } @@ -88,7 +87,7 @@ internal class XrealLink internal constructor( } } catch (e: Exception) { failure.set(e) - current.close() // Wake a control read immediately. + current.close() } }, "xreal-reports").apply { isDaemon = true; start() } ready = true @@ -145,12 +144,11 @@ internal class XrealLink internal constructor( tracking = false commands.clear() connection.getAndSet(null)?.close() - connector.close() // Includes sockets still inside connect(). + connector.close() worker.interrupt() } } -/** Kept independent of Android so the real framing/acknowledgement path is testable. */ internal class XrealControl(private val channels: XrealChannels, private val settleDelayMs: Long = 150) { private var transaction = 0 private fun exchange(command: Int, value: Int? = null): ByteArray { @@ -158,7 +156,7 @@ internal class XrealControl(private val channels: XrealChannels, private val set channels.controlOutput.write(XrealProtocol.request(command, transaction, value)) channels.controlOutput.flush() val deadline = System.nanoTime() + 3_000_000_000L - repeat(32) { // Bound unsolicited button/status packets and stale responses. + repeat(32) { if (System.nanoTime() > deadline) throw IOException("XREAL control timed out") XrealProtocol.response(XrealProtocol.read(channels.controlInput), command, transaction)?.let { return it } } @@ -172,9 +170,6 @@ internal class XrealControl(private val channels: XrealChannels, private val set fun changeDisplay(mode: Int): Int { val stereo = mode == 5 set(XrealProtocol.SET_INPUT, if (stereo) 1 else 0) - // On 1S, SET_INPUT itself changes EDID. Sending SET_DISPLAY immediately - // receives error 5001 while that change is pending. GET_DISPLAY returns - // an empty property during the transition; wait for a real mode report. val current = awaitDisplay { (it == 5) == stereo } if (current == mode) return current set(XrealProtocol.SET_DISPLAY, mode) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/XrealModel.kt b/app/src/main/java/com/droiddeck/launcher/glasses/XrealModel.kt index 19cd2097c2..2de2236c78 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/XrealModel.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/XrealModel.kt @@ -1,10 +1,9 @@ package com.droiddeck.launcher.glasses -/** First One-family target. Recovery and Air USB products must not use this transport. */ object XrealModel : GlassesModel { const val VENDOR_ID = 0x3318 const val PRODUCT_1S = 0x043e - const val NATIVE_60HZ = 29 // Captured on 1S: 1920 x 1200 at 60 Hz. + const val NATIVE_60HZ = 29 override val name = "XREAL 1S" override val controllable = true override val brightnessMax = 9 @@ -16,7 +15,6 @@ object XrealModel : GlassesModel { fun matches(vid: Int, pid: Int) = vid == VENDOR_ID && pid == PRODUCT_1S fun isDisplay(name: String) = name.contains("XREAL", ignoreCase = true) - // One-family EDID configuration values, not VITURE's display mode IDs. override fun mode(hz: Int, sbs: Boolean) = when { sbs -> 5 hz >= 120 -> 4 diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/XrealOrientationFilter.kt b/app/src/main/java/com/droiddeck/launcher/glasses/XrealOrientationFilter.kt index e8d34f44aa..c10bb94735 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/XrealOrientationFilter.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/XrealOrientationFilter.kt @@ -2,19 +2,14 @@ package com.droiddeck.launcher.glasses import kotlin.math.abs -/** 1S radians/sec and device nanoseconds, mapped using directed hardware captures. */ internal class XrealOrientationFilter { private val fusion = ImuFusion() - // 1S reports right/down/forward. Rotate 180 degrees about X into the - // shared right/up/back basis before either gravity alignment or fusion. - // Captures: level gravity -Y; looking left -gyroY; up +gyroX; right tilt +gyroZ. fun update(sample: XrealProtocol.Sample): FloatArray? = fusion.update(sample.timeNs, Vec3(sample.accel.x, -sample.accel.y, -sample.accel.z), Vec3(sample.gyro.x, -sample.gyro.y, -sample.gyro.z)) } -/** Gyro integration with gravity correction in the shared right/up/back basis, rad/s and device ns. */ internal class ImuFusion { private var previous = 0L private var rotation = Quaternion.IDENTITY @@ -27,7 +22,7 @@ internal class ImuFusion { previous = timeNs val norm = accel.length() val gravityValid = abs(norm - 9.81f) < 1.5f - if (dt > 0.25f) initialized = false // Never integrate a reconnect/stall as motion. + if (dt > 0.25f) initialized = false if (!initialized) { if (!gravityValid) return null val up = accel.normalized() @@ -47,7 +42,6 @@ internal class ImuFusion { } rotation = rotation.integrateBodyRate(rate, dt).normalized() } - // Same right/up/back -> shared glasses basis used by the RayNeo adapter. return RayNeoOrientationFilter.glassesPose(floatArrayOf(rotation.w, rotation.x, rotation.y, rotation.z)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/XrealProtocol.kt b/app/src/main/java/com/droiddeck/launcher/glasses/XrealProtocol.kt index d18ca1a94c..09bed01796 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/XrealProtocol.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/XrealProtocol.kt @@ -6,7 +6,6 @@ import java.io.InputStream import java.nio.ByteBuffer import java.nio.ByteOrder -/** Independent implementation of the One-family wire format; see xreal-investigation.md. */ internal object XrealProtocol { const val HOST = "169.254.2.1" const val REPORT_PORT = 52998 @@ -46,7 +45,7 @@ internal object XrealProtocol { fun sample(frame: Frame): Sample? { if (frame.command != REPORT || frame.body.size != 128) return null val b = ByteBuffer.wrap(frame.body).order(ByteOrder.LITTLE_ENDIAN) - if (b.getInt(24) != 11) return null // Magnetometer reports are a different type. + if (b.getInt(24) != 11) return null val time = b.getLong(8) val gyro = Vec3(b.getFloat(28), b.getFloat(32), b.getFloat(36)) val accel = Vec3(b.getFloat(40), b.getFloat(44), b.getFloat(48)) @@ -64,7 +63,6 @@ internal object XrealProtocol { .putInt(4 + payload.size).putInt(transaction or Int.MIN_VALUE).put(payload).array() } - /** No acknowledgement is inferred from a write; match both command and transaction. */ fun response(frame: Frame, command: Int, transaction: Int): ByteArray? { if (frame.command != command || frame.body.size < 4 || ByteBuffer.wrap(frame.body).int != transaction) return null diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/AppVulkan.kt b/app/src/main/java/com/droiddeck/launcher/gpu/AppVulkan.kt new file mode 100644 index 0000000000..59818f263d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/AppVulkan.kt @@ -0,0 +1,73 @@ +package com.droiddeck.launcher.gpu + +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.core.DeviceSupport +import com.droiddeck.launcher.core.FileUtils +import java.io.File + +data class AppVulkan( + val major: Int, + val minor: Int, + val shaderInt64: Boolean?, + val maxPushConstants: Int?, + val source: String, +) { + fun atLeast(major: Int, minor: Int): Boolean = this.major > major || (this.major == major && this.minor >= minor) + + val label: String + get() = "Vulkan $major.$minor, shaderInt64 ${shaderInt64?.let { if (it) "yes" else "no" } ?: "?"}, " + + "push constants ${maxPushConstants ?: "?"} ($source)" + + companion object { + private const val TAG = "AppVulkan" + const val BRIDGE_FILE = "apps-vulkan" + + fun detect(context: Context): AppVulkan? { + if (!DeviceSupport.vkBridge(context)) return null + val native = VulkanInfo.query() + val file = File(VkBridgeComponent.cacheDir(context), BRIDGE_FILE) + val fromBridge = FileUtils.readString(file)?.let { fromBridgeFile(it, native["device"], native["api"]) } + val found = fromBridge ?: fromDriver(native) + Log.i(TAG, found?.label ?: "unknown (driver query: ${native["error"] ?: "no api line"})") + return found + } + + internal fun fromBridgeFile(text: String, driverDevice: String?, driverApi: String? = null): AppVulkan? { + val map = keyValues(text) + val device = map["device"] + if (device != null && driverDevice != null && device != driverDevice) return null + val fileDriver = version(map["driver_api"]) + val native = version(driverApi) + if (fileDriver != null && native != null && fileDriver != native) return null + val promoted = map["promotion"]?.trim()?.lowercase() == "on" + val (major, minor) = (if (promoted) version(map["api"]) else fileDriver ?: version(map["api"])) ?: return null + return AppVulkan(major, minor, bool(map["shader_int64"]), map["max_push_constants"]?.toIntOrNull(), + if (promoted) "bridge, promoted" else "bridge") + } + + internal fun fromDriver(map: Map): AppVulkan? { + val (major, minor) = version(map["api"]) ?: return null + return AppVulkan(major, minor, bool(map["shader_int64"]), map["max_push_constants"]?.toIntOrNull(), "driver") + } + + private fun keyValues(text: String): Map = text.lineSequence().mapNotNull { line -> + val eq = line.indexOf('=') + if (eq <= 0) null else line.substring(0, eq).trim() to line.substring(eq + 1).trim() + }.toMap() + + private fun version(v: String?): Pair? { + val parts = v?.trim()?.split('.') ?: return null + if (parts.size < 2) return null + val major = parts[0].toIntOrNull() ?: return null + val minor = parts[1].toIntOrNull() ?: return null + return major to minor + } + + private fun bool(v: String?): Boolean? = when (v?.trim()?.lowercase()) { + "1", "yes", "true" -> true + "0", "no", "false" -> false + else -> null + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt b/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt index a63a802497..fc55247a97 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/AutoDriverTrial.kt @@ -48,10 +48,6 @@ object AutoDriverTrial { fun bad(context: Context): Set = prefs(context).getStringSet("bad", emptySet()).orEmpty() - /** - * Counted before the compositor loads the trial display driver, so a driver that kills the process during - * Vulkan init still counts towards a rollback; sessionStarting runs too late for that. - */ fun displayStarting(context: Context, display: String) { val p = prefs(context) if (p.getString("release", null) == null || p.getString("display", "") != display) return diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/AutoPicks.kt b/app/src/main/java/com/droiddeck/launcher/gpu/AutoPicks.kt index 76b6dddc96..6216ccf7d3 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/AutoPicks.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/AutoPicks.kt @@ -29,9 +29,10 @@ object AutoPicks { val BUILT_IN = listOf( Rule(setOf(Family.A8XX), models = setOf(840), prefer = listOf(NEWEST_DD_TURNIP, DriverPairs.WN_BALANCED)), Rule(setOf(Family.A8XX), prefer = listOf(DriverPairs.WN_BALANCED)), - Rule(setOf(Family.A7XX_LOW), prefer = listOf(DriverPairs.BANNER_710)), + Rule(setOf(Family.A7XX_LOW), prefer = listOf(NEWEST_DD_TURNIP, DriverPairs.BANNER_710)), Rule(setOf(Family.A7XX), oneUi8Gen2 = true, prefer = listOf(DriverPairs.BANNER_ONEUI)), - Rule(setOf(Family.A7XX, Family.A6XX), prefer = listOf(DriverPairs.BANNER)), + Rule(setOf(Family.A7XX), prefer = listOf(NEWEST_DD_TURNIP, DriverPairs.BANNER)), + Rule(setOf(Family.A6XX), prefer = listOf(DriverPairs.BANNER)), Rule(setOf(Family.ADRENO_UNKNOWN), minSdk = 36, prefer = listOf(DriverPairs.WN_BALANCED)), Rule(setOf(Family.ADRENO_UNKNOWN), prefer = listOf(DriverPairs.BANNER)), ) diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt b/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt new file mode 100644 index 0000000000..8385deaafa --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt @@ -0,0 +1,108 @@ +package com.droiddeck.launcher.gpu + +import android.content.Context +import android.os.Build +import android.os.PowerManager +import android.util.Log +import com.droiddeck.launcher.core.SessionPart +import java.io.File +import java.io.FileWriter +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +class ClockLogComponent(private val logFile: File) : SessionPart() { + @Volatile private var running = false + private var thread: Thread? = null + + override fun start() { + running = true + thread = Thread({ run() }, "clock-log").apply { isDaemon = true; start() } + } + + override fun stop() { + running = false + thread?.interrupt() + thread = null + } + + private fun run() { + val policies = File("/sys/devices/system/cpu/cpufreq").listFiles { f -> f.name.startsWith("policy") } + ?.sortedBy { it.name.removePrefix("policy").toIntOrNull() ?: 0 } ?: emptyList() + val gpuCandidates = gpuSources() + val gpu = gpuCandidates.firstOrNull { !it.startsWith("/proc/") && firstNumber(it) != null } + val power = app().getSystemService(Context.POWER_SERVICE) as? PowerManager + val time = SimpleDateFormat("HH:mm:ss", Locale.US) + try { + FileWriter(logFile, true).use { w -> + w.write("== clocks: ${Build.MANUFACTURER} ${Build.MODEL} (${Build.HARDWARE}), every ${PERIOD_MS / 1000}s\n") + w.write("cpu policies: ${policies.joinToString { p -> p.name + " " + (File(p, "related_cpus").readTextOrNull()?.trim() ?: "?") }}\n") + for (source in gpuCandidates) { + val f = File(source) + val state = when { + !f.exists() -> continue + firstNumber(source) != null -> "readable" + else -> "refused" + } + w.write("gpu source $source: $state\n") + } + w.write("gpu clock from: ${gpu ?: "nothing readable"}\n") + w.flush() + while (running && logFile.length() < MAX_BYTES) { + val line = StringBuilder(time.format(Date())) + for (p in policies) { + val cur = firstNumber(File(p, "scaling_cur_freq").path) + val max = firstNumber(File(p, "scaling_max_freq").path) + val hw = firstNumber(File(p, "cpuinfo_max_freq").path) + line.append(" ${p.name.removePrefix("policy").let { "p$it" }} ${mhz(cur)}/${mhz(max)}") + if (hw != null && max != null && max < hw) line.append("(of ${mhz(hw)})") + } + gpu?.let { line.append(" | gpu ${mhz(firstNumber(it))} MHz") } + if (power != null && Build.VERSION.SDK_INT >= 29) { + line.append(" | thermal ${power.currentThermalStatus}") + if (Build.VERSION.SDK_INT >= 30) { + val h = power.getThermalHeadroom(10) + if (!h.isNaN()) line.append(String.format(Locale.US, " headroom %.2f", h)) + } + } + w.write(line.append('\n').toString()) + w.flush() + try { Thread.sleep(PERIOD_MS) } catch (e: InterruptedException) { break } + } + } + } catch (e: Exception) { + Log.w(TAG, "clock log stopped: $e") + } + } + + companion object { + private const val TAG = "SessionService" + private const val PERIOD_MS = 2000L + private const val MAX_BYTES = 4L shl 20 + + private fun gpuSources(): List { + val list = mutableListOf( + "/sys/kernel/ged/hal/current_freqency", "/sys/kernel/ged/hal/current_frequency", + "/proc/gpufreqv2/gpufreq_status", "/proc/gpufreq/gpufreq_var_dump", + "/sys/kernel/gpu/gpu_clock", "/sys/class/misc/mali0/device/cur_freq", + "/sys/class/misc/mali0/device/clock", + ) + File("/sys/class/devfreq").list()?.sorted()?.forEach { node -> + if (node.contains("mali", true) || node.contains("gpu", true)) list.add("/sys/class/devfreq/$node/cur_freq") + } + return list.distinct() + } + + private fun File.readTextOrNull(): String? = runCatching { readText() }.getOrNull() + + private fun firstNumber(path: String): Long? = + runCatching { Regex("\\d+").find(File(path).readText())?.value?.toLong() }.getOrNull() + + private fun mhz(raw: Long?): String = when { + raw == null -> "?" + raw > 10_000_000 -> (raw / 1_000_000).toString() + raw > 10_000 -> (raw / 1_000).toString() + else -> raw.toString() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt b/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt index 9a5fb11821..2d9aab9020 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt @@ -16,7 +16,7 @@ object DeviceInfo { val vk = VulkanInfo.query() val gpu = GpuInfo.detect() return listOf( - chip(), gpu(gpu), cpu(), memory(context), system(), vulkan(context, vk), drivers(context, gpu), + chip(), gpu(context, gpu), cpu(), memory(context), system(), vulkan(context, vk), drivers(context, gpu), ).filter { it.rows.isNotEmpty() } } @@ -51,7 +51,7 @@ object DeviceInfo { add("Family", read("/sys/devices/soc0/family")) }) - private fun gpu(gpu: GpuInfo) = Section("GPU", buildList> { + private fun gpu(context: Context, gpu: GpuInfo) = Section("GPU", buildList> { add("GPU", gpu.name) add("Family", gpu.family.label) add("Model found from", when (gpu.modelSource) { @@ -66,7 +66,7 @@ object DeviceInfo { add("Clock range", gpuRange()) add("Load", read("$kgsl/gpu_busy_percentage")?.let { if (it.endsWith("%")) it else "$it %" }) add("Temperature", read("$kgsl/temp")?.toLongOrNull()?.let { if (it > 1000) "${it / 1000} °C" else "$it °C" }) - add("Support", gpu.supportText) + add("Support", gpu.supportText(SessionPrefs.vkBridge(context))) }) private fun cpu() = Section("CPU", buildList> { diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt index 3d493c6063..c31cd348e8 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt @@ -52,7 +52,6 @@ object FrameGen { fun apply(context: Context, refreshHz: Float): String? = apply(context, mode(context), refreshHz) - /** Arms [mode] in this process's compositor; the cloud player passes its own mode and frame-rate cap. */ fun apply(context: Context, mode: Mode, refreshHz: Float): String? { when (mode.engine) { ENGINE_LSFG -> { diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt b/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt index c137e666fb..9b0a1897e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt @@ -53,6 +53,18 @@ data class GpuInfo( Support.UNSUPPORTED -> "Not supported: DroidDeck needs an Adreno (Snapdragon) GPU" } + fun supportText(bridge: Boolean): String = when { + support != Support.UNSUPPORTED -> supportText + bridge -> "Runs through the Mali bridge, on the phone's own Vulkan driver" + else -> "Not supported with the Mali bridge off: Turnip needs an Adreno (Snapdragon) GPU" + } + + fun supportText(context: Context, bridge: Boolean): String = when { + support != Support.UNSUPPORTED -> supportText(context) + bridge -> context.getString(R.string.gpuinfo_bridge) + else -> context.getString(R.string.gpuinfo_bridge_off) + } + fun supportText(context: Context): String = context.getString(when (support) { Support.TESTED -> R.string.gpuinfo_supported Support.UNTESTED -> when { diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java index d74b5a3f13..42dce3d64e 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriver.java @@ -25,14 +25,6 @@ public final class LinuxVulkanDriver { return values; } - public static String optionLabel(Context context, String value) { - if (value == null || value.isEmpty()) return "Runtime default (built into the runtime)"; - LinuxVulkanDriverManager m = new LinuxVulkanDriverManager(context); - if (!m.isInstalled(value)) return value + " (imported, missing - uses the runtime default)"; - String ver = m.getDriverVersion(value); - return m.getDriverName(value) + (ver.isEmpty() ? "" : " " + ver) + " (imported)"; - } - public static String resolveIcdPath(Context context, String value) { if (value == null || value.isEmpty()) return null; LinuxVulkanDriverManager m = new LinuxVulkanDriverManager(context); diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLog.kt b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLog.kt index 4d94b6628a..8709c3a74d 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLog.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLog.kt @@ -6,7 +6,6 @@ import java.io.RandomAccessFile import java.nio.file.Files import java.nio.file.attribute.BasicFileAttributes -/** Only new compositor output is evidence of a fault in the current session. */ internal class SteamVrDeviceLossLog(private val file: File) { private var identity: Any? = identity() private var position = file.length() @@ -34,7 +33,6 @@ internal class SteamVrDeviceLossLog(private val file: File) { } identity = current prefix = head - // Fault loops can produce megabytes per second. Bound work and keep the newest output. if (input.length() - position > MAX_READ) { position = input.length() - MAX_READ partial = "" diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecovery.kt b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecovery.kt index 8c045b68e2..d8a546eb54 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecovery.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecovery.kt @@ -11,7 +11,6 @@ import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionEvents import java.io.File -/** Process-wide cursor survives Activity recreation; a new session ignores older log errors. */ internal object SteamVrHealth { private var session: String? = null private var log: SteamVrDeviceLossLog? = null @@ -49,7 +48,6 @@ internal class SteamVrRecovery(private val activity: Activity, private val foreg .create() prompt.setOnDismissListener { countdown?.let(handler::removeCallbacks); countdown = null; dialog = null } dialog = prompt - // A touch meant for the game must not silently dismiss the recovery controls. prompt.setCanceledOnTouchOutside(false) prompt.show() if (automatic) { @@ -66,7 +64,6 @@ internal class SteamVrRecovery(private val activity: Activity, private val foreg private fun restart() { if (!foreground()) return - // Commit before crossing processes so a repeated fault cannot create a restart loop. if (!activity.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() .putLong(LAST_ATTEMPT, System.currentTimeMillis()).commit()) return SessionEvents.record("steamvr.recovery_requested") diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettings.kt b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettings.kt index c05cc21296..63efb3c873 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRecoverySettings.kt @@ -5,13 +5,11 @@ import org.json.JSONObject import java.io.File internal object SteamVrRecoverySettings { - /** After a graphics crash SteamVR can quarantine our HMD, leaving a server with no VR output. */ fun unblockHeadset(file: File): Boolean { if (!file.isFile) return false val settings = JSONObject(file.readText()) val driver = settings.optJSONObject("driver_droiddeck") ?: return false if (!driver.optBoolean("blocked_by_safe_mode")) return false - // Preserve every other setting, including safe mode and blocks on other drivers. driver.put("blocked_by_safe_mode", false) val atomic = AtomicFile(file) val output = atomic.startWrite() diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRestartActivity.kt b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRestartActivity.kt index 671132c4f2..0cf01a9d64 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRestartActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/SteamVrRestartActivity.kt @@ -14,7 +14,6 @@ import com.droiddeck.launcher.SessionActivity import com.droiddeck.launcher.session.SessionService import org.json.JSONObject -/** A visible, private process survives destruction of the app's native graphics context. */ class SteamVrRestartActivity : Activity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -41,7 +40,6 @@ class SteamVrRestartActivity : Activity() { }, SystemClock::elapsedRealtime, SystemClock::sleep) if (shutdown != SteamVrRecoveryPolicy.Shutdown.COMPLETE) android.util.Log.w("SteamVrRecovery", "Restarting before the session finished stopping: $shutdown") - // Only the verified main process, never a caller-supplied PID or an external app. Process.killProcess(main.pid) val exited = SystemClock.elapsedRealtime() + 5000 while (java.io.File("/proc/${main.pid}").exists() && SystemClock.elapsedRealtime() < exited) SystemClock.sleep(50) diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt index 893d569a60..0ac66004b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TpUbwcHint.kt @@ -13,9 +13,6 @@ object TpUbwcHint { @Volatile var activeMode: String? = null private set - // On Adreno 740, TPL1_DBG_ECO_CNTL1.TP_UBWC_FLAG_HINT is shared by every driver on the GPU and must - // match the system driver. A mismatch corrupts Android UI. - // Samsung's One UI firmware sets it whatever blob version it reports. internal fun features(model: Int, systemDriverVersion: String?, samsung: Boolean = false, mode: String = SessionPrefs.TP_UBWC_AUTO): String? { if (model != 740) return null diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java index 9bae92e42a..ba96c3eca8 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java @@ -291,6 +291,10 @@ public final class TurnipDriver { } String quest = QuestExperimental.INSTANCE.defaultAndroidDriver(); if (quest != null) return quest; + if (com.droiddeck.launcher.core.DeviceSupport.INSTANCE.vkBridge(context)) { + Log.i(TAG, "Mali bridge: the compositor uses the system Vulkan driver"); + return null; + } GpuInfo gpu = gpuDetector.get(); if (gpu.getFamily() == GpuInfo.Family.NOT_ADRENO) { Log.i(TAG, "not an Adreno GPU; leaving the display driver to the system"); diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeComponent.kt b/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeComponent.kt new file mode 100644 index 0000000000..8e1c4419e7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeComponent.kt @@ -0,0 +1,102 @@ +package com.droiddeck.launcher.gpu + +import android.content.Context +import android.os.Process +import android.util.Log +import com.droiddeck.launcher.core.HostProcess +import com.droiddeck.launcher.core.SessionPart +import java.io.File + +class VkBridgeComponent(private val socket: File, private val logFile: File) : SessionPart() { + @Volatile private var pid = -1 + @Volatile private var exited = false + + override fun start() { + stop() + val binary = File(app().applicationInfo.nativeLibraryDir, BINARY) + if (!binary.isFile) { + Log.e(TAG, "server missing at $binary; the session will have no Vulkan") + return + } + socket.parentFile?.mkdirs() + val cacheDir = cacheDir(app()) + writeMode(cacheDir, com.droiddeck.launcher.session.SessionPrefs.vkBridgeMode(app())) + if (VkBridgeNative.start(app(), socket, logFile, cacheDir)) { + Log.i(TAG, "server ready in the app's process at $socket") + return + } + socket.delete() + exited = false + val cmd = listOf(binary.absolutePath, "--socket", socket.absolutePath, "--log", logFile.absolutePath, + "--cache-dir", cacheDir.absolutePath) + .joinToString(" ") { it.replace("\\", "\\\\").replace(" ", "\\ ") } + val env = arrayOf("HOME=" + app().filesDir) + pid = HostProcess.start(cmd, env, app().filesDir, { status -> + exited = true + Log.w(TAG, "server exited with status $status") + runCatching { logFile.appendText("== vkbridge server exited with status $status\n") } + }, { line -> Log.i(TAG, line) }) + val began = System.currentTimeMillis() + val deadline = began + 15_000L + while (!socket.exists() && !exited && System.currentTimeMillis() < deadline) { + try { Thread.sleep(50L) } catch (e: InterruptedException) { Thread.currentThread().interrupt(); break } + } + val waited = System.currentTimeMillis() - began + Log.i(TAG, if (socket.exists()) "server ready (pid $pid) at $socket after $waited ms" + else "server NOT ready (pid $pid, exited=$exited) after $waited ms; see $logFile") + if (!socket.exists() && VkBridgeNative.start(app(), socket, logFile, cacheDir)) Log.i(TAG, "server ready in the app's process at $socket") + } + + override fun stop() { + if (pid > 0) { + Process.killProcess(pid) + pid = -1 + } + if (!VkBridgeNative.serving) socket.delete() + } + + override fun suspendPid(): Int = pid + + companion object { + private const val TAG = "VkBridge" + private const val CACHE_DIR = "vkbridge-pipelines" + private const val MODE_FILE = "mode" + + fun cacheDir(context: Context): File { + val dir = File(context.filesDir, CACHE_DIR) + val old = File(context.cacheDir, CACHE_DIR) + if (old.isDirectory) migrate(old, dir) + dir.mkdirs() + return dir + } + + fun writeMode(dir: File, mode: String) { + val file = File(dir, MODE_FILE) + if (runCatching { file.readText().trim() }.getOrNull() == mode) return + val tmp = File(dir, "$MODE_FILE.tmp") + runCatching { + tmp.writeText(mode + "\n") + if (!tmp.renameTo(file)) error("rename failed") + Log.i(TAG, "bridge mode: $mode") + }.onFailure { Log.w(TAG, "could not write $file: $it"); tmp.delete() } + } + + private fun migrate(old: File, dir: File) { + val moved = if (!dir.exists()) old.renameTo(dir) else false + if (!moved) { + dir.mkdirs() + old.listFiles()?.forEach { f -> + val to = File(dir, f.name) + if (to.exists()) return@forEach + if (!f.renameTo(to)) runCatching { f.copyRecursively(to, overwrite = false) } + } + old.deleteRecursively() + } + Log.i(TAG, "bridge cache moved from $old to $dir") + } + + const val BINARY = "libvkbridge_server.so" + const val GUEST_ICD = "/usr/local/share/vkbridge/droidbridge_icd.json" + const val GUEST_LIB = "/usr/local/lib/vkbridge/libvulkan_droidbridge.so" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeNative.kt b/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeNative.kt new file mode 100644 index 0000000000..97efa7bed8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeNative.kt @@ -0,0 +1,49 @@ +package com.droiddeck.launcher.gpu + +import android.content.Context +import android.content.pm.ApplicationInfo +import android.util.Log +import java.io.File + +object VkBridgeNative { + private const val TAG = "VkBridge" + + @Volatile private var loaded: Boolean? = null + + private fun load(context: Context): Boolean { + loaded?.let { return it } + val ok = try { + val dev = File(context.filesDir, "vkbridge/dev/libvkbridge_jni.so") + val debuggable = context.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0 + if (debuggable && dev.isFile) { + Log.w(TAG, "in-app server from the development override $dev") + System.load(dev.absolutePath) + } else { + System.loadLibrary("vkbridge_jni") + } + true + } catch (e: Throwable) { + Log.w(TAG, "in-app server unavailable: $e") + false + } + loaded = ok + return ok + } + + @Volatile var serving = false + private set + + fun start(context: Context, socket: File, log: File, cacheDir: File): Boolean { + if (!load(context)) return false + val ok = try { + nativeStart(socket.absolutePath, log.absolutePath, cacheDir.absolutePath) == 1 + } catch (e: Throwable) { + Log.w(TAG, "in-app server failed to start: $e") + false + } + if (ok) serving = true + return ok + } + + @JvmStatic private external fun nativeStart(socket: String, log: String, cacheDir: String): Int +} diff --git a/app/src/main/java/com/droiddeck/launcher/handtracking/TrackingPack.kt b/app/src/main/java/com/droiddeck/launcher/handtracking/TrackingPack.kt index 85a1e38445..d58a5a881d 100644 --- a/app/src/main/java/com/droiddeck/launcher/handtracking/TrackingPack.kt +++ b/app/src/main/java/com/droiddeck/launcher/handtracking/TrackingPack.kt @@ -8,7 +8,6 @@ import java.io.FileInputStream import java.nio.ByteBuffer import java.nio.channels.FileChannel -/** Hand-tracking models and the OpenCV/MediaPipe native libraries, downloaded on first use. */ internal object TrackingPack { const val HAND = "hand_landmarker.task" const val HAND_LITE = "hand_landmarker_lite.task" @@ -32,10 +31,6 @@ internal object TrackingPack { fun model(context: Context, name: String): ByteBuffer = FileInputStream(file(context, name)).use { it.channel.map(FileChannel.MapMode.READ_ONLY, 0, it.channel.size()) } - /** - * Loads OpenCV and MediaPipe from the pack. MediaPipe's own System.loadLibrary then resolves to the - * already-loaded library by soname, so this must run before any MediaPipe task class initializes. - */ fun loadNative(context: Context): Boolean { if (nativeLoaded) return true synchronized(lock) { @@ -50,7 +45,6 @@ internal object TrackingPack { } } - /** Blocks the calling worker thread until the pack is usable, starting the download if needed. */ fun awaitNative(context: Context, running: () -> Boolean, onState: (AddonPack.State) -> Unit): Boolean = pack.await(context, running, onState) && loadNative(context) } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/BottomHudPresence.kt b/app/src/main/java/com/droiddeck/launcher/hud/BottomHudPresence.kt new file mode 100644 index 0000000000..7df9f10fd5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/BottomHudPresence.kt @@ -0,0 +1,15 @@ +package com.droiddeck.launcher.hud + +import android.os.SystemClock + +internal object BottomHudPresence { + private const val STALE_MS = 2_500L + + @Volatile private var seenAt = 0L + + fun beat() { + seenAt = SystemClock.elapsedRealtime() + } + + val showing: Boolean get() = seenAt != 0L && SystemClock.elapsedRealtime() - seenAt < STALE_MS +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudConfig.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt similarity index 73% rename from app/src/main/java/com/droiddeck/launcher/hud/FusionHudConfig.kt rename to app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt index ca95538a6d..86e9f8f398 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt @@ -3,14 +3,9 @@ package com.droiddeck.launcher.hud import android.content.Context import com.droiddeck.launcher.session.SessionPrefs -/** FusionHUD's settings as one "key=value,…" string (FusionHudView.applyConfig), stored in SessionPrefs. */ -internal object FusionHudConfig { - /** - * Bannerlator's Fusion defaults (DeckOverlaySettings), with the FPS graph from the old DroidDeck HUD. The HUD starts - * locked, so like the old HUD it lets touches through until it is unlocked to move it. - */ +internal object DroidDeckHudConfig { val DEFAULTS: Map = linkedMapOf( - "hudSize" to "minimal", "hudLocked" to "1", "hudScale" to "100", "hudOpacity" to "80", "hudColor" to "mid", + "hudSize" to "minimal", "hudLocked" to "1", "hudSnap" to "1", "hudScale" to "100", "hudDock" to "none", "hudOpacity" to "80", "hudColor" to "mid", "hudOutline" to "40", "hudOutlineAccent" to "1", "showFPS" to "1", "showFPSGraph" to "1", "showCPUUsage" to "1", "showCPULoad" to "1", "showGPULoad" to "1", "showVram" to "1", "showRAM" to "1", "showPower" to "1", "showTemp" to "1", "showBatteryTemp" to "1", @@ -20,12 +15,11 @@ internal object FusionHudConfig { "tempUnit" to "c", "tempBands" to "1", "tempAuto" to "1", "tempRedCpu" to "90", "tempRedGpu" to "90", "tempRedBat" to "48", ) - /** Switches Bannerlator sets together (DeckOverlaySettings twins). */ private val TWINS = mapOf("showCPUUsage" to "showCPULoad", "showTemp" to "showBatteryTemp", "showEngine" to "showRenderer") fun load(context: Context): MutableMap { val values = LinkedHashMap(DEFAULTS) - val stored = SessionPrefs.fusionHudConfig(context) + val stored = SessionPrefs.droidDeckHudConfig(context) if (stored == null) { values["showFPS"] = flag(SessionPrefs.hudShowFps(context)) values["showFPSGraph"] = flag(SessionPrefs.hudShowGraph(context)) @@ -43,12 +37,12 @@ internal object FusionHudConfig { if (key !in DEFAULTS) return values values[key] = value TWINS[key]?.let { values[it] = value } - SessionPrefs.setFusionHudConfig(context, encode(values)) + SessionPrefs.setDroidDeckHudConfig(context, encode(values)) return values } fun reset(context: Context): Map { - SessionPrefs.setFusionHudConfig(context, encode(DEFAULTS)) + SessionPrefs.setDroidDeckHudConfig(context, encode(DEFAULTS)) return DEFAULTS } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt new file mode 100644 index 0000000000..f612477f33 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -0,0 +1,517 @@ +package com.droiddeck.launcher.hud + +import android.content.Context +import android.os.Environment +import android.os.Handler +import android.os.Looper +import android.animation.ValueAnimator +import android.view.Choreographer +import android.view.View +import android.view.animation.PathInterpolator +import android.view.ViewGroup +import android.widget.FrameLayout +import com.droiddeck.launcher.gpu.FrameGen +import com.droiddeck.launcher.gpu.GpuInfo +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.ui.Motion +import com.droiddeck.launcher.wayland.WaylandCompositor +import java.io.File +import kotlin.math.roundToInt + +class DroidDeckHudHost(context: Context) { + private val context = context.applicationContext + private val handler = Handler(Looper.getMainLooper()) + private val feed = GameFrameFeed(File(LinuxRuntime.rootDir(this.context), HudFrames.PATH)) + private val readings = MangoReadings(File(this.context.filesDir, "session"), LinuxRuntime.rootDir(this.context)) + private var view: DroidDeckHudView? = null + private var parent: ViewGroup? = null + private var running = false + private var hidden = false + private var backgrounded = false + private var polling = false + private var wantX = Float.NaN + private var wantY = Float.NaN + private var anchorX = Float.NaN + private var snaps = true + private var snapping = false + private var previewFade: ValueAnimator? = null + private var flingX = 0f + private var engine = "" + private var gpuName = "" + private var protonPid = 0 + private var proton = "" + @Volatile private var lastWindow: String? = null + + var onPresentingWindowChanged: (() -> Unit)? = null + + val liveFps: Float? get() = if (polling) feed.stats.fps else null + + var onConfigChanged: (() -> Unit)? = null + + var passesTouchAt: ((rawX: Float, rawY: Float) -> Boolean)? = null + + private val listener = object : WaylandCompositor.GameListener { + override fun onGameSurface(window: String?, gpuName: String?) { + if (!gpuName.isNullOrBlank()) handler.post { this@DroidDeckHudHost.gpuName = cleanGpuName(gpuName) } + if (window != null && window != lastWindow) { + lastWindow = window + handler.post { + onPresentingWindowChanged?.invoke() + applyShown() + } + } + } + + override fun onGameFrame() { + feed.onCompositorFrame(System.nanoTime()) + } + } + + private val frameCallback = object : Choreographer.FrameCallback { + override fun doFrame(frameTimeNanos: Long) { + if (!running || !polling) return + if (feed.poll(System.nanoTime())) view?.onFrames() + Choreographer.getInstance().postFrameCallback(this) + } + } + + private val enabled: Boolean + get() = SessionPrefs.hudEnabled(context) && + !File(Environment.getExternalStorageDirectory(), "Download/droiddeck-no-hud").exists() + + fun attach(root: FrameLayout, index: Int) { + if (view != null) return + val hud = DroidDeckHudView(root.context) + hud.setFrameStats(feed.stats) + hud.setMangoReadings(readings) + hud.setGpuModel(cleanGpuName(GpuInfo.detect().displayName(context))) + hud.onRefresh = Runnable { refreshLabels(hud) } + hud.setOnDraggedListener { rawX, rawY -> + anchorX = Float.NaN; snapping = false + previewFade?.cancel(); previewFade = null + stopMotion(hud) + shrinkPastEdge(hud, rawX, rawY) + } + hud.setOnFlungListener { vx, _ -> flingX = vx } + hud.setOnTabDraggedListener { x, y -> dragTab(hud, x, y) } + hud.setOnTabDroppedListener { dropTab(hud) } + hud.setOnTabDragCancelledListener { snapping = false; keepOnScreen(hud) } + hud.setOnMovedListener { x, y -> + wantX = x; wantY = y + val vx = flingX + flingX = 0f + dockEdgeFor(hud)?.let { edge -> setDock(hud, edge); return@setOnMovedListener } + stopMotion(hud) + fadeDockPreview(hud) + if (snaps && !hud.isStrip) { snapToAnchor(hud, vx); return@setOnMovedListener } + val fromX = hud.x; val fromY = hud.y + keepOnScreen(hud) + wantX = hud.x; wantY = hud.y + SessionPrefs.setDroidDeckHudPosition(context, hud.x, hud.y) + glideFrom(hud, fromX, fromY) + } + hud.setOnSizeCycledListener { size -> DroidDeckHudConfig.set(context, "hudSize", size); onConfigChanged?.invoke() } + hud.setOnDockChangedListener { token -> setDock(hud, DroidDeckHudDock.from(token)) } + hud.setOnScaledListener { percent -> + DroidDeckHudConfig.set(context, "hudScale", percent.toString()) + onConfigChanged?.invoke() + } + hud.setOnLockChangedListener { locked -> + DroidDeckHudConfig.set(context, "hudLocked", if (locked) "1" else "0") + onConfigChanged?.invoke() + } + hud.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> if (!hud.isDragging) keepOnScreen(hud) } + hud.passesTouchAt = { x, y -> passesTouchAt?.invoke(x, y) == true } + hud.visibility = View.GONE + val margin = (16 * root.resources.displayMetrics.density).roundToInt() + root.addView(hud, index, FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { + leftMargin = margin + topMargin = margin + }) + SessionPrefs.droidDeckHudPosition(context)?.let { (x, y) -> wantX = x; wantY = y; hud.post { keepOnScreen(hud) } } + view = hud + parent = root + applyConfig() + } + + fun applyConfig() { + val config = DroidDeckHudConfig.load(context) + snaps = config["hudSnap"] != "0" + if (!snaps) anchorX = Float.NaN + view?.applyConfig(DroidDeckHudConfig.encode(config)) + } + + fun refresh() { + applyConfig() + if (!enabled) stop() else if (!running) start() + } + + fun start() { + if (running || !enabled || view == null) return + running = true + WaylandCompositor.setGameListener(listener) + applyShown() + } + + fun stop() { + running = false + showing = false + polling = false + Choreographer.getInstance().removeFrameCallback(frameCallback) + WaylandCompositor.clearGameListener(listener) + feed.close() + view?.visibility = View.GONE + } + + fun setHidden(hide: Boolean) { + hidden = hide + applyShown() + } + + fun setBackgrounded(stopped: Boolean) { + backgrounded = stopped + applyShown() + } + + private fun applyShown() { + if (!running) return + val show = !hidden && !backgrounded + val visible = show && SessionState.mode != SessionService.MODE_DESKTOP + view?.visibility = if (visible) View.VISIBLE else View.GONE + showing = visible + if (show != polling) { + polling = show + if (show) Choreographer.getInstance().postFrameCallback(frameCallback) + else Choreographer.getInstance().removeFrameCallback(frameCallback) + } + } + + fun exportDiagnostics(): File? = runCatching { + val dir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "DroidDeck") + dir.mkdirs() + val stamp = java.text.SimpleDateFormat("yyyyMMdd-HHmmss", java.util.Locale.US).format(java.util.Date()) + val file = File(dir, "HUD-diagnostics-$stamp.txt") + val metrics = HudMetrics(context) + metrics.setMangoReadings(MangoReadings(File(context.filesDir, "session"), LinuxRuntime.rootDir(context))) + metrics.snapshot() + Thread.sleep(500) + val mango = metrics.snapshot() + fun shown(value: Any?, unit: String) = if (value == null) "none" else "$value$unit" + val readers = com.droiddeck.launcher.session.GpuStatsComponent.readerStatus() + file.writeText(metrics.also { it.setMangoReadings(null) }.buildDiagnosticsReport(context) + "\n== As the HUD shows them (MangoHud's sources) ==\n" + + "CPU ${shown(mango.cpuPercent, "%")} ${shown(mango.cpuTempC, "°C")}, GPU ${shown(mango.gpuPercent, "%")} " + + "${shown(mango.gpuClockMhz, "MHz")} ${shown(mango.gpuTempC, "°C")}, " + + "RAM ${mango.ramUsedText()}/${mango.ramTotalText()}, VRAM ${mango.vramText()}, battery ${mango.battery.percent}% " + + "${mango.battery.watts}W charging=${mango.battery.charging}\n" + + "GPU feeds: ${com.droiddeck.launcher.session.GpuStatsComponent.sources.ifEmpty { "none (no session, or kgsl absent)" }}\n" + + (if (readers.isNotEmpty()) "GPU readers without root: $readers\n" else "") + + "CPU temperature zones: ${LinuxRuntime.cpuTempZones().joinToString { it.name }}\n" + + "Frames: ${if (feed.engine.isNotEmpty() || feed.pid > 0) "gamescope (pid ${feed.pid}, ${feed.engine})" else "compositor"}, " + + "fps ${feed.stats.fps}\n") + file + }.getOrNull() + + private fun sessionResolution(): String { + val (width, height) = SessionState.outputSize + return "${width}x${height}" + } + + private fun refreshLabels(hud: DroidDeckHudView) { + if (feed.engine.isNotBlank() && !feed.steamFocused) engine = feed.engine + hud.setEngineLabel(engine) + if (gpuName.isNotBlank()) hud.setGpuModel(gpuName) + val feedResolution = if (feed.outputWidth > 0 && feed.outputHeight > 0) buildString { + append(feed.outputWidth).append('x').append(feed.outputHeight) + if (feed.refreshMilliHz > 0) append(" @ ").append((feed.refreshMilliHz + 499) / 1000).append("Hz") + } else "" + hud.setResolution(feedResolution.ifBlank { sessionResolution() }) + val pid = feed.pid + if (pid > 0 && pid != protonPid) { + protonPid = pid + proton = protonName(pid) ?: proton + } + hud.setWineVersion(proton) + hud.setPresentedFps(presentedFps()) + } + + private fun presentedFps(): Float { + if (FrameGen.mode(context).engine == FrameGen.ENGINE_OFF) return 0f + val stats = runCatching { WaylandCompositor.nativeFrameGenStats() }.getOrNull() ?: return 0f + return if (stats.size > 3 && stats[3] > 1f) stats[3] else 0f + } + + private fun dockEdgeFor(v: View): DroidDeckHudDock? { + val over = overhang(v) ?: return null + return over.key.takeIf { over.value >= DOCK_OVERHANG } + } + + private fun overhang(v: View): Map.Entry? { + val p = v.parent as? View ?: return null + if (p.width <= 0 || p.height <= 0 || v.width <= 0 || v.height <= 0) return null + val strip = (v as? DroidDeckHudView)?.isStrip == true + val density = v.resources.displayMetrics.density + val w = if (strip) minOf(v.width.toFloat(), STRIP_PULL_ACROSS_DP * density) else v.width.toFloat() + val h = if (strip) maxOf(v.height.toFloat(), STRIP_PULL_OFF_DP * density) else v.height.toFloat() + return mapOf( + DroidDeckHudDock.LEFT to -v.x / w, + DroidDeckHudDock.RIGHT to (v.x + v.width - p.width) / w, + DroidDeckHudDock.TOP to -v.y / h, + DroidDeckHudDock.BOTTOM to (v.y + v.height - p.height) / h, + ).maxByOrNull { it.value } + } + + private fun dragTab(hud: DroidDeckHudView, x: Float, y: Float) { + val p = hud.parent as? View ?: return + stopMotion(hud) + snapping = false + hud.x = x.coerceIn(0f, (p.width - hud.width).toFloat().coerceAtLeast(0f)) + hud.y = y.coerceIn(0f, (p.height - hud.height).toFloat().coerceAtLeast(0f)) + } + + private fun dropTab(hud: DroidDeckHudView) { + val p = hud.parent as? View ?: return + val maxX = (p.width - hud.width).toFloat().coerceAtLeast(0f) + val maxY = (p.height - hud.height).toFloat().coerceAtLeast(0f) + val pulled = when (hud.dock) { + DroidDeckHudDock.LEFT -> hud.x / hud.width + DroidDeckHudDock.RIGHT -> (maxX - hud.x) / hud.width + DroidDeckHudDock.TOP -> hud.y / hud.height + DroidDeckHudDock.BOTTOM -> (maxY - hud.y) / hud.height + DroidDeckHudDock.NONE -> 0f + } + if (pulled >= 1f) { setDock(hud, DroidDeckHudDock.NONE); return } + wantX = hud.x; wantY = hud.y + val (x, y) = settled(p, hud.dock, hud.width.toFloat(), hud.height.toFloat()) + wantX = x; wantY = y + SessionPrefs.setDroidDeckHudPosition(context, x, y) + if (Motion.scale == 0f) { hud.x = x; hud.y = y; return } + snapping = true + hud.animate().x(x).y(y).setDuration(Motion.ms(220).toLong()).setInterpolator(EASE) + .withEndAction { snapping = false }.start() + } + + private fun stopMotion(hud: DroidDeckHudView) { + hud.animate().setUpdateListener(null) + hud.animate().cancel() + } + + private fun glideFrom(hud: DroidDeckHudView, fromX: Float, fromY: Float) { + if (Motion.scale == 0f || (fromX == hud.x && fromY == hud.y && hud.scaleX == 1f && hud.scaleY == 1f)) { + hud.scaleX = 1f; hud.scaleY = 1f + return + } + val toX = hud.x; val toY = hud.y + hud.x = fromX; hud.y = fromY + snapping = true + hud.animate().x(toX).y(toY).scaleX(1f).scaleY(1f).setDuration(Motion.ms(220).toLong()).setInterpolator(EASE) + .withEndAction { snapping = false; keepOnScreen(hud) }.start() + } + + private fun fadeDockPreview(hud: DroidDeckHudView) { + val from = hud.dockPreviewBlend + if (from <= 0f) return + val edge = overhang(hud)?.key ?: DroidDeckHudDock.NONE + if (Motion.scale == 0f) { hud.setDockPreview(DroidDeckHudDock.NONE, 0f); return } + previewFade?.cancel() + previewFade = ValueAnimator.ofFloat(from, 0f).apply { + duration = Motion.ms(200).toLong() + addUpdateListener { hud.setDockPreview(edge, it.animatedValue as Float) } + start() + } + } + + private fun snapToAnchor(hud: DroidDeckHudView, vx: Float) { + val p = hud.parent as? View ?: return + val maxX = (p.width - hud.width).toFloat().coerceAtLeast(0f) + val maxY = (p.height - hud.height).toFloat().coerceAtLeast(0f) + anchorX = if (hud.x + vx * FLING_REACH_S < maxX / 2f) 0f else 1f + wantX = anchorX * maxX + wantY = hud.y.coerceIn(0f, maxY) + SessionPrefs.setDroidDeckHudPosition(context, wantX, wantY) + stopMotion(hud) + if (Motion.scale == 0f) { + hud.scaleX = 1f; hud.scaleY = 1f + hud.x = wantX; hud.y = wantY + return + } + snapping = true + hud.animate().x(wantX).y(wantY).scaleX(1f).scaleY(1f).setDuration(Motion.ms(260).toLong()).setInterpolator(EASE) + .withEndAction { snapping = false; keepOnScreen(hud) }.start() + } + + private fun shrinkPastEdge(hud: DroidDeckHudView, rawX: Float, rawY: Float) { + if (hud.dock != DroidDeckHudDock.NONE) return + val p = hud.parent as? View ?: return + val edge = overhang(hud) ?: return + val over = edge.value + val t = (over / DOCK_OVERHANG).coerceIn(0f, 1f) + val fade = ((t - PREVIEW_FROM) / (1f - PREVIEW_FROM)).coerceIn(0f, 1f) + hud.setDockPreview(edge.key, fade * fade * (3f - 2f * fade)) + val (tabW, tabH) = hud.dockTabSize() + val e = t * t * (3f - 2f * t) + val at = IntArray(2).also { p.getLocationOnScreen(it) } + hud.pivotX = rawX - at[0] - hud.x + hud.pivotY = rawY - at[1] - hud.y + if (hud.isStrip) { + hud.scaleX = 1f + (tabW / hud.width - 1f) * e + hud.scaleY = 1f + return + } + val tabScale = maxOf(tabW / hud.width, tabH / hud.height).coerceAtMost(1f) + val s = 1f + (tabScale - 1f) * e + hud.scaleX = s; hud.scaleY = s + } + + private fun setDock(hud: DroidDeckHudView, edge: DroidDeckHudDock) { + if (edge == hud.dock) return + animateDock(hud, edge) { commitDock(hud, edge) } + } + + private fun commitDock(hud: DroidDeckHudView, edge: DroidDeckHudDock) { + val tabX = hud.x; val tabY = hud.y + if (edge != DroidDeckHudDock.NONE) { + val p = hud.parent as? View + if (p != null) { + wantX = wantX.coerceIn(0f, p.width.toFloat()) + wantY = wantY.coerceIn(0f, p.height.toFloat()) + } + SessionPrefs.setDroidDeckHudPosition(context, wantX, wantY) + } + DroidDeckHudConfig.set(context, "hudDock", edge.token) + applyConfig() + if (edge == DroidDeckHudDock.NONE) settleOutOfTab(hud, tabX, tabY) + hud.post { keepOnScreen(hud) } + onConfigChanged?.invoke() + } + + private fun settleOutOfTab(hud: DroidDeckHudView, tabX: Float, tabY: Float) { + val p = hud.parent as? View + val maxX = if (p == null) Float.MAX_VALUE else (p.width - hud.contentWidth).coerceAtLeast(0f) + val maxY = if (p == null) Float.MAX_VALUE else (p.height - hud.contentHeight).coerceAtLeast(0f) + wantX = tabX.coerceIn(0f, maxX); wantY = tabY.coerceIn(0f, maxY) + anchorX = if (snaps && !hud.isStrip && p != null) (if (wantX < maxX / 2f) 0f else 1f) else Float.NaN + if (!anchorX.isNaN()) wantX = anchorX * maxX + SessionPrefs.setDroidDeckHudPosition(context, wantX, wantY) + } + + private fun animateDock(hud: DroidDeckHudView, edge: DroidDeckHudDock, commit: () -> Unit) { + stopMotion(hud) + previewFade?.cancel(); previewFade = null + snapping = false + hud.alpha = 1f + val p = hud.parent as? View + if (Motion.scale == 0f || p == null || !hud.isLaidOut || hud.width <= 0) { + hud.scaleX = 1f; hud.scaleY = 1f + hud.setDockPreview(DroidDeckHudDock.NONE, 0f) + commit(); return + } + if (edge != DroidDeckHudDock.NONE) { + val left = hud.x + hud.pivotX * (1f - hud.scaleX); val top = hud.y + hud.pivotY * (1f - hud.scaleY) + val shownW = hud.width * hud.scaleX; val shownH = hud.height * hud.scaleY + hud.pivotX = 0f; hud.pivotY = 0f + hud.x = left; hud.y = top + val (tabW, tabH) = hud.dockTabSize() + wantX = left + (shownW - tabW) / 2f + wantY = top + (shownH - tabH) / 2f + val (tabX, tabY) = settled(p, edge, tabW, tabH) + val sx = tabW / hud.width; val sy = tabH / hud.height + val from = hud.dockPreviewBlend + hud.animate().x(tabX).y(tabY).scaleX(sx).scaleY(sy).setDuration(Motion.ms(220).toLong()).setInterpolator(EASE) + .setUpdateListener { hud.setDockPreview(edge, from + (1f - from) * it.animatedFraction) } + .withEndAction { + hud.animate().setUpdateListener(null) + commit() + hud.setDockPreview(DroidDeckHudDock.NONE, 0f) + hud.scaleX = 1f; hud.scaleY = 1f + hud.x = tabX; hud.y = tabY + }.start() + } else { + hud.scaleX = 1f; hud.scaleY = 1f + val was = hud.dock + val tabX = hud.x; val tabY = hud.y + val tabW = hud.width.toFloat(); val tabH = hud.height.toFloat() + commit() + val w = hud.contentWidth; val h = hud.contentHeight + val (x, y) = settled(p, DroidDeckHudDock.NONE, w, h) + hud.x = x; hud.y = y + val sx = tabW / w; val sy = tabH / h + hud.pivotX = pivotFor(x, tabX, sx) - x + hud.pivotY = pivotFor(y, tabY, sy) - y + hud.scaleX = sx; hud.scaleY = sy + hud.setDockPreview(was, 1f) + hud.animate().scaleX(1f).scaleY(1f).setDuration(Motion.ms(360).toLong()).setInterpolator(EASE) + .setUpdateListener { + val f = (1f - it.animatedFraction / EXPAND_FADE).coerceIn(0f, 1f) + hud.setDockPreview(was, f * f * (3f - 2f * f)) + } + .withEndAction { hud.animate().setUpdateListener(null); hud.setDockPreview(DroidDeckHudDock.NONE, 0f) } + .start() + } + } + + private fun pivotFor(from: Float, to: Float, scale: Float): Float = + if (scale > 0.999f) from else (to - from * scale) / (1f - scale) + + private fun settled(p: View, dock: DroidDeckHudDock, w: Float, h: Float): Pair { + val maxX = (p.width - w).coerceAtLeast(0f); val maxY = (p.height - h).coerceAtLeast(0f) + var x = wantX.coerceIn(0f, maxX); var y = wantY.coerceIn(0f, maxY) + when (dock) { + DroidDeckHudDock.LEFT -> x = 0f + DroidDeckHudDock.RIGHT -> x = maxX + DroidDeckHudDock.TOP -> y = 0f + DroidDeckHudDock.BOTTOM -> y = maxY + DroidDeckHudDock.NONE -> {} + } + return Pair(x, y) + } + + private fun keepOnScreen(v: View) { + if (snapping) return + val p = v.parent as? View ?: return + if (p.width <= 0 || p.height <= 0 || v.width <= 0 || v.height <= 0) return + if (wantX.isNaN()) { wantX = v.x; wantY = v.y } + val maxX = (p.width - v.width).toFloat().coerceAtLeast(0f) + val maxY = (p.height - v.height).toFloat().coerceAtLeast(0f) + val anchored = (v as? DroidDeckHudView)?.let { it.dock == DroidDeckHudDock.NONE && !it.isStrip } == true + if (snaps && anchored && anchorX.isNaN()) { + anchorX = if (wantX.coerceIn(0f, maxX) < maxX / 2f) 0f else 1f + } + if (snaps && anchored && !anchorX.isNaN()) wantX = anchorX * maxX + var x = wantX.coerceIn(0f, maxX) + var y = wantY.coerceIn(0f, maxY) + if ((v as? DroidDeckHudView)?.isStrip == true) y = if (y + v.height / 2f < p.height / 2f) 0f else maxY + when (v.let { it as? DroidDeckHudView }?.dock) { + DroidDeckHudDock.LEFT -> x = 0f + DroidDeckHudDock.RIGHT -> x = maxX + DroidDeckHudDock.TOP -> y = 0f + DroidDeckHudDock.BOTTOM -> y = maxY + else -> {} + } + if (v.x != x) v.x = x + if (v.y != y) v.y = y + } + + companion object { + private const val DOCK_OVERHANG = 0.4f + private const val FLING_REACH_S = 0.18f + private const val PREVIEW_FROM = 0.55f + private const val STRIP_PULL_ACROSS_DP = 600f + private const val STRIP_PULL_OFF_DP = 150f + private const val EXPAND_FADE = 0.5f + private val EASE = PathInterpolator(0.2f, 0.8f, 0.2f, 1f) + + @Volatile @JvmStatic var showing = false + private set + + internal fun cleanGpuName(name: String): String = name.replace("(TM)", "").replace(Regex("\\s+"), " ").trim() + + internal fun protonName(pid: Int): String? = runCatching { + val environ = File("/proc/$pid/environ").readBytes().toString(Charsets.UTF_8).split('\u0000') + val paths = environ.firstOrNull { it.startsWith("STEAM_COMPAT_TOOL_PATHS=") }?.substringAfter('=') ?: return null + paths.split(':').firstOrNull { it.isNotBlank() }?.trimEnd('/')?.substringAfterLast('/') + }.getOrNull()?.takeIf { it.isNotBlank() } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt new file mode 100644 index 0000000000..9f59512e55 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt @@ -0,0 +1,69 @@ +/* + * FusionHUD — a lightweight in-game performance HUD for Android / Winlator overlays. + * Copyright (C) The412Banner + * + * Licensed under the GNU General Public License v3.0 (see LICENSE), with an + * ADDITIONAL attribution requirement under GPL-3.0 §7(b) (see ATTRIBUTION.md): + * any use, fork, or distribution must preserve credit to "The412Banner" and a + * link to https://github.com/The412Banner/FusionHUD in the project documentation + * AND in the in-app credits/about screen. + * + * Ported to DroidDeck from FusionHUD (Bannerlator's HUD) and modified for DroidDeck. + */ + +package com.droiddeck.launcher.hud + +enum class DroidDeckHudSize(val token: String, val label: String) { + FULL("full", "Full"), + TILES("tiles", "Tiles"), + PILL("pill", "Pill"), + MINIMAL("minimal", "Minimal"), + MEGA("mega", "Mega"), + STRIP("strip", "Strip"); + + fun next(): DroidDeckHudSize { + val all = values() + return all[(ordinal + 1) % all.size] + } + + fun supportedChips(): Set = when (this) { + MINIMAL -> MINIMAL_CHIPS + PILL -> PILL_CHIPS + FULL, TILES, STRIP -> STANDARD_CHIPS + MEGA -> MEGA_CHIPS + } + + companion object { + fun from(token: String?): DroidDeckHudSize = + values().firstOrNull { it.token.equals(token, ignoreCase = true) } ?: FULL + + val MINIMAL_CHIPS = setOf("FPS", "FPS graph", "0.01% low", "FPS .1", "Engine", "Clock") + val PILL_CHIPS = setOf("FPS", "FPS graph", "GPU", "CPU", "VRAM", "RAM", "Battery", "GPU model", "FPS .1", "Engine", "Clock") + val STANDARD_CHIPS = setOf( + "FPS", "FPS graph", "GPU", "GPU temp", "CPU", "VRAM", "RAM", "Power", "Temp", + "Battery", "GPU model", "Engine", "0.01% low", "FPS .1", "Clock", + ) + val MEGA_ONLY = setOf( + "Per-core", "Swap", "Network", "Resolution", "Proton", "Wrapper", "DX ver", "Session", + ) + val MEGA_CHIPS = STANDARD_CHIPS + MEGA_ONLY + } +} + +enum class DroidDeckHudDock(val token: String) { + NONE("none"), LEFT("left"), RIGHT("right"), TOP("top"), BOTTOM("bottom"); + + companion object { + fun from(token: String?): DroidDeckHudDock = values().firstOrNull { it.token == token } ?: NONE + } +} + +object DroidDeckHudHdr { + const val NONE = 0 + const val ON = 1 + const val NO_HEADROOM = 2 + const val OFF = 3 + const val READY = 4 + const val TONEMAPPED = 5 + const val NOT_ON_THIS_SCREEN = 6 +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt similarity index 73% rename from app/src/main/java/com/droiddeck/launcher/hud/FusionHudView.kt rename to app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index 2fadde009b..e78249a1c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -8,7 +8,7 @@ * link to https://github.com/The412Banner/FusionHUD in the project documentation * AND in the in-app credits/about screen. * - * Ported to DroidDeck from FusionHUD (Bannerlator's HUD); DroidDeck changes are marked in the code. + * Ported to DroidDeck from FusionHUD (Bannerlator's HUD) and modified for DroidDeck. */ package com.droiddeck.launcher.hud @@ -22,16 +22,22 @@ import android.graphics.Paint import android.graphics.Path import android.graphics.RectF import android.graphics.Typeface +import android.os.SystemClock import android.text.format.DateFormat import android.view.MotionEvent import android.view.View +import android.view.ViewConfiguration import androidx.annotation.VisibleForTesting import androidx.compose.ui.graphics.toArgb +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.ui.Motion +import com.droiddeck.launcher.ui.Palette import com.droiddeck.launcher.ui.Themes import java.util.Date import java.util.Locale import java.util.function.BiConsumer import java.util.function.Consumer +import java.util.function.IntConsumer import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt @@ -41,44 +47,29 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.channels.Channel +import kotlinx.coroutines.delay import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.coroutines.withTimeoutOrNull -/** - * Fusion HUD — the 4th selectable in-game overlay. One color-coded visual language rendered at four - * SIZE modes (Full / Tiles / Pill / Minimal / Mega), all driven by [FrameStats] (gamescope's frame times - * read by MangoHud's rules) + a single cached [HudMetrics.Snapshot]. Pure Canvas drawing. - * - * DroidDeck: the readouts refresh every 500 ms (MangoHud's sampling period) on a Main-dispatcher - * coroutine, collecting the snapshot on Dispatchers.IO; the frame graph is redrawn whenever new frames - * arrive ([onFrames]), as MangoHud draws it. - * - * Gestures go through [HudLockController]: long-press toggles the position lock (with a lock/unlock - * badge fade), a tap cycles the size (Full→Tiles→Pill→Minimal→Full), and a drag repositions — tap + - * drag are frozen while locked. A locked HUD lets a touch through where an on-screen control under it - * takes it ([passesTouchAt]); everywhere else it keeps the touch, so a long press there unlocks it. - */ -class FusionHudView(context: Context) : View(context) { +class DroidDeckHudView(context: Context) : View(context) { private var frames: FrameStats? = null internal fun setFrameStats(stats: FrameStats?) { frames = stats } internal fun setMangoReadings(readings: MangoReadings?) { metrics.setMangoReadings(readings) } - // Frames per second actually reaching the panel while DroidDeck's frame generation adds frames the - // game never made; 0 = nothing is adding frames, and the readout is the game's rate alone. private var presentedFps = 0f fun setPresentedFps(fps: Float) { presentedFps = fps } private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) private var updateJob: Job? = null + private var hueJob: Job? = null private val metrics = HudMetrics(context) private val density = resources.displayMetrics.density - // ---- Config ----------------------------------------------------------- - private var size = FusionSize.FULL + private var size = DroidDeckHudSize.FULL private var scale = 1f private var bgOpacity = 0.8f private var outlineIntensity = 0.4f @@ -101,8 +92,7 @@ class FusionHudView(context: Context) : View(context) { private var showGraph = false private var showLow001 = true private var fpsDecimal = true - private var showClockTime = true // subtle corner/footer clock, available in EVERY size - // Mega-only rows + private var showClockTime = true private var showPerCore = true private var showSwap = true private var showNet = true @@ -113,21 +103,15 @@ class FusionHudView(context: Context) : View(context) { private var showSession = true private var engineLabel = "" - private var displayServer = "" // "X11" / "Wayland": which display server the game runs on - private var hdrState = FusionHdr.NONE // Wayland HDR, on its own line under latency · display server + private var displayServer = "" + private var hdrState = DroidDeckHudHdr.NONE private var gpuModel = "" - // The GPU name a Wayland session reports to games instead of the real adapter ("" = none). It has - // to travel separately from gpuModel: Wayland hands the spoof to DXVK and leaves the Vulkan device - // alone, so everything the host reads back is still the real chip. On X11 the driver wrapper renames - // the device itself, so there gpuModel already IS the spoofed name and this stays empty. private var gpuSpoofName = "" - // Stack-layer version strings (Mega bottom band + DX version on the engine row); fed by the host. - private var wineVersion = "" // "Proton 10.0-4" - private var graphicsWrapper = "" // graphics-driver wrapper package, e.g. "GameNative", "bcn_layer 20260719" - private var dxvkVersion = "" // DXVK version, appended to a DXVK engine row - private var vkd3dVersion = "" // VKD3D version, appended to a VKD3D engine row + private var wineVersion = "" + private var graphicsWrapper = "" + private var dxvkVersion = "" + private var vkd3dVersion = "" - // ---- Live data (updated on the refresh coroutine, read on draw) -------- private var snap: HudMetrics.Snapshot? = null private var fpsNow = 0f private var fpsAvg = 0f @@ -138,17 +122,18 @@ class FusionHudView(context: Context) : View(context) { private val graphPath = Path() private var resolution = "" - // DroidDeck look: the theme's main colour for the FPS label, graph and accent outline, the theme's - // surface behind the readouts, a DroidDeck header (wordmark) on Full/Tiles/Minimal/Mega and the logo - // chip on the Pill. private var accent = 0xFF1A9FFF.toInt() private var surfaceRgb = 0x121417 private var headerMark: RectF? = null + private var headerWordmark: RectF? = null private var chipRect: RectF? = null - // Every size sits in the DroidDeck mark's D: a straight left side split by the orb, round on the - // right. Its fixed layers (fill, header band, watermark, glowing outline) go into a bitmap, because - // Android before 9 skips glow on shapes drawn with hardware acceleration. + var dock = DroidDeckHudDock.NONE + private set + private var tabRect: RectF? = null + private var stripRect: RectF? = null + private val tabPath = Path() + private var dPanel: RectF? = null private var dRadius = 0f private var dDividerTop = -1f @@ -156,7 +141,6 @@ class FusionHudView(context: Context) : View(context) { private var dFrameKey = "" private val glowPaint = Paint(Paint.ANTI_ALIAS_FLAG) - // ---- Colors (mockup) -------------------------------------------------- private val colGpu = 0xFF5EE08A.toInt() private val colCpu = 0xFF58A6FF.toInt() private val colVram = 0xFFC98BFF.toInt() @@ -167,10 +151,9 @@ class FusionHudView(context: Context) : View(context) { private val colValue = 0xFFF2F5F9.toInt() private val colDim = 0xFF9AA4B2.toInt() private val colLo = 0xFFE4E8EE.toInt() - private val colDisp = 0xFF4DD0E1.toInt() // display server (X11 / Wayland) - private val colHdr = 0xFFFFD54F.toInt() // HDR on screen + private val colDisp = 0xFF4DD0E1.toInt() + private val colHdr = 0xFFFFD54F.toInt() - // ---- Paints ----------------------------------------------------------- private val measurePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { typeface = Typeface.create(Typeface.MONOSPACE, Typeface.BOLD) } @@ -185,20 +168,11 @@ class FusionHudView(context: Context) : View(context) { color = colGraph } private val headerPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } - private val wordmarkPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD) - } - // ---- Built geometry --------------------------------------------------- - private class Glyph(val x: Float, val baseline: Float, val text: String, val color: Int, val sizePx: Float, val sans: Boolean = false, val glow: Boolean = false) { - fun moved(dx: Float, dy: Float) = Glyph(x + dx, baseline + dy, text, color, sizePx, sans, glow) + private class Glyph(val x: Float, val baseline: Float, val text: String, val color: Int, val sizePx: Float, val glow: Boolean = false) { + fun moved(dx: Float, dy: Float) = Glyph(x + dx, baseline + dy, text, color, sizePx, glow) } private class Span(val text: String, val color: Int, val sizePx: Float, val glow: Boolean = false) - /** - * A "label + value-run" row for the aligned grid sizes (Full / Mega). When [inline] is true the row - * opts OUT of the shared label column — its value run is placed directly after the label — so a long - * label (the graphics-wrapper on the FPS row) can't widen the column and shove every value right. - */ private class HudRow(val label: Span, val vals: List, val inline: Boolean = false) private val glyphs = ArrayList() private val tileRects = ArrayList() @@ -206,46 +180,92 @@ class FusionHudView(context: Context) : View(context) { private var contentW = 0f private var contentH = 0f - // ---- Listeners -------------------------------------------------------- private var onMovedListener: BiConsumer? = null private var onSizeCycledListener: Consumer? = null private var onLockChangedListener: Consumer? = null fun setOnMovedListener(l: BiConsumer?) { onMovedListener = l } fun setOnSizeCycledListener(l: Consumer?) { onSizeCycledListener = l } fun setOnLockChangedListener(l: Consumer?) { onLockChangedListener = l } + private var onDockChangedListener: Consumer? = null + private var onScaledListener: IntConsumer? = null + private var onDraggedListener: BiConsumer? = null + fun setOnDraggedListener(l: BiConsumer?) { onDraggedListener = l } + private var onFlungListener: BiConsumer? = null + fun setOnFlungListener(l: BiConsumer?) { onFlungListener = l } + fun setOnDockChangedListener(l: Consumer?) { onDockChangedListener = l } + fun setOnScaledListener(l: IntConsumer?) { onScaledListener = l } private val lockController = HudLockController(context, this, object : HudLockController.Callbacks { override fun onTap() { cycleSize() } override fun onMoved(x: Float, y: Float) { onMovedListener?.accept(x, y) } + override fun onDragged(rawX: Float, rawY: Float) { onDraggedListener?.accept(rawX, rawY) } + override fun onFlung(velocityX: Float, velocityY: Float) { onFlungListener?.accept(velocityX, velocityY) } override fun onLockChanged(locked: Boolean) { onLockChangedListener?.accept(locked) } + override fun onPinch(factor: Float) { + val next = (scale * factor).coerceIn(MIN_SCALE, MAX_SCALE) + if (next == scale) return + scale = next + rebuildAndInvalidate() + } + override fun onPinchEnd() { onScaledListener?.accept((scale * 100f).roundToInt()) } }) - // ---- Public surface (symmetric with the other overlays) --------------- - fun setEngineLabel(s: String?) { if ((s ?: "") != engineLabel) { engineLabel = s ?: ""; post { rebuildAndInvalidate() } } } - fun setGpuModel(s: String?) { if ((s ?: "") != gpuModel) { gpuModel = s ?: ""; post { rebuildAndInvalidate() } } } - /** This session's Wayland GPU-name spoof (null / empty = none, the default): the GPU row names it - * in place of the real model, marked so it can't be read as the chip that is really rendering. */ - fun setGpuSpoofName(s: String?) { gpuSpoofName = s ?: ""; post { rebuildAndInvalidate() } } - fun setDisplayServer(s: String?) { displayServer = s ?: ""; post { rebuildAndInvalidate() } } - /** [FusionHdr] code; [FusionHdr.NONE] (the default) draws no HDR line anywhere. Any thread. */ - fun setHdrState(state: Int) { - val v = if (state in FusionHdr.ON..FusionHdr.NOT_ON_THIS_SCREEN) state else FusionHdr.NONE - post { if (v != hdrState) { hdrState = v; rebuildAndInvalidate() } } - } - fun setWineVersion(s: String?) { if ((s ?: "") != wineVersion) { wineVersion = s ?: ""; post { rebuildAndInvalidate() } } } - fun setGraphicsWrapper(s: String?) { graphicsWrapper = s ?: ""; post { rebuildAndInvalidate() } } - fun setDxWrapper(dxvk: String?, vkd3d: String?) { - dxvkVersion = dxvk ?: ""; vkd3dVersion = vkd3d ?: ""; post { rebuildAndInvalidate() } + private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop + private var tabDownRawX = 0f + private var tabDownRawY = 0f + private var tabStartX = 0f + private var tabStartY = 0f + private var tabDragging = false + private var onTabDraggedListener: BiConsumer? = null + private var onTabDroppedListener: Runnable? = null + private var onTabDragCancelledListener: Runnable? = null + fun setOnTabDraggedListener(l: BiConsumer?) { onTabDraggedListener = l } + fun setOnTabDroppedListener(l: Runnable?) { onTabDroppedListener = l } + fun setOnTabDragCancelledListener(l: Runnable?) { onTabDragCancelledListener = l } + + private fun onTabTouch(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + tabDownRawX = event.rawX; tabDownRawY = event.rawY + tabStartX = x; tabStartY = y + tabDragging = false + } + MotionEvent.ACTION_MOVE -> { + val dx = event.rawX - tabDownRawX; val dy = event.rawY - tabDownRawY + if (!tabDragging && dx * dx + dy * dy > touchSlop * touchSlop) tabDragging = true + if (tabDragging) onTabDraggedListener?.accept(tabStartX + dx, tabStartY + dy) + } + MotionEvent.ACTION_UP -> { + if (tabDragging) { tabDragging = false; onTabDroppedListener?.run() } + else onDockChangedListener?.accept(DroidDeckHudDock.NONE.token) + } + MotionEvent.ACTION_CANCEL -> if (tabDragging) { + tabDragging = false + onTabDragCancelledListener?.run() + } + } + return true } - /** The game's output from gamescope ("1280x720 @ 144Hz"), as MangoHud shows it; "" = this display. */ + private var previewEdge = DroidDeckHudDock.NONE + private var previewBlend = 0f + internal fun setDockPreview(edge: DroidDeckHudDock, blend: Float) { + val b = blend.coerceIn(0f, 1f) + if (edge == previewEdge && b == previewBlend) return + previewEdge = edge; previewBlend = b + invalidate() + } + internal val dockPreviewBlend: Float get() = previewBlend + + fun setEngineLabel(s: String?) { if ((s ?: "") != engineLabel) { engineLabel = s ?: ""; post { rebuildAndInvalidate() } } } + fun setGpuModel(s: String?) { if ((s ?: "") != gpuModel) { gpuModel = s ?: ""; post { rebuildAndInvalidate() } } } + fun setWineVersion(s: String?) { if ((s ?: "") != wineVersion) { wineVersion = s ?: ""; post { rebuildAndInvalidate() } } } + fun setResolution(s: String?) { resolution = s ?: "" } private val periodDone = Channel(Channel.CONFLATED) private var seenFpsUpdates = 0L - /** New frames arrived: redraw the graph (MangoHud redraws it every frame), and the readouts when a - * sampling period completed, at the moment MangoHud redraws its own. */ fun onFrames() { val updates = frames?.fpsUpdates ?: 0L if (updates != seenFpsUpdates) { @@ -255,10 +275,6 @@ class FusionHudView(context: Context) : View(context) { if (graphRect != null) invalidate() } - /** Fusion has no orientation (tap cycles size instead); kept for a symmetric host surface. */ - fun setVertical(vertical: Boolean) { /* no-op */ } - fun isVertical(): Boolean = false - private fun cycleSize() { size = size.next() onSizeCycledListener?.accept(size.token) @@ -269,7 +285,7 @@ class FusionHudView(context: Context) : View(context) { if (configString.isNullOrEmpty()) return val cfg = KeyValueSet(configString) - size = FusionSize.from(cfg.get("hudSize", "minimal")) + size = DroidDeckHudSize.from(cfg.get("hudSize", "minimal")) showFPS = cfg.get("showFPS", "1") == "1" showEngine = cfg.get("showEngine", "1") == "1" showGpuModel = cfg.get("showGpuModel", "1") == "1" @@ -285,7 +301,7 @@ class FusionHudView(context: Context) : View(context) { showGraph = cfg.get("showFPSGraph", "0") == "1" showLow001 = cfg.get("showLow001", "1") == "1" fpsDecimal = cfg.get("fpsDecimal", "1") == "1" - showClockTime = cfg.get("showClock", "1") == "1" // Fusion clock defaults ON + showClockTime = cfg.get("showClock", "1") == "1" showPerCore = cfg.get("showPerCore", "1") == "1" showSwap = cfg.get("showSwap", "1") == "1" showNet = cfg.get("showNet", "1") == "1" @@ -296,6 +312,7 @@ class FusionHudView(context: Context) : View(context) { showSession = cfg.get("showSession", "1") == "1" tempDisplay = HudMetrics.TempDisplay.from(cfg) lockController.setLocked(cfg.get("hudLocked", "1") == "1") + dock = DroidDeckHudDock.from(cfg.get("hudDock", "none")) colorIntensity = when (cfg.get("hudColor", "vivid")) { "soft" -> 0.72f; "mid" -> 0.88f; else -> 1.0f @@ -309,7 +326,6 @@ class FusionHudView(context: Context) : View(context) { rebuildAndInvalidate() } - // ---- Lifecycle: self-refresh ------------------------------------------ override fun onAttachedToWindow() { super.onAttachedToWindow() if (isShown) startUpdates() @@ -320,8 +336,6 @@ class FusionHudView(context: Context) : View(context) { super.onDetachedFromWindow() } - // The host hides the HUD with GONE (HUD off, picture-in-picture) and keeps it attached: read the - // sensors only while it shows. override fun onVisibilityChanged(changedView: View, visibility: Int) { super.onVisibilityChanged(changedView, visibility) if (isAttachedToWindow && isShown) startUpdates() else stopUpdates() @@ -329,9 +343,11 @@ class FusionHudView(context: Context) : View(context) { private fun stopUpdates() { updateJob?.cancel(); updateJob = null + hueJob?.cancel(); hueJob = null } private fun startUpdates() { + startHueCycle() if (updateJob?.isActive == true) return updateJob = scope.launch { while (isActive) { @@ -348,23 +364,54 @@ class FusionHudView(context: Context) : View(context) { graphMaxMs = stats?.graphMaxMs() ?: 0f onRefresh?.run() rebuildAndInvalidate() - // Without frames (a still screen) MangoHud redraws nothing; the HUD keeps refreshing. withTimeoutOrNull(REFRESH_MS) { periodDone.receive() } } } } - /** Runs on the main thread just before each readout refresh, for the host's labels. */ var onRefresh: Runnable? = null private fun applyTheme() { - val palette = Themes.current(context) + applyPalette(Themes.current(context)) + if (isAttachedToWindow && isShown) startHueCycle() + } + + private fun applyPalette(palette: Palette) { accent = palette.primary.toArgb() surfaceRgb = palette.surface.toArgb() and 0xFFFFFF colFps = accent colGraph = lighten(accent, 0.3f) } + private fun startHueCycle() { + if (hueJob?.isActive == true) return + if (SessionPrefs.theme(context) != Themes.INNER_GAMER) return + hueJob = scope.launch { + var hue = Themes.rgbHue + var shown = Float.NaN + var last = SystemClock.uptimeMillis() + while (isActive && SessionPrefs.theme(context) == Themes.INNER_GAMER) { + val now = SystemClock.uptimeMillis() + val cycle = Themes.rgbCycleMillis(Themes.rgbSpeed).toFloat() + if (Motion.scale == 0f) { + last = now + delay(HUE_IDLE_MS) + continue + } + hue = (hue + (now - last) / cycle * 360f) % 360f + last = now + val stepped = (hue / Themes.RGB_HUE_STEP).toInt() * Themes.RGB_HUE_STEP + if (stepped != shown) { + shown = stepped + Themes.moveRgbHue(stepped) + applyPalette(Themes.innerGamer(stepped)) + rebuildAndInvalidate() + } + delay((cycle * Themes.RGB_HUE_STEP / 360f).toLong().coerceAtLeast(16L)) + } + } + } + private fun lighten(color: Int, amount: Float): Int = Color.rgb( (Color.red(color) + (255 - Color.red(color)) * amount).roundToInt(), (Color.green(color) + (255 - Color.green(color)) * amount).roundToInt(), @@ -377,7 +424,6 @@ class FusionHudView(context: Context) : View(context) { invalidate() } - // ---- Text helpers ----------------------------------------------------- private fun blend(color: Int): Int { val i = colorIntensity.coerceIn(0f, 1f) if (i >= 0.999f) return color @@ -410,27 +456,19 @@ class FusionHudView(context: Context) : View(context) { private fun one(v: Float): String = if (fpsDecimal) String.format(Locale.US, "%.1f", v) else v.roundToInt().toString() - // Shows "30->118" while something downstream of the game is adding frames. - // The game's own rate stays visible next to the panel rate, because the gap - // between the two is precisely what frame generation is doing. private fun fpsText(v: Float): String = if (differs(v)) "${one(v)}\u2192${one(presentedFps)}" else one(v) - // Either direction: up = frames added (LSFG Native), down = frames lost - // between the guest and the panel, which is the failure win-fg can hit - // and which a single number hides completely. private fun differs(v: Float): Boolean = presentedFps > 0f && kotlin.math.abs(presentedFps - v) > maxOf(1f, v * 0.10f) private fun fmt1(v: Float): String = String.format(Locale.US, "%.1f", v) private fun lowText(v: Float): String? = if (v <= 0f) null else fmt1(v) - // number (white, or "—" muted when null) + unit (muted, smaller) private fun numUnit(num: String?, unit: String, numPx: Float, unitPx: Float): List = if (num == null) listOf(Span("—", colDim, numPx), Span(unit, colDim, unitPx)) else listOf(Span(num, colValue, numPx), Span(unit, colDim, unitPx)) - // "0.2GiB"/"75%"/"1938MHz" → white number + muted suffix private fun valueUnit(text: String, numPx: Float, unitPx: Float): List { val i = text.indexOfFirst { !(it.isDigit() || it == '.' || it == '-') } return if (i <= 0) listOf(Span(text, colValue, numPx)) @@ -439,7 +477,7 @@ class FusionHudView(context: Context) : View(context) { private fun tempSpans(c: Int?, sensor: HudMetrics.TempSensor, numPx: Float, unitPx: Float): List { if (c == null) return emptyList() - val txt = HudMetrics.formatTemp(c.toFloat(), tempDisplay, false) // "81°C" + val txt = HudMetrics.formatTemp(c.toFloat(), tempDisplay, false) val col = HudMetrics.tempColor( c.toFloat(), metrics.resolveThresholds(sensor, tempDisplay), tempDisplay, colValue) val i = txt.indexOf('°') @@ -449,41 +487,30 @@ class FusionHudView(context: Context) : View(context) { private fun gap(unitPx: Float) = Span(" ", colDim, unitPx) - /** The frame-rate number in neon, as on Minimal. */ private fun glowing(spans: List): List = spans.mapIndexed { i, s -> if (i == 0) Span(s.text, s.color, s.sizePx, glow = true) else s } - // ---- Wayland HDR state (one line of its own; nothing at all for FusionHdr.NONE) ---- - /** The state as a full line: "HDR", "HDR (no headroom)", "HDR off", "HDR ready", "HDR tone-mapped", - * "HDR not on this screen". */ private fun hdrLine(px: Float): List = when (hdrState) { - FusionHdr.ON -> listOf(Span("HDR", colHdr, px)) - FusionHdr.NO_HEADROOM -> listOf(Span("HDR", colHdr, px), Span(" (no headroom)", colBat, px)) - FusionHdr.OFF -> listOf(Span("HDR off", colDim, px)) - FusionHdr.READY -> listOf(Span("HDR ready", colDim, px)) - FusionHdr.TONEMAPPED -> listOf(Span("HDR", colDim, px), Span(" tone-mapped", colBat, px)) - FusionHdr.NOT_ON_THIS_SCREEN -> listOf(Span("HDR", colDim, px), Span(" not on this screen", colBat, px)) + DroidDeckHudHdr.ON -> listOf(Span("HDR", colHdr, px)) + DroidDeckHudHdr.NO_HEADROOM -> listOf(Span("HDR", colHdr, px), Span(" (no headroom)", colBat, px)) + DroidDeckHudHdr.OFF -> listOf(Span("HDR off", colDim, px)) + DroidDeckHudHdr.READY -> listOf(Span("HDR ready", colDim, px)) + DroidDeckHudHdr.TONEMAPPED -> listOf(Span("HDR", colDim, px), Span(" tone-mapped", colBat, px)) + DroidDeckHudHdr.NOT_ON_THIS_SCREEN -> listOf(Span("HDR", colDim, px), Span(" not on this screen", colBat, px)) else -> emptyList() } - /** The value after an "HDR" label (Full / Mega): "on", "no headroom", "off", "ready", "tone-mapped", - * "not on this screen". */ private fun hdrValue(px: Float): List = when (hdrState) { - FusionHdr.ON -> listOf(Span("on", colHdr, px)) - FusionHdr.NO_HEADROOM -> listOf(Span("no headroom", colBat, px)) - FusionHdr.OFF -> listOf(Span("off", colDim, px)) - FusionHdr.READY -> listOf(Span("ready", colDim, px)) - FusionHdr.TONEMAPPED -> listOf(Span("tone-mapped", colBat, px)) - FusionHdr.NOT_ON_THIS_SCREEN -> listOf(Span("not on this screen", colBat, px)) + DroidDeckHudHdr.ON -> listOf(Span("on", colHdr, px)) + DroidDeckHudHdr.NO_HEADROOM -> listOf(Span("no headroom", colBat, px)) + DroidDeckHudHdr.OFF -> listOf(Span("off", colDim, px)) + DroidDeckHudHdr.READY -> listOf(Span("ready", colDim, px)) + DroidDeckHudHdr.TONEMAPPED -> listOf(Span("tone-mapped", colBat, px)) + DroidDeckHudHdr.NOT_ON_THIS_SCREEN -> listOf(Span("not on this screen", colBat, px)) else -> emptyList() } private fun hdrText(): String = hdrLine(1f).joinToString("") { it.text } - // ---- GPU model (with the Wayland GPU-name spoof) ---- - /** What the GPU row names: the spoofed GPU when this session reports one, else the real model. */ private fun gpuNameText(): String = gpuSpoofName.ifBlank { gpuModel } - /** The GPU row's value run. A spoofed name carries a marker in the same warning colour the HDR line - * qualifies its state with, so the row can't be read as the chip that is really rendering: - * "GeForce GTX 1080 (spoof)", and where the line is tightest (the pill) "GeForce GTX 1080 spoof". */ private fun gpuModelSpans(px: Float, color: Int, compact: Boolean = false): List { val name = Span(gpuNameText(), color, px) if (gpuSpoofName.isBlank()) return listOf(name) @@ -492,45 +519,73 @@ class FusionHudView(context: Context) : View(context) { private val inkRect = android.graphics.Rect() - // ---- Layout builders -------------------------------------------------- private fun rebuild() { glyphs.clear(); tileRects.clear(); graphRect = null - headerMark = null; chipRect = null; dPanel = null; dDividerTop = -1f + headerMark = null; headerWordmark = null; chipRect = null; dPanel = null; dDividerTop = -1f; tabRect = null; stripRect = null val s = snap if (s == null) { contentW = 0f; contentH = 0f; return } + if (dock != DroidDeckHudDock.NONE) { buildDockTab(); return } when (size) { - FusionSize.FULL -> { buildFull(s); intoPanel(sp(10f), header = true) } - FusionSize.TILES -> { buildTiles(s); intoPanel(sp(9f), header = true) } - FusionSize.PILL -> { buildPill(s); intoPanel(sp(10f), header = false) } - FusionSize.MINIMAL -> buildMinimal(s) - FusionSize.MEGA -> { buildMega(s); intoPanel(sp(10f), header = true) } + DroidDeckHudSize.FULL -> { buildFull(s); intoPanel(sp(10f), header = true) } + DroidDeckHudSize.TILES -> { buildTiles(s); intoPanel(sp(9f), header = true) } + DroidDeckHudSize.PILL -> { buildPill(s); intoPanel(sp(10f), header = false) } + DroidDeckHudSize.MINIMAL -> buildMinimal(s) + DroidDeckHudSize.MEGA -> { buildMega(s); intoPanel(sp(10f), header = true) } + DroidDeckHudSize.STRIP -> buildStrip(s) } } - // ---- DroidDeck panel, header and chip ----------------------------------- - /** The clock sits in the header on every size but the Pill, which keeps it under the FPS. */ - private fun footerClock(): Boolean = showClockTime && size == FusionSize.PILL + private fun buildDockTab() { + val numPx = sp(TAB_NUM_SP) + val spans = tabSpans() + val padX = sp(TAB_PAD_X_SP); val padY = sp(TAB_PAD_Y_SP) + placeRun(padX, padY + capHeight(numPx), spans) + val (w, h) = dockTabSize() + contentW = w; contentH = h + tabRect = RectF(0f, 0f, contentW, contentH) + } - private fun measureSans(text: String, sizePx: Float): Float { wordmarkPaint.textSize = sizePx; return wordmarkPaint.measureText(text) } + private fun tabSpans() = listOf(Span(one(fpsNow), colValue, sp(TAB_NUM_SP)), Span("fps", colDim, sp(TAB_LABEL_SP))) - private fun panelInset() = sp(8f) // room for the glow around the panel - private fun panelLeft() = sp(13f) // the orb and its glow stick out of the left side + internal fun dockTabSize(): Pair = + Pair(runWidth(tabSpans()) + 2f * sp(TAB_PAD_X_SP), capHeight(sp(TAB_NUM_SP)) + 2f * sp(TAB_PAD_Y_SP)) + + private fun drawTab(canvas: Canvas, rect: RectF, edgeOf: DroidDeckHudDock = dock) { + val r = sp(8f); val stroke = outlineWidth(); val h = stroke / 2f + val round = floatArrayOf(r, r, r, r, r, r, r, r) + val edge = when (edgeOf) { + DroidDeckHudDock.LEFT -> intArrayOf(0, 3) + DroidDeckHudDock.RIGHT -> intArrayOf(1, 2) + DroidDeckHudDock.TOP -> intArrayOf(0, 1) + DroidDeckHudDock.BOTTOM -> intArrayOf(2, 3) + DroidDeckHudDock.NONE -> intArrayOf() + } + for (corner in edge) { round[corner * 2] = 0f; round[corner * 2 + 1] = 0f } + tabPath.rewind() + tabPath.addRoundRect(rect.left + h, rect.top + h, rect.right - h, rect.bottom - h, round, Path.Direction.CW) + headerPaint.shader = null + headerPaint.color = withAlpha(panelColor(), max(Color.alpha(panelColor()), 200)) + canvas.drawPath(tabPath, headerPaint) + if (stroke <= 0f) return + strokePaint.strokeWidth = stroke + strokePaint.color = outlineColor() + canvas.drawPath(tabPath, strokePaint) + } + + private fun footerClock(): Boolean = showClockTime && size == DroidDeckHudSize.PILL + + private fun panelInset() = sp(8f) + private fun panelLeft() = sp(13f) private fun contentLeft() = panelLeft() + sp(16f) - /** The DroidDeck mark, "DroidDeck" and the clock across the top, starting on [left], with the same - * space above and below the mark. Returns the header's bottom edge and its right end. */ private fun addPanelHeader(left: Float, inner: Float): Pair { - val wordPx = sp(10f); val clockPx = sp(9.5f); val gapH = sp(7f) - wordmarkPaint.textSize = wordPx - val markH = wordmarkPaint.fontMetrics.let { it.descent - it.ascent } * 0.95f + val clockPx = sp(9.5f); val gapH = sp(7f) + val wordH = sp(12f) val markTop = inner + gapH - val markLeft = left - DroidDeckMark.inkLeftFor(markH) - headerMark = RectF(markLeft, markTop, markLeft + DroidDeckMark.widthFor(markH), markTop + markH) - val midY = markTop + markH / 2f - var x = markLeft + DroidDeckMark.inkRightFor(markH) + sp(6f) - wordmarkPaint.getTextBounds("DroidDeck", 0, 9, inkRect) - glyphs.add(Glyph(x, midY - inkRect.exactCenterY(), "DroidDeck", blend(colValue), wordPx, sans = true)) - x += measureSans("DroidDeck", wordPx) + val wordW = WordmarkArt.widthFor(wordH) + headerWordmark = RectF(left, markTop, left + wordW, markTop + wordH) + val midY = markTop + wordH / 2f + var x = left + wordW if (showClockTime) { measurePaint.textSize = clockPx measurePaint.getTextBounds("0", 0, 1, inkRect) @@ -542,15 +597,10 @@ class FusionHudView(context: Context) : View(context) { glyphs.add(Glyph(x, base, t, blend(colDim), clockPx)) x += measure(t, clockPx) } - dDividerTop = markTop + markH + gapH + dDividerTop = markTop + wordH + gapH return Pair(dDividerTop + max(1f, density), x) } - /** - * Moves a size's content, laid out from [pad] at the origin, into the panel: under the header, or after - * the logo chip on the Pill. Lines that start on the content's left edge are lined up by their ink, so - * the logo, labels and numbers share one edge. - */ private fun intoPanel(pad: Float, header: Boolean) { if (contentW <= 0f || contentH <= 0f) return for (i in glyphs.indices) { @@ -580,8 +630,6 @@ class FusionHudView(context: Context) : View(context) { finishPanel(panel, halfRound = !header) } - /** Closes the panel around everything placed so far, widened until no line, tile or graph reaches the - * round side: a half circle on the short sizes (Pill, Minimal), large round corners on the tall ones. */ private fun finishPanel(panel: RectF, halfRound: Boolean) { val r = if (halfRound) panel.height() / 2f else min(panel.height() / 2f, sp(56f)) val margin = outlineWidth() + sp(4f) @@ -591,7 +639,7 @@ class FusionHudView(context: Context) : View(context) { } var right = panel.right for (g in glyphs) { - val paint = if (g.sans) wordmarkPaint else measurePaint + val paint = measurePaint paint.textSize = g.sizePx paint.getTextBounds(g.text, 0, g.text.length, inkRect) if (inkRect.isEmpty) continue @@ -605,7 +653,6 @@ class FusionHudView(context: Context) : View(context) { contentH = panel.bottom + panelInset() } - // ---- Shared small-info helpers ---------------------------------------- private fun clockTimeString(): String = DateFormat.getTimeFormat(context).format(Date()) private fun elapsedString(): String { @@ -615,31 +662,21 @@ class FusionHudView(context: Context) : View(context) { else String.format(Locale.US, "%02d:%02d", m, s) } - /** - * The FPS row's API/engine label — the DX→Vulkan translator ([engineLabel]: "DXVK"/"VKD3D"/"Zink"), - * gated by the "Engine" chip. This is short and shows in EVERY size. Falls back to a bare "FPS" when - * the toggle is off or no engine label is set. (The graphics WRAPPER is separate — Mega-only, drawn - * below the frametime graph — not on the FPS row.) - */ private fun apiLabel(): String = if (showEngine && engineLabel.isNotBlank()) engineLabel else "FPS" - /** The DX-wrapper version WITH its engine name (e.g. "DXVK 2.4.1", "VKD3D 2.14"), or "" if none. - * Used for the Mega stack line below the graph. */ private fun dxVersionLabeled(): String = when { engineLabel.contains("VKD3D", true) && vkd3dVersion.isNotBlank() -> "VKD3D $vkd3dVersion" engineLabel.contains("DXVK", true) && dxvkVersion.isNotBlank() -> "DXVK $dxvkVersion" else -> "" } - /** The DX-wrapper version for the current engine, or "" (used for the Tiles "API" tile sub-line). */ private fun dxVersion(): String = when { engineLabel.contains("VKD3D", true) -> vkd3dVersion engineLabel.contains("DXVK", true) -> dxvkVersion else -> "" } - /** Resolution + refresh, e.g. "1280x720 @ 120Hz". Read from the current display (Main thread). */ private fun resolutionString(): String { if (resolution.isNotBlank()) return resolution val dm = resources.displayMetrics @@ -648,21 +685,22 @@ class FusionHudView(context: Context) : View(context) { return if (hz >= 1f) "$base @ ${hz.roundToInt()}Hz" else base } - /** A subtle, low-emphasis time-of-day tucked into the bottom-right of any size. Grows contentH slightly. */ private fun addSubtleClock(pad: Float, leftAligned: Boolean = false) { if (!footerClock()) return val px = sp(9.5f) val t = clockTimeString() val w = measure(t, px) - val footerTop = contentH - pad // reuse the bottom padding band as the footer line + val footerTop = contentH - pad val baseline = footerTop - ascent(px) - // Right-aligned footer; on the Pill it sits on the left edge, under the FPS. val x = if (leftAligned) pad else (contentW - pad - w).coerceAtLeast(pad) glyphs.add(Glyph(x, baseline, t, blend(colDim), px)) contentH = footerTop + lineH(px) + pad * 0.5f contentW = max(contentW, pad + w + pad) } + private fun hasGpuStats(s: HudMetrics.Snapshot): Boolean = + s.gpuPercent != null || s.gpuTempC != null || s.gpuClockMhz != null + private fun buildFull(s: HudMetrics.Snapshot) { val rowPx = sp(12f); val unitPx = rowPx * 0.62f val pad = sp(10f); val lineGap = sp(4f); val lvGap = sp(8f) @@ -672,9 +710,9 @@ class FusionHudView(context: Context) : View(context) { rows.add(HudRow(Span("GPU", colGpu, rowPx), gpuModelSpans(rowPx, colValue))) if (displayServer.isNotBlank()) rows.add(HudRow(Span("DISP", colDisp, rowPx), listOf(Span(displayServer, colValue, rowPx)))) - if (hdrState != FusionHdr.NONE) + if (hdrState != DroidDeckHudHdr.NONE) rows.add(HudRow(Span("HDR", colHdr, rowPx), hdrValue(rowPx))) - if (showGPU) { + if (showGPU && hasGpuStats(s)) { val v = ArrayList() v += numUnit(s.gpuPercent?.toString(), "%", rowPx, unitPx) if (showGpuTemp) tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) @@ -685,9 +723,9 @@ class FusionHudView(context: Context) : View(context) { if (showCPU) { val v = ArrayList() v += numUnit(s.cpuPercent?.toString(), "%", rowPx, unitPx) + v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) if (showCpuTemp) tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } - v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) rows.add(HudRow(Span("CPU", colCpu, rowPx), v)) } if (showVram && s.vramText() != null) @@ -710,7 +748,6 @@ class FusionHudView(context: Context) : View(context) { val v = ArrayList() v += glowing(numUnit(fpsText(fpsNow), "FPS", rowPx, unitPx)) v += gap(unitPx); v += numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", rowPx, unitPx) - // Short API/engine label ("DXVK"/"VKD3D"/"Zink", else "FPS") — a normal aligned row. rows.add(HudRow(Span(apiLabel(), colFps, rowPx), v)) rows.add(HudRow(Span("AVG", colLo, rowPx), numUnit(fmt1(fpsAvg), "FPS", rowPx, unitPx))) rows.add(HudRow(Span("1%", colLo, rowPx), numUnit(lowText(lows.low1Fps), "FPS", rowPx, unitPx))) @@ -734,9 +771,6 @@ class FusionHudView(context: Context) : View(context) { } if (showFPS && showGraph) { - // Frametime min/max line + green graph. "Frametime" is far wider than the short-label grid - // column, so place the stat AFTER the ACTUAL label width (not labelCol) — otherwise the two - // overlap and render as "Frametimemin:.. max:..". val ftPx = unitPx * 1.15f val baseline = y - asc placeRun(pad, baseline, listOf(Span("Frametime", colFps, ftPx))) @@ -768,23 +802,22 @@ class FusionHudView(context: Context) : View(context) { "${fmt1(fpsAvg)} avg · ${lowText(lows.low1Fps) ?: "—"} 1%", false)) if (showFPS) tiles.add(Tile("FRAME", colDim, numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", valPx, unitPx), "${fmt1(graphMinMs)} – ${fmt1(graphMaxMs)}", false)) - if (showGPU) tiles.add(Tile("GPU", colGpu, numUnit(s.gpuPercent?.toString(), "%", valPx, unitPx), + if (showGPU && hasGpuStats(s)) tiles.add(Tile("GPU", colGpu, numUnit(s.gpuPercent?.toString(), "%", valPx, unitPx), if (showGpuTemp && s.gpuTempC != null) HudMetrics.formatTemp(s.gpuTempC.toFloat(), tempDisplay, false) else s.gpuClockMhz?.let { "${it}MHz" }, false)) if (showCPU) tiles.add(Tile("CPU", colCpu, numUnit(s.cpuPercent?.toString(), "%", valPx, unitPx), - listOfNotNull(if (showCpuTemp) s.cpuTempC?.let { HudMetrics.formatTemp(it.toFloat(), tempDisplay, false) } else null, - s.cpuClockMhz?.toString()).joinToString(" · ").ifBlank { null }, false)) + listOfNotNull(s.cpuClockMhz?.let { "${it}MHz" }, + if (showCpuTemp) s.cpuTempC?.let { HudMetrics.formatTemp(it.toFloat(), tempDisplay, false) } else null) + .joinToString(" · ").ifBlank { null }, false)) if (showVram && s.vramText() != null) tiles.add(Tile("VRAM", colVram, valueUnit(s.vramText()!!, valPx, unitPx), null, false)) if (showRAM) tiles.add(Tile("RAM", colRam, numUnit(s.ramPercent.roundToInt().toString(), "%", valPx, unitPx), "${s.ramUsedText()} / ${s.ramTotalText()}", false)) - // API/engine tile — short translator name (DXVK/VKD3D/Zink) with the DX version on the sub-line; - // a normal half-width tile that naturally fills the empty slot beside RAM. Gated by "Engine". if (showEngine && engineLabel.isNotBlank()) tiles.add(Tile("API", colFps, listOf(Span(engineLabel, colValue, valPx)), dxVersion().ifBlank { null }, false)) if (displayServer.isNotBlank()) tiles.add(Tile("DISPLAY", colDisp, listOf(Span(displayServer, colValue, valPx)), - if (hdrState != FusionHdr.NONE) hdrText() else null, false)) + if (hdrState != DroidDeckHudHdr.NONE) hdrText() else null, false)) if (showGpuModel && gpuNameText().isNotBlank()) tiles.add(Tile("GPU", colGpu, gpuModelSpans(valPx, colValue), null, true)) if (showBattery || showPower || showBatteryTemp) { @@ -802,7 +835,7 @@ class FusionHudView(context: Context) : View(context) { var normalW = 0f for (t in tiles) if (!t.wide) normalW = max(normalW, tileW(t)) if (normalW == 0f) for (t in tiles) normalW = max(normalW, tileW(t) / 2f) - val tileH = innerPad * 2 + keyH + lineGap + valH + lineGap + subH // uniform (room for a sub line) + val tileH = innerPad * 2 + keyH + lineGap + valH + lineGap + subH val fullW = normalW * 2 + tileGap var x = pad; var y = pad; var col = 0 @@ -843,32 +876,20 @@ class FusionHudView(context: Context) : View(context) { val pad = sp(10f); val midGap = sp(12f); val stkLineGap = sp(3f) val left = ArrayList() - // "30->118" is roughly three times the width of "30", and the pill's - // number is set at 30sp precisely because it is the one big thing on a - // small overlay. Shrink it while it carries both figures so the pill - // does not balloon across the screen; it is still the largest element. val generating = differs(fpsNow) val fpsPx = if (generating) bigPx * 0.55f else bigPx left += Span(fpsText(fpsNow), colValue, fpsPx, glow = true) left += Span("fps", colDim, if (generating) bigUnitPx * 0.8f else bigUnitPx) val stack = ArrayList>() - // The GPU name normally heads the stack. A name wider than every stat under it (a Wayland spoof - // such as "Radeon RX 6800/6800 XT / 6900 XT spoof") would set the stack's width and stretch the - // whole capsule around empty space, so that name gets its own line across the top of the pill - // instead, starting over the API caption (see nameOnTop below). val gpuName = if (showGpuModel && gpuNameText().isNotBlank()) gpuModelSpans(stkPx, colDim, compact = true) else null run { val l = ArrayList() - if (showGPU) { l += Span("GPU ${s.gpuPercent ?: "—"}%", colGpu, stkPx) } + if (showGPU && s.gpuPercent != null) { l += Span("GPU ${s.gpuPercent}%", colGpu, stkPx) } if (showCPU) { if (l.isNotEmpty()) l += Span(" · ", colDim, stkPx); l += Span("CPU ${s.cpuPercent ?: "—"}%", colCpu, stkPx) } if (l.isNotEmpty()) stack.add(l) } - // RAM % (system-wide) takes the slot the latency row used to occupy, matching the GPU/CPU idiom - // on the row above it. colRam keeps RAM's identity colour consistent with the Full/Tiles sizes. if (showRAM) stack.add(listOf(Span("RAM ${s.ramPercent.roundToInt()}%", colRam, stkPx))) - // One battery row, as on the other sizes: each part shows on its own switch, so the battery - // temperature no longer goes with the RAM switch and watts show without the battery level. if (showBattery || showPower || showBatteryTemp) { val l = ArrayList() fun part(spans: List) { @@ -881,9 +902,6 @@ class FusionHudView(context: Context) : View(context) { if (showPower && s.battery.watts > 0f) part(listOf(Span("${fmt1(s.battery.watts)}W", colDim, stkPx))) if (l.isNotEmpty()) stack.add(l) } - // Latency (+ the display server, + optional VRAM) drops to the bottom of the stack, under the - // battery row. The display server sits here, not on the GPU-model line: that line is the - // pill's widest and ran into the capsule's rounded edge. run { val l = ArrayList() l += Span("${fmt1(1000f / max(fpsNow, 1f))}ms", colDim, stkPx) @@ -891,17 +909,13 @@ class FusionHudView(context: Context) : View(context) { if (showVram && s.vramText() != null) { l += Span(" · ", colDim, stkPx); l += Span("${s.vramText()} vram", colDim, stkPx) } stack.add(l) } - // Wayland HDR state on its OWN line directly under the latency · display-server line (it ran off - // the capsule's right edge as "40.3ms · Wayland · HDR (no headroom)"). Only in HDR sessions. - if (hdrState != FusionHdr.NONE) stack.add(hdrLine(stkPx)) + if (hdrState != DroidDeckHudHdr.NONE) stack.add(hdrLine(stkPx)) var statsW = 0f for (l in stack) statsW = max(statsW, runWidth(l)) val nameOnTop = gpuName != null && runWidth(gpuName) > statsW if (gpuName != null && !nameOnTop) stack.add(0, gpuName) - // Left column: a small API/engine caption (DXVK/VKD3D/Zink) above the big FPS and the clock below - // it, all on the left edge, so the left reads API · FPS · clock top-to-bottom. val apiStr = apiLabel() val hasApi = apiStr != "FPS" val apiH = if (hasApi) lineH(stkPx) else 0f @@ -920,14 +934,12 @@ class FusionHudView(context: Context) : View(context) { contentW = pad + leftBlockW + midGap + stackW + pad contentH = pad + topLineH + innerH + pad - // left column (API caption + big FPS), vertically centered as a block var ly = pad + topLineH + (innerH - leftColH) / 2f if (hasApi) { placeRun(pad, ly - ascent(stkPx), listOf(Span(apiStr, colFps, stkPx))) ly += apiH + apiGap } placeRun(pad, ly - ascent(bigPx), left) - // stack, vertically centered var sy = pad + topLineH + (innerH - stackTotalH) / 2f for (l in stack) { placeRun(pad + leftBlockW + midGap, sy - ascent(stkPx), l) @@ -935,22 +947,17 @@ class FusionHudView(context: Context) : View(context) { } addSubtleClock(pad, leftAligned = true) if (nameOnTop && gpuName != null) { - // Left-aligned over the API caption; the pill only widens if the name is wider than the - // API/FPS column + stats. val end = placeRun(pad, pad - ascent(stkPx), gpuName) contentW = max(contentW, end + pad) } } - // One column as wide as the widest row: the logo, FPS, lows, graph and engine line start on its left - // edge (ink, not advance), and the header keeps the same space above and below the logo. private fun buildMinimal(s: HudMetrics.Snapshot) { val bigPx = sp(34f); val bigUnitPx = bigPx * 0.32f; val subPx = sp(11.5f); val footPx = sp(9.5f) val stroke = outlineWidth() val left = contentLeft() val inner = panelInset() + stroke - // Same reasoning as the pill: 34sp is sized for one number, not two. val minGenerating = differs(fpsNow) val big = listOf( Span(fpsText(fpsNow), colValue, if (minGenerating) bigPx * 0.55f else bigPx), @@ -963,7 +970,7 @@ class FusionHudView(context: Context) : View(context) { } val footerLabel = listOf(if (showEngine) engineLabel else "", displayServer) .filter { it.isNotBlank() }.joinToString(" · ") - val hdr = if (hdrState != FusionHdr.NONE) hdrLine(footPx) else emptyList() + val hdr = if (hdrState != DroidDeckHudHdr.NONE) hdrLine(footPx) else emptyList() val (headerBottom, headerRight) = addPanelHeader(left, inner) val x = headerRight @@ -996,6 +1003,89 @@ class FusionHudView(context: Context) : View(context) { finishPanel(panel, halfRound = true) } + private fun buildStrip(s: HudMetrics.Snapshot) { + val rowPx = sp(11.5f); val unitPx = rowPx * 0.8f; val fpsPx = sp(15f) + val padX = sp(10f); val groupGap = sp(13f) + val h = sp(26f) + val w = ((parent as? View)?.width?.takeIf { it > 0 } ?: resources.displayMetrics.widthPixels).toFloat() + val mid = h / 2f + val baseline = mid + capHeight(fpsPx) / 2f + + val markH = sp(13f) + val markLeft = padX - DroidDeckMark.inkLeftFor(markH) + headerMark = RectF(markLeft, mid - markH / 2f, markLeft + DroidDeckMark.widthFor(markH), mid + markH / 2f) + var x = markLeft + DroidDeckMark.inkRightFor(markH) + sp(8f) + + var right = w - padX + if (showClockTime) { + val t = clockTimeString() + right -= measure(t, rowPx) + glyphs.add(Glyph(right, baseline, t, blend(colDim), rowPx)) + right -= groupGap + } + + val generating = differs(fpsNow) + val fps = ArrayList() + if (apiLabel() != "FPS") fps += Span("${apiLabel()} ", colDim, rowPx) + fps += Span(fpsText(fpsNow), colValue, if (generating) fpsPx * 0.8f else fpsPx, glow = true) + fps += Span("fps", colDim, unitPx) + x = placeRun(x, baseline, fps) + groupGap + + if (showGraph) { + val gw = sp(72f); val gh = h * 0.55f + if (x + gw <= right) { + graphRect = RectF(x, mid - gh / 2f, x + gw, mid + gh / 2f) + x += gw + groupGap + } + } + + val groups = ArrayList>() + run { + val l = ArrayList() + l += Span("1% ", colDim, rowPx); l += Span(lowText(lows.low1Fps) ?: "—", colFps, rowPx) + l += Span(" 0.1% ", colDim, rowPx); l += Span(lowText(lows.low01Fps) ?: "—", colFps, rowPx) + if (showLow001) { l += Span(" 0.01% ", colDim, rowPx); l += Span(lowText(lows.low001Fps) ?: "—", colFps, rowPx) } + groups += l + } + if (showGPU || showGpuTemp) { + val l = arrayListOf(Span("GPU", colGpu, rowPx)) + if (showGPU) l += Span(" ${s.gpuPercent ?: "—"}%", colGpu, rowPx) + if (showGpuTemp && s.gpuTempC != null) { l += Span(" ", colDim, rowPx); l += tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) } + groups += l + } + if (showCPU || showCpuTemp) { + val l = arrayListOf(Span("CPU", colCpu, rowPx)) + if (showCPU) l += Span(" ${s.cpuPercent ?: "—"}%", colCpu, rowPx) + if (showCpuTemp && s.cpuTempC != null) { l += Span(" ", colDim, rowPx); l += tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) } + groups += l + } + if (showVram) s.vramText()?.let { groups += listOf(Span("VRAM $it", colVram, rowPx)) } + if (showRAM) groups += listOf(Span("RAM ${s.ramPercent.roundToInt()}%", colRam, rowPx)) + if (showBattery || showPower || showBatteryTemp) { + val l = ArrayList() + fun part(spans: List) { + l += if (l.isEmpty()) Span("BAT ", colBat, rowPx) else Span(" ", colDim, rowPx) + l += spans + } + if (showBattery && s.battery.percent != null) part(listOf(Span("${s.battery.percent}%", colBat, rowPx))) + if (showBatteryTemp && s.battery.tempC != null) + part(tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, rowPx, unitPx)) + if (showPower && s.battery.watts > 0f) part(listOf(Span("${fmt1(s.battery.watts)}W", colDim, rowPx))) + if (l.isNotEmpty()) groups += l + } + if (displayServer.isNotBlank()) groups += listOf(Span(displayServer, colDisp, rowPx)) + if (hdrState != DroidDeckHudHdr.NONE) groups += hdrLine(rowPx) + if (showGpuModel && gpuNameText().isNotBlank()) groups += gpuModelSpans(rowPx, colDim, compact = true) + + for (g in groups) { + if (x + runWidth(g) > right) break + x = placeRun(x, baseline, g) + groupGap + } + + stripRect = RectF(0f, 0f, w, h) + contentW = w; contentH = h + } + private fun capHeight(px: Float): Float { measurePaint.textSize = px measurePaint.getTextBounds("0", 0, 1, inkRect) @@ -1009,8 +1099,6 @@ class FusionHudView(context: Context) : View(context) { return inkRect.left.toFloat() } - /** Places a column of "label + value" rows; returns (bottomY, rightX). Appends glyphs. Rows flagged - * [HudRow.inline] opt out of the shared label column (value follows the label directly). */ private fun layoutColumn(rows: List, x: Float, y0: Float, rowPx: Float, lineGap: Float, lvGap: Float): Pair { if (rows.isEmpty()) return Pair(y0, x) @@ -1030,7 +1118,6 @@ class FusionHudView(context: Context) : View(context) { return Pair(y - lineGap, right) } - /** Places wrapping " · "-separated info fragments within maxWidth; returns (bottomY, rightX). */ private fun layoutWrap(fragments: List>, x: Float, y0: Float, maxWidth: Float, px: Float, lineGap: Float): Pair { if (fragments.isEmpty()) return Pair(y0, x) @@ -1051,11 +1138,10 @@ class FusionHudView(context: Context) : View(context) { val rowPx = sp(11.5f); val unitPx = rowPx * 0.62f; val bandPx = sp(9.5f) val pad = sp(10f); val lineGap = sp(3.5f); val lvGap = sp(7f); val gutter = sp(16f) - // ---- LEFT column: GPU, aggregate CPU, then per-core rows ---- val left = ArrayList() if (showGpuModel && gpuNameText().isNotBlank()) left.add(HudRow(Span("GPU", colGpu, rowPx), gpuModelSpans(rowPx, colValue))) - if (showGPU) { + if (showGPU && hasGpuStats(s)) { val v = ArrayList() v += numUnit(s.gpuPercent?.toString(), "%", rowPx, unitPx) if (showGpuTemp) tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) @@ -1066,9 +1152,9 @@ class FusionHudView(context: Context) : View(context) { if (showCPU) { val v = ArrayList() v += numUnit(s.cpuPercent?.toString(), "%", rowPx, unitPx) + v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) if (showCpuTemp) tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } - v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) left.add(HudRow(Span("CPU", colCpu, rowPx), v)) } if (showPerCore) { @@ -1083,7 +1169,6 @@ class FusionHudView(context: Context) : View(context) { } } - // ---- RIGHT column: VRAM, RAM, SWP, NET, BAT, engine, lows ---- val right = ArrayList() if (showVram && s.vramText() != null) right.add(HudRow(Span("VRAM", colVram, rowPx), valueUnit(s.vramText()!!, rowPx, unitPx))) @@ -1121,8 +1206,6 @@ class FusionHudView(context: Context) : View(context) { val v = ArrayList() v += glowing(numUnit(fpsText(fpsNow), "FPS", rowPx, unitPx)) v += gap(unitPx); v += numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", rowPx, unitPx) - // FPS/engine row: just the short API label. The DX version moved to the stack lines - // below the frametime graph (see below), so this row stays compact. right.add(HudRow(Span(apiLabel(), colFps, rowPx), v)) right.add(HudRow(Span("AVG", colLo, rowPx), numUnit(fmt1(fpsAvg), "FPS", rowPx, unitPx))) right.add(HudRow(Span("1%", colLo, rowPx), numUnit(lowText(lows.low1Fps), "FPS", rowPx, unitPx))) @@ -1131,19 +1214,16 @@ class FusionHudView(context: Context) : View(context) { right.add(HudRow(Span("0.01%", colLo, rowPx), numUnit(lowText(lows.low001Fps), "FPS", rowPx, unitPx))) } - // ---- Two columns side by side (each reflows independently) ---- val (leftBottom, leftRight) = layoutColumn(left, pad, pad, rowPx, lineGap, lvGap) val rightX = (if (left.isEmpty()) pad else leftRight + gutter) val (rightBottom, rightRight) = layoutColumn(right, rightX, pad, rowPx, lineGap, lvGap) var y = max(leftBottom, rightBottom) var maxRight = max(leftRight, rightRight) - // ---- Bottom band spanning both columns: res · Proton · elapsed ---- - // (The graphics wrapper moved to the FPS-row label above, so it's no longer in this band.) val band = ArrayList>() if (showResolution) band.add(listOf(Span("RES ", colDim, bandPx), Span(resolutionString(), colValue, bandPx))) if (displayServer.isNotBlank()) band.add(listOf(Span("DISP ", colDim, bandPx), Span(displayServer, colDisp, bandPx))) - if (hdrState != FusionHdr.NONE) band.add(listOf(Span("HDR ", colDim, bandPx)) + hdrValue(bandPx)) + if (hdrState != DroidDeckHudHdr.NONE) band.add(listOf(Span("HDR ", colDim, bandPx)) + hdrValue(bandPx)) if (showProton && wineVersion.isNotBlank()) band.add(listOf(Span(wineVersion, colVram, bandPx))) if (showSession) band.add(listOf(Span("elapsed ", colDim, bandPx), Span(elapsedString(), colValue, bandPx))) if (band.isNotEmpty()) { @@ -1152,7 +1232,6 @@ class FusionHudView(context: Context) : View(context) { y = bBottom; maxRight = max(maxRight, bRight) } - // ---- Full-width frametime graph ---- if (showGraph) { y += sp(3f) val gh = sp(22f) @@ -1162,9 +1241,6 @@ class FusionHudView(context: Context) : View(context) { y += gh } - // ---- Stack-layer lines BELOW the frametime graph, subtle (same size/style as the bottom - // band): the DX-wrapper version first (e.g. "DXVK 2.4.1-…", gated by "DX ver"), then the - // graphics wrapper beneath it (e.g. "Original", gated by "Wrapper"). ---- val dxLine = dxVersionLabeled() val hasDx = showDxVer && dxLine.isNotBlank() if (hasDx) { @@ -1180,11 +1256,11 @@ class FusionHudView(context: Context) : View(context) { contentW = maxRight + pad contentH = y + pad - addSubtleClock(pad) // subtle time-of-day, consistent with the other sizes + addSubtleClock(pad) } - // ---- Measure / draw --------------------------------------------------- override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + if (stripRect != null) { setMeasuredDimension(contentW.roundToInt(), resolveSize(contentH.roundToInt(), heightMeasureSpec)); return } setMeasuredDimension( resolveSize(contentW.roundToInt(), widthMeasureSpec), resolveSize(contentH.roundToInt(), heightMeasureSpec), @@ -1193,10 +1269,41 @@ class FusionHudView(context: Context) : View(context) { override fun onDraw(canvas: Canvas) { if (contentW <= 0f || contentH <= 0f) { lockController.drawBadge(canvas); return } + val blend = if (dock == DroidDeckHudDock.NONE && previewEdge != DroidDeckHudDock.NONE) previewBlend else 0f + if (blend <= 0f) { drawContent(canvas); return } + if (blend < 1f) { + canvas.saveLayerAlpha(0f, 0f, width.toFloat(), height.toFloat(), ((1f - blend) * 255f).roundToInt()) + drawContent(canvas) + canvas.restore() + } + drawTabPreview(canvas, blend) + } + + private fun drawTabPreview(canvas: Canvas, blend: Float) { + val (w, h) = dockTabSize() + if (scaleX <= 0f || scaleY <= 0f) return + canvas.save() + canvas.translate(width / 2f, height / 2f) + canvas.scale(1f / scaleX, 1f / scaleY) + canvas.translate(-w / 2f, -h / 2f) + canvas.saveLayerAlpha(0f, 0f, w, h, (blend * 255f).roundToInt()) + drawTab(canvas, RectF(0f, 0f, w, h), previewEdge) + var x = sp(TAB_PAD_X_SP) + val baseline = sp(TAB_PAD_Y_SP) + capHeight(sp(TAB_NUM_SP)) + for (span in tabSpans()) { + drawPaint.textSize = span.sizePx + drawPaint.color = blend(span.color) + canvas.drawText(span.text, x, baseline, drawPaint) + x += measure(span.text, span.sizePx) + } + canvas.restore() + canvas.restore() + } + + private fun drawContent(canvas: Canvas) { dPanel?.let { panel -> panelFrame(panel)?.let { canvas.drawBitmap(it, 0f, 0f, null) } } - // Tile backings if (tileRects.isNotEmpty()) { tilePaint.color = Color.argb((14 * bgOpacity).roundToInt().coerceIn(8, 40), 255, 255, 255) val tr = sp(6f) @@ -1204,10 +1311,11 @@ class FusionHudView(context: Context) : View(context) { } chipRect?.let { drawChip(canvas, it) } + tabRect?.let { drawTab(canvas, it) } + stripRect?.let { drawStrip(canvas, it) } - // Text for (g in glyphs) { - val paint = if (g.sans) wordmarkPaint else drawPaint + val paint = drawPaint paint.textSize = g.sizePx paint.color = g.color if (g.glow) paint.setShadowLayer(sp(6f), 0f, 0f, withAlpha(colGraph, 217)) @@ -1215,15 +1323,13 @@ class FusionHudView(context: Context) : View(context) { if (g.glow) paint.clearShadowLayer() } headerMark?.let { DroidDeckMark.draw(canvas, it.left, it.top, it.height(), blend(colValue), accent) } + headerWordmark?.let { WordmarkArt.draw(canvas, it.left, it.top, it.height(), blend(colValue), accent) } - // Frametime graph graphRect?.let { drawGraph(canvas, it) } lockController.drawBadge(canvas) } - // MangoHud's frametime graph: the last 200 frames on a fixed 0-50 ms scale, longer frames clipped - // to 49.9 ms (hud_elements.cpp TransformForward_Custom). private fun drawGraph(canvas: Canvas, rect: RectF) { val stats = frames ?: return stats.graph(graphBuf) @@ -1235,7 +1341,6 @@ class FusionHudView(context: Context) : View(context) { if (i == 0) graphPath.moveTo(px, py) else graphPath.lineTo(px, py) } if (dPanel != null) { - // Neon without a blur: a blur would be redrawn with every frame. graphPaint.strokeWidth = sp(4.5f) graphPaint.color = withAlpha(blend(colGraph), 56) canvas.drawPath(graphPath, graphPaint) @@ -1245,6 +1350,20 @@ class FusionHudView(context: Context) : View(context) { canvas.drawPath(graphPath, graphPaint) } + private fun drawStrip(canvas: Canvas, rect: RectF) { + headerPaint.shader = null + headerPaint.color = panelColor() + canvas.drawRect(rect, headerPaint) + val stroke = outlineWidth() + if (stroke <= 0f) return + val line = max(stroke / 2f, density) + val p = parent as? View + val atBottom = p != null && p.height > 0 && y + height / 2f > p.height / 2f + headerPaint.color = withAlpha(outlineColor(), (110 + 145 * outlineIntensity).roundToInt().coerceAtMost(255)) + if (atBottom) canvas.drawRect(rect.left, rect.top, rect.right, rect.top + line, headerPaint) + else canvas.drawRect(rect.left, rect.bottom - line, rect.right, rect.bottom, headerPaint) + } + private fun outlineWidth(): Float = if (outlineIntensity > 0f) outlineIntensity * sp(3.5f) else 0f private fun outlineColor(): Int = if (outlineFollowAccent) accent else Color.rgb(200, 200, 200) private fun panelColor(): Int = Color.argb((bgOpacity.coerceIn(0f, 1f) * 255f).roundToInt(), @@ -1252,24 +1371,19 @@ class FusionHudView(context: Context) : View(context) { private fun withAlpha(color: Int, alpha: Int): Int = Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color)) - /** The D: straight left side with small corners, round on the right with radius [rad] (a half circle - * when it is half the height). [split] > 0 leaves that much open above and below the middle of the - * left side, where the orb sits. */ - private fun dShape(l: Float, t: Float, r: Float, b: Float, rad: Float, corner: Float, split: Float): Path { - val cy = (t + b) / 2f + private fun dShape(l: Float, t: Float, r: Float, b: Float, rad: Float, corner: Float): Path { return Path().apply { - if (split > 0f) moveTo(l, cy + split) else moveTo(l, t + corner) + moveTo(l, t + corner) lineTo(l, b - corner); quadTo(l, b, l + corner, b) lineTo(r - rad, b) arcTo(r - 2f * rad, b - 2f * rad, r, b, 90f, -90f, false) lineTo(r, t + rad) arcTo(r - 2f * rad, t, r, t + 2f * rad, 0f, -90f, false) lineTo(l + corner, t); quadTo(l, t, l, t + corner) - if (split > 0f) lineTo(l, cy - split) else close() + close() } } - /** Where the inside of the outline's round side is at height [y]. */ private fun roundEdgeX(p: RectF, y: Float, stroke: Float): Float { val r = dRadius - stroke val cx = p.right - dRadius @@ -1285,7 +1399,7 @@ class FusionHudView(context: Context) : View(context) { val bmp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888) val c = Canvas(bmp) val corner = sp(6f) - val body = dShape(panel.left, panel.top, panel.right, panel.bottom, dRadius, corner, 0f) + val body = dShape(panel.left, panel.top, panel.right, panel.bottom, dRadius, corner) bgPaint.color = panelColor() c.drawPath(body, bgPaint) c.save() @@ -1299,24 +1413,16 @@ class FusionHudView(context: Context) : View(context) { headerPaint.color = withAlpha(accent, 90) c.drawRect(panel.left, dDividerTop, roundEdgeX(panel, dDividerTop, stroke), dividerBottom, headerPaint) } - // The watermark fills the half circle on the short sizes and sits on the right of the tall ones. - val halfRound = dRadius >= panel.height() / 2f - 0.5f - val wmH = if (halfRound) panel.height() * 0.92f else min(panel.height(), panel.width()) * 0.55f - DroidDeckMark.draw(c, panel.right - DroidDeckMark.widthFor(wmH) - (if (halfRound) panel.height() * 0.02f else sp(10f)), - panel.centerY() - wmH / 2f, wmH, Color.argb(20, 255, 255, 255), withAlpha(accent, 20)) c.restore() if (stroke > 0f) { val h = stroke / 2f - val outline = dShape(panel.left + h, panel.top + h, panel.right - h, panel.bottom - h, dRadius - h, corner, sp(9f)) + val outline = dShape(panel.left + h, panel.top + h, panel.right - h, panel.bottom - h, dRadius - h, corner) val blur = BlurMaskFilter((sp(3.2f) - 0.5f).coerceAtLeast(0.5f) / 0.57735f, BlurMaskFilter.Blur.NORMAL) glowPaint.strokeWidth = stroke - // Two blurred passes under the sharp one, as the 4-in-1 preview's neon. for (pass in 0..2) { glowPaint.maskFilter = if (pass < 2) blur else null glowPaint.style = Paint.Style.STROKE; glowPaint.color = outlineColor() c.drawPath(outline, glowPaint) - glowPaint.style = Paint.Style.FILL; glowPaint.color = accent - c.drawCircle(panel.left + h, panel.centerY(), sp(5.5f), glowPaint) } glowPaint.maskFilter = null } @@ -1353,20 +1459,31 @@ class FusionHudView(context: Context) : View(context) { DroidDeckMark.draw(canvas, rect.centerX() - markW / 2f, rect.centerY() - markH / 2f, markH, blend(colValue), accent) } - /** Screen point → whether an on-screen control under the HUD takes a touch there. */ internal var passesTouchAt: ((rawX: Float, rawY: Float) -> Boolean)? = null - // Declining the down event hands the whole gesture to the views under the HUD. override fun onTouchEvent(event: MotionEvent): Boolean { + if (dock != DroidDeckHudDock.NONE) return onTabTouch(event) if (event.actionMasked == MotionEvent.ACTION_DOWN && lockController.isLocked() && passesTouchAt?.invoke(event.rawX, event.rawY) == true) return false return lockController.onTouchEvent(event) } - internal val isDragging: Boolean get() = lockController.isDragging() + internal val isStrip: Boolean get() = stripRect != null + + internal val contentWidth: Float get() = contentW + internal val contentHeight: Float get() = contentH + + internal val isDragging: Boolean get() = lockController.isDragging() || tabDragging private companion object { + const val TAB_NUM_SP = 15f + const val TAB_LABEL_SP = 7.25f + const val TAB_PAD_X_SP = 7f + const val TAB_PAD_Y_SP = 5.5f const val REFRESH_MS = 500L + private const val HUE_IDLE_MS = 500L + const val MIN_SCALE = 0.5f + const val MAX_SCALE = 2f const val GRAPH_CLIP_MS = 49.9f fun parseIntOr(s: String?, d: Int): Int = try { s?.trim()?.toInt() ?: d } catch (e: Exception) { d } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckMark.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckMark.kt index dd21683f0e..621f6dc1fb 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckMark.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckMark.kt @@ -5,7 +5,6 @@ import android.graphics.Matrix import android.graphics.Paint import android.graphics.Path -/** artwork/droiddeck-mark.svg: the split D with its circular cut-out and the blue orb. */ internal object DroidDeckMark { private const val VIEW_X = -55.98f const val VIEW_W = 239.92f @@ -36,7 +35,6 @@ internal object DroidDeckMark { fun widthFor(height: Float): Float = height * VIEW_W / VIEW_H - /** Where the drawn mark starts and ends inside [widthFor]: the artwork has empty space on both sides. */ fun inkLeftFor(height: Float): Float = (-31.98f - VIEW_X) * height / VIEW_H fun inkRightFor(height: Float): Float = (175.93f - VIEW_X) * height / VIEW_H diff --git a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/FusionHudHost.kt deleted file mode 100644 index 3e3b5db638..0000000000 --- a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudHost.kt +++ /dev/null @@ -1,236 +0,0 @@ -package com.droiddeck.launcher.hud - -import android.content.Context -import android.os.Environment -import android.os.Handler -import android.os.Looper -import android.view.Choreographer -import android.view.View -import android.view.ViewGroup -import android.widget.FrameLayout -import com.droiddeck.launcher.gpu.FrameGen -import com.droiddeck.launcher.gpu.GpuInfo -import com.droiddeck.launcher.runtime.LinuxRuntime -import com.droiddeck.launcher.session.SessionPrefs -import com.droiddeck.launcher.wayland.WaylandCompositor -import java.io.File -import kotlin.math.roundToInt - -/** - * FusionHUD on the session screen, in place of the old text HUD: the view, the frame feed from gamescope - * (MangoHud's frame times) and MangoHud's readings, started with the session's first frame. - */ -class FusionHudHost(context: Context) { - private val context = context.applicationContext - private val handler = Handler(Looper.getMainLooper()) - private val feed = GameFrameFeed(File(LinuxRuntime.rootDir(this.context), HudFrames.PATH)) - private val readings = MangoReadings(File(this.context.filesDir, "session"), LinuxRuntime.rootDir(this.context)) - private var view: FusionHudView? = null - private var parent: ViewGroup? = null - private var running = false - private var hidden = false - private var backgrounded = false - private var polling = false - private var wantX = Float.NaN - private var wantY = Float.NaN - private var engine = "" - private var gpuName = "" - private var protonPid = 0 - private var proton = "" - @Volatile private var lastWindow: String? = null - - var onPresentingWindowChanged: (() -> Unit)? = null - - /** The HUD itself changed a setting: a tap cycles the size, a long press locks it. */ - var onConfigChanged: (() -> Unit)? = null - - /** Screen point → whether an on-screen control takes a touch there; a locked HUD lets those through. */ - var passesTouchAt: ((rawX: Float, rawY: Float) -> Boolean)? = null - - private val listener = object : WaylandCompositor.GameListener { - override fun onGameSurface(window: String?, gpuName: String?) { - if (!gpuName.isNullOrBlank()) handler.post { this@FusionHudHost.gpuName = cleanGpuName(gpuName) } - if (window != null && window != lastWindow) { - lastWindow = window - handler.post { onPresentingWindowChanged?.invoke() } - } - } - - override fun onGameFrame() { - feed.onCompositorFrame(System.nanoTime()) - } - } - - private val frameCallback = object : Choreographer.FrameCallback { - override fun doFrame(frameTimeNanos: Long) { - if (!running || !polling) return - if (feed.poll(System.nanoTime())) view?.onFrames() - Choreographer.getInstance().postFrameCallback(this) - } - } - - private val enabled: Boolean - get() = SessionPrefs.hudEnabled(context) && - !File(Environment.getExternalStorageDirectory(), "Download/droiddeck-no-hud").exists() - - /** Adds the HUD to [root] at [index] (above the game surface, under the session overlay). */ - fun attach(root: FrameLayout, index: Int) { - if (view != null) return - val hud = FusionHudView(root.context) - hud.setFrameStats(feed.stats) - hud.setMangoReadings(readings) - hud.setGpuModel(cleanGpuName(GpuInfo.detect().displayName(context))) - hud.onRefresh = Runnable { refreshLabels(hud) } - hud.setOnMovedListener { x, y -> - wantX = x; wantY = y - keepOnScreen(hud) - wantX = hud.x; wantY = hud.y - SessionPrefs.setFusionHudPosition(context, hud.x, hud.y) - } - hud.setOnSizeCycledListener { size -> FusionHudConfig.set(context, "hudSize", size); onConfigChanged?.invoke() } - hud.setOnLockChangedListener { locked -> - FusionHudConfig.set(context, "hudLocked", if (locked) "1" else "0") - onConfigChanged?.invoke() - } - hud.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> if (!hud.isDragging) keepOnScreen(hud) } - hud.passesTouchAt = { x, y -> passesTouchAt?.invoke(x, y) == true } - hud.visibility = View.GONE - val margin = (16 * root.resources.displayMetrics.density).roundToInt() - root.addView(hud, index, FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { - leftMargin = margin - topMargin = margin - }) - SessionPrefs.fusionHudPosition(context)?.let { (x, y) -> wantX = x; wantY = y; hud.post { keepOnScreen(hud) } } - view = hud - parent = root - applyConfig() - } - - fun applyConfig() { - view?.applyConfig(FusionHudConfig.encode(FusionHudConfig.load(context))) - } - - fun refresh() { - applyConfig() - if (!enabled) stop() else if (!running) start() - } - - fun start() { - if (running || !enabled || view == null) return - running = true - WaylandCompositor.setGameListener(listener) - applyShown() - } - - fun stop() { - running = false - showing = false - polling = false - Choreographer.getInstance().removeFrameCallback(frameCallback) - WaylandCompositor.clearGameListener(listener) - feed.close() - view?.visibility = View.GONE - } - - /** Picture-in-picture and similar: keep running, draw nothing. */ - fun setHidden(hide: Boolean) { - hidden = hide - applyShown() - } - - /** The session screen is stopped (another app in front): draw nothing and stop reading sensors. */ - fun setBackgrounded(stopped: Boolean) { - backgrounded = stopped - applyShown() - } - - private fun applyShown() { - if (!running) return - val show = !hidden && !backgrounded - view?.visibility = if (show) View.VISIBLE else View.GONE - showing = show - // Frames are read once per display frame only while the HUD is drawn. - if (show != polling) { - polling = show - if (show) Choreographer.getInstance().postFrameCallback(frameCallback) - else Choreographer.getInstance().removeFrameCallback(frameCallback) - } - } - - /** A sensor report (FusionHUD's diagnostics) in Downloads/DroidDeck; null when it can't be written. */ - fun exportDiagnostics(): File? = runCatching { - val dir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "DroidDeck") - dir.mkdirs() - val stamp = java.text.SimpleDateFormat("yyyyMMdd-HHmmss", java.util.Locale.US).format(java.util.Date()) - val file = File(dir, "HUD-diagnostics-$stamp.txt") - // Its own reader: the HUD's CPU load is the change since its previous sample, which an export must - // not move. Two samples half a second apart, MangoHud's sampling period. - val metrics = HudMetrics(context) - metrics.setMangoReadings(MangoReadings(File(context.filesDir, "session"), LinuxRuntime.rootDir(context))) - metrics.snapshot() - Thread.sleep(500) - val mango = metrics.snapshot() - file.writeText(metrics.also { it.setMangoReadings(null) }.buildDiagnosticsReport(context) + "\n== As the HUD shows them (MangoHud's sources) ==\n" + - "CPU ${mango.cpuPercent}% ${mango.cpuTempC}°C, GPU ${mango.gpuPercent}% ${mango.gpuClockMhz}MHz ${mango.gpuTempC}°C, " + - "RAM ${mango.ramUsedText()}/${mango.ramTotalText()}, VRAM ${mango.vramText()}, battery ${mango.battery.percent}% " + - "${mango.battery.watts}W charging=${mango.battery.charging}\n" + - "CPU temperature zones: ${LinuxRuntime.cpuTempZones().joinToString { it.name }}\n" + - "Frames: ${if (feed.engine.isNotEmpty() || feed.pid > 0) "gamescope (pid ${feed.pid}, ${feed.engine})" else "compositor"}, " + - "fps ${feed.stats.fps}\n") - file - }.getOrNull() - - private fun refreshLabels(hud: FusionHudView) { - if (feed.engine.isNotBlank() && !feed.steamFocused) engine = feed.engine - hud.setEngineLabel(engine) - if (gpuName.isNotBlank()) hud.setGpuModel(gpuName) - hud.setResolution(if (feed.outputWidth > 0 && feed.outputHeight > 0) buildString { - append(feed.outputWidth).append('x').append(feed.outputHeight) - if (feed.refreshMilliHz > 0) append(" @ ").append((feed.refreshMilliHz + 499) / 1000).append("Hz") - } else "") - val pid = feed.pid - if (pid > 0 && pid != protonPid) { - protonPid = pid - proton = protonName(pid) ?: proton - } - hud.setWineVersion(proton) - hud.setPresentedFps(presentedFps()) - } - - private fun presentedFps(): Float { - if (FrameGen.mode(context).engine == FrameGen.ENGINE_OFF) return 0f - val stats = runCatching { WaylandCompositor.nativeFrameGenStats() }.getOrNull() ?: return 0f - return if (stats.size > 3 && stats[3] > 1f) stats[3] else 0f - } - - // The HUD is clamped from where the user left it (wantX/wantY, set on a drop or restore), not from where - // it is drawn: a window that shrinks and grows back (picture-in-picture, a fold) must not leave it in the - // corner the small window pushed it to. - private fun keepOnScreen(v: View) { - val p = v.parent as? View ?: return - if (p.width <= 0 || p.height <= 0 || v.width <= 0 || v.height <= 0) return - if (wantX.isNaN()) { wantX = v.x; wantY = v.y } - val maxX = (p.width - v.width).toFloat().coerceAtLeast(0f) - val maxY = (p.height - v.height).toFloat().coerceAtLeast(0f) - val x = wantX.coerceIn(0f, maxX) - val y = wantY.coerceIn(0f, maxY) - if (v.x != x) v.x = x - if (v.y != y) v.y = y - } - - companion object { - /** True while the HUD is on screen; DroidDeck keeps sampling VRAM for it (GpuMemComponent). */ - @Volatile @JvmStatic var showing = false - private set - - /** "Adreno (TM) 750" as the driver names it, "Adreno 750" as DroidDeck does elsewhere. */ - internal fun cleanGpuName(name: String): String = name.replace("(TM)", "").replace(Regex("\\s+"), " ").trim() - - /** The Proton build of a game process: the first STEAM_COMPAT_TOOL_PATHS entry's folder. */ - internal fun protonName(pid: Int): String? = runCatching { - val environ = File("/proc/$pid/environ").readBytes().toString(Charsets.UTF_8).split('\u0000') - val paths = environ.firstOrNull { it.startsWith("STEAM_COMPAT_TOOL_PATHS=") }?.substringAfter('=') ?: return null - paths.split(':').firstOrNull { it.isNotBlank() }?.trimEnd('/')?.substringAfterLast('/') - }.getOrNull()?.takeIf { it.isNotBlank() } - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudModels.kt b/app/src/main/java/com/droiddeck/launcher/hud/FusionHudModels.kt deleted file mode 100644 index ea4c336afe..0000000000 --- a/app/src/main/java/com/droiddeck/launcher/hud/FusionHudModels.kt +++ /dev/null @@ -1,86 +0,0 @@ -/* - * FusionHUD — a lightweight in-game performance HUD for Android / Winlator overlays. - * Copyright (C) The412Banner - * - * Licensed under the GNU General Public License v3.0 (see LICENSE), with an - * ADDITIONAL attribution requirement under GPL-3.0 §7(b) (see ATTRIBUTION.md): - * any use, fork, or distribution must preserve credit to "The412Banner" and a - * link to https://github.com/The412Banner/FusionHUD in the project documentation - * AND in the in-app credits/about screen. - * - * Ported to DroidDeck from FusionHUD (Bannerlator's HUD); DroidDeck changes are marked in the code. - */ - -package com.droiddeck.launcher.hud - -/** - * Size modes for the Fusion HUD (the 4th selectable in-game overlay style). One shared color-coded - * visual language, four amounts of detail — see the approved mockup. The config value is the lower-case - * token stored under the `hudSize` key; the label is the user-facing string. - */ -enum class FusionSize(val token: String, val label: String) { - FULL("full", "Full"), - TILES("tiles", "Tiles"), - PILL("pill", "Pill"), - MINIMAL("minimal", "Minimal"), - MEGA("mega", "Mega"); - - /** Next size in the tap-cycle: Full → Tiles → Pill → Minimal → Mega → Full. */ - fun next(): FusionSize { - val all = values() - return all[(ordinal + 1) % all.size] - } - - /** - * The metric toggle chips this size actually renders — the SINGLE source of truth queried by BOTH - * config surfaces ({@code FpsCounterConfigDialog} + in-game {@code XServerDrawer} HudContent) so the - * chip list can't drift from what the view draws. Chip ids are the chip LABELS used in the UI. - * (Hiding a chip is purely UI; buildConfig() still emits every key — strip-invariant.) - */ - fun supportedChips(): Set = when (this) { - MINIMAL -> MINIMAL_CHIPS - PILL -> PILL_CHIPS - FULL, TILES -> STANDARD_CHIPS - MEGA -> MEGA_CHIPS - } - - companion object { - fun from(token: String?): FusionSize = - values().firstOrNull { it.token.equals(token, ignoreCase = true) } ?: FULL - - // Chip-label ids (must match the labels the config UIs build). "Clock" is a small subtle - // corner readout available in EVERY size, so it's in all sets. - // The API/engine label ("Engine" chip) shows on the FPS row in EVERY size, so it's in all sets. - // "Wrapper" and "DX ver" are Mega-only: the wrapper appears solely below Mega's frametime graph, - // and "DX ver" gates the DX-version suffix on Mega's FPS-row engine label. - val MINIMAL_CHIPS = setOf("FPS", "FPS graph", "0.01% low", "FPS .1", "Engine", "Clock") - val PILL_CHIPS = setOf("FPS", "FPS graph", "GPU", "CPU", "VRAM", "RAM", "Battery", "GPU model", "FPS .1", "Engine", "Clock") - val STANDARD_CHIPS = setOf( - "FPS", "FPS graph", "GPU", "GPU temp", "CPU", "VRAM", "RAM", "Power", "Temp", - "Battery", "GPU model", "Engine", "0.01% low", "FPS .1", "Clock", - ) - val MEGA_ONLY = setOf( - "Per-core", "Swap", "Network", "Resolution", "Proton", "Wrapper", "DX ver", "Session", - ) - val MEGA_CHIPS = STANDARD_CHIPS + MEGA_ONLY - } -} - -/** - * The Wayland HDR state the Fusion HUD shows on its own line, directly under the latency · display-server - * line (the host sets it with [FusionHudView.setHdrState]). [NONE] = no line at all: every session whose - * HDR gate is closed (X11, SDR screens, HDR off) keeps the HUD exactly as it was. - */ -object FusionHdr { - const val NONE = 0 - const val ON = 1 // HDR frames on screen with HDR headroom - const val NO_HEADROOM = 2 // HDR frames on screen, but the display gives them no headroom (5 s+) - const val OFF = 3 // the drawer's HDR output switch is off (tone-mapped to SDR) - const val READY = 4 // HDR open for the session, no HDR frames on screen right now - const val TONEMAPPED = 5 // HDR output on, but the frames are shown tone-mapped (frame generation - // on a screen that offers no HDR10 swapchain) - const val NOT_ON_THIS_SCREEN = 6 // HDR open for the session, but the screen the game is on NOW - // reports no HDR10 (the TV was unplugged mid-game). The offer to the - // game cannot be withdrawn once made, so the gate stays open for the - // session — but "ready" would be a lie on a panel that cannot show it. -} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt index fcca0aaa2e..98dc35074f 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/GameFrames.kt @@ -3,13 +3,6 @@ package com.droiddeck.launcher.hud import java.io.File import kotlin.math.roundToInt -/** - * Frame statistics by MangoHud's rules, so the HUD and Steam's performance overlay agree: MangoHud - * overlay.cpp update_hud_info_with_frametime and hud_elements.cpp fps() / frame_timing(). The FPS is the - * frames counted over a sampling period of at least 500 ms, the frame time next to it is 1000 / FPS, and - * the graph holds the last 200 frame times (zeros until filled) on a fixed 0-50 ms scale, min and max - * taken over those 200. Average and lows are FusionHUD's own readouts. - */ internal class FrameStats { private val graph = FloatArray(GRAPH_FRAMES) private var graphHead = 0 @@ -26,14 +19,16 @@ internal class FrameStats { private var sessionStartNs = 0L private var sessionFrames = 0L + private val slowTimes = LongArray(SLOW_FRAMES) + private var slowHead = 0 + private var slowSize = 0 + @Volatile var fps = 0f private set - /** Completed sampling periods; MangoHud redraws its readouts when one completes. */ @Volatile var fpsUpdates = 0L private set - /** Frames added so far; the HUD redraws its graph when this moves. */ @Volatile var count = 0L private set @@ -60,6 +55,11 @@ internal class FrameStats { if (lowsSize < LOWS_FRAMES) lowsSize++ if (sessionStartNs == 0L) sessionStartNs = timeNs - frametimeNs sessionFrames++ + if (frametimeNs > SLOW_NS) { + slowTimes[slowHead] = timeNs + slowHead = (slowHead + 1) % SLOW_FRAMES + if (slowSize < SLOW_FRAMES) slowSize++ + } } count++ } @@ -77,14 +77,14 @@ internal class FrameStats { cachedLowsNs = 0L sessionStartNs = 0L sessionFrames = 0L + slowHead = 0 + slowSize = 0 fps = 0f count++ } - /** MangoHud's frame time readout: 1000 / FPS. */ fun frametimeMs(): Float = 1000f / maxOf(fps, 1f) - /** The graph, oldest first, into [out] (GRAPH_FRAMES long). */ @Synchronized fun graph(out: FloatArray) { for (i in 0 until GRAPH_FRAMES) out[i] = graph[(graphHead + i) % GRAPH_FRAMES] @@ -96,7 +96,6 @@ internal class FrameStats { @Synchronized fun graphMaxMs(): Float = graph.max() - /** Average over the frames this session, from the first frame to [nowNs]'s last frame. */ @Synchronized fun averageFps(): Float { if (sessionFrames < 2 || lastPresentNs <= sessionStartNs) return 0f @@ -106,13 +105,22 @@ internal class FrameStats { @Synchronized fun sessionSeconds(nowNs: Long): Float = if (sessionStartNs == 0L) 0f else (nowNs - sessionStartNs) / 1e9f + @Synchronized + fun slowFrames(nowNs: Long, windowNs: Long): Int { + var n = 0 + for (i in 0 until slowSize) { + if (nowNs - slowTimes[(slowHead - 1 - i + SLOW_FRAMES) % SLOW_FRAMES] > windowNs) break + n++ + } + return n + } + class Lows(val low1Fps: Float, val low01Fps: Float, val low001Fps: Float) { companion object { val EMPTY = Lows(0f, 0f, 0f) } } - /** FPS at the 99th, 99.9th and 99.99th percentile frame time of the last LOWS_FRAMES frames. */ fun lows(nowNs: Long): Lows { val copy: LongArray synchronized(this) { @@ -141,15 +149,12 @@ internal class FrameStats { const val FPS_PERIOD_NS = 500_000_000L const val LOWS_FRAMES = 8192 private const val PAUSE_NS = 1_000_000_000L + const val SLOW_NS = 33_333_334L + private const val SLOW_FRAMES = 2048 private const val LOWS_RECOMPUTE_NS = 250_000_000L } } -/** - * Feeds [stats] with the frame times gamescope shares (the ones MangoHud shows). Sessions without the - * shared file, or where gamescope stopped sending, fall back to the frames DroidDeck's compositor shows, - * which stop at the screen's refresh rate. - */ internal class GameFrameFeed(private val file: File, val stats: FrameStats = FrameStats()) { private var handle = 0L private var nextOpenNs = 0L @@ -160,7 +165,7 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra private val info = IntArray(5) @Volatile private var fromGamescope = false private var lastCompositorNs = 0L - @Volatile private var compositorFrames = 0L // written by the compositor thread only + @Volatile private var compositorFrames = 0L private var seenCompositorFrames = 0L @Volatile var engine = "" @@ -176,7 +181,8 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra @Volatile var refreshMilliHz = 0 private set - /** Main thread, once per display frame. True when new frames arrived. */ + val live: Boolean get() = fromGamescope + fun poll(nowNs: Long): Boolean { val compositorAdded = compositorFrames != seenCompositorFrames seenCompositorFrames = compositorFrames @@ -185,7 +191,6 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra nextOpenNs = nowNs + REOPEN_NS handle = runCatching { HudFrames.nativeOpen(file.path) }.getOrDefault(0L) if (handle == 0L) return compositorAdded - // Frames already in the file were written before this reader started. HudFrames.nativePoll(handle, frametimes, times) } val n = HudFrames.nativePoll(handle, frametimes, times) @@ -199,7 +204,6 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra } else if (lastRingFrameNs != 0L && nowNs - lastRingFrameNs > LIVE_NS) { fromGamescope = false } - // A new session writes the file again from the start; reopen when gamescope has gone quiet. if (n <= 0 && nowNs - maxOf(lastRingFrameNs, nextOpenNs - REOPEN_NS) > STALE_NS) close() if (nowNs - lastInfoNs >= INFO_NS) { lastInfoNs = nowNs @@ -208,7 +212,6 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra return n > 0 || compositorAdded } - /** Compositor thread: one frame shown on the panel. */ fun onCompositorFrame(nowNs: Long) { if (fromGamescope) { lastCompositorNs = 0L @@ -247,8 +250,6 @@ internal class GameFrameFeed(private val file: File, val stats: FrameStats = Fra private const val STALE_NS = 5_000_000_000L private const val INFO_NS = 500_000_000L - /** DroidDeck's mangoapp's names for gamescope's engine field (Valve's 20260902.1 build, app/main.cpp - * engine_type_from_str and overlay.h engines); gamescope sends "gamescope" when it knows none. */ fun engineLabel(name: String): String = when (name) { "DXVK" -> "DXVK" "vkd3d" -> "VKD3D" diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudFrames.kt b/app/src/main/java/com/droiddeck/launcher/hud/HudFrames.kt index 63a9a7945d..ca13e7a3eb 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudFrames.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudFrames.kt @@ -1,12 +1,10 @@ package com.droiddeck.launcher.hud -/** Reader for the frame-times file gamescope patch 0125 writes (hudframes.c). */ internal object HudFrames { init { System.loadLibrary("droiddeckwayland") } - /** Under the Linux root: the session exports /run/droiddeck-hud/frames to gamescope. */ const val PATH = "run/droiddeck-hud/frames" const val CAPACITY = 1024 diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java index 3266e85fee..98c34df7ce 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java @@ -8,7 +8,7 @@ * link to https://github.com/The412Banner/FusionHUD in the project documentation * AND in the in-app credits/about screen. * - * Ported to DroidDeck from FusionHUD (Bannerlator's HUD); DroidDeck changes are marked in the code. + * Ported to DroidDeck from FusionHUD (Bannerlator's HUD) and modified for DroidDeck. */ package com.droiddeck.launcher.hud; @@ -22,45 +22,24 @@ import android.graphics.RectF; import android.os.SystemClock; import android.view.GestureDetector; import android.view.MotionEvent; +import android.view.ScaleGestureDetector; import android.view.View; import java.util.function.BiConsumer; import java.util.function.Consumer; -/** - * Shared touch + lock behaviour for every in-game performance HUD (classic FrameRating(+Horizontal), - * GameHub PerfHudView, GameNative PerformanceHudView, and the Fusion HUD). One place so the four - * overlays can't drift: - * - *
    - *
  • tap → {@link Callbacks#onTap()} (orientation-toggle for the first three; size-cycle for - * Fusion) — a no-op that only re-flashes the lock badge while locked.
  • - *
  • drag → moves the host view and, on release, {@link Callbacks#onMoved} to persist the - * position — disabled (frozen) while locked.
  • - *
  • long-press → toggles {@code hudLocked}, persisted via {@link Callbacks#onLockChanged} - * and kept in sync with the "Lock in place" menu chip. Works locked or unlocked (so a long-press - * always unlocks); a locked {@code FusionHudView} passes touches on only over on-screen controls.
  • - *
- * - *

On every lock/unlock (and on a blocked gesture while locked) a small padlock badge fades in → - * holds → fades out in a corner of the panel. The fade is driven by a self-reposting Runnable that - * invalidates only while visible — nothing runs on the present path, nothing animates at rest. - * - *

All methods are Main-thread only (touch + draw), matching the epoll-thread rule: the views feed - * this from {@code onTouchEvent}/{@code dispatchDraw}, never from a present tick. - */ public class HudLockController { public interface Callbacks { - /** Unlocked single tap: orientation-toggle (classic/gamehub/gamenative) or size-cycle (fusion). */ void onTap(); - /** Drag released (unlocked): persist the new (x, y). */ void onMoved(float x, float y); - /** Lock toggled by long-press: persist {@code hudLocked} + sync the menu chip. */ + default void onDragged(float rawX, float rawY) {} + default void onFlung(float velocityX, float velocityY) {} void onLockChanged(boolean locked); + default void onPinch(float factor) {} + default void onPinchEnd() {} } - // Fade timing (ms): in → hold → out. Lock/unlock hold ~1.5 s; a blocked-gesture re-flash is shorter. private static final long FADE_IN_MS = 160; private static final long HOLD_TOGGLE_MS = 1500; private static final long HOLD_REFLASH_MS = 750; @@ -70,14 +49,14 @@ public class HudLockController { private final View view; private final Callbacks cb; private final GestureDetector detector; + private final ScaleGestureDetector scaleDetector; private boolean locked = false; - // Drag state private float downRawX, downRawY, startX, startY; private boolean dragging = false; + private boolean pinched = false; - // Fade state private long fadeStart = 0; private long holdMs = HOLD_TOGGLE_MS; private boolean fadeShowLocked = false; @@ -90,21 +69,22 @@ public class HudLockController { this.cb = cb; this.detector = new GestureDetector(context, new Listener()); this.detector.setIsLongpressEnabled(true); + this.scaleDetector = new ScaleGestureDetector(context, new PinchListener()); + this.scaleDetector.setQuickScaleEnabled(false); iconFill.setStyle(Paint.Style.FILL); iconStroke.setStyle(Paint.Style.STROKE); iconStroke.setStrokeCap(Paint.Cap.ROUND); iconStroke.setStrokeJoin(Paint.Join.ROUND); } - /** Set lock state from config (applyConfig) WITHOUT firing the persist callback. */ public void setLocked(boolean locked) { this.locked = locked; } public boolean isLocked() { return locked; } public boolean isDragging() { return dragging; } - /** Feed from the host view's onTouchEvent. Always consumes (mirrors the legacy manual handlers). */ public boolean onTouchEvent(MotionEvent event) { + scaleDetector.onTouchEvent(event); detector.onTouchEvent(event); int action = event.getActionMasked(); if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) { @@ -122,12 +102,12 @@ public class HudLockController { startX = view.getX(); startY = view.getY(); dragging = false; + pinched = false; return true; } @Override public void onLongPress(MotionEvent e) { - // Long-press always toggles — this is the only gesture that still works while locked. locked = !locked; cb.onLockChanged(locked); flash(locked, HOLD_TOGGLE_MS); @@ -135,29 +115,58 @@ public class HudLockController { @Override public boolean onSingleTapUp(MotionEvent e) { + if (pinched) return true; if (locked) { - flash(true, HOLD_REFLASH_MS); // intentionally locked — remind the user + flash(true, HOLD_REFLASH_MS); } else { cb.onTap(); } return true; } + @Override + public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) { + if (dragging && !locked && !pinched) cb.onFlung(velocityX, velocityY); + return true; + } + @Override public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { + if (pinched) return true; if (locked) { if (!dragging) flash(true, HOLD_REFLASH_MS); - dragging = true; // mark so the blocked drag doesn't fall through to a tap + dragging = true; return true; } view.setX(startX + (e2.getRawX() - downRawX)); view.setY(startY + (e2.getRawY() - downRawY)); dragging = true; + cb.onDragged(e2.getRawX(), e2.getRawY()); return true; } } - // ---- Fade badge ------------------------------------------------------- + private final class PinchListener extends ScaleGestureDetector.SimpleOnScaleGestureListener { + @Override + public boolean onScaleBegin(ScaleGestureDetector d) { + if (locked) return false; + pinched = true; + dragging = false; + return true; + } + + @Override + public boolean onScale(ScaleGestureDetector d) { + cb.onPinch(d.getScaleFactor()); + return true; + } + + @Override + public void onScaleEnd(ScaleGestureDetector d) { + cb.onPinchEnd(); + } + } + private void flash(boolean showLocked, long hold) { fadeShowLocked = showLocked; holdMs = hold; @@ -190,14 +199,6 @@ public class HudLockController { return Color.argb(Math.round(255 * a), Color.red(color), Color.green(color), Color.blue(color)); } - /** - * Draw the padlock badge in the top-right of the panel if a fade is in progress. Call from the - * host's onDraw (plain View) or dispatchDraw (ViewGroup), after the content. - * - *

No background box: the glyph is drawn twice — a slightly expanded, thicker semi-transparent - * black "halo" pass for legibility on any game frame, then the white glyph on top — so it reads as - * a floating icon, not an opaque tile. - */ public void drawBadge(Canvas canvas) { float a = currentAlpha(); if (a <= 0f) return; @@ -216,14 +217,12 @@ public class HudLockController { float r = size * 0.2f; float shackleTop = top + size * 0.08f; - // Pass 1: dark halo (expanded body, thicker shackle) for contrast; Pass 2: white glyph. drawLock(canvas, cx, bodyTop, bodyLeft, bodyRight, bottom, r, shackleTop, d, Color.argb(Math.round(150 * a), 0, 0, 0), 3.0f * d, 0.9f * d, false); drawLock(canvas, cx, bodyTop, bodyLeft, bodyRight, bottom, r, shackleTop, d, withAlpha(0xFFFFFFFF, a), 1.7f * d, 0f, true); } - /** One padlock pass. {@code halo} inflates the body/shackle in dark; the white pass punches the keyhole. */ private void drawLock(Canvas canvas, float cx, float bodyTop, float bodyLeft, float bodyRight, float bottom, float r, float shackleTop, float d, int color, float strokeW, float expand, boolean punchKeyhole) { @@ -231,7 +230,6 @@ public class HudLockController { iconStroke.setColor(color); iconStroke.setStrokeWidth(strokeW); - // Body canvas.drawRoundRect(bodyLeft - expand, bodyTop - expand, bodyRight + expand, bottom + expand, 2.4f * d, 2.4f * d, iconFill); if (punchKeyhole) { @@ -243,19 +241,16 @@ public class HudLockController { RectF arc = new RectF(cx - r, shackleTop, cx + r, shackleTop + 2f * r); if (fadeShowLocked) { - // Closed: both legs run straight down into the body. Path p = new Path(); p.addArc(arc, 180f, 180f); p.moveTo(cx - r, shackleTop + r); p.lineTo(cx - r, bodyTop); p.moveTo(cx + r, shackleTop + r); p.lineTo(cx + r, bodyTop); canvas.drawPath(p, iconStroke); } else { - // Open, clearly to the LEFT: the RIGHT leg stays seated in the body; the arc + LEFT leg - // hinge up-and-left off the right attachment so the left leg lifts well clear of the body. - canvas.drawLine(cx + r, shackleTop + r, cx + r, bodyTop, iconStroke); // fixed right leg + canvas.drawLine(cx + r, shackleTop + r, cx + r, bodyTop, iconStroke); Path p = new Path(); p.addArc(arc, 180f, 180f); - p.moveTo(cx - r, shackleTop + r); p.lineTo(cx - r, bodyTop); // full-length left leg + p.moveTo(cx - r, shackleTop + r); p.lineTo(cx - r, bodyTop); canvas.save(); canvas.rotate(-42f, cx + r, shackleTop + r); canvas.drawPath(p, iconStroke); diff --git a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java index 88cbc87074..51a4e42608 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudMetrics.java @@ -8,7 +8,8 @@ * link to https://github.com/The412Banner/FusionHUD in the project documentation * AND in the in-app credits/about screen. * - * Ported to DroidDeck from FusionHUD (Bannerlator's HUD); DroidDeck changes are marked in the code. + * Ported to DroidDeck from FusionHUD (Bannerlator's HUD) and modified for DroidDeck. + * Metric readers from @xXJSONDeruloXx's work. */ package com.droiddeck.launcher.hud; @@ -32,50 +33,17 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; -/** - * Shared live-metric collector for every performance HUD overlay. This is the single, device-complete - * implementation of the sysfs / Android readers — no overlay should re-read sysfs itself, so the GPU - * discovery / thermal / battery logic never diverges. - * - *

Ported and hardened from GameNative's {@code PerformanceHudView} readers, which are far more - * device-complete than the two-fixed-path versions previously inlined in the classic overlays: - *

    - *
  • GPU load — ~10 static candidates plus a dynamic {@code /sys/class/devfreq} + - * {@code /sys/devices/virtual/devfreq} walk for gpu/mali/g3d/kgsl nodes; handles gpubusy - * (busy/total), Mali gpuinfo (delta-ms/wall-ms, needs state between calls) and generic percent - * nodes. Discovery cached.
  • - *
  • CPU usage — {@code /proc/stat} aggregate delta with a scaling-frequency fallback for devices - * where {@code /proc/stat} is restricted.
  • - *
  • Thermal — prioritized CPU zone discovery (cpu-silicon > cpu-0 > cpu > soc > - * s5p-tmu > cputop > tsens > cluster > big/little) and a separate prioritized GPU zone - * discovery plus kgsl/mali direct paths. milli-°C normalization + 1..150 sanity clamp.
  • - *
  • Battery — % capacity, power W, runtime-left estimate (charge_counter / current_now, smoothed), - * battery temperature, plus the dual-battery current-sum for the classic overlays.
  • - *
- * - *

Every getter is null / absent-safe: nullable getters return {@code null} when a metric cannot be - * read (the overlay hides that row, matching GameNative behavior); the legacy non-null getters return - * 0 in that case. Not thread-safe; call from a single refresh thread per instance. - */ public class HudMetrics { private final Context context; public HudMetrics(Context context) { this.context = context; } - // DroidDeck: the readings Steam's performance overlay shows come from MangoReadings, so both agree. private MangoReadings mango; public void setMangoReadings(MangoReadings readings) { mango = readings; } - // ======================================================================= - // CPU usage - // ======================================================================= private Long lastCpuTotal = null; private Long lastCpuIdle = null; - /** - * Overall device CPU usage 0..100 computed from the /proc/stat delta since the last call, with a - * scaling-frequency fallback. Returns null only when neither source is readable. - */ public Integer getCpuUsagePercent() { String line = readFirstLine("/proc/stat"); if (line != null) { @@ -104,8 +72,6 @@ public class HudMetrics { return clampPercent((int) usage); } } - // First sample seeds the delta — fall through to the frequency estimate so the - // very first read still returns something. } } } @@ -127,20 +93,10 @@ public class HudMetrics { return clampPercent((int) ((currentTotal * 100L) / maxTotal)); } - /** Legacy non-null accessor (0 when unavailable). Kept for {@code PerfHudView}. */ - public float getCPUUsage() { - Integer p = getCpuUsagePercent(); - return p == null ? 0f : p; - } - - // ======================================================================= - // GPU load - // ======================================================================= private List gpuUsagePathsCache = null; private Long lastMaliGpuInfoMs = null; private long lastMaliGpuInfoWallMs = 0L; - /** GPU utilisation 0..100, or null when no readable source is found on this device. */ public Integer getGpuUsagePercent() { for (String path : discoverGpuUsagePaths()) { Integer p = readGpuUsageSample(path); @@ -149,12 +105,6 @@ public class HudMetrics { return null; } - /** Legacy non-null accessor (0 when unavailable). Kept for {@code PerfHudView}. */ - public int getGPULoad() { - Integer p = getGpuUsagePercent(); - return p == null ? 0 : p; - } - private List discoverGpuUsagePaths() { if (gpuUsagePathsCache != null) return gpuUsagePathsCache; LinkedHashSet candidates = new LinkedHashSet<>(); @@ -163,8 +113,6 @@ public class HudMetrics { if (new File(p).canRead()) candidates.add(p); } - // Vendor platform nodes with hashed/addressed names we can't hard-code (e.g. - // /sys/devices/platform/13000000.mali/utilisation, .../gpusysfs/gpu_busy, panfrost, sgpu). File platformDir = new File("/sys/devices/platform"); File[] platformNodes = platformDir.listFiles(File::isDirectory); if (platformNodes != null) { @@ -211,9 +159,6 @@ public class HudMetrics { return gpuUsagePathsCache; } - // Ordered, world-readable-when-present GPU utilisation nodes across the vendors we've seen: - // Adreno KGSL, Mali (misc + Exynos vendor), PowerVR, and amdgpu-style sysfs (Samsung Xclipse / - // "sgpu", AMD-on-Exynos). readGpuUsageSample() knows how to parse each filename shape. private static final String[] GPU_USAGE_STATIC_PATHS = { "/sys/class/kgsl/kgsl-3d0/gpubusy", "/sys/class/kgsl/kgsl-3d0/gpu_busy_percentage", @@ -223,23 +168,19 @@ public class HudMetrics { "/sys/class/misc/mali0/device/gpuinfo", "/sys/devices/platform/mali/utilization", "/sys/kernel/gpu/gpu_busy", - "/sys/devices/platform/gpusysfs/gpu_busy", // Exynos Mali vendor node + "/sys/devices/platform/gpusysfs/gpu_busy", "/sys/class/misc/pvrsrvkm/device/utilisation", - "/sys/class/pvr/utilisation", // PowerVR (Rogue) sysfs + "/sys/class/pvr/utilisation", "/sys/class/pvr/gpu_utilisation", - "/sys/class/drm/card0/device/gpu_busy_percent", // amdgpu / Xclipse (sgpu), 0..100 + "/sys/class/drm/card0/device/gpu_busy_percent", "/sys/class/devfreq/gpu/load", - // ── Additive cross-vendor fallbacks (appended LAST: tried only after every path above - // misses, so a device that already resolves — e.g. Adreno kgsl — never reaches these). ── - "/sys/kernel/ged/hal/gpu_utilization", // MediaTek GED: " " → loading% - "/sys/module/ged/parameters/gpu_loading", // MediaTek GED module param, plain percent + "/sys/kernel/ged/hal/gpu_utilization", + "/sys/module/ged/parameters/gpu_loading", }; - // Percent-bearing filenames scanned under each devfreq / platform GPU node. private static final String[] GPU_USAGE_FILES = { "gpu_busy_percentage", "gpu_busy_percent", "gpu_load", "utilisation", "utilization", "load", "gpu_busy", "gpuinfo", }; - // Substrings that mark a devfreq / platform node as the GPU, across vendors. private static final String[] GPU_NODE_TOKENS = { "gpu", "mali", "g3d", "kgsl", "panfrost", "pvr", "powervr", "xclipse", "sgpu", }; @@ -258,8 +199,6 @@ public class HudMetrics { return clampPercent((int) ((busy * 100L) / total)); } case "gpuinfo": { - // Mali multi-line node: the GPU busy time (ms) is the last token of line 1. Utilisation - // is the delta over wall-clock delta between two reads, so it needs state. String line = readNthLine(path, 1); if (line == null) return null; String[] toks = line.trim().split("\\s+"); @@ -294,46 +233,12 @@ public class HudMetrics { return null; } - // ======================================================================= - // RAM - // ======================================================================= - public float getRAMPercent() { - ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); - ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo(); - am.getMemoryInfo(mi); - if (mi.totalMem <= 0) return 0; - return (mi.totalMem - mi.availMem) * 100f / mi.totalMem; - } + private List thermalZonesCache = null; - /** Used RAM as "x.xGB" (or "yMB" below 1 GB), matching GameNative's HUD text. */ - public String getUsedRamText() { - ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); - if (am == null) return "—"; - ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo(); - am.getMemoryInfo(mi); - long usedBytes = Math.max(0L, mi.totalMem - mi.availMem); - double usedGb = usedBytes / (1024.0 * 1024.0 * 1024.0); - if (usedGb >= 1.0) return String.format(Locale.US, "%.1fGB", usedGb); - return (usedBytes / (1024L * 1024L)) + "MB"; - } - - // ======================================================================= - // Temperature - // ======================================================================= - private List thermalZonesCache = null; // each entry: {type, tempPath} - - /** Legacy non-null CPU-temperature accessor in °C (0 when unavailable). Kept for {@code PerfHudView}. */ - public float getTemperature() { - Integer t = getCpuTempC(); - return t == null ? 0f : t; - } - - /** Hottest representative CPU temperature in °C, or null when no CPU zone is readable. */ public Integer getCpuTempC() { return readTemperatureC(discoverPrioritizedCpuTempPaths()); } - /** GPU temperature in °C, or null when no GPU sensor is readable. */ public Integer getGpuTempC() { ArrayList paths = new ArrayList<>(); paths.add("/sys/class/kgsl/kgsl-3d0/temp"); @@ -346,16 +251,16 @@ public class HudMetrics { private List discoverPrioritizedCpuTempPaths() { return prioritizePaths(type -> { - if (type.contains("gpu")) return null; // never mistake a GPU zone for CPU + if (type.contains("gpu")) return null; if (type.contains("cpu-silicon")) return 0; if (type.contains("cpu-0")) return 1; - if (type.contains("cpuss")) return 2; // Qualcomm cpuss composite - if (type.contains("mtktscpu")) return 2; // MediaTek CPU thermal - if (type.contains("cpu")) return 2; // cpu, cpu-*-usr, cpu_thermal, cpu_center - if (type.contains("s5p-tmu")) return 3; // Exynos TMU + if (type.contains("cpuss")) return 2; + if (type.contains("mtktscpu")) return 2; + if (type.contains("cpu")) return 2; + if (type.contains("s5p-tmu")) return 3; if (type.contains("soc")) return 4; if (type.contains("cputop")) return 5; - if (type.contains("tsens")) return 6; // Qualcomm tsens aggregate + if (type.contains("tsens")) return 6; if (type.contains("cluster")) return 7; if (type.contains("big") || type.contains("little")) return 8; return null; @@ -365,11 +270,11 @@ public class HudMetrics { private List discoverPrioritizedGpuTempPaths() { return prioritizePaths(type -> { if (type.contains("gpu-silicon")) return 0; - if (type.contains("gpuss")) return 1; // Qualcomm gpuss - if (type.contains("mtktsgpu")) return 1; // MediaTek GPU thermal + if (type.contains("gpuss")) return 1; + if (type.contains("mtktsgpu")) return 1; if (type.contains("gpu-virt")) return 2; if (type.contains("gpu")) return 2; - if (type.contains("g3d")) return 3; // Exynos Mali (g3d) + if (type.contains("g3d")) return 3; if (type.contains("kgsl")) return 4; if (type.contains("mali")) return 5; if (type.contains("xclipse") || type.contains("sgpu")) return 6; @@ -381,12 +286,11 @@ public class HudMetrics { private List prioritizePaths(Ranker ranker) { List zones = discoverAllThermalZones(); - ArrayList order = new ArrayList<>(); // {index, rank} + ArrayList order = new ArrayList<>(); for (int i = 0; i < zones.size(); i++) { Integer r = ranker.rank(zones.get(i)[0]); if (r != null) order.add(new int[]{i, r}); } - // Sort by rank, then by path for determinism. order.sort((a, b) -> { if (a[1] != b[1]) return Integer.compare(a[1], b[1]); return zones.get(a[0])[1].compareTo(zones.get(b[0])[1]); @@ -426,14 +330,12 @@ public class HudMetrics { if (!seen.add(path)) continue; Integer raw = readIntFromLine(path); if (raw == null) continue; - // Round to nearest degree for milli-°C sources; sanity-clamp to reject offline sensors. int celsius = raw > 1000 ? (raw + 500) / 1000 : raw; if (celsius >= 1 && celsius <= 150) return celsius; } return null; } - /** The first path in {@code paths} that yields a plausible reading, or null. */ private String resolveTempPath(List paths) { LinkedHashSet seen = new LinkedHashSet<>(); for (String path : paths) { @@ -446,13 +348,8 @@ public class HudMetrics { return null; } - // ======================================================================= - // Temperature danger bands (green / amber / red) - // ======================================================================= - public enum TempSensor { CPU, GPU, BATTERY } - /** Amber and red onset in °C. Always °C internally — conversion happens at format time only. */ public static final class Thresholds { public final int amberC; public final int redC; @@ -463,19 +360,14 @@ public class HudMetrics { public static final int TEMP_COLOR_AMBER = 0xFFFFB74D; public static final int TEMP_COLOR_RED = 0xFFEF5350; - // Tier-2 fallbacks, used when the device declares no usable trip points. Battery is the only one - // with a well-grounded number (Li-ion); CPU/GPU vary enough between parts that these are a - // deliberately conservative guess — which is exactly why trip points are preferred. private static final int DEFAULT_RED_CPU = 90; private static final int DEFAULT_RED_GPU = 90; private static final int DEFAULT_RED_BAT = 48; - /** Amber sits a proportional step below red, which scales sensibly across both CPU/GPU and battery ranges. */ public static int amberForRed(int redC) { return Math.round(redC * 0.88f); } - /** Parsed temperature display options, shared by every overlay so they can't disagree. */ public static final class TempDisplay { public final boolean fahrenheit; public final boolean colorBands; @@ -518,17 +410,11 @@ public class HudMetrics { } } - // Trip points are a device constant — resolve once per sensor and keep it. private final java.util.EnumMap autoThresholdCache = new java.util.EnumMap<>(TempSensor.class); private final java.util.EnumSet autoThresholdResolved = java.util.EnumSet.noneOf(TempSensor.class); - /** - * Bands for a sensor. Manual mode uses the user's red point; Auto prefers the device's OWN - * declared thermal trip points (per-device truth — a handheld with active cooling and a phone on - * the same SoC throttle at very different points) and falls back to {@link #DEFAULT_RED_CPU} etc. - */ public Thresholds resolveThresholds(TempSensor sensor, TempDisplay display) { if (display != null && !display.auto) { int red = display.manualRedFor(sensor); @@ -547,15 +433,6 @@ public class HudMetrics { return new Thresholds(amberForRed(red), red); } - /** - * Bands from the kernel's declared trip points for the zone we actually read this sensor from: - * amber ← the lowest sane {@code passive} trip, red ← the lowest sane {@code hot}/{@code critical}. - * - *

Returns null unless a usable red point is found. Two real traps this guards against: some - * zones aren't temperature sensors at all (a Snapdragon's {@code pm8550-bcl-lvl0} battery-current - * limiter reports {@code trip_point_0_temp = 1} with type {@code passive}), and the GPU is often - * read from a non-thermal_zone node ({@code /sys/class/kgsl/...}) that has no trip points. - */ private Thresholds readTripPointThresholds(TempSensor sensor) { String tempPath; switch (sensor) { @@ -563,7 +440,7 @@ public class HudMetrics { tempPath = resolveTempPath(discoverPrioritizedGpuTempPaths()); break; case BATTERY: - return null; // battery temp comes from BatteryManager, not a thermal zone + return null; default: tempPath = resolveTempPath(discoverPrioritizedCpuTempPaths()); } @@ -580,8 +457,6 @@ public class HudMetrics { Integer raw = readIntFromLine(tripTemp.getPath()); if (raw == null) continue; int celsius = raw > 1000 ? (raw + 500) / 1000 : raw; - // Reject anything that isn't plausibly a thermal trip — this is what filters out the - // battery-current-limiter zones whose "trip point" is a level index, not a temperature. if (celsius < 20 || celsius > 120) continue; String typePath = tripTemp.getPath().replaceAll("_temp$", "_type"); @@ -600,7 +475,6 @@ public class HudMetrics { return new Thresholds(amber, red); } - /** Band colour for a reading, or {@code fallbackColor} when banding is off or the value is unusable. */ public static int tempColor(Float celsius, Thresholds t, TempDisplay display, int fallbackColor) { if (celsius == null || t == null || display == null || !display.colorBands) return fallbackColor; if (celsius >= t.redC) return TEMP_COLOR_RED; @@ -608,7 +482,6 @@ public class HudMetrics { return TEMP_COLOR_OK; } - /** Formats a °C reading in the user's unit. Thresholds stay °C; only display converts. */ public static String formatTemp(float celsius, TempDisplay display, boolean oneDecimal) { boolean f = display != null && display.fahrenheit; float value = f ? celsius * 9f / 5f + 32f : celsius; @@ -618,15 +491,12 @@ public class HudMetrics { : String.format(Locale.ENGLISH, "%d%s", Math.round(value), unit); } - // ======================================================================= - // Battery - // ======================================================================= public static final class Battery { public final float watts; public final boolean charging; - public final Integer percent; // 0..100 or null - public final Integer tempC; // rounded °C or null - public final String runtimeText; // "LEFT 2h 5m" / "LEFT CHG" / null + public final Integer percent; + public final Integer tempC; + public final String runtimeText; Battery(float watts, boolean charging) { this(watts, charging, null, null, null); @@ -640,29 +510,23 @@ public class HudMetrics { } } - /** power_supply current_now channels (µA) for the dual-battery sum. */ private static final String[] CURRENT_CHANNELS = { "/sys/class/power_supply/battery/current_now", "/sys/class/power_supply/bms/current_now", "/sys/class/power_supply/main/current_now", }; - /** power_supply voltage_now channels (µV) — fallback when {@code EXTRA_VOLTAGE} reads 0 on some - * OEM firmwares (e.g. HONOR Magic), which otherwise leaves wattage stuck at 0.0W. */ private static final String[] VOLTAGE_CHANNELS = { "/sys/class/power_supply/battery/voltage_now", "/sys/class/power_supply/bms/voltage_now", "/sys/class/power_supply/main/voltage_now", }; - /** power_supply power_now channels (µW) — last-resort direct power reading when neither the - * BatteryManager voltage nor {@code voltage_now} is available. */ private static final String[] POWER_CHANNELS = { "/sys/class/power_supply/battery/power_now", "/sys/class/power_supply/bms/power_now", "/sys/class/power_supply/main/power_now", }; - /** First readable long across a channel list, or null. */ private static Long readLongFromChannels(String[] paths) { for (String p : paths) { Long v = readLongFromLine(p); @@ -671,15 +535,6 @@ public class HudMetrics { return null; } - /** - * ADDITIVE charging fallback from {@code /sys/class/power_supply/*}, consulted ONLY when the - * framework gave no usable charge state ({@code EXTRA_STATUS == UNKNOWN} or a null battery intent). - * A charger/input supply reporting {@code online == 1} — or the battery's own {@code status} reading - * "Charging"/"Full" — means charging. Returns TRUE when charging is positively detected, FALSE when a - * status/online node is readable but not charging, or null when nothing usable exists (so the caller - * keeps its own default). Never reached on devices whose BatteryManager reports a real status - * (e.g. Adreno phones/handhelds), so it cannot change their reading. - */ private static Boolean readChargingFromPowerSupply() { File[] supplies = new File("/sys/class/power_supply").listFiles(); if (supplies == null || supplies.length == 0) return null; @@ -690,14 +545,12 @@ public class HudMetrics { type = type == null ? "" : type.trim().toLowerCase(Locale.US); boolean isBattery = type.equals("battery") || name.equals("battery") || name.equals("bms"); if (isBattery) { - // The battery's own status string is the most direct charge-state signal. String st = readFirstLine(new File(supply, "status").getPath()); if (st == null) continue; st = st.trim().toLowerCase(Locale.US); - sawSignal = Boolean.FALSE; // "discharging"/"not charging" both land here + sawSignal = Boolean.FALSE; if (st.equals("charging") || st.equals("full")) return Boolean.TRUE; } else { - // A charger / power-input supply (ac/usb/wireless/mains/dc): online==1 → external power in. Long online = readLongFromLine(new File(supply, "online").getPath()); if (online == null) continue; sawSignal = Boolean.FALSE; @@ -712,55 +565,6 @@ public class HudMetrics { private static final double RUNTIME_SMOOTHING_OLD_WEIGHT = 0.65; private static final double RUNTIME_SMOOTHING_NEW_WEIGHT = 0.35; - /** - * Legacy discharge-only power reading used by the classic overlays + {@code PerfHudView}: - * watts are reported only while discharging (0 when charging). When {@code dualBattery} is set the - * per-cell current channels are summed to correct devices that report only one cell's current. - */ - public Battery getBattery(boolean dualBattery) { - Intent status = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); - boolean charging = false; - int voltageMv = 0; - if (status != null) { - charging = status.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0; - voltageMv = status.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0); - } else { - // ADDITIVE: no battery intent → best-effort power_supply charge probe (default stays false). - // Never reached on devices that deliver ACTION_BATTERY_CHANGED (e.g. Adreno). - Boolean sysCharging = readChargingFromPowerSupply(); - if (sysCharging != null) charging = sysCharging; - } - long microAmps; - if (dualBattery) { - long sum = 0; int n = 0; - for (String path : CURRENT_CHANNELS) { - Long v = readLongFromLine(path); - if (v != null) { sum += Math.abs(v); n++; } - } - microAmps = n > 0 ? -sum : readCurrentNowFallback(); - } else { - microAmps = readCurrentNowFallback(); - } - // current_now's SIGN convention is device-dependent — many OEMs (Xiaomi/Poco especially) - // report discharge as POSITIVE, the opposite of the AOSP convention. Gating wattage on the - // sign therefore reads 0W on battery on those devices (and only shows a value while charging). - // Use the magnitude for the power figure; the reliable charge DIRECTION is EXTRA_PLUGGED (the - // `charging` flag), which the HUD already uses for the PWR/CHG label. - // EXTRA_VOLTAGE reads 0 on some OEM firmwares even though current is fine — fall back to the - // power_supply voltage_now (µV → mV) so wattage isn't stuck at 0. - if (voltageMv <= 0) { - Long uv = readLongFromChannels(VOLTAGE_CHANNELS); - if (uv != null && uv > 0) voltageMv = (int) (Math.abs(uv) / 1000L); - } - // current unit auto-detected (mA vs µA) — see currentRawToAmps. - float watts = (voltageMv / 1000f) * currentRawToAmps(microAmps); - return new Battery(watts, charging); - } - - /** - * Full GameNative-parity battery snapshot for the GameNative-style HUD: %, power W (magnitude, - * regardless of charge/discharge), smoothed runtime-left estimate, and temperature. - */ public Battery collectBattery() { BatteryManager bm = (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE); if (bm == null) return new Battery(0f, false); @@ -771,15 +575,12 @@ public class HudMetrics { Intent status = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); if (status == null) { - // No battery intent at all → additive power_supply charge probe (default stays false). Boolean sysCharging = readChargingFromPowerSupply(); return new Battery(0f, sysCharging != null && sysCharging, percent, null, null); } int st = status.getIntExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_UNKNOWN); boolean charging = st == BatteryManager.BATTERY_STATUS_CHARGING || st == BatteryManager.BATTERY_STATUS_FULL; - // ADDITIVE: only when the framework reports no usable charge state do we consult power_supply. - // A device that reports CHARGING/DISCHARGING/FULL/NOT_CHARGING (e.g. Adreno) never enters this. if (st == BatteryManager.BATTERY_STATUS_UNKNOWN) { Boolean sysCharging = readChargingFromPowerSupply(); if (sysCharging != null) charging = sysCharging; @@ -792,23 +593,16 @@ public class HudMetrics { int rawTemp = status.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0); if (rawTemp > 0) tempC = Math.round(rawTemp / 10f); - // EXTRA_VOLTAGE reads 0 on some OEM firmwares (e.g. HONOR Magic) even though capacity, temp - // and current all work — which left wattage stuck at 0.0W. Fall back to the power_supply - // voltage_now (µV → mV); if voltage is still unavailable, use power_now (µW) directly. if (voltageMv <= 0) { Long uv = readLongFromChannels(VOLTAGE_CHANNELS); if (uv != null && uv > 0) voltageMv = (int) (Math.abs(uv) / 1000L); } - // Wattage = current × voltage, with current UNIT auto-detected (CURRENT_NOW is nominally µA but - // many OEMs — e.g. this HONOR — report mA; see batteryCurrentAmps). currentMicroAmps above stays - // as-is for the runtime estimate (a ratio, so unit-independent). If neither current nor voltage - // resolves, fall back to power_now (µW) directly. float amps = batteryCurrentAmps(bm); float watts = 0f; if (amps > 0f && voltageMv > 0) { watts = (voltageMv / 1000f) * amps; } else { - Long uw = readLongFromChannels(POWER_CHANNELS); // µW + Long uw = readLongFromChannels(POWER_CHANNELS); if (uw != null && uw != 0L) watts = (float) (Math.abs(uw) / 1_000_000.0); } @@ -842,24 +636,12 @@ public class HudMetrics { return minutes + "m"; } - private long readCurrentNowFallback() { - BatteryManager bm = (BatteryManager) context.getSystemService(Context.BATTERY_SERVICE); - return bm.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW); - } - - /** Raw battery current reading → AMPS, with unit AUTO-DETECT. {@code BATTERY_PROPERTY_CURRENT_NOW} - * (and {@code current_now}) are nominally µA, but many OEMs report mA — a small number, whereas a - * real µA reading is always huge. So a magnitude < 20000 means the device gave mA. Without this, - * wattage on mA-reporting devices came out ~1000× too small → 0.0W even though current & voltage are - * fine. Sentinel/zero → 0. (Heuristic mirrors Ludashi-plus WinlatorHUD.getBatteryCurrentAmps().) */ private static float currentRawToAmps(long raw) { if (raw == 0L || raw == Long.MIN_VALUE) return 0f; long a = Math.abs(raw); - return a < 20000L ? a / 1000f : a / 1_000_000f; // mA → A, else µA → A + return a < 20000L ? a / 1000f : a / 1_000_000f; } - /** Battery current in AMPS for the wattage calc: framework property first, then power_supply - * {@code current_now} sysfs (battery/bms/main) when it's unsupported ({@code Long.MIN_VALUE}) or 0. */ private float batteryCurrentAmps(BatteryManager bm) { long raw = (bm != null) ? bm.getLongProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW) : 0L; if (raw == 0L || raw == Long.MIN_VALUE) { @@ -869,11 +651,6 @@ public class HudMetrics { return currentRawToAmps(raw); } - // ======================================================================= - // Clock frequencies (best-effort, nullable) - // ======================================================================= - - /** Peak CPU core clock in MHz (max scaling_cur_freq across cores), or null when unreadable. */ public Integer getCpuClockMhz() { int cores = Runtime.getRuntime().availableProcessors(); long maxKhz = 0; @@ -882,29 +659,26 @@ public class HudMetrics { if (cur != null && cur > maxKhz) maxKhz = cur; } if (maxKhz <= 0) return null; - return (int) (maxKhz / 1000L); // kHz → MHz + return (int) (maxKhz / 1000L); } private List gpuClockPathsCache = null; private static final String[] GPU_CLOCK_PATHS = { - "/sys/class/kgsl/kgsl-3d0/gpuclk", // Adreno, Hz - "/sys/class/kgsl/kgsl-3d0/devfreq/cur_freq", // Adreno devfreq, Hz - "/sys/class/kgsl/kgsl-3d0/clock_mhz", // some kernels, already MHz - "/sys/kernel/gpu/gpu_clock", // Mali vendor node, MHz - "/sys/devices/platform/gpusysfs/gpu_clock", // Exynos Mali vendor node, MHz - "/sys/class/misc/mali0/device/clock", // Mali, kHz/MHz - "/sys/class/devfreq/gpu/cur_freq", // generic devfreq gpu, Hz - // ── Additive cross-vendor fallbacks (appended LAST: only reached when every node above - // is unreadable, so Adreno/Mali devices that already resolve are unaffected). ── - "/sys/kernel/ged/hal/current_freqency", // MediaTek GED (vendor's spelling), kHz - "/sys/kernel/ged/hal/gpu_clock", // MediaTek GED alt, MHz + "/sys/class/kgsl/kgsl-3d0/gpuclk", + "/sys/class/kgsl/kgsl-3d0/devfreq/cur_freq", + "/sys/class/kgsl/kgsl-3d0/clock_mhz", + "/sys/kernel/gpu/gpu_clock", + "/sys/devices/platform/gpusysfs/gpu_clock", + "/sys/class/misc/mali0/device/clock", + "/sys/class/devfreq/gpu/cur_freq", + "/sys/kernel/ged/hal/current_freqency", + "/sys/kernel/ged/hal/gpu_clock", }; private List discoverGpuClockPaths() { if (gpuClockPathsCache != null) return gpuClockPathsCache; LinkedHashSet found = new LinkedHashSet<>(); for (String p : GPU_CLOCK_PATHS) if (new File(p).canRead()) found.add(p); - // Vendor-agnostic devfreq walk: any gpu/mali/panfrost/xclipse/sgpu node's cur_freq (Hz). File[] devfreqRoots = { new File("/sys/class/devfreq"), new File("/sys/devices/virtual/devfreq"), @@ -928,49 +702,31 @@ public class HudMetrics { return gpuClockPathsCache; } - /** GPU clock in MHz (Adreno KGSL / devfreq / Mali nodes), or null when no source reports it. */ public Integer getGpuClockMhz() { for (String p : discoverGpuClockPaths()) { Long raw = readLongFromLine(p); if (raw == null || raw <= 0) continue; long mhz; - if (raw >= 1_000_000L) mhz = raw / 1_000_000L; // Hz - else if (raw >= 10_000L) mhz = raw / 1_000L; // kHz (defensive) - else mhz = raw; // already MHz + if (raw >= 1_000_000L) mhz = raw / 1_000_000L; + else if (raw >= 10_000L) mhz = raw / 1_000L; + else mhz = raw; if (mhz >= 1 && mhz <= 3000) return (int) mhz; } return null; } - // ======================================================================= - // VRAM (best-effort, Java-only sysfs — no native rebuild) - // ======================================================================= - // Covered here in pure Java: Adreno KGSL (bytes mapped/allocated) and amdgpu-style drm nodes - // (Samsung Xclipse / "sgpu", AMD-on-Exynos), which expose mem_info_vram_used/_total directly. - // TODO(native): VK_EXT_memory_budget as a vendor-agnostic fallback for Mali/PowerVR, which expose - // no world-readable VRAM node. FEASIBILITY (checked 2026-07): the compositor's Vulkan layer - // (app/src/main/cpp/winlator/vulkan.c) creates an EPHEMERAL VkInstance/VkPhysicalDevice inside - // getRenderer() and destroys it every call — it holds no reusable device and loads only the - // properties/extension entrypoints, not vkGetPhysicalDeviceMemoryProperties2. Wiring the budget - // query therefore means a new JNI method + enabling VK_KHR_get_physical_device_properties2 / - // VK_EXT_memory_budget at instance create + an NDK rebuild — out of scope for a source-only pass. - // CAVEAT to document if/when added: this HUD is an app-side overlay, NOT in the game's Vulkan - // device, so an app-created instance reports the DEVICE-WIDE heap budget (a GPU-memory-pressure - // proxy), not the game's per-process VRAM. Devices with no readable node return null → HUD hides VRAM. private List vramUsedPathsCache = null; private static final String[] VRAM_USED_PATHS = { - "/sys/class/kgsl/kgsl-3d0/gpumem_mapped", // bytes currently mapped to the GPU - "/sys/class/kgsl/kgsl-3d0/page_alloc", // bytes allocated to the KGSL page pool - "/sys/class/kgsl/kgsl-3d0/mapped", // alt name on some kernels - "/sys/class/drm/card0/device/mem_info_vram_used",// amdgpu / Xclipse (sgpu), bytes - "/sys/class/kgsl/kgsl-3d0/page_alloc_max", // high-water fallback + "/sys/class/kgsl/kgsl-3d0/gpumem_mapped", + "/sys/class/kgsl/kgsl-3d0/page_alloc", + "/sys/class/kgsl/kgsl-3d0/mapped", + "/sys/class/drm/card0/device/mem_info_vram_used", + "/sys/class/kgsl/kgsl-3d0/page_alloc_max", }; - // Total-VRAM companions (amdgpu exposes one; used only by the diagnostics report). private static final String[] VRAM_TOTAL_PATHS = { "/sys/class/drm/card0/device/mem_info_vram_total", }; - /** Used GPU memory in bytes from Adreno KGSL sysfs, or null when this device exposes nothing readable. */ public Long getVramUsedBytes() { if (vramUsedPathsCache == null) { ArrayList found = new ArrayList<>(); @@ -986,50 +742,33 @@ public class HudMetrics { private static Long sanitizeVramBytes(Long v) { if (v == null) return null; - if (v < (1L << 20)) return null; // < 1 MiB → idle-zero / not a byte count - if (v > 64L * (1L << 30)) return null; // > 64 GiB → not bytes + if (v < (1L << 20)) return null; + if (v > 64L * (1L << 30)) return null; return v; } - /** Used GPU memory as "x.xGiB" (or "yMiB"), or null when no VRAM source is readable. */ - public String getVramUsedText() { - Long b = getVramUsedBytes(); - return b == null ? null : formatGiB(b); - } - private static String formatGiB(long bytes) { return String.format(Locale.US, "%.1fGiB", bytes / (1024.0 * 1024.0 * 1024.0)); } - // ======================================================================= - // Single cached snapshot — read EVERYTHING once per HUD refresh - // ======================================================================= - - /** - * Immutable point-in-time reading of every metric the Fusion HUD draws. Collected in one pass by - * {@link #snapshot()} so the view never touches sysfs / BatteryManager during draw (the user's - * explicit ask: one collection pass, cached, so gameplay isn't strained). All numeric fields are - * raw (nullable when unreadable); the view formats + colours them. - */ public static final class Snapshot { - public final Integer cpuPercent; // 0..100 or null - public final Integer gpuPercent; // 0..100 or null - public final Integer cpuClockMhz; // MHz or null - public final Integer gpuClockMhz; // MHz or null - public final Integer cpuTempC; // °C or null - public final Integer gpuTempC; // °C or null + public final Integer cpuPercent; + public final Integer gpuPercent; + public final Integer cpuClockMhz; + public final Integer gpuClockMhz; + public final Integer cpuTempC; + public final Integer gpuTempC; public final long ramUsedBytes; public final long ramTotalBytes; - public final float ramPercent; // 0..100 - public final Long vramUsedBytes; // bytes or null - public final Battery battery; // never null - // ---- Mega-only extras ---- - public final int[] perCorePercent; // per-core 0..100, -1 unknown (never null; may be empty) - public final int[] perCoreClockMhz; // per-core MHz, 0 unknown (never null; may be empty) - public final Long swapUsedBytes; // bytes or null (no swap) - public final Long swapTotalBytes; // bytes or null - public final Long netDownBps; // bytes/sec down, or null (first sample / unreadable) - public final Long netUpBps; // bytes/sec up, or null + public final float ramPercent; + public final Long vramUsedBytes; + public final Battery battery; + public final int[] perCorePercent; + public final int[] perCoreClockMhz; + public final Long swapUsedBytes; + public final Long swapTotalBytes; + public final Long netDownBps; + public final Long netUpBps; Snapshot(Integer cpuPercent, Integer gpuPercent, Integer cpuClockMhz, Integer gpuClockMhz, Integer cpuTempC, Integer gpuTempC, long ramUsedBytes, long ramTotalBytes, @@ -1066,7 +805,6 @@ public class HudMetrics { } } - /** One collection pass over every metric. Call from the HUD's own ~1 s refresh thread, never draw. */ public Snapshot snapshot() { if (mango != null) return mangoSnapshot(mango); Integer cpu = getCpuUsagePercent(); @@ -1102,7 +840,6 @@ public class HudMetrics { net == null ? null : net[0], net == null ? null : net[1]); } - // DroidDeck: the same snapshot with MangoHud's sources and rounding (see MangoReadings). private Snapshot mangoSnapshot(MangoReadings m) { MangoReadings.Cpu cpu = m.cpu(); MangoReadings.Memory mem = m.memory(); @@ -1121,11 +858,6 @@ public class HudMetrics { net == null ? null : net[0], net == null ? null : net[1]); } - // ======================================================================= - // Mega-view extras: per-core CPU, swap, network (best-effort, nullable) - // ======================================================================= - - /** Per-core clock in MHz (each core's {@code scaling_cur_freq}); 0 for a core that can't be read. */ public int[] getPerCoreClockMhz() { int cores = Runtime.getRuntime().availableProcessors(); int[] out = new int[Math.max(0, cores)]; @@ -1136,11 +868,12 @@ public class HudMetrics { return out; } - // Per-core /proc/stat deltas — one prev sample per core, seeded on the first read. private long[] lastCoreTotal = null; private long[] lastCoreIdle = null; + private static final int PER_CORE_STAT = 1, PER_CORE_ESTIMATE = 2; + /** Sources of the last per-core reading: PER_CORE_STAT and/or PER_CORE_ESTIMATE (clock speed); 0 when no core was read. */ + private volatile int perCoreSources = 0; - /** Per-core CPU usage 0..100 from the {@code cpuN} /proc/stat deltas; -1 for a core not yet sampled. */ public int[] readPerCorePercent() { int cores = Runtime.getRuntime().availableProcessors(); int[] out = new int[Math.max(0, cores)]; @@ -1153,8 +886,8 @@ public class HudMetrics { try (BufferedReader r = new BufferedReader(new FileReader("/proc/stat"))) { String line; while ((line = r.readLine()) != null) { - if (!line.startsWith("cpu")) break; // cpu lines are first; stop at the block end - if (line.length() < 4 || !Character.isDigit(line.charAt(3))) continue; // skip aggregate "cpu " + if (!line.startsWith("cpu")) break; + if (line.length() < 4 || !Character.isDigit(line.charAt(3))) continue; String[] parts = line.trim().split("\\s+"); int core; try { core = Integer.parseInt(parts[0].substring(3)); } catch (Exception e) { continue; } @@ -1165,8 +898,8 @@ public class HudMetrics { try { long v = Long.parseLong(parts[i]); total += v; - if (i == 4) idle = v; // idle - else if (i == 5) idle += v; // + iowait + if (i == 4) idle = v; + else if (i == 5) idle += v; } catch (NumberFormatException e) { ok = false; break; } } if (!ok) continue; @@ -1179,21 +912,23 @@ public class HudMetrics { } } } catch (Exception ignored) {} - // Frequency fallback for any core /proc/stat couldn't give us — restricted on some firmwares - // (e.g. HONOR / Android 16), which is also why the aggregate getCpuUsagePercent() falls back. - // scaling_cur_freq / cpuinfo_max_freq is a load proxy (per-core clocks ARE readable there), and - // it also seeds the very first sample. Cores with a real /proc/stat delta keep it (no regression). + int sources = 0; for (int i = 0; i < out.length; i++) { - if (out[i] >= 0) continue; + if (out[i] >= 0) { + sources |= PER_CORE_STAT; + continue; + } Long cur = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/scaling_cur_freq"); Long max = readLongFromLine("/sys/devices/system/cpu/cpu" + i + "/cpufreq/cpuinfo_max_freq"); - if (cur != null && max != null && max > 0L) + if (cur != null && max != null && max > 0L) { out[i] = clampPercent((int) ((Math.max(0L, Math.min(cur, max)) * 100L) / max)); + sources |= PER_CORE_ESTIMATE; + } } + perCoreSources = sources; return out; } - /** Swap {used, total} in bytes from /proc/meminfo, or null when there is no swap. */ public long[] getSwapBytes() { long totalKb = -1, freeKb = -1; try (BufferedReader r = new BufferedReader(new FileReader("/proc/meminfo"))) { @@ -1215,10 +950,8 @@ public class HudMetrics { return v == null ? -1 : v; } - // Net rate: cumulative rx/tx bytes + the wall-clock of the previous read → bytes/sec. private long lastNetRx = -1, lastNetTx = -1, lastNetWallMs = 0; - /** Network {down, up} in bytes/sec (all interfaces except loopback), or null on the first/failed read. */ public long[] readNetRateBps() { long rx = 0, tx = 0; boolean any = false; @@ -1241,7 +974,7 @@ public class HudMetrics { long now = SystemClock.elapsedRealtime(); long prevRx = lastNetRx, prevTx = lastNetTx, prevWall = lastNetWallMs; lastNetRx = rx; lastNetTx = tx; lastNetWallMs = now; - if (prevRx < 0 || prevWall <= 0) return null; // seed + if (prevRx < 0 || prevWall <= 0) return null; long dt = now - prevWall; if (dt <= 0) return null; long down = Math.max(0L, (rx - prevRx) * 1000L / dt); @@ -1249,26 +982,14 @@ public class HudMetrics { return new long[]{down, up}; } - // ======================================================================= - // Diagnostics report (invoked ONLY on user tap — never on the HUD refresh path) - // ======================================================================= - - /** - * One-tap plain-text device report for the "Export HUD diagnostics" action: for every metric it - * lists the resolved source path/API + current value, or MISS + the exact candidates it tried, - * followed by an "exists on this device" dump (thermal zone types, devfreq/kgsl/mali nodes) so a - * device owner can send back the real path for anything that missed. Does a short prime+sample so - * delta-based readers (CPU%/GPU%/net) report a live value. Run OFF the main thread. - */ public String buildDiagnosticsReport(Context ctxIn) { final Context ctx = ctxIn != null ? ctxIn : this.context; - // Prime the delta-based readers, wait, then take a live sample. snapshot(); try { Thread.sleep(350L); } catch (InterruptedException ignored) { Thread.currentThread().interrupt(); } Snapshot s = snapshot(); StringBuilder sb = new StringBuilder(); - sb.append("DroidDeck FusionHUD diagnostics\n"); + sb.append("DroidDeck HUD diagnostics\n"); sb.append("Generated: ") .append(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(new Date())).append('\n'); sb.append("Device: ").append(Build.MANUFACTURER).append(' ').append(Build.MODEL).append('\n'); @@ -1281,7 +1002,6 @@ public class HudMetrics { sb.append("\n== Metrics ==\n"); - // ---- CPU ---- boolean procStat = new File("/proc/stat").canRead(); if (s.cpuPercent != null) { metricHit(sb, "CPU %", s.cpuPercent + "%", @@ -1292,19 +1012,20 @@ public class HudMetrics { "/sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq"); } - // Per-core % StringBuilder cores = new StringBuilder(); for (int i = 0; i < s.perCorePercent.length; i++) { if (i > 0) cores.append(' '); int v = s.perCorePercent[i]; cores.append('c').append(i).append('=').append(v < 0 ? "?" : (v + "%")); } - if (s.perCorePercent.length > 0) - metricHit(sb, "Per-core %", cores.toString(), "/proc/stat (per-cpu lines)"); + int coreSources = perCoreSources; + if (s.perCorePercent.length > 0 && coreSources != 0) + metricHit(sb, "Per-core %", cores.toString(), coreSources == PER_CORE_STAT ? "/proc/stat (per-cpu lines)" + : coreSources == PER_CORE_ESTIMATE ? "scaling_cur_freq / cpuinfo_max_freq (clock estimate)" + : "/proc/stat (per-cpu lines); scaling_cur_freq / cpuinfo_max_freq (clock estimate) for the other cores"); else - metricMiss(sb, "Per-core %", "/proc/stat"); + metricMiss(sb, "Per-core %", "/proc/stat", "/sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq"); - // Per-core clock StringBuilder coreClk = new StringBuilder(); for (int i = 0; i < s.perCoreClockMhz.length; i++) { if (i > 0) coreClk.append(' '); @@ -1317,7 +1038,6 @@ public class HudMetrics { else metricMiss(sb, "CPU clock", "/sys/devices/system/cpu/cpu*/cpufreq/scaling_cur_freq"); - // CPU temp String cpuTempPath = resolveTempPath(discoverPrioritizedCpuTempPaths()); if (s.cpuTempC != null && cpuTempPath != null) metricHit(sb, "CPU temp", s.cpuTempC + "°C", cpuTempPath); @@ -1325,7 +1045,6 @@ public class HudMetrics { metricMiss(sb, "CPU temp", "/sys/class/thermal/thermal_zone*/temp (types: cpu*/cpuss/tsens/mtktscpu/s5p-tmu/soc)"); - // ---- GPU ---- String gpuUsagePath = firstReadableGpuUsagePath(); if (s.gpuPercent != null && gpuUsagePath != null) metricHit(sb, "GPU %", s.gpuPercent + "%", gpuUsagePath); @@ -1347,7 +1066,6 @@ public class HudMetrics { "/sys/class/kgsl/kgsl-3d0/temp", "/sys/class/misc/mali0/device/temp", "/sys/class/thermal/thermal_zone*/temp (types: gpu*/gpuss/g3d/kgsl/mali/mtktsgpu)"); - // ---- Memory ---- metricHit(sb, "RAM", s.ramUsedText() + " / " + s.ramTotalText() + " (" + Math.round(s.ramPercent) + "%)", "ActivityManager.MemoryInfo"); if (s.swapUsedBytes != null) @@ -1355,7 +1073,6 @@ public class HudMetrics { else metricMiss(sb, "SWAP", "/proc/meminfo (SwapTotal=0 or unreadable)"); - // VRAM String vramPath = firstReadableVramUsedPath(); if (s.vramUsedBytes != null && vramPath != null) { Long total = readFirstReadableLong(VRAM_TOTAL_PATHS); @@ -1366,14 +1083,12 @@ public class HudMetrics { new ArrayList<>(), VRAM_USED_PATHS); } - // ---- Net ---- if (s.netDownBps != null) metricHit(sb, "NET", formatRate(s.netDownBps) + " down / " + formatRate(s.netUpBps) + " up", "/proc/net/dev"); else metricMiss(sb, "NET", "/proc/net/dev (first sample or unreadable)"); - // ---- Battery ---- Battery b = s.battery; StringBuilder bat = new StringBuilder(); bat.append(b.percent != null ? b.percent + "%" : "?%") @@ -1383,7 +1098,6 @@ public class HudMetrics { .append(b.runtimeText != null ? ", " + b.runtimeText : ""); metricHit(sb, "Battery", bat.toString(), "BatteryManager + /sys/class/power_supply"); - // ---- Exists-on-device dump ---- appendExistsDump(sb); return sb.toString(); } @@ -1415,7 +1129,7 @@ public class HudMetrics { } private String firstReadableVramUsedPath() { - if (vramUsedPathsCache == null) getVramUsedBytes(); // builds the cache + if (vramUsedPathsCache == null) getVramUsedBytes(); if (vramUsedPathsCache == null) return null; for (String p : vramUsedPathsCache) if (sanitizeVramBytes(readLongFromLine(p)) != null) return p; return null; @@ -1479,12 +1193,6 @@ public class HudMetrics { appendGpuNoRootProbes(sb); } - /** Probes for a ROOT-FREE GPU-load path on locked-sysfs Adreno devices (SM8750/HONOR etc.): - * (1) can the app open the KGSL device node? The sysfs mirror (/sys/class/kgsl) is SELinux-blocked - * (vendor_sysfs_kgsl), but /dev/kgsl-3d0 is labeled gpu_device and is normally app-openable — - * that's the door for reading GPU busy via ioctl perf-counters instead of sysfs. - * (2) is there an app-readable devfreq node under /sys/devices/platform that bypasses the blocked - * /sys/class/kgsl symlink (a free win for at least the clock). */ private void appendGpuNoRootProbes(StringBuilder sb) { sb.append("-- GPU no-root reachability probes --\n"); sb.append(" /dev/kgsl-3d0 open O_RDWR: ") @@ -1516,8 +1224,6 @@ public class HudMetrics { if (!found) sb.append(" devfreq (platform kgsl): (no app-readable node found)\n"); } - /** open()+close() a path with the given flags, reporting OK or the errno class — used to test - * whether the app's sandbox can reach a device node without root. */ private static String probeOpen(String path, int flags) { java.io.FileDescriptor fd = null; try { @@ -1530,8 +1236,6 @@ public class HudMetrics { } } - /** Battery-wattage inputs: which power_supply nodes this app can actually READ, and their raw - * values. Confirms the voltage_now / power_now fallback for devices where EXTRA_VOLTAGE is 0. */ private void appendPowerSupplyDump(StringBuilder sb) { sb.append("-- /sys/class/power_supply (battery watts inputs) --\n"); File[] nodes = new File("/sys/class/power_supply").listFiles(); @@ -1582,9 +1286,6 @@ public class HudMetrics { return names.length() == 0 ? "(no readable files)" : names.toString(); } - // ======================================================================= - // Low-level helpers - // ======================================================================= private static int clampPercent(int v) { return v < 0 ? 0 : (v > 100 ? 100 : v); } private static String readFirstLine(String path) { diff --git a/app/src/main/java/com/droiddeck/launcher/hud/KeyValueSet.java b/app/src/main/java/com/droiddeck/launcher/hud/KeyValueSet.java index 1c3a1ba9b9..f455d85256 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/KeyValueSet.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/KeyValueSet.java @@ -8,7 +8,7 @@ * link to https://github.com/The412Banner/FusionHUD in the project documentation * AND in the in-app credits/about screen. * - * Ported to DroidDeck from FusionHUD (Bannerlator's HUD); DroidDeck changes are marked in the code. + * Ported to DroidDeck from FusionHUD (Bannerlator's HUD) and modified for DroidDeck. */ package com.droiddeck.launcher.hud; @@ -20,17 +20,14 @@ import java.util.Iterator; public class KeyValueSet implements Iterable { private String data = ""; - // Default constructor for an empty KeyValueSet public KeyValueSet() { this.data = ""; } - // Constructor to initialize with a string representation of key-value pairs public KeyValueSet(String data) { this.data = data != null && !data.isEmpty() ? data : ""; } - // Helper method to find the start and end indices of a key in the data string private int[] indexOfKey(String key) { int start = 0; int end = data.indexOf(","); @@ -48,37 +45,31 @@ public class KeyValueSet implements Iterable { return null; } - // Method to get the value associated with a key, or an empty string if the key is not present public String get(String key) { for (String[] keyValue : this) if (keyValue[0].equals(key)) return keyValue[1]; return ""; } - // Method to get the value associated with a key, or a fallback value if the key is not present public String get(String key, String fallback) { for (String[] keyValue : this) if (keyValue[0].equals(key)) return keyValue[1]; return fallback; } - // Method to get a boolean value associated with a key, or a fallback value if the key is not present public boolean getBoolean(String key, boolean fallback) { String value = get(key); if (value.isEmpty()) return fallback; return value.equals("1") || value.equals("t") || value.equalsIgnoreCase("true"); } - // Method to get a float value associated with a key, or a fallback value if the key is not present public float getFloat(String key, float fallback) { String value = get(key); try { if (!value.isEmpty()) return Float.parseFloat(value); } catch (NumberFormatException e) { - // Ignore exception and return fallback } return fallback; } - // Method to set a value for a key in the key-value data public void put(String key, Object value) { int[] range = indexOfKey(key); if (range != null) { @@ -88,21 +79,15 @@ public class KeyValueSet implements Iterable { } } - // Method to set a float value for a key in the key-value data public void put(String key, float value) { put(key, String.valueOf(value)); } - // Iterator implementation for key-value pairs in the format [key, value] @NonNull @Override public Iterator iterator() { final int[] start = {0}; final int[] end = {data.indexOf(",")}; - // A single-item config (no comma) gives indexOf == -1, making hasNext() (start < end) - // immediately false so the sole pair was never iterated (get() then returned the - // fallback). Guard it exactly as next() already does. An empty string still yields - // end == 0 → no iteration, which is correct. if (end[0] == -1) end[0] = data.length(); final String[] item = new String[2]; return new Iterator() { diff --git a/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt b/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt index 828bcc0f5a..d9fbaa4dfc 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt @@ -1,14 +1,10 @@ package com.droiddeck.launcher.hud +import android.os.Environment import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File +import kotlin.math.roundToInt -/** - * The readings Steam's performance overlay shows in a DroidDeck session (Valve's mangohud 20260902.1, - * tools/mangoapp), taken from the files the session hands it and computed the same way, so the two - * overlays agree. Sources and formulas follow that build: cpu.cpp calculateCPUData, deckard_temp.cpp, - * msm.cpp getQcomGpuInfo, memory.cpp update_meminfo and battery.cpp getPercent / getPower. - */ internal class MangoReadings(private val sessionDir: File, private val rootDir: File) { class Cpu(val percent: Int, val perCore: IntArray) class Memory(val usedBytes: Long, val totalBytes: Long, val swapUsedBytes: Long, val swapTotalBytes: Long) @@ -17,7 +13,6 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: private val cpuTimes = HashMap() private val cpuPercents = HashMap() - /** Total and per-core load from the session's /proc/stat (DroidDeck's stand-in when the app can't read it). */ @JvmOverloads fun cpu(stat: File = statFile()): Cpu? { val lines = runCatching { stat.readLines() }.getOrNull() ?: return null @@ -38,7 +33,6 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: File(sessionDir, "proc-stat").takeIf { !File("/proc/stat").canRead() && it.isFile } ?: File("/proc/stat") private fun cpuPercent(key: String, v: LongArray): Int { - // user nice system idle iowait irq softirq steal guest guest_nice; guest time is already in user. val user = v[0] - v[8] val nice = v[1] - v[9] val systemAll = v[2] + v[5] + v[6] @@ -55,8 +49,8 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: return busy.coerceIn(0f, 100f).toInt().also { cpuPercents[key] = it } } - /** Average of the zones the session types cpuN-thermal, truncated. */ fun cpuTempC(): Int? { + externalCpuTemp()?.let { return it } var sum = 0f var count = 0 for (zone in LinuxRuntime.cpuTempZones()) { @@ -67,6 +61,13 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: return if (count == 0) null else (sum / count).toInt() } + /** Optional ADB helper feed: /sdcard/DroidDeck/cpu-temp, written from the host while a session runs. */ + private fun externalCpuTemp(): Int? { + val file = File(Environment.getExternalStorageDirectory(), "DroidDeck/cpu-temp") + if (!file.isFile || System.currentTimeMillis() - file.lastModified() > CPU_TEMP_FRESH_MS) return null + return readFloat(file)?.takeIf { it.isFinite() && it in -20f..150f }?.roundToInt() + } + fun gpuPercent(): Int? { val feed = fresh(File(sessionDir, "sys/kgsl-3d0/perf_now")) val source = feed ?: LinuxRuntime.gpuLoadSource()?.let(::File) ?: return null @@ -85,7 +86,6 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: return (milli / 1000.0).toInt() } - /** MemTotal - MemAvailable and SwapTotal - SwapFree from /proc/meminfo. */ fun memory(): Memory? { val kb = HashMap() runCatching { @@ -103,9 +103,8 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: } /** The KGSL total DroidDeck shares with the session (GpuMemComponent). */ - fun vramBytes(): Long? = fresh(File(rootDir, VRAM_FILE), VRAM_FRESH_MS)?.let(::readLong) + fun vramBytes(): Long? = fresh(File(rootDir, VRAM_FILE), VRAM_FRESH_MS)?.let(::readLong)?.takeIf { it > 0 } - /** BAT* under the session's power_supply (BatteryComponent): no watts while charging, full or unknown. */ fun battery(): Battery? { val dirs = File(sessionDir, "sys/power_supply").listFiles { f -> f.name.contains("BAT") }?.sortedBy { it.name } if (dirs.isNullOrEmpty()) return null @@ -144,12 +143,12 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: const val VRAM_FILE = "run/droiddeck-hud/gpu-mem" private const val FEED_FRESH_MS = 10_000L private const val VRAM_FRESH_MS = 15_000L + private const val CPU_TEMP_FRESH_MS = 10_000L private val WHITESPACE = Regex("\\s+") private fun readLong(file: File): Long? = runCatching { file.readText().trim().toLong() }.getOrNull() private fun readFloat(file: File): Float? = runCatching { file.readLines().first().trim().toFloat() }.getOrNull() - /** std::stod on the first line: the leading number, "6 %" -> 6. */ fun leadingNumber(file: File): Double? = runCatching { Regex("^\\s*-?\\d+(\\.\\d+)?").find(file.readLines().first())?.value?.trim()?.toDouble() }.getOrNull() diff --git a/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt b/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt new file mode 100644 index 0000000000..d19c7d6e51 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.hud + +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Path +import androidx.compose.ui.graphics.asAndroidPath +import androidx.compose.ui.graphics.vector.PathParser + +internal object WordmarkArt { + const val BOX_X = 239.135f + const val BOX_Y = 120.02f + const val BOX_W = 1040.7f - 239.135f + const val BOX_H = 243.2f - 120.02f + const val MARK_SCALE = 0.527445f + + const val LEFT_HALF = "M-31.98 0H56.055V40.489A71.81 71.81 0 0 0 56.055 183.231V223.72H-31.98Z" + const val RIGHT_HALF = "M71.885 0.28A111.86 111.86 0 0 1 71.885 223.44V183.234A71.81 71.81 0 0 0 71.885 40.486Z" + const val LETTERS = + "M361.45 241.36V160.13H387.02V241.36ZM387.02 196.73 376.32 188.38Q379.5 174.17 387.02 166.31Q394.54 158.46 407.91 158.46Q413.76 158.46 418.19 160.21Q422.62 161.97 425.96 165.65L410.75 184.87Q409.08 183.03 406.57 182.03Q404.07 181.02 400.89 181.02Q394.54 181.02 390.78 184.95Q387.02 188.88 387.02 196.73" + + "ZM467.91 243.2Q455.38 243.2 445.27 237.6Q435.15 232 429.3 222.31Q423.45 212.61 423.45 200.58Q423.45 188.54 429.3 179.02Q435.15 169.49 445.18 163.89Q455.21 158.29 467.91 158.29Q480.62 158.29 490.64 163.81Q500.67 169.32 506.52 178.93Q512.37 188.54 512.37 200.58Q512.37 212.61 506.52 222.31Q500.67 232 490.64 237.6Q480.62 243.2 467.91 243.2" + + "ZM467.91 219.97Q473.43 219.97 477.61 217.54Q481.79 215.12 484.04 210.69Q486.3 206.26 486.3 200.58Q486.3 194.9 483.96 190.63Q481.62 186.37 477.52 183.95Q473.43 181.52 467.91 181.52Q462.56 181.52 458.39 183.95Q454.21 186.37 451.87 190.72Q449.53 195.06 449.53 200.75Q449.53 206.26 451.87 210.69Q454.21 215.12 458.39 217.54Q462.56 219.97 467.91 219.97" + + "ZM523.4 241.36V160.13H548.98V241.36ZM536.27 148.93Q530.26 148.93 526.33 144.84Q522.4 140.74 522.4 134.89Q522.4 128.88 526.33 124.86Q530.26 120.85 536.27 120.85Q542.29 120.85 546.13 124.86Q549.98 128.88 549.98 134.89Q549.98 140.74 546.13 144.84Q542.29 148.93 536.27 148.93ZM599.95 243.03Q588.42 243.03 579.48 237.52Q570.54 232 565.44 222.47Q560.34 212.95 560.34 200.75Q560.34 188.54 565.44 179.02Q570.54 169.49 579.48 163.97Q588.42 158.46 599.95 158.46Q608.31 158.46 615.08 161.63Q621.85 164.81 626.28 170.41Q630.71 176.01 631.21 183.2V217.46Q630.71 224.65 626.36 230.41Q622.02 236.18 615.16 239.61Q608.31 243.03 599.95 243.03" + + "ZM604.47 219.97Q609.98 219.97 613.99 217.54Q618 215.12 620.34 210.77Q622.68 206.43 622.68 200.75Q622.68 195.06 620.43 190.8Q618.17 186.54 614.08 184.03Q609.98 181.52 604.63 181.52Q599.28 181.52 595.19 184.03Q591.09 186.54 588.67 190.88Q586.25 195.23 586.25 200.75Q586.25 206.26 588.59 210.61Q590.93 214.95 595.11 217.46Q599.28 219.97 604.47 219.97" + + "ZM646.75 241.36H621.68V219.46L625.53 199.74L621.18 180.02V120.02H646.75ZM683.19 241.36V218.29H712.44Q723.13 218.29 731.16 214.03Q739.18 209.77 743.53 201.58Q747.87 193.39 747.87 182.19Q747.87 170.99 743.44 162.97Q739.01 154.95 731.07 150.6Q723.13 146.26 712.44 146.26H682.35V123.36H712.77Q726.14 123.36 737.42 127.62Q748.71 131.88 757.15 139.82Q765.59 147.76 770.18 158.54Q774.78 169.32 774.78 182.36Q774.78 195.23 770.18 206.09Q765.59 216.96 757.23 224.81Q748.87 232.67 737.59 237.01Q726.31 241.36 713.11 241.36" + + "ZM665.47 241.36V123.36H691.71V241.36ZM827.6 243.2Q814.39 243.2 804.11 237.77Q793.83 232.33 787.98 222.64Q782.13 212.95 782.13 200.75Q782.13 188.54 787.9 178.93Q793.67 169.32 803.53 163.81Q813.39 158.29 825.76 158.29Q837.79 158.29 846.98 163.47Q856.18 168.65 861.44 177.85Q866.71 187.04 866.71 198.91Q866.71 201.08 866.46 203.5Q866.21 205.93 865.54 209.1L795.51 209.27V191.72L854.67 191.55L843.64 198.91Q843.47 191.89 841.47 187.29Q839.46 182.69 835.54 180.27Q831.61 177.85 825.92 177.85Q819.91 177.85 815.48 180.61Q811.05 183.36 808.63 188.38Q806.2 193.39 806.2 200.58Q806.2 207.77 808.79 212.86Q811.38 217.96 816.15 220.72Q820.91 223.48 827.43 223.48Q833.45 223.48 838.29 221.39Q843.14 219.3 846.82 215.12L860.86 229.16Q854.84 236.18 846.32 239.69Q837.79 243.2 827.6 243.2" + + "ZM916.68 243.2Q904.15 243.2 893.95 237.68Q883.75 232.17 877.9 222.47Q872.05 212.78 872.05 200.75Q872.05 188.54 877.99 178.93Q883.92 169.32 894.12 163.81Q904.31 158.29 917.02 158.29Q926.54 158.29 934.48 161.55Q942.42 164.81 948.6 171.33L932.22 187.71Q929.38 184.53 925.62 183.03Q921.86 181.52 917.02 181.52Q911.5 181.52 907.24 183.95Q902.98 186.37 900.55 190.63Q898.13 194.9 898.13 200.58Q898.13 206.26 900.55 210.61Q902.98 214.95 907.32 217.46Q911.67 219.97 917.02 219.97Q922.03 219.97 925.96 218.21Q929.88 216.46 932.73 213.28L948.94 229.66Q942.59 236.35 934.56 239.77Q926.54 243.2 916.68 243.2" + + "ZM1010.61 241.36 982.2 199.24 1010.45 160.13H1039.03L1004.93 204.09L1005.77 193.56L1040.7 241.36ZM958.63 241.36V120.02H984.21V241.36Z" + + private fun parse(d: String): Path = PathParser().parsePathString(d).toPath().asAndroidPath() + private val letters by lazy { parse(LETTERS) } + private val leftHalf by lazy { parse(LEFT_HALF) } + private val rightHalf by lazy { parse(RIGHT_HALF) } + private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } + + fun widthFor(height: Float): Float = height * BOX_W / BOX_H + + fun draw(canvas: Canvas, left: Float, top: Float, height: Float, inkColor: Int, ballColor: Int) { + val k = height / BOX_H + canvas.save() + canvas.translate(left, top) + canvas.scale(k, k) + canvas.translate(-BOX_X, -BOX_Y) + paint.color = inkColor + canvas.drawPath(letters, paint) + canvas.translate(239.135f, 123.36f) + canvas.scale(MARK_SCALE, MARK_SCALE) + canvas.translate(31.98f, 0f) + canvas.drawPath(leftHalf, paint) + canvas.drawPath(rightHalf, paint) + paint.color = ballColor + canvas.drawCircle(63.98f, 111.86f, 55.98f, paint) + canvas.restore() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt index 65f9e5b83e..54ae373ae2 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt @@ -5,7 +5,8 @@ import android.os.Handler import android.os.Looper class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: (Boolean) -> Unit, - private val doubleTapMs: () -> Long = { 500 }, private val onCancel: () -> Unit = {}) { + private val doubleTapMs: () -> Long = { 500 }, private val onCancel: () -> Unit = {}, + private val holds: () -> Boolean = { true }) { private class Press(val hold: Runnable, var held: Boolean = false, var used: Boolean = false) private val handler = Handler(Looper.getMainLooper()) private val presses = mutableMapOf() @@ -20,6 +21,11 @@ class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: fun onChordInput() { if (presses.isEmpty()) return + if (!holds()) { + presses.values.forEach { handler.removeCallbacks(it.hold); it.used = true } + cancelTap() + return + } val alreadyHeld = presses.values.any { it.held } presses.values.forEach { handler.removeCallbacks(it.hold) @@ -43,6 +49,7 @@ class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: handler.removeCallbacks(singleTap) val hold = Runnable { val press = presses[device] ?: return@Runnable + if (!holds()) { press.used = true; cancelTap(); return@Runnable } val alreadyHeld = presses.values.any { it.held } press.held = true presses.values.forEach { it.used = true } diff --git a/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt new file mode 100644 index 0000000000..ae44dc0e6c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt @@ -0,0 +1,149 @@ +package com.droiddeck.launcher.input + +import android.accessibilityservice.AccessibilityService +import android.accessibilityservice.AccessibilityServiceInfo +import android.content.Intent +import android.content.pm.PackageManager +import android.graphics.Rect +import android.hardware.display.DisplayManager +import android.os.Build +import android.os.Handler +import android.os.HandlerThread +import android.util.Log +import android.view.Display +import android.view.accessibility.AccessibilityEvent +import android.view.accessibility.AccessibilityWindowInfo +import android.view.inputmethod.InputMethodManager +import java.util.concurrent.ConcurrentHashMap + +object BottomScreenGuests { + enum class Top { HOME, GUEST, NONE } + + internal const val MIN_COVER = 0.5f + + internal fun classify(pkg: String?, homes: Set): Top = when (pkg) { + null -> Top.NONE + in homes -> Top.HOME + else -> Top.GUEST + } + + internal fun holder(topPkg: String?, arrival: String?, homes: Set): String? = when { + topPkg != null -> topPkg.takeIf { classify(it, homes) == Top.GUEST } + arrival != null -> arrival.takeIf { classify(it, homes) == Top.GUEST } + else -> null + } + + internal fun ignorable(type: Int): Boolean = type == AccessibilityWindowInfo.TYPE_INPUT_METHOD || + type == AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY || + type == AccessibilityWindowInfo.TYPE_SPLIT_SCREEN_DIVIDER || + type == AccessibilityWindowInfo.TYPE_MAGNIFICATION_OVERLAY + + fun supported(model: String = Build.MODEL, sdk: Int = Build.VERSION.SDK_INT): Boolean = + sdk >= 33 && DualScreen.yieldsBottom(model) +} + +class BottomScreenWatch(private val service: AccessibilityService) { + private class Arrival(val pkg: String) + + private val thread = HandlerThread("bottom-screen").apply { start() } + private val handler = Handler(thread.looper) + private val own = service.packageName + private val arrivals = ConcurrentHashMap() + private var homes: Set = emptySet() + private var keyboards: Set = emptySet() + private var holders: Map = emptyMap() + private val check = Runnable { evaluate() } + + fun start() { + current = this + service.serviceInfo = service.serviceInfo?.apply { + eventTypes = eventTypes or AccessibilityEvent.TYPE_WINDOWS_CHANGED or AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED + flags = flags or AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS + } + handler.post { + homes = homePackages() + keyboards = keyboardPackages() + evaluate() + } + } + + fun onEvent(event: AccessibilityEvent) { + when (event.eventType) { + AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED -> { + val pkg = event.packageName?.toString() ?: return + if (event.displayId == Display.DEFAULT_DISPLAY || pkg == own || pkg == SYSTEM_UI) return + arrivals[event.displayId] = Arrival(pkg) + } + AccessibilityEvent.TYPE_WINDOWS_CHANGED -> Unit + else -> return + } + handler.removeCallbacks(check) + handler.postDelayed(check, 150) + } + + fun stop() { + handler.removeCallbacksAndMessages(null) + handler.post { + if (current === this) { + current = null + DualScreen.setTaken(emptySet()) + } + } + thread.quitSafely() + } + + private fun evaluate() { + val seen = HashMap(arrivals) + val all = runCatching { service.windowsOnAllDisplays }.getOrNull() ?: return + val displays = service.getSystemService(DisplayManager::class.java) ?: return + val taken = mutableMapOf() + for (i in 0 until all.size()) { + val id = all.keyAt(i) + if (id == Display.DEFAULT_DISPLAY) continue + val display = displays.getDisplay(id)?.takeIf(DualScreen::builtIn) ?: continue + val windows = all.valueAt(i) + val topPkg = windows.asSequence() + .filter { !BottomScreenGuests.ignorable(it.type) && cover(it, display) >= BottomScreenGuests.MIN_COVER } + .sortedByDescending { it.layer } + .firstNotNullOfOrNull { packageOf(it)?.takeUnless { pkg -> pkg == own } } + val arrival = seen[id] + if (topPkg != null && arrival != null) arrivals.remove(id, arrival) + BottomScreenGuests.holder(topPkg, arrival?.pkg?.takeUnless { it in keyboards }, homes)?.let { taken[id] = it } + } + if (current !== this) return + if (taken != holders) Log.i(TAG, "bottom screen holders: $taken") + holders = taken + DualScreen.setTaken(taken.keys) + } + + private fun cover(window: AccessibilityWindowInfo, display: Display): Float { + val bounds = Rect().also(window::getBoundsInScreen) + val area = display.mode.physicalWidth.toFloat() * display.mode.physicalHeight + return if (area <= 0f) 0f else bounds.width().toFloat() * bounds.height() / area + } + + private fun packageOf(window: AccessibilityWindowInfo): String? = + runCatching { window.getRoot(0)?.packageName?.toString() }.getOrNull() + + private fun homePackages(): Set { + val pm = service.packageManager + return listOf(Intent.CATEGORY_HOME, Intent.CATEGORY_SECONDARY_HOME).flatMap { category -> + runCatching { + pm.queryIntentActivities(Intent(Intent.ACTION_MAIN).addCategory(category), PackageManager.MATCH_ALL) + .filter { it.priority >= 0 } + .mapNotNull { it.activityInfo?.packageName } + }.getOrDefault(emptyList()) + }.toSet() + } + + private fun keyboardPackages(): Set = + runCatching { + service.getSystemService(InputMethodManager::class.java)?.inputMethodList.orEmpty().map { it.packageName }.toSet() + }.getOrDefault(emptySet()) + + private companion object { + @Volatile var current: BottomScreenWatch? = null + const val TAG = "BottomScreen" + const val SYSTEM_UI = "com.android.systemui" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt index d38eb9758c..ee8d68ef05 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt @@ -66,6 +66,10 @@ class DirectTouchHold( held = false } + fun cancelPendingHold() { + handler.removeCallbacks(hold) + } + fun onTouch(event: MotionEvent): Boolean { if (event.actionMasked == MotionEvent.ACTION_DOWN) { if (liftPending) { diff --git a/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt index 7f8e8454cc..cfd37c95c5 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt @@ -4,7 +4,11 @@ import android.content.Context import android.hardware.display.DisplayManager import android.os.Build import android.view.Display +import android.view.InputDevice +import android.view.MotionEvent import com.droiddeck.launcher.session.SessionPrefs +import kotlin.math.abs +import kotlin.math.roundToInt object DualScreen { const val MODE_AUTO = "auto" @@ -13,27 +17,86 @@ object DualScreen { val modes = listOf(MODE_AUTO, MODE_ON, MODE_OFF) private const val TYPE_INTERNAL = 1 private val knownModels = setOf("retroid pocket duo", "ayn thor") + private val touchedDisplays = mutableSetOf() + private val takenListeners = java.util.concurrent.CopyOnWriteArraySet<() -> Unit>() + @Volatile private var takenDisplays: Set = emptySet() + private val main by lazy { android.os.Handler(android.os.Looper.getMainLooper()) } - fun builtInDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? = + fun yieldsBottom(model: String): Boolean = model.trim().lowercase().let { m -> knownModels.any(m::startsWith) } + + fun taken(displayId: Int): Boolean = displayId in takenDisplays + + fun setTaken(ids: Set) { + if (ids == takenDisplays) return + takenDisplays = ids + main.post { takenListeners.forEach { it() } } + } + + fun watchTaken(listener: () -> Unit) { takenListeners += listener } + + fun unwatchTaken(listener: () -> Unit) { takenListeners -= listener } + + fun builtInDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? { + val primary = displayManager.getDisplay(primaryDisplayId) + val awake = primary?.state != Display.STATE_OFF + val panels = if (awake) touchPanels() else emptyList() + return internalDisplay(displayManager, primaryDisplayId) { + if (awake && it.state == Display.STATE_OFF) return@internalDisplay false + synchronized(touchedDisplays) { + if (awake && hasOwnTouchPanel(size(it), primary?.let(::size), panels)) touchedDisplays += it.displayId + it.displayId in touchedDisplays + } + } + } + + private fun internalDisplay(displayManager: DisplayManager, primaryDisplayId: Int, accept: (Display) -> Boolean = { true }): Display? = displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION).firstOrNull { it.isValid && it.displayId != primaryDisplayId && (it.flags and Display.FLAG_PRESENTATION) != 0 && - isBuiltIn(displayType(it), Build.MODEL) + isBuiltIn(displayType(it), Build.MODEL) && accept(it) } - fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? = - when (SessionPrefs.dualScreenMode(context)) { - MODE_OFF -> null - MODE_ON -> builtInDisplay(displayManager, primaryDisplayId) ?: anyDisplay(displayManager, primaryDisplayId) - else -> builtInDisplay(displayManager, primaryDisplayId) + internal fun hasOwnTouchPanel(display: Pair, primary: Pair?, panels: List>): Boolean { + val matching = panels.count { covers(it, display) } + return if (primary != null && covers(primary, display)) matching >= 2 else matching >= 1 + } + + private fun covers(panel: Pair, display: Pair): Boolean = + (near(panel.first, display.first) && near(panel.second, display.second)) || + (near(panel.first, display.second) && near(panel.second, display.first)) + + private fun near(a: Int, b: Int) = abs(a - b) <= 2 + + private fun size(display: Display): Pair = + display.mode.let { it.physicalWidth to it.physicalHeight } + + private fun touchPanels(): List> = + InputDevice.getDeviceIds().toList().mapNotNull { id -> + val device = InputDevice.getDevice(id) ?: return@mapNotNull null + if (device.isVirtual || !device.supportsSource(InputDevice.SOURCE_TOUCHSCREEN)) return@mapNotNull null + val x = device.getMotionRange(MotionEvent.AXIS_X, InputDevice.SOURCE_TOUCHSCREEN) ?: return@mapNotNull null + val y = device.getMotionRange(MotionEvent.AXIS_Y, InputDevice.SOURCE_TOUCHSCREEN) ?: return@mapNotNull null + (x.max - x.min + 1f).roundToInt() to (y.max - y.min + 1f).roundToInt() } + fun sessionDisplay(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? = + display(context, displayManager, primaryDisplayId, SessionPrefs.dualScreenSessionMode(context)) + + fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int, mode: String = SessionPrefs.dualScreenMode(context)): Display? = + when (mode) { + MODE_OFF -> null + MODE_ON -> internalDisplay(displayManager, primaryDisplayId) ?: anyDisplay(displayManager, primaryDisplayId) + else -> builtInDisplay(displayManager, primaryDisplayId) + }?.takeUnless { taken(it.displayId) } + fun anyDisplay(displayManager: DisplayManager, primaryDisplayId: Int): Display? = displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION).firstOrNull { it.isValid && it.displayId != primaryDisplayId && (it.flags and Display.FLAG_PRESENTATION) != 0 } + fun builtIn(display: Display): Boolean = isBuiltIn(displayType(display), Build.MODEL) + internal fun isBuiltIn(type: Int?, model: String): Boolean = - if (type != null) type == TYPE_INTERNAL else model.trim().lowercase() in knownModels + if (type != null) type == TYPE_INTERNAL else yieldsBottom(model) private fun displayType(display: Display): Int? = runCatching { Display::class.java.getMethod("getType").invoke(display) as Int }.getOrNull() diff --git a/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java b/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java index 46ce997984..8cbe135e7a 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java +++ b/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java @@ -612,7 +612,6 @@ public class FakeInputWriter { for (int i = 0; i < length; i++) output[9 + i] = ring.get(TRITON_OUTPUT_OFFSET + i); nativeStoreFence(); if (seq != ring.getLong(TRITON_OUTPUT_SEQ_OFFSET)) return null; - // Acknowledge the exact report sequence taken so a concurrent timeout overwrite cannot lose its length. ring.putInt(TRITON_OUTPUT_ACK_OFFSET, (int) seq); nativeStoreFence(); return output; diff --git a/app/src/main/java/com/droiddeck/launcher/input/GesturePrefs.kt b/app/src/main/java/com/droiddeck/launcher/input/GesturePrefs.kt index b8be5bf542..55588d6fd4 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/GesturePrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/GesturePrefs.kt @@ -2,7 +2,6 @@ package com.droiddeck.launcher.input import android.content.Context -/** Global defaults with optional overrides for the currently focused game. */ object GesturePrefs { private fun prefs(context: Context) = context.getSharedPreferences("touch_gestures", Context.MODE_PRIVATE) diff --git a/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt index 68d5722d0a..4d69f68c5b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt @@ -2,7 +2,6 @@ package com.droiddeck.launcher.input import android.view.MotionEvent -/** Keeps split Android touch targets from restarting one shared gesture recognizer. */ internal class GestureTouchStreamGate { enum class Source { SURFACE, SCREEN_KEYS, ON_SCREEN_CONTROLS } diff --git a/app/src/main/java/com/droiddeck/launcher/input/GuestKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/GuestKeys.kt new file mode 100644 index 0000000000..191760003d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/GuestKeys.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.input + +import android.view.KeyEvent + +object GuestKeys { + /** Sends [event] as evdev presses, with Shift around characters typed by a keyboard that has no Shift key; false when it has no evdev code. */ + fun send(event: KeyEvent, sendKey: (code: Int, down: Boolean) -> Unit): Boolean { + val down = event.action == KeyEvent.ACTION_DOWN + if (!down && event.action != KeyEvent.ACTION_UP) return false + var evdev = if (isKeyboardEscape(event.keyCode, event.scanCode)) KEY_ESC else EvdevKeys.fromKeyCode(event.keyCode) + val ch = event.unicodeChar + val plain = if (ch > 0) EvdevKeys.unshiftedChar(ch) else 0 + if (evdev <= 0 && ch > 0) { + val code = EvdevKeys.fromKeyCode(EvdevKeys.keycodeForChar(if (plain != 0) plain else ch)) + if (code > 0) evdev = code + } + val shiftEvdev = if (evdev > 0 && plain != 0 && event.deviceId <= 0) KEY_LEFTSHIFT else 0 + if (evdev <= 0 && event.scanCode > 0) evdev = event.scanCode + if (evdev <= 0) return false + if (down) { + if (shiftEvdev != 0) sendKey(shiftEvdev, true) + sendKey(evdev, true) + } else { + sendKey(evdev, false) + if (shiftEvdev != 0) sendKey(shiftEvdev, false) + } + return true + } + + fun isKeyboardEscape(keyCode: Int, scanCode: Int): Boolean = + keyCode == KeyEvent.KEYCODE_BACK && scanCode == KEY_ESC + + private const val KEY_ESC = 1 + private const val KEY_LEFTSHIFT = 42 +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt index b85fecb120..2f17ef1eae 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt @@ -37,7 +37,6 @@ object HomeButtonShortcuts { } fun onKeyEvent(context: Context, event: KeyEvent): Boolean { - // AYN maps its system-assistant key (gpio-keys KEY_F24) to HOME too; only the pad's Home is Guide. if (!HomeGuideInput.isHome(event.keyCode) || !PadBridge.isControllerKeyEvent(event)) return false return input.onKeyEvent(event, enabled() && HomeApp.isDefault(context)) } @@ -46,13 +45,78 @@ object HomeButtonShortcuts { fun onDeviceRemoved(device: Int) = input.onDeviceRemoved(device) } -class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListener { - override fun onServiceConnected() { - getSystemService(InputManager::class.java).registerInputDeviceListener(this, Handler(Looper.getMainLooper())) +object SystemKeyCapture { + private var owner: Any? = null + private var active: () -> Boolean = { false } + private var send: (KeyEvent) -> Unit = {} + private val held = HashMap, KeyEvent>() + private val releasing = HashSet>() + internal var isKeyboard: (KeyEvent) -> Boolean = ::fromKeyboard + + fun attach(owner: Any, active: () -> Boolean, send: (KeyEvent) -> Unit) { + this.owner = owner + this.active = active + this.send = send } - override fun onKeyEvent(event: KeyEvent) = HomeButtonShortcuts.onKeyEvent(this, event) - override fun onAccessibilityEvent(event: AccessibilityEvent?) {} + fun detach(owner: Any) { + if (this.owner !== owner) return + held.values.forEach { send(KeyEvent.changeAction(it, KeyEvent.ACTION_UP)) } + releasing += held.keys + held.clear() + this.owner = null + active = { false } + send = {} + } + + internal fun captures(keyCode: Int, metaState: Int): Boolean = when { + keyCode == KeyEvent.KEYCODE_META_LEFT || keyCode == KeyEvent.KEYCODE_META_RIGHT -> true + metaState and KeyEvent.META_META_ON != 0 -> true + metaState and KeyEvent.META_ALT_ON != 0 -> keyCode == KeyEvent.KEYCODE_TAB || keyCode == KeyEvent.KEYCODE_ESCAPE + else -> false + } + + private fun fromKeyboard(event: KeyEvent): Boolean = + event.device?.let { !it.isVirtual && it.keyboardType == android.view.InputDevice.KEYBOARD_TYPE_ALPHABETIC } == true + + fun onKeyEvent(event: KeyEvent): Boolean { + val key = event.deviceId to event.keyCode + if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { + releasing -= key + } else if (key in releasing) { + if (event.action == KeyEvent.ACTION_UP) releasing -= key + return true + } + val taken = when (event.action) { + KeyEvent.ACTION_DOWN -> { + val take = key in held || (event.repeatCount == 0 && active() && isKeyboard(event) && captures(event.keyCode, event.metaState)) + if (take) held[key] = KeyEvent(event) + take + } + KeyEvent.ACTION_UP -> held.remove(key) != null + else -> false + } + if (taken) send(event) + return taken + } +} + +class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListener { + private var bottomScreen: BottomScreenWatch? = null + + override fun onServiceConnected() { + getSystemService(InputManager::class.java).registerInputDeviceListener(this, Handler(Looper.getMainLooper())) + if (bottomScreen == null && BottomScreenGuests.supported()) bottomScreen = BottomScreenWatch(this).also { it.start() } + } + + private fun stopBottomScreen() { + bottomScreen?.stop() + bottomScreen = null + } + + override fun onKeyEvent(event: KeyEvent) = + SystemKeyCapture.onKeyEvent(event) || HomeButtonShortcuts.onKeyEvent(this, event) + override fun onAccessibilityEvent(event: AccessibilityEvent?) { event?.let { bottomScreen?.onEvent(it) } } override fun onInterrupt() { HomeButtonShortcuts.release() } override fun onInputDeviceAdded(deviceId: Int) {} override fun onInputDeviceChanged(deviceId: Int) {} @@ -60,11 +124,14 @@ class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListen override fun onUnbind(intent: Intent?): Boolean { HomeButtonShortcuts.release() + stopBottomScreen() + com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) return super.onUnbind(intent) } override fun onDestroy() { HomeButtonShortcuts.release() + stopBottomScreen() getSystemService(InputManager::class.java).unregisterInputDeviceListener(this) super.onDestroy() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt index fd289f7347..e4d7120447 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt @@ -46,7 +46,6 @@ class HomeGuideInput(private val setPressed: (Boolean) -> Unit, private val onCa } companion object { - // The Retroid Nova pad falls back to Generic.kl, which maps its Home scan code to MOVE_HOME. fun isHome(keyCode: Int) = keyCode == KeyEvent.KEYCODE_HOME || keyCode == KeyEvent.KEYCODE_MOVE_HOME private const val DUO_QUICK_MENU_SCAN_CODE = 194 diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt index a3abeb6dcf..e240ddbbbf 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt @@ -13,6 +13,7 @@ import android.view.HapticFeedbackConstants import android.view.MotionEvent import android.view.View import android.view.WindowInsets +import com.droiddeck.launcher.session.SessionPrefs import kotlin.math.abs import kotlin.math.max import kotlin.math.min @@ -59,15 +60,20 @@ class OnScreenControls( return dx * dx + dy * dy <= hit * hit } - fun drag(x: Float, y: Float) { + fun drag(x: Float, y: Float): Boolean { var dx = x - ax var dy = y - ay val d = sqrt(dx * dx + dy * dy) - if (d > radius) { dx = dx / d * radius; dy = dy / d * radius } + val atLimit = d > radius + if (atLimit) { dx = dx / d * radius; dy = dy / d * radius } + if (!atLimit && abs(dx - kx) < MIN_STICK_MOVE_PX && abs(dy - ky) < MIN_STICK_MOVE_PX) return false kx = dx; ky = dy; dirty = true + return true } } + private val stickRedraw = ThrottledRedraw(this, STICK_REDRAW_MS) + private val controls = listOf( Control("up", "dpad", -1, 26f, 0f, -52f), Control("right", "dpad", -1, 26f, 52f, 0f), @@ -211,6 +217,7 @@ class OnScreenControls( } override fun onDetachedFromWindow() { + stickRedraw.cancel() releaseAll() pad?.releaseTouch(this) super.onDetachedFromWindow() @@ -513,6 +520,7 @@ class OnScreenControls( @SuppressLint("ClickableViewAccessibility") override fun onTouchEvent(event: MotionEvent): Boolean { if (editing) return onEditTouch(event) + if (event.getToolType(event.actionIndex) == MotionEvent.TOOL_TYPE_MOUSE) return false when (event.actionMasked) { MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> { val index = event.actionIndex @@ -543,7 +551,7 @@ class OnScreenControls( control.ay = if (adaptive) event.getY(index) else control.cy control.drag(event.getX(index), event.getY(index)) } - requestUnbufferedDispatch(event) + if (SessionPrefs.lowLatency(context)) requestUnbufferedDispatch(event) apply() return true } @@ -552,13 +560,14 @@ class OnScreenControls( if (keyboardPressedBy != -1) return true if (quickPressedBy != -1) return true var changed = false + var stickMoved = false for (index in 0 until event.pointerCount) { val pointer = event.getPointerId(index) if (forwardedPointerBits and (1 shl pointer) != 0) continue val x = event.getX(index) val y = event.getY(index) val stick = controls.firstOrNull { it.stick >= 0 && it.pressedBy == pointer } - if (stick != null) { stick.drag(x, y); changed = true; continue } + if (stick != null) { stickMoved = stick.drag(x, y) || stickMoved; continue } val over = controlAt(x, y)?.takeIf { it.stick < 0 } for (control in controls) { if (control.stick < 0 && control.pressedBy == pointer && control !== over) { @@ -571,7 +580,7 @@ class OnScreenControls( changed = true } } - if (changed) apply() + if (changed) apply() else if (stickMoved) apply(stickOnly = true) return true } MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_CANCEL -> { @@ -673,7 +682,6 @@ class OnScreenControls( private fun closestSnap(position: Float, targets: List): Float? = targets.minByOrNull { abs(position - it) }?.takeIf { abs(position - it) <= dp(SNAP_DP) } - /** Whether a finger going down at ([x], [y]) lands on something here, as [onTouchEvent] decides it. */ fun takesTouchAt(x: Float, y: Float): Boolean = editing || keyboardContains(x, y) || (!buttonsOnly && quickContains(x, y)) || (!quickHidden && (controlAt(x, y) ?: adaptiveStickAt(x, y)) != null) @@ -706,7 +714,7 @@ class OnScreenControls( else -> control.target != ControllerPrefs.OFF } - private fun apply() { + private fun apply(stickOnly: Boolean = false) { val bridge = pad if (bridge == null || editing) { invalidate(); return } if (bridge.hasInputRouter()) { @@ -721,7 +729,7 @@ class OnScreenControls( } else write(state, control.id, control.pressedBy != -1) } } - invalidate() + if (stickOnly) stickRedraw.request() else invalidate() return } val qamHeld = controls.any { it.id == "qam" && it.pressedBy != -1 } @@ -753,7 +761,7 @@ class OnScreenControls( for (target in used) write(state, target, target in held) } } - invalidate() + if (stickOnly) stickRedraw.request() else invalidate() } private fun write(state: PadState, target: String, down: Boolean) { @@ -796,6 +804,8 @@ class OnScreenControls( private companion object { const val DOUBLE_TAP_MS = 300L + const val STICK_REDRAW_MS = 33L + const val MIN_STICK_MOVE_PX = 1f const val MIN_FACE_MM = 9.5f const val FULL_SIZE_HEIGHT_MM = 85f const val BOTTOM_MARGIN_MM = 5f diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index a31e52dbe4..eedd6c51ff 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -313,11 +313,6 @@ public final class PadBridge { || device.supportsSource(InputDevice.SOURCE_JOYSTICK)); } - public static boolean isControllerKey(KeyEvent event) { - return isFromController(event.getDevice()) - && isPadKey(event.getKeyCode(), event.getDevice().getKeyboardType()); - } - public static boolean isPadKey(int keyCode, int keyboardType) { if ((keyCode >= KeyEvent.KEYCODE_BUTTON_A && keyCode <= KeyEvent.KEYCODE_BUTTON_MODE) || (keyCode >= KeyEvent.KEYCODE_BUTTON_1 && keyCode <= KeyEvent.KEYCODE_BUTTON_16)) return true; @@ -706,7 +701,6 @@ public final class PadBridge { liveReport.copyFrom(report); if (backQamAxesBlocked && !hasAxes(liveReport)) backQamAxesBlocked = false; long at = android.os.SystemClock.uptimeMillis(); - // Steam must see the modifier before a partner; preserve quick press/release pairs in order. if (backQamPressed || homeGuidePressed || !backQamWrites.isEmpty()) at += backQamDelayMs; writeBackQamReport(report, at); } diff --git a/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt index f3ab1d4c6a..24959e5a24 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt @@ -51,6 +51,15 @@ val PC_KEY_ROWS: List> = listOf( val PC_MODIFIERS: Set = setOf(42, 54, 29, 97, 56, 100, 125) +// Sticky modifiers are excluded: hiding a locked modifier would leave it pressed forever. +val PC_KEY_HIDDEN_GROUPS: Map> = mapOf( + "function" to ((59..68).toSet() + setOf(1, 87, 88)), + "nav" to setOf(110, 111, 102, 107, 104, 109), + "arrows" to setOf(103, 105, 108, 106), +) + +val PC_KEY_GROUP_IDS: Map = mapOf(0 to "function", 1 to "nav", 2 to "arrows") + val PC_KEYS: Map = PC_KEY_ROWS.flatten().associateBy { it.code } fun pcKeyLabel(context: Context, code: Int): String { diff --git a/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt index 74b50a4526..ca1ec046a6 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt @@ -11,6 +11,7 @@ class PointerGestures { fun onScroll(dx: Float, dy: Float) {} fun onScrollEnd() {} fun onZoom(steps: Int) {} + fun onThreeFingerTap(): Boolean = false } companion object { diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt index 2967a06f6a..4223754320 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt @@ -36,12 +36,6 @@ fun screenKeyDirections(shape: Int): List = when (shape) { else -> emptyList() } -val SCREEN_KEY_SHAPES = - listOf( - SCREEN_KEY_PILL, SCREEN_KEY_ROUND, SCREEN_KEY_CIRCLE, SCREEN_KEY_RECT, - SCREEN_KEY_TRIGGER, SCREEN_KEY_DPAD, SCREEN_KEY_STICK, - ) - data class ScreenKey( val codes: List, val x: Float, @@ -55,9 +49,4 @@ data class ScreenKey( val toggle: Boolean = false, val labels: Boolean = true, ) { - fun shownLabel(context: Context): String = when { - text.isNotEmpty() -> text - glyph.isNotEmpty() -> glyph - else -> screenKeyLabel(context, codes) - } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt index df129888c8..2e27eecbe6 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt @@ -56,6 +56,7 @@ class ScreenKeys(context: Context, private val sendKey: (Int, Boolean) -> Unit) private var guideY = -1f private val addPress = Runnable { addX = pressX; addY = pressY; onAdd?.invoke() } private var editing = false + val isEditing get() = editing private var selected: Entry? = null private var dragX = 0f private var dragY = 0f @@ -609,7 +610,6 @@ class ScreenKeys(context: Context, private val sendKey: (Int, Boolean) -> Unit) else -> entry.halfH } - /** Whether a finger going down at ([x], [y]) lands on something here, as [onTouchEvent] decides it. */ fun takesTouchAt(x: Float, y: Float): Boolean = editing || entryAt(x, y) != null private fun entryAt(x: Float, y: Float): Entry? = entries.lastOrNull { entry -> @@ -812,6 +812,7 @@ class ScreenKeys(context: Context, private val sendKey: (Int, Boolean) -> Unit) override fun onTouchEvent(event: MotionEvent): Boolean = if (editing) editTouch(event) else playTouch(event) private fun playTouch(event: MotionEvent): Boolean { + if (event.getToolType(event.actionIndex) == MotionEvent.TOOL_TYPE_MOUSE) return false when (event.actionMasked) { MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> { val index = event.actionIndex diff --git a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt index cffa3773ef..d2ae03b696 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt @@ -10,11 +10,23 @@ enum class SecondScreenMode(val id: String, @StringRes val label: Int) { KEYBOARD_TRACKPAD("keyboard-trackpad", R.string.second_mode_keyboard_trackpad), TERMINAL("terminal", R.string.second_mode_terminal), DECK_CONTROLS("deck-controls", R.string.second_mode_deck_controls), - CUSTOM_CONTROLS("custom-controls", R.string.input_custom_controls); + CUSTOM_CONTROLS("custom-controls", R.string.input_custom_controls), + DASHBOARD("dashboard", R.string.second_mode_dashboard), + DESKTOP("desktop", R.string.second_mode_desktop); companion object { - fun opening(remembered: String?, deckPad: Boolean): SecondScreenMode = - entries.firstOrNull { it != NONE && it.id == remembered && (it != DECK_CONTROLS || deckPad) } ?: if (deckPad) DECK_CONTROLS else KEYBOARD_TRACKPAD + fun opening(remembered: String?, deckPad: Boolean, dashboard: Boolean = false, desktop: Boolean = false): SecondScreenMode { + entries.firstOrNull { + it != NONE && it.id == remembered && (it != DECK_CONTROLS || deckPad) && (it != DASHBOARD || dashboard) && + (it != DESKTOP || desktop) + }?.let { return it } + val picked = entries.any { it != NONE && it.id == remembered } + return when { + deckPad -> DECK_CONTROLS + dashboard && !picked -> DASHBOARD + else -> KEYBOARD_TRACKPAD + } + } } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt index 68eed5edea..3e6e7944af 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt @@ -107,12 +107,12 @@ class SteamTouchControls( var onTouchMiss: ((MotionEvent) -> Unit)? = null private var editing = false + var onEditingChanged: ((Boolean) -> Unit)? = null private var editElements: MutableList = mutableListOf() private var hidden: MutableList = mutableListOf() private var selected = -1 private var dragOffset = 0f to 0f private var pinchStart = 0f - private var pinchScale = 1f private var saving = false private val pendingBindings = HashMap() private var pendingColor: FloatArray? = null @@ -140,6 +140,7 @@ class SteamTouchControls( override fun onDetachedFromWindow() { handler.removeCallbacks(poll) + moveRedraw.cancel() sensors.unregisterListener(shakeListener) releaseAll() super.onDetachedFromWindow() @@ -244,7 +245,6 @@ class SteamTouchControls( private fun hit(list: List, x: Float, y: Float): Element? = list.filter { reach(it, x, y) <= 1.15f }.minByOrNull { reach(it, x, y) } - /** Whether a finger going down at ([x], [y]) lands on something here, as [onTouchEvent] decides it. */ fun takesTouchAt(x: Float, y: Float): Boolean = editing || menuOpen || hit(live(), x, y) != null private fun live(): List = @@ -350,17 +350,6 @@ class SteamTouchControls( canvas.restore() } - private fun drawSteamMark(canvas: Canvas, x: Float, y: Float, r: Float, color: Int) { - val p = Paint(Paint.ANTI_ALIAS_FLAG).apply { this.color = color; style = Paint.Style.STROKE; strokeCap = Paint.Cap.ROUND } - p.strokeWidth = r * 0.16f - canvas.drawCircle(x + r * 0.28f, y - r * 0.18f, r * 0.27f, p) - canvas.drawCircle(x + r * 0.28f, y - r * 0.18f, r * 0.1f, Paint(p).apply { style = Paint.Style.FILL }) - canvas.drawCircle(x - r * 0.3f, y + r * 0.3f, r * 0.17f, p) - p.strokeWidth = r * 0.2f - canvas.drawLine(x + r * 0.1f, y - r * 0.02f, x - r * 0.2f, y + r * 0.22f, p) - canvas.drawLine(x - r * 0.45f, y + r * 0.28f, x - r * 0.95f, y + r * 0.1f, p) - } - private fun drawFace(canvas: Canvas, type: Int, binding: SteamTouchBindings.Binding?, x: Float, y: Float, r: Float, alpha: Int, pressed: Boolean) { val square = isSquare(type) @@ -559,7 +548,7 @@ class SteamTouchControls( return bits } - private fun publish() { + private fun publish(moving: Boolean = false) { var buttons = 0L val sticks = ShortArray(4) val pads = ShortArray(6) @@ -590,7 +579,7 @@ class SteamTouchControls( } } device.setControls(buttons, sticks, pads) - invalidate() + if (moving) moveRedraw.request() else invalidate() } fun releaseAll() { @@ -599,6 +588,8 @@ class SteamTouchControls( invalidate() } + private val moveRedraw = ThrottledRedraw(this, MOVE_REDRAW_MS) + private fun keepHeldFingers() { val moved = SteamTouchConfig.remapHeld(fingers.mapValues { it.value.element?.type }, live()) fingers.keys.retainAll(moved.keys) @@ -627,6 +618,7 @@ class SteamTouchControls( } return true } + if (event.getToolType(event.actionIndex) == MotionEvent.TOOL_TYPE_MOUSE) return false val index = event.actionIndex lastTouchMs = android.os.SystemClock.uptimeMillis() if (faded) { faded = false; invalidate() } @@ -647,7 +639,7 @@ class SteamTouchControls( if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) fingers[event.getPointerId(index)] = Finger(e, x, y) if (feedback) performHapticFeedback(android.view.HapticFeedbackConstants.VIRTUAL_KEY) - requestUnbufferedDispatch(event) + if (com.droiddeck.launcher.session.SessionPrefs.lowLatency(context)) requestUnbufferedDispatch(event) publish() return true } @@ -666,7 +658,7 @@ class SteamTouchControls( } } } - publish() + publish(moving = true) return true } MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_CANCEL -> { @@ -715,6 +707,7 @@ class SteamTouchControls( fun startEditing() { releaseAll() editing = true + onEditingChanged?.invoke(true) editSets.clear() selected = -1 pendingBindings.clear() @@ -765,8 +758,13 @@ class SteamTouchControls( actionSet = saved } + fun cancelEditing() { + if (editing) stopEditing() + } + private fun stopEditing() { editing = false + onEditingChanged?.invoke(false) trayOpen = false trayDrag = null selected = -1 @@ -855,19 +853,6 @@ class SteamTouchControls( invalidate() } - private fun controlName(type: Int) = when (type) { - SteamTouchConfig.DPAD -> context.getString(R.string.touch_dpad) - SteamTouchConfig.JOYSTICK_LEFT -> context.getString(R.string.touch_left_stick) - SteamTouchConfig.JOYSTICK_RIGHT -> context.getString(R.string.touch_right_stick) - SteamTouchConfig.TRACKPAD_LEFT -> context.getString(R.string.deck_left_trackpad) - SteamTouchConfig.TRACKPAD_RIGHT -> context.getString(R.string.deck_right_trackpad) - SteamTouchConfig.TRACKPAD_CENTER -> context.getString(R.string.deck_surface_trackpad) - SteamTouchConfig.STEAM -> "Steam" - SteamTouchConfig.THUMB -> context.getString(R.string.touch_menu) - SteamTouchConfig.KEYBOARD -> context.getString(R.string.touch_keyboard) - else -> label(type) - } - private fun moreMenu() { val host = parent as? android.view.ViewGroup ?: return val density = resources.displayMetrics.density @@ -1495,6 +1480,7 @@ class SteamTouchControls( companion object { private const val TAG = "SteamTouch" private const val POLL_MS = 150L + private const val MOVE_REDRAW_MS = 33L const val BIG_PICTURE = 769 private const val ICON_PX = 128 private const val MARK_D = "M-31.98 0H56.055V40.489A71.81 71.81 0 0 0 56.055 183.231V223.72H-31.98Z" + diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchDevice.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchDevice.kt index 2d63358d3d..560bff4f06 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchDevice.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchDevice.kt @@ -74,8 +74,6 @@ class SteamTouchDevice private constructor(private val buffer: ByteBuffer) { Log.i(TAG, "steam touch: " + if (value) "plugged in" else "unplugged") } - fun setBattery(percent: Int) = buffer.putInt(OFF_BATTERY, percent.coerceIn(0, 100)) - fun state(): State { repeat(8) { val seq = buffer.getLong(OFF_STATE_SEQ) diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt index 3e0ca925aa..062bfbfdc4 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt @@ -3,7 +3,6 @@ package com.droiddeck.launcher.input import android.media.AudioManager import android.view.KeyEvent -/** Use Steam's PulseAudio bridge for feedback instead of requesting Android's volume UI. */ internal object SteamVolumeKeys { fun dispatch(event: KeyEvent, enabled: Boolean, adjust: (Int) -> Unit): Boolean { val direction = when (event.keyCode) { diff --git a/app/src/main/java/com/droiddeck/launcher/input/ThrottledRedraw.kt b/app/src/main/java/com/droiddeck/launcher/input/ThrottledRedraw.kt new file mode 100644 index 0000000000..b4d99f1196 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ThrottledRedraw.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.input + +import android.os.SystemClock +import android.view.View + +internal class ThrottledRedraw(private val view: View, private val intervalMs: Long) { + private var last = 0L + private val redraw = Runnable { + last = SystemClock.uptimeMillis() + view.invalidate() + } + + fun request() { + view.removeCallbacks(redraw) + view.postDelayed(redraw, (last + intervalMs - SystemClock.uptimeMillis()).coerceAtLeast(0L)) + } + + fun cancel() { + view.removeCallbacks(redraw) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt index f386ebb179..d3be470568 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt @@ -39,6 +39,7 @@ data class TouchGestureConfig( val showGestureDebugOverlay: Boolean = false, val gestureThreshold: Int = DEFAULT_GESTURE_THRESHOLD, val mouseDragMovementMode: String = MOUSE_DRAG_MOVEMENT_DIRECT, + val relativeMouseMode: Int = RELATIVE_MOUSE_AUTO, ) { fun toJson(): String { @@ -75,6 +76,7 @@ data class TouchGestureConfig( put(KEY_SHOW_GESTURE_DEBUG_OVERLAY, showGestureDebugOverlay) put(KEY_GESTURE_THRESHOLD, gestureThreshold) put(KEY_MOUSE_DRAG_MOVEMENT_MODE, mouseDragMovementMode) + put(KEY_RELATIVE_MOUSE_MODE, relativeMouseMode) }.toString() } @@ -91,6 +93,10 @@ data class TouchGestureConfig( const val MOUSE_DRAG_MOVEMENT_DIRECT = "direct" const val MOUSE_DRAG_MOVEMENT_RELATIVE = "relative" + + const val RELATIVE_MOUSE_AUTO = 0 + const val RELATIVE_MOUSE_ON = 1 + const val RELATIVE_MOUSE_OFF = 2 const val ACTION_SHOW_KEYBOARD = "show_keyboard" const val ACTION_KEY_ESC = "key_ESC" const val ACTION_KEY_TILDE = "key_TILDE" @@ -114,6 +120,7 @@ data class TouchGestureConfig( private const val KEY_LONG_PRESS_MOUSE_BEHAVIOR = "longPressMouseBehavior" private const val KEY_LONG_PRESS_DELAY = "longPressDelay" private const val KEY_DIRECT_HOLD_BEHAVIOR = "directHoldBehavior" + private const val KEY_RELATIVE_MOUSE_MODE = "relativeMouseMode" private const val KEY_DOUBLE_TAP_ENABLED = "doubleTapEnabled" private const val KEY_DOUBLE_TAP_DELAY = "doubleTapDelay" private const val KEY_TWO_FINGER_DRAG_ENABLED = "twoFingerDragEnabled" @@ -191,6 +198,7 @@ data class TouchGestureConfig( mouseDragMovementMode = normalizeMouseDragMovementMode( obj.optString(KEY_MOUSE_DRAG_MOVEMENT_MODE, MOUSE_DRAG_MOVEMENT_DIRECT), ), + relativeMouseMode = normalizeRelativeMouseMode(obj.optInt(KEY_RELATIVE_MOUSE_MODE, RELATIVE_MOUSE_AUTO)), ) } catch (_: Exception) { fallbackDefaults() @@ -205,6 +213,10 @@ data class TouchGestureConfig( return if (value == MOUSE_BEHAVIOR_CLICK) MOUSE_BEHAVIOR_CLICK else MOUSE_BEHAVIOR_HOLD } + private fun normalizeRelativeMouseMode(mode: Int): Int { + return if (mode in RELATIVE_MOUSE_AUTO..RELATIVE_MOUSE_OFF) mode else RELATIVE_MOUSE_AUTO + } + private fun normalizeMouseDragMovementMode(mode: String?): String { return if (mode == MOUSE_DRAG_MOVEMENT_RELATIVE) { MOUSE_DRAG_MOVEMENT_RELATIVE diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt index b03cd03b61..ed4e87732b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt @@ -240,7 +240,8 @@ class TouchpadGestures( } if (desktop && scrolled && event.pointerCount == 2) listener.onScrollEnd() if (fingers >= 3) { - if (event.pointerCount == 2 && secondWasTap && !scrolled && event.eventTime - downAt < TouchTiming.TAP_MS * 2) + if (event.pointerCount == 2 && secondWasTap && !scrolled && event.eventTime - downAt < TouchTiming.TAP_MS * 2 && + !listener.onThreeFingerTap()) click(PointerGestures.BTN_MIDDLE) if (event.pointerCount == 2) secondWasTap = false } else if (twoFingers && secondWasTap && event.eventTime - secondDownAt < TouchTiming.TAP_MS && !scrolled) { diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java b/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java index 140b4ace41..819226764b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java @@ -28,7 +28,6 @@ public final class TouchscreenGestures { void key(int code, boolean down); void wheel(int steps); void showKeyboard(); - /** Establish the pointer origin before a relative middle-mouse pan begins. */ default void prepareRelativePan() {} default void gesture(Gesture gesture) {} } @@ -97,12 +96,10 @@ public final class TouchscreenGestures { final int code; MouseButton(int code) { this.code = code; } } - // Long-press detection private Runnable longPressRunnable; private boolean longPressTriggered; private boolean longPressActionHeld, twoFingerHoldActionHeld, threeFingerHoldActionHeld; - // Double-tap detection private long lastTapTime; private float lastTapX; private float lastTapY; @@ -110,76 +107,54 @@ public final class TouchscreenGestures { private float doubleTapAnchorX, doubleTapAnchorY; private long singleFingerDownTime; - // Drag tracking (box selection) private boolean isDragging; private boolean dragButtonPressed; - // Two-finger tracking private boolean twoFingerDragging; private float twoFingerLastX0, twoFingerLastY0; private float twoFingerLastX1, twoFingerLastY1; private boolean twoFingerMiddleButtonDown; - // Pinch tracking private float pinchLastDistance; private float pinchZoomRemainder; private float keyPanRemainderX, keyPanRemainderY; private static final float PINCH_STEP_PX = 10f; - // Two-finger tap detection private boolean twoFingerTapPossible; private boolean twoFingerTapFired; - // Track which WASD/arrow keys are currently held private boolean panKeyUp, panKeyDown, panKeyLeft, panKeyRight; - // True when finger has moved beyond tap tolerance (prevents spurious tap on lift) private boolean movedBeyondTapThreshold; - // True after a multi-finger gesture has been active — prevents the remaining - // finger from starting a spurious single-finger drag on lift sequence. private boolean multiFingerGestureUsed; - // Remember which keycodes were actually pressed so releasePanKeys releases only those private Integer panLeftKey, panRightKey, panUpKey, panDownKey; - // Long-press movement tolerance (pixels of raw finger movement before cancelling long-press) private static final float LONG_PRESS_MOVE_TOLERANCE = 50f; - // Raw touch-down coordinates for measuring finger travel private float touchDownRawX, touchDownRawY; - // Last raw coordinates for single-finger drag delta private float singleFingerLastRawX, singleFingerLastRawY; - // Two-finger gesture mutual exclusion (only pan OR pinch, not both) private static final int TWO_FINGER_GESTURE_NONE = 0; private static final int TWO_FINGER_GESTURE_PAN = 1; private static final int TWO_FINGER_GESTURE_ZOOM = 2; private int twoFingerGestureMode = TWO_FINGER_GESTURE_NONE; - // Accumulated deltas for deciding which two-finger gesture to lock into private float accumulatedPinchDelta, accumulatedPanDelta; - // Settle window: ignore movement for first N ms after second finger lands (#1) - // Also serves as a grace period for a third finger to arrive before 2F locks in private static final long TWO_FINGER_SETTLE_MS = 120; private static final long THREE_FINGER_SETTLE_MS = 50; private long twoFingerDownTime; private long threeFingerDownTime; - // Velocity gating for two-finger hold vs drag (#2) private long twoFingerLastMoveTime; - private static final float MIN_DRAG_VELOCITY = 0.3f; // px/ms to commit to drag + private static final float MIN_DRAG_VELOCITY = 0.3f; - // Pinch vs drag ratio: pinch delta must exceed pan by this factor to classify as pinch (#4) private static final float PINCH_RATIO_THRESHOLD = 1.5f; - // Cancel-and-reclassify: allow reclassification within this window after lock-in (#5) private static final long RECLASSIFY_WINDOW_MS = 100; private long twoFingerLockTime; private float reclassifyPinchDelta, reclassifyPanDelta; - // Gesture pointer ownership tracking (prevents d-pad/button pointer conflicts) private int gestureFingerCount = 0; private final ArrayList gestureOwnedPointerIds = new ArrayList<>(); private final int[] multiFingerStartIds = new int[3]; private final float[] multiFingerStartX = new float[3], multiFingerStartY = new float[3]; private int multiFingerStartCount; - // Two-finger hold detection private Runnable twoFingerHoldRunnable; private boolean twoFingerHoldTriggered; - // Three-finger tracking private boolean threeFingerTapPossible; private boolean threeFingerTapFired; private boolean threeFingerDragging; @@ -199,9 +174,7 @@ public final class TouchscreenGestures { switch (action) { case MotionEvent.ACTION_DOWN: - // A new touch must not shorten or discard an already recognized click. handleTsCancel(true); - // First pointer overall — gesture system claims it gestureOwnedPointerIds.clear(); gestureOwnedPointerIds.add(pointerId); gestureFingerCount = 1; @@ -209,13 +182,11 @@ public final class TouchscreenGestures { break; case MotionEvent.ACTION_POINTER_DOWN: - // New pointer arrived — gesture system claims it if (!gestureOwnedPointerIds.contains(pointerId)) { gestureOwnedPointerIds.add(pointerId); gestureFingerCount++; } if (gestureFingerCount == 1) { - // First gesture finger (controls own earlier pointers) handleTsDown(event, actionIndex); } else if (gestureFingerCount == 2) { handleTsPointerDown(event); @@ -242,15 +213,12 @@ public final class TouchscreenGestures { gestureOwnedPointerIds.remove(Integer.valueOf(pointerId)); gestureFingerCount = Math.max(0, gestureFingerCount - 1); if (prevCount == 3 && gestureFingerCount == 2) { - // Three-finger gesture ending handleTsThreeFingerUp(event); } else if (prevCount == 2 && gestureFingerCount == 1) { - // Two-finger gesture ending (2→1) handleTsPointerUp(event); } else if (prevCount >= 4) { if (removedIndex < 3) rebaseThreeFingerMovement(event); } else if (prevCount >= 1 && gestureFingerCount == 0) { - // Last gesture finger lifted while controls still hold pointers handleTsUp(event, actionIndex); } } @@ -261,9 +229,6 @@ public final class TouchscreenGestures { int prevCount = gestureFingerCount; gestureOwnedPointerIds.remove(Integer.valueOf(pointerId)); gestureFingerCount = Math.max(0, gestureFingerCount - 1); - // Clean up multi-finger state if needed, routing by previous - // gesture mode so a 3-finger gesture isn't ended via the - // two-finger cleanup path. if (prevCount >= 3) { handleTsThreeFingerUp(event); } else if (prevCount == 2) { @@ -271,7 +236,6 @@ public final class TouchscreenGestures { } handleTsUp(event, actionIndex); } - // ACTION_UP = last pointer overall — full cleanup gestureOwnedPointerIds.clear(); gestureFingerCount = 0; break; @@ -309,15 +273,12 @@ public final class TouchscreenGestures { threeFingerHoldTriggered = false; accumulatedThreeFingerDelta = 0; - // Store raw touch coordinates for long-press movement tolerance touchDownRawX = event.getX(actionIndex); touchDownRawY = event.getY(actionIndex); singleFingerDownTime = SystemClock.uptimeMillis(); singleFingerLastRawX = touchDownRawX; singleFingerLastRawY = touchDownRawY; - // Keep a nearby re-tap undecided until UP: it can still become a drag, - // long press, or multi-finger gesture instead of a double click. if (isDoubleTap(event, actionIndex)) { secondTapCandidate = true; doubleTapAnchorX = lastTapX; @@ -327,7 +288,6 @@ public final class TouchscreenGestures { if (!secondTapCandidate && delayedPress == null && pendingTapPress == null) moveCursorTo(x, y); - // Schedule long-press if (gestureConfig.getLongPressEnabled()) { longPressRunnable = () -> { secondTapCandidate = false; @@ -342,7 +302,6 @@ public final class TouchscreenGestures { postDelayed(longPressRunnable, gestureConfig.getLongPressDelay()); } - // Tap: immediate cursor move (press is deferred to UP for click, or MOVE for drag) } private void handleTsPointerDown(MotionEvent event) { @@ -351,11 +310,6 @@ public final class TouchscreenGestures { flushPendingTapRelease(); lastTapTime = 0; flushPendingHoldClickRelease(); - // Cancel any single-finger long-press. cancelLongPressTimer only - // clears the pending runnable; if the long-press has already fired - // we must also release the held action before we transition into a - // multi-finger gesture, otherwise the long-press button/key stays - // down for the rest of the touch sequence. if (longPressTriggered) { longPressActionHeld = releaseHoldAction(longPressActionHeld, gestureConfig.getLongPressAction()); longPressTriggered = false; @@ -388,7 +342,6 @@ public final class TouchscreenGestures { event.getY(idx0) - event.getY(idx1)); recordMultiFingerOrigins(event, 2); } - // Schedule two-finger hold if (gestureConfig.getTwoFingerHoldEnabled()) { twoFingerHoldRunnable = () -> { twoFingerHoldTriggered = true; @@ -404,33 +357,26 @@ public final class TouchscreenGestures { } private void handleTsMove(MotionEvent event, int pointerIndex) { - // After a multi-finger gesture, ignore single-finger movement until all fingers lift if (multiFingerGestureUsed) return; int x = (int) event.getX(pointerIndex); int y = (int) event.getY(pointerIndex); - // If long press already triggered, ignore movement (right-click already sent) if (longPressTriggered) return; - // Measure raw finger travel from initial touch point float rawTravel = maxFingerTravel(event, pointerIndex, touchDownRawX, touchDownRawY); if (secondTapCandidate && (rawTravel > doubleTapSlop || maxFingerTravel(event, pointerIndex, doubleTapAnchorX, doubleTapAnchorY) >= doubleTapSlop)) { secondTapCandidate = false; } - // The threshold decides when a drag starts. An active drag must keep - // following the finger even when it returns through the touch origin. if (!isDragging && rawTravel <= LONG_PRESS_MOVE_TOLERANCE) { return; } - // Beyond tolerance — cancel long press cancelLongPressTimer(); movedBeyondTapThreshold = true; - // Detect drag start if (!isDragging && gestureConfig.getDragEnabled()) { flushPendingTapRelease(); String dragAction = gestureConfig.getDragAction(); @@ -438,14 +384,7 @@ public final class TouchscreenGestures { dragButtonPressed = true; singleFingerLastRawX = event.getX(pointerIndex); singleFingerLastRawY = event.getY(pointerIndex); - // Send the configured drag press immediately so that a short - // move followed straight by UP still produces a press+release - // pair. A zero-delta performPanAction just presses the button - // (or is a no-op for the key-pan variants, which press per - // direction on their next move frame). if (isClickDragAction(dragAction)) { - // The candidate's cursor stayed at the previous click. Start - // a drag at this touch's own origin before pressing its button. moveCursorTo((int) touchDownRawX, (int) touchDownRawY); if (useRelativeMouseDragMovement()) { pressClickDragAction(dragAction); @@ -456,7 +395,6 @@ public final class TouchscreenGestures { performPanAction(0f, 0f, dragAction); } notifyGesture(Gesture.DRAG); - // Non-click pan actions continue with real deltas on the next frame. return; } @@ -481,14 +419,11 @@ public final class TouchscreenGestures { return; } - // Move cursor moveCursorTo(x, y); } private void handleTsTwoFingerMove(MotionEvent event) { if (multiFingerGestureUsed) return; - // If a two-finger hold has already fired, ignore subsequent jitter so - // it can't lock into a pan/zoom gesture mid-hold. if (twoFingerHoldTriggered) return; if (gestureFingerCount < 2 || gestureOwnedPointerIds.size() < 2) return; @@ -496,20 +431,15 @@ public final class TouchscreenGestures { int idx1 = event.findPointerIndex(gestureOwnedPointerIds.get(1)); if (idx0 < 0 || idx1 < 0) return; - // Settling delays recognition, not movement tracking. A swipe or pinch - // must stop being a tap/hold even when it finishes inside that delay. if (multiFingerMovementExceeded(event)) { twoFingerTapPossible = false; cancelTwoFingerHoldTimer(); } - // Slow deliberate travel can cross touch slop before reaching the - // pan/zoom threshold. It must not turn into a stationary hold first. if (multiFingerMovementExceeded(event, true)) cancelTwoFingerHoldTimer(); float x0 = event.getX(idx0), y0 = event.getY(idx0); float x1 = event.getX(idx1), y1 = event.getY(idx1); - // Compute per-frame pan and pinch deltas float currDist = (float) Math.hypot(x0 - x1, y0 - y1); float framePinchDelta = Math.abs(currDist - pinchLastDistance); @@ -523,7 +453,6 @@ public final class TouchscreenGestures { long now = SystemClock.uptimeMillis(); if (now - twoFingerDownTime < TWO_FINGER_SETTLE_MS) { - // Still settling — update stored positions but don't accumulate deltas twoFingerLastX0 = x0; twoFingerLastY0 = y0; twoFingerLastX1 = x1; twoFingerLastY1 = y1; pinchLastDistance = currDist; @@ -531,14 +460,12 @@ public final class TouchscreenGestures { } long frameTime = now - twoFingerLastMoveTime; twoFingerLastMoveTime = now; - float velocity = (frameTime > 0) ? framePanDelta / frameTime : 0; // px/ms + float velocity = (frameTime > 0) ? framePanDelta / frameTime : 0; - // Accumulate deltas until we have enough movement to decide gesture type if (twoFingerGestureMode == TWO_FINGER_GESTURE_NONE) { accumulatedPinchDelta += framePinchDelta; accumulatedPanDelta += framePanDelta; if (accumulatedPinchDelta + accumulatedPanDelta > (float) gestureConfig.getGestureThreshold()) { - // Enough movement to lock into a gesture — no longer a tap or hold twoFingerTapPossible = false; cancelTwoFingerHoldTimer(); if (accumulatedPinchDelta > accumulatedPanDelta * PINCH_RATIO_THRESHOLD @@ -551,7 +478,6 @@ public final class TouchscreenGestures { twoFingerLockTime = now; notifyGesture(Gesture.TWO_FINGER_DRAG); } else if (accumulatedPanDelta >= accumulatedPinchDelta && gestureConfig.getTwoFingerDragEnabled()) { - // Fallback: pan is dominant but velocity was too low — still drag twoFingerGestureMode = TWO_FINGER_GESTURE_PAN; twoFingerLockTime = now; notifyGesture(Gesture.TWO_FINGER_DRAG); @@ -571,7 +497,7 @@ public final class TouchscreenGestures { reclassifyPinchDelta += framePinchDelta; reclassifyPanDelta += framePanDelta; float reclassifyTotal = reclassifyPinchDelta + reclassifyPanDelta; - if (reclassifyTotal > 20f) { // enough post-lock data to reclassify + if (reclassifyTotal > 20f) { boolean shouldBeZoom = reclassifyPinchDelta > reclassifyPanDelta * PINCH_RATIO_THRESHOLD; if (shouldBeZoom && twoFingerGestureMode == TWO_FINGER_GESTURE_PAN && gestureConfig.getPinchEnabled()) { @@ -585,7 +511,7 @@ public final class TouchscreenGestures { resetSmallMovement(); notifyGesture(Gesture.TWO_FINGER_DRAG); } - twoFingerLockTime = 0; // done reclassifying + twoFingerLockTime = 0; reclassifyPinchDelta = 0; reclassifyPanDelta = 0; } @@ -595,12 +521,10 @@ public final class TouchscreenGestures { pinchZoomRemainder = accumulateSignedMovement(pinchZoomRemainder, delta); if (Math.abs(pinchZoomRemainder) >= PINCH_STEP_PX) { performZoomAction(pinchZoomRemainder > 0); - // Keep the fractional travel, without queuing a burst of old - // zoom actions after a large move or a direction reversal. pinchZoomRemainder %= PINCH_STEP_PX; } } - pinchLastDistance = currDist; // Always update baseline to avoid stale deltas + pinchLastDistance = currDist; if (twoFingerGestureMode == TWO_FINGER_GESTURE_PAN) { String twoFingerDragAction = gestureConfig.getTwoFingerDragAction(); if (isClickDragAction(twoFingerDragAction)) { @@ -627,14 +551,11 @@ public final class TouchscreenGestures { private void handleTsPointerUp(MotionEvent event) { cancelTwoFingerHoldTimer(); if (multiFingerMovementExceeded(event)) twoFingerTapPossible = false; - // Two-finger hold release if (twoFingerHoldTriggered) { twoFingerHoldActionHeld = releaseHoldAction(twoFingerHoldActionHeld, gestureConfig.getTwoFingerHoldAction()); twoFingerHoldTriggered = false; } - // Two-finger tap detection else if (twoFingerTapPossible && !twoFingerDragging && gestureConfig.getTwoFingerTapEnabled()) { - // Move cursor to midpoint between the two fingers float midX = (twoFingerLastX0 + twoFingerLastX1) / 2f; float midY = (twoFingerLastY0 + twoFingerLastY1) / 2f; queueTapClick(gestureConfig.getTwoFingerTapAction(), midX, midY); @@ -652,7 +573,6 @@ public final class TouchscreenGestures { reclassifyPinchDelta = 0; reclassifyPanDelta = 0; twoFingerLockTime = 0; - // Suppress single-finger tap/drag when last finger lifts after any 2F gesture movedBeyondTapThreshold = true; multiFingerGestureUsed = true; } @@ -661,7 +581,6 @@ public final class TouchscreenGestures { cancelLongPressTimer(); if (longPressTriggered) { - // Release the long-press action longPressActionHeld = releaseHoldAction(longPressActionHeld, gestureConfig.getLongPressAction()); longPressTriggered = false; return; @@ -671,7 +590,6 @@ public final class TouchscreenGestures { float y = event.getY(actionIndex); if (isDragging && dragButtonPressed) { - // End drag (release any held drag buttons/keys) releaseDragInput(); dragButtonPressed = false; isDragging = false; @@ -685,8 +603,6 @@ public final class TouchscreenGestures { ? gestureConfig.getLongPressDelay() : ViewConfiguration.getLongPressTimeout(); if (SystemClock.uptimeMillis() - singleFingerDownTime < tapLimit && Math.hypot(x - doubleTapAnchorX, y - doubleTapAnchorY) < doubleTapSlop) { - // A normal left tap already supplied the first click. Other - // single-tap mappings need a complete synthesized double click. boolean firstTapClicked = gestureConfig.getTapEnabled() && TouchGestureConfig.ACTION_LEFT_CLICK.equals(gestureConfig.getTapAction()); int clicks = firstTapClicked ? 1 : 2; @@ -697,26 +613,21 @@ public final class TouchscreenGestures { } } - // Two-finger tap already sent its click on POINTER_UP — skip the tap on UP if (twoFingerTapFired) { twoFingerTapFired = false; return; } - // Three-finger tap already sent its click — skip the tap on UP if (threeFingerTapFired) { threeFingerTapFired = false; return; } - // Simple tap — only if finger stayed within tap tolerance if (gestureConfig.getTapEnabled() && !movedBeyondTapThreshold) { queueTapClick(gestureConfig.getTapAction(), x, y); notifyGesture(Gesture.TAP); } - // Record for double-tap detection (even if tap itself is disabled, - // so double-tap can still prime from single touch-ups) if (!movedBeyondTapThreshold && (gestureConfig.getTapEnabled() || gestureConfig.getDoubleTapEnabled())) { lastTapTime = SystemClock.uptimeMillis(); lastTapX = x; @@ -776,13 +687,10 @@ public final class TouchscreenGestures { cancelLongPressTimer(); cancelDrag(); cancelTwoFingerHoldTimer(); - // If a two-finger hold already injected its action, release it before - // transitioning so the held button/key doesn't stay down. if (twoFingerHoldTriggered) { twoFingerHoldActionHeld = releaseHoldAction(twoFingerHoldActionHeld, gestureConfig.getTwoFingerHoldAction()); twoFingerHoldTriggered = false; } - // Clean up two-finger state releaseDragInput(); resetSmallMovement(); twoFingerDragging = false; @@ -797,7 +705,6 @@ public final class TouchscreenGestures { threeFingerDragOffsetX = threeFingerDragOffsetY = 0f; threeFingerDownTime = SystemClock.uptimeMillis(); - // Compute midpoint of three gesture fingers if (gestureOwnedPointerIds.size() >= 3) { float sumX = 0, sumY = 0; int validCount = 0; @@ -809,13 +716,12 @@ public final class TouchscreenGestures { validCount++; } } - if (validCount < 3) return; // Can't proceed without all 3 pointers + if (validCount < 3) return; threeFingerLastMidX = sumX / 3f; threeFingerLastMidY = sumY / 3f; recordMultiFingerOrigins(event, 3); } - // Schedule three-finger hold if (gestureConfig.getThreeFingerHoldEnabled()) { threeFingerHoldRunnable = () -> { threeFingerHoldTriggered = true; @@ -831,8 +737,6 @@ public final class TouchscreenGestures { private void handleTsThreeFingerMove(MotionEvent event) { if (gestureFingerCount < 3 || gestureOwnedPointerIds.size() < 3) return; - // If a three-finger hold has already fired, ignore subsequent jitter so - // it can't lock into a pan gesture mid-hold. if (threeFingerHoldTriggered) return; if (multiFingerMovementExceeded(event)) { threeFingerTapPossible = false; @@ -877,8 +781,6 @@ public final class TouchscreenGestures { } if (threeFingerGestureMode == THREE_FINGER_GESTURE_PAN) { - // Once recognized, retain small mouse movements. Keyboard panning - // accumulates its own direction threshold in performKeyPan. String threeFingerDragAction = gestureConfig.getThreeFingerDragAction(); if (isClickDragAction(threeFingerDragAction)) { if (useRelativeMouseDragMovement()) { @@ -919,7 +821,6 @@ public final class TouchscreenGestures { multiFingerStartCount = 0; resetSmallMovement(); threeFingerGestureMode = THREE_FINGER_GESTURE_NONE; - // Suppress single-finger tap/drag when last finger lifts after any 3F gesture movedBeyondTapThreshold = true; multiFingerGestureUsed = true; } @@ -966,7 +867,6 @@ public final class TouchscreenGestures { } x /= 3f; y /= 3f; - // Replacing a tracked finger changes the centroid without moving the cursor. if (threeFingerDragging) { threeFingerDragOffsetX += threeFingerLastMidX - x; threeFingerDragOffsetY += threeFingerLastMidY - y; @@ -1030,9 +930,6 @@ public final class TouchscreenGestures { private void startPendingTapClick() { if (delayedPress != null || pendingTapPress != null || pendingTapClicks.isEmpty()) return; TapClick click = pendingTapClicks.peekFirst(); - // Games that poll button state need an observable UP interval too. - // Reuse the first tap's location: normal finger drift must not turn - // this into two clicks on different targets or a tiny drag. long delay = Math.max(0, CLICK_DELAYED_TIME - (SystemClock.uptimeMillis() - lastInputReleaseTime)); pendingTapPress = () -> { pendingTapPress = null; @@ -1224,9 +1121,6 @@ public final class TouchscreenGestures { pressButton(MouseButton.BUTTON_MIDDLE); twoFingerMiddleButtonDown = true; } - // Pan from the client's current pointer. Games can recenter the mouse - // when the middle button goes down; replaying our old absolute touch - // anchor after that warp causes a large, unintended camera movement. moveCursorByRelativeDelta(dx, dy); } @@ -1287,10 +1181,6 @@ public final class TouchscreenGestures { } private void performKeyPan(float dx, float dy, Integer leftKey, Integer rightKey, Integer upKey, Integer downKey) { - // When fingers are actively moving, update key states to match the - // swipe direction. When fingers stop moving but stay on screen, - // keep the current keys held — movement continues until finger-up - // calls releasePanKeys(). keyPanRemainderX = accumulateSignedMovement(keyPanRemainderX, dx); keyPanRemainderY = accumulateSignedMovement(keyPanRemainderY, dy); @@ -1300,9 +1190,6 @@ public final class TouchscreenGestures { dy = keyPanRemainderY; keyPanRemainderX = keyPanRemainderY = 0f; - // --- Significant movement detected: update each axis --- - - // Horizontal: determine desired state from this frame's delta boolean wantLeft = dx < -3f; boolean wantRight = dx > 3f; @@ -1311,7 +1198,6 @@ public final class TouchscreenGestures { if (wantLeft && !panKeyLeft) { pressKey(leftKey); panKeyLeft = true; panLeftKey = leftKey; } if (wantRight && !panKeyRight) { pressKey(rightKey); panKeyRight = true; panRightKey = rightKey; } - // Vertical: determine desired state from this frame's delta boolean wantUp = dy < -3f; boolean wantDown = dy > 3f; diff --git a/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt b/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt index 343d18bdd4..0734710a39 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/VrControllers.kt @@ -6,7 +6,6 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import java.io.File -/** What SteamVR sees for the game pad. The driver reads the file once, when SteamVR starts. */ object VrControllers { enum class Emulate(val key: String) { OFF("off"), INDEX("index"), TOUCH("touch"), VIVE("vive") } @@ -46,7 +45,6 @@ object VrControllers { fun encode(settings: Settings): String = "emulate=${settings.emulate.key}\nsticks=${if (settings.sticksMoveHands) "hands" else "game"}\n" - /** Writes into the session's runtime dir, which the guest sees as /run/droiddeck. */ fun publish(context: Context) { runCatching { val dir = File(context.filesDir, ".wayland-rt").apply { mkdirs() } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index e3a64e9628..fa58c26ea5 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -17,13 +17,14 @@ object BattleNet { const val PROGRAM = "/usr/local/bin/droiddeck-battlenet" - class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null, val product: String? = null) + class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null, val product: String? = null, val flavor: String? = null) internal val TITLES = listOf( - Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight", product = "wow"), - Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades", product = "wow_classic"), - Title("wow_classic_era", "World of Warcraft Classic", "WoWC", product = "wow_classic_era"), - Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC", product = "wow_anniversary"), + Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight", product = "wow", flavor = "_retail_"), + Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades", product = "wow_classic", flavor = "_classic_"), + Title("wow_classic_era", "World of Warcraft Classic", "WoWC", product = "wow_classic_era", flavor = "_classic_era_"), + Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC", product = "wow_anniversary", flavor = "_anniversary_"), + Title("wow_forever", "World of Warcraft: Forever", "WoWF", shop = "world-of-warcraft-forever", product = "wowf", flavor = "_forever_"), Title("diablo3", "Diablo III", "D3", shop = "diablo-iii", product = "d3"), Title("d3cn", "Diablo III", "D3CN", shop = "diablo-iii"), Title("s2", "StarCraft II", "S2", shop = "starcraft-ii", product = "s2"), @@ -58,15 +59,17 @@ object BattleNet { Title("aqua", "Avowed", "AQUA", 2457220, shop = "avowed", product = "aqua"), ) - val STORE: List get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" } + val STORE: List<Title> get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" && it.code != "WoWF" } fun notInstalled(title: Title, installedIds: Collection<String?>) = installedIds.mapNotNull { id -> id?.let(::title)?.code }.none { it == title.code } private const val COVER_RETRY_MS = 24 * 3600_000L + internal fun artTitle(title: Title) = TITLES.firstOrNull { it.code == title.code } ?: title + private fun coverDir(context: Context, title: Title) = - File(context.filesDir, "battlenet-art/${(TITLES.firstOrNull { it.code == title.code } ?: title).uid}") + File(context.filesDir, "battlenet-art/${artTitle(title).uid}") fun cover(context: Context, title: Title): File? = art(context, title).cover @@ -78,7 +81,7 @@ object BattleNet { var got = false for (title in titles) { val dir = coverDir(context, title) - val tried = File(dir, ".tried") + val tried = File(dir, ".tried-2") val wide = File(dir, BLIZZARD) val done = File(dir, "p.jpg").isFile && (title.shop == null || wide.isFile) if (done || System.currentTimeMillis() - tried.lastModified() < COVER_RETRY_MS) continue @@ -86,11 +89,15 @@ object BattleNet { if (title.steam != null && runCatching { art.download(title.steam.toString(), dir) }.getOrDefault(false)) got = true if (title.shop != null && !wide.isFile) { val cover = File(dir, BLIZZARD_COVER).takeUnless { File(dir, "p.jpg").isFile } - if (runCatching { com.droiddeck.launcher.stores.battlenet.BlizzardArt.fetch(title.shop, wide, cover) } - .onFailure { Log.w(TAG, "Blizzard art for ${title.uid}: ${it.javaClass.simpleName}") }.getOrDefault(false)) got = true + if (runCatching { com.droiddeck.launcher.stores.battlenet.BlizzardArt.fetch(title.code, title.shop, wide, cover) } + .onFailure { Log.w(TAG, "Blizzard art for ${title.uid}: ${it.javaClass.simpleName}") }.getOrDefault(false)) { + got = true + File(dir, OLD_BLIZZARD).delete() + File(dir, OLD_BLIZZARD_COVER).delete() + } } if (!File(dir, "p.jpg").isFile && !File(dir, BLIZZARD_COVER).isFile && key.isNotEmpty()) { - val id = runCatching { com.droiddeck.launcher.frontend.SteamGridDb.gameId(key, title.steam, title.name) }.getOrNull() + val id = runCatching { com.droiddeck.launcher.frontend.SteamGridDb.exactGameId(key, title.steam, title.name) }.getOrNull() if (id != null && runCatching { com.droiddeck.launcher.frontend.SteamGridDb.download(key, id, dir) }.getOrDefault(false)) got = true } runCatching { tried.writeText("") ; tried.setLastModified(System.currentTimeMillis()) } @@ -110,13 +117,15 @@ object BattleNet { class Art(val cover: File?, val header: File?) - private const val BLIZZARD = "blizzard.jpg" - private const val BLIZZARD_COVER = "p-blizzard.jpg" + private const val BLIZZARD = "blizzard-2.jpg" + private const val BLIZZARD_COVER = "p-blizzard-2.jpg" + private const val OLD_BLIZZARD = "blizzard.jpg" + private const val OLD_BLIZZARD_COVER = "p-blizzard.jpg" fun art(context: Context, title: Title): Art { val dir = coverDir(context, title) fun first(vararg names: String) = names.map { File(dir, it) }.firstOrNull { it.isFile } - return Art(first("p.jpg", BLIZZARD_COVER), first(BLIZZARD, "header.jpg")) + return Art(first("p.jpg", BLIZZARD_COVER, OLD_BLIZZARD_COVER), first(BLIZZARD, OLD_BLIZZARD, "header.jpg")) } fun prefix(context: Context) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/compatdata/$APP_ID") @@ -159,24 +168,56 @@ object BattleNet { return if (base.isNotEmpty() && id.substringAfterLast('_') in LOCALES) TITLES.firstOrNull { it.uid == base } else null } + internal fun titleForProduct(product: String): Title? { + val code = product.trim() + if (code.isEmpty()) return null + return TITLES.firstOrNull { it.product.equals(code, ignoreCase = true) } ?: TITLES.firstOrNull { it.code.equals(code, ignoreCase = true) } + } + fun games(context: Context): List<Game> { val pfx = File(prefix(context), "pfx") + val agent = runCatching { productDbInstalls(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrNull() val entries = installs( runCatching { File(pfx, "system.reg").useLines { uninstallEntries(it) } }.getOrDefault(emptyList()), - runCatching { productDbEntries(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrNull(), + agent?.map { it.uid to it.path }, ) - val found = LinkedHashMap<String, Game>() + val products = agent.orEmpty().filter { it.product.isNotEmpty() }.associate { it.uid.lowercase() to it.product } + val listed = LinkedHashMap<String, Triple<Title, String, File>>() for ((uid, path) in entries) { - val title = title(uid) + val title = title(uid) ?: products[uid.lowercase()]?.let(::titleForProduct) if (title == null) { if (uid.lowercase() !in NOT_GAMES) Log.i(TAG, "not listed: $uid (no launch code known)") continue } - if (title.code in found) continue + if (title.code in listed) continue val folder = hostFolder(context, path)?.takeIf { it.isDirectory } ?: continue - found[title.code] = Game(title.uid, title.name, title.code, folder, uid) + listed[title.code] = Triple(title, uid, folder) } - return found.values.toList() + val saved = listed.mapValues { (code, _) -> com.droiddeck.launcher.session.SessionPrefs.battleNetFolder(context, code) } + val folders = ownFolders(listed.mapValues { it.value.first to it.value.third }, saved) + return listed.map { (code, found) -> + val folder = folders.getValue(code) + if (saved[code] != folder.path) com.droiddeck.launcher.session.SessionPrefs.setBattleNetFolder(context, code, folder.path) + Game(found.first.uid, found.first.name, code, folder, found.second) + } + } + + internal fun ownFolders(games: Map<String, Pair<Title, File>>, saved: Map<String, String?>): Map<String, File> { + val out = HashMap<String, File>() + val taken = HashSet<File>() + fun options(title: Title, folder: File) = listOfNotNull(folder, title.flavor?.let { File(folder, it) }?.takeIf { it.isDirectory }) + for ((code, game) in games) { + val keep = saved[code]?.let(::File)?.takeIf { it in options(game.first, game.second) && it !in taken } ?: continue + out[code] = keep + taken.add(keep) + } + for ((code, game) in games) { + if (code in out) continue + val pick = options(game.first, game.second).firstOrNull { it !in taken } ?: game.second + out[code] = pick + taken.add(pick) + } + return games.keys.associateWith { out.getValue(it) } } internal fun installs(registry: List<Pair<String, String>>, agent: List<Pair<String, String>>?): List<Pair<String, String>> { @@ -250,17 +291,22 @@ object BattleNet { return out.toString() } - internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? { + internal class AgentInstall(val uid: String, val path: String, val product: String) + + internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? = productDbInstalls(bytes)?.map { it.uid to it.path } + + internal fun productDbInstalls(bytes: ByteArray): List<AgentInstall>? { val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrNull()?.filter { it.first == 1 }?.takeIf { it.isNotEmpty() } ?: return null return installs.map { (_, start, end) -> runCatching { val install = fields(bytes, start, end) val uid = install.firstOrNull { it.first == 1 }?.let { String(bytes, it.second, it.third - it.second) } + val product = install.firstOrNull { it.first == 2 }?.let { String(bytes, it.second, it.third - it.second) }.orEmpty() val path = install.firstOrNull { it.first == 3 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } ?.let { String(bytes, it.second, it.third - it.second) } val installed = install.firstOrNull { it.first == 4 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } ?.let { s -> varints(bytes, s.second, s.third)[1] } - if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else uid to path + if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else AgentInstall(uid, path, product) }.getOrElse { return null } }.filterNotNull() } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt index d3ab2b546b..2d1a9aa401 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -75,7 +75,10 @@ object BwrapSpawner { } } - class Plan(val root: File, val binds: List<Bind>, val cwd: String, val argv: List<String>, val env: Map<String, String>) + class Plan( + val root: File, val binds: List<Bind>, val cwd: String, val argv: List<String>, val env: Map<String, String>, + val envTool: String = "/usr/bin/env", + ) data class Bind(val host: String, val guest: String) { val spec: String get() = if (host == guest) host else "$host:$guest" @@ -179,12 +182,13 @@ object BwrapSpawner { val argv = request.getJSONArray("argv").let { a -> (0 until a.length()).map { a.getString(it) } } val env = LinkedHashMap<String, String>() request.optJSONObject("env")?.let { e -> e.keys().forEach { k -> env[k] = e.getString(k) } } - if (binds.any { it.guest == "/dev" }) gpu(rootfs, root, env)?.forEach { addBind(it) } + val envTool = request.optString("envTool").takeIf { it.startsWith("/") } + if (envTool == null && binds.any { it.guest == "/dev" }) gpu(rootfs, root, env)?.forEach { addBind(it) } val libc = listOf("/usr/lib/aarch64-linux-gnu/libc.so.6", "/lib/aarch64-linux-gnu/libc.so.6").map { hostPath(binds, root.path, it) } - if (preloadFits(rootfs, libc.firstOrNull { File(it).isFile } ?: libc.first())) preload(session, rootfs, env).forEach { addBind(it) } + if (envTool == null && preloadFits(rootfs, libc.firstOrNull { File(it).isFile } ?: libc.first())) preload(session, rootfs, env).forEach { addBind(it) } zypakShims(binds, root, dir).forEach { addBind(it) } browserSandboxes(env) - return Plan(root, binds, request.optString("cwd", "/").ifEmpty { "/" }, argv, env) + return Plan(root, binds, request.optString("cwd", "/").ifEmpty { "/" }, argv, env, envTool ?: "/usr/bin/env") } private const val GPU_DIR = "/run/droiddeck-gpu" @@ -196,6 +200,7 @@ object BwrapSpawner { LIB_DIRS.map { File(rootfs, "$it/$name") }.firstOrNull { it.exists() } private fun gpu(rootfs: String, root: File, env: MutableMap<String, String>): List<Bind>? { + env["VKBRIDGE_SOCKET"]?.let { sock -> if (File(sock).exists()) return bridgeGpu(rootfs, root, env, sock) } val driver = runtimeLib(rootfs, "libvulkan_freedreno.so") if (driver == null || !File("/dev/kgsl-3d0").exists()) return null if (env.containsKey("VK_ICD_FILENAMES") || env.containsKey("VK_DRIVER_FILES")) return null @@ -218,6 +223,28 @@ object BwrapSpawner { return binds } + private fun bridgeGpu(rootfs: String, root: File, env: MutableMap<String, String>, socket: String): List<Bind>? { + val driver = File(rootfs, "usr/local/lib/vkbridge/libvulkan_droidbridge.so") + if (!driver.isFile) { Log.w(TAG, "gpu: vkbridge session but no bridge ICD in the runtime"); return null } + val binds = ArrayList<Bind>() + binds.add(Bind(driver.canonicalPath, "$GPU_DIR/libvulkan_droidbridge.so")) + val sockDir = File(socket).parent ?: return null + binds.add(Bind(sockDir, sockDir)) + val icd = File(root.parentFile, "vkbridge_icd.json") + val api = runCatching { + JSONObject(File(rootfs, "usr/local/share/vkbridge/droidbridge_icd.json").readText()).getJSONObject("ICD").getString("api_version") + }.getOrNull() ?: run { Log.w(TAG, "gpu: vkbridge session but the runtime's bridge manifest is unreadable"); return null } + icd.writeText("{\"file_format_version\": \"1.0.0\", \"ICD\": {\"library_path\": \"$GPU_DIR/libvulkan_droidbridge.so\", \"api_version\": \"$api\"}}\n") + binds.add(Bind(icd.path, "$GPU_DIR/vkbridge_icd.json")) + env["VK_DRIVER_FILES"] = "$GPU_DIR/vkbridge_icd.json" + env["VK_ICD_FILENAMES"] = "$GPU_DIR/vkbridge_icd.json" + if (!env.containsKey("MESA_LOADER_DRIVER_OVERRIDE") && !env.containsKey("GALLIUM_DRIVER")) { + env["MESA_LOADER_DRIVER_OVERRIDE"] = "zink" + env["GALLIUM_DRIVER"] = "zink" + } + return binds + } + private fun preload(session: List<Bind>, rootfs: String, env: MutableMap<String, String>): List<Bind> { val libs = FileUtils.readString(File(rootfs, "etc/ld.so.preload"))?.lines() ?.map { it.trim() }?.filter { it.startsWith("/") && File(rootfs + it).isFile } ?: return emptyList() @@ -325,7 +352,7 @@ object BwrapSpawner { val verbose = plan.env["DROIDDECK_PROOT_VERBOSE"]?.toIntOrNull() if (verbose != null) { cmd.add(1, "-v"); cmd.add(2, verbose.toString()) } plan.binds.forEach { cmd.add("-b"); cmd.add(it.spec) } - cmd.add("/usr/bin/env") + cmd.add(plan.envTool) cmd.add("-i") plan.env.forEach { (k, v) -> cmd.add("$k=$v") } cmd.addAll(plan.argv) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt index 5c5687c967..c45c748210 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt @@ -23,7 +23,6 @@ object DeckyManager { private const val PATH = "root/homebrew/services/PluginLoader" private const val VERSION = "root/homebrew/services/.droiddeck-decky-version" private const val SETTINGS = "root/homebrew/settings/loader.json" - // droiddeck-session reads the marker from the root of the client it runs. private val CEF_REMOTE_DEBUG_MARKERS = listOf( "root/.local/share/Steam/.cef-enable-remote-debugging", "root/.droiddeck-x64/.local/share/Steam/.cef-enable-remote-debugging", @@ -58,7 +57,6 @@ object DeckyManager { check(staged.renameTo(file)) { "cannot write ${file.path}" } } - // Mirrors Decky's updater: Stable takes the newest non-prerelease tag, Prerelease the newest tag of either kind. fun latest(channels: ReleaseChannels, branch: Int): Release? = if (branch == BRANCH_STABLE) channels.stable.firstOrNull() else channels.all.firstOrNull() diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt index 4a4857634b..2b976796fc 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -51,7 +51,6 @@ object DesktopCatalog { private fun journal(root: File, id: String) = File(root, ".droiddeck-pkg-$id$JOURNAL_SUFFIX") - /** Packages whose extraction over the runtime started and never finished. */ fun interrupted(context: Context): List<Entry> = interrupted(LinuxRuntime.rootDir(context)) fun interrupted(root: File): List<Entry> = @@ -63,7 +62,6 @@ object DesktopCatalog { private fun downloadFile(context: Context, entry: Entry) = File(context.cacheDir, "pkg-${entry.id}-${entry.sha256.take(12)}.download") - /** Drops downloads kept for installs that no longer need finishing, such as after the runtime was reinstalled. */ fun pruneDownloads(context: Context) = synchronized(installLock) { val keep = interrupted(context).map { downloadFile(context, it).name }.toSet() context.cacheDir.listFiles { f -> f.name.startsWith("pkg-") && f.name.removeSuffix(".resume.properties").endsWith(".download") } @@ -102,7 +100,6 @@ object DesktopCatalog { o.optString("icon", "applications-games"), o.optString("category", "Game"), ) - /** A finished download is kept until its extraction completes, so resuming does not fetch it again. */ private fun downloaded(file: File, entry: Entry): Boolean = file.isFile && file.length() > 0 && !File(file.path + ".resume.properties").exists() && (entry.size <= 0 || file.length() == entry.size) && entry.sha256.equals(Hashes.sha256(file), ignoreCase = true) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt new file mode 100644 index 0000000000..83bfa6748a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopLanguage.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.BuildConfig +import com.droiddeck.launcher.core.Downloader +import com.droiddeck.launcher.core.FileUtils +import com.droiddeck.launcher.core.Hashes +import com.droiddeck.launcher.session.DesktopLocale +import java.io.File +import java.util.Locale + +object DesktopLanguage { + private const val TAG = "DesktopLanguage" + private const val INDEX = "desktop-kde.i18n.txt" + private const val ABSENT = "absent" + + class Pack(val locale: String, val sha256: String, val size: Long) + + internal fun parseIndex(text: String): Map<String, Pack> = text.lineSequence().mapNotNull { line -> + val parts = line.trim().split(' ') + if (parts.size != 3 || !parts[0].matches(Regex("[A-Za-z_]+")) || !parts[1].matches(Regex("[0-9a-fA-F]{64}"))) return@mapNotNull null + Pack(parts[0], parts[1], parts[2].toLongOrNull() ?: return@mapNotNull null) + }.associateBy { it.locale } + + /** KDE ships region packs (pt_BR, zh_TW) beside bare-language ones (pt, es). */ + internal fun candidates(locale: Locale): List<String> { + val region = DesktopLocale.lang(locale).removeSuffix(".UTF-8") + if (region == DesktopLocale.DEFAULT.removeSuffix(".UTF-8") || region.startsWith("en")) return emptyList() + return listOfNotNull(region, "zh_TW".takeIf { region == "zh_HK" }, region.substringBefore('_')).distinct() + } + + internal fun baseUrl(desktopUrl: String) = desktopUrl.substringBeforeLast('/') + "/" + + private fun marker(root: File, tag: String, name: String) = File(root, ".droiddeck-i18n-$tag-$name") + + /** Installs the desktop's translations for [locale]; false when a download failed and is worth retrying. */ + @Synchronized + fun ensure(context: Context, locale: Locale): Boolean { + val root = LinuxRuntime.rootDir(context) + if (!DesktopCatalog.desktopInstalled(root)) return true + val entry = DesktopCatalog.desktopEntry(context) + val tag = "${entry.version}-${BuildConfig.DESKTOP_KDE_TAG}" + val pending = candidates(locale).filterNot { marker(root, tag, it).isFile } + if (pending.isEmpty()) return true + val base = baseUrl(BuildConfig.DESKTOP_KDE_URL) + val index = parseIndex(Downloader.downloadString(base + INDEX) ?: return false) + var complete = true + for (name in pending) { + val pack = index[name] + if (pack == null) { + FileUtils.writeString(marker(root, tag, name), ABSENT) + continue + } + val download = File(context.cacheDir, "i18n-$name-${pack.sha256.take(12)}.download") + try { + val ok = Downloader.downloadFile( + base + "desktop-kde-i18n-$name.tar.zst", download, true, pack.sha256, java.util.function.Consumer<Float> { }, + ) && pack.sha256.equals(Hashes.sha256(download), ignoreCase = true) && + LinuxRuntimeInstaller.extract(context, download, root, null) + if (ok) FileUtils.writeString(marker(root, tag, name), pack.sha256) else complete = false + } catch (e: Exception) { + Log.w(TAG, "language pack $name: $e") + complete = false + } finally { + download.delete() + } + } + return complete + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt index cf0d3d7f63..334bce3dfc 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt @@ -189,7 +189,6 @@ class DeviceControlsComponent(context: Context, root: File, private val activity companion object { private const val TAG = "DeviceControls" - // AudioService sends these on every stream step; the Settings observer and 250 ms poll lag a held volume key. private const val VOLUME_CHANGED_ACTION = "android.media.VOLUME_CHANGED_ACTION" private const val STREAM_MUTE_CHANGED_ACTION = "android.media.STREAM_MUTE_CHANGED_ACTION" private const val PERMISSION_CHANNEL = "brightness_permission" diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt index 56340b111e..eabcd67b87 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt @@ -19,7 +19,7 @@ object FlatpakManager { @Volatile var busy: String? = null private set - class App(val id: String, val name: String, val icon: File?, val branch: String, val summary: String?) + class App(val id: String, val name: String, val icon: File?, val branch: String, val summary: String?, val arch: String = "aarch64") fun ready(context: Context): Boolean { val root = LinuxRuntime.rootDir(context) @@ -33,24 +33,33 @@ object FlatpakManager { else -> "aarch64" } + internal fun arches(native: String = arch()): List<String> = if (native == "aarch64") listOf("aarch64", "x86_64") else listOf(native) + + internal fun installedBranch(appDir: File, native: String = arch()): Pair<String, File>? = + arches(native).firstNotNullOfOrNull { arch -> + File(appDir, arch).listFiles()?.firstOrNull { File(it, "active").exists() }?.let { arch to it } + } + + fun foreign(app: App, native: String = arch()): Boolean = app.arch != native + + fun launchArgs(app: App, native: String = arch()): List<String> = if (foreign(app, native)) listOf("--arch=${app.arch}", app.id) else listOf(app.id) + fun installedApps(context: Context): List<App> { val apps = File(LinuxRuntime.rootDir(context), "$USER_DIR/app") - val arch = arch() return apps.listFiles()?.mapNotNull { dir -> val id = dir.name - val archDir = File(dir, arch) - val branch = archDir.listFiles()?.firstOrNull { File(it, "active").exists() } ?: return@mapNotNull null + val (arch, branch) = installedBranch(dir) ?: return@mapNotNull null val active = File(branch, "active") val export = File(active, "export/share") val desktop = FileUtils.readString(File(export, "applications/$id.desktop")) val name = desktop?.let { entry(it, "Name") } ?: id.substringAfterLast('.') val summary = desktop?.let { entry(it, "Comment") } - App(id, name, icon(export, id), branch.name, summary) + App(id, name, icon(export, id), branch.name, summary, arch) }?.sortedBy { it.name.lowercase() } ?: emptyList() } fun isInstalled(context: Context, id: String): Boolean = - File(LinuxRuntime.rootDir(context), "$USER_DIR/app/$id/${arch()}").listFiles()?.any { File(it, "active").exists() } == true + installedBranch(File(LinuxRuntime.rootDir(context), "$USER_DIR/app/$id")) != null private fun entry(desktop: String, key: String): String? { var inMain = false @@ -117,7 +126,11 @@ object FlatpakManager { when (o.optString("e")) { "op" -> { step = stage(context, o); onProgress(step, overall(o, 0)) } "progress" -> onProgress(step, overall(o, o.optInt("percent"))) - "error" -> { error = o.optString("message"); Log.w(TAG, "$verb $id: $error") } + "error" -> { + error = if (o.optString("code") == "arch") context.getString(R.string.flatpakmgr_wrong_arch, o.optString("id"), o.optString("arch")) + else o.optString("message") + Log.w(TAG, "$verb $id: ${o.optString("message")}") + } "warning" -> Log.w(TAG, "$verb $id: ${o.optString("message")}") "done" -> onDone(o) } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt index 7db52a9e24..8e5769c312 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt @@ -39,7 +39,6 @@ object GuestCommand { if (linkDir != null) cmd.add(1, "--link2symlink") val binds = LinuxRuntime.binds(context, null, runtimeDir, Environment.getExternalStorageDirectory(), extraBinds) binds.forEach { cmd.add("-b"); cmd.add(it) } - // Fake root and link2symlink are emulated by proot, so their syscalls must stay on the traced path. val fastPathKey = if (fastPath && !fakeRoot && linkDir == null && ProotFastPath.enabled(context)) ProotFastPath.key(root, binds) else null cmd += listOf( "/usr/bin/env", "-i", "HOME=/root", "USER=root", "LANG=C.UTF-8", @@ -48,8 +47,6 @@ object GuestCommand { "DROIDDECK_BWRAP_SOCKET=${BwrapSpawner.socket(context)}", "XDG_DATA_DIRS=/root/.local/share/flatpak/exports/share:/usr/local/share:/usr/share", ) - // The Steam client installer and the package tools inside the guest fetch over plain curl, - // so the app proxy has to reach them through the environment proot starts them with. DownloadSource.proxyHostPort(context).takeIf { it.isNotEmpty() }?.let { hostPort -> cmd += listOf( "http_proxy=http://$hostPort", "https_proxy=http://$hostPort", @@ -77,7 +74,6 @@ object GuestCommand { try { while (process.isAlive && !flag.get()) Thread.sleep(200) if (flag.get()) { - // PRoot ignores SIGTERM; SIGQUIT makes it kill its tracees and exit cleanly. if (pid > 0) { runCatching { android.system.Os.kill(pid, android.system.OsConstants.SIGQUIT) } } else { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt index 45f07471bc..06a0348253 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt @@ -251,12 +251,36 @@ class LinuxNetworkLinkComponent( } } + private fun localDnsServers(): Pair<List<String>, List<String>> { + val active = connectivity.activeNetwork?.let { connectivity.getNetworkCapabilities(it) } + if (active?.hasTransport(NetworkCapabilities.TRANSPORT_VPN) == true) return Pair(emptyList(), emptyList()) + val servers = LinkedHashSet<String>() + val gateways = LinkedHashSet<String>() + for (network in connectivity.allNetworks) { + val capabilities = connectivity.getNetworkCapabilities(network) ?: continue + if (!capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) continue + if (!capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) && + !capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) continue + val link = connectivity.getLinkProperties(network) ?: continue + for (address in link.dnsServers) { + if (address.isLinkLocalAddress || address.isLoopbackAddress || address.isAnyLocalAddress) continue + address.hostAddress?.substringBefore('%')?.let { servers.add(it) } + } + link.routes.firstOrNull { + it.isDefaultRoute && (it.gateway as? Inet4Address)?.let { g -> !g.isLoopbackAddress && !g.isAnyLocalAddress } == true + }?.gateway?.hostAddress?.substringBefore('%')?.let { gateways.add(it) } + } + val order = compareBy<String>({ if (it.contains(':')) 1 else 0 }) + return Pair(servers.sortedWith(order), gateways.sortedWith(order)) + } + private fun writeResolver(properties: LinkProperties?) { val own = properties?.dnsServers.orEmpty() .filter { !it.isLinkLocalAddress && !it.isLoopbackAddress && !it.isAnyLocalAddress } .sortedBy { if (it is Inet4Address) 0 else 1 } .mapNotNull { it.hostAddress?.substringBefore('%') } - val servers = (own + listOf("8.8.8.8", "1.1.1.1", "2001:4860:4860::8888")).distinct().take(6) + val (discovered, gateways) = localDnsServers() + val servers = (own + discovered + listOf("8.8.8.8", "1.1.1.1", "2001:4860:4860::8888") + gateways).distinct().take(6) val text = buildString { append("# Written by the app from the device's active network; edits are overwritten.\n") for (server in servers) append("nameserver $server\n") diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 81f005ab7d..e2cc349aae 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -26,6 +26,7 @@ public final class LinuxRuntime { public static final String EXTRA_LINUX_MODE = "linux_mode"; private static final String KGSL_DEVICE = "/dev/kgsl-3d0"; public static final String GUEST_RUNTIME_DIR = "/run/droiddeck"; + public static final String GUEST_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"; private static final String SYSTEM_FONTS = "/system/fonts"; private static final String GUEST_SYSTEM_FONTS = "/usr/local/share/fonts/android"; public static final String DEBUG_LOG_DIR = "DroidDeck"; @@ -50,7 +51,6 @@ public final class LinuxRuntime { } public static File liveDir(Context context) { - // Android may evict cache files even while guest processes are using them. File dir = new File(context.getNoBackupFilesDir(), "guest-runtime"); dir.mkdirs(); return dir; @@ -63,9 +63,7 @@ public final class LinuxRuntime { } private static final String HOST_DIR = "opt/android-host"; - /** The downloaded add-on pack. The APK does not ship this binary. */ public static final String PROOT_PACK = "add-on pack"; - /** Termux's unpatched proot inside the rootfs. Developer switch only. */ public static final String PROOT_ROOTFS = "rootfs fallback"; public static final String PROOT_MISSING = "missing"; @@ -81,7 +79,6 @@ public final class LinuxRuntime { return rootfsProot(context).isFile() && rootfsLoader(context).isFile(); } - /** Patched proot is the add-on pack. The rootfs copy is not that binary. */ public static boolean patchedProot(Context context) { return AddonPack.PROOT.installed(context); } @@ -98,7 +95,6 @@ public final class LinuxRuntime { return AddonPack.PROOT.file(context, "libproot-loader.so"); } - /** Where {@link #prootBinary} came from: {@link #PROOT_PACK}, {@link #PROOT_ROOTFS} or {@link #PROOT_MISSING}. */ public static String prootSource(Context context) { File bin = prootBinary(context); if (!bin.isFile()) return PROOT_MISSING; @@ -113,12 +109,15 @@ public final class LinuxRuntime { } public static boolean isInstalled(Context context) { + return hasRootfs(context) && (patchedProot(context) || rootfsProotReady(context)); + } + + public static boolean hasRootfs(Context context) { if (LinuxRuntimeInstaller.isRemoving() || LinuxRuntimeInstaller.hasRemovalPending(context)) return false; File root = rootDir(context); return (new File(root, "usr/bin/gamescope").isFile() || new File(root, "usr/games/gamescope").isFile()) && (new File(root, SESSION_SCRIPT.substring(1)).isFile() - || new File(root, LegacyNames.SESSION_SCRIPT.substring(1)).isFile()) - && (patchedProot(context) || rootfsProotReady(context)); + || new File(root, LegacyNames.SESSION_SCRIPT.substring(1)).isFile()); } public static File vulkanIcd(Context context) { @@ -280,10 +279,42 @@ public final class LinuxRuntime { return false; } + static final String MALI_DEVICE = "/dev/mali0"; + + static final String[] DRM_RENDER_NODES = { + "/dev/dri/renderD128", "/dev/dri/renderD129", "/dev/dri/renderD130", "/dev/dri/renderD131", + }; + + public static String gpuStandIn(Context context) { + if (new File(KGSL_DEVICE).exists()) return KGSL_DEVICE; + if (!com.droiddeck.launcher.core.DeviceSupport.INSTANCE.vkBridge(context)) return null; + return bridgeStandIn(path -> new File(path).exists()); + } + + static String bridgeStandIn(java.util.function.Predicate<String> exists) { + if (exists.test(MALI_DEVICE)) return MALI_DEVICE; + for (String node : DRM_RENDER_NODES) if (exists.test(node)) return node; + return null; + } + + public static String deviceNumbers(String path) { + try { + long dev = Os.stat(path).st_rdev; + long major = ((dev >> 8) & 0xfff) | ((dev >> 32) & ~0xfffL); + long minor = (dev & 0xff) | ((dev >> 12) & ~0xffL); + return major + ":" + minor; + } catch (ErrnoException e) { + return null; + } + } + private static void bindGpuNode(Context context, List<String> cmd) { + String standIn = gpuStandIn(context); + if (standIn == null) return; + boolean kgsl = standIn.equals(KGSL_DEVICE); StructStat st; try { - st = Os.stat(KGSL_DEVICE); + st = Os.stat(standIn); } catch (ErrnoException e) { return; } @@ -303,13 +334,14 @@ public final class LinuxRuntime { Files.write(new File(drm, "dev").toPath(), (major + ":" + minor + "\n").getBytes(StandardCharsets.UTF_8)); Files.write(new File(device, "uevent").toPath(), - "DRIVER=kgsl-3d0\nMODALIAS=platform:kgsl-3d0\n".getBytes(StandardCharsets.UTF_8)); + (kgsl ? "DRIVER=kgsl-3d0\nMODALIAS=platform:kgsl-3d0\n" : "DRIVER=mali\nMODALIAS=platform:mali\n") + .getBytes(StandardCharsets.UTF_8)); File subsystem = new File(device, "subsystem"); if (!Files.isSymbolicLink(subsystem.toPath())) { Os.symlink("/sys/bus/platform", subsystem.getPath()); } File driver = new File(device, "driver"); - if (!Files.isSymbolicLink(driver.toPath())) { + if (kgsl && !Files.isSymbolicLink(driver.toPath())) { Os.symlink("/sys/bus/platform/drivers/msm_drm", driver.getPath()); } } catch (IOException | ErrnoException e) { @@ -317,7 +349,7 @@ public final class LinuxRuntime { } bind(cmd, new File(base, "sys").getPath() + ":/sys/dev/char"); bind(cmd, dri.getPath() + ":/dev/dri"); - bind(cmd, KGSL_DEVICE + ":/dev/dri/" + node); + bind(cmd, standIn + ":/dev/dri/" + node); bindDrmClass(base, cmd, node, major + ":" + minor); } @@ -388,9 +420,6 @@ public final class LinuxRuntime { return thermalZone("ddr"); } - // MangoHud reads the GPU and DDR temperatures from these zone numbers (bindAdrenoStats). On phones - // where they are CPU zones, their type follows the temperature put there, so they stay out of the - // CPU average. private static java.util.Map<String, String> replacedZoneTypes() { java.util.Map<String, String> replaced = new java.util.HashMap<>(); if (gpuTempSource() != null) { @@ -401,7 +430,6 @@ public final class LinuxRuntime { return replaced; } - /** The zones the session's MangoHud averages for the CPU temperature (all typed cpuN-thermal there). */ public static List<File> cpuTempZones() { java.util.Map<String, String> replaced = replacedZoneTypes(); List<File> zones = new ArrayList<>(); diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index ee3349405f..21a40a92ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -130,7 +130,8 @@ public final class LinuxRuntimeInstaller { } if (!owner) return join(job, listener); try { - job.ok = installOnce(context.getApplicationContext(), release, new ProgressListener() { + Context app = context.getApplicationContext(); + ProgressListener progress = new ProgressListener() { @Override public void onProgress(String stage, int percent) { onProgress(Step.OTHER, stage, percent); } @@ -141,7 +142,10 @@ public final class LinuxRuntimeInstaller { job.percent = percent; for (ProgressListener l : job.listeners) l.onProgress(step, stage, percent); } - }); + }; + boolean desktop = DesktopCatalog.INSTANCE.desktopInstalled(app); + job.ok = installOnce(app, release, progress); + if (job.ok && desktop) keepDesktop(app, progress); return job.ok; } finally { synchronized (JOB_LOCK) { @@ -151,6 +155,28 @@ public final class LinuxRuntimeInstaller { } } + private static void keepDesktop(Context context, ProgressListener progress) { + String problem; + try { + problem = DesktopCatalog.INSTANCE.install(context, DesktopCatalog.INSTANCE.desktopEntry(context), progress); + } catch (RuntimeException e) { + problem = e.toString(); + } + if (problem == null) { + Log.i(TAG, "desktop installed again for the new runtime"); + return; + } + Log.w(TAG, "desktop not installed again for the new runtime: " + problem); + boolean started = false; + for (DesktopCatalog.Entry entry : DesktopCatalog.INSTANCE.interrupted(context)) { + if (DesktopCatalog.DESKTOP_ID.equals(entry.getId())) started = true; + } + if (!started) return; + String undone = DesktopCatalog.INSTANCE.removeDesktop(context, progress); + if (undone == null) Log.i(TAG, "rolled back the partial desktop install"); + else Log.w(TAG, "could not roll back the partial desktop install: " + undone); + } + public static boolean isInstalling() { synchronized (JOB_LOCK) { return running != null && !running.removal && !running.maintenance; @@ -244,10 +270,6 @@ public final class LinuxRuntimeInstaller { } } - /** - * The download is named after the release, so a partial file is only ever resumed for the same - * version and checksum, never for a different runtime that happens to share a fixed name. - */ static String archiveName(Release release) { String version = release.version.replaceAll("[^A-Za-z0-9._-]", "_"); String sum = release.sha256.replaceAll("[^A-Za-z0-9]", ""); @@ -255,7 +277,6 @@ public final class LinuxRuntimeInstaller { return "linuxfs-" + version + "-" + sum + ".tar.zst"; } - /** Removes archives left by other releases and by builds that used the fixed name. */ private static void deleteOtherArchives(File dir, String keep) { File[] files = dir.listFiles((d, name) -> name.startsWith("linuxfs") && name.endsWith(".tar.zst") && !name.equals(keep)); if (files == null) return; @@ -264,8 +285,6 @@ public final class LinuxRuntimeInstaller { private static boolean installOnce(Context context, Release release, ProgressListener listener) { File archive = new File(context.getCacheDir(), archiveName(release)); - // A failed download keeps what it fetched so the next attempt resumes it; anything that - // reached verification and failed is not trusted and is removed. boolean keepPartial = false; try { deleteOtherArchives(context.getCacheDir(), archive.getName()); @@ -526,8 +545,6 @@ public final class LinuxRuntimeInstaller { } } - // Packages extract over the live runtime and their archives list a link before the file it - // names, so a kill mid-way must leave neither a truncated file nor a link to a missing one. public static boolean extract(Context context, File archive, File destination, ProgressListener listener) { return extract(context, archive, destination, destination, listener); } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt b/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt index 974b6fe16e..e9a9f4a72e 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt @@ -12,10 +12,6 @@ object ProotFastPath { const val LIBRARY = "/usr/local/lib/libblfastpath.so" const val MAX_BINDS = 256 - /** - * The fast path's trampoline is let through only by the proot built with patches/0014. - * The rootfs copy (Termux's stock proot) is not that binary, so the library stays out. - */ fun allows(preference: Boolean, noSeccomp: Boolean, source: String): Boolean = preference && !noSeccomp && source == LinuxRuntime.PROOT_PACK diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java index 3b2a39ee85..fbbc5ddaed 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java @@ -74,11 +74,6 @@ public final class RuntimeFileTree { throw new IOException("Cannot make directory removable: " + dir); } - /** - * Paths in a runtime tree that belong to the user: the home folder, imported AppImages and script apps, and catalog - * AppImages with their menu entries and markers. Tar-kind catalog packages (the desktop) unpack over /usr and cannot - * be carried. - */ static java.util.List<String> userPaths(File tree) throws IOException { java.util.List<String> paths = new java.util.ArrayList<>(java.util.Arrays.asList("root", "opt/appimages/user", "opt/droiddeck-apps", "opt/droiddeck/wincomponents")); for (String n : children(new File(tree, "usr/local/share/applications"))) { @@ -168,13 +163,6 @@ public final class RuntimeFileTree { return false; } - /** - * Moves each user path that exists in {@code from} into {@code to}, replacing what {@code to} ships there. With - * {@code onlyMissing}, a path already present in {@code to} is left alone. On failure the paths already moved go back - * before the exception is thrown. Rollback failures are suppressed on that exception; callers must retain the source - * of any incomplete rollback. - * Returns the moved paths. - */ static java.util.List<String> carryUserData(File from, File to, boolean onlyMissing) throws IOException { return carryUserData(from, to, onlyMissing, new java.util.ArrayList<>(userPaths(from, to))); } @@ -200,7 +188,6 @@ public final class RuntimeFileTree { return moved; } - /** Puts the given paths back from {@code from} into {@code to}; failures are collected, not stopped on. */ static void carryBack(File from, File to, java.util.List<String> paths) throws IOException { IOException failed = null; for (int i = paths.size() - 1; i >= 0; i--) { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt index f334e6cc54..94d7f443f6 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt @@ -10,7 +10,6 @@ object RuntimeHealth { fun brokenLibraryLinks(context: Context): List<String> = brokenLibraryLinks(LinuxRuntime.rootDir(context)) - /** A complete runtime has no library link in usr/lib whose target is missing. */ fun brokenLibraryLinks(root: File): List<String> = listOf("usr/lib", "usr/lib/aarch64-linux-gnu").flatMap { dir -> val lib = File(root, dir) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt index aa53092fe2..a641cf1f28 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt @@ -117,7 +117,6 @@ class RuntimeInstallService : Service() { if (Build.VERSION.SDK_INT >= 26) context.startForegroundService(intent) else context.startService(intent) } - /** Keeps the process in the foreground until the returned release runs, so closing the app does not stop the install. */ fun holdForPackage(context: Context, title: String): () -> Unit { packageTitle = title packageStage = title diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt index b7ca15a18d..f40443e028 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt @@ -97,7 +97,8 @@ object UserApps { App( "flatpak:${app.id}", Kind.FLATPAK, readName(custom) ?: app.name, File(custom, "icon.png").takeIf { it.isFile } ?: app.icon ?: FlathubApi.iconUrl(app.id), - app.summary, FlatpakManager.LAUNCHER, listOf(app.id), + app.summary, FlatpakManager.LAUNCHER, FlatpakManager.launchArgs(app), + arch = app.arch.takeIf { FlatpakManager.foreign(app) }, ) } return (scripts + images + flatpaks).sortedBy { it.name.lowercase() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt index 517fa6c74f..ef64bfde02 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt @@ -56,7 +56,6 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart val timeToEmptyS = if (discharging && chargeNowUah > 0 && abs(currentAvgUa) > 0) chargeNowUah * 3600L / abs(currentAvgUa) else 0L val charging = status == BatteryManager.BATTERY_STATUS_CHARGING val timeToFullS = if (charging && chargeFullUah > chargeNowUah && abs(currentAvgUa) > 0) (chargeFullUah - chargeNowUah) * 3600L / abs(currentAvgUa) else 0L - // Android can keep reporting charging at 100%; Linux reports Full there, and Steam shows 99% until it does. val statusText = when (status) { BatteryManager.BATTERY_STATUS_CHARGING -> if (pct >= 100) "Full" else "Charging" BatteryManager.BATTERY_STATUS_DISCHARGING -> "Discharging" @@ -127,9 +126,6 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart companion object { private const val TAG = "SessionService" - // CURRENT_NOW/CURRENT_AVERAGE are documented as µA, but Samsung and other vendors report mA, - // which made every lifetime estimate 1000x too long. No real µA reading under load is below 10 mA, - // and no mA reading is above 10 A, so anything smaller than 10_000 is taken as mA. private const val MILLIAMP_CEILING = 10_000L internal fun toMicroamps(raw: Long): Long = if (abs(raw) < MILLIAMP_CEILING) raw * 1000L else raw diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt index 953196900c..a525bed375 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt @@ -24,7 +24,6 @@ object BootMovie { DROIDDECK_60 to "droiddeck-startup-60.webm", ) - // Steam's CEF player only takes WebM codecs; MediaMuxer's WebM writer cannot take AV1. internal val VIDEO_CODECS = setOf(MediaFormat.MIMETYPE_VIDEO_VP8, MediaFormat.MIMETYPE_VIDEO_VP9, MediaFormat.MIMETYPE_VIDEO_AV1) private val REMUX_CODECS = setOf(MediaFormat.MIMETYPE_VIDEO_VP8, MediaFormat.MIMETYPE_VIDEO_VP9) internal val AUDIO_CODECS = setOf(MediaFormat.MIMETYPE_AUDIO_OPUS, MediaFormat.MIMETYPE_AUDIO_VORBIS) @@ -39,18 +38,14 @@ object BootMovie { private fun dir(context: Context) = File(context.filesDir, "boot-movie") private fun customFile(context: Context) = File(dir(context), "custom.webm") - /** A movie imported before movies were kept in Steam's own folder. */ internal fun legacyCustomFile(context: Context) = customFile(context) - /** Unpacks one of DroidDeck's own movies on demand; null for anything else. */ internal fun assetFile(context: Context, id: String): File? = ASSETS[id]?.let { extractAsset(context, it) } - /** Picking a movie here makes it Steam's startup movie at the next session, over whatever Steam had picked. */ fun select(context: Context, id: String) { SessionPrefs.setBootMovie(context, id) SessionPrefs.setBootMovieApplyNext(context, true) BootMovieReport.note(context, "picked $id here; Steam names ${SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context))}") - // Whatever Steam names right now is about to be replaced, so it is not a pick to adopt later. SessionFiles.startupMovieLocalPath(BootMovieLibrary.steamConfig(context))?.let { SessionPrefs.setBootMovieSteamSeen(context, it) } } @@ -67,7 +62,6 @@ object BootMovie { } } - /** The file the current choice plays from, before any volume or length change. */ fun currentFile(context: Context): File? = sourceOf(context, choice(context)) private fun sourceOf(context: Context, choice: String): File? = when { @@ -84,7 +78,6 @@ object BootMovie { return variant(context, source) } - /** The movie as Steam should get it: with the chosen volume and cut off after the chosen number of seconds. */ private fun variant(context: Context, source: File): File? { val volume = if (SessionPrefs.bootMovieSound(context)) SessionPrefs.bootMovieVolume(context) else 0 val seconds = SessionPrefs.bootMovieSeconds(context) @@ -124,21 +117,15 @@ object BootMovie { internal enum class Step { REMUX_SILENT, REMUX_AUDIO, TRANSCODE_SILENT, TRANSCODE_AUDIO, REGAIN } - /** - * How a movie is processed: the steps tried in order until one works, whether the source goes out untouched, and - * whether it still plays as it is when every step fails. - */ internal class Plan(val passthrough: Boolean, val steps: List<Step>, val sourceOnFailure: Boolean) internal fun plan(volume: Int, seconds: Int): Plan = when { volume == 100 && seconds == 0 -> Plan(true, emptyList(), true) volume == 0 -> Plan(false, listOf(Step.REMUX_SILENT, Step.TRANSCODE_SILENT), false) - // Only a length that could not be applied plays as it is; a volume that could not be applied plays no louder. volume == 100 -> Plan(false, listOf(Step.REMUX_AUDIO, Step.TRANSCODE_AUDIO), true) else -> Plan(false, listOf(Step.REGAIN, Step.REMUX_SILENT, Step.TRANSCODE_AUDIO), false) } - /** Frames beyond 1920x1080 (4K and the like) have made Steam crash while it starts, so such a movie is always scaled down. */ internal const val MAX_LONG_SIDE = 1920 internal const val MAX_SHORT_SIDE = 1080 @@ -150,22 +137,16 @@ object BootMovie { private fun isOversized(source: File): Boolean = probe(source)?.first?.let { oversized(it) } == true - /** A movie that is too large never goes out as it is: it is converted at the chosen volume, and plays nothing if that fails. */ internal fun oversizedPlan(volume: Int): Plan = Plan(false, listOf(if (volume == 0) Step.TRANSCODE_SILENT else Step.TRANSCODE_AUDIO), false) private fun transcodeSilent(source: File, target: File, limitUs: Long) = BootMovieTranscoder.transcode(source, target, keepAudio = false, limitUs = limitUs) {} != null - /** Keeps at most the one processed copy in use, so trying settings never leaves movies piling up. */ private fun prune(folder: File, keep: String?) { folder.listFiles()?.forEach { if (it.name != keep) it.delete() } } - /** - * Takes over a startup movie chosen in Steam's own settings: when Steam's config names a movie it did not name before, - * that movie becomes the choice here. Steam already plays it, so nothing is staged over it. True when the choice changed. - */ fun syncFromSteam(context: Context): Boolean { val named = SessionFiles.startupMovieLocalPath(BootMovieLibrary.steamConfig(context)) ?: return false val seen = SessionPrefs.bootMovieSteamSeen(context) @@ -174,7 +155,6 @@ object BootMovie { if (named == SessionFiles.BOOT_MOVIE_PATH || (named.isEmpty() && seen == null)) return false val path = named.ifEmpty { "/movies/steam_os_startup.webm" } val prefix = "/uioverrides/movies/" - // The list names a bought movie from the Steam folder (/config/communityitemscache/...), Steam's config from its config folder. val id = if (path.startsWith(prefix)) BootMovieLibrary.idOf(path.removePrefix(prefix)) else { val listed = BootMovieLibrary.list(context).firstOrNull { it.id.startsWith(BootMovieLibrary.STEAM_PREFIX) && it.id.endsWith(path) } listed?.id ?: BootMovieLibrary.STEAM_PREFIX + path diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt index 0dd7a0fadf..6fb1f56a9e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt @@ -9,22 +9,14 @@ import com.droiddeck.launcher.runtime.LinuxRuntime import org.json.JSONObject import java.io.File -/** - * The boot movies a person can pick from: DroidDeck's own two, a movie imported before this list existed, every `.webm` in - * Steam's custom movies folder (imports, SteamDeckRepo and movies put there by hand; all of them can be removed), Steam's own - * three startup movies and the movies bought in Steam's points shop (neither can be removed). - */ object BootMovieLibrary { private const val TAG = "BootMovieLibrary" const val PREFIX = "file:" - /** A movie Steam itself keeps outside its custom movies folder, such as one bought in its points shop: `steam:<path Steam names>`. */ const val STEAM_PREFIX = "steam:" - /** Held while the movie list is read and changed, so two imports at once cannot overwrite each other's entries. */ private val lock = Any() - /** Names DroidDeck stages the chosen movie under; they are copies, not movies of their own. */ internal val STAGED = setOf("bigpicture_startup.webm", "steam_os_startup.webm", "droiddeck-startup.webm") const val SOURCE_DROIDDECK = "droiddeck" @@ -37,28 +29,21 @@ object BootMovieLibrary { internal fun moviesDir(context: Context) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/config/uioverrides/movies") - /** - * The folders whose custom movies are listed, found and removed: [moviesDir], where imports are put and managed, then the - * x86-64 client's. The order never depends on which client is running, so a saved choice keeps meaning the same file. - */ internal fun customMovieDirs(context: Context): List<File> = listOf(moviesDir(context), File(SessionPrefs.steamRoot(context, "x86_64"), "config/uioverrides/movies")).distinctBy { it.path } - /** Where imported and installed movies are kept for good; Steam's folder holds a copy, which is put back if it goes missing. */ internal fun libraryDir(context: Context) = File(context.filesDir, "boot-movie/library") private fun metaFile(context: Context) = File(context.filesDir, "boot-movie/movies.json") internal fun steamRoot(context: Context) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam") - /** The running (else selected) Steam client's config, the one whose startup movie choice is read and recorded. */ internal fun steamConfig(context: Context) = File(SessionPrefs.activeSteamRoot(context), "config/config.vdf") private fun thumbsDir(context: Context) = File(context.filesDir, "boot-movie/thumbs") fun idOf(name: String) = PREFIX + name - /** Every Steam client folder: the usual one and the x86-64 client's. */ internal fun steamRoots(context: Context): List<File> = listOf( steamRoot(context), File(LinuxRuntime.rootDir(context), "root/.droiddeck-x64/.local/share/Steam"), ).filter { it.isDirectory } @@ -86,7 +71,6 @@ object BootMovieLibrary { private fun readMeta(context: Context): JSONObject = runCatching { JSONObject(metaFile(context).readText()) }.getOrDefault(JSONObject()) - /** Changes the movie list one writer at a time; [change] gets the list and returns whether to save it. */ private fun editMeta(context: Context, change: (JSONObject) -> Boolean) = synchronized(lock) { val meta = readMeta(context) if (change(meta)) { @@ -100,7 +84,6 @@ object BootMovieLibrary { } } - /** The post a movie was installed from, if it came from SteamDeckRepo. */ fun repoId(context: Context, name: String): String? = readMeta(context).optJSONObject(name)?.optString("repo")?.takeIf { it.isNotEmpty() } @@ -128,7 +111,6 @@ object BootMovieLibrary { val info = meta.optJSONObject(f.name) val source = info?.optString("source")?.takeIf { it.isNotEmpty() } ?: SOURCE_STEAM val title = info?.optString("title")?.takeIf { it.isNotEmpty() } ?: f.nameWithoutExtension - // Everything in Steam's custom movies folder is the person's own (imported, from SteamDeckRepo or put there by hand). out.add(Entry(idOf(f.name), title, if (source == SOURCE_STEAM) SOURCE_IMPORT else source, f, removable = true)) } val steam = LinkedHashMap<String, File>() @@ -147,14 +129,12 @@ object BootMovieLibrary { for ((id, file) in steam) { val native = file.nameWithoutExtension.lowercase() in NATIVE if ((file.name in STAGED && !native) || !seen.add(file.canonicalPath)) continue - // Steam names a bought movie by an item number and a hash; the points shop's own title is shown when Steam has it. val title = if (native) NATIVE[file.nameWithoutExtension.lowercase()] ?: file.nameWithoutExtension else bought[file.path] ?: boughtId(file)?.let { "#$it" } ?: file.nameWithoutExtension out.add(Entry(id, title, if (native) SOURCE_STEAM else SOURCE_POINTSHOP, file, removable = false)) } return out } - /** The four startup movies Steam ships with; Steam's movies folder holds many more videos that are not startup movies. */ private val NATIVE = mapOf( "deck_startup" to "Deck startup", "oled_startup" to "Oled startup", "startup_machine" to "Machine startup", "steam_os_startup" to "SteamOS startup", @@ -167,13 +147,8 @@ object BootMovieLibrary { private val scans = HashMap<String, Scan>() - /** Forgets the last search for Steam's own movies. */ internal fun forgetScan() = synchronized(scanLock) { scans.clear() } - /** - * Movies Steam keeps outside its custom movies folder, such as ones bought in its points shop: every `.webm` below the - * client's config, cache and user folders. The search is repeated at most every 15 seconds for each client folder. - */ private fun pointShopMovies(root: File): Scan = synchronized(scanLock) { val now = System.currentTimeMillis() scans[root.path]?.let { if (now - it.at < 15_000L) return it } @@ -191,10 +166,8 @@ object BootMovieLibrary { scan } - /** The item number in the name Steam gives a bought movie, `<item number>_<hash>.webm`; null for any other name. */ private fun boughtId(file: File) = Regex("^(\\d+)_").find(file.nameWithoutExtension)?.groupValues?.get(1) - /** What the points shop calls a bought movie, from the list of startup movies Steam keeps in each user's local config. */ private fun boughtTitle(root: File, id: String): String? { val key = "communityitemid\\\":\\\"$id\\\"" val title = Regex("item_title\\\\\":\\\\\"([^\\\\\"]*)") @@ -209,7 +182,6 @@ object BootMovieLibrary { private const val OVERRIDES = "/uioverrides/movies/" - /** Puts back, in Steam's folder, any movie of DroidDeck's that went missing there, such as after the runtime was reset. */ internal fun restore(context: Context) = synchronized(lock) { migrateLegacyMeta(context) val meta = readMeta(context) @@ -222,7 +194,6 @@ object BootMovieLibrary { } } - /** Takes in the movie notes an earlier version kept inside Steam's movies folder, so those movies keep their title and source. */ private fun migrateLegacyMeta(context: Context) { val legacy = File(moviesDir(context), ".droiddeck-movies.json") if (!legacy.isFile) return @@ -238,7 +209,6 @@ object BootMovieLibrary { legacy.delete() } - /** Copies [kept] to [copy] through a staging name, so Steam never sees half a movie. */ private fun mirror(kept: File, copy: File): Boolean { val staged = File(copy.parentFile, copy.name + ".${System.nanoTime()}.staged") return try { @@ -255,10 +225,8 @@ object BootMovieLibrary { fun title(context: Context, id: String): String = list(context).firstOrNull { it.id == id }?.title ?: id - /** The file a movie id plays from; DroidDeck's own movies live in the app and are unpacked on demand. */ fun fileOf(context: Context, entry: Entry): File? = entry.file ?: BootMovie.assetFile(context, entry.id) - /** A free `.webm` name for a movie called [title]; the same title twice gets " (2)", " (3)"… */ fun freeName(context: Context, title: String): String { val base = title.replace(Regex("[^\\p{L}\\p{N} ._()\\-]"), "").replace(Regex("\\s+"), " ").trim().trim('.').take(60).ifEmpty { "movie" } val dirs = customMovieDirs(context) @@ -269,10 +237,6 @@ object BootMovieLibrary { return name } - /** - * Keeps the finished movie [staged] (a file in [libraryDir]) under a free name, copies it into Steam's folder and notes its - * title, source and cover. Returns the name, or null when it could not be kept. Runs one movie at a time. - */ internal fun commit(context: Context, staged: File, title: String, source: String, repoId: String? = null, cover: ByteArray? = null): String? = synchronized(lock) { val name = freeName(context, title) @@ -283,7 +247,6 @@ object BootMovieLibrary { name } - /** Notes a movie that was just put into Steam's folder: what to call it, where it came from and its cover. */ fun register(context: Context, name: String, title: String, source: String, repoId: String? = null, cover: ByteArray? = null) { editMeta(context) { meta -> val info = JSONObject().put("title", title).put("source", source) @@ -301,12 +264,10 @@ object BootMovieLibrary { val removed = when { id == BootMovie.CUSTOM -> { BootMovie.removeCustom(context); true } else -> { - // Only movies in Steam's custom movies folder are ever deleted; Steam's own and points shop movies are left alone. if (!id.startsWith(PREFIX)) return false val name = id.removePrefix(PREFIX) if (name.isEmpty() || name.contains('/') || name.contains('\\') || name in STAGED) return false val copies = customMovieDirs(context).map { File(it, name) } - // A name can exist in more than one client's folder; the entry is the first one found (see customMovieDirs), and only that file is deleted. val target = copies.firstOrNull { it.exists() } val managed = File(libraryDir(context), name) if (readMeta(context).optJSONObject(name) == null && target == null && !managed.isFile) return false @@ -335,14 +296,12 @@ object BootMovieLibrary { return removed } - /** What every processed copy of [source] starts with; the hash of its full path keeps same-named files in different places apart. */ internal fun variantPrefix(source: File) = safe(source.name) + "." + Integer.toHexString(source.absolutePath.hashCode()) + "-" private fun safe(name: String) = name.replace(Regex("[^A-Za-z0-9._-]"), "_") private fun coverName(name: String) = "cover-" + safe(name) - /** How long a movie runs, in whole seconds; 0 when it cannot be read. */ fun durationSeconds(file: File?): Int { if (file == null || !file.isFile) return 0 val retriever = MediaMetadataRetriever() @@ -357,7 +316,6 @@ object BootMovieLibrary { } } - /** The first frame that is not nearly black out of several taken through the movie, else the brightest; a movie may open dark. */ private fun brightestFrame(retriever: MediaMetadataRetriever, durationMs: Long): Bitmap? { var best: Bitmap? = null var bestLuma = -1 @@ -382,11 +340,9 @@ object BootMovieLibrary { private const val MIN_COVER_LUMA = 24 - /** A cover for a movie: the picture SteamDeckRepo gave it, or one frame taken from the video and remembered. */ fun cover(context: Context, entry: Entry): File? { val file = fileOf(context, entry) ?: return null val name = if (entry.id.startsWith(PREFIX)) file.name else entry.id - // Points Shop covers once kept a picture that was not always the movie's own; those files are not used. val given = File(thumbsDir(context), if (entry.source == SOURCE_POINTSHOP) "v2-" + coverName(name) else coverName(name)) if (given.isFile && given.length() > 0L) return given val key = "frame-" + safe(name) + "-v2-" + file.length() + "-" + file.lastModified() + ".jpg" diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt index 3a672dcfd9..18ff31169d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt @@ -8,10 +8,6 @@ import java.text.SimpleDateFormat import java.util.Date import java.util.Locale -/** - * What DroidDeck and Steam know about boot movies, in one text file: Steam's startup movie setting, every movie file and - * where it lives, DroidDeck's own state, and a short trace of what each session start did to Steam's config. - */ object BootMovieReport { private const val TAG = "BootMovieReport" private const val MAX_TRACE_LINES = 200 @@ -23,7 +19,6 @@ object BootMovieReport { private fun traceFile(context: Context) = File(context.filesDir, "boot-movie/apply.log") - /** Adds a line to the short trace kept for the report; only the latest lines are kept. */ fun note(context: Context, line: String) { synchronized(lock) { runCatching { @@ -36,7 +31,6 @@ object BootMovieReport { } } - /** Writes the report to Downloads/DroidDeck, or to the app's own folder when that is not possible; null when the report cannot be built or neither folder works. */ fun write(context: Context): File? { val text = runCatching { build(context) }.getOrElse { Log.w(TAG, "could not build the report", it) diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieTranscoder.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieTranscoder.kt index 92bbbae4e2..55f84c006d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieTranscoder.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieTranscoder.kt @@ -46,7 +46,6 @@ internal object BootMovieTranscoder { return Result(audioDropped = hadAudio && !muxedAudio) } - /** Copies the video of [source] untouched and gives it its sound again at [gain] of its level, cut to [limitUs]. */ fun regain(source: File, target: File, gain: Float, limitUs: Long): Boolean { val audio = runCatching { encodeAudio(source, gain, limitUs) } .onFailure { Log.w(TAG, "could not change the volume of ${source.name}", it) }.getOrNull() ?: return false @@ -121,7 +120,6 @@ internal object BootMovieTranscoder { internal class Layout(val width: Int, val height: Int, val x: Int, val y: Int, val contentWidth: Int, val contentHeight: Int) - // Steam fills the screen with its startup movie, so portrait clips are pillarboxed into 16:9 instead of cropped. internal fun layout(width: Int, height: Int, rotation: Int): Layout { val (w, h) = if (rotation % 180 != 0) height to width else width to height fun even(v: Double) = maxOf(2, (v.toInt() / 2) * 2) @@ -137,7 +135,6 @@ internal object BootMovieTranscoder { return Layout(canvas, ch, (canvas - cw) / 2, 0, cw, ch) } - /** [pcm] made quieter by [gain] and cut to its first [limitUs] microseconds. */ internal fun scale(pcm: ShortArray, channels: Int, gain: Float, limitUs: Long): ShortArray { val frames = pcm.size / channels val kept = if (limitUs == Long.MAX_VALUE) frames else minOf(frames.toLong(), limitUs * OPUS_RATE / 1_000_000L).toInt() @@ -164,7 +161,6 @@ internal object BootMovieTranscoder { return out } - /** Most decoded audio held in memory at once: about six minutes of 48 kHz stereo. */ private const val MAX_PCM_BYTES = 64 shl 20 private fun encodeAudio(source: File, gain: Float = 1f, limitUs: Long = Long.MAX_VALUE): Audio? { @@ -212,7 +208,6 @@ internal object BootMovieTranscoder { } dec.releaseOutputBuffer(index, false) if (info.flags and MediaCodec.BUFFER_FLAG_END_OF_STREAM != 0) break - // Past the length that will be kept there is nothing more to decode; without a length, a track too big to hold is dropped. if (limitUs != Long.MAX_VALUE && info.presentationTimeUs > limitUs) break if (pcm.size() > MAX_PCM_BYTES) { if (limitUs == Long.MAX_VALUE) return null else break } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt new file mode 100644 index 0000000000..36b9c3dfdc --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt @@ -0,0 +1,366 @@ +package com.droiddeck.launcher.session + +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.ServiceConnection +import android.os.Bundle +import android.os.Environment +import android.os.Handler +import android.os.IBinder +import android.os.Looper +import android.os.Message +import android.os.Messenger +import android.util.Log +import android.view.Surface +import com.droiddeck.launcher.core.HostProcess +import com.droiddeck.launcher.runtime.DesktopCatalog +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.wayland.BottomDesktopCompositorService as Comp +import java.io.File + +/** + * KDE Plasma on the bottom screen while the session keeps the top one: its own compositor process + * ([Comp]) and a second guest started with the session's environment, like the bottom-screen terminal. + */ +object BottomDesktop { + private const val TAG = "BottomDesktop" + const val SCRIPT = "/usr/local/bin/droiddeck-bottom-desktop" + private const val TARGET_SHORT_SIDE = 720f + + enum class State { OFF, STARTING, RUNNING, ENDED, FAILED } + + private class Launch( + val guest: List<String>, + val binds: List<String>, + val sessionRoot: File, + val hostEnvironment: Array<String>, + val root: File, + val sessionDir: File, + val generation: Int, + val installed: Boolean, + ) + + @Volatile private var launch: Launch? = null + private val launchLock = Any() + private val main = Handler(Looper.getMainLooper()) + private val listeners = LinkedHashSet<() -> Unit>() + + @Volatile var state = State.OFF + private set + private var onTextInput: ((Boolean) -> Unit)? = null + private var imeWatcher: android.os.FileObserver? = null + + private var appContext: Context? = null + private var service: Messenger? = null + private var binding: ServiceConnection? = null + private var pendingAttach: Message? = null + /** The desktop guest's proot: -1 when there is none, 0 while it is being started. */ + @Volatile private var guestPid = -1 + + /** The proot to freeze with the session when it pauses. */ + val suspendPid: Int get() = guestPid + private var guestGeneration = 0 + var outputSize = 0 to 0 + private set + private var attachedSurface: Surface? = null + private var cursorShown = false + /** The session generation whose launch the running compositor and guest belong to; -1 when none. */ + private var owner = -1 + + private val replies = Messenger(object : Handler(Looper.getMainLooper()) { + override fun handleMessage(msg: Message) { + if (msg.arg1 != owner) return + when (msg.what) { + Comp.MSG_ATTACHED -> { + service?.let { send(it, Message.obtain(null, Comp.MSG_CURSOR, if (cursorShown) 1 else 0, 0)) } + if (guestPid < 0 && state == State.STARTING) startGuest() + } + Comp.MSG_FIRST_FRAME -> if (state == State.STARTING) setState(State.RUNNING) + } + } + }) + + fun prepare( + guest: List<String>, + binds: List<String>, + sessionRoot: File, + hostEnvironment: Array<String>, + root: File, + sessionDir: File, + generation: Int, + stillCurrent: () -> Boolean, + ) { + val prepared = Launch(ArrayList(guest), ArrayList(binds), sessionRoot, hostEnvironment.copyOf(), root, sessionDir, generation, + DesktopCatalog.desktopInstalled(root)) + synchronized(launchLock) { if (stillCurrent()) launch = prepared } + } + + fun available(): Boolean = + launch?.installed == true && SessionState.running && SessionState.mode != SessionService.MODE_DESKTOP + + fun outputSizeFor(width: Int, height: Int, fullResolution: Boolean = false): Pair<Int, Int> = + desktopOutputSize(width, height, fullResolution, TARGET_SHORT_SIDE) + + fun addListener(listener: () -> Unit) { listeners.add(listener) } + + fun removeListener(listener: () -> Unit) { listeners.remove(listener) } + + /** Called on the main thread when a text field in the desktop gains or loses focus (droiddeck-ime's report). */ + fun setTextInputListener(listener: ((Boolean) -> Unit)?) { onTextInput = listener } + + private fun watchIme(dir: File) { + imeWatcher?.stopWatching() + dir.deleteRecursively() + dir.mkdirs() + @Suppress("DEPRECATION") + imeWatcher = object : android.os.FileObserver(dir.path, MOVED_TO or CLOSE_WRITE) { + override fun onEvent(event: Int, path: String?) { + if (path != "ime.json") return + val focused = runCatching { org.json.JSONObject(File(dir, path).readText()).optBoolean("textField") } + .getOrNull() ?: return + main.post { if (imeWatcher === this) onTextInput?.invoke(focused) } + } + }.also { it.startWatching() } + } + + private fun setState(next: State) { + if (Looper.myLooper() != Looper.getMainLooper()) { main.post { setState(next) }; return } + if (state == next) return + Log.i(TAG, "state $state -> $next") + state = next + listeners.toList().forEach { it() } + } + + fun attach(context: Context, surface: Surface, width: Int, height: Int, refreshHz: Float) { + val current = launch + if (current == null || !SessionState.running) { + setState(State.FAILED) + return + } + if (owner != -1 && owner != current.generation) stop(context, owner) + appContext = context.applicationContext + owner = current.generation + outputSize = width to height + attachedSurface = surface + val dir = File(current.sessionDir, "bottom-desktop").apply { mkdirs() } + val msg = Message.obtain(null, Comp.MSG_ATTACH).apply { + arg1 = owner + obj = surface + replyTo = replies + data = Bundle().apply { + putString(Comp.KEY_RUNTIME_DIR, runtimeDir(context).path) + putInt(Comp.KEY_WIDTH, width) + putInt(Comp.KEY_HEIGHT, height) + putFloat(Comp.KEY_REFRESH, refreshHz) + putString(Comp.KEY_LOG, File(dir, "wayland.log").path) + } + } + if (state == State.OFF || state == State.ENDED || state == State.FAILED) setState(State.STARTING) + val target = service + if (target != null) send(target, msg) else { + pendingAttach = msg + bind(context.applicationContext) + } + } + + fun resize(surface: Surface, width: Int, height: Int) { + if (surface !== attachedSurface || width <= 0 || height <= 0 || outputSize == (width to height)) return + outputSize = width to height + pendingAttach?.data?.apply { + putInt(Comp.KEY_WIDTH, width) + putInt(Comp.KEY_HEIGHT, height) + } + service?.let { send(it, Message.obtain(null, Comp.MSG_RESIZE, width, height)) } + } + + fun detach(surface: Surface? = null) { + if (surface != null && attachedSurface != null && surface !== attachedSurface) return + attachedSurface = null + pendingAttach = null + service?.let { send(it, Message.obtain(null, Comp.MSG_DETACH)) } + } + + fun sendTouch(action: Int, pointerId: Int, x: Int, y: Int) { + val target = service ?: return + send(target, Message.obtain(null, Comp.MSG_TOUCH, (pointerId shl 8) or (action and 0xff), + (x.coerceIn(0, 0xffff) shl 16) or y.coerceIn(0, 0xffff))) + } + + fun sendPointer(x: Int, y: Int) { + val target = service ?: return + send(target, Message.obtain(null, Comp.MSG_POINTER, x, y)) + } + + /** Button (3), wheel (4) and smooth-scroll (12) input, as `WaylandCompositor.nativeSendSceneInput` takes it. */ + fun sendScene(type: Int, a: Int, b: Int = 0) { + val target = service ?: return + send(target, Message.obtain(null, Comp.MSG_SCENE, type, a).apply { + if (b != 0) data = Bundle().apply { putInt(Comp.KEY_B, b) } + }) + } + + fun showCursor(on: Boolean) { + cursorShown = on + service?.let { send(it, Message.obtain(null, Comp.MSG_CURSOR, if (on) 1 else 0, 0)) } + } + + /** False when the next attach starts a new compositor process, which needs a surface no earlier one used. */ + val connected: Boolean get() = service != null + + fun sendKey(evdev: Int, down: Boolean) { + val target = service ?: return + send(target, Message.obtain(null, Comp.MSG_KEY, evdev, if (down) 1 else 0)) + } + + fun sendText(text: String) { + val target = service ?: return + send(target, Message.obtain(null, Comp.MSG_TEXT).apply { data = Bundle().apply { putString(Comp.KEY_TEXT, text) } }) + } + + fun stop(context: Context, generation: Int? = null) { + if (Looper.myLooper() != Looper.getMainLooper()) { main.post { stop(context, generation) }; return } + synchronized(launchLock) { + if (generation != null && launch?.generation == generation) launch = null + } + // A newer session may already have prepared its launch; only the desktop the stopped session started goes. + if (generation != null && owner != generation) return + owner = -1 + val pid = guestPid + guestPid = -1 + guestGeneration++ + if (pid > 1) SessionService.stopTerminalProcess(context, pid) + service?.let { send(it, Message.obtain(null, Comp.MSG_STOP)) } + binding?.let { runCatching { context.applicationContext.unbindService(it) } } + binding = null + service = null + pendingAttach = null + imeWatcher?.stopWatching() + imeWatcher = null + setState(State.OFF) + } + + private fun bind(context: Context) { + if (binding != null) return + val connection = object : ServiceConnection { + override fun onServiceConnected(name: ComponentName?, binder: IBinder?) { + if (binding !== this || binder == null) return + val messenger = Messenger(binder) + service = messenger + pendingAttach?.let { send(messenger, it) } + pendingAttach = null + } + + override fun onServiceDisconnected(name: ComponentName?) { + if (binding !== this) return + Log.w(TAG, "the desktop's compositor process died") + service = null + binding = null + runCatching { context.unbindService(this) } + val pid = guestPid + guestPid = -1 + guestGeneration++ + if (pid > 1) SessionService.stopTerminalProcess(context, pid) + imeWatcher?.stopWatching() + imeWatcher = null + owner = -1 + setState(State.FAILED) + } + } + binding = connection + val bound = runCatching { + context.bindService(Intent(context, Comp::class.java), connection, + Context.BIND_AUTO_CREATE or Context.BIND_IMPORTANT) + }.getOrDefault(false) + if (!bound) { + Log.e(TAG, "could not bind the desktop's compositor") + binding = null + setState(State.FAILED) + } + } + + private fun send(target: Messenger, msg: Message) { + runCatching { target.send(msg) }.onFailure { Log.w(TAG, "compositor message ${msg.what} not delivered", it) } + } + + private fun runtimeDir(context: Context) = File(context.filesDir, ".wayland-rt-bottom") + + private fun startGuest() { + val context = appContext ?: return + val current = launch + if (current == null || !SessionState.running || current.generation != owner) { + setState(State.FAILED) + return + } + // A freeze collects its helpers once, when it begins; a guest started after that would run on unfrozen. + if (SessionState.suspended || SessionState.suspending) { + setState(State.OFF) + return + } + val generation = ++guestGeneration + guestPid = 0 + val (width, height) = outputSize + service?.let { send(it, Message.obtain(null, Comp.MSG_NEW_GUEST)) } + Thread({ + if (!DesktopCatalog.desktopInstalled(current.root)) { + Log.e(TAG, "the desktop package is not installed") + main.post { if (generation == guestGeneration) { guestPid = -1; setState(State.FAILED) } } + return@Thread + } + val dir = File(current.sessionDir, "bottom-desktop").apply { mkdirs() } + val runtime = runtimeDir(context).apply { mkdirs() } + val imeDir = File(current.sessionRoot, "bottom-desktop-ime") + main.post { if (generation == guestGeneration) watchIme(imeDir) } + val binds = LinuxRuntime.binds(context, current.sessionRoot, runtime, Environment.getExternalStorageDirectory(), current.binds) + val guest = ArrayList(current.guest).apply { + add("BL_WIDTH=$width") + add("BL_HEIGHT=$height") + add("BL_DEBUG_DIR=" + dir.path) + add("BL_TOP_SESSION=" + SessionState.mode) + add("BL_IME_DIR=" + imeDir.path) + add(SCRIPT) + } + val command = LinuxRuntime.commandWithBinds(context, current.root, binds, guest) + val line = command.joinToString(" ") { it.replace("\\", "\\\\").replace(" ", "\\ ") } + val pid = HostProcess.start(line, current.hostEnvironment, current.root, { status -> + main.post { + if (generation != guestGeneration) return@post + Log.i(TAG, "the desktop ended ($status)") + SessionService.terminalProcessExited(context, guestPid) + guestPid = -1 + guestGeneration++ + setState(if (state == State.RUNNING || status == 0) State.ENDED else State.FAILED) + } + }, null, File(dir, "proot.log")) + main.post { + if (generation != guestGeneration || launch !== current) { + if (pid > 1) SessionService.stopTerminalProcess(context, pid) + if (generation == guestGeneration) guestPid = -1 + return@post + } + if (pid <= 1) { + guestPid = -1 + Log.e(TAG, "the desktop's guest did not start") + setState(State.FAILED) + return@post + } + if (SessionState.suspended || SessionState.suspending) { + SessionService.stopTerminalProcess(context, pid) + guestPid = -1 + guestGeneration++ + setState(State.OFF) + return@post + } + guestPid = pid + SessionService.registerTerminalProcess(context, pid) + Log.i(TAG, "desktop guest pid $pid at ${width}x$height") + } + }, "bottom-desktop-start").start() + } +} + +internal fun desktopOutputSize(width: Int, height: Int, fullResolution: Boolean, targetShortSide: Float): Pair<Int, Int> { + if (width <= 0 || height <= 0) return 0 to 0 + val scale = if (fullResolution) 1f else maxOf(1f, Math.round(minOf(width, height) / targetShortSide * 2f) / 2f) + return ((width / scale).toInt() and 1.inv()) to ((height / scale).toInt() and 1.inv()) +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt new file mode 100644 index 0000000000..45e0890c52 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt @@ -0,0 +1,60 @@ +package com.droiddeck.launcher.session + +import android.app.Notification +import android.content.Context +import android.service.notification.NotificationListenerService +import android.service.notification.StatusBarNotification +import androidx.compose.runtime.mutableStateListOf +import androidx.core.app.NotificationManagerCompat + +data class BottomNotification(val key: String, val app: String, val title: String, val text: String, val postedAt: Long) + +object BottomNotifications { + val items = mutableStateListOf<BottomNotification>() + + fun granted(context: Context): Boolean = + context.packageName in NotificationManagerCompat.getEnabledListenerPackages(context) + + internal fun keep(own: String, pkg: String, ongoing: Boolean, groupSummary: Boolean, title: String, text: String): Boolean = + pkg != own && !ongoing && !groupSummary && (title.isNotBlank() || text.isNotBlank()) + + internal fun add(list: MutableList<BottomNotification>, item: BottomNotification) { + list.removeAll { it.key == item.key } + list.add(0, item) + while (list.size > MAX_ITEMS) list.removeAt(list.lastIndex) + } + + fun clear() = items.clear() + + internal fun post(context: Context, sbn: StatusBarNotification) { + val n = sbn.notification ?: return + val extras = n.extras + val title = extras?.getCharSequence(Notification.EXTRA_TITLE)?.toString().orEmpty() + val text = (extras?.getCharSequence(Notification.EXTRA_BIG_TEXT) ?: extras?.getCharSequence(Notification.EXTRA_TEXT))?.toString().orEmpty() + if (!keep(context.packageName, sbn.packageName, sbn.isOngoing, (n.flags and Notification.FLAG_GROUP_SUMMARY) != 0, title, text)) return + val app = runCatching { + val pm = context.packageManager + pm.getApplicationLabel(pm.getApplicationInfo(sbn.packageName, 0)).toString() + }.getOrDefault(sbn.packageName) + add(items, BottomNotification(sbn.key, app, title, text, sbn.postTime)) + } + + internal fun remove(key: String) { + items.removeAll { it.key == key } + } + + private const val MAX_ITEMS = 30 +} + +class BottomNotificationListener : NotificationListenerService() { + override fun onListenerConnected() { + BottomNotifications.clear() + runCatching { activeNotifications }.getOrNull()?.sortedBy { it.postTime }?.forEach { BottomNotifications.post(this, it) } + } + + override fun onNotificationPosted(sbn: StatusBarNotification) = BottomNotifications.post(this, sbn) + + override fun onNotificationRemoved(sbn: StatusBarNotification) = BottomNotifications.remove(sbn.key) + + override fun onListenerDisconnected() = BottomNotifications.clear() +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomScreenshots.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomScreenshots.kt new file mode 100644 index 0000000000..905f227158 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomScreenshots.kt @@ -0,0 +1,93 @@ +package com.droiddeck.launcher.session + +import android.content.ContentValues +import android.content.Context +import android.graphics.Bitmap +import android.net.Uri +import android.os.Build +import android.os.Environment +import android.provider.MediaStore +import java.io.File +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +data class BottomShot(val uri: Uri?, val file: File?, val takenAt: Long, val steam: Boolean) { + val model: Any get() = uri ?: file!! +} + +object BottomScreenshots { + private const val FOLDER = "DroidDeck" + private const val QUALITY = 95 + private const val LIMIT = 120 + + internal fun fileName(at: Long): String = + "DroidDeck_" + SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date(at)) + ".jpg" + + fun save(context: Context, bitmap: Bitmap, at: Long = System.currentTimeMillis()): Boolean = runCatching { + val name = fileName(at) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + val resolver = context.contentResolver + val values = ContentValues().apply { + put(MediaStore.Images.Media.DISPLAY_NAME, name) + put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg") + put(MediaStore.Images.Media.DATE_TAKEN, at) + put(MediaStore.Images.Media.RELATIVE_PATH, "${Environment.DIRECTORY_PICTURES}/$FOLDER") + put(MediaStore.Images.Media.IS_PENDING, 1) + } + val uri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values) ?: return false + val written = runCatching { + resolver.openOutputStream(uri)?.use { bitmap.compress(Bitmap.CompressFormat.JPEG, QUALITY, it) } == true + }.getOrDefault(false) + if (!written) { + resolver.delete(uri, null, null) + return false + } + resolver.update(uri, ContentValues().apply { put(MediaStore.Images.Media.IS_PENDING, 0) }, null, null) + true + } else { + @Suppress("DEPRECATION") + val dir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), FOLDER) + if (!dir.isDirectory && !dir.mkdirs()) return false + val file = File(dir, name) + file.outputStream().use { bitmap.compress(Bitmap.CompressFormat.JPEG, QUALITY, it) } + android.media.MediaScannerConnection.scanFile(context, arrayOf(file.path), arrayOf("image/jpeg"), null) + true + } + }.getOrDefault(false) + + fun list(context: Context, runtimeRoot: File): List<BottomShot> = + (own(context) + steam(runtimeRoot)).sortedByDescending { it.takenAt }.take(LIMIT) + + private fun own(context: Context): List<BottomShot> = runCatching { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + @Suppress("DEPRECATION") + val dir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), FOLDER) + return dir.listFiles { f -> f.isFile && f.name.endsWith(".jpg", true) }.orEmpty() + .map { BottomShot(null, it, it.lastModified(), steam = false) } + } + val shots = ArrayList<BottomShot>() + context.contentResolver.query( + MediaStore.Images.Media.EXTERNAL_CONTENT_URI, + arrayOf(MediaStore.Images.Media._ID, MediaStore.Images.Media.DATE_TAKEN, MediaStore.Images.Media.DATE_ADDED), + "${MediaStore.Images.Media.RELATIVE_PATH} = ?", arrayOf("${Environment.DIRECTORY_PICTURES}/$FOLDER/"), + "${MediaStore.Images.Media.DATE_ADDED} DESC", + )?.use { c -> + while (c.moveToNext() && shots.size < LIMIT) { + val taken = c.getLong(1).takeIf { it > 0L } ?: (c.getLong(2) * 1000L) + shots += BottomShot(android.content.ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, c.getLong(0)), + null, taken, steam = false) + } + } + shots + }.getOrDefault(emptyList()) + + internal fun steam(runtimeRoot: File): List<BottomShot> = + SteamDownloadMonitor.STEAM_HOMES.flatMap { home -> + File(runtimeRoot, "$home/userdata").listFiles { f -> f.isDirectory }.orEmpty().flatMap { account -> + File(account, "760/remote").listFiles { f -> f.isDirectory }.orEmpty().flatMap { app -> + File(app, "screenshots").listFiles { f -> f.isFile && f.name.endsWith(".jpg", true) }.orEmpty().toList() + } + } + }.map { BottomShot(null, it, it.lastModified(), steam = true) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index 8b7ad50f0c..8255209d19 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -7,6 +7,7 @@ import android.util.Log import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils import com.droiddeck.launcher.core.GameEnvironment +import com.droiddeck.launcher.gpu.AppVulkan import com.droiddeck.launcher.gpu.GpuInfo import com.droiddeck.launcher.runtime.LinuxRuntime import com.github.luben.zstd.ZstdInputStream @@ -34,7 +35,6 @@ object ComponentsManager { "Dxvk-gplasync-Linux" to "dxvk", "Vkd3d-proton-Linux" to "vkd3d", ) - // DD_NIGHTLY holds every component in one release; the file name says which. private val NIGHTLY_PREFIXES = linkedMapOf("DD-dxvk-" to "dxvk", "DD-vkd3d-proton-" to "vkd3d", "DD-FEXCore-" to "fex") private val SOURCES = RELEASES.keys.map { NIGHTLIES to it } + (DD_COMPONENTS to DD_NIGHTLY) private val DOWNLOAD_REPOS = listOf(NIGHTLIES, DD_COMPONENTS) @@ -639,29 +639,31 @@ object ComponentsManager { } - fun swap(context: Context, protonId: String, file: String): String = synchronized(lock) { + fun swap(context: Context, protonId: String, file: String, auto: Boolean = false): String = synchronized(lock) { val p = proton(context, protonId) val wcp = File(packagesDir(context), safeName(file)) val info = packageInfo(context, wcp) val state = loadState(context) if (inUse(context, p)) { - state.sub("queued").sub(p.id).put(info.comp, JSONObject().put("kind", "package").put("file", wcp.name).put("label", info.version)) + state.sub("queued").sub(p.id).put(info.comp, JSONObject().put("kind", "package").put("file", wcp.name).put("label", info.version) + .apply { if (auto) put("auto", true) }) saveState(context, state) return context.getString(R.string.cmgr_swap_queued, LABEL[info.comp], info.version, p.name) } - applyPackage(context, p, info, wcp, state) + applyPackage(context, p, info, wcp, state, auto) state.sub("queued").optJSONObject(p.id)?.remove(info.comp) saveState(context, state) context.getString(R.string.cmgr_swap_done, LABEL[info.comp], info.version, p.name) } - private fun applyPackage(context: Context, p: Proton, info: Package, wcp: File, state: JSONObject) { + private fun applyPackage(context: Context, p: Proton, info: Package, wcp: File, state: JSONObject, auto: Boolean = false) { ensureOriginal(context, p, info.comp, state) val hashes = installFiles(context, p.dir, info.comp, wcp) state.sub("active").sub(p.id).put(info.comp, JSONObject() .put("file", wcp.name).put("label", info.version).put("protonVersion", p.version) .put("files", JSONObject(hashes.filterKeys { owned(info.comp, it) } as Map<*, *>)) - .put("at", System.currentTimeMillis() / 1000)) + .put("at", System.currentTimeMillis() / 1000) + .apply { if (auto) put("auto", true) }) Log.i(TAG, "swapped ${info.comp} ${info.version} into ${p.name} ${p.version}") } @@ -709,7 +711,7 @@ object ComponentsManager { applyOriginal(context, p, comp, v, File(originalsDir(context), "$pid/${safeName(v)}/$comp.wcp"), state) } else { val wcp = File(packagesDir(context), q.optString("file")) - applyPackage(context, p, packageInfo(context, wcp), wcp, state) + applyPackage(context, p, packageInfo(context, wcp), wcp, state, q.optBoolean("auto")) } done += "${LABEL[comp]} ${q.optString("label")} → ${p.name}" }.onFailure { Log.w(TAG, "queued $comp for ${p.name}", it) } @@ -976,12 +978,9 @@ object ComponentsManager { internal fun assetComp(release: String, name: String): String? = RELEASES[release] ?: if (release == DD_NIGHTLY) NIGHTLY_PREFIXES.entries.firstOrNull { name.startsWith(it.key) }?.value else null - // Per component: the stable packages newest first, then the nightlies. internal val CATALOG_ORDER: Comparator<CatalogItem> = compareBy<CatalogItem> { it.comp }.thenBy { it.release == DD_NIGHTLY }.then(newestFirst { it.file }) - // A nightly DD-<flavor>-<version>[+N]-nightly.wcp pairs with the newest stable <flavor>-<version>[-<rev>]-linux.wcp - // in the same list, so the stable row can offer it behind a Stable/Nightly switch. Unpaired nightlies keep their own row. internal fun nightlyPairs(items: List<CatalogItem>): Map<CatalogItem, CatalogItem> { val stable = items.filter { it.release != DD_NIGHTLY } return items.filter { it.release == DD_NIGHTLY }.mapNotNull { n -> @@ -1015,15 +1014,76 @@ object ComponentsManager { internal fun forcedPackageWanted(activeFile: String?, protonVersionMatches: Boolean): Boolean = activeFile.isNullOrEmpty() || !protonVersionMatches + internal fun bridgeDxvk(vk: AppVulkan?): ForcedPackage? = when { + vk == null -> null + !vk.atLeast(1, 1) -> null + !vk.atLeast(1, 3) -> ForcedPackage(emptySet(), "dxvk", DXVK_FOR_VULKAN_1_1, "Dxvk-Linux") + vk.shaderInt64 == false || (vk.maxPushConstants ?: 256) < 256 -> + ForcedPackage(emptySet(), "dxvk", DXVK_FOR_VULKAN_1_3_NO_INT64, "Dxvk-Linux") + else -> null + } + + internal const val DXVK_FOR_VULKAN_1_1 = "dxvk-1.10.3-linux.wcp" + internal const val DXVK_FOR_VULKAN_1_3_NO_INT64 = "dxvk-2.6.2-linux.wcp" + + internal fun autoDxvkUndoWanted(bridgeSession: Boolean, keepProtonDxvk: Boolean, vulkan: AppVulkan?, bridgeRule: ForcedPackage?): Boolean = + !bridgeSession || keepProtonDxvk || (vulkan != null && bridgeRule == null) + + private fun dropQueuedAuto(context: Context, installed: List<Proton>) = synchronized(lock) { + val state = loadState(context) + var changed = false + for (p in installed) { + val q = state.optJSONObject("queued")?.optJSONObject(p.id) ?: continue + if (q.optJSONObject("dxvk")?.optBoolean("auto") == true) { q.remove("dxvk"); changed = true } + } + if (changed) saveState(context, state) + } + + internal fun autoChoiceStale(entry: JSONObject?, wantedFile: String?): Boolean = + entry != null && entry.optBoolean("auto") && entry.optString("file") != wantedFile + internal fun catalogMatch(items: List<CatalogItem>, file: String, release: String): CatalogItem? = items.firstOrNull { it.file == file && it.release == release } - fun ensureForcedPackages(context: Context): String? = ensureForcedPackages( + private val forcedLock = Any() + + fun ensureForcedPackages(context: Context): String? = synchronized(forcedLock) { ensureForcedPackages( context, GpuInfo.detect(), { file, release -> catalogItem(context, file, release) }, { download(context, it) {} }, { id, file -> swap(context, id, file) }, - ) + vulkan = AppVulkan.detect(context), + bridgeSession = com.droiddeck.launcher.core.DeviceSupport.vkBridge(context), + applyAuto = { id, file -> swap(context, id, file, auto = true) }, + undoAuto = { id, comp -> undoAutoChoice(context, id, comp) }, + keepProtonDxvk = SessionPrefs.bridgeProtonDxvk(context), + autoPossible = !com.droiddeck.launcher.core.DeviceSupport.adreno(), + ) } + + fun settleAutoDxvk(context: Context) { + val app = context.applicationContext + Thread({ + runCatching { ensureForcedPackages(app) } + .onSuccess { if (it != null) Log.i(TAG, it) } + .onFailure { Log.w(TAG, "automatic DXVK", it) } + }, "auto-dxvk").start() + } + + internal fun undoAutoChoice(context: Context, protonId: String, comp: String): String = synchronized(lock) { + val p = proton(context, protonId) + val state = loadState(context) + val entry = state.sub("active").optJSONObject(p.id)?.optJSONObject(comp) + val sameProton = entry?.optString("protonVersion") == p.version + if (sameProton && originalFile(context, p, comp).isFile) + return restore(context, protonId, comp, safeName(p.version)) + if (sameProton) { + Log.w(TAG, "${p.name}: its own ${LABEL[comp]} copy is gone; keeping ${entry?.optString("label")}") + return "${LABEL[comp]}: ${p.name} keeps ${entry?.optString("label")} (its own copy is gone)" + } + state.sub("active").optJSONObject(p.id)?.remove(comp) + saveState(context, state) + "${LABEL[comp]}: ${p.name} keeps its own copy" + } internal fun ensureForcedPackages( context: Context, @@ -1031,16 +1091,35 @@ object ComponentsManager { lookup: (file: String, release: String) -> CatalogItem?, fetch: (CatalogItem) -> Unit, apply: (protonId: String, file: String) -> String, + vulkan: AppVulkan? = null, + bridgeSession: Boolean = false, + applyAuto: (protonId: String, file: String) -> String = apply, + undoAuto: (protonId: String, comp: String) -> String = { _, _ -> "" }, + keepProtonDxvk: Boolean = false, + autoPossible: Boolean = true, ): String? { - val rules = FORCED_PACKAGES.filter { it.matches(gpu) } - if (rules.isEmpty()) return null + val chooseDxvk = bridgeSession && !keepProtonDxvk + val bridgeRule = if (chooseDxvk) bridgeDxvk(vulkan) else null + val rules = FORCED_PACKAGES.filter { it.matches(gpu) }.map { it to false } + listOfNotNull(bridgeRule?.let { it to true }) + if (rules.isEmpty() && !autoPossible) return null val installed = protons(context) val lines = mutableListOf<String>() - for (rule in rules) { + fun each(p: Proton, what: () -> String): String = + runCatching(what).getOrElse { e -> Log.w(TAG, "${p.name}: ${e.message}", e); "${p.name}: ${e.message ?: e.javaClass.simpleName}" } + if (autoPossible && autoDxvkUndoWanted(bridgeSession, keepProtonDxvk, vulkan, bridgeRule)) { + dropQueuedAuto(context, installed) + val state = loadState(context) + for (p in installed) { + val entry = state.optJSONObject("active")?.optJSONObject(p.id)?.optJSONObject("dxvk") + if (autoChoiceStale(entry, null)) lines.add(each(p) { undoAuto(p.id, "dxvk") }) + } + } + for ((rule, auto) in rules) { val state = loadState(context) val targets = installed.filter { p -> val active = state.optJSONObject("active")?.optJSONObject(p.id)?.optJSONObject(rule.comp) - forcedPackageWanted(active?.optString("file"), active?.optString("protonVersion") == p.version) + forcedPackageWanted(active?.optString("file"), active?.optString("protonVersion") == p.version) || + (auto && autoChoiceStale(active, rule.file)) } if (targets.isEmpty()) continue val missing = missingPackage(context, rule, lookup, fetch) @@ -1048,9 +1127,10 @@ object ComponentsManager { lines.add(missing) continue } - lines.add(targets.joinToString("; ") { apply(it.id, rule.file) }) + if (auto) lines.add("${vulkan?.label}: DXVK ${rule.file}") + lines.add(targets.joinToString("; ") { p -> if (auto) each(p) { applyAuto(p.id, rule.file) } else apply(p.id, rule.file) }) } - return lines.joinToString("; ").ifEmpty { null } + return lines.filter { it.isNotEmpty() }.joinToString("; ").ifEmpty { null } } private fun missingPackage( diff --git a/app/src/main/java/com/droiddeck/launcher/session/DesktopLocale.kt b/app/src/main/java/com/droiddeck/launcher/session/DesktopLocale.kt new file mode 100644 index 0000000000..68ada01296 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/DesktopLocale.kt @@ -0,0 +1,64 @@ +package com.droiddeck.launcher.session + +import java.util.Locale + +object DesktopLocale { + const val DEFAULT = "C.UTF-8" + + private val regions = mapOf( + "en" to "US", "id" to "ID", "ms" to "MY", "cs" to "CZ", "da" to "DK", "de" to "DE", + "es" to "ES", "fr" to "FR", "it" to "IT", "hu" to "HU", "nl" to "NL", "nb" to "NO", + "pl" to "PL", "pt" to "PT", "ro" to "RO", "fi" to "FI", "sv" to "SE", "vi" to "VN", + "tr" to "TR", "el" to "GR", "bg" to "BG", "ru" to "RU", "uk" to "UA", "ar" to "EG", + "hi" to "IN", "th" to "TH", "ja" to "JP", "ko" to "KR", "zh" to "CN", + ) + + private val systemRegions = mapOf( + "en" to setOf("US", "GB", "AU", "CA", "IN", "NZ", "IE", "ZA", "SG"), + "fr" to setOf("FR", "CA", "BE", "CH", "LU"), + "de" to setOf("DE", "AT", "CH", "LU"), + "it" to setOf("IT", "CH"), + "nl" to setOf("NL", "BE"), + "pt" to setOf("PT", "BR"), + "sv" to setOf("SE", "FI"), + "ar" to setOf("EG", "SA", "AE", "MA", "DZ", "TN", "JO", "KW", "IQ"), + ) + + private val traditionalRegions = setOf("TW", "HK", "MO") + + fun lang(locale: Locale): String { + val language = when (locale.language) { + "in" -> "id" + "no", "nn" -> "nb" + else -> locale.language + } + val region = when { + language == "es" && SteamLanguage.forLocale(locale) == "latam" -> + locale.country.takeIf { it.length == 2 && it != "US" } ?: "MX" + language == "zh" -> chineseRegion(locale) + locale.country in systemRegions[language].orEmpty() -> locale.country + else -> regions[language] ?: return DEFAULT + } + return "${language}_$region.UTF-8" + } + + private fun chineseRegion(locale: Locale): String = when { + locale.script == "Hans" -> "CN" + locale.script == "Hant" -> if (locale.country == "HK") "HK" else "TW" + locale.country == "HK" -> "HK" + locale.country in traditionalRegions -> "TW" + else -> "CN" + } + + fun language(locale: Locale): String? { + val lang = lang(locale) + if (lang == DEFAULT) return null + val full = lang.removeSuffix(".UTF-8") + val short = full.substringBefore('_') + return when { + short == "en" -> full + full == "zh_HK" -> "zh_HK:zh_TW:zh" + else -> "$full:$short" + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt b/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt index 92cd7652da..d3471283e8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt @@ -7,11 +7,6 @@ import com.droiddeck.launcher.core.Downloader import org.json.JSONObject import java.io.File -/** - * The FEX build DroidDeck-Components' fex.json names for x86 programs. A session uses the last copy read. - * Components' build-fex.yml replaces the archive on its single `fex` release and records the build's version; - * a release per build (fex-2610-r5) is still read. - */ object FexCatalog { private const val TAG = "FexCatalog" const val CATALOG_URL = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/fex.json" @@ -43,7 +38,6 @@ object FexCatalog { fun cached(context: Context): Build? = runCatching { parse(file(context).readText()) }.getOrNull() - /** Reads fex.json straight from GitHub (a digest never comes from a mirror), at most every ten minutes. */ @Synchronized fun refresh(context: Context, now: Long = System.currentTimeMillis()): Build? { if (now - refreshedAt < REFRESH_MS) return cached(context) @@ -62,7 +56,6 @@ object FexCatalog { return build } - /** For droiddeck-fex-update: the build and every source its archive may come from (it checks the sha256). */ fun environment(build: Build, sources: List<String> = DownloadSource.candidates(build.url)): List<String> = listOf( "BL_FEX_TAG=${build.tag}", "BL_FEX_SHA256=${build.sha256}", diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt index 447fb254c9..eb5bb4e0d9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt @@ -17,7 +17,6 @@ object GameStorage { val primary = context.getExternalFilesDir(null)?.absolutePath val primaryStorage = Environment.getExternalStorageDirectory()?.absolutePath return context.getExternalFilesDirs(null).orEmpty().filterNotNull().mapNotNull { dir -> - // Non-primary app dirs are usable even when Android reports the volume as non-removable (USB SSDs often do). if (primary != null && dir.absolutePath == primary) return@mapNotNull null if (!primaryStorage.isNullOrBlank() && dir.absolutePath.startsWith("$primaryStorage/")) return@mapNotNull null val volume = try { sm?.getStorageVolume(dir) } catch (e: Exception) { null } @@ -63,12 +62,14 @@ object GameStorage { fun gamesFolderLibraries(context: Context): List<Library> { if (SessionPrefs.gameStorage(context).isNotEmpty()) return emptyList() val card = effective(context)?.let { canonical(File(it.path)) } + val added = SteamLibraries.list(context).map { canonical(it.host) } val sm = context.getSystemService(StorageManager::class.java) return AddedGames.roots(context).mapNotNull { root -> val host = canonical(root.host) if (!hasInstalledGames(root.host)) return@mapNotNull null if ('"' in root.guest || '\\' in root.guest || !root.host.isDirectory || !root.host.canWrite()) return@mapNotNull null if (card != null && (host == card || host.startsWith("$card/") || card.startsWith("$host/"))) return@mapNotNull null + if (added.any { SteamLibraries.overlaps(it, host) }) return@mapNotNull null val volume = try { sm?.getStorageVolume(root.host)?.getDescription(context) } catch (e: Exception) { null } val name = root.host.name.ifEmpty { context.getString(R.string.gstore_folder) } val label = if (volume.isNullOrBlank()) name else context.getString(R.string.gstore_folder_on_volume, name, volume) diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameTelemetry.kt b/app/src/main/java/com/droiddeck/launcher/session/GameTelemetry.kt new file mode 100644 index 0000000000..2a32d817ec --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/GameTelemetry.kt @@ -0,0 +1,209 @@ +package com.droiddeck.launcher.session + +import java.nio.ByteBuffer +import java.nio.ByteOrder + +data class Telemetry( + val source: String, + val speedKmh: Float? = null, + val rpm: Float? = null, + val maxRpm: Float? = null, + val gear: String? = null, + val throttle: Float? = null, + val brake: Float? = null, + val lap: Int? = null, + val laps: Int? = null, + val position: Int? = null, + val fuel: Float? = null, + val currentLapS: Float? = null, + val lastLapS: Float? = null, + val bestLapS: Float? = null, + val gLat: Float? = null, + val gLon: Float? = null, + val steer: Float? = null, + val tireTempsC: List<Float>? = null, + val turboBar: Float? = null, + val engineTempC: Float? = null, + val oilTempC: Float? = null, + val lights: Int? = null, +) + +object GameTelemetry { + const val CODEMASTERS_PORT = 20777 + const val FORZA_PORT = 5300 + const val OUTGAUGE_PORT = 4444 + val PORTS = listOf(CODEMASTERS_PORT, FORZA_PORT, OUTGAUGE_PORT) + + val LISTEN_ADDRESS: java.net.InetAddress = java.net.InetAddress.getByAddress(byteArrayOf(127, 0, 0, 1)) + + fun parse(port: Int, data: ByteArray, length: Int): Telemetry? = runCatching { + val buf = ByteBuffer.wrap(data, 0, length).order(ByteOrder.LITTLE_ENDIAN) + when (port) { + CODEMASTERS_PORT -> codemasters(buf, length) + FORZA_PORT -> forza(buf, length) + OUTGAUGE_PORT -> outGauge(buf, length) + else -> null + } + }.getOrNull() + + private const val MPS_TO_KMH = 3.6f + private const val GRAVITY = 9.81f + + const val DL_SHIFT = 1 + const val DL_HANDBRAKE = 4 + const val DL_PITSPEED = 8 + const val DL_TC = 16 + const val DL_ABS = 1024 + + private const val CM_LAP_TIME = 1 + private const val CM_SPEED = 7 + private const val CM_THROTTLE = 29 + private const val CM_STEER = 30 + private const val CM_BRAKE = 31 + private const val CM_GEAR = 33 + private const val CM_G_LAT = 34 + private const val CM_G_LON = 35 + private const val CM_LAP = 36 + private const val CM_RPM = 37 + private const val CM_POSITION = 39 + private const val CM_FUEL = 45 + private const val CM_FUEL_CAPACITY = 46 + private const val CM_LAPS = 60 + private const val CM_LAST_LAP = 62 + private const val CM_MAX_RPM = 63 + private const val CM_MIN_FLOATS = 38 + + internal fun codemasters(buf: ByteBuffer, length: Int): Telemetry? { + if (length < CM_MIN_FLOATS * 4) return null + val floats = length / 4 + fun f(i: Int) = if (i < floats) buf.getFloat(i * 4) else 0f + val gear = f(CM_GEAR).toInt() + val capacity = f(CM_FUEL_CAPACITY) + return Telemetry( + source = "Codemasters", + speedKmh = f(CM_SPEED) * MPS_TO_KMH, + rpm = f(CM_RPM) * 10f, + maxRpm = (f(CM_MAX_RPM) * 10f).takeIf { it > 0f }, + gear = when { + gear == 0 -> "N" + gear < 0 || gear == 10 -> "R" + else -> gear.toString() + }, + throttle = f(CM_THROTTLE).coerceIn(0f, 1f), + brake = f(CM_BRAKE).coerceIn(0f, 1f), + lap = f(CM_LAP).toInt() + 1, + laps = f(CM_LAPS).toInt().takeIf { it > 0 }, + position = f(CM_POSITION).toInt().takeIf { it > 0 }, + fuel = if (capacity > 0f) (f(CM_FUEL) / capacity).coerceIn(0f, 1f) else null, + currentLapS = f(CM_LAP_TIME).takeIf { it > 0f }, + lastLapS = f(CM_LAST_LAP).takeIf { it > 0f }, + gLat = f(CM_G_LAT), + gLon = f(CM_G_LON), + steer = f(CM_STEER).coerceIn(-1f, 1f), + ) + } + + private const val FORZA_SLED = 232 + private const val FORZA_FM7 = 311 + private const val FORZA_HORIZON = 324 + private const val FORZA_FM2023 = 331 + private const val HORIZON_SHIFT = 12 + + internal fun forza(buf: ByteBuffer, length: Int): Telemetry? { + if (length < FORZA_SLED) return null + val racing = buf.getInt(0) != 0 + val maxRpm = buf.getFloat(8) + val rpm = buf.getFloat(16) + val dash = when (length) { + FORZA_FM7, FORZA_FM2023 -> FORZA_SLED + FORZA_HORIZON -> FORZA_SLED + HORIZON_SHIFT + else -> -1 + } + if (dash < 0) return Telemetry(source = "Forza", rpm = rpm, maxRpm = maxRpm.takeIf { it > 0f }) + if (!racing) return Telemetry(source = "Forza") + val gear = buf.get(dash + 75).toInt() and 0xFF + val tiresF = (0 until 4).map { buf.getFloat(dash + 24 + it * 4) } + return Telemetry( + source = "Forza", + speedKmh = buf.getFloat(dash + 12) * MPS_TO_KMH, + rpm = rpm, + maxRpm = maxRpm.takeIf { it > 0f }, + gear = if (gear == 0) "R" else gear.toString(), + throttle = (buf.get(dash + 71).toInt() and 0xFF) / 255f, + brake = (buf.get(dash + 72).toInt() and 0xFF) / 255f, + lap = (buf.getShort(dash + 68).toInt() and 0xFFFF) + 1, + position = (buf.get(dash + 70).toInt() and 0xFF).takeIf { it > 0 }, + fuel = buf.getFloat(dash + 44).coerceIn(0f, 1f), + currentLapS = buf.getFloat(dash + 60).takeIf { it > 0f }, + lastLapS = buf.getFloat(dash + 56).takeIf { it > 0f }, + bestLapS = buf.getFloat(dash + 52).takeIf { it > 0f }, + gLat = buf.getFloat(20) / GRAVITY, + gLon = buf.getFloat(28) / GRAVITY, + steer = (buf.get(dash + 76).toFloat() / 127f).coerceIn(-1f, 1f), + tireTempsC = tiresF.takeIf { f -> f.any { it > 0f } }?.map { (it - 32f) * 5f / 9f }, + ) + } + + private const val OUTGAUGE_SIZE = 92 + + internal fun outGauge(buf: ByteBuffer, length: Int): Telemetry? { + if (length < OUTGAUGE_SIZE) return null + val gear = buf.get(10).toInt() and 0xFF + return Telemetry( + source = "OutGauge", + speedKmh = buf.getFloat(12) * MPS_TO_KMH, + rpm = buf.getFloat(16), + gear = when (gear) { + 0 -> "R" + 1 -> "N" + else -> (gear - 1).toString() + }, + throttle = buf.getFloat(48).coerceIn(0f, 1f), + brake = buf.getFloat(52).coerceIn(0f, 1f), + fuel = buf.getFloat(28).coerceIn(0f, 1f), + turboBar = buf.getFloat(20).takeIf { it != 0f }, + engineTempC = buf.getFloat(24).takeIf { it != 0f }, + oilTempC = buf.getFloat(36).takeIf { it != 0f }, + lights = buf.getInt(44).takeIf { buf.getInt(40) != 0 }, + ) + } +} + +object GameStatusFiles { + const val WAR_THUNDER_STATE = "http://127.0.0.1:8111/state" + private const val ELITE_APP = "359320" + private const val ELITE_STATUS = "pfx/drive_c/users/steamuser/Saved Games/Frontier Developments/Elite Dangerous/Status.json" + const val WAR_THUNDER_ROWS = 12 + + internal fun warThunder(json: String): List<Pair<String, String>> { + val state = org.json.JSONObject(json) + if (!state.optBoolean("valid", false)) return emptyList() + return state.keys().asSequence().filter { it != "valid" }.mapNotNull { key -> + val value = state.opt(key) as? Number ?: return@mapNotNull null + key to if (value.toDouble() % 1.0 == 0.0) value.toLong().toString() else "%.1f".format(java.util.Locale.US, value.toDouble()) + }.toList() + } + + fun eliteStatusFile(runtimeRoot: java.io.File, mounts: Map<String, java.io.File>): java.io.File? { + val libraries = SteamDownloadMonitor.manifests(runtimeRoot, mounts).mapNotNull { it.parentFile } + + SteamDownloadMonitor.STEAM_HOMES.map { java.io.File(runtimeRoot, "$it/steamapps") } + return libraries.distinct().map { java.io.File(it, "compatdata/$ELITE_APP/$ELITE_STATUS") }.firstOrNull { it.isFile } + } + + data class Elite(val fuelMain: Double?, val fuelReserve: Double?, val cargo: Double?, val pips: List<Int>?, val legal: String?, val balance: Long?) + + internal fun elite(json: String): Elite? { + val s = org.json.JSONObject(json) + val fuel = s.optJSONObject("Fuel") + val pips = s.optJSONArray("Pips")?.let { a -> (0 until a.length()).map { a.optInt(it) } } + if (fuel == null && pips == null && !s.has("Cargo") && !s.has("Balance")) return null + return Elite( + fuelMain = fuel?.optDouble("FuelMain")?.takeIf { !it.isNaN() }, + fuelReserve = fuel?.optDouble("FuelReservoir")?.takeIf { !it.isNaN() }, + cargo = s.optDouble("Cargo").takeIf { !it.isNaN() }, + pips = pips, + legal = s.optString("LegalState").takeIf { it.isNotEmpty() }, + balance = if (s.has("Balance")) s.optLong("Balance") else null, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameThreadHints.kt b/app/src/main/java/com/droiddeck/launcher/session/GameThreadHints.kt index 1b5b90db62..3c2c5098b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameThreadHints.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameThreadHints.kt @@ -12,54 +12,26 @@ import com.droiddeck.launcher.wayland.WaylandCompositor import java.io.File import kotlin.math.abs -/** - * The game's busiest threads named to Android's performance hint service (ADPF) for a session. - * - * Qualcomm's WALT moves a thread to the prime cores only once it fills a mid core (the Odin 3's - * sched_upmigrate is 95), and a game thread that waits on its workers or the GPU for part of each - * frame never does: Factorio's update thread sat at ~68% on cores 0-5 with 6-7 idle, and ran 60% - * faster pinned to 6-7. An app may not raise a thread's uclamp (EPERM without CAP_SYS_NICE), but a - * hint session may name any thread of its UID - the guest's are - and one reported behind its - * target is boosted by the power HAL onto the prime cores: on the Odin 3 a 70%-busy thread of a - * child process went from cores 0-5 to 6-7 and ran 1.7x faster within a second. - * - * Once a second the busiest threads of this UID are read from /proc; one busy more than [ENTER] of - * the time (averaged with the second before, so a loading spike does not count) joins the session, - * and leaves it under [LEAVE] - well below, since it runs faster where it was moved. While the - * session has threads it reports them behind target, which is what asks for the boost: the reports - * carry no frame timing, the busy share is the signal (a capped game's frame interval looks the same - * as a slow one's). Nothing is boosted while the device is critically hot or saves power. - * - * Nor while the game holds the panel's rate or a fraction of it ([holdsPace]): there is nothing to - * gain, and it cost frame pacing - Serious Sam capped at 120 fps ran its boosted main thread on prime - * cores the governor kept at 2.2 GHz, slower than a 3.5 GHz mid core, and 23-25% of its frames fell - * under 90 fps against 2-7% unboosted. A game with no frames (Factorio's benchmark, a loading screen) - * or one falling behind the panel is boosted; one holding pace keeps what it has for [PACE_LEAVE_S] - * seconds and is then let go. - */ object GameThreadHints { private const val TAG = "GameThreadHints" private const val TARGET_NS = 10_000_000L private const val REPORT_MS = 50L - private const val SCAN_EVERY = 20 // reports, so once a second + private const val SCAN_EVERY = 20 private const val ENTER = 0.6 - private const val LEAVE = 0.15 // a capped game's main thread idles to ~30% on a prime core; under 0.3 it hopped back and forth - private const val MAX_THREADS = 2 // one per prime core; a third would be sped up in place instead + private const val LEAVE = 0.15 + private const val MAX_THREADS = 2 private const val TOP_PROCESSES = 3 private const val PACE_WINDOW_S = 3 private const val PACE_LEAVE_S = 10 private const val PACE_TOLERANCE = 0.08 - /** Busy, but not the game: the app itself and the Steam client, whose UI would otherwise hold the prime cores. */ private val NOT_GAMES = setOf("steam", "steamwebhelper") private var worker: Thread? = null - /** At a session's start. The line is for the log. */ @Synchronized fun start(context: Context): String { if (!SessionPrefs.gameThreadHints(context)) return "game thread hints: off" - // Measured on the Odin 3 (CQ8725S) only; another HAL may boost differently, or not at all. if (Build.VERSION.SDK_INT < 31 || Build.SOC_MODEL != "CQ8725S") return "game thread hints: Odin 3 only" val hm = context.getSystemService(PerformanceHintManager::class.java) ?: return "game thread hints: no PerformanceHintManager" @@ -69,7 +41,6 @@ object GameThreadHints { return "game thread hints: watching" } - /** At a session's end. */ @Synchronized fun stop() { worker?.interrupt() @@ -92,7 +63,6 @@ object GameThreadHints { val fps = (frames.last() - frames.first()).toDouble() / (frames.size - 1).coerceAtLeast(1) val paced = frames.size > PACE_WINDOW_S && holdsPace(fps, SessionState.refreshHz.toDouble()) pacedFor = if (paced) pacedFor + 1 else 0 - // Not SEVERE: the Odin 3 reports it once its skin reaches 50 C, a couple of minutes into any game. val spare = pm.isPowerSaveMode || pm.currentThermalStatus >= PowerManager.THERMAL_STATUS_CRITICAL val next = when { spare || pacedFor >= PACE_LEAVE_S -> emptySet() @@ -101,7 +71,6 @@ object GameThreadHints { } if (next != boosted) { session = update(hm, session, next) - // No session means a thread exited in between: tried again next second. boosted = if (session == null) emptySet() else next Log.i(TAG, (if (session == null && next.isNotEmpty()) "no session for " else "boosting ") + next.joinToString { "${readName("/proc/$it/comm")}/$it ${((busy[it] ?: 0.0) * 100).toInt()}%" }.ifEmpty { "nothing" } + @@ -119,7 +88,6 @@ object GameThreadHints { } } - /** A new session over [tids] in place of [session]; null for none. The set changes seldom, so no setThreads. */ private fun update(hm: PerformanceHintManager, session: PerformanceHintManager.Session?, tids: Set<Int>): PerformanceHintManager.Session? { session?.close() if (tids.isEmpty()) return null @@ -131,19 +99,9 @@ object GameThreadHints { } } - /** - * Whether a game presenting [fps] frames a second keeps up with a [refreshHz] panel: within - * [PACE_TOLERANCE] of the rate or of a half, a third or a quarter of it (a 60 fps limiter on 120 Hz). - * A game with next to no frames (a headless benchmark, a loading screen) does not. - */ - // ponytail: a CPU-bound game that happens to run at ~60 fps on a 120 Hz panel reads as limited; narrow the band if that shows up internal fun holdsPace(fps: Double, refreshHz: Double): Boolean = fps >= 10 && refreshHz > 0 && (1..4).any { k -> abs(fps - refreshHz / k) < PACE_TOLERANCE * refreshHz / k } - /** - * The threads to boost next: those already boosted that are still above [LEAVE], then new ones - * above [ENTER], busiest first, at most [MAX_THREADS]. - */ internal fun pick(boosted: Set<Int>, busy: Map<Int, Double>): Set<Int> = busy.entries .filter { (tid, share) -> share >= if (tid in boosted) LEAVE else ENTER } @@ -154,7 +112,6 @@ object GameThreadHints { private fun readName(path: String) = try { File(path).readText().trim() } catch (_: Exception) { "?" } - /** Busy shares of this UID's threads since the last sample: /proc shows an app only its own processes. */ private class Scanner { private val self = Process.myPid() private val hz = Os.sysconf(OsConstants._SC_CLK_TCK).toDouble() @@ -163,7 +120,6 @@ object GameThreadHints { private var lastThread = HashMap<Int, Long>() private var lastBusy = HashMap<Int, Double>() - /** Only the busiest few processes have their threads read, so a second costs a few dozen small reads. */ fun sample(): Map<Int, Double> { val now = System.nanoTime() val seconds = (now - lastNs) / 1e9 @@ -197,7 +153,6 @@ object GameThreadHints { return busy } - /** utime + stime of a /proc stat line; fields counted after the command's closing parenthesis. */ private fun cpuTicks(path: String): Long? = try { val line = File(path).readText() val fields = line.substring(line.lastIndexOf(')') + 2).split(' ') diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt index e95af8b155..a9d55199d2 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuMemComponent.kt @@ -21,7 +21,8 @@ class GpuMemComponent(private val file: File, private val root: File) : SessionP thread = Thread({ while (running) { try { Thread.sleep(PERIOD_MS) } catch (e: InterruptedException) { break } - if (running && (OverlayShown.check(root) || com.droiddeck.launcher.hud.FusionHudHost.showing)) sample()?.let { write(it) } + if (running && (OverlayShown.check(root) || com.droiddeck.launcher.hud.DroidDeckHudHost.showing || + com.droiddeck.launcher.hud.BottomHudPresence.showing)) sample()?.let { write(it) } } }, "gpu-mem").apply { isDaemon = true; start() } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt index 0063509167..b0c0b45b2f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuStatsComponent.kt @@ -7,10 +7,16 @@ import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File import java.io.RandomAccessFile -class GpuStatsComponent(val dir: File) : SessionPart() { +class GpuStatsComponent(val dir: File, private val root: File) : SessionPart() { @Volatile private var running = false private var thread: Thread? = null private val feeds = ArrayList<Feed>() + private var layerLoad: LayerLoad? = null + private var memstore: KgslBusy.Reader? = null + private var memstoreLoad: MemstoreLoad? = null + private var memstoreState: String? = null + private var cycleClock: KgslClock.Sampler? = null + @Volatile private var shown = false private class Feed( val file: File, val source: String, val read: () -> Long?, val format: String, val percent: Boolean = false, @@ -24,9 +30,13 @@ class GpuStatsComponent(val dir: File) : SessionPart() { } fun prepare(): Boolean { + sources = "" + KgslBusy.status = "not tried" + KgslClock.status = "not tried" if (!File(KGSL).exists()) return false val unreadable = MANGOHUD_FILES.any { File(KGSL, it).let { f -> f.exists() && !f.canRead() } } - if (!unreadable && !File(GPUBUSY).canRead()) return false + // Where SELinux hides the kgsl nodes completely (exists() is false too), the layer and cycle-counter feeds stand in. + if (!unreadable && !File(GPUBUSY).canRead() && !loadBlocked()) return false return try { dir.mkdirs() dir.listFiles()?.forEach { java.nio.file.Files.deleteIfExists(it.toPath()) } @@ -34,19 +44,19 @@ class GpuStatsComponent(val dir: File) : SessionPart() { PASSTHROUGH_FILES.forEach { name -> runCatching { File(dir, name).writeText(File(KGSL, name).readText()) } } - loadFeed()?.let { load -> + (loadFeed() ?: blockedLoadFeed())?.let { load -> feeds.add(load) feeds.add(Feed(File(dir, "perf_now"), load.source, load.read, "%-6s\n", percent = true)) } - pick("clock_mhz", clockSources(), "%5d\n") { mhz(it) }?.let { clock -> + (pick("clock_mhz", clockSources(), "%5d\n") { mhz(it) } ?: cycleClockFeed())?.let { clock -> feeds.add(clock) feeds.add(Feed(File(dir, "cur_freq"), clock.source, { clock.read()?.times(1_000_000) }, "%-10d\n")) } pick("temp", tempSources(), "%6d\n") { milliCelsius(it) }?.let { feeds.add(it) } refresh() - Log.i(TAG, "hud: kgsl stats from the session's own: " + MANGOHUD_FILES.joinToString { name -> - "$name " + (feeds.firstOrNull { it.file.name == name }?.source ?: "none") - }) + createMissing(feeds.map { it.file }) + describeSources() + Log.i(TAG, "hud: kgsl stats from the session's own: $sources") true } catch (e: Exception) { Log.w(TAG, "hud: could not stand in for kgsl stats: $e") @@ -66,19 +76,217 @@ class GpuStatsComponent(val dir: File) : SessionPart() { }, "gpu-stats").apply { isDaemon = true; start() } } - // kgsl's gpubusy can read 0 0 straight after a read, so feeds that share a reader share one read. private fun refresh() { + if (layerLoad != null || cycleClock != null || memstore != null) { + shown = hudShown() + memstore?.run(shown) + if (!shown) memstoreLoad?.pause() + layerLoad?.wanted(shown && memstoreLoad?.working != true) + } val values = HashMap<() -> Long?, Long?>() for (feed in feeds) { if (feed.read !in values) values[feed.read] = feed.read() values[feed.read]?.let { write(feed, it) } } + memstoreLoad?.let { load -> + val state = when { + load.working -> "working" + load.failed -> "failed" + else -> null + } + if (state != memstoreState) { + memstoreState = state + if (load.failed) { + memstore?.close() + memstore = null + KgslBusy.status += ", but the stamps never moved" + Log.i(TAG, "hud: kgsl memstore timestamps never moved; GPU load from Vulkan timing") + } else if (load.working) { + Log.i(TAG, "hud: GPU load from the kgsl memstore (all GPU work)") + } + describeSources() + } + } + } + + private fun describeSources() { + sources = MANGOHUD_FILES.joinToString { name -> + val source = if (name == "gpu_busy_percentage" && memstoreLoad != null) memstoreSource() + else feeds.firstOrNull { it.file.name == name }?.source + "$name " + (source ?: "none") + } + } + + private fun memstoreSource(): String = when { + memstoreLoad?.working == true -> + if (memstore?.mode == KgslBusy.MODE_CONTEXTS) "kgsl memstore per-context timestamps (all GPU work)" + else "kgsl memstore ringbuffer timestamps (all GPU work)" + memstoreLoad?.failed == true -> LAYER_SOURCE + else -> "kgsl memstore once its timestamps move; until then $LAYER_SOURCE" } override fun stop() { running = false thread?.interrupt() thread = null + memstore?.close() + memstore = null + memstoreLoad = null + memstoreState = null + layerLoad?.clear() + cycleClock?.close() + cycleClock = null + sources = "" + } + + private fun hudShown(): Boolean = OverlayShown.check(root) || com.droiddeck.launcher.hud.DroidDeckHudHost.showing || + com.droiddeck.launcher.hud.BottomHudPresence.showing + + // Android hides the load (kgsl sysfs blocked): the kgsl memstore gives the whole GPU's busy share. The in-game + // Vulkan layer and the compositor time their own GPU work until the memstore timestamps are seen moving, and + // for the whole session where they never move. + private fun blockedLoadFeed(): Feed? { + if (!loadBlocked()) return null + val load = LayerLoad(guestLoadDir(root), extra = ::compositorBusyNs, onWanted = ::compositorTiming) + .also { it.clear(); layerLoad = it } + val sampled = KgslBusy.open()?.let { reader -> + memstore = reader + MemstoreLoad(reader::counts).also { memstoreLoad = it } + } + val read = read@{ + if (!shown) return@read null + val whole = sampled?.percent() + if (sampled?.working == true) whole else load.percent() + } + return Feed(File(dir, "gpu_busy_percentage"), LAYER_SOURCE, read, "%3d %%\n") + } + + // The clock nodes are blocked too: read the GPU's cycle counter from a small GPU job of our own. + private fun cycleClockFeed(): Feed? { + val sampler = KgslClock.open() ?: return null + cycleClock = sampler + // clock_mhz and cur_freq both read this; one GPU job per refresh serves both. + var at = 0L + var last: Long? = null + val read = { + val now = SystemClock.elapsedRealtime() + if (now - at > PERIOD_MS / 2) { at = now; last = if (shown) sampler.mhz()?.toLong() else null } + last + } + return Feed(File(dir, "clock_mhz"), "GPU cycle counter (own GPU job)", read, "%5d\n") + } + + private fun compositorBusyNs(): Long? = + runCatching { com.droiddeck.launcher.wayland.WaylandCompositor.nativeGpuBusyNs() }.getOrNull()?.takeIf { it >= 0 } + + private fun compositorTiming(on: Boolean) { + runCatching { com.droiddeck.launcher.wayland.WaylandCompositor.nativeSetGpuTiming(on) } + } + + /** + * Busy time the layer (tools/gpuload) writes per process, plus [extra] (the compositor's own GPU time), as a share + * of wall time between two reads. + */ + internal class LayerLoad( + private val dir: File, + private val clock: () -> Long = System::nanoTime, + private val extra: () -> Long? = { null }, + private val onWanted: (Boolean) -> Unit = {}, + ) { + private val last = HashMap<String, Long>() + private var lastAt = 0L + private var on = false + + fun wanted(on: Boolean) { + val flag = File(dir, "on") + if (on && !flag.exists()) runCatching { dir.mkdirs(); flag.createNewFile() } + if (!on && flag.exists()) { flag.delete(); last.clear(); lastAt = 0L } + if (on != this.on) onWanted(on) + this.on = on + } + + fun percent(): Long? { + val now = clock() + val files = dir.listFiles { f -> f.name.isNotEmpty() && f.name.all(Char::isDigit) }.orEmpty() + var busy = 0L + val seen = HashSet<String>() + for (file in files) { + val total = runCatching { file.readText().trim().substringBefore(' ').toLong() }.getOrNull() ?: continue + seen += file.name + last[file.name]?.let { if (total >= it) busy += total - it } + last[file.name] = total + if (System.currentTimeMillis() - file.lastModified() > STALE_MS) file.delete() + } + extra()?.let { total -> + seen += EXTRA + last[EXTRA]?.let { if (total >= it) busy += total - it } + last[EXTRA] = total + } + last.keys.retainAll(seen) + val wall = now - lastAt + val first = lastAt == 0L + lastAt = now + if (first || wall <= 0) return null + return (busy * 100 / wall).coerceIn(0, 100) + } + + fun clear() { + dir.listFiles()?.forEach { it.delete() } + last.clear() + lastAt = 0L + if (on) onWanted(false) + on = false + } + + private companion object { + const val EXTRA = "compositor" + } + } + + /** + * Busy share over the last [WINDOW] reads from [KgslBusy] running totals (busy samples, samples, samples with + * new ringbuffer work). Not [working] until new work has been seen; [failed] once [GIVE_UP_SAMPLES] samples + * passed without any. + */ + internal class MemstoreLoad(private val counts: () -> LongArray?) { + var working = false + private set + var failed = false + private set + private val window = ArrayDeque<LongArray>() + private var waited = 0L + + fun percent(): Long? { + if (failed) return null + val now = counts() ?: return null + val previous = window.lastOrNull() + window.addLast(now) + while (window.size > WINDOW + 1) window.removeFirst() + if (previous == null) return null + val fresh = now[1] - previous[1] + if (fresh <= 0) return null + if (!working) { + if (now[2] > previous[2]) { + working = true + } else { + waited += fresh + if (waited >= GIVE_UP_SAMPLES) failed = true + return null + } + } + val base = window.first() + return ((now[0] - base[0]) * 100 / (now[1] - base[1])).coerceIn(0, 100) + } + + /** The totals stop while sampling is off; the next reading starts a new window. */ + fun pause() { + window.clear() + } + + companion object { + const val GIVE_UP_SAMPLES = 5_000L + const val WINDOW = 2 + } } private fun loadFeed(): Feed? { @@ -86,8 +294,6 @@ class GpuStatsComponent(val dir: File) : SessionPart() { return pick("gpu_busy_percentage", LOAD_SOURCES, "%3d %%\n") { it.coerceIn(0, 100) } } - // kgsl publishes busy/total once per ~1 s of GPU-on time and zeroes it on any read while the GPU is - // power-collapsed, so direct pollers mostly see 0; latch each published window instead. private fun latchedBusyFeed(): Feed? { var load = 0L var windowAt = 0L @@ -134,6 +340,34 @@ class GpuStatsComponent(val dir: File) : SessionPart() { private const val LOAD_HOLD_MS = 5_000L private val MANGOHUD_FILES = listOf("gpu_busy_percentage", "clock_mhz", "temp") private val PASSTHROUGH_FILES = listOf("gpu_model", "gpu_chipid") + const val GUEST_LOAD_DIR = "/run/droiddeck-hud/gpu-load" + private const val LAYER_SOURCE = "Vulkan timing: games ($GUEST_LOAD_DIR) + DroidDeck compositor" + + /** Where the running session's GPU feeds come from, for the HUD diagnostics export. */ + @Volatile var sources = "" + + /** Why the no-root GPU readers work or not, for the HUD diagnostics export; empty where they were not needed. */ + fun readerStatus(): String = + if (KgslBusy.status == "not tried" && KgslClock.status == "not tried") "" + else "kgsl memstore ${KgslBusy.status}; GPU cycle counter ${KgslClock.status}" + + private const val STALE_MS = 30_000L + + fun guestLoadDir(root: File) = File(root, GUEST_LOAD_DIR.removePrefix("/")) + + // A feed with no value yet (the HUD hidden at start) still needs its file, or binds() leaves its node out for + // the whole session. + internal fun createMissing(files: List<File>) = files.forEach { runCatching { it.createNewFile() } } + + /** True when this app can see kgsl but none of its GPU load nodes (SELinux-blocked, e.g. the Retroid Pocket Duo). */ + fun loadBlocked(): Boolean = File(KGSL).exists() && !File(GPUBUSY).canRead() && LOAD_SOURCES.none { File(it).canRead() } + + /** Turns on the in-game layer (tools/gpuload) where the load is blocked; empty elsewhere. */ + fun guestEnv(root: File): List<String> { + if (!loadBlocked()) return emptyList() + guestLoadDir(root).mkdirs() + return listOf("DROIDDECK_GPU_LOAD=1", "DROIDDECK_GPU_LOAD_DIR=$GUEST_LOAD_DIR") + } private const val QCOM_GPU = "/sys/kernel/gpu" private val LOAD_SOURCES = listOf( "$KGSL/gpu_busy_percentage", "$KGSL/devfreq/gpu_load", "$KGSL/gpuload", "$QCOM_GPU/gpu_busy", diff --git a/app/src/main/java/com/droiddeck/launcher/session/HwmonComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/HwmonComponent.kt index 2cd84747d4..66401c7fa0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/HwmonComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/HwmonComponent.kt @@ -108,5 +108,9 @@ class HwmonComponent(val dir: File, private val root: File) : SessionPart() { private fun readNumber(path: String): Long? = runCatching { File(path).readText().trim().toLong() }.getOrNull()?.takeIf { it >= 0 } + + fun fanSource(): String? = FAN_SOURCES().firstOrNull { readNumber(it) != null } + + fun readRpm(path: String): Long? = readNumber(path) } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt new file mode 100644 index 0000000000..d3962dd765 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslBusy.kt @@ -0,0 +1,67 @@ +package com.droiddeck.launcher.session + +import android.util.Log + +/** + * Whole-GPU busy share for Adreno devices whose kgsl load nodes are SELinux-blocked for apps + * (app/src/main/cpp/gpuclock/kgsl_busy.c). It covers every process's GPU work, Android's own composition included. + */ +object KgslBusy { + private const val TAG = "SessionService" + + @JvmStatic private external fun nativeOpen(error: IntArray): Long + @JvmStatic private external fun nativeMode(handle: Long): Int + @JvmStatic private external fun nativeRun(handle: Long, on: Boolean) + @JvmStatic private external fun nativeRead(handle: Long, out: LongArray): Boolean + @JvmStatic private external fun nativeClose(handle: Long) + + private val loaded: Boolean by lazy { + runCatching { System.loadLibrary("gpuclock") }.onFailure { Log.w(TAG, "hud: gpuclock library: $it") }.isSuccess + } + + class Reader internal constructor(private var handle: Long) : AutoCloseable { + /** Samples once a millisecond while on. */ + @Synchronized fun run(on: Boolean) { + if (handle != 0L) nativeRun(handle, on) + } + + /** Which memstore entries are watched: [MODE_RINGBUFFER] or [MODE_CONTEXTS] (hardware-scheduled kernels). */ + val mode: Int = if (handle != 0L) runCatching { nativeMode(handle) }.getOrDefault(0) else 0 + + /** Running totals: busy samples, samples, samples in which a ringbuffer or context started new work. */ + @Synchronized fun counts(): LongArray? { + if (handle == 0L) return null + val out = LongArray(3) + return if (nativeRead(handle, out)) out else null + } + + @Synchronized override fun close() { + if (handle != 0L) nativeClose(handle) + handle = 0L + } + } + + const val MODE_RINGBUFFER = 1 + const val MODE_CONTEXTS = 2 + + /** What the last [open] found, for the HUD diagnostics export. */ + @Volatile var status = "not tried" + + fun open(): Reader? { + if (!loaded) { + status = "gpuclock library did not load" + return null + } + val error = IntArray(1) + val handle = runCatching { nativeOpen(error) }.getOrDefault(0L) + if (handle == 0L) { + status = "open failed: ${KgslErrors.describe(error[0])}" + Log.i(TAG, "hud: no GPU load from the kgsl memstore (open error ${error[0]})") + return null + } + val reader = Reader(handle) + status = if (reader.mode == MODE_CONTEXTS) "per-context stamps (hardware-scheduled kernel)" else "ringbuffer stamps" + Log.i(TAG, "hud: kgsl memstore reader uses $status") + return reader + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt new file mode 100644 index 0000000000..a8089cb328 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslClock.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.session + +import android.util.Log + +/** + * GPU clock from the GPU's own cycle counter, for Adreno devices whose kgsl clock nodes are SELinux-blocked for + * apps (app/src/main/cpp/gpuclock/kgsl_clock.c). Each [mhz] call runs one tiny GPU job, so callers sample only + * while a HUD is shown. + */ +object KgslClock { + private const val TAG = "SessionService" + + @JvmStatic private external fun nativeOpen(error: IntArray): Long + @JvmStatic private external fun nativeSample(handle: Long): Int + @JvmStatic private external fun nativeClose(handle: Long) + + private val loaded: Boolean by lazy { + runCatching { System.loadLibrary("gpuclock") }.onFailure { Log.w(TAG, "hud: gpuclock library: $it") }.isSuccess + } + + class Sampler internal constructor(private var handle: Long) : AutoCloseable { + /** MHz, or null when this sample was refused or failed its checks. */ + @Synchronized fun mhz(): Int? = sample().takeIf { it > 0 } + + /** MHz, or a negative native code: -errno from kgsl or [RANGE_CHECK_FAILED]. */ + @Synchronized fun sample(): Int = if (handle == 0L) CLOSED else nativeSample(handle) + + @Synchronized override fun close() { + if (handle != 0L) nativeClose(handle) + handle = 0L + } + } + + /** -EBADF, what the native side also returns for a closed handle. */ + private const val CLOSED = -9 + + /** The native sample code for a reading that failed its range checks (kgsl_clock.c sampler_mhz). */ + const val RANGE_CHECK_FAILED = -1000 + + /** What the last [open] found, for the HUD diagnostics export. */ + @Volatile var status = "not tried" + + /** A sampler that already produced one good reading, or null (the reason goes to the log and [status]). */ + fun open(): Sampler? { + if (!loaded) { + status = "gpuclock library did not load" + return null + } + val error = IntArray(1) + val handle = runCatching { nativeOpen(error) }.getOrDefault(0L) + if (handle == 0L) { + status = "open failed: ${KgslErrors.describe(error[0])}" + Log.i(TAG, "hud: no GPU clock from the cycle counter (open error ${error[0]})") + return null + } + val sampler = Sampler(handle) + var code = 0 + val first = (0 until 3).firstNotNullOfOrNull { + code = sampler.sample() + code.takeIf { it > 0 } + } + if (first == null) { + status = "no usable reading: ${KgslErrors.describe(code)}" + Log.i(TAG, "hud: GPU cycle counter gave no usable reading ($code)") + sampler.close() + return null + } + status = "working ($first MHz at start)" + Log.i(TAG, "hud: GPU clock from the cycle counter ($first MHz now)") + return sampler + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/KgslErrors.kt b/app/src/main/java/com/droiddeck/launcher/session/KgslErrors.kt new file mode 100644 index 0000000000..819b627664 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/KgslErrors.kt @@ -0,0 +1,11 @@ +package com.droiddeck.launcher.session + +/** Readable text for the negative errno codes the gpuclock library returns. */ +internal object KgslErrors { + fun describe(code: Int): String { + if (code == 0) return "no error code" + if (code == KgslClock.RANGE_CHECK_FAILED) return "sample out of range" + val name = runCatching { android.system.OsConstants.errnoName(-code) }.getOrNull() + return if (name != null) "$name ($code)" else "error $code" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/OfflineMode.kt b/app/src/main/java/com/droiddeck/launcher/session/OfflineMode.kt index 5632bd27ea..f673f282be 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/OfflineMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/OfflineMode.kt @@ -21,7 +21,6 @@ object OfflineMode { fun account(context: Context): String? { val root = LinuxRuntime.rootDir(context) - // Until its first start the x86-64 client has no sign-in; droiddeck-steam-x64 --sync-login copies the arm64 one. val file = x64LoginUsers(root).takeIf { SessionPrefs.activeSteamClientArch(context) == "x86_64" && it.isFile } ?: loginUsers(root) val text = try { diff --git a/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt b/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt index 35ac169a77..300306f8c7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/OrphanReaper.kt @@ -11,7 +11,7 @@ object OrphanReaper { fun release(pid: Int) { kept.remove(pid) } - fun reap(reason: String): Int { + fun reap(reason: String, matching: (String) -> Boolean = { true }): Int { val me = android.os.Process.myPid() val uid = android.os.Process.myUid() val spared = descendants(kept) @@ -21,6 +21,7 @@ object OrphanReaper { if (pid == me || pid <= 1 || pid in spared) return@forEach if (uidOf(pid) != uid) return@forEach val name = try { File(entry, "cmdline").readText().substringBefore('\u0000') } catch (e: Exception) { "?" } + if (!matching(name)) return@forEach try { android.os.Process.killProcess(pid) killed++ diff --git a/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt b/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt index 22f067d54d..a84a35667e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt @@ -4,7 +4,7 @@ import java.io.File object OverlayShown { fun check(root: File): Boolean { - val config = File(root, "tmp").listFiles { f -> f.name.startsWith("mangohud.") } + val config = File(root, "tmp").listFiles { f -> f.name.startsWith("mangohud.") || f.name == "droiddeck-mangohud.conf" } ?.maxByOrNull { it.lastModified() } ?: return false return runCatching { !config.readText().contains("no_display") }.getOrDefault(false) } diff --git a/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt index 5826db97ab..39d99bfa6c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/RumbleComponent.kt @@ -214,8 +214,6 @@ class RumbleComponent : SessionPart() { if (any) manager.vibrate(combined.combine()) else cancel() } - // Some vendors' input-device vibrator HALs (Samsung's) don't halt a Bluetooth pad's running - // effect on cancel(), but a new effect always replaces it. override fun cancel() { val supersede = CombinedVibration.startParallel() ids.forEach { supersede.addVibrator(it, VibrationEffect.createOneShot(1L, 1)) } @@ -255,7 +253,6 @@ class RumbleComponent : SessionPart() { private const val TAG = "SessionService" const val NAME = "droiddeck-rumble" const val MIN_GAP_MS = 50L - // Must match RUMBLE_HOLD_MS in fakeinput_steam.cpp. const val HOLD_MS = 0xFFFF const val HOLD_EFFECT_MS = 2000L const val KEEPALIVE_MS = 1500L diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt index b4408c48b9..4fc0043043 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt @@ -31,7 +31,6 @@ object SessionArtifacts { private val collectingDone = collectingLock.newCondition() private val collecting = HashSet<File>() - /** Recovery leaves [dir] alone from the stop until [collect] has finished it. */ fun collectionStarted(dir: File) { collectingLock.lock() try { collecting.add(dir) } finally { collectingLock.unlock() } @@ -317,7 +316,6 @@ object SessionArtifacts { runCatching { File(dir, CLIENT_FILE).writeText("$arch\n") } } - /** The Steam client a session ran, when it recorded one. */ internal fun recordedClient(dir: File): String? = runCatching { File(dir, CLIENT_FILE).readText().trim() }.getOrNull()?.takeIf { it == "arm64" || it == "x86_64" } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt index 31b9b10988..1cb526c90d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt @@ -7,6 +7,10 @@ object SessionDisplay { const val MATCH_SCREEN = "screen" const val FOLLOW_SCREEN = "follow" const val FOLLOW_MIN_SIDE = 480 + val FOLLOW_SCALES = listOf(1.5f, 2f, 2.5f, 3f, 4f) + const val FOLLOW_CUSTOM = "follow/custom" + const val FOLLOW_SCALE_MAX = 8f + private const val FOLLOW_SCALED_PREFIX = "follow/" const val DEFAULT_RESOLUTION = "720p" private val PRESET_HEIGHTS = listOf(720, 900, 1080) @@ -14,12 +18,30 @@ object SessionDisplay { fun presetHeight(choice: String): Int? = if (choice.endsWith("p")) choice.dropLast(1).toIntOrNull()?.takeIf { it > 0 } else null + fun followScaled(scale: Float): String = FOLLOW_SCALED_PREFIX + formatScale(scale) + + fun formatScale(scale: Float): String = + (Math.round(scale * 10) / 10f).let { if (it % 1f == 0f) it.toInt().toString() else it.toString() } + + fun parseFollowScale(text: String): Float? = + text.trim().replace(',', '.').toFloatOrNull() + ?.let { Math.round(it * 10) / 10f }?.takeIf { it > 1f && it <= FOLLOW_SCALE_MAX } + + fun isFollow(choice: String): Boolean = followScale(choice) != null + + fun followScale(choice: String): Float? = when { + choice == FOLLOW_SCREEN -> 1f + choice.startsWith(FOLLOW_SCALED_PREFIX) -> parseFollowScale(choice.removePrefix(FOLLOW_SCALED_PREFIX)) + else -> null + } + fun screenSize(panel: Pair<Int, Int>): Pair<Int, Int> = (maxOf(panel.first, panel.second) and 1.inv()) to (minOf(panel.first, panel.second) and 1.inv()) fun resolveChoice(panel: Pair<Int, Int>, choice: String, portrait: Boolean = false): Pair<Int, Int> { fun orient(size: Pair<Int, Int>) = if (portrait) size.second to size.first else size - if (choice == MATCH_SCREEN || choice == FOLLOW_SCREEN) return orient(screenSize(panel)) + if (choice == MATCH_SCREEN) return orient(screenSize(panel)) + followScale(choice)?.let { return orient(scaledDown(screenSize(panel), it)) } presetHeight(choice)?.let { return orient(resolve(panel, it, SessionPrefs.SHAPE_AUTO)) } val parts = choice.split('x').map { it.toIntOrNull() } return if (parts.size == 2 && parts.all { it != null && it > 0 }) parts[0]!! to parts[1]!! @@ -29,13 +51,16 @@ object SessionDisplay { fun resolutionOptions(panel: Pair<Int, Int>): List<String> { val panelHeight = minOf(panel.first, panel.second) return PRESET_HEIGHTS.filter { it <= panelHeight }.map { "${it}p" } - .filter { resolveChoice(panel, it) != screenSize(panel) } + MATCH_SCREEN + FOLLOW_SCREEN + .filter { resolveChoice(panel, it) != screenSize(panel) } + MATCH_SCREEN + FOLLOW_SCREEN + FOLLOW_SCALES.map(::followScaled) } - fun followSize(width: Int, height: Int, controlsBelow: Boolean = false): Pair<Int, Int>? = + fun followSize(width: Int, height: Int, controlsBelow: Boolean = false, scale: Float = 1f): Pair<Int, Int>? = if (width <= 0 || height <= 0 || (if (controlsBelow) width else minOf(width, height)) < FOLLOW_MIN_SIDE) null - else (width and 1.inv()) to (height and 1.inv()) + else scaledDown(width to height, scale) + + private fun scaledDown(size: Pair<Int, Int>, scale: Float): Pair<Int, Int> = + (Math.round(size.first / scale) and 1.inv()) to (Math.round(size.second / scale) and 1.inv()) const val UNFOLDED_MAX_GAME_SHARE = 0.8f diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 2027dc7c77..a947bf7e1f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -22,6 +22,7 @@ object SessionFiles { internal val DESKTOP_FILES = arrayOf( "usr/local/bin/droiddeck-desktop" to "usr/local/bin/droiddeck-desktop", + "usr/local/bin/droiddeck-bottom-desktop" to "usr/local/bin/droiddeck-bottom-desktop", "usr/local/bin/droiddeck-gpu" to "usr/local/bin/droiddeck-gpu", "usr/local/bin/droiddeck-desktop-gpu" to "usr/local/bin/droiddeck-desktop-gpu", "usr/local/bin/droiddeck-desktop-window-rules" to "usr/local/bin/droiddeck-desktop-window-rules", @@ -32,7 +33,6 @@ object SessionFiles { "etc/xdg/autostart/droiddeck-clipboard.desktop" to "etc/xdg/autostart/droiddeck-clipboard.desktop", ) - /** Puts the session's files in place; [startsSession] is true only for the call that starts the Steam session. */ fun stage(context: Context, root: File, startsSession: Boolean = false) { if (DesktopCatalog.desktopInstalled(root) && !DesktopCatalog.desktopFromPack(root)) try { DesktopCatalog.cleanLegacy(context) } catch (e: Exception) { Log.w(TAG, "LXQt cleanup will retry next session", e) } @@ -160,17 +160,25 @@ object SessionFiles { ) + handModels).map { "usr/local/lib/droiddeck-vr/$it" to "usr/local/lib/droiddeck-vr/$it" } + listOf("usr/local/lib/droiddeck-vr/layer/VK_LAYER_DROIDDECK_vr_implicit.json" to "usr/share/vulkan/implicit_layer.d/droiddeck_vr.json") + // HUD GPU load where Android hides it (GpuStatsComponent.guestEnv turns the layer on). + val gpuLoad = listOf( + "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so" to "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so", + "usr/local/lib/droiddeck-gpuload/VK_LAYER_DROIDDECK_gpu_load.json" to "usr/share/vulkan/implicit_layer.d/droiddeck_gpu_load.json", + ) val fexPreloads = listOf("x86_64", "i386").flatMap { arch -> listOf("libblsession.so", "libfakeinput.so", "libfaultreport.so").map { "$arch/$it" to "usr/local/lib/droiddeck-fex/$arch/$it" } } + listOf("libvulkan-thunk.so", "libwebkitinput.so").map { "x86_64/$it" to "usr/local/lib/droiddeck-fex/x86_64/$it" } val optional = (arrayOf( "usr/local/bin/gamescope" to "usr/local/bin/gamescope", - // The gamescope pack carries its own WSI layer (patch 0117); it replaces the runtime's stock copy. "usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so" to "usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so", + "usr/local/lib/vkbridge/libvulkan_droidbridge.so" to "usr/local/lib/vkbridge/libvulkan_droidbridge.so", + "usr/local/share/vkbridge/droidbridge_icd.json" to "usr/local/share/vkbridge/droidbridge_icd.json", + "usr/local/bin/droiddeck-vkbridge-smoke" to "usr/local/bin/droiddeck-vkbridge-smoke", "usr/local/lib/droiddeck/uruntime" to "usr/local/lib/droiddeck/uruntime", "usr/local/lib/droiddeck-pipewire.tzst" to "usr/local/lib/droiddeck-pipewire.tzst", "usr/local/share/licenses/uruntime/LICENSE" to "usr/local/share/licenses/uruntime/LICENSE", - ) + mangoapp + msitools.map { it to it } + vr + fexPreloads).filter { (asset, _) -> + "usr/local/lib/droiddeck-dirt/ws2_32.dll" to "usr/local/lib/droiddeck-dirt/ws2_32.dll", + ) + mangoapp + msitools.map { it to it } + vr + gpuLoad + fexPreloads).filter { (asset, _) -> val dir = asset.substringBeforeLast('/') runCatching { context.assets.list("linuxfs/$dir")?.contains(asset.substringAfterLast('/')) == true }.getOrDefault(false) } @@ -275,7 +283,6 @@ object SessionFiles { val movieDir = File(home, "config/uioverrides/movies") val config = File(home, "config/config.vdf") if (startupMovie == null) { - // Nothing to play (a movie whose volume could not be set is never played at another volume), so no earlier copy plays either. for (name in listOf("bigpicture_startup.webm", "steam_os_startup.webm")) { File(movieDir, name).delete() File(movieDir, ".$name.source").delete() @@ -290,21 +297,15 @@ object SessionFiles { "stage session=$startsSession pending=$force choice=${SessionPrefs.bootMovie(context)} movie=${startupMovie?.path} " + "staged=$bigPictureMovieInstalled done=$done steam=${home.path} config: $before -> ${startupMoviePath(config)}", ) + if (startsSession) disableIdleSleep(home) if (!done) allDone = false if (!bigPictureMovieInstalled) allInstalled = false if (done && home.path.contains(".droiddeck-x64") == activeIsX64) seen = if (bigPictureMovieInstalled) BOOT_MOVIE_PATH else "" } - // A pick made in the app is done once a session started with every Steam client's config having it; guest commands run - // before that, and a Steam that is already running writes its own choice back when it exits. if (force && allDone && allInstalled && startsSession) SessionPrefs.setBootMovieApplyNext(context, false) seen?.let { SessionPrefs.setBootMovieSteamSeen(context, it) } } - /** - * Points Steam's startup movie back at its own default when it names a movie that is gone: DroidDeck's staged copy that - * could not be prepared, or (when a pick here is waiting) a movie removed from Steam's folder. True when Steam's config - * no longer names a missing movie. - */ internal fun resetMissingStartupMovie(config: File, force: Boolean): Boolean { if (!config.isFile) return true val text = runCatching { config.readText() }.getOrElse { @@ -383,7 +384,6 @@ object SessionFiles { installed = staged.setReadable(true, false) && staged.renameTo(movie) if (installed) { FileUtils.writeString(stamp, identity) - // Steam's picker draws its preview from this picture and does not redraw it when the movie changes. File(directory, name.removeSuffix(".webm") + ".jpg").delete() } } catch (e: Exception) { @@ -400,10 +400,6 @@ object SessionFiles { internal const val BOOT_MOVIES_DIR = "/uioverrides/movies/" internal const val BOOT_MOVIE_PATH = "/uioverrides/movies/bigpicture_startup.webm" - /** - * Steam's startup movie setting is the `StartupMovie` section inside its `Customization` section; the one under the Steam - * settings is where older clients kept it, and DroidDeck still keeps it in step. - */ private fun customizationMovie(text: String): VdfBlock? { var from = 0 while (true) { @@ -413,7 +409,6 @@ object SessionFiles { } } - /** The older `StartupMovie` section: the first one that is not inside `Customization`. */ private fun olderMovie(text: String): VdfBlock? { val inside = customizationMovie(text) var from = 0 @@ -424,10 +419,8 @@ object SessionFiles { } } - /** The section Steam reads: the one under `Customization` when there is one. */ private fun activeStartupMovie(text: String): VdfBlock? = customizationMovie(text) ?: olderMovie(text) - /** The movie Steam's config selects, as a path like `/uioverrides/movies/x.webm`; null when none is named. */ internal fun startupMoviePath(config: File): String? = startupMovieLocalPath(config)?.takeIf { it.isNotEmpty() } internal fun startupMovieLocalPath(config: File): String? { @@ -436,7 +429,6 @@ object SessionFiles { return scalar(text.substring(movie.keyStart, movie.close + 1), "LocalPath") } - /** Both `StartupMovie` sections of Steam's config as written there, for the report; null when there is none. */ internal fun startupMovieBlock(config: File): String? { val text = runCatching { config.readText() }.getOrNull() ?: return null val parts = listOfNotNull( @@ -446,7 +438,6 @@ object SessionFiles { return parts.takeIf { it.isNotEmpty() }?.joinToString("\n") } - /** The `Customization` section of Steam's config with the lines before it, for the report; null when there is none. */ internal fun customizationBlock(config: File): String? { val text = runCatching { config.readText() }.getOrNull() ?: return null val customization = findObject(text, "Customization", 0, text.length) ?: return null @@ -459,7 +450,6 @@ object SessionFiles { return text.replaceRange(movie.keyStart, movie.close + 1, setScalar(setScalar(block, "MovieID", "0", newline), "LocalPath", path, newline)) } - /** True when Steam's config selects DroidDeck's staged movie once this returns. */ internal fun ensureStartupMovieDefault(config: File, force: Boolean = false): Boolean { val path = BOOT_MOVIE_PATH val legacyPath = "/uioverrides/movies/droiddeck-startup.webm" @@ -486,7 +476,6 @@ object SessionFiles { return false } } - // Later sections first, so the positions of earlier ones stay valid. val targets = listOfNotNull(customizationMovie(text), olderMovie(text)).sortedByDescending { it.keyStart } for (target in targets) text = pointAt(text, target, path, newline) if (olderMovie(text) == null) { @@ -528,7 +517,38 @@ object SessionFiles { } } - /** Adds the `Customization` section Steam reads, next to the `Software` section, when the config has none. */ + private val IDLE_SLEEP_TIMERS = listOf("IdleSuspendBatterySeconds", "IdleSuspendACSeconds") + + internal fun disableIdleSleep(steamHome: File): Boolean { + val config = File(steamHome, "config/config.vdf") + val text = runCatching { config.readText() }.getOrNull() ?: return false + val newline = if (text.contains("\r\n")) "\r\n" else "\n" + val steam = findSteamBlock(text) ?: return false + val system = findObject(text, "system", steam.open + 1, steam.close) + val updated = if (system != null) { + val block = text.substring(system.keyStart, system.close + 1) + text.replaceRange(system.keyStart, system.close + 1, IDLE_SLEEP_TIMERS.fold(block) { acc, key -> setScalar(acc, key, "0", newline) }) + } else { + val lineStart = text.lastIndexOf('\n', steam.close).let { if (it < 0) 0 else it + 1 } + val indent = text.substring(lineStart, steam.close).takeWhile { it == '\t' || it == ' ' } + "\t" + val section = (listOf(indent + "\"system\"", indent + "{") + + IDLE_SLEEP_TIMERS.map { "$indent\t\"$it\"\t\t\"0\"" } + (indent + "}")).joinToString(newline) + newline + text.substring(0, lineStart) + section + text.substring(lineStart) + } + val staged = File(config.parentFile, config.name + ".staged") + return try { + if (updated != text) { + staged.writeText(updated) + if (!staged.renameTo(config)) { staged.delete(); return false } + } + true + } catch (e: Exception) { + staged.delete() + Log.w(TAG, "could not disable Steam's idle sleep", e) + false + } + } + private fun withCustomization(text: String, path: String, newline: String): String { val root = findObject(text, "InstallConfigStore", 0, text.length) ?: return text val lineStart = text.lastIndexOf('\n', root.close).let { if (it < 0) 0 else it + 1 } @@ -598,13 +618,6 @@ object SessionFiles { fun logDirectory(context: Context): File = LinuxRuntime.logDir(context).apply { mkdirs() } - /** - * Registers the Android system fonts (which include CJK faces such as Noto Sans CJK / - * MiSans) with the container's fontconfig, so the Steam Deck UI (CEF/webkit renderer) - * resolves Chinese/Japanese glyphs instead of showing tofu / mojibake. - * The fonts themselves are bind-mounted by LinuxRuntime.bindSystemFonts() into - * /usr/local/share/fonts/android; here we only need to point fontconfig at them. - */ private val DESKTOP_STRINGS = listOf( "desktop_restore_title" to R.string.desktop_restore_title, "desktop_restore_body" to R.string.desktop_restore_body, diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt index ded53162c6..1855503700 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt @@ -69,7 +69,6 @@ object SessionLogShare { return zip } - /** Every entry is scrubbed line by line, whatever its size: a raw copy can carry tokens out of the device. */ private fun addEntry(z: ZipOutputStream, name: String, f: File) { z.putNextEntry(ZipEntry(name)) val w = z.bufferedWriter() diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt index f73609f442..6f335f231c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPaths.kt @@ -44,7 +44,6 @@ object SessionPaths { fun current(): File? = dir - /** Whether the current session folder will survive teardown. No session means the next one can retain logs. */ fun currentSessionLogsRetained(context: Context): Boolean = dir?.let { it.parentFile == SessionFiles.logDirectory(context) } ?: true diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 05f81ce7eb..48bdeffdef 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -86,12 +86,26 @@ object SessionPrefs { prefs(context).edit().putBoolean("animations", on).apply() } - fun dualScreenMode(context: Context): String = - prefs(context).getString("dualScreenMode", null)?.takeIf { it in com.droiddeck.launcher.input.DualScreen.modes } - ?: com.droiddeck.launcher.input.DualScreen.MODE_AUTO + private fun savedDualScreenMode(context: Context, key: String): String? = + prefs(context).getString(key, null)?.takeIf { it in com.droiddeck.launcher.input.DualScreen.modes } + + private fun legacyDualScreenMode(context: Context): String = + if (!prefs(context).getBoolean("dualScreenLauncher", true)) com.droiddeck.launcher.input.DualScreen.MODE_OFF + else savedDualScreenMode(context, "dualScreenMode") ?: com.droiddeck.launcher.input.DualScreen.MODE_AUTO + + fun dualScreenMode(context: Context): String = legacyDualScreenMode(context) fun setDualScreenMode(context: Context, mode: String) { - prefs(context).edit().putString("dualScreenMode", mode).apply() + val sessions = dualScreenSessionMode(context) + prefs(context).edit().remove("dualScreenLauncher").putString("dualScreenMode", mode).putString("dualScreenSessionMode", sessions).apply() + } + + fun dualScreenSessionMode(context: Context): String = + savedDualScreenMode(context, "dualScreenSessionMode") ?: legacyDualScreenMode(context) + + fun setDualScreenSessionMode(context: Context, mode: String) { + val launcher = dualScreenMode(context) + prefs(context).edit().remove("dualScreenLauncher").putString("dualScreenMode", launcher).putString("dualScreenSessionMode", mode).apply() } fun secondScreenPanel(context: Context): String? = prefs(context).getString("secondScreenPanel", null) @@ -100,10 +114,66 @@ object SessionPrefs { prefs(context).edit().putString("secondScreenPanel", mode).apply() } - fun dualScreenLauncher(context: Context): Boolean = prefs(context).getBoolean("dualScreenLauncher", true) + /** The bottom-screen desktop takes touch as a trackpad unless the user switched it to direct touch. */ + fun bottomDesktopDirectTouch(context: Context): Boolean = prefs(context).getBoolean("bottomDesktopDirectTouch", false) - fun setDualScreenLauncher(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("dualScreenLauncher", on).apply() + fun setBottomDesktopDirectTouch(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("bottomDesktopDirectTouch", on).apply() + } + + fun statsStrip(context: Context): String? = prefs(context).getString("statsStrip", null) + + fun setStatsStrip(context: Context, id: String) { + prefs(context).edit().putString("statsStrip", id).apply() + } + + fun bottomStripMetrics(context: Context): Set<StripMetric> = StripMetric.parse(prefs(context).getString("bottomStripMetrics", null)) + + fun setBottomStripMetric(context: Context, metric: StripMetric, on: Boolean) { + val now = bottomStripMetrics(context).let { if (on) it + metric else it - metric } + prefs(context).edit().putString("bottomStripMetrics", StripMetric.encode(now)).apply() + } + + fun bottomHud(context: Context): Boolean = prefs(context).getBoolean("bottomHud", true) + + fun setBottomHud(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("bottomHud", on).apply() + } + + fun bottomStripOnTabs(context: Context): Boolean = prefs(context).getBoolean("bottomStripTabs", true) + + fun setBottomStripOnTabs(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("bottomStripTabs", on).apply() + } + + fun statsHud(context: Context): String? = prefs(context).getString("statsHud", null) + + fun setStatsHud(context: Context, id: String) { + prefs(context).edit().putString("statsHud", id).apply() + } + + fun statsSpeedUnit(context: Context): String? = prefs(context).getString("statsSpeedUnit", null) + + fun setStatsSpeedUnit(context: Context, id: String) { + prefs(context).edit().putString("statsSpeedUnit", id).apply() + } + + fun statsDash(context: Context): String? = prefs(context).getString("statsDash", null) + + fun setStatsDash(context: Context, id: String) { + prefs(context).edit().putString("statsDash", id).apply() + } + + fun telemetryAuto(context: Context): Boolean = prefs(context).getBoolean("telemetryAuto", true) + + fun setTelemetryAuto(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("telemetryAuto", on).apply() + } + + fun telemetryOff(context: Context): Set<String> = prefs(context).getStringSet("telemetryOff", null)?.toSet().orEmpty() + + fun setTelemetryOff(context: Context, keys: Set<String>) { + prefs(context).edit().putStringSet("telemetryOff", keys.toSet()).apply() } fun dualScreenSessionControls(context: Context): Boolean = prefs(context).getBoolean("dualScreenSessionControls", true) @@ -124,13 +194,6 @@ object SessionPrefs { prefs(context).edit().putString("gameStoresSpeedTier", tier).apply() } - /** - * Hidden A/B switch for the Epic installer: "adaptive" (default: native parallel fetch written - * straight into staged files), "lookahead" (the native ordered-lookahead engine that caches each - * chunk and copies it into staged files), "batch" (the older whole-cache native fetch, then - * native assembly; needs about twice the game's size free) or "java" (the bounded Java writer). - * No UI; set it in the `session` preferences for benchmarks. - */ fun storesEpicMode(context: Context): String = prefs(context).getString("storesEpicMode", "adaptive") ?: "adaptive" fun storesShowMature(context: Context): Boolean = prefs(context).getBoolean("storesShowMature", false) @@ -147,10 +210,10 @@ object SessionPrefs { } fun storesView(context: Context): String = - prefs(context).getString("storesView", null)?.takeIf { it in STORES_VIEWS } ?: STORES_VIEWS.first() + prefs(context).getString("storesView", null)?.takeIf { it in STORES_VIEWS } ?: DEFAULT_STORES_VIEW fun setStoresView(context: Context, view: String) { - prefs(context).edit().putString("storesView", if (view in STORES_VIEWS) view else STORES_VIEWS.first()).apply() + prefs(context).edit().putString("storesView", if (view in STORES_VIEWS) view else DEFAULT_STORES_VIEW).apply() } fun libraryCardLevel(context: Context): Int = prefs(context).getInt("libraryCardLevel", 2) @@ -199,6 +262,7 @@ object SessionPrefs { val STORES_SORTS = listOf("lastPlayed", "recentlyInstalled", "titleAsc", "titleDesc", "sizeDesc", "sizeAsc", "releaseDateDesc") val STORES_VIEWS = listOf("cards", "capsules", "list") + const val DEFAULT_STORES_VIEW = "capsules" fun storesInstallTarget(context: Context): String = prefs(context).getString("storesInstallTarget", "") ?: "" @@ -206,7 +270,6 @@ object SessionPrefs { prefs(context).edit().putString("storesInstallTarget", path).apply() } - /** Empty means follow the app/system language for GOG and Epic installs. */ fun storesInstallLanguage(context: Context): String = prefs(context).getString("storesInstallLanguage", "") ?: "" fun setStoresInstallLanguage(context: Context, code: String) { @@ -285,18 +348,44 @@ object SessionPrefs { prefs(context).edit().putInt("hudOpacity", percent.coerceIn(HUD_OPACITY_RANGE)).apply() } - fun fusionHudConfig(context: Context): String? = prefs(context).getString("fusionHud", null) + const val PC_KEYBOARD_SIZE_DEFAULT = 47 + val PC_KEYBOARD_SIZE_RANGE = 25..70 + const val PC_KEYBOARD_OPACITY_DEFAULT = 100 + val PC_KEYBOARD_OPACITY_RANGE = 30..100 - fun setFusionHudConfig(context: Context, config: String) { - prefs(context).edit().putString("fusionHud", config).apply() + fun pcKeyboardSize(context: Context): Int = + prefs(context).getInt("pcKeyboardSize", PC_KEYBOARD_SIZE_DEFAULT).takeIf { it in PC_KEYBOARD_SIZE_RANGE } ?: PC_KEYBOARD_SIZE_DEFAULT + + fun setPcKeyboardSize(context: Context, percent: Int) { + prefs(context).edit().putInt("pcKeyboardSize", percent.coerceIn(PC_KEYBOARD_SIZE_RANGE)).apply() } - fun fusionHudPosition(context: Context): Pair<Float, Float>? = - prefs(context).getString("fusionHudPos", null)?.split(',')?.mapNotNull { it.toFloatOrNull() } + fun pcKeyboardOpacity(context: Context): Int = + prefs(context).getInt("pcKeyboardOpacity", PC_KEYBOARD_OPACITY_DEFAULT).takeIf { it in PC_KEYBOARD_OPACITY_RANGE } ?: PC_KEYBOARD_OPACITY_DEFAULT + + fun setPcKeyboardOpacity(context: Context, percent: Int) { + prefs(context).edit().putInt("pcKeyboardOpacity", percent.coerceIn(PC_KEYBOARD_OPACITY_RANGE)).apply() + } + + fun pcKeyboardHiddenKeys(context: Context): Set<String> = + idList(prefs(context).getString("pcKeyboardHiddenKeys", null)).toSet() + + fun setPcKeyboardHiddenKeys(context: Context, hidden: Set<String>) { + prefs(context).edit().putString("pcKeyboardHiddenKeys", hidden.joinToString(",")).apply() + } + + fun droidDeckHudConfig(context: Context): String? = prefs(context).getString("__KEEP_droidDeckHud__", null) + + fun setDroidDeckHudConfig(context: Context, config: String) { + prefs(context).edit().putString("__KEEP_droidDeckHud__", config).apply() + } + + fun droidDeckHudPosition(context: Context): Pair<Float, Float>? = + prefs(context).getString("__KEEP_droidDeckHudPos__", null)?.split(',')?.mapNotNull { it.toFloatOrNull() } ?.takeIf { it.size == 2 }?.let { it[0] to it[1] } - fun setFusionHudPosition(context: Context, x: Float, y: Float) { - prefs(context).edit().putString("fusionHudPos", "$x,$y").apply() + fun setDroidDeckHudPosition(context: Context, x: Float, y: Float) { + prefs(context).edit().putString("__KEEP_droidDeckHudPos__", "$x,$y").apply() } const val HUD_COLOR_MINT = "mint" @@ -327,6 +416,12 @@ object SessionPrefs { prefs(context).edit().putBoolean("directCursor", on).apply() } + fun backHold(context: Context): Boolean = prefs(context).getBoolean("backHold", true) + + fun setBackHold(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("backHold", on).apply() + } + fun backActionsInverted(context: Context): Boolean = prefs(context).getBoolean("backActionsInverted", false) fun setBackActionsInverted(context: Context, inverted: Boolean) { @@ -426,10 +521,6 @@ object SessionPrefs { position.takeIf { it in listOf("top", "bottom", "center") } ?: "center").apply() } - /** - * After a game launched from the front end (or another launcher's link) closes, the client - * exits cleanly and the session returns there, instead of staying in Big Picture. - */ fun returnAfterGame(context: Context): Boolean = prefs(context).getBoolean("returnAfterGame", true) fun setReturnAfterGame(context: Context, on: Boolean) { @@ -439,13 +530,12 @@ object SessionPrefs { private fun shaderPrecacheApplied(context: Context) = java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.bl-shader-precache-applied") - /** - * Shader pre-caching as the launcher last set it, until a session reports it written into the - * client's config.vdf; after that the client's own toggle is the user's again. - */ fun pendingShaderPrecache(context: Context): Boolean? { val prefs = prefs(context) - if (!prefs.contains("shaderPrecache")) return null + if (!prefs.contains("shaderPrecache")) { + if (steamConfig(context).exists()) return null + prefs.edit().putBoolean("shaderPrecache", false).apply() + } val on = prefs.getBoolean("shaderPrecache", true) val applied = shaderPrecacheApplied(context) val written = runCatching { applied.readText().trim() }.getOrNull() ?: return on @@ -460,9 +550,12 @@ object SessionPrefs { prefs(context).edit().putBoolean("shaderPrecache", on).apply() } + private fun steamConfig(context: Context) = + java.io.File(steamRoot(context, steamClientArch(context)), "config/config.vdf") + fun shaderPrecache(context: Context): Boolean = pendingShaderPrecache(context) ?: runCatching { com.droiddeck.launcher.storage.SteamStorage.shaderPrecache( - java.io.File(steamRoot(context, steamClientArch(context)), "config/config.vdf").readText()) }.getOrDefault(true) + steamConfig(context).readText()) }.getOrDefault(true) fun stretch16x9(context: Context): Boolean = prefs(context).getBoolean("stretch16x9", false) @@ -607,7 +700,6 @@ object SessionPrefs { prefs(context).edit().putBoolean("gpuClockPin", on).apply() } - /** Whether the game's busiest threads are named to the power HAL for a boost (GameThreadHints). */ fun gameThreadHints(context: Context): Boolean = prefs(context).getBoolean("gameThreadHints", true) fun prootNoSeccomp(context: Context): Boolean = prefs(context).getBoolean("prootNoSeccomp", false) @@ -622,18 +714,12 @@ object SessionPrefs { prefs(context).edit().putBoolean("prootFastPath", on).apply() } - /** gamescope draws the cursor itself. Off by default: on a phone that plane costs frames. */ fun cursorComposite(context: Context): Boolean = prefs(context).getBoolean("cursorComposite", false) fun setCursorComposite(context: Context, on: Boolean) { prefs(context).edit().putBoolean("cursorComposite", on).apply() } - /** - * The rootfs ships Termux's unpatched proot. A session uses it only when this file exists, - * so a missing add-on pack cannot silently fall back to it. - * Path: Android/data/<package>/files/droiddeck-stock-proot - */ @JvmStatic fun allowStockProot(context: Context): Boolean = context.getExternalFilesDir(null)?.let { File(it, "droiddeck-stock-proot").isFile } == true @@ -686,6 +772,29 @@ object SessionPrefs { fun zinkLazy(context: Context): Boolean = prefs(context).getBoolean("zinkLazy", true) + @JvmStatic + fun vkBridge(context: Context): Boolean = prefs(context).getBoolean("vkBridge", com.droiddeck.launcher.core.DeviceSupport.mali()) + + fun setVkBridge(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("vkBridge", on).apply() + } + + @JvmStatic + fun bridgeProtonDxvk(context: Context): Boolean = prefs(context).getBoolean("bridgeProtonDxvk", false) + + fun setBridgeProtonDxvk(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("bridgeProtonDxvk", on).apply() + } + + fun vkBridgeSafe(context: Context): Boolean = prefs(context).getBoolean("vkBridgeSafe", true) + + fun setVkBridgeSafe(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("vkBridgeSafe", on).apply() + } + + @JvmStatic + fun vkBridgeMode(context: Context): String = if (vkBridgeSafe(context)) "safe" else "performance" + fun setZinkLazy(context: Context, on: Boolean) { prefs(context).edit().putBoolean("zinkLazy", on).apply() } @@ -719,7 +828,6 @@ object SessionPrefs { ) } - /** Extra Proton, Wine and graphics diagnostics for the next game launch; off unless chosen. */ fun gameDebugLogsEnabled(context: Context): Boolean = prefs(context).getBoolean("gameDebugLogsEnabled", false) @@ -782,6 +890,9 @@ object SessionPrefs { fun battleNetNoSteamSet(context: Context): Boolean = prefs(context).getBoolean("battleNetNoSteamSet", false) fun setBattleNetNoSteamSet(context: Context) { prefs(context).edit().putBoolean("battleNetNoSteamSet", true).apply() } + fun battleNetFolder(context: Context, code: String): String? = prefs(context).getString("battleNetFolder:$code", null) + fun setBattleNetFolder(context: Context, code: String, path: String) { prefs(context).edit().putString("battleNetFolder:$code", path).apply() } + fun clearCachedApps(context: Context): Boolean = prefs(context).getBoolean("clearCachedApps", false) fun setClearCachedApps(context: Context, on: Boolean) { prefs(context).edit().putBoolean("clearCachedApps", on).apply() } @@ -828,7 +939,7 @@ object SessionPrefs { fun resolutionChoice(context: Context, mode: String, panel: Pair<Int, Int>): String { val saved = prefs(context) saved.getString("displayResolution.$mode", null)?.let { value -> - if (value == SessionDisplay.MATCH_SCREEN || value == SessionDisplay.FOLLOW_SCREEN || + if (value == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(value) || SessionDisplay.presetHeight(value) != null) return value parseResolution(value)?.let { return "${it.first}x${it.second}" } } @@ -841,7 +952,7 @@ object SessionPrefs { } fun setResolutionChoice(context: Context, mode: String, choice: String) { - val value = if (choice == SessionDisplay.MATCH_SCREEN || choice == SessionDisplay.FOLLOW_SCREEN || + val value = if (choice == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(choice) || SessionDisplay.presetHeight(choice) != null) choice else { val size = requireNotNull(parseResolution(choice)) { "Invalid resolution" } "${size.first}x${size.second}" @@ -873,7 +984,6 @@ object SessionPrefs { prefs(context).edit().putString("steamClientArch", id).apply() } - /** The running session's client, else the selected one: a changed setting applies from the next session. */ fun activeSteamClientArch(context: Context): String = SessionState.steamClientArch?.takeIf { SessionState.running } ?: steamClientArch(context) @@ -891,13 +1001,10 @@ object SessionPrefs { fun setBootMovieSound(context: Context, on: Boolean) { prefs(context).edit().putBoolean("bootMovieSound", on).apply() } fun bootMovieVolume(context: Context): Int = prefs(context).getInt("bootMovieVolume", 100).coerceIn(0, 100) fun setBootMovieVolume(context: Context, percent: Int) { prefs(context).edit().putInt("bootMovieVolume", percent.coerceIn(0, 100)).apply() } - /** How long the boot movie plays, in seconds; 0 plays all of it. */ fun bootMovieSeconds(context: Context): Int = prefs(context).getInt("bootMovieSeconds", 0).coerceAtLeast(0) fun setBootMovieSeconds(context: Context, seconds: Int) { prefs(context).edit().putInt("bootMovieSeconds", seconds.coerceAtLeast(0)).apply() } - /** Set when a movie was picked here, so the next session makes it Steam's startup movie even if Steam had another one. */ fun bootMovieApplyNext(context: Context): Boolean = prefs(context).getBoolean("bootMovieApplyNext", false) fun setBootMovieApplyNext(context: Context, on: Boolean) { prefs(context).edit().putBoolean("bootMovieApplyNext", on).apply() } - /** The startup movie path Steam's config held when it was last looked at, so only a change made in Steam is taken over. */ fun bootMovieSteamSeen(context: Context): String? = prefs(context).getString("bootMovieSteamSeen", null) fun setBootMovieSteamSeen(context: Context, path: String) { prefs(context).edit().putString("bootMovieSteamSeen", path).apply() } fun bootMovieCustomName(context: Context): String? = prefs(context).getString("bootMovieCustomName", null) @@ -905,10 +1012,17 @@ object SessionPrefs { prefs(context).edit().apply { if (name == null) remove("bootMovieCustomName") else putString("bootMovieCustomName", name) }.apply() } - fun runSteamAtStartup(context: Context): Boolean = prefs(context).getBoolean("runSteamAtStartup", false) + const val STARTUP_OFF = "" + const val STARTUP_STEAM = "steam" + const val STARTUP_DESKTOP = "desktop" - fun setRunSteamAtStartup(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("runSteamAtStartup", on).apply() + fun startupSession(context: Context): String { + val p = prefs(context) + return p.getString("startupSession", null) ?: if (p.getBoolean("runSteamAtStartup", false)) STARTUP_STEAM else STARTUP_OFF + } + + fun setStartupSession(context: Context, id: String) { + prefs(context).edit().putString("startupSession", id).remove("runSteamAtStartup").apply() } fun addedGamesDirs(context: Context): List<String> { @@ -1015,21 +1129,34 @@ object SessionPrefs { if (previous != null && !p.contains("addedAppId:$folderPath")) { val moved = movedAddedGame(p.all, previous, folderPath) moved.keys.forEach { edit.remove(it) } - moved.values.forEach { (name, value) -> - when (value) { - is String -> edit.putString(name, value) - is Long -> edit.putLong(name, value) - is Int -> edit.putInt(name, value) - is Boolean -> edit.putBoolean(name, value) - is Float -> edit.putFloat(name, value) - } - } + moved.values.forEach { (name, value) -> edit.putValue(name, value) } val removed = removedAddedGames(context) if (previous in removed) edit.putString("removedAddedGames", removed.map { if (it == previous) folderPath else it }.joinToString("\n")) } edit.apply() } + fun inheritAddedGame(context: Context, from: String, to: String) = synchronized(addedGameLock) { + val p = prefs(context) + val all = p.all + val edit = p.edit() + all.filterKeys { it.startsWith("added") && it.endsWith(":$from") }.forEach { (name, value) -> + val key = name.removeSuffix(from) + to + if (key !in all) edit.putValue(key, value) + } + edit.apply() + } + + private fun android.content.SharedPreferences.Editor.putValue(name: String, value: Any?) { + when (value) { + is String -> putString(name, value) + is Long -> putLong(name, value) + is Int -> putInt(name, value) + is Boolean -> putBoolean(name, value) + is Float -> putFloat(name, value) + } + } + internal fun movedAddedGame(all: Map<String, *>, from: String, to: String): Map<String, Pair<String, Any?>> = all.filterKeys { it.startsWith("added") && it.endsWith(":$from") }.mapValues { (name, value) -> val moved = if (value is String && (value == from || value.startsWith("$from/"))) to + value.removePrefix(from) else value @@ -1048,13 +1175,11 @@ object SessionPrefs { prefs(context).edit().putString("theme", id).apply() } - /** The custom Gradient theme's primary and secondary colours (ARGB). */ fun gradientColors(context: Context): Pair<Int, Int> = prefs(context).let { it.getInt("gradientPrimary", com.droiddeck.launcher.ui.Themes.DEFAULT_PRIMARY) to it.getInt("gradientSecondary", com.droiddeck.launcher.ui.Themes.DEFAULT_SECONDARY) } - /** How fast the Inner Gamer theme cycles its colours, 1 to 10. */ fun rgbSpeed(context: Context): Int = prefs(context).getInt("innerGamerSpeed", com.droiddeck.launcher.ui.Themes.DEFAULT_RGB_SPEED).coerceIn(1, com.droiddeck.launcher.ui.Themes.RGB_SPEEDS) @@ -1084,32 +1209,21 @@ object SessionPrefs { prefs(context).edit().putBoolean("hdr.$mode", on).apply() } - /** Compositor frame limit that releases buffers to the game unpaced. */ const val FPS_UNPACED = -1 - /** The drawer's frame limit slider: its first stop is Off. */ const val FPS_LIMIT_OFF = 15 - const val FPS_LIMIT_MAX = 120 + const val FPS_LIMIT_MAX = 165 - /** - * Buffers go back to the game as soon as they are replaced instead of once per refresh; - * Steam's Frame Limit in the Quick Access menu caps Steam games, and the drawer's limit caps games - * launched without Steam. Mirroring still follows the glasses' refresh rate. - */ - fun compositorFpsLimit(mirrorRefreshLimit: Int, sessionLimit: Int = 0): Int = when { - mirrorRefreshLimit <= 0 && sessionLimit <= 0 -> FPS_UNPACED - mirrorRefreshLimit <= 0 -> sessionLimit - sessionLimit <= 0 -> mirrorRefreshLimit - else -> minOf(mirrorRefreshLimit, sessionLimit) - } + const val PIP_FPS = 30 - private const val STEAM_UI_FPS = 60f - - fun steamUiPacing(context: Context): Boolean = prefs(context).getBoolean("steamUiPacing", true) - - fun steamUiFpsLimit(refreshHz: Float): Int { - val steps = ((refreshHz + 0.5f) / STEAM_UI_FPS).toInt() - return if (steps < 2) 0 else (refreshHz / steps + 0.01f).toInt() + fun compositorFpsLimit(mirrorRefreshLimit: Int, sessionLimit: Int = 0, pip: Boolean = false): Int { + val limit = when { + mirrorRefreshLimit <= 0 && sessionLimit <= 0 -> FPS_UNPACED + mirrorRefreshLimit <= 0 -> sessionLimit + sessionLimit <= 0 -> mirrorRefreshLimit + else -> minOf(mirrorRefreshLimit, sessionLimit) + } + return if (pip && mirrorRefreshLimit <= 0 && (limit <= 0 || limit > PIP_FPS)) PIP_FPS else limit } val upscalerChoices = listOf( @@ -1400,4 +1514,16 @@ object SessionPrefs { fun setGameStorage(context: Context, path: String, label: String) { prefs(context).edit().putString("gameStorage", path).putString("gameStorageLabel", label).apply() } + + fun steamLibraries(context: Context): String = prefs(context).getString("steamLibraries", "") ?: "" + + fun setSteamLibraries(context: Context, json: String) { + prefs(context).edit().putString("steamLibraries", json).apply() + } + + fun steamLibraryNextId(context: Context): Int = prefs(context).getInt("steamLibraryNextId", 1) + + fun setSteamLibraryNextId(context: Context, id: Int) { + prefs(context).edit().putInt("steamLibraryNextId", id).apply() + } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 7b7dc4fdfd..12c848d1cb 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -70,10 +70,13 @@ class SessionService : Service() { private val mainHandler = Handler(Looper.getMainLooper()) private var suspendController: SessionSuspendController? = null private val steamDownloadMonitor = SteamDownloadMonitor() + private val downloadMonitorExecutor = java.util.concurrent.Executors.newSingleThreadExecutor { Thread(it, "steam-download-monitor").apply { isDaemon = true } } private var downloadMonitorTask: Runnable? = null private var downloadActive = false private var clientInstallActive = false - @Volatile private var steamLibraryMounts = emptyMap<String, File>() + private var steamLibraryMounts: Map<String, File> + get() = SessionState.steamLibraryMounts + set(value) { SessionState.steamLibraryMounts = value } private var suspendDownloadNow = false private var suspendPolicy = SessionPrefs.SUSPEND_MANUAL private var steamDownloadsInBackground = false @@ -105,7 +108,6 @@ class SessionService : Service() { private var freezeCancelled = false private var pendingSteamGameId: String? = null private var pendingSteamGameGeneration = -1 - // Bumped to cancel a running game-exit watch (a new launch, or the session ending). @Volatile private var gameExitWatchToken = 0 private val flushSteamGame = object : Runnable { override fun run() = flushQueuedSteamGame() @@ -345,7 +347,7 @@ class SessionService : Service() { screenOn = readScreenOn() manualPauseRequested = false suspendDownloadNow = false - steamDownloadMonitor.reset() + runOnDownloadMonitor { steamDownloadMonitor.reset() } downloadActive = false clientInstallActive = false steamSleepToken = null @@ -370,9 +372,10 @@ class SessionService : Service() { SessionState.steamUi = intent?.getStringExtra(EXTRA_STEAM_UI) SessionState.steamUrl = intent?.getStringExtra(EXTRA_STEAM_URL) com.droiddeck.launcher.stores.battlenet.BattleNetClient.clearRequests(LinuxRuntime.sessionRoot(this)) - synchronized(stopLock) { + val gen = synchronized(stopLock) { SessionState.steamClientArch = null SessionState.running = true + ++sessionGen } if (SessionState.stopRequested) { stopSession(0) @@ -383,7 +386,6 @@ class SessionService : Service() { SessionState.guestPid = -1 SessionEvents.transition(SessionPhase.STARTING_GUEST, "service.started", mapOf("mode" to SessionState.mode)) com.droiddeck.launcher.wayland.CompositorHost.newSession() - val gen = ++sessionGen SessionPrefs.backgroundAppLimit(this).takeIf { it != com.droiddeck.launcher.core.BackgroundAppLimit.OFF } ?.let { com.droiddeck.launcher.core.BackgroundAppLimit.applyAsync(this, it) } if (SessionPrefs.clearCachedApps(this)) clearCachedApps() @@ -439,7 +441,7 @@ class SessionService : Service() { LinuxRuntime.writeAccounts(this) } catch (e: Exception) { Log.e(TAG, "could not write the guest's passwd/group", e) - stopSession(-1) + stopSession(-1, gen) return } @@ -466,8 +468,8 @@ class SessionService : Service() { } else { val message = getString(R.string.session_proot_missing) Log.e(TAG, "$message (pack ready=$prootPack)") - SessionEvents.fail("PROOT_MISSING", message, -1) - stopSession(-1) + failSession(gen, "PROOT_MISSING", message, -1) + stopSession(-1, gen) return } } @@ -475,7 +477,6 @@ class SessionService : Service() { .onFailure { Log.w(TAG, "agent environment skipped", it) } .getOrDefault(emptyList()) SessionFiles.stage(this, root, startsSession = true) - // Earlier sessions' reports still read the Steam logs and VAC marker this session replaces. SessionArtifacts.awaitCollections() SessionArtifacts.finishAbandoned(this, beforeGuestStart = true) VacDiagnostics.arm(this) @@ -488,7 +489,7 @@ class SessionService : Service() { GameEnvironmentStore.publish(this) } catch (e: Exception) { Log.e(TAG, "could not publish the game environment", e) - stopSession(-1) + stopSession(-1, gen) return } val sessionLog = File(sessionDir, "session.log") @@ -522,6 +523,7 @@ class SessionService : Service() { components.add(encoder) guest.add("BL_VENC_SOCKET=" + encoder.socket.absolutePath) } + startVkBridge(guest, sessionDir) guest.add("BL_WIDTH=" + size.first) guest.add("BL_HEIGHT=" + size.second) @@ -533,7 +535,6 @@ class SessionService : Service() { guest.add("DXVK_HDR=1") Log.i(TAG, "hdr: gamescope --hdr-enabled, DXVK_HDR=1") } - // gamescope's WSI layer and winex11 reuse their per-present window checks for this long. guest.add("DROIDDECK_WSI_BYPASS_CHECK_MS=100") guest.add("WINE_OFFSCREEN_CHECK_MS=100") guest.add("BL_REFRESH=" + Math.round(SessionState.refreshHz)) @@ -543,7 +544,6 @@ class SessionService : Service() { val fakeInputDir = File(sessionRoot, "dev/input").apply { mkdirs() } val controllersOn = !File(Environment.getExternalStorageDirectory(), NO_PAD_SWITCH).exists() SessionState.deckPad = false - SessionState.secondScreenAutoOpened = false deckBinds = emptyList() inputSysfs = null if (controllersOn) { @@ -576,6 +576,7 @@ class SessionService : Service() { add("-c") add("cd \"\$HOME\" && exec /bin/bash -i") } + val desktopGuest = ArrayList(guest) guest.add(LinuxRuntime.SESSION_SCRIPT) guest.add(SessionState.mode) if (SessionState.mode == MODE_STEAM) SessionState.steamUrl?.takeIf { it.startsWith("steam://") }?.let { @@ -587,7 +588,7 @@ class SessionService : Service() { val program = SessionState.program if (program.isNullOrEmpty()) { Log.e(TAG, "run mode without a program") - stopSession(65) + stopSession(65, gen) return } guest.add(program) @@ -642,9 +643,17 @@ class SessionService : Service() { } if (gen == sessionGen && SessionState.running) { SessionTerminal.prepare(terminalCommand, terminalHostEnvironment.map { (key, value) -> "$key=$value" }.toTypedArray(), root, gen) + val (fastPathName, _) = ProotFastPath.hostEnv("") + BottomDesktop.prepare(desktopGuest, binds, sessionRoot, + hostEnv.asArray().filterNot { it.startsWith("$fastPathName=") }.toTypedArray(), root, sessionDir, gen, + ) { gen == sessionGen && SessionState.running } } if (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP) OfflineMode.apply(this, root) + if (SessionState.mode == MODE_DESKTOP) { + runCatching { com.droiddeck.launcher.runtime.DesktopLanguage.ensure(this, com.droiddeck.launcher.core.AppLanguage.effective(this)) } + .onFailure { Log.w(TAG, "desktop language pack: $it") } + } val networkLink = LinuxNetworkLinkComponent(this, root) networkLink.attach(this) @@ -674,7 +683,7 @@ class SessionService : Service() { } val program = programStatus(sessionRoot) Log.i(TAG, "session ended: $status" + if (program != null) " (program $program)" else "") - stopSession(program ?: status ?: -1) + stopSession(program ?: status ?: -1, gen) }, null, sessionLog.takeIf { "PROOT_PROFILE=1" in hostEnv.asArray() }) Log.i(TAG, "session pid $pid, log ${sessionLog.path}") if (gen != sessionGen || !SessionState.running) { @@ -696,14 +705,17 @@ class SessionService : Service() { SessionEvents.guestStarted(pid) } else { SessionEvents.record("guest.start_failed", mapOf("pid" to pid)) - SessionEvents.fail("GUEST_START_FAILED", "The guest process could not be started", pid) - stopSession(-1) + failSession(gen, "GUEST_START_FAILED", "The guest process could not be started", pid) + stopSession(-1, gen) return } if (gen == sessionGen && SessionState.running) { suspendController = SessionSuspendController( sessionRoot = { sessionPid }, - helperRoots = { components.mapNotNull { it.suspendPid().takeIf { pid -> pid > 1 } } }, + helperRoots = { + components.mapNotNull { it.suspendPid().takeIf { pid -> pid > 1 } } + + listOfNotNull(BottomDesktop.suspendPid.takeIf { it > 1 }) + }, suspendAudio = { if (!pulse.setSinkSuspended(true)) Log.w(TAG, "could not suspend audio sink") if (!pulse.setMicSuspended(true)) Log.w(TAG, "could not suspend microphone source") @@ -717,6 +729,7 @@ class SessionService : Service() { if (!pulse.setMicSuspended(false)) Log.w(TAG, "could not resume microphone source") }, zramControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.bl-zram"), + clockControl = File(filesDir, "${LinuxRuntime.DIR}/tmp/.bl-clock"), pagedOut = { processes, unacknowledged, residentKb, swapKb, swapBeforeKb, millis -> Log.i(TAG, "paged out $processes processes ($unacknowledged unacknowledged) in $millis ms: " + "resident ${residentKb / 1024} MB, zram ${swapBeforeKb / 1024} -> ${swapKb / 1024} MB") @@ -727,6 +740,20 @@ class SessionService : Service() { )) } }, + readBackAllowed = { SessionPrefs.ramCapMb(this) == 0 }, + pagedIn = { processes, swapKb, swapBeforeKb, availableKb, millis -> + if (processes == 0) { + Log.i(TAG, "left ${swapBeforeKb / 1024} MB in zram after resume (RAM cap, or ${availableKb / 1024} MB available is too little)") + } else { + Log.i(TAG, "read back $processes processes in $millis ms: zram ${swapBeforeKb / 1024} -> ${swapKb / 1024} MB") + } + mainHandler.post { + SessionEvents.record("session.paged_in", mapOf( + "processes" to processes, "swapMb" to swapKb / 1024, "swapBeforeMb" to swapBeforeKb / 1024, + "availableMb" to availableKb / 1024, "ms" to millis, + )) + } + }, ) updateDownloadMonitoring() mainHandler.post { updateSuspendPolicy() } @@ -748,15 +775,27 @@ class SessionService : Service() { return sessionDir } + private fun relativeMouseForSession(): Int { + val game = if (SessionState.mode == MODE_RUN) SessionState.program?.let { "program:$it" } + else SessionState.gameId?.toLongOrNull()?.toString() + return com.droiddeck.launcher.input.GesturePrefs.read(this, game).relativeMouseMode + } + private fun addClientEnvironment(guest: MutableList<String>, steamHere: Boolean, agentEnvironment: List<String>) { guest.add("/usr/bin/env") guest.add("-i") guest.add("DROIDDECK_BWRAP_SOCKET=" + com.droiddeck.launcher.runtime.BwrapSpawner.socket(this)) guest.add("HOME=/root") guest.add("USER=root") - guest.add("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games") + guest.add("PATH=" + LinuxRuntime.GUEST_PATH) guest.add("TERM=xterm-256color") - guest.add("LANG=C.UTF-8") + if (SessionState.mode == MODE_DESKTOP) { + val appLocale = com.droiddeck.launcher.core.AppLanguage.effective(this) + guest.add("LANG=" + DesktopLocale.lang(appLocale)) + DesktopLocale.language(appLocale)?.let { guest.add("LANGUAGE=$it") } + } else { + guest.add("LANG=C.UTF-8") + } guest.add("BL_STEAM_LANGUAGE=" + SteamLanguage.forLocale( com.droiddeck.launcher.core.AppLanguage.effective(this), com.droiddeck.launcher.core.AppLanguage.system(this).country, @@ -780,7 +819,7 @@ class SessionService : Service() { ?: SessionPrefs.androidDriver(this), linuxDriverId, ) - LinuxVulkanDriver.resolveIcdPath(this, linuxDriverId) + if (!com.droiddeck.launcher.core.DeviceSupport.vkBridge(this)) LinuxVulkanDriver.resolveIcdPath(this, linuxDriverId) ?.let { guest.add(LinuxVulkanDriver.ENV + "=" + it) } val tuOverride = tuDebugOverride() val tuDriver = sysmemDriver(linuxDriverId) @@ -792,6 +831,7 @@ class SessionService : Service() { if (SessionPrefs.glThread(this)) guest.add("mesa_glthread=true") if (SessionPrefs.noGlError(this)) guest.add("MESA_NO_ERROR=1") guest.add("MESA_DISK_CACHE_DATABASE=1") + guest.addAll(GpuStatsComponent.guestEnv(LinuxRuntime.rootDir(this))) guest.add("GLIBC_TUNABLES=glibc.pthread.rseq=0:glibc.malloc.top_pad=16777216") if (SessionState.mode == MODE_STEAM) guest.add("BL_MANGOAPP=" + (if (SessionPrefs.mangoapp(this)) "1" else "0")) SessionState.steamClientArch = if (steamHere) SessionPrefs.steamClientArch(this) else null @@ -812,13 +852,14 @@ class SessionService : Service() { guest.add("BL_FSYNC_FIRST=" + (if (SessionPrefs.fsyncFirst(this)) "1" else "0")) guest.add("BL_GAMESCOPE_REALTIME=" + (if (SessionPrefs.gamescopeRealtime(this)) "1" else "0")) if (SessionPrefs.cursorComposite(this)) guest.add("BL_CURSOR_COMPOSITE=1") + relativeMouseForSession().takeIf { it != 0 }?.let { guest.add("gamescope_relative_mouse=$it") } if (com.droiddeck.launcher.core.ZramSupport.supported()) { guest.add("BL_ZRAM=1") if (steamHere) SessionPrefs.ramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_RAM_CAP_MB=$it") } if (!SessionPrefs.zramClient(this)) guest.add("BL_ZRAM_CLIENT=0") } SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_VRAM_MB=$it") } - guest.add("BANNER_AUDIO_DIRECT_DECAY=0") + guest.add("AUDIO_DIRECT_DECAY=0") val extra = extraEnv() + agentEnvironment if (extra.none { it.startsWith("TU_DEBUG=") }) guest.add("$GAME_TU_DEBUG=" + (tuOverride ?: if (tuDriver) "sysmem" else "")) extra.forEach { guest.add(it) } @@ -834,6 +875,27 @@ class SessionService : Service() { private fun noSteamGame(): Boolean = SessionState.mode == MODE_RUN && SessionState.program in setOf(NoSteamLaunch.PROTON_RUN, NoSteamLaunch.EPIC, NoSteamLaunch.BATTLENET) + private fun startVkBridge(guest: MutableList<String>, sessionDir: File) { + if (!com.droiddeck.launcher.core.DeviceSupport.vkBridge(this)) return + val socket = File(filesDir, "vkbridge/server.sock") + val bridge = com.droiddeck.launcher.gpu.VkBridgeComponent(socket, File(sessionDir, "vkbridge-server.log")) + bridge.attach(this) + components.add(bridge) + com.droiddeck.launcher.gpu.ClockLogComponent(File(sessionDir, "vkbridge-clocks.log")).let { + it.attach(this) + components.add(it) + } + guest.add("BL_VKBRIDGE=1") + guest.add("VKBRIDGE_SOCKET=" + socket.path) + guest.add("VKBRIDGE_CLIENT_LOG=" + File(sessionDir, "vkbridge-client.log").path) + guest.add("VKBRIDGE_MODE=" + SessionPrefs.vkBridgeMode(this)) + LinuxRuntime.gpuStandIn(this)?.let { node -> + guest.add("BL_DRM_STANDIN=$node") + LinuxRuntime.deviceNumbers(node)?.let { guest.add("VKBRIDGE_DRM_RENDER=$it") } + } + Log.i(TAG, "vkbridge: on (${com.droiddeck.launcher.core.DeviceSupport.gpuName(this)}, ${SessionPrefs.vkBridgeMode(this)} mode), socket $socket") + } + private fun startAudio(guest: MutableList<String>, sessionDir: File, directAudioPack: Boolean): PulseAudioComponent { val wantsDirectAudio = directAudioPack && (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || noSteamGame()) && @@ -841,7 +903,7 @@ class SessionService : Service() { val wantsMic = SessionPrefs.micEnabled(this) && checkSelfPermission(android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED guest.add("BL_MIC_ENABLED=" + if (wantsMic) "1" else "0") - guest.add("BANNER_AUDIO_DIRECT_MIC=" + if (wantsMic) "1" else "0") + guest.add("AUDIO_DIRECT_MIC=" + if (wantsMic) "1" else "0") val audioDir = File(filesDir, "directaudio").apply { mkdirs() } val relaySocket = File(audioDir, "relay.sock") val micFifo = if (wantsMic) File(audioDir, "mic.fifo") else null @@ -869,7 +931,11 @@ class SessionService : Service() { } if (wantsDirectAudio) { guest.add("BL_DIRECTAUDIO=/" + SessionFiles.DIRECTAUDIO_DIR) - guest.add("BANNER_AUDIO_DIRECT_RELAY=" + relaySocket.absolutePath) + guest.add("AUDIO_DIRECT_RELAY=" + relaySocket.absolutePath) + val lowLatency = com.droiddeck.launcher.audio.DirectAudioTiming.lowLatencyOutput() + val timing = com.droiddeck.launcher.audio.DirectAudioTiming.environment(lowLatency) + guest.addAll(timing) + Log.i(TAG, "audio: Android output " + (if (lowLatency) "is low-latency; DirectAudio keeps its defaults" else "is not low-latency; DirectAudio uses " + timing.joinToString(" "))) } Log.i(TAG, "audio: client DirectAudio (in-process sink)" + (if (wantsDirectAudio) " + DirectAudio for games" else "") + (if (wantsMic) " + microphone" else "") + @@ -974,7 +1040,7 @@ class SessionService : Service() { gpuMem.attach(this) components.add(gpuMem) } - val gpuStats = GpuStatsComponent(File(filesDir, "session/sys/kgsl-3d0")) + val gpuStats = GpuStatsComponent(File(filesDir, "session/sys/kgsl-3d0"), LinuxRuntime.rootDir(this)) if (gpuStats.prepare()) { gpuStats.attach(this) components.add(gpuStats) @@ -1036,7 +1102,7 @@ class SessionService : Service() { Log.w(TAG, "added games: ${root.host} is not a readable folder this session") } } - for ((host, guest) in com.droiddeck.launcher.stores.StoreInstallRoot.externalRoots(this)) { + for ((host, guest) in com.droiddeck.launcher.stores.StoreInstallRoot.externalRootsForXodus(this)) { if (host.isDirectory && host.canRead()) { File(LinuxRuntime.rootDir(this), guest.removePrefix("/")).mkdirs() binds.add(host.path + ":" + guest) @@ -1081,8 +1147,43 @@ class SessionService : Service() { } } } + val addedLibraries = ArrayList<SteamLibraries.Entry>() + val cardPath = storageDiagnosticLibrary?.let { library?.path }?.let { runCatching { File(it).canonicalPath }.getOrDefault(it) } + for (entry in SteamLibraries.list(this)) { + if (cardPath != null && SteamLibraries.overlaps(cardPath, runCatching { entry.host.canonicalPath }.getOrDefault(entry.path))) { + Log.w(TAG, "added steam library: ${entry.path} overlaps the card library; not a library this session") + continue + } + if (!entry.host.isDirectory) { + Log.w(TAG, "added steam library: ${entry.path} is not attached; not a library this session") + continue + } + val problem = GameStorage.prepare(this, entry.path) + if (problem != null) { + Log.w(TAG, "added steam library: $problem") + continue + } + try { + val room = if (ProotFastPath.enabled(this)) { + ProotFastPath.MAX_BINDS - LinuxRuntime.binds(this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds).size + } else Int.MAX_VALUE + val content = SecondaryLibrary.contentPath(entry.host) + val extra = SecondaryLibrary.binds(filesDir, entry.host, listOf(entry.guest), content = content) + if (extra.size > room) { + Log.w(TAG, "added steam library: ${entry.path} needs ${extra.size} binds, $room left for the fast path; not a library this session") + continue + } + File(LinuxRuntime.rootDir(this), entry.guest.removePrefix("/")).mkdirs() + binds.addAll(extra) + libraries.add(entry.guest to entry.label) + steamLibraryMounts = steamLibraryMounts + (entry.guest to content) + addedLibraries.add(entry) + Log.i(TAG, "added steam library: ${content.path} -> ${entry.guest} (\"${entry.label}\")") + } catch (e: Exception) { + Log.w(TAG, "added steam library: ${entry.path} private directories could not be prepared", e) + } + } val x64Libraries = org.json.JSONArray() - // Desktop mode offers the x86-64 client either way; droiddeck-steam-x64 drops library folders it is not given. val x64Here = SessionPrefs.steamClientArch(this) == "x86_64" || (SessionState.mode == MODE_DESKTOP && com.droiddeck.launcher.storage.SteamStorage.x64ClientPresent(SessionPrefs.steamRoot(this, "x86_64"))) @@ -1107,6 +1208,27 @@ class SessionService : Service() { Log.w(TAG, "x86-64 steam library: $x64 private directories could not be prepared", e) } } + if (x64Here) for (entry in addedLibraries) { + val problem = GameStorage.prepare(this, entry.x64Host.path) + if (problem != null) { + Log.w(TAG, "x86-64 steam library: $problem") + continue + } + try { + val room = if (ProotFastPath.enabled(this)) { + ProotFastPath.MAX_BINDS - LinuxRuntime.binds(this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds).size + } else Int.MAX_VALUE + val extra = SecondaryLibrary.binds(filesDir, entry.x64Host, listOf(entry.x64Guest)).drop(1) + if (extra.size > room) { + Log.w(TAG, "x86-64 steam library: ${entry.x64Host} needs ${extra.size} binds, $room left for the fast path; not a library this session") + continue + } + binds.addAll(extra) + x64Libraries.put(org.json.JSONObject().put("path", entry.x64Guest).put("label", entry.label)) + } catch (e: Exception) { + Log.w(TAG, "x86-64 steam library: ${entry.x64Host} private directories could not be prepared", e) + } + } try { val listing = File(filesDir, "session/steam-libraries-x64.json").apply { parentFile?.mkdirs() } listing.writeText(x64Libraries.toString()) @@ -1286,13 +1408,6 @@ class SessionService : Service() { Log.i(TAG, "queued Steam game $gameId for the running client") } - /** - * A game launched from the front end (the Games tab, or another launcher's link): once it has - * started and then been gone for [GAME_EXIT_GRACE_MS], ask the client to exit through the - * session script's steam-stop request. The client quits cleanly, finishing its cloud sync, so - * the session ends on its own and the activity returns to where the launch came from instead - * of leaving the player in Big Picture. The grace covers launchers that restart the game. - */ private fun watchGameExit(gameId: String, gen: Int) { if (!SessionPrefs.returnAfterGame(this)) return val token = ++gameExitWatchToken @@ -1307,7 +1422,6 @@ class SessionService : Service() { seen = true goneSince = 0L } else if (!seen) { - // Never started (an install, an update or a failed launch): leave the session be. if (now > startBy) { Log.i(TAG, "game $gameId did not start; not watching for its exit") return@Thread @@ -1333,19 +1447,7 @@ class SessionService : Service() { Log.i(TAG, "game $gameId closed: asking the client to exit and returning to the launcher") } - /** A Steam game is running: the client runs each one under its reaper, and Proton's script - * waits on the game with waitforexitandrun. Read from the command lines, as ComponentsManager does. */ - private fun steamGameRunning(): Boolean { - val procs = File("/proc").listFiles() ?: return false - for (p in procs) { - if (!p.name.all(Char::isDigit)) continue - val cmd = runCatching { File(p, "cmdline").readBytes() }.getOrNull() ?: continue - if (cmd.isEmpty()) continue - val text = String(cmd).replace('\u0000', ' ') - if (text.contains("SteamLaunch AppId=") || text.contains("waitforexitandrun")) return true - } - return false - } + private fun steamGameRunning(): Boolean = SteamGameProcess.running() private fun resumeSession(panelVisible: Boolean = true) { if (SessionState.suspended) SessionState.resumeRequested = true @@ -1557,7 +1659,6 @@ class SessionService : Service() { if (suspendPolicy == SessionPrefs.SUSPEND_MANUAL && hidden && !downloadsBlockingSuspend) { manualPauseRequested = true } else if (!hidden && !SessionState.suspended) { - // Coming back before the freeze finished keeps the game running instead of pausing it a moment later. manualPauseRequested = false } val controller = suspendController ?: return @@ -1580,7 +1681,6 @@ class SessionService : Service() { SessionPrefs.SUSPEND_MANUAL -> manualPauseRequested && prepared && !downloadsBlockingSuspend else -> false } - // A frozen game never sends the stop for a held rumble, so the keepalive would run on. val quietRumble = !screenOn || shouldSuspend || SessionState.suspended components.forEach { (it as? RumbleComponent)?.quiet(quietRumble) } if (freezePending && !shouldSuspend && !freezeCancelled) { @@ -1599,6 +1699,7 @@ class SessionService : Service() { )) if (shouldSuspend) { freezePending = true + SessionState.suspending = true freezeCancelled = false val freezeSteamToken = steamSleepToken val freezeNativeToken = nativeSleepToken @@ -1607,6 +1708,7 @@ class SessionService : Service() { ) { success -> mainHandler.post { if (gen != sessionGen || !SessionState.running) return@post + SessionState.suspending = false suspendOperationPending = false freezePending = false if (success) { @@ -1793,11 +1895,22 @@ class SessionService : Service() { }, "tracer-priority").start() } - private fun stopSession(status: Int) { - cancelQueuedSteamGame() - gameExitWatchToken++ + private fun failSession(gen: Int, code: String, message: String, status: Int?) { + synchronized(stopLock) { + if (gen == sessionGen) SessionEvents.fail(code, message, status) + } + } + + private fun stopSession(status: Int, gen: Int? = null) { + if (gen != null && gen != sessionGen) { + Log.i(TAG, "ignoring a stop from session $gen; session $sessionGen is current") + return + } completeNativeSleep() val (ended, endedArch) = synchronized(stopLock) { + if (gen != null && gen != sessionGen) return + cancelQueuedSteamGame() + gameExitWatchToken++ if (!SessionState.running) return SessionEvents.record("guest.exited", mapOf("status" to status)) SessionEvents.transition(SessionPhase.STOPPING, "session.stopping", mapOf("status" to status)) @@ -1819,6 +1932,7 @@ class SessionService : Service() { GameThreadHints.stop() suspendOperationPending = false freezePending = false + SessionState.suspending = false launchWatcher?.stopWatching() launchWatcher = null syncWatcher?.stopWatching() @@ -1829,6 +1943,7 @@ class SessionService : Service() { auxiliaryProcesses.toMap().also { auxiliaryProcesses.clear() } } SessionTerminal.clear(sessionGen) + BottomDesktop.stop(this, stoppedGen) val controller = suspendController suspendController = null if (ended != null) { @@ -1896,7 +2011,7 @@ class SessionService : Service() { override fun onDestroy() { stopSession(0) - GameThreadHints.stop() // also when the session never got as far as running + GameThreadHints.stop() if (screenReceiverRegistered) { unregisterReceiver(screenReceiver) screenReceiverRegistered = false @@ -1905,6 +2020,9 @@ class SessionService : Service() { (getSystemService(Context.DISPLAY_SERVICE) as? DisplayManager)?.unregisterDisplayListener(displayListener) displayListenerRegistered = false } + downloadMonitorTask?.let(mainHandler::removeCallbacks) + downloadMonitorTask = null + downloadMonitorExecutor.shutdown() super.onDestroy() } @@ -2028,12 +2146,20 @@ class SessionService : Service() { SessionState.running && SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER && (steamDownloadsInBackground || !SessionState.firstFrameSeen) + private fun runOnDownloadMonitor(task: () -> Unit) { + try { + downloadMonitorExecutor.execute(task) + } catch (e: java.util.concurrent.RejectedExecutionException) { + Log.d(TAG, "download monitor already shut down") + } + } + private fun updateDownloadMonitoring() { if (!downloadWatchWanted()) { val wasActive = downloadActive downloadMonitorTask?.let(mainHandler::removeCallbacks) downloadMonitorTask = null - steamDownloadMonitor.reset() + runOnDownloadMonitor { steamDownloadMonitor.reset() } downloadActive = false if (clientInstallActive) SessionEvents.record("steam.client_download", mapOf("active" to false)) clientInstallActive = false @@ -2055,18 +2181,30 @@ class SessionService : Service() { val wasInstalling = clientInstallActive clientInstallActive = !SessionState.firstFrameSeen && (clientInstallActive || SteamDownloadMonitor.clientInstallPending(root)) - downloadActive = clientInstallActive || steamDownloadsInBackground && steamDownloadMonitor.poll( - root, - receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()), - client = SessionState.steamClientArch, - mounts = steamLibraryMounts, - ) - if (wasInstalling != clientInstallActive) { - SessionEvents.record("steam.client_download", mapOf("active" to clientInstallActive)) + val receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()) + val client = SessionState.steamClientArch + val mounts = steamLibraryMounts + val self = this + val finish = { monitored: Boolean -> + if (downloadMonitorTask === self) { + downloadActive = clientInstallActive || monitored + if (wasInstalling != clientInstallActive) { + SessionEvents.record("steam.client_download", mapOf("active" to clientInstallActive)) + } + if (wasActive != downloadActive) refreshNotification() + updateSuspendPolicy() + mainHandler.postDelayed(self, DOWNLOAD_POLL_MS) + } + } + if (clientInstallActive || !steamDownloadsInBackground) { + finish(false) + return + } + runOnDownloadMonitor { + val monitored = runCatching { steamDownloadMonitor.poll(root, receivedBytes = receivedBytes, client = client, mounts = mounts) } + .getOrDefault(false) + mainHandler.post { finish(monitored) } } - if (wasActive != downloadActive) refreshNotification() - updateSuspendPolicy() - mainHandler.postDelayed(this, DOWNLOAD_POLL_MS) } } downloadMonitorTask = poll @@ -2135,9 +2273,7 @@ class SessionService : Service() { private const val DOWNLOAD_POLL_MS = 2_000L private const val STEAM_GAME_REQUEST = "steam-game" private const val GAME_URL_PREFIX = "steam://rungameid/" - /** How long a front-end launch may take to start (downloads, first-run installs) before the exit watch gives up. */ private const val GAME_START_TIMEOUT_MS = 20 * 60_000L - /** How long the game must stay gone before the client is asked to exit: launchers restart games. */ private const val GAME_EXIT_GRACE_MS = 10_000L private const val GAME_EXIT_POLL_MS = 2_000L private const val NO_PAD_SWITCH = "Download/droiddeck-no-pad" diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 088c8b7d00..2e66d2b80f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -54,6 +54,8 @@ object SessionState { var suspended by mutableStateOf(false) var resumeRequested by mutableStateOf(false) var resuming by mutableStateOf(false) + /** A freeze has begun and has not finished; it already chose which processes it stops. */ + @Volatile var suspending = false var resumeFailures by mutableIntStateOf(0) var resumeFailed by mutableStateOf(false) var manualPause by mutableStateOf(false) @@ -70,8 +72,6 @@ object SessionState { var steamUrl: String? = null @Volatile var steamClientArch: String? = null - // A Play SteamVR request can arrive while an existing session is visible. - // Wake the status/launch effect even if no glasses surface has attached yet. var steamVr by mutableStateOf(false) var relaunch: android.content.Intent? = null @JvmStatic var hdr = false @@ -92,6 +92,10 @@ object SessionState { @Volatile var secondScreenMode = com.droiddeck.launcher.input.SecondScreenMode.NONE @Volatile var secondScreenDisplay = -1 @Volatile var secondScreenAutoOpened = false + @Volatile var secondScreenProvisional = false + @Volatile var gameOnBottom = false + + @Volatile var steamLibraryMounts: Map<String, java.io.File> = emptyMap() @Volatile var mode = "steam" @@ -101,6 +105,7 @@ object SessionState { @Volatile var followScreen = false + var followScale = 1f @Volatile var refreshHz: Float = 60f @@ -108,7 +113,6 @@ object SessionState { @Volatile var upscaleRatio: Float = 0f - /** Frame limit chosen in the drawer for a game launched without Steam; 0 is off. */ @Volatile var fpsLimit: Int = 0 diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt index 5d0e32f990..b0a6852144 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt @@ -3,6 +3,9 @@ package com.droiddeck.launcher.session import android.os.Process import java.io.File import java.io.IOException +import java.io.RandomAccessFile +import java.nio.ByteBuffer +import java.nio.ByteOrder import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.RejectedExecutionException @@ -19,8 +22,13 @@ internal class SessionSuspendController( private val nowMillis: () -> Long = { System.nanoTime() / 1_000_000 }, private val executor: ExecutorService = Executors.newSingleThreadExecutor(), private val zramControl: File? = null, + private val clockControl: File? = null, + private val nowNanos: () -> Long = System::nanoTime, private val pagedOut: (processes: Int, unacknowledged: Int, residentKb: Long, swapKb: Long, swapBeforeKb: Long, millis: Long) -> Unit = { _, _, _, _, _, _ -> }, + private val readBackAllowed: () -> Boolean = { true }, + private val pagedIn: (processes: Int, swapKb: Long, swapBeforeKb: Long, availableKb: Long, millis: Long) -> Unit = + { _, _, _, _, _ -> }, ) { private enum class Role { SESSION_ROOT, SESSION_CHILD, HELPER_ROOT, HELPER_CHILD } @@ -43,6 +51,8 @@ internal class SessionSuspendController( @Volatile private var closing = false @Volatile private var cancelled = false private var frozen = emptyList<ProcessRecord>() + private var frozenSince: Long? = null + private var pagedOutTargets = emptyList<ProcessRecord>() fun freeze(pageOut: Boolean = false, completion: (Boolean) -> Unit) { cancelled = false @@ -93,6 +103,7 @@ internal class SessionSuspendController( } catch (_: Exception) { } finally { frozen = records.values.toList() + if (complete && frozenSince == null) frozenSince = nowNanos() if (!complete) { if (restoreSafely(frozen)) frozen = emptyList() runAudio(resumeAudio) @@ -100,10 +111,10 @@ internal class SessionSuspendController( if (interrupted) Thread.currentThread().interrupt() } completion(complete) + if (!complete && frozen.isEmpty() && !interrupted) readBack() }, { completion(false) }) } - // A freeze still queued or paging out stops before its next SIGSTOP pass and rolls back. fun cancelFreeze() { cancelled = true } @@ -111,16 +122,19 @@ internal class SessionSuspendController( fun resume(completion: (Boolean) -> Unit) { submit({ val records = frozen + advanceClock() runAudio(resumeAudio) val resumed = restoreSafely(records) if (resumed) frozen = emptyList() completion(resumed) + if (resumed) readBack() }, { completion(false) }) } fun closeAndResume(completion: () -> Unit) { closing = true submit({ + advanceClock() if (restoreSafely(frozen)) frozen = emptyList() completion() executor.shutdown() @@ -135,6 +149,23 @@ internal class SessionSuspendController( } } + private fun advanceClock() { + val since = frozenSince ?: return + frozenSince = null + val control = clockControl?.takeIf { it.isFile && it.length() >= Long.SIZE_BYTES } ?: return + try { + RandomAccessFile(control, "rw").use { file -> + val bytes = ByteArray(Long.SIZE_BYTES) + file.readFully(bytes) + val shift = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN).long.coerceAtLeast(0L) + + (nowNanos() - since).coerceAtLeast(0L) + file.seek(0L) + file.write(ByteBuffer.allocate(Long.SIZE_BYTES).order(ByteOrder.LITTLE_ENDIAN).putLong(shift).array()) + } + } catch (_: IOException) { + } + } + private fun runAudio(action: () -> Unit) { try { action() @@ -217,7 +248,6 @@ internal class SessionSuspendController( } private fun stoppedSnapshot(records: List<ProcessRecord>, root: ProcessRecord): Map<TaskIdentity, Long>? { - // PRoot can leave the leader stopped while native worker threads keep running. val tasks = LinkedHashMap<TaskIdentity, Long>() var stopped = true for (record in records) { @@ -244,9 +274,6 @@ internal class SessionSuspendController( return tasks.takeIf { stopped && it.isNotEmpty() } } - // A stopped process cannot run libblsession's SIGURG handler, so the page-out has to finish - // before the stop. Android's low-memory killer otherwise finds the frozen game resident in RAM - // with most of zram still free. private fun pageOut(records: MutableMap<Pair<Int, Long>, ProcessRecord>, root: Int, helpers: List<Int>) { val control = zramControl?.takeIf { it.isFile } ?: return try { @@ -263,13 +290,12 @@ internal class SessionSuspendController( } } if (targets.isEmpty()) return + pagedOutTargets = (pagedOutTargets + targets).distinct() val acks = targets.associateWith { File(control.parentFile, "${control.name}.ack.${it.pid}") } acks.values.forEach { it.delete() } val start = nowMillis() val before = memoryKb(targets) for (record in targets) send(record, SIGURG) - // A program can replace libblsession's SIGURG handler (PyInstaller's bootloader, the Go runtime); - // such a process never creates its ack and is not waited for once the start window has passed. val waiting = targets.toMutableList() while (!closing && !cancelled && nowMillis() - start < PAGE_OUT_TIMEOUT_MS) { val started = nowMillis() - start >= PAGE_OUT_START_MS @@ -283,6 +309,57 @@ internal class SessionSuspendController( pagedOut(targets.size, unacknowledged, after.first, after.second, before.second, nowMillis() - start) } + private fun readBack() { + val targets = pagedOutTargets.filterNot { isGone(it) } + pagedOutTargets = emptyList() + val control = zramControl?.takeIf { it.isFile } ?: return + if (targets.isEmpty() || closing) return + val before = memoryKb(targets).second + val (total, available) = meminfoKb() + if (!readBackAllowed() || !canTake(before, total, available)) { + pagedIn(0, before, before, available, 0) + return + } + try { + control.writeText("0") + } catch (_: IOException) { + return + } + val start = nowMillis() + for (record in targets) send(record, SIGURG) + var swap = before + var unchanged = 0 + try { + while (!closing && nowMillis() - start < READ_BACK_TIMEOUT_MS) { + sleep(READ_BACK_POLL_MS) + val current = memoryKb(targets).second + unchanged = if (current == swap) unchanged + 1 else 0 + swap = current + if (swap == 0L || unchanged >= READ_BACK_STABLE_POLLS) break + } + } catch (_: InterruptedException) { + Thread.currentThread().interrupt() + } + pagedIn(targets.size, swap, before, available, nowMillis() - start) + } + + private fun canTake(swapKb: Long, totalKb: Long, availableKb: Long): Boolean = + availableKb >= swapKb * READ_BACK_AVAILABLE_FACTOR && + availableKb - swapKb >= maxOf(READ_BACK_HEADROOM_KB, totalKb / READ_BACK_TOTAL_SHARE) + + private fun meminfoKb(): Pair<Long, Long> = try { + val values = HashMap<String, Long>() + File(procRoot, "meminfo").forEachLine { line -> + val name = line.substringBefore(':') + if (name == "MemTotal" || name == "MemAvailable") { + line.substringAfter(':').trim().substringBefore(' ').toLongOrNull()?.let { values[name] = it } + } + } + (values["MemTotal"] ?: 0L) to (values["MemAvailable"] ?: 0L) + } catch (_: IOException) { + 0L to 0L + } + private fun isGone(record: ProcessRecord): Boolean = try { readProcess(record.pid)?.started != record.started } catch (_: Exception) { false } @@ -303,9 +380,6 @@ internal class SessionSuspendController( return resident to swap } - // PRoot traces every guest. A stop sent while it runs becomes a group stop that it restarts - // thread by thread; once it is stopped, each thread that takes a SIGSTOP stays parked in its - // signal-delivery stop. So the roots stop first and every guest thread gets its own SIGSTOP. private fun stop(records: List<ProcessRecord>) { for (record in records.filter { it.role == Role.SESSION_ROOT }) send(record, SIGSTOP) for (record in records.filter { it.role == Role.HELPER_ROOT }) send(record, SIGSTOP) @@ -370,7 +444,6 @@ internal class SessionSuspendController( val current = try { readProcess(record.pid) } catch (_: Exception) { return false } if (current == null || current.started != record.started) return true if (current.state == 'T' || current.state == 't') return false - // A traced worker in 't' is usually PRoot handling a system call; 'T' is a job-control stop. return File(procRoot, "${record.pid}/task").listFiles().orEmpty().none { entry -> entry.name.toIntOrNull() != null && try { readStat(File(entry, "stat"))[0].first() == 'T' } catch (_: IOException) { false } @@ -384,6 +457,12 @@ internal class SessionSuspendController( const val PAGE_OUT_POLL_MS = 100L const val PAGE_OUT_START_MS = 2_000L const val PAGE_OUT_TIMEOUT_MS = 12_000L + const val READ_BACK_POLL_MS = 100L + const val READ_BACK_STABLE_POLLS = 5 + const val READ_BACK_TIMEOUT_MS = 5_000L + const val READ_BACK_HEADROOM_KB = 1_048_576L + const val READ_BACK_AVAILABLE_FACTOR = 2L + const val READ_BACK_TOTAL_SHARE = 10L const val RESTORE_CHECKS = 80 const val FREEZE_TIMEOUT_MS = 8_000L const val FREEZE_MAX_PASSES = 256 diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 5c445a2a3a..6a6b296043 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -12,13 +12,13 @@ object SettingsReset { private const val TAG = "SettingsReset" internal val SESSION_KEYS = setOf( - "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "addedGamesArt", - "dualScreenMode", "dualScreenLauncher", "dualScreenSessionControls", + "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "startupSession", "addedGamesArt", + "dualScreenMode", "dualScreenSessionMode", "dualScreenLauncher", "dualScreenSessionControls", "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", - "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "fusionHud", "fusionHudPos", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", + "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "railLabels", + "stretch16x9", "picturePosition", "railLabels", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", @@ -27,7 +27,7 @@ object SettingsReset { "upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias", "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", "bootMovieApplyNext", "bootMovieSteamSeen", - "questDefaultsV1", + "questDefaultsV1", "telemetryAuto", "telemetryOff", "statsStrip", "statsHud", "bottomHud", "bottomStripMetrics", "bottomStripTabs", "statsDash", "statsSpeedUnit", ) internal val SESSION_PREFIXES = listOf( diff --git a/app/src/main/java/com/droiddeck/launcher/session/StatsLayout.kt b/app/src/main/java/com/droiddeck/launcher/session/StatsLayout.kt new file mode 100644 index 0000000000..b438ba2f32 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/StatsLayout.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.session + +enum class StatsStrip(val id: String) { + LINE("line"), PANEL("panel"), TILES("tiles"), RINGS("rings"); + + fun next(): StatsStrip = entries[(ordinal + 1) % entries.size] + + companion object { + fun from(id: String?): StatsStrip = entries.firstOrNull { it.id == id } ?: LINE + } +} + +enum class StripMetric(val id: String, val defaultOn: Boolean = true) { + ENGINE("engine"), GRAPH("graph"), LOWS("lows"), LOW001("low001"), GPU("gpu"), GPU_TEMP("gputemp", false), + CPU("cpu"), CPU_TEMP("cputemp"), VRAM("vram"), RAM("ram"), CLOCK("clock"); + + companion object { + val defaults: Set<StripMetric> = entries.filter { it.defaultOn }.toSet() + + fun parse(saved: String?): Set<StripMetric> = + if (saved == null) defaults + else saved.split(',').mapNotNull { id -> entries.firstOrNull { it.id == id.trim() } }.toSet() + + fun encode(on: Set<StripMetric>): String = entries.filter { it in on }.joinToString(",") { it.id } + } +} + +enum class StatsHud(val id: String) { + BIG_FPS("bigfps"), FULL("full"), TILES("tiles"), RINGS("rings"), GRAPHS("graphs"), CORES("cores"), + HEAT("heat"), GAME("game"), PACING("pacing"), NIGHT("night"), MEGA("mega"); + + fun next(): StatsHud = entries[(ordinal + 1) % entries.size] + + companion object { + fun from(id: String?): StatsHud = entries.firstOrNull { it.id == id } ?: BIG_FPS + } +} + +enum class SpeedUnit(val id: String, val label: String, val perKmh: Float) { + AUTO("auto", "", 1f), KMH("kmh", "km/h", 1f), MPH("mph", "mph", 0.621371f); + + fun resolve(country: String): SpeedUnit = if (this != AUTO) this else if (country.uppercase() in MPH_REGIONS) MPH else KMH + + fun next(): SpeedUnit = entries[(ordinal + 1) % entries.size] + + companion object { + private val MPH_REGIONS = setOf("US", "PR", "GU", "VI", "AS", "MP", "GB", "IM", "JE", "GG", "LR", "BS", "BZ") + + fun from(id: String?): SpeedUnit = entries.firstOrNull { it.id == id } ?: AUTO + } +} + +enum class StatsDash(val id: String) { + AUTO("auto"), SPEEDOMETER("speedometer"), CIRCUIT("circuit"), TRACE("trace"), DIALS("dials"), GLANCE("glance"); + + fun resolve(source: String): StatsDash = if (this != AUTO) this else when (source) { + "Forza" -> CIRCUIT + "OutGauge" -> DIALS + else -> SPEEDOMETER + } + + companion object { + private val DRAWN = listOf(SPEEDOMETER, CIRCUIT, TRACE, DIALS, GLANCE) + + fun from(id: String?): StatsDash = entries.firstOrNull { it.id == id } ?: AUTO + + fun tapped(shown: StatsDash): StatsDash = DRAWN[(DRAWN.indexOf(shown) + 1).mod(DRAWN.size)] + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDeckRepo.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDeckRepo.kt index 2a940a96f4..9503e8e2f2 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamDeckRepo.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDeckRepo.kt @@ -7,12 +7,10 @@ import java.net.HttpURLConnection import java.net.URL import java.net.URLEncoder -/** steamdeckrepo.com's public boot video list, the same one its website and its own manager app read. */ object SteamDeckRepo { private const val TAG = "SteamDeckRepo" const val BASE = "https://steamdeckrepo.com" - /** The site shows twelve movies a page. */ const val PAGE_SIZE = 12 const val MAX_DOWNLOAD_BYTES = 120L shl 20 private const val MAX_JSON_BYTES = 1 shl 20 @@ -23,7 +21,6 @@ object SteamDeckRepo { TRENDING("trending"), DOWNLOADS("downloads-desc"), LIKES("likes-desc"), NEWEST("created_at-desc"), } - /** `null` is every device. */ val DEVICES = listOf("steam_deck", "steam_machine") class Post( @@ -36,7 +33,6 @@ object SteamDeckRepo { object Failed : Page() } - /** The text of [key], empty when it is missing or JSON null, which `optString` would turn into the word "null". */ private fun JSONObject.text(key: String): String = if (isNull(key)) "" else optString(key) fun parse(json: String): List<Post>? { @@ -83,10 +79,6 @@ object SteamDeckRepo { return result } - /** - * The number of the last page for a search, found by asking for pages: the site does not say how many there are, but a - * page past the end is empty and the last one is short. Null when the site cannot be reached. - */ fun lastPage(sort: Sort, device: String?, search: String, cap: Int = 512, count: (Int) -> Int? = { p -> (fetch(sort, device, search, p) as? Page.Ok)?.posts?.size }): Int? { @@ -111,7 +103,6 @@ object SteamDeckRepo { return good } - /** Reads [input] to its end, or null as soon as it holds more than [limit] bytes, so a huge answer is never kept whole. */ internal fun readLimited(input: java.io.InputStream, limit: Int): ByteArray? { val out = java.io.ByteArrayOutputStream() val buffer = ByteArray(16 * 1024) @@ -142,7 +133,6 @@ object SteamDeckRepo { } } - /** Fetches a small picture such as a cover; null when it cannot be had. */ fun bytes(url: String, limit: Int = 4 shl 20): ByteArray? { if (!url.startsWith("https://")) return null var connection: HttpURLConnection? = null @@ -161,10 +151,6 @@ object SteamDeckRepo { } } - /** - * Downloads a movie to [target] through the site's own download address, so the site counts it like a download from - * its website, and falls back to the video's address. True when a file was saved. - */ fun download(post: Post, target: File, onProgress: (Int) -> Unit = {}): Boolean { for (url in listOf("$BASE/post/download/${post.id}", post.video)) { if (save(url, target, onProgress)) return true diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt index ff3602c1bd..ccc8693c33 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt @@ -101,34 +101,6 @@ internal class SteamDownloadMonitor { now - lastContentActivityAt <= CONTENT_ACTIVITY_GRACE_MS } - private fun manifests(runtimeRoot: File, mounts: Map<String, File>): List<File> { - val steamRoots = linkedSetOf<File>() - for (home in STEAM_HOMES) { - val primary = File(runtimeRoot, home) - steamRoots += primary - val libraryFolders = File(primary, "steamapps/libraryfolders.vdf") - runCatching { - PATH.findAll(libraryFolders.readText()).forEach { match -> - steamRoots += hostPath(runtimeRoot, match.groupValues[1], mounts) - } - } - } - return steamRoots.flatMap { root -> - File(root, "steamapps").listFiles { file -> - file.isFile && file.name.startsWith("appmanifest_") && file.name.endsWith(".acf") - }.orEmpty().toList() - } - } - - private fun hostPath(runtimeRoot: File, guest: String, mounts: Map<String, File>): File { - val path = guest.trimEnd('/') - for ((mount, host) in mounts) { - if (path == mount) return host - if (path.startsWith("$mount/")) return File(host, path.removePrefix("$mount/")) - } - return File(runtimeRoot, path.removePrefix("/")) - } - private fun read(file: File): ManifestState { val text = runCatching { file.readText() }.getOrDefault("") val flags = value(text, "StateFlags")?.toLongOrNull() ?: 0L @@ -137,9 +109,6 @@ internal class SteamDownloadMonitor { return ManifestState(downloaded, flags != 4L && (total <= 0L || downloaded < total)) } - private fun value(text: String, key: String): String? = - Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) - companion object { fun clientInstallPending(runtimeRoot: File): Boolean { val home = File(runtimeRoot, "root") @@ -149,12 +118,43 @@ internal class SteamDownloadMonitor { return !(stamped && File(steam, "steamrtarm64/steam").isFile) || File(home, ".bl-steam-repair").exists() } + internal fun manifests(runtimeRoot: File, mounts: Map<String, File>): List<File> { + val steamRoots = linkedSetOf<File>() + for (home in STEAM_HOMES) { + val primary = File(runtimeRoot, home) + steamRoots += primary + val libraryFolders = File(primary, "steamapps/libraryfolders.vdf") + runCatching { + PATH.findAll(libraryFolders.readText()).forEach { match -> + steamRoots += hostPath(runtimeRoot, match.groupValues[1], mounts) + } + } + } + return steamRoots.flatMap { root -> + File(root, "steamapps").listFiles { file -> + file.isFile && file.name.startsWith("appmanifest_") && file.name.endsWith(".acf") + }.orEmpty().toList() + } + } + + private fun hostPath(runtimeRoot: File, guest: String, mounts: Map<String, File>): File { + val path = guest.trimEnd('/') + for ((mount, host) in mounts) { + if (path == mount) return host + if (path.startsWith("$mount/")) return File(host, path.removePrefix("$mount/")) + } + return File(runtimeRoot, path.removePrefix("/")) + } + + internal fun value(text: String, key: String): String? = + Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) + private const val MANIFEST_PROGRESS_GRACE_MS = 8_000L private const val CONTENT_ACTIVITY_GRACE_MS = 90_000L private const val MIN_RECEIVE_BYTES_PER_SEC = 64L * 1024L private val PATH = Regex("\"path\"\\s+\"([^\"]+)\"") - private val STEAM_HOMES = listOf("root/.local/share/Steam", "root/.droiddeck-x64/.local/share/Steam") - private val CONTENT_UPDATE = Regex("""AppID (\d+) (App|Workshop|Shader) update changed : (.*)""") + internal val STEAM_HOMES = listOf("root/.local/share/Steam", "root/.droiddeck-x64/.local/share/Steam") + internal val CONTENT_UPDATE = Regex("""AppID (\d+) (App|Workshop|Shader) update changed : (.*)""") private val CURRENT_RATE = Regex("""Current download rate: ([\d.]+) Mbps""") } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloads.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloads.kt new file mode 100644 index 0000000000..83b101db44 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloads.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.session + +import java.io.File +import java.io.RandomAccessFile + +data class SteamDownload( + val appId: String, + val name: String, + val done: Long, + val total: Long, + val shader: Boolean = false, + val paused: Boolean = false, +) + +object SteamDownloads { + fun read(runtimeRoot: File, mounts: Map<String, File> = emptyMap(), client: String? = null): List<SteamDownload> { + val names = HashMap<String, String>() + val apps = SteamDownloadMonitor.manifests(runtimeRoot, mounts).mapNotNull { file -> + val text = runCatching { file.readText() }.getOrNull() ?: return@mapNotNull null + val id = SteamDownloadMonitor.value(text, "appid") ?: file.name.removePrefix("appmanifest_").removeSuffix(".acf") + val name = SteamDownloadMonitor.value(text, "name") ?: id + names[id] = name + fromManifest(id, name, text) + }.let(::onePerApp) + val homes = client?.let { listOf(if (it == "x86_64") SteamDownloadMonitor.STEAM_HOMES[1] else SteamDownloadMonitor.STEAM_HOMES[0]) } + ?: SteamDownloadMonitor.STEAM_HOMES + val log = homes.map { File(runtimeRoot, "$it/logs/content_log.txt") }.filter { it.isFile }.maxByOrNull { it.lastModified() } + val shaders = log?.let { runningShaderUpdates(tail(it)) }.orEmpty() + .map { SteamDownload(it, names[it] ?: it, 0L, 0L, shader = true) } + return apps + shaders + } + + internal fun onePerApp(downloads: List<SteamDownload>): List<SteamDownload> = + downloads.groupBy { it.appId }.values.map { same -> same.maxBy { it.done } } + + internal fun fromManifest(id: String, name: String, text: String): SteamDownload? { + val flags = SteamDownloadMonitor.value(text, "StateFlags")?.toLongOrNull() ?: 0L + if (flags == FULLY_INSTALLED) return null + val done = SteamDownloadMonitor.value(text, "BytesDownloaded")?.toLongOrNull() ?: 0L + val total = SteamDownloadMonitor.value(text, "BytesToDownload")?.toLongOrNull() ?: 0L + if (total > 0L && done >= total) return null + if ((flags and UPDATE_REQUIRED) == 0L && total <= 0L) return null + return SteamDownload(id, name, done, total, paused = (flags and UPDATE_PAUSED) != 0L) + } + + internal fun runningShaderUpdates(lines: Sequence<String>): List<String> { + val state = LinkedHashMap<String, Boolean>() + for (line in lines) { + if ("Client version:" in line) state.clear() + val match = SteamDownloadMonitor.CONTENT_UPDATE.find(line) ?: continue + if (match.groupValues[2] != "Shader") continue + val running = match.groupValues[3].let { "Running Update" in it && "Stopping" !in it } + state[match.groupValues[1]] = running + } + return state.filterValues { it }.keys.toList() + } + + private fun tail(file: File): Sequence<String> = runCatching { + RandomAccessFile(file, "r").use { raf -> + val start = (raf.length() - TAIL_BYTES).coerceAtLeast(0L) + raf.seek(start) + val bytes = ByteArray((raf.length() - start).toInt()) + raf.readFully(bytes) + String(bytes, Charsets.ISO_8859_1).lineSequence().drop(if (start > 0L) 1 else 0).toList().asSequence() + } + }.getOrDefault(emptySequence()) + + private const val FULLY_INSTALLED = 4L + private const val UPDATE_REQUIRED = 2L + private const val UPDATE_PAUSED = 512L + private const val TAIL_BYTES = 256L * 1024L +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamGameProcess.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamGameProcess.kt new file mode 100644 index 0000000000..891fb57ca8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamGameProcess.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.session + +import java.io.File + +object SteamGameProcess { + fun matches(cmdline: ByteArray): Boolean { + val args = String(cmdline).split('\u0000') + for (i in args.indices) { + if (args[i] == "waitforexitandrun") return true + if (args[i] == "SteamLaunch" && args.getOrNull(i + 1)?.startsWith("AppId=") == true) return true + } + return false + } + + fun running(proc: File = File("/proc")): Boolean = proc.listFiles()?.any { p -> + p.name.all(Char::isDigit) && runCatching { File(p, "cmdline").readBytes() }.getOrNull()?.let(::matches) == true + } == true +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt new file mode 100644 index 0000000000..6f89079677 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt @@ -0,0 +1,180 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.os.storage.StorageManager +import com.droiddeck.launcher.R +import com.droiddeck.launcher.files.StorageRoots +import com.droiddeck.launcher.frontend.AddedGames +import java.io.File +import org.json.JSONArray +import org.json.JSONObject + +/** Steam libraries the user added beside the internal one and the card library, each a folder of its own. */ +object SteamLibraries { + const val GUEST_ROOT = "/mnt/droiddeck-lib" + // Each library costs a bind per redirected tool and prefix folder; the PRoot fast path holds 256 in all. + const val MAX = 4 + private val lock = Any() + + class Entry(val id: String, val path: String, val label: String) { + val host: File get() = File(path) + val guest: String get() = "$GUEST_ROOT/$id" + val x64Host: File get() = File(path, GameStorage.X64_CARD_DIR) + val x64Guest: String get() = "$guest/${GameStorage.X64_CARD_DIR}" + } + + fun list(context: Context): List<Entry> = parse(SessionPrefs.steamLibraries(context)) + + internal fun parse(json: String): List<Entry> { + if (json.isBlank()) return emptyList() + val array = runCatching { JSONArray(json) }.getOrNull() ?: return emptyList() + return (0 until array.length()).mapNotNull { i -> + val o = array.optJSONObject(i) ?: return@mapNotNull null + val id = o.optString("id") + val path = o.optString("path") + if (!id.matches(Regex("[0-9]{1,6}")) || path.isEmpty()) null else Entry(id, path, clean(o.optString("label")).ifEmpty { File(path).name }) + }.distinctBy { it.id } + } + + private fun save(context: Context, entries: List<Entry>) { + val array = JSONArray() + for (e in entries) array.put(JSONObject().put("id", e.id).put("path", e.path).put("label", e.label)) + SessionPrefs.setSteamLibraries(context, array.toString()) + } + + /** Steam's libraryfolders.vdf stores labels between quotes with no escaping DroidDeck relies on. */ + internal fun clean(label: String): String = label.replace('"', ' ').replace('\\', ' ').replace(Regex("\\s+"), " ").trim() + + sealed class AddResult { + class Added(val entry: Entry) : AddResult() + class Refused(val reason: String) : AddResult() + } + + fun add(context: Context, picked: String, label: String? = null): AddResult { + val entries = list(context) + if (entries.size >= MAX) return AddResult.Refused(context.getString(R.string.libraries_full, MAX)) + val path = innerLibrary(File(picked))?.path ?: picked + val host = canonical(File(path)) + if (taken(context, entries).any { overlaps(it, host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) + // Adding a Games folder itself is fine; a child of one would make it overlap and hide the rest of that folder. + if (AddedGames.roots(context).any { host.startsWith(canonical(it.host) + "/") }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) + GameStorage.prepare(context, path)?.let { return AddResult.Refused(it) } + synchronized(lock) { + val current = list(context) + if (current.size >= MAX) return AddResult.Refused(context.getString(R.string.libraries_full, MAX)) + if (current.any { overlaps(canonical(it.host), host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) + // A removed library's mount stays registered with Steam until its next session, so ids are never reused. + val next = maxOf(SessionPrefs.steamLibraryNextId(context), (current.maxOfOrNull { it.id.toInt() } ?: 0) + 1) + val entry = Entry(next.toString(), path, clean(label ?: defaultLabel(context, File(path))).ifEmpty { File(path).name }) + save(context, current + entry) + SessionPrefs.setSteamLibraryNextId(context, next + 1) + return AddResult.Added(entry) + } + } + + private fun taken(context: Context, entries: List<Entry>): List<String> = entries.map { canonical(it.host) } + listOfNotNull( + GameStorage.effective(context)?.let { canonical(File(it.path)) }, + canonical(SessionPrefs.steamRoot(context, "arm64")), + ) + + class Found(val path: String, val shown: String, val label: String, val games: Int) + + /** Reads storage; call off the main thread. */ + fun found(context: Context): List<Found> { + val entries = list(context) + val taken = taken(context, entries) + AddedGames.roots(context).map { canonical(it.host) } + val hits = ArrayList<Pair<File, Int>>() + for (root in StorageRoots.list(context)) { + if (!root.readable) continue + for (dir in candidates(rawView(root.dir), SCAN_DEPTH)) { + val games = gameCount(dir) + if (games > 0 && File(dir, "steamapps").canWrite() && taken.none { overlaps(it, canonical(dir)) }) hits += dir to games + } + } + val picked = ArrayList<Pair<File, Int>>() + for (hit in hits.sortedByDescending { it.second }) { + if (picked.none { overlaps(canonical(it.first), canonical(hit.first)) }) picked += hit + } + return picked.map { (dir, games) -> + val shown = File(storagePath(dir.path)) + Found(dir.path, shown.path, defaultLabel(context, shown), games) + } + } + + /** The FUSE view under /storage hides files other apps wrote unless DroidDeck has all files access; the raw card mount does not. */ + private fun rawView(dir: File): File { + if (!dir.path.startsWith("/storage/") || dir.path.startsWith("/storage/emulated")) return dir + val raw = File("/mnt/media_rw/" + dir.path.removePrefix("/storage/")) + return if (raw.canRead() && raw.list() != null) raw else dir + } + + internal fun innerLibrary(picked: File): File? { + if (gameCount(picked) > 0) return null + return candidates(picked, 1).filter { it != picked && gameCount(it) > 0 }.singleOrNull() + } + + internal fun candidates(root: File, depth: Int): List<File> { + val out = arrayListOf(root) + var level = listOf(root) + repeat(depth) { + level = level.flatMap { dir -> + dir.listFiles { f -> f.isDirectory && !f.name.startsWith(".") && f.name != "steamapps" && !(dir == root && f.name == "Android") } + .orEmpty().sortedBy { it.name } + }.take(SCAN_LIMIT - out.size) + out += level + } + return out + } + + internal fun gameCount(library: File): Int { + val steamapps = File(library, "steamapps") + val manifests = steamapps.list()?.count { it.startsWith("appmanifest_") && it.endsWith(".acf") } ?: return 0 + return manifests + depotInstalls(File(steamapps, "common")).size + } + + /** Finished downloads another client left without a Steam manifest; the importer registers them from depot.config. */ + fun depotInstalls(common: File): List<File> { + val managed = AddedGames.steamInstallDirs(common) + return common.listFiles { f -> + f.isDirectory && f.name.lowercase() !in managed && + File(f, ".download_complete").isFile && depotRecord(File(f, ".DepotDownloader")) + }.orEmpty().sortedBy { it.name.lowercase() } + } + + private fun depotRecord(dir: File): Boolean = File(dir, "depot.config").isFile || + File(dir, "completed").list()?.any { it.matches(Regex("\\d+_\\d+\\.manifest")) } == true + + fun rename(context: Context, id: String, label: String) { + val name = clean(label).takeIf { it.isNotEmpty() } ?: return + synchronized(lock) { save(context, list(context).map { if (it.id == id) Entry(it.id, it.path, name) else it }) } + } + + /** Forgets the library; its folder and games stay where they are. */ + fun remove(context: Context, id: String) { + synchronized(lock) { save(context, list(context).filterNot { it.id == id }) } + } + + fun defaultLabel(context: Context, picked: File): String { + val folder = File(storagePath(picked.path)) + val volume = try { + context.getSystemService(StorageManager::class.java)?.getStorageVolume(folder)?.getDescription(context) + } catch (e: Exception) { + null + } + val parent = folder.parentFile + val named = if (folder.name.equals("Steam", true) && parent != null && !volumeRoot(parent)) parent else folder + val name = named.name.ifEmpty { context.getString(R.string.gstore_folder) } + return clean(if (volume.isNullOrBlank()) name else context.getString(R.string.gstore_folder_on_volume, name, volume)) + } + + private fun volumeRoot(dir: File): Boolean = dir.parent in setOf("/storage", "/mnt/media_rw", "/storage/emulated") || dir.parent == null + + internal fun overlaps(a: String, b: String): Boolean = a == b || a.startsWith("$b/") || b.startsWith("$a/") + + private fun storagePath(path: String): String = if (path.startsWith("/mnt/media_rw/")) "/storage/" + path.removePrefix("/mnt/media_rw/") else path + + private fun canonical(file: File): String = storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) + + private const val SCAN_DEPTH = 2 + private const val SCAN_LIMIT = 4000 +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamWebLogin.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamWebLogin.kt new file mode 100644 index 0000000000..356df06f72 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamWebLogin.kt @@ -0,0 +1,70 @@ +package com.droiddeck.launcher.session + +import android.database.sqlite.SQLiteDatabase +import java.io.File +import javax.crypto.Cipher +import javax.crypto.SecretKeyFactory +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.PBEKeySpec +import javax.crypto.spec.SecretKeySpec + +data class WebCookie(val host: String, val header: String) + +object SteamWebLogin { + val HOSTS = listOf("steamcommunity.com", "steam-chat.com") + private const val COOKIES = "config/htmlcache/Default/Cookies" + private const val V10 = "v10" + private const val HOST_HASH_VERSION = 24 + private const val HOST_HASH_BYTES = 32 + + private val key: SecretKeySpec by lazy { + val spec = PBEKeySpec("peanuts".toCharArray(), "saltysalt".toByteArray(), 1, 128) + SecretKeySpec(SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1").generateSecret(spec).encoded, "AES") + } + + internal fun decrypt(encrypted: ByteArray, hostHashed: Boolean): String? = runCatching { + if (encrypted.size <= V10.length || String(encrypted, 0, V10.length, Charsets.US_ASCII) != V10) return null + val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding") + cipher.init(Cipher.DECRYPT_MODE, key, IvParameterSpec(ByteArray(16) { ' '.code.toByte() })) + val plain = cipher.doFinal(encrypted, V10.length, encrypted.size - V10.length) + val value = if (hostHashed && plain.size >= HOST_HASH_BYTES) plain.copyOfRange(HOST_HASH_BYTES, plain.size) else plain + String(value, Charsets.UTF_8) + }.getOrNull() + + internal fun header(name: String, value: String, httpOnly: Boolean): String { + val v = if (name == "steamLoginSecure") value.replace("||", "%7C%7C") else value + return "$name=$v; Path=/; Secure" + if (httpOnly) "; HttpOnly" else "" + } + + fun read(runtimeRoot: File, client: String?, scratch: File): List<WebCookie> { + val homes = client?.let { listOf(if (it == "x86_64") SteamDownloadMonitor.STEAM_HOMES[1] else SteamDownloadMonitor.STEAM_HOMES[0]) } + ?: SteamDownloadMonitor.STEAM_HOMES + val store = homes.map { File(runtimeRoot, "$it/$COOKIES") }.filter { it.isFile }.maxByOrNull { it.lastModified() } + ?: return emptyList() + scratch.deleteRecursively() + if (!scratch.mkdirs()) return emptyList() + return try { + val copy = File(scratch, "Cookies") + store.copyTo(copy, overwrite = true) + File(store.path + "-journal").takeIf { it.length() > 0L }?.copyTo(File(scratch, "Cookies-journal"), overwrite = true) + SQLiteDatabase.openDatabase(copy.path, null, SQLiteDatabase.OPEN_READWRITE).use { db -> + val version = db.rawQuery("SELECT value FROM meta WHERE key = 'version'", null).use { if (it.moveToFirst()) it.getString(0).toIntOrNull() else null } ?: 0 + val marks = HOSTS.joinToString { "?" } + db.rawQuery("SELECT host_key, name, value, encrypted_value, is_httponly FROM cookies WHERE host_key IN ($marks)", HOSTS.toTypedArray()).use { c -> + val out = ArrayList<WebCookie>() + while (c.moveToNext()) { + val name = c.getString(1) + val value = c.getString(2).takeUnless { it.isNullOrEmpty() } + ?: decrypt(c.getBlob(3) ?: continue, version >= HOST_HASH_VERSION) ?: continue + out += WebCookie(c.getString(0), header(name, value, c.getInt(4) != 0)) + } + out + } + } + } catch (_: Exception) { + emptyList() + } finally { + scratch.deleteRecursively() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/TelemetryOutput.kt b/app/src/main/java/com/droiddeck/launcher/session/TelemetryOutput.kt new file mode 100644 index 0000000000..b3d8841488 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/TelemetryOutput.kt @@ -0,0 +1,110 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.frontend.Library +import java.io.File + +object TelemetryOutput { + data class Game(val name: String, val prefixId: String, val file: File, val on: Boolean) + + data class MenuGame(val name: String, val setting: String, val port: Int) + + val MENU_GAMES: Map<Int, MenuGame> = mapOf( + 1293830 to MenuGame("Forza Horizon 4", "Data Out", GameTelemetry.FORZA_PORT), + 1551360 to MenuGame("Forza Horizon 5", "Data Out", GameTelemetry.FORZA_PORT), + 2440510 to MenuGame("Forza Motorsport", "Data Out", GameTelemetry.FORZA_PORT), + 284160 to MenuGame("BeamNG.drive", "OutGauge", GameTelemetry.OUTGAUGE_PORT), + ) + + internal const val ORIGINAL_SUFFIX = ".droiddeck-original" + private const val MY_GAMES = "pfx/drive_c/users/steamuser/Documents/My Games" + private const val CONFIG = "hardwaresettings/hardware_settings_config.xml" + private const val ADDRESS = "127.0.0.1" + private const val EXTRADATA = "3" + private val TAGS = listOf("udp", "motion") + private val BYTES = Charsets.ISO_8859_1 + + fun scan(compatdata: List<File>): List<Game> = compatdata.asSequence() + .flatMap { root -> root.listFiles { f -> f.isDirectory }.orEmpty().asSequence() } + .flatMap { prefix -> File(prefix, MY_GAMES).listFiles { f -> f.isDirectory }.orEmpty().asSequence().map { prefix to it } } + .mapNotNull { (prefix, game) -> + val file = File(game, CONFIG) + val text = runCatching { file.readText(BYTES) }.getOrNull() ?: return@mapNotNull null + val element = element(text) ?: return@mapNotNull null + Game(game.name, prefix.name, file, pointsHere(element.value)) + } + .sortedBy { it.name.lowercase() } + .toList() + + fun set(game: Game, on: Boolean): Boolean = runCatching { + val file = game.file + val original = File(file.path + ORIGINAL_SUFFIX) + val xml = file.readText(BYTES) + val next = if (on) { + if (!original.exists()) file.copyTo(original) + turnedOn(xml) + } else { + turnedOff(xml, original.takeIf { it.isFile }?.readText(BYTES)) + } + checkNotNull(next) + val tmp = File(file.path + ".droiddeck-tmp") + tmp.writeText(next, BYTES) + check(tmp.renameTo(file)) + if (!on) original.delete() + true + }.getOrDefault(false) + + fun applyAutomatic(context: Context, running: String?) { + if (!SessionPrefs.telemetryAuto(context)) return + automaticTargets(scan(Library.compatdataDirs(context)), SessionPrefs.telemetryOff(context), running).forEach { set(it, true) } + } + + internal fun key(game: Game) = "${game.prefixId}/${game.name}" + + internal fun automaticTargets(games: List<Game>, off: Set<String>, running: String?): List<Game> = + games.filter { !it.on && key(it) !in off && !isRunning(it.prefixId, running) } + + internal fun restoreTargets(games: List<Game>, running: String?): List<Game> = + games.filter { File(it.file.path + ORIGINAL_SUFFIX).isFile && !isRunning(it.prefixId, running) } + + internal fun isRunning(prefixId: String, running: String?): Boolean { + val id = running?.toLongOrNull() ?: return running != null + return prefixId == id.toString() || prefixId == id.toInt().toString() + } + + internal fun element(xml: String): MatchResult? = TAGS.firstNotNullOfOrNull { tag -> tagRegex(tag).find(xml) } + + internal fun pointsHere(element: String): Boolean = + attr(element, "enabled") == "true" && attr(element, "ip") == ADDRESS && + attr(element, "port") == GameTelemetry.CODEMASTERS_PORT.toString() && + (attr(element, "extradata") ?: EXTRADATA) == EXTRADATA + + internal fun turnedOn(xml: String): String? { + val element = element(xml) ?: return null + var on = withAttr(element.value, "enabled", "true") + on = withAttr(on, "ip", ADDRESS) + on = withAttr(on, "port", GameTelemetry.CODEMASTERS_PORT.toString()) + if (attr(on, "extradata") != null) on = withAttr(on, "extradata", EXTRADATA) + return xml.replaceRange(element.range, on) + } + + internal fun turnedOff(xml: String, original: String?): String? { + val element = element(xml) ?: return null + val tag = element.value.drop(1).takeWhile { !it.isWhitespace() } + val before = original?.let { tagRegex(tag).find(it)?.value } + return xml.replaceRange(element.range, before ?: withAttr(element.value, "enabled", "false")) + } + + internal fun attr(element: String, name: String): String? = + Regex("\\s$name=\"([^\"]*)\"").find(element)?.groupValues?.get(1) + + internal fun withAttr(element: String, name: String, value: String): String { + val existing = Regex("(\\s$name=\")[^\"]*\"") + if (existing.containsMatchIn(element)) return existing.replace(element) { it.groupValues[1] + value + "\"" } + val selfClosing = element.endsWith("/>") + val body = element.dropLast(if (selfClosing) 2 else 1).trimEnd() + return "$body $name=\"$value\"" + if (selfClosing) " />" else ">" + } + + private fun tagRegex(tag: String) = Regex("<$tag\\s[^>]*>") +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/VacDiagnostics.kt b/app/src/main/java/com/droiddeck/launcher/session/VacDiagnostics.kt index 2f0d03c280..e38d1c454b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/VacDiagnostics.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/VacDiagnostics.kt @@ -10,17 +10,9 @@ import java.text.SimpleDateFormat import java.util.Date import java.util.Locale -/** - * Source games state VAC-secure or insecure only in their console, which reaches a file (console.log in the - * mod folder) only with -condebug. The report quotes the lines it found and says inconclusive rather than guessing. - */ object VacDiagnostics { private const val TAG = "VacDiagnostics" - /** - * Checked by the launch wrapper. Lines: session start (epoch seconds), the Steam client it ran, then - * "length<tab>canonical path" for each console.log already there. - */ private const val MARKER = "root/.droiddeck-vac-diagnostics" private const val LAUNCHES = "root/.droiddeck-vac-launches" @@ -30,7 +22,6 @@ object VacDiagnostics { private const val MAX_QUOTED = 40 private val INSECURE = Regex("insecure mode", RegexOption.IGNORE_CASE) - // "Connecting to" is only an attempt: L4D2 refuses a VAC server with a dialog that never reaches the console. private val CONNECTED = Regex("^Connected to", RegexOption.IGNORE_CASE) private val ATTEMPTED = Regex("^Connecting to", RegexOption.IGNORE_CASE) private val NOTABLE = Regex("\\bVAC\\b|secure|Connected to|Connecting to|Disconnect|challenge|game coordinator", RegexOption.IGNORE_CASE) @@ -45,7 +36,6 @@ object VacDiagnostics { File(root, LAUNCHES).delete() if (enabled(context)) { val arch = SessionPrefs.steamClientArch(context) - // -condebug appends, so each console.log's length now is where this session's lines start. val sizes = consoleLogs(context, arch).joinToString("") { "${it.length()}\t${canonical(it)}\n" } marker.writeText("${System.currentTimeMillis() / 1000}\n$arch\n$sizes") } else marker.delete() @@ -57,7 +47,6 @@ object VacDiagnostics { private const val SNAPSHOT_MARKER = ".vac-marker" private const val SNAPSHOT_LAUNCHES = ".vac-launches" - /** Call when a session stops, before the next [arm] replaces its marker and launch list. */ fun snapshot(context: Context, dir: File) { val root = LinuxRuntime.rootDir(context) try { @@ -145,7 +134,6 @@ object VacDiagnostics { "Inconclusive - the game never connected to a server. Join a VAC-secured server, then check again." } - /** Source writes <game>/<mod>/console.log, Source 2 <game>/game/<mod>/console.log. */ private fun consoleLogs(context: Context, arch: String): List<File> { val found = LinkedHashMap<String, File>() for (library in libraryRoots(context, arch)) { @@ -176,7 +164,6 @@ object VacDiagnostics { return roots.filter { it.isDirectory }.distinctBy { runCatching { it.canonicalPath }.getOrDefault(it.path) } } - /** Two libraries can hold the same game and mod folder; a repeated name takes a tag from the log's path. */ internal fun consoleNames(logs: List<File>): List<String> { val used = HashSet<String>() return logs.map { log -> diff --git a/app/src/main/java/com/droiddeck/launcher/session/VideoEncodeBridge.kt b/app/src/main/java/com/droiddeck/launcher/session/VideoEncodeBridge.kt index 8e4b247307..b7cc20a439 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/VideoEncodeBridge.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/VideoEncodeBridge.kt @@ -4,7 +4,6 @@ import android.util.Log import com.droiddeck.launcher.core.SessionPart import java.io.File -/** Steam's Remote Play V4L2 encoder in the guest talks to this MediaCodec encoder (venc.c, venc_server.cpp). */ class VideoEncodeBridge(val socket: File) : SessionPart() { override fun start() { socket.parentFile?.mkdirs() diff --git a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt index 4b355caa40..21398bc4c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt @@ -103,11 +103,6 @@ object WinComponents { const val VCREDIST_ARM64 = "vcredist2022_arm64" - /** - * The ARM64 Visual C++ 2015-2022 runtime as registry values only (the version a 14.44.35211 installer writes, in both - * registry views). Xbox games' launchers running as ARM64EC check for it; Wine's own CRT does the work. Same approach as - * MGamer404's Bannerlator #627. Used until the catalog carries a component of this name. - */ internal fun builtInArm64Runtime(): Component { fun value(view: String, name: String, type: String, data: String) = Step("set_register_key", JSONObject() .put("action", "set_register_key").put("key", "HKLM\\Software\\${view}Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\arm64") @@ -388,7 +383,6 @@ object WinComponents { val archiveName = archive.optString("name") val url = c.snapshot.substringBeforeLast('/') + "/" + archiveName val file = File(work, "${c.name}.files.tar.xz") - // The snapshot came straight from github.com, so its digest may vouch for a mirror's copy of the archive. val sha = archive.optString("sha256").takeIf { it.matches(Regex("(?i)[0-9a-f]{64}")) } if (!Downloader.downloadFile(url, file, false, sha) { f -> onProgress(Progress(c.name, archiveName, Phase.DOWNLOAD, if (f < 0) -1 else Math.round(f * 100f))) }) { return null to "download failed: $archiveName" diff --git a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt index 9697addd64..de3648e83c 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/SteamStorage.kt @@ -48,7 +48,6 @@ object SteamStorage { ) } - /** The folder alone does not mean installed: Decky's CEF marker creates it. */ fun x64ClientPresent(root: File): Boolean = File(root, "steamrt64/steam").isFile || File(root, "package/droiddeck-installed").isFile || File(root, "steamapps").isDirectory @@ -58,7 +57,6 @@ object SteamStorage { private val PENDING_MANIFEST = Regex("appmanifest_(\\d+)\\.acf\\..+") - // A partial download has no manifest yet, only a temporary one and its staging folder. fun manifests(library: File): Listing? { val apps = File(library, "steamapps") val names = apps.list() ?: return null @@ -91,8 +89,6 @@ object SteamStorage { enum class Kind { ARM_PROTON, REQUIRED, OLD_RUNTIME, X86_PROTON } - // DroidDeck's ARM64 Steam client cannot run Valve's x86 Protons, and its own Proton and FEX tools - // replace the scout and soldier container runtimes. fun kind(m: Manifest): Kind { val dir = m.installDir.orEmpty() return when { @@ -146,7 +142,6 @@ object SteamStorage { private val ARM_IN_NAME = Regex("arm64|aarch64") - // The x86-64 client ignores tools named for arm64; droiddeck-steam-x64 names its wrappers with a64 instead. fun x64ToolName(name: String): String = name.replace(ARM_IN_NAME, "a64") class ToolUse(val mappings: Map<String, String>, val installed: Set<String>, val x64: Boolean = false) { diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt index aa0a76cb25..9c5fff91a9 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt @@ -89,7 +89,6 @@ object StorageScan { fun measure(file: File): Long = size(file).also { known[file.path] = it } } - // Proton tools' files live only in the arm64 client's root; the x86-64 client has wrappers of them. fun steamRoot(context: Context) = SessionPrefs.steamRoot(context, "arm64") fun scan(context: Context): StorageReport { @@ -113,7 +112,6 @@ object StorageScan { Library.steamLibraries(context, arch).map { (root, label) -> val internal = canonical(root) == primary val data = if (internal) root else SecondaryLibrary.privateRoot(files, root) - // The x86-64 card folder and its steamapps appear only with that client's first session and library write. val listing = SteamStorage.manifests(root) ?: SteamStorage.Listing(emptyList(), emptySet(), true).takeIf { x64 && (if (internal) !File(root, "steamapps").exists() else !root.exists() && root.parentFile?.isDirectory == true) @@ -127,7 +125,6 @@ object StorageScan { .filter { !SteamStorage.isTool(it) && it.installed }.map { it.appId.toString() }.toSet() val armUse = runCatching { SteamStorage.compatMappings(File(steamRoot, "config/config.vdf").readText()) }.getOrNull() ?.let { SteamStorage.ToolUse(it, installedGames(false)) } - // An x86-64 client without a config.vdf has never mapped a game to anything. val x64Vdf = x64Root?.let { File(it, "config/config.vdf") } val x64Use = if (x64Vdf == null || !x64Vdf.exists()) SteamStorage.ToolUse(emptyMap(), emptySet(), x64 = true) else runCatching { SteamStorage.ToolUse(SteamStorage.compatMappings(x64Vdf.readText()), installedGames(true), x64 = true) }.getOrNull() diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt index f7086336ec..503e769be7 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt @@ -115,7 +115,6 @@ object StorageState { }, "storage-remove-tool").start() } - // Every action works from a fresh scan so nothing is deleted on the strength of an older one. private fun act(context: Context, name: String, action: (Context, StorageReport) -> Boolean, onDone: (Long?) -> Unit = {}) { if (cleaning || SessionState.running) { onDone(null); return } val app = context.applicationContext @@ -134,7 +133,6 @@ object StorageState { }, "storage-$name").start() } - // A game can be installed in both Steam clients, and an id can be left over in several libraries. fun clearShaders(context: Context, appId: Int, x64: Boolean = false) = act(context, "shaders-$appId", { _, fresh -> val dir = fresh.games.firstOrNull { it.appId == appId && it.x64 == x64 }?.shaderDir ?: return@act false FileOps.delete(dir) @@ -204,7 +202,6 @@ object StorageState { } } - // Steam treats an app as installed while its manifest exists, so the manifest goes first. private fun deleteTool(tool: ToolUsage) { tool.manifests.forEach { check(!it.exists() || it.delete()) { "cannot delete $it" } } tool.dirs.forEach { FileOps.delete(it) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt index 9dfc6b6658..2b52fe3587 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt @@ -12,10 +12,6 @@ object CloudSavePaths { class GogCloudLocation(val name: String, val template: String) - /** - * cloudStorage.enabled with an empty locations list is Galaxy SDK IStorage, whose objects the - * API names under a location called `__default`. - */ fun gogSaveFromRemote(enabled: Boolean, locations: List<Pair<String, String>>, clientId: String): GogCloudLocation? { if (!enabled) return null val named = locations.filter { it.second.isNotEmpty() } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index 659ae7005c..2af7a9bff4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -87,7 +87,7 @@ object CloudSaves { val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> "" + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> "" } ?: return null p.edit() .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) @@ -131,10 +131,6 @@ object CloudSaves { } } - /** - * The selected cloud location's name: GOG prefixes every cloud file with it, and the local folder - * is the location itself. Older builds had no name cached; fetch it once for those. - */ private fun gogLocationName(context: Context, id: String, folder: File): String? { val p = GogPrefs.get(context) p.getString("cloud_location_$id", null)?.ifEmpty { null }?.let { return it } @@ -152,7 +148,7 @@ object CloudSaves { val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> null } return dir to (if (dir == null) "unresolved" else "ok") } @@ -177,7 +173,7 @@ object CloudSaves { val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET -> null } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { @@ -194,11 +190,6 @@ object CloudSaves { internal class Migration(val baseline: Map<String, CloudPlan.Entry>, val moved: Int, val cleaned: Int, val failed: Int) - /** - * Moves only files whose `"<location>/<path>"` key proves the old mapping wrote them; anything - * the game itself created under that name is left where it is. Identical duplicates are removed - * only when they prove the same. The name must be one path segment: it comes from remote config. - */ internal fun migrateNested(dir: File, name: String, base: Map<String, CloudPlan.Entry>): Migration? { if (name.isEmpty() || name == "." || name == ".." || name.contains('/') || name.contains('\\')) return null val nested = File(dir, name) @@ -254,8 +245,6 @@ object CloudSaves { private fun migrateGogNested(context: Context, id: String, folder: File, dir: File) { val p = GogPrefs.get(context) - // Run once per game: after this the flat layout is authoritative, even if the game itself - // keeps a folder named like the cloud location. if (p.getInt("cloud_layout_$id", 0) >= CLOUD_LAYOUT) return val name = gogLocationName(context, id, folder) ?: return val base = baseline(context, Store.GOG, id).orEmpty() @@ -281,9 +270,6 @@ object CloudSaves { fun upload(context: Context, store: Store, id: String, force: Boolean = false): Result = sync(context, store, id, "up") { dir, cloud -> upWith(context, store, id, dir, cloud, force) } - fun keepCloud(context: Context, store: Store, id: String): Result = download(context, store, id, force = true) - fun keepLocal(context: Context, store: Store, id: String): Result = upload(context, store, id, force = true) - fun downloadOrDefer(context: Context, store: Store, id: String): Result = downloadOrDefer(context, store, id, Executor { Thread(it, "cloud-deferred").start() }) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt index 9c32bd4c1a..3d46a28da7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt @@ -47,7 +47,6 @@ internal fun gunzip(data: ByteArray): ByteArray? = try { java.util.zip.GZIPInputStream(data.inputStream()).use { it.readBytes() } } catch (e: Exception) { null } -/** Same gzip GOG uses on PUT: deflate level 6, mtime 0, OS Unix. */ internal fun gzipGogPut(data: ByteArray): ByteArray { val deflater = Deflater(6, true) val raw = ByteArrayOutputStream() @@ -98,17 +97,14 @@ internal fun isoDate(s: String?): Long { class NoCloudSaves : Exception("no cloud saves") -/** GOG cloud names are `<location name>/<path under that location>`; the name is not part of the folder. */ internal fun splitGogName(name: String): Pair<String?, String> { val slash = name.indexOf('/') return if (slash <= 0 || slash == name.length - 1) null to name else name.substring(0, slash) to name.substring(slash + 1) } -/** Maps cloud names to paths under the selected location's folder; the chosen location name is returned. */ internal fun gogRelativeNames(files: List<CloudFile>, location: String?): Pair<String?, List<CloudFile>> { val locations = files.mapNotNull { splitGogName(it.name).first }.distinct() - // Only infer a location when every name is prefixed; a mixed listing keeps its old shape. val allPrefixed = files.isNotEmpty() && files.all { splitGogName(it.name).first != null } val chosen = when { location != null && (location in locations || allPrefixed) -> location @@ -167,10 +163,6 @@ class GogCloud( return relative(raw) } - /** - * The API names every file `<location>/<path>`. The location's folder is the sync root, so the - * first segment is dropped. Older builds kept it, writing saves one folder too deep. - */ private fun relative(raw: List<CloudFile>): List<CloudFile> { val (chosen, files) = gogRelativeNames(raw, location) prefix = chosen?.let { "$it/" } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt b/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt index 01c7eebcf4..89b393654f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt @@ -12,7 +12,6 @@ import javax.crypto.spec.GCMParameterSpec object CredentialCipher { const val VERSION = 1 - /** Sealed with the hardware-keystore (TEE) key; [VERSION] envelopes keep opening with the older, possibly StrongBox, key. */ const val VERSION_TEE = 2 const val ALG = "AES/GCM" private const val TRANSFORMATION = "AES/GCM/NoPadding" @@ -23,7 +22,6 @@ object CredentialCipher { fun existing(): SecretKey = key() - /** Key for [VERSION] envelopes written before [VERSION_TEE]. */ fun legacy(): SecretKey = existing() val version: Int get() = VERSION @@ -35,8 +33,6 @@ object CredentialCipher { e is android.security.keystore.KeyPermanentlyInvalidatedException || e is KeyMissing || e is org.json.JSONException || e is IllegalArgumentException - // StrongBox took over 10 s per Xbox credential write on a tester's phone, past the backend's - // 10 s reply timeout, so new writes use a TEE key. The old alias stays readable. object Keystore : KeyProvider { private const val LEGACY_ALIAS = "droiddeck-store-credentials" private const val ALIAS = "droiddeck-store-credentials-tee" diff --git a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt index 79ca0f8492..4e53c5ea08 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -12,11 +12,13 @@ internal object LoginFlows { Store.GOG -> GogFlow(state, browserUserAgent) Store.EPIC -> epicFlow() Store.AMAZON -> amazonFlow() + Store.GAMEJOLT -> gameJoltFlow(browserUserAgent) Store.ITCH, Store.XBOX, Store.BATTLENET -> null } @Volatile var epicFlow: () -> StoreLoginActivity.Flow? = { null } @Volatile var amazonFlow: () -> StoreLoginActivity.Flow? = { null } + @Volatile var gameJoltFlow: (String) -> StoreLoginActivity.Flow? = { null } private class GogFlow(private val state: String, override val userAgent: String) : StoreLoginActivity.Flow { override val startUrl: String get() = GogAuth.authUrl(state) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt b/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt index 0cc03b7028..ced9ae8fb2 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt @@ -92,6 +92,28 @@ object SteamLiveShortcuts { if (evaluate(context, js) != null) Log.i(TAG, "live shortcuts: updated $id") } + fun launchOptions(context: Context, appId: Long): String? { + if (!clientRunning()) return null + val js = """ + new Promise(done => { + let handle = null, answer; + const finish = d => { clearTimeout(timer); try { handle?.unregister(); } catch (e) {} done(d); }; + const timer = setTimeout(() => finish(null), 4000); + handle = SteamClient.Apps.RegisterForAppDetails(${appId and 0xFFFFFFFFL}, d => { answer = d; if (handle) finish(d); }); + if (answer !== undefined) finish(answer); + }).then(d => typeof d?.strLaunchOptions === 'string' ? d.strLaunchOptions : null) + """.trimIndent() + return evaluate(context, js) + } + + fun setLaunchOptions(context: Context, appId: Long, options: String): Boolean { + if (!clientRunning()) return false + val id = appId and 0xFFFFFFFFL + val done = evaluate(context, "(async () => { SteamClient.Apps.SetAppLaunchOptions($id, ${JSONObject.quote(options)}); return 1; })()") != null + if (done) Log.i(TAG, "live: launch options for $id") + return done + } + fun setArt(context: Context, appId: Long, assetType: Int?, file: java.io.File?, iconPath: String? = null) { if (!clientRunning()) return val id = appId and 0xFFFFFFFFL @@ -108,7 +130,6 @@ object SteamLiveShortcuts { if (evaluate(context, js) != null) Log.i(TAG, "live shortcuts: art $assetType for $id") } - /** Moves and resizes a game's logo in the running client; with null the client's default position comes back. */ fun setLogoPosition(context: Context, appId: Long, position: LogoPosition.Value?) { if (!clientRunning()) return val id = appId and 0xFFFFFFFFL diff --git a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt index 54476b6e19..b7d0fbce1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt @@ -5,9 +5,12 @@ enum class Store(val id: String, val label: String, val shortLabel: String) { EPIC("epic", "Epic Games", "Epic"), AMAZON("amazon", "Amazon Games", "Amazon"), XBOX("xbox", "Xbox", "Xbox"), - ITCH("itch", "itch.io", "itch"), + ITCH("itch", "Itch.io", "Itch.io"), + GAMEJOLT("gamejolt", "Game Jolt", "Game Jolt"), BATTLENET("battlenet", "Battle.net", "Battle.net"); + val folder: String get() = if (this == ITCH) "itch" else shortLabel + companion object { fun byId(id: String?): Store? = entries.firstOrNull { it.id == id } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt index f69380f7c4..5de9b5e1ab 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt @@ -95,7 +95,6 @@ object StoreAccounts { return json.optString("display_name", "").ifEmpty { json.optString("username", "") }.ifEmpty { store.label } } - /** The name the Stores page shows. Xbox shows the gamertag, else the sign-in email with its name part masked. */ fun displayName(context: Context, store: Store): String? { if (store != Store.XBOX) return signedInAs(context, store) val json = read(context, store) ?: return if (isUnavailable(store)) store.label else null diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreArchiveUnpacker.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreArchiveUnpacker.kt new file mode 100644 index 0000000000..ef355cc038 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreArchiveUnpacker.kt @@ -0,0 +1,231 @@ +package com.droiddeck.launcher.stores + +import android.content.Context +import com.droiddeck.launcher.runtime.GuestCommand +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.itch.ItchArchives +import org.apache.commons.compress.MemoryLimitException +import org.apache.commons.compress.archivers.sevenz.SevenZFile +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream +import org.apache.commons.compress.archivers.zip.ZipFile +import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream +import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream +import org.apache.commons.compress.compressors.xz.XZCompressorInputStream +import java.io.BufferedInputStream +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.nio.file.Files +import java.util.concurrent.atomic.AtomicBoolean + +internal class StoreArchiveUnpacker( + private val app: Context, + private val cancelled: AtomicBoolean, + private val label: String, + private val unsupported: Int, + private val extractFailed: Int, + private val logName: String, +) { + var work: File = File("") + + fun unpack(archive: File, filename: String, handle: DownloadQueue.JobHandle) { + when (val kind = ItchArchives.kind(archive, filename)) { + "zip" -> unzip(archive, handle) + "7z" -> try { + sevenZip(archive, handle) + } catch (e: MemoryLimitException) { + handle.log("$label: ${archive.name} needs more memory than the app has, unpacking it in the runtime") + unrar(archive, handle, kind) + } + "rar" -> unrar(archive, handle, kind) + "exe" -> copy(archive, File(work, filename.ifBlank { "game.exe" })) + "tar" -> untar(archive, null, handle) + "gz", "bz2", "xz" -> untar(archive, kind, handle) ?: single(archive, kind, handle) + else -> copy(archive, File(work, filename.ifBlank { "game" })) + } + } + + private fun target(name: String): File? { + val file = File(work, name.replace('\\', '/')) + val root = work.canonicalPath + val path = file.canonicalPath + return if (path == root || path.startsWith(root + File.separator)) file else null + } + + private fun unrar(archive: File, handle: DownloadQueue.JobHandle, kind: String) { + if (!LinuxRuntime.isInstalled(app)) throw IllegalStateException(app.getString(unsupported, kind)) + val binds = if (listOf(app.filesDir, app.cacheDir).any { work.absolutePath.startsWith(it.absolutePath + "/") }) null + else listOf(work.absolutePath) + fun bsdtar(args: List<String>, onLine: (String) -> Unit) = + GuestCommand.run(app, listOf("/usr/bin/bsdtar") + args, logName = logName, extraBinds = binds, fastPath = true, cancelled = cancelled) { line -> + if (!line.startsWith("proot ")) onLine(line) + } + var entries = 0L + bsdtar(listOf("-tf", archive.absolutePath)) { entries++ } + var done = 0L + val tail = ArrayDeque<String>() + val code = bsdtar(listOf("-xvf", archive.absolutePath, "-C", work.absolutePath)) { line -> + if (line.startsWith("x ")) handle.stageProgress(++done, entries) else { + if (tail.size == 5) tail.removeFirst() + tail.addLast(line) + } + } + if (cancelled.get()) return + if (code != 0) { + handle.log("$label: bsdtar exited $code: ${tail.joinToString(" | ")}") + throw IllegalStateException(app.getString(extractFailed, code)) + } + } + + private fun sevenZip(archive: File, handle: DownloadQueue.JobHandle) { + val total = archive.length() + var written = 0L + val buffer = ByteArray(64 * 1024) + val limitKb = (Runtime.getRuntime().maxMemory() / 4 / 1024).coerceIn(32L * 1024, Int.MAX_VALUE.toLong()).toInt() + Files.newByteChannel(archive.toPath()).use { channel -> + SevenZFile.builder().setSeekableByteChannel(channel).setMaxMemoryLimitKb(limitKb).get().use { seven -> + while (true) { + if (cancelled.get()) return + val entry = seven.nextEntry ?: break + val file = target(entry.name) + if (file == null) { + handle.log("$label: skipped an entry outside the game folder") + continue + } + if (entry.isDirectory) { + file.mkdirs() + continue + } + file.parentFile?.mkdirs() + FileOutputStream(file).use { out -> + while (true) { + if (cancelled.get()) return + val read = seven.read(buffer, 0, buffer.size) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + } + + private fun untar(archive: File, codec: String?, handle: DownloadQueue.JobHandle): Unit? { + val total = archive.length() + var written = 0L + var entries = 0 + val buffer = ByteArray(64 * 1024) + val opened = runCatching { + FileInputStream(archive).use { raw -> + val stream = when (codec) { + "gz" -> GzipCompressorInputStream(BufferedInputStream(raw)) + "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) + "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) + else -> BufferedInputStream(raw) + } + stream.use { input -> + TarArchiveInputStream(input).use { tar -> + while (true) { + if (cancelled.get()) return null + val entry = tar.nextEntry ?: break + entries++ + val file = target(entry.name) + if (file == null) { + handle.log("$label: skipped an entry outside the game folder") + continue + } + if (entry.isDirectory) { + file.mkdirs() + continue + } + file.parentFile?.mkdirs() + FileOutputStream(file).use { out -> + while (true) { + if (cancelled.get()) return null + val read = tar.read(buffer, 0, buffer.size) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + } + true + } + if (opened.isSuccess && entries > 0) return Unit + if (opened.isFailure && codec == null) throw opened.exceptionOrNull() ?: IllegalStateException("tar") + return null + } + + private fun single(archive: File, codec: String, handle: DownloadQueue.JobHandle) { + val name = archive.name.substringBeforeLast('.') + val file = target(name.ifBlank { "game" }) ?: throw IllegalStateException("archive") + file.parentFile?.mkdirs() + val total = archive.length() + var written = 0L + val buffer = ByteArray(64 * 1024) + FileInputStream(archive).use { raw -> + val stream = when (codec) { + "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) + "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) + else -> GzipCompressorInputStream(BufferedInputStream(raw)) + } + stream.use { input -> + FileOutputStream(file).use { out -> + while (true) { + if (cancelled.get()) return + val read = input.read(buffer) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + + private fun copy(source: File, target: File) { + target.parentFile?.mkdirs() + FileInputStream(source).use { input -> FileOutputStream(target).use { out -> input.copyTo(out, 128 * 1024) } } + } + + private fun unzip(archive: File, handle: DownloadQueue.JobHandle) { + val total = archive.length() + var written = 0L + val buffer = ByteArray(64 * 1024) + ZipFile.builder().setFile(archive).get().use { zip -> + for (entry in zip.entries) { + if (cancelled.get()) return + val target = target(entry.name) + if (target == null) { + handle.log("$label: skipped an entry outside the game folder") + continue + } + if (entry.isDirectory) { + target.mkdirs() + continue + } + target.parentFile?.mkdirs() + zip.getInputStream(entry).use { input -> + FileOutputStream(target).use { out -> + while (true) { + if (cancelled.get()) return + val read = input.read(buffer) + if (read < 0) break + out.write(buffer, 0, read) + written += read + handle.stageProgress(written, total) + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreArt.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreArt.kt index 14415fd9c6..2b86be8b2b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreArt.kt @@ -29,7 +29,6 @@ object StoreArt { return writeLogo(get(url) ?: return false, dst) } - /** A logo is drawn over the hero, so it stays a PNG with its transparency instead of going through [place]. */ internal fun writeLogo(bytes: ByteArray, dst: File): Boolean { if (dst.isFile && dst.length() > 0) return true val bitmap = runCatching { BitmapFactory.decodeByteArray(bytes, 0, bytes.size) }.getOrNull() ?: return false diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt index 967e56ca7b..ad59e511a0 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt @@ -26,7 +26,6 @@ data class CatalogItem( val logoUrl: String? = null, ) { val accessible: Boolean get() = owned || subscription - /** Licensed now, or a supported package the account's subscription can install. */ val installable: Boolean get() = accessible || includedWith.isNotBlank() val isDiscounted: Boolean get() = discountPercent > 0 && originalPrice.isNotBlank() val key: String get() = "${store.id}:$id" @@ -95,7 +94,6 @@ internal fun <T> retainOrder(items: List<T>, previous: List<T>, key: (T) -> Stri return previous.map { byKey.getValue(key(it)) } } -/** A detail page opens for search results too; the library wins when it already knows the product. */ fun detailCatalogItem( store: Store, id: String, @@ -114,11 +112,6 @@ fun mergeItems(old: List<CatalogItem>?, new: List<CatalogItem>): List<CatalogIte return if (merged.size == old.size && merged.indices.all { merged[it] === old[it] }) old else merged } -/** - * [patched] over [old] by key, the way a store that fills its cards in one at a time needs it: a card - * already on screen keeps its very object and its place, one the grid does not have yet is added where - * its title belongs. Unlike [mergeItems] the rest of [old] is never dropped. - */ fun patchItems(old: List<CatalogItem>?, patched: List<CatalogItem>): List<CatalogItem> { if (old.isNullOrEmpty()) return patched val byKey = patched.associateBy { it.key } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreGameSidecar.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreGameSidecar.kt index e4d828372f..da81f87cf9 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreGameSidecar.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreGameSidecar.kt @@ -11,6 +11,8 @@ class StoreGameSidecar( val title: String, val exe: String, val launcher: String? = null, + /** The working directory a store's launch task asks for: "" is the game folder, null means the exe's folder. */ + val workdir: String? = null, val args: List<String> = emptyList(), val env: Map<String, String> = emptyMap(), val installVersion: String = "", @@ -30,12 +32,12 @@ class StoreGameSidecar( fun launcherFile(folder: File): File? = launcher?.takeIf { it.isNotEmpty() }?.let { File(folder, it) } fun copy( - exe: String = this.exe, launcher: String? = this.launcher, args: List<String> = this.args, + exe: String = this.exe, launcher: String? = this.launcher, workdir: String? = this.workdir, args: List<String> = this.args, env: Map<String, String> = this.env, installVersion: String = this.installVersion, installedAt: Long = this.installedAt, cover: String? = this.cover, hero: String? = this.hero, extra: Map<String, String> = this.extra, state: String = this.state, epic: EpicOptions = this.epic, cloud: Boolean = this.cloud, achievements: Boolean = this.achievements, logo: String? = this.logo, - ) = StoreGameSidecar(store, id, title, exe, launcher, args, env, installVersion, installedAt, cover, hero, extra, state, epic, cloud, achievements, logo) + ) = StoreGameSidecar(store, id, title, exe, launcher, workdir, args, env, installVersion, installedAt, cover, hero, extra, state, epic, cloud, achievements, logo) fun toJson(): JSONObject = JSONObject().apply { put("version", VERSION) @@ -48,6 +50,7 @@ class StoreGameSidecar( if (store != Store.AMAZON) put("cloud", cloud) if (store == Store.GOG) put("achievements", achievements) if (!launcher.isNullOrEmpty()) put("launcher", launcher) + if (workdir != null) put("workdir", workdir) if (args.isNotEmpty()) put("args", JSONArray(args)) if (env.isNotEmpty()) put("env", JSONObject(env as Map<*, *>)) if (installVersion.isNotEmpty()) put("installVersion", installVersion) @@ -116,13 +119,16 @@ class StoreGameSidecar( if (exe.isEmpty() && state == STATE_INSTALLED) return null if (exe.isNotEmpty() && !relativeInside(exe)) return null val launcher = o.optString("launcher", "").replace('\\', '/').takeIf { it.isNotEmpty() && relativeInside(it) } + val workdir = if (!o.has("workdir")) null else o.optString("workdir", "") + .replace('\\', '/').removePrefix("./").trimEnd('/') + .let { if (it.isEmpty() || it == ".") "" else it.takeIf(::relativeInside) } val args = o.optJSONArray("args")?.let { a -> List(a.length()) { a.optString(it) }.filter { it.isNotEmpty() } } ?: emptyList() val env = LinkedHashMap<String, String>() o.optJSONObject("env")?.let { e -> e.keys().forEach { k -> env[k] = e.optString(k) } } val extra = LinkedHashMap<String, String>() o.optJSONObject("extra")?.let { e -> e.keys().forEach { k -> extra[k] = e.optString(k) } } return StoreGameSidecar( - store, id, title, exe, launcher, args, env, + store, id, title, exe, launcher, workdir = workdir, args = args, env = env, installVersion = o.optString("installVersion", ""), installedAt = o.optLong("installedAt", 0L), cover = o.optString("cover", "").ifEmpty { null }, diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt index fa20167da9..2ba84041f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt @@ -39,7 +39,6 @@ object StoreInstallRoot { } catch (e: Exception) { StoresState.logLine("storage: StatFs failed for store install target (${e.javaClass.simpleName})") try { - // File's zero also means an unavailable measurement; only StatFs establishes zero. usableBytes(existing).takeIf { it > 0L } ?: SPACE_UNKNOWN } catch (fallback: Exception) { StoresState.logLine("storage: usable-space fallback failed for store install target (${fallback.javaClass.simpleName})") @@ -51,19 +50,12 @@ object StoreInstallRoot { @JvmStatic fun insufficientSpace(required: Long, available: Long): Boolean = required > 0L && available >= 0L && available < required - /** - * The catalog size is the known minimum for an install. Epic's actual chunk-cache requirement - * is determined from its manifest before chunk downloads begin. - */ fun estimatedBytesNeeded(item: CatalogItem): Long = StoreSizes.size(item).coerceAtLeast(0L) - /** Pre-install storage check to detect insufficient space before starting. */ fun checkStorage(context: Context, item: CatalogItem, targetRoot: File): StorageCheck { val size = estimatedBytesNeeded(item) val existing = existingFolder(context, item.store, item.id, item.title) val freeTarget = availableBytes(existing ?: targetRoot) - // Backends account for completed files on resume; the catalog cannot describe remaining work. - // Comparing the full catalog size to remaining free space would reject valid resumes. if (item.store == Store.EPIC || existing != null) return StorageCheck(enough = true, requiredBytes = size, availableBytes = freeTarget) if (size <= 0L) return StorageCheck(enough = true, requiredBytes = 0L, availableBytes = freeTarget) if (insufficientSpace(size, freeTarget)) { @@ -93,7 +85,6 @@ object StoreInstallRoot { fun customTarget(context: Context): Target? { val folder = defaultStorageFolder(context) ?: return null - // Writes are probed when the folder is chosen; File.canWrite() is unreliable on FUSE volumes. if (!folder.isDirectory) return null val label = SessionPrefs.defaultStorageFolderLabel(context).ifBlank { folderLabel(context, folder) } return Target(File(folder, ON_VOLUME), label, removable = true, folder = true) @@ -137,10 +128,7 @@ object StoreInstallRoot { .filter { !isInternal(context, it) && (library == null || !it.absolutePath.startsWith("$library/")) } .map { root -> val base = guestFor(context, root) - val guest = if (used.add(base)) base else { - val suffix = "%08x".format(CRC32().apply { update(root.absolutePath.toByteArray()) }.value) - "$base-$suffix".also { used.add(it) } - } + val guest = if (used.add(base)) base else "$base-${pathKey(root)}".also { used.add(it) } root to guest } } @@ -166,17 +154,21 @@ object StoreInstallRoot { } } - /** Xodus has its own PRoot mount table and cannot see the selected Steam library's SD bind. */ fun externalRootsForXodus(context: Context): List<Pair<File, String>> { - val roots = externalRoots(context).toMutableList() + val roots = externalRoots(context) val selectedLibrary = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } - ?.takeUnless { isInternal(context, it) } - if (selectedLibrary != null && roots.none { it.first.absolutePath == selectedLibrary.absolutePath }) { - roots += selectedLibrary to guestFor(context, selectedLibrary) - } - return roots + ?.takeUnless { isInternal(context, it) } ?: return roots + return withSelectedLibrary(roots, selectedLibrary, guestFor(context, selectedLibrary)) } + internal fun withSelectedLibrary(roots: List<Pair<File, String>>, library: File, base: String): List<Pair<File, String>> { + if (roots.any { it.first.absolutePath == library.absolutePath }) return roots + val guest = if (roots.none { it.second == base }) base else "$base-${pathKey(library)}" + return roots + (library to guest) + } + + private fun pathKey(root: File): String = "%08x".format(CRC32().apply { update(root.absolutePath.toByteArray()) }.value) + fun externalBindSpecs(context: Context): List<String> = externalBindSpecs(externalRoots(context), LinuxRuntime.rootDir(context)) fun externalBindSpecsForXodus(context: Context): List<String> = @@ -192,7 +184,7 @@ object StoreInstallRoot { private fun guestFor(context: Context, root: File): String { val sm = context.getSystemService(StorageManager::class.java) val uuid = runCatching { sm?.getStorageVolume(root)?.uuid }.getOrNull()?.takeIf { it.isNotBlank() }?.replace(Regex("[^A-Za-z0-9-]"), "") - val key = uuid ?: "%08x".format(CRC32().apply { update(root.absolutePath.toByteArray()) }.value) + val key = uuid ?: pathKey(root) return "$GUEST_EXTERNAL/$key" } @@ -226,7 +218,7 @@ object StoreInstallRoot { fun isRemovable(context: Context, folder: File): Boolean = !folder.absolutePath.startsWith(internalRoot(context).absolutePath + "/") - fun storeDir(root: File, store: Store): File = File(root, store.shortLabel) + fun storeDir(root: File, store: Store): File = File(root, store.folder) fun gameFolders(context: Context): List<File> = roots(context).flatMap { root -> Store.entries.flatMap { store -> @@ -254,7 +246,7 @@ object StoreInstallRoot { val sidecar = StoreGameSidecar.read(folder) when { sidecar == null -> Unfinished(store, null, folder) - store == Store.GOG && sidecar.state == StoreGameSidecar.STATE_UPDATING -> null + sidecar.state == StoreGameSidecar.STATE_UPDATING -> null !sidecar.isInstalled -> Unfinished(store, sidecar.id, folder) else -> null } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt index 2f4df83f20..c29ea41652 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt @@ -19,7 +19,6 @@ object StoreInstalls { StoreGameSidecar(store, id, title, exe = "", cover = cover, hero = hero, state = StoreGameSidecar.STATE_INSTALLING).write(folder) } - /** Epic commits verified files individually, not a whole-game transaction. Keep updates resumable. */ @JvmStatic fun markUpdating(folder: File) { val before = StoreGameSidecar.read(folder) ?: return diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLanguage.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLanguage.kt index bc9afe3c21..c8ab328009 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLanguage.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLanguage.kt @@ -6,18 +6,9 @@ import com.droiddeck.launcher.session.SessionPrefs import org.json.JSONArray import java.util.Locale -/** - * Language for a third-party store install ([Store.GOG], [Store.EPIC]): the app/system locale by - * default, or the code the user picked in the install dialog / store settings. - * - * GOG depots and Epic install tags use overlapping but not identical codes (`en` vs `en-US`, - * `nb` vs `no`). Matching is on the language part plus a few aliases, so a Polish phone selects - * `pl-PL` depots without the user having to know the store's spelling. - */ object StoreLanguage { const val EXTRA = "installLanguage" - /** Codes the settings list and Epic's tag table share; GOG often uses the same with a region. */ val KNOWN: List<String> = listOf( "en", "pl", "de", "fr", "es", "es-419", "pt", "pt-BR", "it", "ru", "uk", "cs", "hu", "nl", "sv", "da", "fi", "nb", "ro", "bg", "el", "tr", "ar", "th", "vi", "ja", "ko", @@ -36,7 +27,6 @@ object StoreLanguage { fun selectable(store: Store): Boolean = store == Store.GOG || store == Store.EPIC - /** Tag actually sent to the store: settings override, else the app/system locale. */ @JvmStatic fun preferredCode(context: Context): String { val chosen = SessionPrefs.storesInstallLanguage(context) @@ -68,10 +58,6 @@ object StoreLanguage { fun fallbackList(store: Store): List<String> = if (selectable(store)) KNOWN else emptyList() - /** - * One code from [available]. An exact normalized code wins (`pl-PL` over `pl`). A base-language - * match is used only when that exact code is not offered, then English, then the first code. - */ @JvmStatic fun pick(available: List<String>, preferred: String): String { if (available.isEmpty()) return preferred @@ -82,11 +68,6 @@ object StoreLanguage { ?: available.first() } - /** - * True when a GOG depot whose `languages` array is [listed] overlaps [chosen], including a - * base-language match (`pl` accepts `pl-PL`). Shared depots (`*`, empty, missing) always match. - * Install selection uses [depotMatchesResolved] after [pick] has chosen a single code. - */ @JvmStatic fun depotAccepted(listed: Array<String>?, chosen: String): Boolean { if (listed.isNullOrEmpty()) return true @@ -97,10 +78,6 @@ object StoreLanguage { } } - /** - * True when [listed] is shared, or contains the one code [resolved] already selected. - * `pl-PL` does not also keep a `pl` depot. - */ @JvmStatic fun depotMatchesResolved(listed: Array<String>?, resolved: String): Boolean { if (listed.isNullOrEmpty()) return true @@ -109,7 +86,6 @@ object StoreLanguage { return listed.any { primary(it) == want } } - /** Normalized code without collapsing to the base language. `pl-PL` stays `pl-pl`. */ internal fun primary(code: String): String? { val raw = code.trim().lowercase().replace('_', '-') if (raw.isEmpty()) return null diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt index e17aac578b..378d7fa74b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunch.kt @@ -22,7 +22,8 @@ object StoreLaunch { fun launcherText(sidecar: StoreGameSidecar): String { val exe = sidecar.exe.replace('/', '\\') - val dir = exe.substringBeforeLast('\\', "") + val dir = sidecar.workdir?.let { if (it.isEmpty()) "" else it.replace('/', '\\') } + ?: exe.substringBeforeLast('\\', "") val lines = ArrayList<String>() lines += "@echo off" lines += "setlocal" diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLogFiles.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLogFiles.kt index bd94cfc3bc..95cd69ebdc 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLogFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLogFiles.kt @@ -26,7 +26,6 @@ object StoreLogFiles { private val CLOCK = SimpleDateFormat("HH:mm:ss.SSS", Locale.US) - /** Appends [text] with a time stamp. Works in any of the app's processes. */ fun stamped(context: Context, text: String) = append(context, "${synchronized(CLOCK) { CLOCK.format(Date()) }} $text") fun append(context: Context, line: String) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt index 37169cf96f..228d97cd78 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -183,10 +183,6 @@ class StoreLoginActivity : ComponentActivity() { return root } - /** - * The activity handles density changes itself so that folding between two displays of different - * density keeps the page and the sign-in in progress; the dp-based chrome sizes are applied again. - */ override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) if (!::topBar.isInitialized) return @@ -221,7 +217,6 @@ class StoreLoginActivity : ComponentActivity() { setBackgroundColor(0xFF0A0B0D.toInt()) settings.javaScriptEnabled = true settings.domStorageEnabled = true - // Store sign-in pages are web pages; they never need to read local files or content:// URIs. settings.allowFileAccess = false settings.allowContentAccess = false settings.userAgentString = userAgent @@ -278,6 +273,10 @@ class StoreLoginActivity : ComponentActivity() { if (url != null && view != null && flow?.isRedirect(url) == true && flow?.readsPage != true) complete(view, url) } + override fun doUpdateVisitedHistory(view: WebView?, url: String?, isReload: Boolean) { + if (!isPopup && store == Store.GAMEJOLT && url != null && view != null && flow?.isRedirect(url) == true && flow?.readsPage != true) complete(view, url) + } + override fun onPageFinished(view: WebView?, url: String?) { if (url != null && view != null && flow?.readsPage == true && flow?.isRedirect(url) == true) complete(view, url) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index 290676c9ed..545c981e50 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -54,7 +54,7 @@ object StoreSizes { when (item.store) { Store.EPIC -> EpicPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", it).apply() - Store.ITCH -> {} + Store.ITCH, Store.GAMEJOLT -> {} Store.GOG, Store.XBOX, Store.BATTLENET -> {} } } @@ -113,5 +113,6 @@ object StoreSizes { } Store.GOG, Store.XBOX, Store.BATTLENET -> 0L Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchLibrary.size(context, item) + Store.GAMEJOLT -> com.droiddeck.launcher.stores.gamejolt.GameJoltBuilds.size(context, item) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index ff44ca7638..f28c402e8e 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -81,7 +81,7 @@ object StoresState { runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetClient.syncAccount(app) } val found = Store.entries.mapNotNull { store -> StoreAccounts.displayName(app, store)?.let { store to it } } val onDisk = StoreInstallRoot.gameFolders(app).mapNotNull { folder -> - StoreGameSidecar.read(folder)?.takeIf { it.isInstalled || it.store == Store.GOG && it.state == StoreGameSidecar.STATE_UPDATING }?.let { InstalledStoreGame(it, folder) } + StoreGameSidecar.read(folder)?.takeIf { it.isInstalled || it.state == StoreGameSidecar.STATE_UPDATING }?.let { InstalledStoreGame(it, folder) } } + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetBackend.installedGames(app) }.getOrDefault(emptyList()) val partial = StoreInstallRoot.unfinished(app) val version = if (StoresNative.available) StoresNative.version ?: "" else "" @@ -131,7 +131,11 @@ object StoresState { fun detailItem(store: Store, id: String): CatalogItem? = detailCatalogItem( store, id, library[store].orEmpty(), - found[store].orEmpty() + if (store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchBrowseState.items + com.droiddeck.launcher.stores.itch.ItchCollections.items() else emptyList(), + found[store].orEmpty() + when (store) { + Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchBrowseState.items + com.droiddeck.launcher.stores.itch.ItchCollections.items() + Store.GAMEJOLT -> com.droiddeck.launcher.stores.gamejolt.GameJoltBrowseState.items + com.droiddeck.launcher.stores.gamejolt.GameJoltCollections.items() + else -> emptyList() + }, shelves[store], ) @@ -145,7 +149,6 @@ object StoresState { private val libraryAsked = java.util.concurrent.ConcurrentHashMap<Store, Long>() - /** Once per store, again after a minute when the last sync never produced a library (offline, expired sign-in). */ fun loadLibrary(context: Context, store: Store) { if (!isSignedIn(store) || library.containsKey(store)) return val now = android.os.SystemClock.elapsedRealtime() @@ -192,6 +195,10 @@ object StoresState { backend?.signOut(app) if (store == Store.GOG) com.droiddeck.launcher.stores.gog.GogComet.replaceAccount { StoreAccounts.clear(app, store) } else if (store != Store.XBOX || backend == null) StoreAccounts.clear(app, store) + if (store == Store.GAMEJOLT) { + com.droiddeck.launcher.stores.gamejolt.GameJoltCollections.clear() + com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.clear(app) + } if (store == Store.ITCH) { com.droiddeck.launcher.stores.itch.ItchCollections.clear() com.droiddeck.launcher.stores.itch.ItchUpdates.clear(app) @@ -205,7 +212,6 @@ object StoresState { } var openDownloads by mutableStateOf(false) - /** A "store:id" key another page asks the Stores page to open. */ var openGameRequest by mutableStateOf<String?>(null) private fun askForNotifications(context: Context) { @@ -220,10 +226,12 @@ object StoresState { var pendingInstall by mutableStateOf<CatalogItem?>(null) var itchPicking by mutableStateOf<CatalogItem?>(null) + var gameJoltPicking by mutableStateOf<CatalogItem?>(null) fun requestInstall(context: Context, item: CatalogItem) { askForNotifications(context) if (item.store == Store.ITCH && item.extra["uploadId"].isNullOrEmpty()) { itchPicking = item; return } + if (item.store == Store.GAMEJOLT && item.extra["buildId"].isNullOrEmpty()) { gameJoltPicking = item; return } if (isUnfinished(item)) { install(context, item); return } val targets = StoreInstallRoot.targets(context) val preferred = StoreInstallRoot.defaultTarget(context) @@ -287,6 +295,7 @@ object StoresState { installed = installed.filterNot { it.folder.absolutePath == game.folder.absolutePath } uninstalling.remove(key) if (game.sidecar.store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchUpdates.applied(app, key) + if (game.sidecar.store == Store.GAMEJOLT) com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.applied(app, key) } }) main.post(onDone) @@ -323,10 +332,6 @@ object StoresState { internal fun post(block: () -> Unit) = main.post(block) - /** - * A worker thread whose failure is logged. An uncaught exception on a plain Thread reaches the crash - * handler, which ends the whole app, and none of these jobs is worth that. - */ private fun background(name: String, onFailure: () -> Unit = {}, block: () -> Unit) { Thread({ try { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt index 3fc972ab20..fadbe31f54 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt @@ -17,6 +17,41 @@ internal object BlizzardArt { private val OG = Regex("""<meta property="og:image" content="(https://[^"]+)"""") private val THUMB = Regex("""\\?"imageUrl\\?":\\?"(//catalog\.blzstatic\.com/[^"\\]+)""") private val HOSTS = listOf(".blzstatic.com", ".blz-contentstack.com", "blz-contentstack-images.akamaized.net") + private const val KEY_ART_ASSETS = "https://blz-contentstack-images.akamaized.net/v3/assets/bltf408a0557f4e4998/" + private const val KEY_ART_CATALOG = "https://catalog.blzstatic.com/" + internal val KEY_ART = mapOf( + "WoW" to "${KEY_ART_ASSETS}blt80af93933ab07df3/68b8bf2d804a9776216cd63e/Midnight_keyart.png", + "WoWC" to "${KEY_ART_ASSETS}blt6a80c8e7260f84f2/690d2219b415dd246153245b/BCC.png", + "WoWF" to "${KEY_ART_ASSETS}blt1d58537e928b17c5/6ae2c99668c747dd1b4f558b/WoW_Forever_AnimatedTrailerSupportAssets_BnetShop_1920x1080.png", + "D3" to "${KEY_ART_CATALOG}/f96/8d92f4d8bd316d3787f02d8a86935d6a-Store_Product_960x540_D3.jpg", + "D3CN" to "${KEY_ART_CATALOG}/f96/8d92f4d8bd316d3787f02d8a86935d6a-Store_Product_960x540_D3.jpg", + "S2" to "${KEY_ART_ASSETS}blt4b6d6857f147a6de/61254804841f180993fedb61/6885-32192.png", + "S1" to "${KEY_ART_ASSETS}blt03d69a4563a6ae63/6a34b50f799ece2cb2da248c/9458-28298.jpg", + "WTCG" to "${KEY_ART_ASSETS}blt5a3d84e1d0b2bbcf/662aea9f842cecfd4fd95327/HS_Key_Art_SG2.png", + "Hero" to "${KEY_ART_ASSETS}blt73de967d17ca81ca/67db7dea931b380b4c76239a/Hanamura_Loading_Screen7.png", + "W3" to "${KEY_ART_ASSETS}blt66c211421d2c5495/6a7e66d8dee8846a67cba6fa/WC_Rebirth_Announce_BnetShop_ComparsionCard_Reforged_1920x1080.png", + "VIPR" to "${KEY_ART_ASSETS}bltd11d425fcbbe3c46/63eecbbd1e040260dfbede83/BO4_(2).png", + "ODIN" to "${KEY_ART_CATALOG}/ffe/5e9926e8de75095fa953b8e71aea966c-_Kronos-Bnet_Game-Card_Feature_3A_Standard-960x540.jpg", + "LAZR" to "${KEY_ART_CATALOG}/7f/ec4770b465f107f24f9a46a66d163ab9-Lazarus-Bnet_Placeholder-Card_PDG-960x540-For_20200331.jpg", + "ZEUS" to "${KEY_ART_ASSETS}blt3e4e126b8153648b/63eeca6b998e686b2e53b748/CW-keyArt-thumb.jpg", + "FORE" to "${KEY_ART_ASSETS}bltff4d6ec7afd2e49a/63f695ff583a5b674fbcde69/CODVG_Reveal_Ultimate_Keyart_Textless-Bnet-Launcher_Content_UI_(Phoenix)-1920x1080_01a_FINAL.jpg", + "AUKS" to "${KEY_ART_ASSETS}bltd31831eda9199937/62abc0df5cbe472513c0ce59/Cortez_Base_Game-Bnet_Game-Card_Feature-960x540.jpg", + "PNTA" to "${KEY_ART_ASSETS}bltd6fa384b60ff3fbd/64cc2fe367e57a3aa2cec653/Jupiter_Coming_Soon-Bnet_Game-Content_UI_(Phoenix)-EN-1920x1080_textless.jpg", + "WLBY" to "${KEY_ART_ASSETS}blt861e34883e31a113/63eec7f166192b60e0205205/CB4_Launch_Keyart_CTA_02-Bnet-Launcher_Launcher_2.0-1920x1080_textless.jpg", + "RTRO" to "${KEY_ART_ASSETS}bltc2737ca8175c8330/620d7693f2a06e30446fa9c7/BCO_PR_Shop_Assets_prod-thumb_TS01.jpg", + "ANBS" to "${KEY_ART_ASSETS}bltcd126fd51eb09be1/6a21ee1fc451656b3d6841b5/DI_Art_Warlock-Login_illustration_(all_classes)-Illustration_(2).png", + "Fen" to "${KEY_ART_ASSETS}blt8de255bf153ad1e2/63d0275cd791066264c678f4/en_D4_pre-purchase_blog_1920x1080_Primary_TS01.jpg", + "D1" to "${KEY_ART_ASSETS}bltf183b52d38f5d94e/65a089802357a8ed25a05da1/blizzard_diablo_launch_desktop_shopproductasset_bchbnet_stat_enus_1920x1080_EE01.png", + "W1" to "${KEY_ART_ASSETS}blt20214ec16801085a/65a07418cd72b186912c1fac/blizzard_warcraft1_launch_desktop_shopproductasset_bchbnet_stat_enus_1920x1080_EE01.png", + "W2" to "${KEY_ART_ASSETS}blt45a874eacd7a27e4/65a08bf2db6bb9361a1fbc63/blizzard_warcraft2_launch_desktop_shopproductasset_bchbnet_stat_enus_1920x1080_EE01.png", + "W1R" to "${KEY_ART_CATALOG}/7d/405b3c58ecc70c495dcf4b333cdd9e01-WC01_keyArt_finalcopy.png", + "W2R" to "${KEY_ART_CATALOG}/7d/924e7c287781c84865b662d20029680c-WC02_KeyArt_finalcopyV2.png", + "GRY" to "${KEY_ART_ASSETS}bltd22bde30bb1b973e/652d87d52c84c8e75f881b5f/SplashAnims_landscape_1.png", + "ARIS" to "${KEY_ART_ASSETS}bltc5face49eea05c7e/67ca48cb4b61d73198918ba6/shop_product_feature_card_aries_standard.webp", + "SCOR" to "${KEY_ART_ASSETS}blt82dbffc2b51e8aa1/67a562cc7113284f3b17ff7d/phx_notification_browsing_card_scorpio_announce.webp", + "ARK" to "${KEY_ART_ASSETS}blt4a061067c30285dc/6837812aedfd13b46a16c38b/shop_asset_gallery_card_arkansas_wishlist.webp", + "AQUA" to "${KEY_ART_ASSETS}blte982469df0746ee4/672ea9f71dee4754a60cde05/shop_product_edition_card_avowed_standard.jpg", + ) internal fun imageUrl(page: String): String? { val og = OG.find(page)?.groupValues?.get(1)?.takeUnless { "youtube" in it || "maxresdefault" in it } @@ -24,16 +59,23 @@ internal object BlizzardArt { return (sequenceOf(og) + thumbs).filterNotNull().firstOrNull(::allowed) } - private fun allowed(url: String): Boolean { + internal fun allowed(url: String): Boolean { val host = runCatching { URL(url).host }.getOrNull() ?: return false return HOSTS.any { h -> host == h.trimStart('.') || host.endsWith(h) } } - fun fetch(slug: String, wide: File, cover: File?): Boolean { - val page = get(URL(SHOP + slug), MAX_PAGE, true)?.toString(Charsets.UTF_8) ?: return false - val url = imageUrl(page) ?: return false - val bytes = get(URL(url.substringBefore('?') + "?imwidth=$WIDE"), MAX_IMAGE, false) ?: return false - val art = BitmapFactory.decodeByteArray(bytes, 0, bytes.size) ?: return false + private fun image(url: String): Bitmap? { + val bytes = get(URL(url.substringBefore('?') + "?imwidth=$WIDE"), MAX_IMAGE, false) ?: return null + return BitmapFactory.decodeByteArray(bytes, 0, bytes.size) + } + + private fun shopImage(slug: String): Bitmap? { + val page = get(URL(SHOP + slug), MAX_PAGE, true)?.toString(Charsets.UTF_8) ?: return null + return imageUrl(page)?.let(::image) + } + + fun fetch(code: String, slug: String, wide: File, cover: File?): Boolean { + val art = runCatching { KEY_ART[code]?.let(::image) }.getOrNull() ?: shopImage(slug) ?: return false try { val scaled = if (art.width > WIDE) Bitmap.createScaledBitmap(art, WIDE, art.height * WIDE / art.width, true) else art save(scaled, wide) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt index baae64b3cd..379161ebf1 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt @@ -142,7 +142,6 @@ object DownloadQueue { advance(app) } - /** Immediately records a failed download (e.g. from pre-flight storage check). */ fun recordFailed(context: Context, entry: DownloadEntry, error: String, retry: (() -> Unit)? = null) { val app = context.applicationContext val now = System.currentTimeMillis() @@ -196,7 +195,6 @@ object DownloadQueue { renumber() publishLocked() } - // A preflight retry rechecks storage and enqueues the real backend, never a running placeholder. if (retry != null) { retry(); return } StoresState.logLine("resumed \"${entry(key)?.name}\"") advance(app) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt index ce5afa91b6..394164c4c3 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt @@ -47,7 +47,6 @@ object EpicBackend : StoreBackend, EpicLaunchSupport { if (!quiet) StoresState.status[store] = app.getString(R.string.stores_sync_library) } val result = EpicLibrary.sync(app, force) { line -> if (!quiet) StoresState.post { StoresState.status[store] = line } } - // Throttled means the cache is fresh, possibly written by another sync after this one read it. val fresh = if (result == EpicLibrary.SyncResult.Throttled) EpicLibrary.cached(app).map { EpicLibrary.toCatalogItem(app, it) } else cached StoresState.post { StoresState.status.remove(store) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltApi.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltApi.kt new file mode 100644 index 0000000000..fce0696a15 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltApi.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.stores.gamejolt + +import com.droiddeck.launcher.stores.StoreNet +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL +import java.net.URLEncoder + +internal class GameJoltAnswer(val code: Int, val json: JSONObject?) { + val ok: Boolean get() = code in 200..299 + val payload: JSONObject? get() = json?.optJSONObject("payload") + val user: JSONObject? get() = json?.optJSONObject("user") +} + +internal object GameJoltApi { + const val SITE = "https://gamejolt.com" + const val LOGIN = "$SITE/login" + + private const val BASE = "$SITE/site-api" + private const val MAX_BYTES = 6_000_000 + + fun get(path: String, cookies: String = ""): GameJoltAnswer = send("GET", path, cookies, null) + + fun post(path: String, cookies: String = "", body: String = ""): GameJoltAnswer = send("POST", path, cookies, body) + + fun overview(gameId: String, cookies: String): GameJoltAnswer = get("/web/discover/games/overview/$gameId", cookies) + + fun search(query: String, page: Int, cookies: String): GameJoltAnswer = + get("/web/search/games?q=${URLEncoder.encode(query, "UTF-8")}&page=$page", cookies) + + fun browse(queryString: String, cookies: String): GameJoltAnswer = get("/web/discover/games?$queryString", cookies) + + fun pageUrl(slug: String, id: String): String = "$SITE/games/$slug/$id" + + private fun readBounded(input: java.io.InputStream): String { + val out = java.io.ByteArrayOutputStream() + val buffer = ByteArray(16 * 1024) + while (out.size() < MAX_BYTES) { + val read = input.read(buffer, 0, minOf(buffer.size, MAX_BYTES - out.size())) + if (read < 0) break + out.write(buffer, 0, read) + } + return out.toString(Charsets.UTF_8.name()) + } + + private fun send(method: String, path: String, cookies: String, body: String?): GameJoltAnswer { + var conn: HttpURLConnection? = null + return try { + conn = (URL(BASE + path).openConnection() as HttpURLConnection).apply { + connectTimeout = 25_000 + readTimeout = 25_000 + requestMethod = method + setRequestProperty("User-Agent", StoreNet.BROWSER_UA) + setRequestProperty("Accept", "application/json") + if (cookies.isNotBlank()) setRequestProperty("Cookie", cookies) + if (body != null) { + doOutput = true + setRequestProperty("Content-Type", "application/x-www-form-urlencoded") + } + } + if (body != null) conn.outputStream.use { it.write(body.toByteArray()) } + val code = conn.responseCode + val stream = if (code in 200..399) conn.inputStream else conn.errorStream + val text = stream?.use { readBounded(it) }.orEmpty() + GameJoltAnswer(code, runCatching { JSONObject(text) }.getOrNull()) + } catch (e: Exception) { + GameJoltAnswer(0, null) + } finally { + runCatching { conn?.disconnect() } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltAuth.kt new file mode 100644 index 0000000000..1cc9f05758 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltAuth.kt @@ -0,0 +1,24 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import org.json.JSONObject + +internal object GameJoltAuth { + fun cookies(context: Context): String = StoreAccounts.read(context.applicationContext, Store.GAMEJOLT)?.optString("access_token").orEmpty() + + fun save(context: Context, cookies: String, user: JSONObject) { + val name = user.optString("display_name").ifBlank { user.optString("username") } + StoreAccounts.write( + context.applicationContext, Store.GAMEJOLT, + JSONObject().put("access_token", cookies).put("user_id", user.optLong("id").toString()).put("username", user.optString("username")).put("display_name", name), + ) + } + + fun username(context: Context): String = StoreAccounts.read(context.applicationContext, Store.GAMEJOLT)?.optString("username").orEmpty() + + fun userId(context: Context): String = StoreAccounts.read(context.applicationContext, Store.GAMEJOLT)?.optString("user_id").orEmpty() + + fun clear(context: Context) = StoreAccounts.clear(context.applicationContext, Store.GAMEJOLT) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBackend.kt new file mode 100644 index 0000000000..09444f42a8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBackend.kt @@ -0,0 +1,86 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import android.content.Intent +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.LoginFlows +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreLoginActivity +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.StoreSizes +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadQueue +import java.io.File + +object GameJoltBackend : StoreBackend { + override val store: Store = Store.GAMEJOLT + + init { + LoginFlows.gameJoltFlow = { agent -> GameJoltLogin(agent) } + } + + override fun signIn(context: Context) { + context.startActivity( + Intent(context, StoreLoginActivity::class.java) + .putExtra(StoreLoginActivity.EXTRA_STORE, store.id) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + ) + } + + override fun signOut(context: Context) { + val app = context.applicationContext + GameJoltPrefs.get(app).edit().clear().apply() + GameJoltAuth.clear(app) + GameJoltLibrary.reset() + StoresState.post { + StoresState.library.remove(store) + StoresState.shelves.remove(store) + StoresState.found.remove(store) + StoresState.problems.remove(store) + StoresState.status.remove(store) + } + } + + override fun syncLibrary(context: Context, force: Boolean) { + val app = context.applicationContext + if (force) GameJoltLibrary.reset() + Thread({ GameJoltLibrary.sync(app, force) }, "gamejolt-sync").start() + } + + override fun loadShelves(context: Context, force: Boolean) { + StoresState.post { StoresState.shelves[store] = StoreShelves() } + } + + override fun search(context: Context, query: String): List<CatalogItem> { + val cookies = GameJoltAuth.cookies(context) + val items = ArrayList<CatalogItem>() + for (page in 1..2) { + val answer = GameJoltApi.search(query, page, cookies) + val found = if (answer.ok) GameJoltCatalog.items(answer.payload?.optJSONArray("games")) else emptyList() + if (found.isEmpty()) break + items.addAll(found) + } + StoresState.logLine("Game Jolt search: \"$query\" returned ${items.size} games") + return items.distinctBy { it.id } + } + + override fun install(context: Context, item: CatalogItem, root: File) { + val app = context.applicationContext + if (!item.isFree && !item.owned) { + StoresState.logLine("Game Jolt: \"${item.title}\" is a paid game, opening its page instead") + return + } + val folder = StoreInstallRoot.folderFor(app, Store.GAMEJOLT, item.id, item.title, root) + val entry = DownloadEntry( + Store.GAMEJOLT, item.id, item.title, cover = item.imageUrl, bytesTotal = StoreSizes.size(item), + location = StoreInstallRoot.labelFor(app, folder), + ) + DownloadQueue.enqueue(app, entry) { GameJoltInstaller(app, item, folder) } + } + + override fun uninstall(context: Context, game: InstalledStoreGame) {} +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowse.kt new file mode 100644 index 0000000000..4aa8df90da --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowse.kt @@ -0,0 +1,163 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.StoresState +import java.net.URLEncoder + +internal data class GameJoltQuery( + val section: String = GameJoltBrowse.SECTION_FEATURED, + val price: String = GameJoltBrowse.PRICE_ANY, + val os: Set<String> = emptySet(), + val browser: Set<String> = emptySet(), + val maturity: Set<String> = emptySet(), + val status: Set<String> = emptySet(), + val partners: Boolean = false, + val tags: List<String> = emptyList(), +) + +internal object GameJoltBrowse { + const val SECTION_FEATURED = "featured" + const val SECTION_HOT = "hot" + const val SECTION_BEST = "best" + const val SECTION_NEW = "new" + val sections = listOf(SECTION_FEATURED, SECTION_HOT, SECTION_BEST, SECTION_NEW) + + const val PRICE_ANY = "any" + const val PRICE_FREE = "free" + const val PRICE_SALE = "sale" + const val PRICE_PAID = "paid" + const val PRICE_UNDER_5 = "5-less" + const val PRICE_UNDER_15 = "15-less" + const val PRICE_UNDER_30 = "30-less" + val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE, PRICE_PAID, PRICE_UNDER_5, PRICE_UNDER_15, PRICE_UNDER_30) + + val systems = listOf("windows", "mac", "linux", "other") + val browsers = listOf("html", "flash", "unity") + val maturities = listOf("everyone", "teen", "adult") + val statuses = listOf("complete", "wip") + + fun tagSlug(tag: String): String = tag.trim().lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-') + + fun queryString(query: GameJoltQuery, page: Int): String { + val parts = ArrayList<String>() + parts.add("section=${query.section.takeIf { it in sections } ?: SECTION_FEATURED}") + query.tags.forEach { parts.add("tag=" + enc(tagSlug(it))) } + if (query.price != PRICE_ANY && query.price in prices) parts.add("f_price=${query.price}") + systems.filter { it in query.os }.forEach { parts.add("f_os%5B%5D=$it") } + browsers.filter { it in query.browser }.forEach { parts.add("f_browser%5B%5D=$it") } + maturities.filter { it in query.maturity }.forEach { parts.add("f_maturity%5B%5D=$it") } + statuses.filter { it in query.status }.forEach { parts.add("f_status%5B%5D=$it") } + if (query.partners) parts.add("f_partners%5B%5D=partners") + if (page > 1) parts.add("page=$page") + return parts.joinToString("&") + } + + private fun enc(value: String): String = URLEncoder.encode(value, "UTF-8") + + class Page(val items: List<CatalogItem>, val code: Int, val rawIds: List<String>) + + fun effective(query: GameJoltQuery, showMature: Boolean): GameJoltQuery { + val playable = query.copy(status = query.status.filterTo(HashSet()) { it in statuses }.ifEmpty { statuses.toSet() }) + if (showMature) return playable + val allowed = playable.maturity - "adult" + return playable.copy(maturity = allowed.ifEmpty { setOf("everyone", "teen") }) + } + + fun page(context: Context, query: GameJoltQuery, page: Int, showMature: Boolean): Page { + val cookies = GameJoltAuth.cookies(context) + val asked = effective(query, showMature) + val answer = fetch(queryString(asked, page), cookies) + val all = if (answer.ok) GameJoltCatalog.items(answer.payload?.optJSONArray("games")) else emptyList() + return Page(all, answer.code, all.map { it.id }) + } + + private fun fetch(qs: String, cookies: String): GameJoltAnswer { + val answer = GameJoltApi.browse(qs, cookies) + val games = if (answer.ok) answer.payload?.optJSONArray("games") else null + StoresState.logLine("Game Jolt browse: ?$qs answered ${answer.code} with ${games?.length() ?: 0} games") + return answer + } +} + +internal object GameJoltBrowseState { + var query by mutableStateOf(GameJoltQuery()) + private set + var items by mutableStateOf<List<CatalogItem>>(emptyList()) + private set + var loading by mutableStateOf(false) + private set + var ended by mutableStateOf(false) + private set + var failed by mutableStateOf(false) + private set + + private var next = 1 + private var generation = 0 + private var loadedMature: Boolean? = null + private val seenRaw = HashSet<String>() + + fun sync(context: Context, showMature: Boolean) { + if (!showMature && "adult" in query.maturity) { + reset() + query = query.copy(maturity = query.maturity - "adult") + more(context) + return + } + val before = loadedMature ?: return + if (before != showMature) more(context) + } + + private fun reset() { + generation++ + items = emptyList() + ended = false + failed = false + loading = false + next = 1 + seenRaw.clear() + } + + fun choose(context: Context, wanted: GameJoltQuery) { + if (wanted == query) return + reset() + query = wanted + more(context) + } + + fun more(context: Context, retry: Boolean = false) { + val app = context.applicationContext + val mature = SessionPrefs.storesShowMature(app) + if (loadedMature != null && loadedMature != mature) reset() + if (loading || ended || (failed && !retry)) return + loading = true + failed = false + val mine = generation + val asked = query + val page = next + loadedMature = mature + Thread({ + val answer = runCatching { GameJoltBrowse.page(app, asked, page, mature) }.getOrNull() + StoresState.post { + if (mine != generation) return@post + loading = false + if (answer == null || answer.code !in 200..299) { + failed = true + return@post + } + if (answer.rawIds.filter { seenRaw.add(it) }.isEmpty()) { + ended = true + return@post + } + next = page + 1 + val known = items.mapTo(HashSet()) { it.id } + val fresh = answer.items.filter { known.add(it.id) } + if (fresh.isEmpty()) more(app) else items = items + fresh + } + }, "gamejolt-browse").start() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuilds.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuilds.kt new file mode 100644 index 0000000000..a014e7d6ec --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuilds.kt @@ -0,0 +1,85 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.stores.CatalogItem +import org.json.JSONArray +import org.json.JSONObject + +internal class GameJoltBuild( + val id: String, + val packageId: String, + val packageTitle: String, + val version: String, + val filename: String, + val size: Long, + val stamp: String, + val platforms: Set<String>, + val folder: String, + val executable: String, +) { + val installable: Boolean get() = "windows" in platforms +} + +internal object GameJoltBuilds { + fun parse(payload: JSONObject?): List<GameJoltBuild> { + if (payload == null) return emptyList() + val packages = objects(payload.optJSONArray("packages")).associate { it.optLong("id") to it.optString("title") } + val releases = objects(payload.optJSONArray("releases")).associateBy { it.optLong("id") } + val launch = objects(payload.optJSONArray("launchOptions")) + val builds = objects(payload.optJSONArray("builds")).filter { it.optJSONObject("primary_file") != null } + val newest = builds.groupBy { it.optLong("game_package_id") }.mapValues { (_, list) -> + list.maxOfOrNull { releaseRank(releases[it.optLong("game_release_id")], it.optLong("game_release_id")) } + } + return builds + .filter { newest[it.optLong("game_package_id")] == releaseRank(releases[it.optLong("game_release_id")], it.optLong("game_release_id")) } + .map { build -> + val file = build.optJSONObject("primary_file") + val release = releases[build.optLong("game_release_id")] + val id = build.optLong("id") + GameJoltBuild( + id = id.toString(), + packageId = build.optLong("game_package_id").toString(), + packageTitle = packages[build.optLong("game_package_id")].orEmpty(), + version = release?.optString("version_number").orEmpty(), + filename = file?.optString("filename").orEmpty().substringAfterLast('/').substringAfterLast('\\'), + size = file?.optLong("filesize") ?: 0L, + stamp = release?.optLong("published_on")?.takeIf { it > 0L }?.toString().orEmpty(), + platforms = platforms(build), + folder = build.optString("folder"), + executable = launch.firstOrNull { it.optLong("game_build_id") == id && it.optString("os").startsWith("windows") }?.optString("executable_path").orEmpty(), + ) + } + .sortedWith(compareByDescending<GameJoltBuild> { it.installable }.thenByDescending { it.stamp.toLongOrNull() ?: 0L }.thenByDescending { it.id.toLongOrNull() ?: 0L }) + } + + fun platforms(build: JSONObject): Set<String> { + val found = LinkedHashSet<String>() + if (build.optBoolean("os_windows") || build.optBoolean("os_windows_64")) found.add("windows") + if (build.optBoolean("os_linux") || build.optBoolean("os_linux_64")) found.add("linux") + if (build.optBoolean("os_mac") || build.optBoolean("os_mac_64")) found.add("osx") + if (build.optBoolean("os_other")) found.add("other") + return if (found.isEmpty()) setOf("web") else found + } + + fun load(context: Context, gameId: String): List<GameJoltBuild>? { + val answer = GameJoltApi.overview(gameId, GameJoltAuth.cookies(context)) + if (!answer.ok) return null + return parse(answer.payload) + } + + fun byId(builds: List<GameJoltBuild>, id: String): GameJoltBuild? = builds.firstOrNull { it.id == id } + + fun preferred(builds: List<GameJoltBuild>): GameJoltBuild? = builds.firstOrNull { it.installable } + + fun size(context: Context, item: CatalogItem): Long { + val gameId = item.extra["gameId"].orEmpty().ifEmpty { item.id } + val builds = load(context, gameId) ?: return 0L + val chosen = item.extra["buildId"]?.let { byId(builds, it) } ?: preferred(builds) + return chosen?.size ?: 0L + } + + private fun releaseRank(release: JSONObject?, id: Long): Long = (release?.optLong("published_on") ?: 0L) * 1_000_000L + id + + private fun objects(array: JSONArray?): List<JSONObject> = + if (array == null) emptyList() else (0 until array.length()).mapNotNull { array.optJSONObject(it) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCatalog.kt new file mode 100644 index 0000000000..5303d65b47 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCatalog.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.stores.gamejolt + +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.cleanStoreText +import org.json.JSONArray +import org.json.JSONObject +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.TimeZone +import java.util.concurrent.atomic.AtomicBoolean + +internal object GameJoltCatalog { + private const val PAID = "paid" + private val sellableLogged = AtomicBoolean(false) + + fun items(games: JSONArray?, owned: Boolean = false): List<CatalogItem> { + if (games == null) return emptyList() + return (0 until games.length()).mapNotNull { games.optJSONObject(it)?.let { game -> item(game, owned) } }.distinctBy { it.id } + } + + fun item(game: JSONObject, owned: Boolean = false): CatalogItem? { + val id = game.optLong("id") + if (id <= 0L) return null + val slug = game.optString("slug") + val sellable = game.optJSONObject("sellable") + val paid = sellable?.optString("type") == PAID + if (paid) noteSellable(sellable) + val developer = game.optJSONObject("developer") + val author = developer?.optString("display_name").orEmpty().ifBlank { developer?.optString("username").orEmpty() } + val thumbnail = game.optJSONObject("thumbnail_media_item")?.optString("img_url").orEmpty().ifBlank { game.optString("img_thumbnail") } + val header = game.optJSONObject("header_media_item")?.optString("img_url").orEmpty().ifBlank { game.optString("img_thumbnail") } + val price = if (paid) GameJoltPricing.of(sellable) else null + val compatibility = game.optJSONObject("compatibility") + val tags = buildList { + if (compatibility?.optBoolean("os_windows") == true) add("Windows") + if (compatibility?.optBoolean("os_linux") == true) add("Linux") + if (compatibility?.optBoolean("os_mac") == true) add("macOS") + }.joinToString(", ") + return CatalogItem( + store = Store.GAMEJOLT, + id = id.toString(), + title = game.optString("title").ifBlank { "Game Jolt game $id" }, + imageUrl = header.ifBlank { null }, + tallImageUrl = thumbnail.ifBlank { null }, + tags = tags, + isFree = !paid, + hasPrice = paid, + finalPrice = price?.final.orEmpty(), + originalPrice = price?.original.orEmpty(), + discountPercent = price?.discount ?: 0, + owned = owned, + storeUrl = GameJoltApi.pageUrl(slug.ifBlank { "game" }, id.toString()), + developer = author, + publisher = author, + releaseDate = date(game.optLong("published_on")), + description = cleanStoreText(game.optString("description")), + mature = game.optBoolean("has_adult_content"), + extra = mapOf("gameId" to id.toString(), "slug" to slug), + ) + } + + private fun noteSellable(sellable: JSONObject?) { + if (sellable == null || !sellableLogged.compareAndSet(false, true)) return + val pricing = sellable.optJSONArray("pricings")?.optJSONObject(0) + StoresState.logLine("Game Jolt: a paid game carries sellable keys [${sellable.keys().asSequence().joinToString(",")}] and pricing keys [${pricing?.keys()?.asSequence()?.joinToString(",").orEmpty()}]") + } + + private fun date(stamp: Long): String { + if (stamp <= 0L) return "" + val millis = if (stamp > 100_000_000_000L) stamp else stamp * 1000L + return SimpleDateFormat("yyyy-MM-dd", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }.format(Date(millis)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollections.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollections.kt new file mode 100644 index 0000000000..887a071acb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollections.kt @@ -0,0 +1,120 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import org.json.JSONObject +import java.net.URLEncoder +import java.util.concurrent.ConcurrentHashMap + +internal class GameJoltCollection(val id: String, val title: String) + +internal object GameJoltCollections { + const val FOLLOWED = "followed" + private const val PLAYLIST = "playlist:" + + var list by mutableStateOf<List<GameJoltCollection>>(emptyList()) + private set + var selected by mutableStateOf<String?>(null) + private set + private val games = mutableStateMapOf<String, List<CatalogItem>>() + private val loading = ConcurrentHashMap.newKeySet<String>() + @Volatile private var generation = 0 + + fun items(): List<CatalogItem> = games.values.flatten() + + fun gamesOf(id: String): List<CatalogItem>? = games[id] + + fun chosen(): GameJoltCollection? = list.firstOrNull { it.id == selected } + + fun clear() { + generation++ + StoresState.post { + list = emptyList() + selected = null + games.clear() + } + } + + fun load(context: Context) { + val app = context.applicationContext + val started = generation + val guard = "$started:" + if (!loading.add(guard)) return + Thread({ + try { + val cookies = GameJoltAuth.cookies(app) + if (cookies.isBlank()) return@Thread + val playlists = playlists(cookies) ?: return@Thread + val parsed = listOf(GameJoltCollection(FOLLOWED, app.getString(R.string.stores_gamejolt_followed))) + parse(playlists) + if (started != generation) return@Thread + StoresState.post { + if (started != generation) return@post + list = parsed + if (selected != null && parsed.none { it.id == selected }) selected = null + } + StoresState.logLine("Game Jolt: ${parsed.size} collections") + selected?.let { fetchGames(app, it, started) } + } finally { + loading.remove(guard) + } + }, "gamejolt-collections").start() + } + + fun select(context: Context, id: String?) { + selected = id + if (id == null) return + val app = context.applicationContext + val started = generation + Thread({ fetchGames(app, id, started) }, "gamejolt-collection-games").start() + } + + private fun playlists(cookies: String): JSONArray? { + val library = GameJoltApi.get("/web/library", cookies) + if (!library.ok) return null + library.payload?.optJSONArray("playlists")?.let { return it } + val nested = library.payload?.optJSONArray("collections") + if (nested != null) { + val out = JSONArray() + for (i in 0 until nested.length()) nested.optJSONObject(i)?.optJSONObject("playlist")?.let { out.put(it) } + if (out.length() > 0) return out + } + return GameJoltApi.get("/web/library/playlists", cookies).takeIf { it.ok }?.payload?.optJSONArray("playlists") ?: JSONArray() + } + + internal fun parse(playlists: JSONArray): List<GameJoltCollection> = (0 until playlists.length()).mapNotNull { i -> + val playlist = playlists.optJSONObject(i) ?: return@mapNotNull null + val id = playlist.optLong("id").takeIf { it > 0L } ?: return@mapNotNull null + val title = playlist.optString("name").ifBlank { return@mapNotNull null } + GameJoltCollection("$PLAYLIST$id", title) + } + + internal fun path(id: String, username: String): String? = when { + id == FOLLOWED -> "/web/library/games/followed/@${URLEncoder.encode(username, "UTF-8")}" + id.startsWith(PLAYLIST) -> id.removePrefix(PLAYLIST).toLongOrNull()?.let { "/web/library/games/playlist/$it" } + else -> null + } + + private fun fetchGames(app: Context, id: String, started: Int) { + val guard = "$started:$id" + if (!loading.add(guard)) return + try { + val path = path(id, GameJoltAuth.username(app)) ?: return + val found = GameJoltLibrary.games(app, path, false) + if (found == null) { + StoresState.logLine("Game Jolt: collection $id failed") + return + } + StoresState.post { if (started == generation) games[id] = found } + StoresState.logLine("Game Jolt: collection $id has ${found.size} games") + } finally { + loading.remove(guard) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltInstaller.kt new file mode 100644 index 0000000000..c6653bf9be --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltInstaller.kt @@ -0,0 +1,239 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreArchiveUnpacker +import com.droiddeck.launcher.stores.StoreExe +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreInstalls +import com.droiddeck.launcher.stores.StoreNet +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import com.droiddeck.launcher.stores.itch.ItchArchives +import com.droiddeck.launcher.stores.itch.ItchStaging +import java.io.File +import java.io.FileOutputStream +import java.net.HttpURLConnection +import java.net.URL +import java.util.concurrent.atomic.AtomicBoolean + +internal class GameJoltInstaller( + private val app: Context, + private val item: CatalogItem, + private val folder: File, +) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + private var work: File = folder + private var updating = false + private var previous: StoreGameSidecar? = null + private val commit = Any() + private val unpacker = StoreArchiveUnpacker(app, cancelled, "Game Jolt", R.string.stores_gamejolt_archive, R.string.stores_gamejolt_extract_failed, "gamejolt-unrar") + + override fun run(handle: DownloadQueue.JobHandle): String? { + val cookies = GameJoltAuth.cookies(app) + if (cookies.isBlank()) throw IllegalStateException(app.getString(R.string.stores_sync_sign_in)) + if (!item.isFree && !item.owned) throw IllegalStateException(app.getString(R.string.stores_gamejolt_not_owned)) + val gameId = item.extra["gameId"].orEmpty().ifEmpty { item.id } + val before = StoreGameSidecar.read(folder) + previous = before + updating = before != null && (before.isInstalled || before.state == StoreGameSidecar.STATE_UPDATING) + val resuming = before?.let { it.state == StoreGameSidecar.STATE_INSTALLING && it.id == item.id } == true + StoreInstalls.begin(folder, Store.GAMEJOLT, item.id, item.title, item.imageUrl, item.imageUrl) + handle.stage(DownloadStage.MANIFEST) + val builds = GameJoltBuilds.load(app, gameId) ?: throw IllegalStateException(app.getString(R.string.stores_gamejolt_no_game)) + val chosen = item.extra["buildId"].orEmpty() + val build = (if (chosen.isBlank()) GameJoltBuilds.preferred(builds) else GameJoltBuilds.byId(builds, chosen))?.takeIf { it.installable } + ?: throw IllegalStateException(app.getString(R.string.stores_gamejolt_no_build)) + handle.log("Game Jolt: installing build ${build.id} (${build.filename}, ${build.size} bytes, platforms ${build.platforms.joinToString(",")}, launch ${build.executable.ifBlank { "none" }})") + val scratch = StoreInstallRoot.scratchDir(app, Store.GAMEJOLT, item.id) + scratch.mkdirs() + val filename = build.filename.trim().takeUnless { it.isBlank() || it == "." || it == ".." } ?: "download.bin" + val archive = File(scratch, filename) + val exe = try { + handle.stage(DownloadStage.DOWNLOAD) + download(build, archive, handle) + if (cancelled.get()) return null + handle.stage(DownloadStage.INSTALL) + install(build, archive, filename, handle, resuming) + } catch (t: Throwable) { + if (!cancelled.get()) dropCaches(scratch) + throw t + } + if (exe == null) { + if (cancelled.get()) return null + dropCaches(scratch) + throw IllegalStateException(app.getString(R.string.stores_gamejolt_no_exe)) + } + archive.delete() + StoreInstalls.deleteTree(scratch) + val sidecar = StoreGameSidecar( + store = Store.GAMEJOLT, + id = item.id, + title = item.title, + exe = exe, + args = previous?.args.orEmpty(), + env = previous?.env.orEmpty(), + installVersion = build.stamp, + installedAt = System.currentTimeMillis(), + cover = item.imageUrl, + hero = item.imageUrl, + extra = mapOf("gameId" to gameId, "buildId" to build.id, "packageId" to build.packageId) + (if (item.isFree) emptyMap() else mapOf("paid" to "1")), + cloud = false, + ) + StoreInstalls.complete(app, folder, sidecar) { done, steps -> handle.stageProgress(done.toLong(), steps.toLong()) } + GameJoltUpdates.applied(app, item.key) + return folder.path + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + if (deleteFiles) dropCaches(StoreInstallRoot.scratchDir(app, Store.GAMEJOLT, item.id)) + } + + private fun dropCaches(scratch: File) { + if (!updating) { + StoreInstalls.discard(app, folder, listOf(scratch)) + return + } + synchronized(commit) { + StoreInstalls.deleteTree(scratch) + ItchStaging.delete(File(folder, ItchStaging.DIR)) + } + } + + private fun download(build: GameJoltBuild, target: File, handle: DownloadQueue.JobHandle) { + val origin = File(target.path + ".from") + val stamp = "${build.id} ${build.stamp} ${build.size}" + if (!target.isFile || runCatching { origin.readText() }.getOrNull() != stamp) { + target.delete() + origin.writeText(stamp) + } + val expected = build.size + if (expected > 0 && target.length() == expected) { + handle.progress(expected, expected) + return + } + for (attempt in 0..1) { + val have = target.length() + val url = downloadLink(build) + var conn: HttpURLConnection? = null + try { + conn = (URL(url).openConnection() as HttpURLConnection).apply { + connectTimeout = 30_000 + readTimeout = 60_000 + instanceFollowRedirects = true + setRequestProperty("User-Agent", StoreNet.BROWSER_UA) + setRequestProperty("Accept", "*/*") + if (have > 0) setRequestProperty("Range", "bytes=$have-") + } + val code = conn.responseCode + if (code == 416 && attempt == 0) { + target.delete() + continue + } + if (code !in 200..299) throw IllegalStateException(app.getString(R.string.stores_gamejolt_download_failed, code)) + val append = code == 206 && have > 0 + if (have > 0) handle.log(if (append) "Game Jolt: resuming at $have bytes" else "Game Jolt: server ignored the resume, starting over") + var done = if (append) have else 0L + val total = conn.contentLengthLong.takeIf { it > 0 }?.let { if (append) it + have else it } ?: expected + handle.progress(done, total) + val buffer = ByteArray(128 * 1024) + conn.inputStream.use { input -> + FileOutputStream(target, append).use { out -> + while (true) { + if (cancelled.get()) return + val read = input.read(buffer) + if (read < 0) break + out.write(buffer, 0, read) + done += read + handle.progress(done, total) + } + } + } + if (total > 0 && done < total) throw IllegalStateException(app.getString(R.string.stores_gamejolt_download_failed, code)) + return + } finally { + runCatching { conn?.disconnect() } + } + } + } + + private fun downloadLink(build: GameJoltBuild): String { + val answer = GameJoltApi.post("/web/discover/games/builds/get-download-url/${build.id}", GameJoltAuth.cookies(app)) + val url = answer.payload?.optString("url").orEmpty() + if (url.startsWith("https://")) return url + throw IllegalStateException( + when { + answer.code == 0 -> app.getString(R.string.stores_gamejolt_download_unreachable) + answer.ok -> app.getString(R.string.stores_gamejolt_download_no_link) + else -> app.getString(R.string.stores_gamejolt_download_failed, answer.code) + }, + ) + } + + private fun clearPartialInstall() { + folder.listFiles()?.forEach { + if (it.name == StoreGameSidecar.FILE_NAME) return@forEach + if (it.isDirectory) StoreInstalls.deleteTree(it) else it.delete() + } + } + + private fun install(build: GameJoltBuild, archive: File, filename: String, handle: DownloadQueue.JobHandle, resuming: Boolean): String? { + work = if (updating) File(folder, ItchStaging.DIR) else folder + if (updating) ItchStaging.delete(work) + work.mkdirs() + unpacker.work = work + if (resuming) clearPartialInstall() + val exe = try { + val kind = ItchArchives.kind(archive, filename) + if (kind == "exe") archive.copyTo(File(work, filename), overwrite = true) else unpacker.unpack(archive, filename, handle) + var picked = pick(build, filename) + var passes = 0 + while (picked.isBlank() && passes < 2 && !cancelled.get()) { + val inner = ItchArchives.inner(work) ?: break + handle.log("Game Jolt: no exe yet, unpacking ${inner.name}") + unpacker.unpack(inner, inner.name, handle) + if (cancelled.get()) break + inner.delete() + picked = pick(build, inner.name.substringBeforeLast('.').takeIf { it.endsWith(".exe", ignoreCase = true) }) + passes++ + } + picked + } catch (t: Throwable) { + if (updating) ItchStaging.delete(work) + throw t + } + if (exe.isBlank()) { + handle.log("Game Jolt: no exe found in ${folder.name}") + if (updating) ItchStaging.delete(work) + return null + } + if (updating) synchronized(commit) { + if (cancelled.get()) { + ItchStaging.delete(work) + return null + } + try { + StoreInstalls.markUpdating(folder) + } catch (t: Throwable) { + ItchStaging.delete(work) + throw t + } + ItchStaging.merge(work, folder) + ItchStaging.delete(work) + } + return exe + } + + private fun pick(build: GameJoltBuild, hint: String?): String { + if (build.executable.isNotBlank()) { + val declared = File(work, build.executable.trimStart('/')) + val inside = runCatching { declared.canonicalPath.startsWith(work.canonicalPath + File.separator) }.getOrDefault(false) + if (inside && declared.isFile) return declared.relativeTo(work).path + } + return StoreExe.pick(work, hint?.ifBlank { null } ?: build.filename.substringBeforeLast('.').ifBlank { null }, item.title) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLibrary.kt new file mode 100644 index 0000000000..e5f69d4f19 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLibrary.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.mergeItems +import java.net.URLEncoder +import java.util.concurrent.atomic.AtomicBoolean + +internal object GameJoltLibrary { + private const val MAX_PAGES = 20 + private const val THROTTLE_MS = 10 * 60 * 1000L + + private val running = AtomicBoolean(false) + @Volatile private var syncedAt = 0L + + fun sync(context: Context, force: Boolean) { + val app = context.applicationContext + if (!running.compareAndSet(false, true)) return + try { + val cookies = GameJoltAuth.cookies(app) + val name = GameJoltAuth.username(app) + if (cookies.isBlank() || name.isBlank()) { + StoresState.post { + StoresState.status.remove(Store.GAMEJOLT) + StoresState.problems[Store.GAMEJOLT] = app.getString(R.string.stores_sync_sign_in) + } + return + } + val have = StoresState.library[Store.GAMEJOLT].orEmpty() + if (!force && have.isNotEmpty() && System.currentTimeMillis() - syncedAt < THROTTLE_MS) return + if (have.isEmpty()) StoresState.post { StoresState.status[Store.GAMEJOLT] = app.getString(R.string.stores_sync_game_list) } + val items = games(app, "/web/library/games/owned/@${URLEncoder.encode(name, "UTF-8")}", true) + if (items == null) { + StoresState.post { + StoresState.status.remove(Store.GAMEJOLT) + StoresState.problems[Store.GAMEJOLT] = app.getString(R.string.stores_sync_failed) + } + return + } + syncedAt = System.currentTimeMillis() + StoresState.post { + StoresState.status.remove(Store.GAMEJOLT) + StoresState.problems.remove(Store.GAMEJOLT) + StoresState.library[Store.GAMEJOLT] = mergeItems(StoresState.library[Store.GAMEJOLT], items) + } + StoresState.logLine("Game Jolt: ${items.size} owned games") + } finally { + running.set(false) + } + } + + fun reset() { + syncedAt = 0L + } + + fun games(context: Context, path: String, owned: Boolean): List<CatalogItem>? { + val cookies = GameJoltAuth.cookies(context) + val out = ArrayList<CatalogItem>() + val seen = HashSet<String>() + for (page in 1..MAX_PAGES) { + val answer = GameJoltApi.get(if (page == 1) path else "$path?page=$page", cookies) + if (!answer.ok) return if (page == 1) null else out + val batch = GameJoltCatalog.items(answer.payload?.optJSONArray("games"), owned).filter { seen.add(it.id) } + if (batch.isEmpty()) break + out.addAll(batch) + val total = answer.payload?.optInt("totalGamesCount") ?: 0 + if (total in 1..out.size) break + } + return out + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLogin.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLogin.kt new file mode 100644 index 0000000000..e8a547ed2b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltLogin.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.net.Uri +import android.util.Log +import android.webkit.CookieManager +import android.webkit.WebView +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.StoreLoginActivity +import com.droiddeck.launcher.stores.WebCookies + +internal class GameJoltLogin(override val userAgent: String) : StoreLoginActivity.Flow { + override val startUrl: String get() = GameJoltApi.LOGIN + + override fun isRedirect(url: String): Boolean { + val uri = Uri.parse(url) + if (uri.host != HOST && uri.host != "www.$HOST") return false + val path = uri.path.orEmpty() + return AUTH_PATHS.none { path == it || path.startsWith("$it/") } + } + + override fun forgetSignIn(done: () -> Unit) { + runCatching { WebCookies.expire(listOf(GameJoltApi.SITE), HOST, listOf("/")) { done() } } + .onFailure { + Log.w(TAG, "could not clear the previous web sign-in: ${it.javaClass.simpleName}") + done() + } + } + + override fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? { + val manager = CookieManager.getInstance() + manager.flush() + val cookies = manager.getCookie(GameJoltApi.SITE).orEmpty() + if (cookies.isBlank()) { + Log.w(TAG, "no cookies after the sign-in redirect") + return activity.getString(R.string.stores_login_error_verification) + } + val answer = GameJoltApi.get("/web/search/games?q=a", cookies) + val user = answer.user + Log.d(TAG, "verify: code=${answer.code} cookies=${cookies.split(';').joinToString(",") { it.substringBefore('=').trim() }} userKeys=${user?.keys()?.asSequence()?.joinToString(",").orEmpty()}") + if (user == null || user.optLong("id") <= 0L) return activity.getString(R.string.stores_login_error_verification) + return try { + GameJoltAuth.save(activity, cookies, user) + null + } catch (e: Exception) { + Log.w(TAG, "saving the sign-in failed: ${e.javaClass.simpleName}") + activity.getString(R.string.stores_login_error_generic) + } + } + + companion object { + private const val TAG = "GameJoltLogin" + private const val HOST = "gamejolt.com" + private val AUTH_PATHS = listOf("/login", "/join", "/auth", "/forgot", "/terms", "/privacy", "/help", "/legal", "/site-api", "/x", "/oauth") + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPrefs.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPrefs.kt new file mode 100644 index 0000000000..3790e3ea6a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPrefs.kt @@ -0,0 +1,11 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import android.content.SharedPreferences + +object GameJoltPrefs { + const val FILE = "stores.gamejolt" + + @JvmStatic + fun get(context: Context): SharedPreferences = context.applicationContext.getSharedPreferences(FILE, Context.MODE_PRIVATE) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricing.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricing.kt new file mode 100644 index 0000000000..2986f0f7c4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricing.kt @@ -0,0 +1,28 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONObject +import java.util.Locale + +internal object GameJoltPricing { + class Price(val final: String, val original: String, val discount: Int) + + fun of(sellable: JSONObject?): Price? { + val list = sellable?.optJSONArray("pricings") ?: return null + val entries = (0 until list.length()).mapNotNull { list.optJSONObject(it) }.filter { it.optLong("amount") > 0L } + val sale = entries.firstOrNull { it.optBoolean("promotional") } + val regular = entries.firstOrNull { !it.optBoolean("promotional") } + val now = sale ?: regular ?: return null + val was = if (sale != null && regular != null && regular.optLong("amount") > sale.optLong("amount")) regular else null + val percent = if (was == null) 0 else { + val before = was.optLong("amount") + (((before - now.optLong("amount")) * 100 + before / 2) / before).toInt() + } + return Price(format(now), was?.let(::format).orEmpty(), percent) + } + + private fun format(pricing: JSONObject): String { + val amount = String.format(Locale.US, "%.2f", pricing.optLong("amount") / 100.0) + val currency = pricing.optString("currency_code").takeIf { it.isNotBlank() && it != "null" && !it.equals("USD", ignoreCase = true) } + return if (currency == null) "$$amount" else "$amount $currency" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdates.kt b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdates.kt new file mode 100644 index 0000000000..9b8b6a3642 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdates.kt @@ -0,0 +1,188 @@ +package com.droiddeck.launcher.stores.gamejolt + +import android.content.Context +import android.widget.Toast +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONObject +import java.util.concurrent.atomic.AtomicBoolean + +internal class GameJoltUpdate(val buildId: String, val stamp: String, val filename: String, val replaced: Boolean) + +internal object GameJoltUpdates { + private const val KEY_AT = "updates_checked_at" + private const val KEY_FOUND = "updates_found" + private const val THROTTLE_MS = 6 * 60 * 60 * 1000L + private const val GAP_MS = 1_000L + + val available = mutableStateMapOf<String, GameJoltUpdate>() + var checkingKey by mutableStateOf<String?>(null) + private set + + private val running = AtomicBoolean(false) + private val restored = AtomicBoolean(false) + @Volatile private var generation = 0 + + internal fun evaluate(builds: List<GameJoltBuild>?, buildId: String, packageId: String, version: String): GameJoltUpdate? { + if (builds == null || buildId.isBlank()) return null + val installable = builds.filter { it.installable } + val samePackage = installable.filter { it.packageId == packageId } + if (samePackage.isNotEmpty()) { + if (samePackage.any { it.id == buildId }) return null + val same = samePackage.firstOrNull { newer(it, buildId, version) } ?: return null + return GameJoltUpdate(same.id, same.stamp, same.filename, false) + } + val next = installable.firstOrNull() ?: return null + return if (next.id == buildId) null else GameJoltUpdate(next.id, next.stamp, next.filename, true) + } + + private fun newer(build: GameJoltBuild, buildId: String, version: String): Boolean { + val stamp = build.stamp.toLongOrNull() ?: 0L + val have = version.toLongOrNull() ?: 0L + if (stamp != have) return stamp > have + return (build.id.toLongOrNull() ?: 0L) > (buildId.toLongOrNull() ?: 0L) + } + + internal fun encode(found: Map<String, GameJoltUpdate>): String = JSONObject().also { out -> + for ((key, u) in found) out.put(key, JSONObject().put("buildId", u.buildId).put("stamp", u.stamp).put("filename", u.filename).put("replaced", u.replaced)) + }.toString() + + internal fun decode(raw: String?): Map<String, GameJoltUpdate> { + val json = runCatching { JSONObject(raw.orEmpty()) }.getOrNull() ?: return emptyMap() + val out = LinkedHashMap<String, GameJoltUpdate>() + for (key in json.keys()) { + val u = json.optJSONObject(key) ?: continue + val id = u.optString("buildId") + if (id.isBlank()) continue + out[key] = GameJoltUpdate(id, u.optString("stamp"), u.optString("filename"), u.optBoolean("replaced")) + } + return out + } + + private fun restore(app: Context) { + if (!restored.compareAndSet(false, true)) return + val started = generation + val saved = decode(GameJoltPrefs.get(app).getString(KEY_FOUND, null)) + StoresState.post { + if (started != generation) return@post + for ((k, v) in saved) if (k !in available) available[k] = v + } + } + + private fun save(app: Context) { + GameJoltPrefs.get(app).edit().putString(KEY_FOUND, encode(available.toMap())).apply() + } + + private fun snapshot(game: InstalledStoreGame): Triple<String, String, String> = + Triple(game.sidecar.installVersion, game.sidecar.extra["buildId"].orEmpty(), game.sidecar.extra["packageId"].orEmpty()) + + fun check(context: Context) { + val app = context.applicationContext + if (!running.compareAndSet(false, true)) return + val started = generation + Thread({ + try { + restore(app) + val prefs = GameJoltPrefs.get(app) + if (System.currentTimeMillis() - prefs.getLong(KEY_AT, 0L) < THROTTLE_MS) return@Thread + if (GameJoltAuth.cookies(app).isBlank()) return@Thread + val games = StoresState.installed.toList().filter { it.sidecar.store == Store.GAMEJOLT && it.sidecar.isInstalled } + val found = LinkedHashMap<String, GameJoltUpdate>() + val answered = HashSet<String>() + val seen = HashMap<String, Triple<String, String, String>>() + var failed = false + games.forEachIndexed { i, game -> + if (i > 0) Thread.sleep(GAP_MS) + val extra = game.sidecar.extra + seen[game.key] = snapshot(game) + val builds = GameJoltBuilds.load(app, extra["gameId"].orEmpty().ifEmpty { game.sidecar.id }) + if (builds == null) failed = true + else { + answered += game.key + evaluate(builds, extra["buildId"].orEmpty(), extra["packageId"].orEmpty(), game.sidecar.installVersion)?.let { found[game.key] = it } + } + } + if (started != generation) return@Thread + StoresState.post { + if (started != generation) return@post + for (k in answered) { + val now = StoresState.installed.firstOrNull { it.key == k } ?: continue + if (seen[k] != snapshot(now)) continue + val u = found[k] + if (u != null) available[k] = u else available.remove(k) + } + save(app) + } + if (!failed && started == generation) prefs.edit().putLong(KEY_AT, System.currentTimeMillis()).apply() + StoresState.logLine("Game Jolt: checked ${games.size} installed games, ${found.size} with updates") + } finally { + running.set(false) + } + }, "gamejolt-updates").start() + } + + fun checkGame(context: Context, game: InstalledStoreGame) { + val app = context.applicationContext + if (checkingKey != null) return + checkingKey = game.key + val started = generation + val before = snapshot(game) + Thread({ + try { + val extra = game.sidecar.extra + val builds = GameJoltBuilds.load(app, extra["gameId"].orEmpty().ifEmpty { game.sidecar.id }) + val found = evaluate(builds, before.second, before.third, before.first) + StoresState.post { + if (started != generation) return@post + val now = StoresState.installed.firstOrNull { it.key == game.key } + if (builds != null && now != null && snapshot(now) == before) { + if (found != null) available[game.key] = found else available.remove(game.key) + save(app) + } + val text = when { + builds == null -> app.getString(R.string.stores_sync_failed) + found != null -> app.getString(R.string.stores_itch_updates_found, 1) + else -> app.getString(R.string.upd_current_status) + } + Toast.makeText(app, text, Toast.LENGTH_SHORT).show() + } + StoresState.logLine("Game Jolt: checked ${game.sidecar.title}, ${if (found != null) "update available" else "up to date"}") + } finally { + StoresState.post { checkingKey = null } + } + }, "gamejolt-update-check").start() + } + + fun start(context: Context, game: InstalledStoreGame, update: GameJoltUpdate) { + val app = context.applicationContext + if (StoresState.uninstalling.containsKey(game.key)) return + val root = game.folder.parentFile?.parentFile ?: return + val item = CatalogItem( + Store.GAMEJOLT, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, + isFree = game.sidecar.extra["paid"] != "1", owned = true, extra = game.sidecar.extra + ("buildId" to update.buildId), + ) + StoresState.install(app, item, root) + } + + fun applied(context: Context, key: String) { + val app = context.applicationContext + StoresState.post { + available.remove(key) + save(app) + } + } + + fun clear(context: Context) { + val app = context.applicationContext + generation++ + GameJoltPrefs.get(app).edit().remove(KEY_AT).remove(KEY_FOUND).apply() + StoresState.post { available.clear() } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt index 9332bb986f..6a1e5f65c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt @@ -47,8 +47,6 @@ object GogAuth { Log.i(TAG, "signed in") } - fun storedToken(context: Context): String? = StoreAccounts.read(context, Store.GOG)?.optString("access_token", "")?.ifEmpty { null } - @JvmStatic @Synchronized fun validToken(context: Context): String? { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt index 59a370775a..fb6b0c8905 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt @@ -42,12 +42,9 @@ object GogBackend : StoreBackend { if (!quiet) StoresState.status[store] = app.getString(com.droiddeck.launcher.R.string.stores_sync_library) } val result = GogLibrary.sync(app, force, onStatus = { line -> if (!quiet) StoresState.post { StoresState.status[store] = line } }, onList = { list -> - // Mapped here, off the main thread: the listing paints the tab before any product is asked about. val items = list.map { GogLibrary.toCatalogItem(app, it) } - // An empty listing is not news: posting it would drop the cards already on screen. if (items.isNotEmpty()) StoresState.post { StoresState.library[store] = com.droiddeck.launcher.stores.mergeItems(StoresState.library[store], items) } }, onItems = { changed -> - // Only the products that came back are touched: a card already on screen keeps its object, and a product the grid has not seen yet is added where its title belongs. val items = changed.map { GogLibrary.toCatalogItem(app, it) } StoresState.post { StoresState.library[store] = com.droiddeck.launcher.stores.patchItems(StoresState.library[store], items) } }) @@ -95,7 +92,6 @@ object GogBackend : StoreBackend { private fun fetchLogo(id: String): String? = runCatching { StoreNet.get("https://api.gog.com/v2/games/$id?locale=en-US")?.let { logoOf(JSONObject(it)) } }.getOrNull() - /** `images.logo2x` from the products API is an opaque banner, not a logo; the v2 `logo` link is a transparent PNG. */ internal fun logoOf(v2: JSONObject): String? = GogStoreCatalog.absolutize(v2.optJSONObject("_links")?.optJSONObject("logo")?.optString("href")).takeIf { it.startsWith("https://") } @@ -137,6 +133,7 @@ object GogBackend : StoreBackend { val installedLanguage = result.language?.takeIf { it.isNotEmpty() } ?: language val sidecar = StoreGameSidecar( Store.GOG, game.gameId, game.title, exe = result.exeRelative.ifEmpty { "" }, + workdir = result.workDir, installVersion = result.buildId, installedAt = System.currentTimeMillis(), cover = item.tallImageUrl ?: item.imageUrl, hero = item.imageUrl, logo = item.logoUrl ?: fetchLogo(game.gameId), diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java index 9b66b95de9..352fa5c1f6 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java @@ -23,11 +23,15 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Locale; +import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -62,8 +66,9 @@ public final class GogDownloadManager { public final long bytes; public List<String> dependencies = new ArrayList<>(); public boolean dependenciesRead = false; - /** Language actually written, after the manifest's depot list resolved the request. Null for builds that have no language depots. */ public String language; + /** GOG's working directory for the exe: "" is the install root, null when no task declared it. */ + public String workDir; Result(String exeRelative, String buildId, long bytes) { this.exeRelative = exeRelative; this.buildId = buildId; this.bytes = bytes; } } @@ -71,7 +76,6 @@ public final class GogDownloadManager { InstallException(String message) { super(message); } } - /** A failure of the offline-installer fallback; its partial files can be discarded. */ public static final class InstallerException extends InstallException { InstallerException(String message) { super(message); } } @@ -261,7 +265,9 @@ public final class GogDownloadManager { if (clientId != null && !clientId.isEmpty()) GogPrefs.get(ctx).edit().putString("client_id_" + game.gameId, clientId).apply(); String clientSecret = manifest.optString("clientSecret", null); if (clientSecret != null && !clientSecret.isEmpty()) GogPrefs.get(ctx).edit().putString("client_secret_" + game.gameId, clientSecret).apply(); - out.result = new Result(pickExe(installPath, tempExe, game.title), gm.buildId, planned); + GameTask task = pickTask(installPath, game.gameId, tempExe, game.title); + out.result = new Result(task == null ? "" : task.path, gm.buildId, planned); + if (task != null) out.result.workDir = task.workDir; out.result.dependencies = dependencies; out.result.dependenciesRead = true; out.result.language = resolved; @@ -311,7 +317,6 @@ public final class GogDownloadManager { return StoreLanguage.depotMatchesResolved(listed, resolved); } - /** Language codes listed on this product's Windows gen2 depots, excluding `*`. */ public static List<String> listLanguages(Context ctx, String gameId) { try { String token = GogAuth.validToken(ctx); @@ -433,7 +438,9 @@ public final class GogDownloadManager { if (anyFailed.get()) { out.error = "one or more files failed to download"; return out; } cb.onProgress("Finishing…", 96); writeFile(new File(installPath, MARKER), ("{\"gameId\":\"" + game.gameId + "\",\"generation\":1}").getBytes("UTF-8")); - out.result = new Result(pickExe(installPath, null, game.title), "", planned); + GameTask task = pickTask(installPath, game.gameId, null, game.title); + out.result = new Result(task == null ? "" : task.path, "", planned); + if (task != null) out.result.workDir = task.workDir; return out; } catch (Exception e) { out.error = "exception: " + e.getClass().getSimpleName(); @@ -483,11 +490,14 @@ public final class GogDownloadManager { for (InstallerPart part : parts) new File(installPath, part.filename).delete(); deleteDir(new File(installPath, "tmp")); deleteDir(new File(installPath, "commonappdata")); - String exe = pickExe(installPath, null, game.title); + GameTask task = pickTask(installPath, game.gameId, null, game.title); + String exe = task == null ? "" : task.path; if (exe.isEmpty()) throw new InstallException("The installer was extracted but no game executable was found"); cb.onLog("gog: installer extracted natively; game exe " + exe); GogMaintenance.captureOffline(game.gameId, installPath, downloads); - return new Result(exe, "", total); + Result result = new Result(exe, "", total); + result.workDir = task.workDir; + return result; } catch (InstallerException e) { throw e; } catch (InstallException e) { @@ -497,12 +507,6 @@ public final class GogDownloadManager { } } - /** - * GOG's Windows installer is a 32-bit Inno Setup stub. On ARM64 it runs through - * Proton/FEX, where its path strings are corrupted before CreateFileW (observed on - * Wine 11 + FEX: "Path not found"). Extracting the same files with innoextract in - * the Linux guest avoids that path entirely. - */ private static void extractInstaller(Context ctx, File installPath, String setupName, Callback cb, AtomicBoolean cancelled) throws InstallException { String guestDir = AddedGames.INSTANCE.guestPath(ctx, installPath); if (guestDir == null || guestDir.isEmpty()) { @@ -531,11 +535,6 @@ public final class GogDownloadManager { InstallerPart(String url, String filename, long size) { this.url = url; this.filename = filename; this.size = size; } } - /** - * Every file of the first usable Windows installer. GOG lists a setup stub and its data parts as - * separate files, often without a filename; the parts are named after the stub so the installer - * finds them when launched (setup_<id>.exe, setup_<id>-1.bin, ...). - */ static List<InstallerPart> installerParts(JSONObject downloads, String gameId) { List<InstallerPart> out = new ArrayList<>(); if (downloads == null) return out; @@ -1085,21 +1084,188 @@ public final class GogDownloadManager { dir.delete(); } - static String pickExe(File installPath, String tempExe, String title) { + /** + * GOG's own manifest names the game's play task: Blood Omen's is kain.exe while dxconfig.exe is + * its separate tool task (#680). The product's own {@code goggame-<id>.info} decides when it has + * one; any other {@code goggame-*.info} in the folder is only the fallback. Builds without a + * manifest fall through to the hint and search below. + */ + private static GameTask declaredGameTask(File installPath, String gameId) { + File own = gameId == null || gameId.isEmpty() ? null : new File(installPath, "goggame-" + gameId + ".info"); + if (own != null && !own.isFile()) own = null; + List<File> others = new ArrayList<>(); + File[] files = installPath.listFiles(); + if (files != null) { + Arrays.sort(files); + for (File f : files) { + if (f.equals(own) || !f.isFile() || !f.getName().startsWith("goggame-") || !f.getName().endsWith(".info")) continue; + others.add(f); + } + } + if (own != null) { + GameTask task = bestGameTask(installPath, own); + if (task != null) return task; + } + GameTask best = null; + for (File manifest : others) { + GameTask task = bestGameTask(installPath, manifest); + if (task != null && (best == null || task.rank > best.rank)) best = task; + } + return best; + } + + static final class GameTask { + final String path; + /** GOG's working directory for the task: "" is the install root, null when no task declared it. */ + final String workDir; + final int rank; + GameTask(String path, String workDir, int rank) { this.path = path; this.workDir = workDir; this.rank = rank; } + } + + /** The task this manifest would be played from, or null when it names none that exists. */ + private static GameTask bestGameTask(File installPath, File manifest) { + JSONArray tasks; + try { + tasks = new JSONObject(new String(Files.readAllBytes(manifest.toPath()), StandardCharsets.UTF_8)) + .optJSONArray("playTasks"); + } catch (Exception ignored) { + return null; // A truncated manifest is not a reason to fail an install that downloaded fine. + } + if (tasks == null) return null; + GameTask best = null; + for (int i = 0; i < tasks.length(); i++) { + JSONObject task = tasks.optJSONObject(i); + if (task == null) continue; + int rank = taskRank(task); + if (rank == 0 || (best != null && rank <= best.rank)) continue; + String path = task.optString("path", "").replace('\\', '/').replaceAll("/+", "/").replaceFirst("^(\\.?/)+", ""); + if (path.isEmpty()) continue; + File exe = new File(installPath, path); + if (!exe.isFile() || gogSupportExe(exe.getName()) || !inside(installPath, exe)) continue; + best = new GameTask(path, taskWorkDir(installPath, task), rank); + } + return best; + } + + /** + * GOG runs a task from its declared working directory, and from the installation root when the + * task declares none. The Witcher's play task is {@code System\witcher.exe}; started from + * {@code System} hand-built shortcuts cannot find the game's {@code Data} folder, so the root is + * recorded as "" and reaches the shortcut's Start In. A directory that leaves the folder, or is + * not there, falls back to the root rather than to a guess. + */ + private static String taskWorkDir(File installPath, JSONObject task) { + String dir = task.optString("workingDir", "").replace('\\', '/').replaceAll("/+", "/").trim(); + while (dir.startsWith("./")) dir = dir.substring(2); + dir = dir.replaceAll("^/+", "").replaceAll("/+$", ""); + if (dir.isEmpty() || dir.equals(".")) return ""; + File folder = new File(installPath, dir); + return folder.isDirectory() && inside(installPath, folder) ? dir : ""; + } + + /** + * GOG's categories that launch the game: a primary task wins, and a primary {@code launcher} is + * how GOG ships games that start through one. Only a primary {@code launcher} counts: GOG files + * the configuration tool beside a game as a non-primary {@code launcher}, so that one falls to + * the search rather than becoming the game. {@code tool} and {@code document} name no game. + */ + private static int taskRank(JSONObject task) { + String category = task.optString("category").toLowerCase(Locale.ROOT); + boolean primary = task.optBoolean("isPrimary", false); + if ("game".equals(category)) return primary ? 4 : 2; + if ("launcher".equals(category)) return primary ? 3 : 0; + return 0; + } + + /** + * GOG's Galaxy support executables sit in the game folder but install or patch its Galaxy files, + * never play the game. The Witcher: Enhanced Edition ships + * {@code galaxy_the_witcher_enhanced_edition_2.1.0.15.exe}, and its build metadata even names + * that file as the temp executable: launching it is the same 32-bit Inno Setup stub that stops + * at "Path not found" under ARM64 FEX (#694). Play tasks and the name search both step over it. + */ + private static boolean gogSupportExe(String path) { + return new File(path.replace('\\', '/')).getName().toLowerCase(Locale.ROOT).startsWith("galaxy_"); + } + + /** Whether the canonical path of {@code file} stays below {@code root}. */ + private static boolean inside(File root, File file) { + try { + return file.getCanonicalPath().startsWith(root.getCanonicalPath() + File.separator); + } catch (Exception e) { + return false; + } + } + + /** Exe names that belong to the config or tool shims around the game, not to the game. */ + private static final String[] TOOL_STEM_PARTS = { + "config", "setting", "setup", "install", "unins", "touchup", "crashreport", + "report", "editor", "launcher", "diagnostic", + }; + + static GameTask pickTask(File installPath, String gameId, String tempExe, String title) { + GameTask declared = declaredGameTask(installPath, gameId); + if (declared != null) return declared; if (tempExe != null) { - File hinted = new File(installPath, tempExe); - if (hinted.isFile()) return relative(installPath, hinted); + String hint = tempExe.replace('\\', '/'); + File hinted = new File(installPath, hint); + if (!gogSupportExe(hint) && hinted.isFile() && inside(installPath, hinted)) return new GameTask(relative(installPath, hinted), null, 0); } List<File> candidates = new ArrayList<>(); collectExeRecursive(installPath, candidates); - if (candidates.isEmpty()) return ""; - String key = title.toLowerCase().replaceAll("[^a-z0-9]", ""); - File best = candidates.get(0); - for (File f : candidates) { - String n = f.getName().toLowerCase().replaceAll("\\.exe$", "").replaceAll("[^a-z0-9]", ""); - if (!n.isEmpty() && (n.equals(key) || key.startsWith(n) || n.startsWith(key))) { best = f; break; } + if (candidates.isEmpty()) return null; + String key = title.toLowerCase(Locale.ROOT).replaceAll("[^a-z0-9]", ""); + List<String> words = new ArrayList<>(); + for (String word : title.toLowerCase(Locale.ROOT).split("[^a-z0-9]+")) { + if (word.length() >= 4 && !words.contains(word)) words.add(word); } - return relative(installPath, best); + Map<File, Integer> scores = new HashMap<>(); + for (File f : candidates) scores.put(f, exeScore(f, key, words)); + Collections.sort(candidates, (a, b) -> { + int byScore = Integer.compare(scores.get(b), scores.get(a)); + if (byScore != 0) return byScore; + int byDepth = Integer.compare(depth(installPath, a), depth(installPath, b)); + if (byDepth != 0) return byDepth; + int bySize = Long.compare(b.length(), a.length()); + if (bySize != 0) return bySize; + return relative(installPath, a).compareTo(relative(installPath, b)); + }); + return new GameTask(relative(installPath, candidates.get(0)), null, 0); + } + + static String pickExe(File installPath, String gameId, String tempExe, String title) { + GameTask task = pickTask(installPath, gameId, tempExe, title); + return task == null ? "" : task.path; + } + + /** + * A word of the game's title in the exe name is the strongest hint: Blood Omen's kain.exe beats + * the dxconfig.exe beside it (#680). Config and tool exes lose even when their name is the only + * one resembling the title, and the depth penalty keeps a bundled tool below the game's own + * folder. Before this, whatever the folder listing returned first was kept. + */ + private static int exeScore(File f, String key, List<String> words) { + String stem = f.getName().toLowerCase(Locale.ROOT).replaceAll("\\.exe$", "").replaceAll("[^a-z0-9]", ""); + int score = 0; + if (!stem.isEmpty() && !key.isEmpty()) { + if (stem.equals(key)) score += 120; + else if (key.startsWith(stem) || stem.startsWith(key)) score += 80; + } + for (String word : words) { + if (stem.equals(word)) { score += 100; break; } + if (stem.contains(word)) { score += 40; break; } + } + for (String part : TOOL_STEM_PARTS) { + if (stem.contains(part)) { score -= 110; break; } + } + return score; + } + + private static int depth(File root, File f) { + String path = relative(root, f); + int depth = 0; + for (int i = 0; i < path.length(); i++) if (path.charAt(i) == '/') depth++; + return depth; } private static String relative(File root, File f) { @@ -1113,7 +1279,7 @@ public final class GogDownloadManager { File[] files = dir.listFiles(); if (files == null) return; for (File f : files) { - if (f.isFile() && f.getName().toLowerCase().endsWith(".exe")) { + if (f.isFile() && f.getName().toLowerCase().endsWith(".exe") && !gogSupportExe(f.getName())) { String path = f.getAbsolutePath().toLowerCase(); if (!path.contains("redist") && !path.contains("unins") && !path.contains("setup") && !path.contains("crash") && !path.contains("report") && !path.contains("helper") && !path.contains("dotnet") && !path.contains("vcredist") diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogLibrary.kt index 0e76d2fab2..8f48740ee2 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogLibrary.kt @@ -21,13 +21,9 @@ object GogLibrary { private const val LAST_SYNC_KEY = "library_synced_at" private const val SKIPPED_KEY = "library_skipped" private const val THROTTLE_MS = 6L * 60L * 60L * 1000L - // mediaType=1 leaves the movies and soundtracks out, hiddenFlag=0 the hidden ones. private const val LIST_URL = "https://embed.gog.com/account/getFilteredProducts?mediaType=1&hiddenFlag=0&sortBy=title" private const val LIST_MAX_PAGES = 100 - // The listing's image is a bare hash, and the CDN serves it only through Galaxy's own formatters: the - // vertical cover is the one card art it carries. The wide background only the per-game fetch knows. private const val COVER_SUFFIX = "_glx_vertical_cover.webp" - // The older account endpoint: owned ids only. The fallback for a listing that cannot be read. private const val OWNED_URL = "https://embed.gog.com/user/data/games" private val syncing = AtomicBoolean(false) @@ -62,28 +58,22 @@ object GogLibrary { val token = GogAuth.validToken(app) ?: return SyncResult.NotLoggedIn onStatus(app.getString(R.string.stores_sync_game_list)) val listing = ownedListing(token) - // The listing is the only source of titles: without it the owned ids still sync, just without the early paint. val listed: List<GogGame> = listing?.games ?: ownedIds(token)?.map { GogGame(it, "", "", "", "", "", 1, null, "", "") } ?: return SyncResult.Failed(app.getString(R.string.stores_sync_gog_unreachable)) val named = listing != null StoresState.logLine(if (named) "GOG: listing ${listed.size} games" else "GOG: listing unreadable, ${listed.size} owned ids") - // A page that failed leaves games unnamed: they are still owned, so their cards and cached details stay. val ownedSet = listing?.owned ?: listed.mapTo(HashSet()) { it.gameId } val cachedList = cached(app) val stale = System.currentTimeMillis() - p.getLong(LAST_SYNC_KEY, 0L) >= THROTTLE_MS val heavy = force || cachedList.isEmpty() || stale val cachedIds = cachedList.mapTo(HashSet()) { it.gameId } - // A product the last sync found uninstallable stays out of the list while it is re-checked. val skipped = java.util.Collections.newSetFromMap(java.util.concurrent.ConcurrentHashMap<String, Boolean>()) skipped.addAll(p.getStringSet(SKIPPED_KEY, emptySet()).orEmpty()) val idsToFetch = if (heavy) ownedSet.toList() else ownedSet.filter { it !in cachedIds && it !in skipped } val merged = LinkedHashMap<String, GogGame>() - // The cache's own entry stays even when the game is re-fetched: its details beat the listing's. for (g in cachedList) if (g.gameId in ownedSet && g.gameId !in skipped) merged[g.gameId] = g - // A game the sync has not reached keeps the listing's entry, so its card is there from the start. for (g in listed) if (g.gameId !in merged && g.gameId !in skipped) merged[g.gameId] = g - // Only products that were asked about are cached: a bare listing entry is asked about again. val detailed = HashSet(cachedIds) if (named) onList(sorted(merged)) if (idsToFetch.isEmpty()) { @@ -101,15 +91,12 @@ object GogLibrary { for ((idx, f) in futures.withIndex()) { val g = runCatching { f.get() }.getOrNull() if (g != null) { - // The cover the card already shows stays, so the wide art lands over it instead of over a gap. val filled = g.withCover(merged[g.gameId]?.verticalCover) merged[g.gameId] = filled; detailed.add(g.gameId); fetched++; skipped.remove(g.gameId); onItems(listOf(filled)) } if ((idx + 1) % 5 == 0) onStatus(app.getString(R.string.stores_sync_progress, idx + 1, futures.size)) - // Saved as it goes: a sync the user closes the app on still leaves a library to paint next launch. if ((idx + 1) % 20 == 0) saveCache(p, merged.values.filter { it.gameId in detailed }) } - // A product this round found uninstallable leaves when the round is over, not in the middle of it. for (id in skipped) merged.remove(id) val finalList = merged.values.toList() saveCache(p, finalList.filter { it.gameId in detailed }) @@ -132,11 +119,9 @@ object GogLibrary { var page = 1 var pages = 1 while (page <= pages && page <= LIST_MAX_PAGES) { - // A page that cannot be read ends the listing; the pages already read still name most of the library. val listed = StoreNet.get("$LIST_URL&page=$page", bearer = token, userAgent = GogAuth.GALAXY_UA)?.let { parseListing(it) } if (listed == null) { StoresState.logLine("GOG: listing page $page of $pages unreadable") - // The unread pages hold games too: without their ids those games would leave the library and the cache. owned.addAll(ownedIds(token) ?: return null) break } @@ -145,7 +130,6 @@ object GogLibrary { pages = listed.totalPages page++ } - // Not one page read: the caller falls back to the owned ids. return all.ifEmpty { null }?.let { Listing(it, owned) } } @@ -166,7 +150,6 @@ object GogLibrary { val games = ArrayList<GogGame>(arr.length()) for (i in 0 until arr.length()) { val o = arr.optJSONObject(i) ?: continue - // 1801418160 is GOG's own "Galaxy" entry, in every library. val id = o.optLong("id", 0L).toString() if (id == "0" || id == "1801418160") continue if (o.optBoolean("isMovie", false) || !o.optBoolean("isGame", true)) continue diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogMaintenance.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogMaintenance.kt index 796e0dbcb1..20d523ec69 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogMaintenance.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogMaintenance.kt @@ -386,7 +386,9 @@ internal object GogMaintenance { transfer(context, Proposal(folder, old, target, GogOperation.UPDATE, bytes, disk), null, cancelled, callback) if (cancelled.get()) return null target.write(folder) - val result = GogDownloadManager.Result(GogDownloadManager.pickExe(folder, null, game.title), build.id, disk) + val task = GogDownloadManager.pickTask(folder, game.gameId, null, game.title) + val result = GogDownloadManager.Result(task?.path ?: "", build.id, disk) + result.workDir = task?.workDir result.language = target.language result.dependencies = target.manifest.optJSONArray("dependencies")?.strings().orEmpty() result.dependenciesRead = true diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt index d4dcf19830..79b2725f1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt @@ -2,10 +2,9 @@ package com.droiddeck.launcher.stores.itch import android.content.Context import com.droiddeck.launcher.R -import com.droiddeck.launcher.runtime.GuestCommand -import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.stores.CatalogItem import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreArchiveUnpacker import com.droiddeck.launcher.stores.StoreExe import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreInstallRoot @@ -13,20 +12,10 @@ import com.droiddeck.launcher.stores.StoreInstalls import com.droiddeck.launcher.stores.StoreNet import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.download.DownloadStage -import org.apache.commons.compress.MemoryLimitException -import org.apache.commons.compress.archivers.sevenz.SevenZFile -import org.apache.commons.compress.archivers.tar.TarArchiveInputStream -import org.apache.commons.compress.archivers.zip.ZipFile -import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream -import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream -import org.apache.commons.compress.compressors.xz.XZCompressorInputStream -import java.io.BufferedInputStream import java.io.File -import java.io.FileInputStream import java.io.FileOutputStream import java.net.HttpURLConnection import java.net.URL -import java.nio.file.Files import java.util.concurrent.atomic.AtomicBoolean internal class ItchInstaller( @@ -39,6 +28,7 @@ internal class ItchInstaller( private var updating = false private var previous: StoreGameSidecar? = null private val commit = Any() + private val unpacker = StoreArchiveUnpacker(app, cancelled, "itch.io", R.string.stores_itch_archive, R.string.stores_itch_extract_failed, "itch-unrar") override fun run(handle: DownloadQueue.JobHandle): String? { val key = ItchAuth.key(app) @@ -135,7 +125,6 @@ internal class ItchInstaller( private fun download(key: String, downloadKeyId: String, uploadId: String, version: String, target: File, expected: Long, handle: DownloadQueue.JobHandle) { - // A partial file is only resumed when it came from this exact upload build. val origin = File(target.path + ".from") val stamp = "$uploadId $version $expected" if (!target.isFile || runCatching { origin.readText() }.getOrNull() != stamp) { @@ -169,7 +158,6 @@ internal class ItchInstaller( if (have > 0) handle.log(if (append) "itch.io: resuming at ${have} bytes" else "itch.io: server ignored the resume, starting over") var done = if (append) have else 0L val total = conn.contentLengthLong.takeIf { it > 0 }?.let { if (append) it + have else it } ?: expected - // The first report is the queue's speed baseline, so resumed bytes don't read as instant throughput. handle.progress(done, total) val buffer = ByteArray(128 * 1024) conn.inputStream.use { input -> @@ -227,16 +215,17 @@ internal class ItchInstaller( work = if (updating) File(folder, ItchStaging.DIR) else folder if (updating && !patched) ItchStaging.delete(work) work.mkdirs() + unpacker.work = work if (resuming) clearPartialInstall() val exe = try { - if (!patched) unpack(archive, filename, handle) + if (!patched) unpacker.unpack(archive, filename, handle) val hint = filename.substringBeforeLast('.') var picked = StoreExe.pick(work, hint.ifBlank { null }, item.title) var passes = 0 while (picked.isBlank() && passes < 2 && !cancelled.get()) { val inner = ItchArchives.inner(work) ?: break handle.log("itch.io: no exe yet, unpacking ${inner.name}") - unpack(inner, inner.name, handle) + unpacker.unpack(inner, inner.name, handle) if (cancelled.get()) break inner.delete() picked = StoreExe.pick(work, inner.name.substringBeforeLast('.').takeIf { it.endsWith(".exe", ignoreCase = true) }, item.title) @@ -269,208 +258,5 @@ internal class ItchInstaller( return exe } - private fun unpack(archive: File, filename: String, handle: DownloadQueue.JobHandle) { - when (val kind = ItchArchives.kind(archive, filename)) { - "zip" -> unzip(archive, handle) - "7z" -> try { - sevenZip(archive, handle) - } catch (e: MemoryLimitException) { - handle.log("itch.io: ${archive.name} needs more memory than the app has, unpacking it in the runtime") - unrar(archive, handle, kind) - } - "rar" -> unrar(archive, handle, kind) - "exe" -> copy(archive, File(work, filename.ifBlank { "game.exe" })) - "tar" -> untar(archive, null, handle) - "gz", "bz2", "xz" -> untar(archive, kind, handle) ?: single(archive, kind, handle) - else -> copy(archive, File(work, filename.ifBlank { "game" })) - } - } - - private fun target(name: String): File? { - val file = File(work, name.replace('\\', '/')) - val root = work.canonicalPath - val path = file.canonicalPath - return if (path == root || path.startsWith(root + File.separator)) file else null - } - - // No JVM library reads RAR5; the runtime's bsdtar (libarchive) does. - private fun unrar(archive: File, handle: DownloadQueue.JobHandle, kind: String) { - if (!LinuxRuntime.isInstalled(app)) throw IllegalStateException(app.getString(R.string.stores_itch_archive, kind)) - val binds = if (listOf(app.filesDir, app.cacheDir).any { work.absolutePath.startsWith(it.absolutePath + "/") }) null - else listOf(work.absolutePath) - fun bsdtar(args: List<String>, onLine: (String) -> Unit) = - GuestCommand.run(app, listOf("/usr/bin/bsdtar") + args, logName = "itch-unrar", extraBinds = binds, fastPath = true, cancelled = cancelled) { line -> - if (!line.startsWith("proot ")) onLine(line) - } - var entries = 0L - bsdtar(listOf("-tf", archive.absolutePath)) { entries++ } - var done = 0L - val tail = ArrayDeque<String>() - val code = bsdtar(listOf("-xvf", archive.absolutePath, "-C", work.absolutePath)) { line -> - if (line.startsWith("x ")) handle.stageProgress(++done, entries) else { - if (tail.size == 5) tail.removeFirst() - tail.addLast(line) - } - } - if (cancelled.get()) return - if (code != 0) { - handle.log("itch.io: bsdtar exited $code: ${tail.joinToString(" | ")}") - throw IllegalStateException(app.getString(R.string.stores_itch_extract_failed, code)) - } - } - - private fun sevenZip(archive: File, handle: DownloadQueue.JobHandle) { - val total = archive.length() - var written = 0L - val buffer = ByteArray(64 * 1024) - val limitKb = (Runtime.getRuntime().maxMemory() / 4 / 1024).coerceIn(32L * 1024, Int.MAX_VALUE.toLong()).toInt() - Files.newByteChannel(archive.toPath()).use { channel -> - SevenZFile.builder().setSeekableByteChannel(channel).setMaxMemoryLimitKb(limitKb).get().use { seven -> - while (true) { - if (cancelled.get()) return - val entry = seven.nextEntry ?: break - val file = target(entry.name) - if (file == null) { - handle.log("itch.io: skipped an entry outside the game folder") - continue - } - if (entry.isDirectory) { - file.mkdirs() - continue - } - file.parentFile?.mkdirs() - FileOutputStream(file).use { out -> - while (true) { - if (cancelled.get()) return - val read = seven.read(buffer, 0, buffer.size) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - } - - private fun untar(archive: File, codec: String?, handle: DownloadQueue.JobHandle): Unit? { - val total = archive.length() - var written = 0L - var entries = 0 - val buffer = ByteArray(64 * 1024) - val opened = runCatching { - FileInputStream(archive).use { raw -> - val stream = when (codec) { - "gz" -> GzipCompressorInputStream(BufferedInputStream(raw)) - "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) - "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) - else -> BufferedInputStream(raw) - } - stream.use { input -> - TarArchiveInputStream(input).use { tar -> - while (true) { - if (cancelled.get()) return null - val entry = tar.nextEntry ?: break - entries++ - val file = target(entry.name) - if (file == null) { - handle.log("itch.io: skipped an entry outside the game folder") - continue - } - if (entry.isDirectory) { - file.mkdirs() - continue - } - file.parentFile?.mkdirs() - FileOutputStream(file).use { out -> - while (true) { - if (cancelled.get()) return null - val read = tar.read(buffer, 0, buffer.size) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - } - true - } - if (opened.isSuccess && entries > 0) return Unit - if (opened.isFailure && codec == null) throw opened.exceptionOrNull() ?: IllegalStateException("tar") - return null - } - - private fun single(archive: File, codec: String, handle: DownloadQueue.JobHandle) { - val name = archive.name.substringBeforeLast('.') - val file = target(name.ifBlank { "game" }) ?: throw IllegalStateException("archive") - file.parentFile?.mkdirs() - val total = archive.length() - var written = 0L - val buffer = ByteArray(64 * 1024) - FileInputStream(archive).use { raw -> - val stream = when (codec) { - "bz2" -> BZip2CompressorInputStream(BufferedInputStream(raw)) - "xz" -> XZCompressorInputStream(BufferedInputStream(raw)) - else -> GzipCompressorInputStream(BufferedInputStream(raw)) - } - stream.use { input -> - FileOutputStream(file).use { out -> - while (true) { - if (cancelled.get()) return - val read = input.read(buffer) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - - private fun copy(source: File, target: File) { - target.parentFile?.mkdirs() - FileInputStream(source).use { input -> FileOutputStream(target).use { out -> input.copyTo(out, 128 * 1024) } } - } - - // Streaming readers stop silently on zips whose data descriptors disagree with the local headers; - // the central directory is authoritative. - private fun unzip(archive: File, handle: DownloadQueue.JobHandle) { - val total = archive.length() - var written = 0L - val buffer = ByteArray(64 * 1024) - ZipFile.builder().setFile(archive).get().use { zip -> - for (entry in zip.entries) { - if (cancelled.get()) return - val target = target(entry.name) - if (target == null) { - handle.log("itch.io: skipped an entry outside the game folder") - continue - } - if (entry.isDirectory) { - target.mkdirs() - continue - } - target.parentFile?.mkdirs() - zip.getInputStream(entry).use { input -> - FileOutputStream(target).use { out -> - while (true) { - if (cancelled.get()) return - val read = input.read(buffer) - if (read < 0) break - out.write(buffer, 0, read) - written += read - handle.stageProgress(written, total) - } - } - } - } - } - } - private companion object } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt index d4a16c4098..6f50a03039 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt @@ -10,7 +10,6 @@ import java.time.Instant internal object XboxCatalog { private val productId = Regex("[A-Z0-9]{12}") private val plans = setOf("CFQ7TTC0KGQ8", "CFQ7TTC0KHS0", "CFQ7TTC0P85B", "CFQ7TTC0K5DJ", "CFQ7TTC0K6L8", "CFQ7TTC10QFD") - /** Plans whose store offers advertise PC games. Library entitlements under any active plan count, as the backend resolves a PC package for them. */ private val pcPlans = mapOf( "CFQ7TTC0KGQ8" to "PC Game Pass", "CFQ7TTC0KHS0" to "Game Pass Ultimate", @@ -137,7 +136,6 @@ internal object XboxCatalog { private const val CLOUD_GAME_PASS = "29a81209-df6f-41fd-a528-2ae6b91f719c" private const val CLOUD_ALL = "ce573635-7c18-4d0c-9d68-90b932393470" - /** Microsoft's public cloud lists (catalog.gamepass.com "sigls"; ids as Better xCloud by redphx, MIT, uses them). */ fun cloudCatalog(market: String = Xodus.market()): XboxCloudCatalog = XboxCloudCatalog(cloudList(CLOUD_GAME_PASS, market), cloudList(CLOUD_ALL, market)) @@ -169,7 +167,6 @@ val CatalogItem.xboxPc: Boolean get() = extra["pc"] != "0" val CatalogItem.xboxCloud: Boolean get() = extra["cloud"] == "1" val CatalogItem.xboxCloudId: String get() = extra["cloudId"]?.takeIf { it.isNotEmpty() } ?: id -/** Microsoft lists console and PC editions as separate products; a cloud-only one with a PC game's title folds into that card. */ internal fun mergeEditions(games: List<CatalogItem>): List<CatalogItem> { fun key(title: String) = title.lowercase().replace(Regex("[^a-z0-9]+"), "") val cloudOnly = games.filter { !it.xboxPc && it.xboxCloud }.groupBy { key(it.title) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt index 1fa7bdfe56..66f2a1fc89 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt @@ -27,11 +27,6 @@ import androidx.webkit.WebSettingsCompat import androidx.webkit.WebViewCompat import androidx.webkit.WebViewFeature -/** - * Microsoft's web player (xbox.com/play) in its own process and WebView data directory: the store sign-in - * clears its own web data after each attempt, so the player keeps a separate Microsoft session. Signing out of - * the store clears it ([clearWebSignIn]). - */ class XboxCloudActivity : ComponentActivity() { private var web: WebView? = null private var custom: View? = null @@ -61,7 +56,6 @@ class XboxCloudActivity : ComponentActivity() { loadWithOverviewMode = true userAgentString = chromeUserAgent(userAgentString) } - // No "X-Requested-With: <package>" header: it marks the page as embedded in an app. if (WebViewFeature.isFeatureSupported(WebViewFeature.REQUESTED_WITH_HEADER_ALLOW_LIST)) WebSettingsCompat.setRequestedWithHeaderOriginAllowList(view.settings, emptySet()) Log.i(TAG, "UA ${view.settings.userAgentString}") @@ -107,7 +101,6 @@ class XboxCloudActivity : ComponentActivity() { intent.getStringExtra("url")?.takeIf { url -> runCatching { java.net.URI(url) }.getOrNull()?.let { it.scheme == "https" && it.host == "www.xbox.com" && it.userInfo == null && it.port == -1 } == true } ?: START_URL - // Without the WebView markers the page treats this as Chrome for Android. private fun chromeUserAgent(default: String): String = default.replace("; wv)", ")").replace(Regex(" Version/\\d+(\\.\\d+)*"), "") @@ -124,7 +117,6 @@ class XboxCloudActivity : ComponentActivity() { if (hasFocus) hideBars() } - // A controller's unused B arrives as BACK; ask before leaving so a stray press never ends a stream. override fun dispatchKeyEvent(event: KeyEvent): Boolean { if (event.keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) { val fromController = event.source and InputDevice.SOURCE_GAMEPAD == InputDevice.SOURCE_GAMEPAD || diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt index 10b034eaae..1f8dd66e6d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt @@ -14,7 +14,6 @@ import java.io.File import java.net.HttpURLConnection import java.net.URL -/** Xbox games added to the Games tab to stream before (or without) installing them. */ object XboxCloudGames { class Entry(val id: String, val title: String, val poster: String?, val hero: String?) @@ -69,7 +68,6 @@ object XboxCloudGames { }.distinctBy { it.id } }.getOrDefault(emptyList()) - /** Games-tab rows for the added games that are not installed (an installed copy has its own row). */ fun rows(context: Context, installedIds: Set<String>): List<Library.SteamGame> = entries.filter { it.id !in installedIds }.map { e -> val dir = artDir(context, e.id) val appId = rowId(e.id) @@ -100,10 +98,6 @@ object XboxCloudGames { private val prefetching = java.util.concurrent.atomic.AtomicBoolean(false) - /** - * Fetches the streaming tokens in the background while a cloud game is on screen (about 20 s), so Stream starts at - * once; both players take them from this process (the native one through XboxCloudTokenService). - */ fun prefetch(context: Context) { val app = context.applicationContext if (!prefetching.compareAndSet(false, true)) return @@ -116,7 +110,6 @@ object XboxCloudGames { }, "xcloud-prefetch").start() } - /** Streaming runs outside the Linux session; the session owns the screen, audio and controllers while it runs. */ fun stream(context: Context, id: String, title: String) { if (SessionState.running) { android.widget.Toast.makeText(context, "Close the Steam session to stream Xbox games.", android.widget.Toast.LENGTH_LONG).show() @@ -125,7 +118,6 @@ object XboxCloudGames { context.startActivity(XboxCloudPlayerActivity.playerIntent(context, id, title).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) } - /** Whether the signed-in library says this game streams (cached library; reads disk). */ fun streams(context: Context, id: String): Boolean = runCatching { StoresState.library[Store.XBOX]?.firstOrNull { it.id == id }?.let { return it.xboxCloud } val app = context.applicationContext diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt index 9b8d11c0d0..354850932c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt @@ -43,7 +43,6 @@ import com.droiddeck.launcher.stores.StoresState import org.json.JSONObject import java.util.concurrent.Executors -/** Runs the WebRTC client page (tools/xcloud-player); signalling and tokens stay on this side of the bridge. */ class XboxCloudPlayerActivity : ComponentActivity() { private lateinit var root: FrameLayout private var web: WebView? = null @@ -57,7 +56,6 @@ class XboxCloudPlayerActivity : ComponentActivity() { @Volatile private var webUrl: String? = null @Volatile private var settings = XboxCloudSettings() @Volatile private var sessionSignals: XboxCloudSignalling? = null - /** The settings this stream started with (stream-start settings changed since then need a restart). */ @Volatile private var startedWith: XboxCloudSettings? = null private var menu: androidx.compose.ui.platform.ComposeView? = null @@ -106,7 +104,6 @@ class XboxCloudPlayerActivity : ComponentActivity() { allowContentAccess = false } view.setBackgroundColor(Color.BLACK) - // The Gamepad API only sees controllers while the WebView has input focus. view.isFocusable = true view.isFocusableInTouchMode = true view.addJavascriptInterface(Bridge(), "DDCloud") @@ -225,7 +222,6 @@ class XboxCloudPlayerActivity : ComponentActivity() { private fun isGuideKey(event: KeyEvent): Boolean = event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE - /** One press is the stream's Xbox button; two quick presses or a hold open the player menu. */ private fun guideKey(event: KeyEvent): Boolean { if (!isGuideKey(event)) return false if (event.action == KeyEvent.ACTION_DOWN) { @@ -256,7 +252,6 @@ class XboxCloudPlayerActivity : ComponentActivity() { web?.evaluateJavascript("window.__ddButton && window.__ddButton('Nexus', $value)", null) } - // Back opens the player menu so a stray press never ends a stream. override fun dispatchKeyEvent(event: KeyEvent): Boolean { if (menu != null) { if (isGuideKey(event)) { @@ -274,7 +269,6 @@ class XboxCloudPlayerActivity : ComponentActivity() { if (event.action == KeyEvent.ACTION_UP) { if (notice == null) openMenu() else finish() } return true } - // Reporting controller buttons handled stops Android turning an unused one into a fallback key. val handled = super.dispatchKeyEvent(event) val fromController = event.source and android.view.InputDevice.SOURCE_GAMEPAD == android.view.InputDevice.SOURCE_GAMEPAD || event.source and android.view.InputDevice.SOURCE_JOYSTICK == android.view.InputDevice.SOURCE_JOYSTICK @@ -389,7 +383,6 @@ class XboxCloudPlayerActivity : ComponentActivity() { fun intent(context: Context, productId: String, title: String): Intent = Intent(context, XboxCloudPlayerActivity::class.java) .putExtra("product", productId.uppercase()).putExtra("title", title) - /** The player the settings pick: the native engine (frame generation) where it can run, else the web player. */ fun playerIntent(context: Context, productId: String, title: String): Intent { val native = XboxNativePlayerActivity.supported() && XboxCloudSettings.load(context).playerEngine == "native" return if (!native) intent(context, productId, title) else Intent(context, XboxNativePlayerActivity::class.java) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt index ca21202781..835a55166c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt @@ -6,7 +6,6 @@ import org.json.JSONObject import java.net.HttpURLConnection import java.net.URL -/** Streaming-service tokens stay in memory only. Request shapes follow Greenlight / xal-node by unknownskl (MIT). */ internal object XboxCloudSession { class Region(val name: String, val baseUri: String, val isDefault: Boolean) @@ -22,7 +21,6 @@ internal object XboxCloudSession { @Volatile private var cached: Session? = null - /** One fetch at a time (about 20 s: two ticket exchanges); a second caller waits and gets the same tokens. */ @Synchronized fun get(app: Context, account: String): Session { cached?.takeIf { it.account == account && it.fresh }?.let { return it } @@ -39,10 +37,6 @@ internal object XboxCloudSession { fun clear() { cached = null; titleIds = null } - /** - * For the native player's own process: the main process's tokens (it keeps them, and fetches them ahead while a - * cloud game's page is open), handed over in memory through XboxCloudTokenService; null if that is not reachable. - */ fun fromMainProcess(app: Context, account: String, timeoutSeconds: Long = 90): Session? { cached?.takeIf { it.account == account && it.fresh }?.let { return it } val reply = XboxCloudTokenService.request(app, account, timeoutSeconds) ?: return null diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt index 7b8806a36e..247b1b033b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt @@ -4,43 +4,41 @@ import android.content.Context import org.json.JSONObject data class XboxCloudSettings( - val resolution: String = "1080p", // 720p | 1080p | 1080p_hq - val region: String = "", // "" = Microsoft's choice - val language: String = "", // "" = the device's language - val codec: String = "default", // default | high | normal | low - val bitrateMbps: Int = 0, // 0 = no cap + val resolution: String = "1080p", + val region: String = "", + val language: String = "", + val codec: String = "default", + val bitrateMbps: Int = 0, val preventDrops: Boolean = false, - val statsLevel: Int = 0, // 0 off, 1 fps, 2 basic, 3 detailed, 4 full + val statsLevel: Int = 0, val statsLayout: String = "horizontal", - val statsCorner: String = "right", // right | left - val volume: Int = 100, // 100..300 % - val rumble: Int = 100, // 0..100 % + val statsCorner: String = "right", + val volume: Int = 100, + val rumble: Int = 100, val maxFps: Int = 0, val brightness: Int = 0, val contrast: Int = 0, val gamma: Float = 1f, val saturation: Int = 100, val sharpen: Int = 0, - val sharpenMode: String = "cas", // cas | usm + val sharpenMode: String = "cas", val deband: Int = 0, val fxaa: Boolean = false, val toon: Boolean = false, val crt: Boolean = false, val ntsc: Boolean = false, - val playerEngine: String = "web", // web | native (WebRTC library + DroidDeck's compositor, frame generation) - val frameGen: String = "ddfg", // native engine: off | ddfg (2x) | lsfg | lsfg3 | lsfg4 (needs Lossless.dll) - val fpsLimit: Int = 0, // native engine target: 0 = the screen's rate, else 30/45/60/120/144/165 - val fpsCustomOn: Boolean = false, // use fpsCustom instead of the presets - val fpsCustom: Int = 60, // 10..165 - val instantInput: Boolean = true, // native: send controller changes at once (else every 16 ms) - val smallBuffer: Boolean = false, // native: WebRTC shows frames as soon as decoded (no playout delay) - val fastDecoder: Boolean = true, // native: the hardware decoder's low-latency mode - val zeroCopy: Boolean = false, // native, frame generation off: decode straight onto the screen + val playerEngine: String = "web", + val frameGen: String = "ddfg", + val fpsLimit: Int = 0, + val fpsCustomOn: Boolean = false, + val fpsCustom: Int = 60, + val instantInput: Boolean = true, + val smallBuffer: Boolean = false, + val fastDecoder: Boolean = true, + val zeroCopy: Boolean = false, ) { - /** The native engine's frame-rate target (0 = the screen's own rate). */ val fpsTarget get() = if (fpsCustomOn) fpsCustom else fpsLimit - /** The service picks the stream resolution from the reported OS (Better xCloud's mapping). */ val osName get() = when (resolution) { "720p" -> "android"; "1080p_hq" -> "tizen"; else -> "windows" } fun toJson(): String = JSONObject() diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt index 1131fb1245..b4f9ab9cb3 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt @@ -52,18 +52,14 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -/** Shared by the Xbox cloud settings page and the in-player menu; [live] changes reach the running stream. */ @Composable fun XboxCloudSettingsPanel( settings: XboxCloudSettings, regions: List<String>, live: Boolean, - /** "stream", "picture" or "overlay" shows that section only; null shows all. */ section: String? = null, - /** The row to select when the panel opens (the last one used), or null for no initial selection. */ restoreRow: Int? = null, onRowFocused: (Int) -> Unit = {}, - /** The settings the running stream started with; rows that differ say they need a restart (null: no stream). */ startedWith: XboxCloudSettings? = null, onChange: (XboxCloudSettings) -> Unit, ) { @@ -78,7 +74,6 @@ fun XboxCloudSettingsPanel( } } -/** Gives each settings row its place in the page, so the last-used row can be selected again. */ private class PanelFocus { var next = 0 var count = 0 @@ -99,7 +94,6 @@ private fun PanelContent( startedWith: XboxCloudSettings?, onChange: (XboxCloudSettings) -> Unit, ) { - // Stream-start settings changed during a stream wait for a restart; back at the starting value, no note. fun pending(differs: (XboxCloudSettings) -> Boolean) = startedWith != null && differs(startedWith) if (section == null || section == "stream") Section("Stream", if (live) "Applies to the next stream." else "Applies when a stream starts.") { @@ -116,7 +110,6 @@ private fun PanelContent( "apply to the web engine.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 8.dp, bottom = 6.dp)) } - // The service picks the size from the reported device profile (the PC profile can send 1440p). Choice("Resolution", listOf("720p" to "720p (phone)", "1080p" to "Best (PC)", "1080p_hq" to "1080p HQ (TV)"), settings.resolution, pending { it.resolution != settings.resolution }) { onChange(settings.copy(resolution = it)) } Choice("Server region", listOf("" to "Automatic") + regions.map { it to it }, settings.region, @@ -176,7 +169,6 @@ private fun PanelContent( settings.zeroCopy) { onChange(settings.copy(zeroCopy = it)) } } - // "overlay-native": the native player's page (its sound has no volume boost). if (section == null || section == "overlay" || section == "overlay-native") Section("Overlay and sound", null) { Choice("Performance overlay", listOf(0 to "Off", 1 to "FPS only", 2 to "Basic", 3 to "Detailed", 4 to "Full"), settings.statsLevel) { onChange(settings.copy(statsLevel = it)) @@ -202,10 +194,6 @@ private fun Section(title: String, note: String?, content: @Composable ColumnSco } } -/** - * One settings row, driven by a controller: it takes focus as a whole (highlighted), Left / Right change its - * value, A / Enter selects; the − / + buttons and switches inside stay for touch only. - */ @Composable private fun SettingRow( onLeft: (() -> Unit)?, @@ -236,7 +224,6 @@ private fun SettingRow( if (action != null) { action(); true } else false } .focusable() - // A tap selects too, without a second focus stop (a clickable would be one). .pointerInput(Unit) { detectTapGestures { currentSelect?.invoke() } } .padding(horizontal = 8.dp, vertical = 4.dp), verticalAlignment = Alignment.CenterVertically, @@ -257,7 +244,6 @@ private fun Step(label: String, value: String, onMinus: () -> Unit, onPlus: () - } } -/** A value slider (touch) that a controller moves with Left / Right in steps of 1 (hold to repeat). */ @Composable private fun SliderRow(label: String, value: Int, min: Int, max: Int, onValue: (Int) -> Unit) { SettingRow(onLeft = { onValue((value - 1).coerceAtLeast(min)) }, onRight = { onValue((value + 1).coerceAtMost(max)) }, onSelect = null) { @@ -293,7 +279,6 @@ private fun Toggle(label: String, note: String, checked: Boolean, needsRestart: color = MaterialTheme.colorScheme.tertiary, modifier = Modifier.padding(start = 8.dp, bottom = 4.dp)) } -/** One entry of the cloud players' menu list (highlighted when selected; A or a tap opens it). */ @Composable internal fun XboxMenuEntry(title: String, note: String?, focus: FocusRequester? = null, onFocused: () -> Unit = {}, onClick: () -> Unit) { val cs = MaterialTheme.colorScheme diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt index a5e7587af9..8488de6e9b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt @@ -3,7 +3,6 @@ package com.droiddeck.launcher.stores.xbox import org.json.JSONArray import org.json.JSONObject -/** Request shapes follow Microsoft's web player as Greenlight (MIT) implements them. */ internal class XboxCloudSignalling( private val session: XboxCloudSession.Session, private val titleId: String, @@ -62,7 +61,6 @@ internal class XboxCloudSignalling( private fun version(min: Int, max: Int) = JSONObject().put("minVersion", min).put("maxVersion", max) - /** The exchange answers 204 until the console has replied. */ private fun poll(path: String): XboxCloudSession.Reply { repeat(60) { val reply = XboxCloudSession.request(session, "GET", path) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt index 03df4c19d4..1568406ed9 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt @@ -16,10 +16,6 @@ import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors import java.util.concurrent.TimeUnit -/** - * Hands the main process's Xbox Cloud Gaming tokens to the native player's process (:xcloudnative) over Binder, so - * they stay in memory (not exported, same app only) and a stream does not wait for a second ~20 s token fetch. - */ class XboxCloudTokenService : Service() { private val worker = Executors.newSingleThreadExecutor() private val messenger = Messenger(Handler(Looper.getMainLooper()) { message -> @@ -42,7 +38,6 @@ class XboxCloudTokenService : Service() { private const val REQUEST = 1 private const val REPLY = 2 - /** Blocks until the main process answers (its tokens, or "error"), or returns null when it cannot be reached. */ fun request(context: Context, account: String, timeoutSeconds: Long): Bundle? { val app = context.applicationContext val done = CountDownLatch(1) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt index f969c20ebb..c8b126519f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt @@ -14,7 +14,6 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str val name = "droiddeck-xbox-${UUID.randomUUID()}" private val generation = lifecycle(app, expectedGeneration) { it } private val server = LocalServerSocket(name) - // Some devices refuse the abstract socket from inside PRoot; the backend then falls back to this keyed loopback port. private val loopback = java.net.ServerSocket(0, 8, java.net.InetAddress.getByAddress(byteArrayOf(127, 0, 0, 1))) val port: Int get() = loopback.localPort val key: String = ByteArray(32).also { java.security.SecureRandom().nextBytes(it) }.joinToString("") { "%02x".format(it) } @@ -38,7 +37,6 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str return false } - /** Also written to the stores log: sign-in runs in its own process, where only that file reaches a shared log. */ private fun note(text: String) { android.util.Log.w("XboxCredentials", text) com.droiddeck.launcher.stores.StoreLogFiles.stamped(app, "Xbox credentials: $text") @@ -84,7 +82,6 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str } } } - /** Each connection gets its own thread; an accept error is logged and retried instead of silently ending the loop. */ private fun <S> listen(route: String, accept: () -> S, serve: (S) -> Unit) = Thread({ var failures = 0 while (!closed) { @@ -101,7 +98,6 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str } }, "xbox-credentials-$route").start() - /** Logs requests that take 2 s or more, and the stage a request is still in after 8 s (the backend waits 30 s). */ private fun tracked(route: String, block: (step: (String) -> Unit) -> JSONObject): JSONObject { val started = android.os.SystemClock.elapsedRealtime() val stage = java.util.concurrent.atomic.AtomicReference("auth") @@ -183,7 +179,6 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str } } - /** The connecting socket must belong to this app's user; an unreadable table (newer Android) leaves the key as the check. */ private fun loopbackOwner(peerPort: Int): Boolean { val uid = android.os.Process.myUid() val rows = listOf("/proc/net/tcp", "/proc/net/tcp6").mapNotNull { runCatching { java.io.File(it).readLines().drop(1) }.getOrNull() }.flatten() diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxGamertag.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxGamertag.kt index b065e8bafe..c6e62596b4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxGamertag.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxGamertag.kt @@ -4,15 +4,12 @@ import android.content.Context import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreAccounts import com.droiddeck.launcher.stores.StoresState -/** Keeps the account's Xbox gamertag in its record so the Stores page can show it instead of the sign-in email. */ internal object XboxGamertag { - /** `xodus-cli profile` allows itself 45 s, and starting it through PRoot adds to that. */ private const val TIMEOUT_SECONDS = 75L private val triedGeneration = java.util.concurrent.atomic.AtomicReference<String?>(null) internal fun valid(value: String): Boolean = value.isNotEmpty() && value.length <= 64 && value.none { it.isISOControl() } - /** Reads the gamertag with `xodus-cli profile` and stores it; false when Xbox didn't return one. */ fun refresh(app: Context, credentialGeneration: String? = null): Boolean = try { val gamertag = Xodus.run(app, listOf("profile", "--json"), timeout = TIMEOUT_SECONDS, credentialGeneration = credentialGeneration) .optString("gamertag").trim() @@ -29,7 +26,6 @@ internal object XboxGamertag { false } - /** Fetches a missing gamertag once per signed-in account, on its own thread so it never holds up a library sync. */ fun ensure(app: Context) { Thread({ runCatching { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt index 39840b2608..530eca4e58 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt @@ -55,8 +55,6 @@ class XboxLoginActivity : ComponentActivity() { Thread({ if (closed) return@Thread try { - // A record without a username is left from a sign-in that never finished; starting clean - // also avoids reading it back with an older, slow Keystore key. progress("preparing the sign-in", "Preparing Microsoft sign-in…") val leftover = StoreAccounts.read(applicationContext, Store.XBOX) if (leftover != null && leftover.optString("username").isBlank()) { @@ -73,7 +71,6 @@ class XboxLoginActivity : ComponentActivity() { Xodus.start(applicationContext, listOf("--external-webview-stdio", "login"), credentialGeneration = accountGeneration).use { process -> child = process if (closed) return@use - // StoresState.logLine writes no file in this process, so the reason would miss the shared log. Xodus.diagnostics(process) { line -> logStep(line) line.removePrefix("NEXUS_CREDENTIAL_ERROR_V1 ").takeIf { it != line && it !in codes && codes.size < 6 }?.let(codes::add) @@ -164,7 +161,6 @@ class XboxLoginActivity : ComponentActivity() { private fun progress(name: String, text: String) { step = name; show(text) } - /** Written to the stores log, which the shared log zip carries; the main process's log helpers don't run in this process. */ private fun logStep(line: String) { val text = StoreLog.redactLine("Xbox sign-in: $line") Log.i(TAG, text) @@ -230,7 +226,6 @@ class XboxLoginActivity : ComponentActivity() { companion object { private const val TAG = "XboxLogin" - /** Our own check messages are safe to show; anything else is named by its type, never its text, which may hold sign-in data. */ internal fun failure(e: Exception): String { val message = e.message.orEmpty() return if (e is IllegalStateException && message.isNotBlank() && message != "Check failed." && message.length <= 160) message diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt index 661023d542..e42c2ebaf6 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt @@ -4,14 +4,8 @@ import android.view.InputDevice import android.view.KeyEvent import android.view.MotionEvent -/** - * Controller state for the native cloud player, from Android key and motion events (no Gamepad API). Button - * bits follow the xCloud input report (Greenlight's packet.ts): Nexus 2, Menu 4, View 8, A 16, B 32, X 64, - * Y 128, D-pad 256..2048, shoulders 4096 / 8192, stick clicks 16384 / 32768. - */ internal class XboxNativePad { data class State(val buttons: Int, val lx: Float, val ly: Float, val rx: Float, val ry: Float, val lt: Float, val rt: Float) { - /** Greenlight's rule: any button change, a stick moved past 0.08 or held past 0.15, a trigger past 0.01. */ fun differsFrom(o: State): Boolean = buttons != o.buttons || listOf(lx to o.lx, ly to o.ly, rx to o.rx, ry to o.ry).any { (a, b) -> Math.abs(a - b) > 0.08f || Math.abs(a) > 0.15f } || Math.abs(lt - o.lt) > 0.01f || Math.abs(rt - o.rt) > 0.01f @@ -22,15 +16,12 @@ internal class XboxNativePad { @Volatile private var lx = 0f; @Volatile private var ly = 0f @Volatile private var rx = 0f; @Volatile private var ry = 0f @Volatile private var lt = 0f; @Volatile private var rt = 0f - /** Called after any change (instant controller input). */ @Volatile var onChanged: (() -> Unit)? = null - /** Buttons pressed on behalf of the app (the menu's Xbox button), OR-ed in. */ @Volatile var overrideButtons = 0 fun snapshot() = State(buttons or hatButtons or overrideButtons, lx, ly, rx, ry, lt, rt) - /** True when the event was a controller button this pad tracks. */ fun onKey(event: KeyEvent): Boolean { val bit = when (event.keyCode) { KeyEvent.KEYCODE_BUTTON_A -> 16 @@ -47,7 +38,6 @@ internal class XboxNativePad { KeyEvent.KEYCODE_BUTTON_THUMBR -> 32768 KeyEvent.KEYCODE_BUTTON_START -> 4 KeyEvent.KEYCODE_BUTTON_SELECT -> 8 - // Digital triggers on pads without analog axes. KeyEvent.KEYCODE_BUTTON_L2 -> { lt = if (event.action == KeyEvent.ACTION_DOWN) 1f else 0f; onChanged?.invoke(); return true } KeyEvent.KEYCODE_BUTTON_R2 -> { rt = if (event.action == KeyEvent.ACTION_DOWN) 1f else 0f; onChanged?.invoke(); return true } else -> return false @@ -57,7 +47,6 @@ internal class XboxNativePad { return true } - /** True when the event came from a joystick (sticks, triggers, hat). */ fun onMotion(event: MotionEvent): Boolean { if (event.source and InputDevice.SOURCE_JOYSTICK != InputDevice.SOURCE_JOYSTICK || event.action != MotionEvent.ACTION_MOVE) return false val device = event.device diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt index 1333be117c..2125bf802a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt @@ -56,13 +56,6 @@ import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors import java.util.concurrent.TimeUnit -/** - * Native Xbox Cloud Gaming player (opt-in, Android 10+): Google's WebRTC library instead of the web page, the - * xCloud channels ported from Greenlight (XboxNativeProtocol), controller from Android input events, and the - * picture through DroidDeck's own compositor (XboxNativeVideo) so DDFG or LSFG can generate frames. Runs in - * its own process (:xcloudnative): that compositor instance is never the Linux session's. - * Sign-in and session requests are the web player's (XboxCloudSession, XboxCloudSignalling). - */ class XboxNativePlayerActivity : ComponentActivity() { private lateinit var root: FrameLayout private lateinit var surfaceView: SurfaceView @@ -79,9 +72,7 @@ class XboxNativePlayerActivity : ComponentActivity() { @Volatile private var signalling: XboxCloudSignalling? = null @Volatile private var settings = XboxCloudSettings() @Volatile private var closed = false - /** The stream reached the screen at least once (a later failure is a lost connection, not a failed start). */ @Volatile private var connectedOnce = false - /** The session was ended because the player stayed in the background (Android freezes the app soon after). */ @Volatile private var endedInBackground = false private var backgroundEnd: Runnable? = null private var notice: androidx.compose.ui.platform.ComposeView? = null @@ -93,14 +84,8 @@ class XboxNativePlayerActivity : ComponentActivity() { private var menuPage by androidx.compose.runtime.mutableStateOf("") private var lastMainEntry = 0 private val lastRow = mutableMapOf<String, Int>() - /** The settings this stream started with (stream-start settings changed since then need a restart). */ private var startedWith: XboxCloudSettings? = null - /** - * The picture's route right now: true = zero-copy (decoder straight onto the screen), false = WebRTC's texture - * through the Vulkan compositor. Zero-copy whenever it is chosen and frame generation is off; switched live. - */ @Volatile private var zeroCopy = false - /** The SurfaceView's surface while it exists (UI thread). */ private var screen: android.view.Surface? = null private var screenW = 0 private var screenH = 0 @@ -108,7 +93,6 @@ class XboxNativePlayerActivity : ComponentActivity() { @Volatile private var decoders: org.webrtc.DroidDeckLowLatencyDecoderFactory? = null private var lastZeroCopyFrames = 0L private var lastSubmitted = 0L - /** The release of the Guide press that opened the menu must not close it again. */ private var swallowGuideUp = false override fun onCreate(savedInstanceState: Bundle?) { @@ -138,7 +122,6 @@ class XboxNativePlayerActivity : ComponentActivity() { override fun surfaceCreated(holder: SurfaceHolder) {} override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) { screen = holder.surface; screenW = width; screenH = height - // Zero-copy: the decoder owns this surface (back on it after a stand-in); the Vulkan compositor must not connect to it. if (zeroCopy) { decoders?.setZeroCopySurface(holder.surface); return } @Suppress("DEPRECATION") nativeVideo.setSurface(holder.surface, width, height, windowManager.defaultDisplay.refreshRate) @@ -166,12 +149,10 @@ class XboxNativePlayerActivity : ComponentActivity() { webPlayer = true) } - /** One popup at a time, in the app's dialog style; A or Enter picks the selected button, Back closes the player. */ private fun showNotice(title: String, text: String, webPlayer: Boolean) = runOnUiThread { if (notice != null || isFinishing || isDestroyed) return@runOnUiThread closeMenu() show("") - // The stream is over: stale numbers must not stay on screen. overlayOn = false overlay.visibility = android.view.View.GONE val view = androidx.compose.ui.platform.ComposeView(this) @@ -207,13 +188,9 @@ class XboxNativePlayerActivity : ComponentActivity() { root.addView(view, FrameLayout.LayoutParams(-1, -1)) } - // ---- background ---- - override fun onStop() { super.onStop() if (closed || isChangingConfigurations || signalling == null || endedInBackground) return - // Android freezes a background app about a minute after it leaves the screen; the connection then dies - // without a goodbye. End the session cleanly before that and offer a restart on return. log("in the background") val end = Runnable { backgroundEnd = null; endInBackground() } backgroundEnd = end @@ -243,15 +220,12 @@ class XboxNativePlayerActivity : ComponentActivity() { runCatching { pc?.close() } } - // ---- session ---- - private fun run() { val account = com.droiddeck.launcher.stores.StoreAccounts.signedInAs(applicationContext, com.droiddeck.launcher.stores.Store.XBOX) ?: error("Sign in to the Xbox store first.") val requested = intent.getStringExtra("product").orEmpty() val cached = XboxLibraryCache.read(applicationContext, account, Xodus.market())?.games?.firstOrNull { it.id == requested } val product = cached?.extra?.get("cloudId")?.takeIf { it.isNotEmpty() } ?: requested - // The main process's tokens when it has them (no second ~20 s fetch); else this process fetches its own. val shared = runCatching { XboxCloudSession.fromMainProcess(applicationContext, account) } .onFailure { log("tokens from the main process: ${it.message?.take(160)}") }.getOrNull() log(if (shared != null) "tokens from the main process" else "tokens fetched here") @@ -280,7 +254,6 @@ class XboxNativePlayerActivity : ComponentActivity() { if (closed) return show("Connecting…") - // Small network buffer: no playout delay, frames go to the decoder and screen as soon as they are complete. val trials = if (settings.smallBuffer) "WebRTC-ForcePlayoutDelay/min_ms:0,max_ms:0/WebRTC-ZeroPlayoutDelay/min_pacing:0ms,max_decode_queue_size:8/" else "" PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions.builder(applicationContext) .setFieldTrials(trials).createInitializationOptions()) @@ -290,7 +263,6 @@ class XboxNativePlayerActivity : ComponentActivity() { surfaceView.holder.surface.takeIf { it.isValid } } else null if (zeroSurface != null) { - // The compositor may already hold the screen; it must let go before the decoder takes it. val ready = CountDownLatch(1) runOnUiThread { zeroCopy = true; video?.setSurface(null, 0, 0, 60f); ready.countDown() } ready.await(2, TimeUnit.SECONDS) @@ -336,7 +308,6 @@ class XboxNativePlayerActivity : ComponentActivity() { return reply } - /** Opus stereo (Greenlight), H.264 profile order (Main first unless the user picked one) and the bitrate cap. */ private fun tweakOffer(sdp: String): String { var out = sdp.replace("useinbandfec=1", "useinbandfec=1; stereo=1") val prefix = when (settings.codec) { "low" -> "420"; "normal" -> "42e"; else -> "4d" } @@ -360,7 +331,6 @@ class XboxNativePlayerActivity : ComponentActivity() { return out } - /** The server's candidates, plus the IPv4 behind a Teredo address (Greenlight's ice.ts / teredo.ts). */ private fun addRemoteCandidate(peer: PeerConnection, c: JSONObject) { val line = c.optString("candidate").removePrefix("a=") if (line.isEmpty() || line == "end-of-candidates") return @@ -410,11 +380,9 @@ class XboxNativePlayerActivity : ComponentActivity() { private fun attach(receiver: RtpReceiver) = synchronized(this) { val track = receiver.track() - // Always attached: in zero-copy WebRTC delivers no frames, and after a live switch back they flow again. if (track is VideoTrack && !videoAttached) { videoAttached = true; video?.let { track.addSink(it) }; log("video track") } } - /** LSFG needs the Lossless.dll and its shader cache built; otherwise DDFG. */ private fun effectiveFrameGen(): String { if (!XboxNativeVideo.isLsfg(settings.frameGen)) return settings.frameGen val status = com.droiddeck.launcher.gpu.Lossless.sync(applicationContext) @@ -439,8 +407,6 @@ class XboxNativePlayerActivity : ComponentActivity() { override fun onSetFailure(error: String) = done(Result.failure(IllegalStateException(error))) } - // ---- input, rumble, overlay ---- - private var guideDown = false private var guideDownAt = 0L private var lastGuideUp = 0L @@ -454,7 +420,6 @@ class XboxNativePlayerActivity : ComponentActivity() { override fun dispatchKeyEvent(event: KeyEvent): Boolean { if (menu != null) { - // Guide closes the menu; Back goes up one page, then closes it. if (isGuide(event)) { if (event.action == KeyEvent.ACTION_UP) { if (swallowGuideUp) swallowGuideUp = false else closeMenu() }; return true } if (event.keyCode == KeyEvent.KEYCODE_BACK) { if (event.action == KeyEvent.ACTION_UP) { if (menuPage.isNotEmpty()) menuPage = "" else closeMenu() } @@ -462,7 +427,6 @@ class XboxNativePlayerActivity : ComponentActivity() { } return super.dispatchKeyEvent(event) } - // Guide / the Input Controls menu button: once = the Xbox button, twice or held = the player menu. if (isGuide(event)) { if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { val pending = pendingNexus @@ -482,7 +446,6 @@ class XboxNativePlayerActivity : ComponentActivity() { return super.dispatchKeyEvent(event) } - // With the menu open, sticks and the hat go to Android unhandled, which turns them into D-pad keys for the menu. override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean = (menu == null && pad.onMotion(event)) || super.dispatchGenericMotionEvent(event) @@ -495,7 +458,6 @@ class XboxNativePlayerActivity : ComponentActivity() { runCatching { vibrator.vibrate(VibrationEffect.createOneShot(durationMs.coerceAtMost(1000).toLong(), amplitude)) } } - /** The overlay is remembered with the other cloud settings (on = overlay level above 0). */ @Volatile private var overlayOn = false private var lastJitterDelay = 0.0 @@ -507,12 +469,6 @@ class XboxNativePlayerActivity : ComponentActivity() { private var lastLost = 0.0 private var lastReceived = 0.0 - /** - * The overlay, at the web player's levels and layout (settings statsLevel / statsLayout): 1 fps and frame - * generation base -> shown; 2 + resolution, ping; 3 + bitrate, jitter buffer, decode time, packet loss; 4 + frame - * generation's added delay, the estimated picture delay (one-way network + buffer + decode + frame generation + - * one screen refresh), codec and server. - */ private fun updateOverlay() { val level = settings.statsLevel if (!overlayOn || level <= 0) return @@ -549,7 +505,6 @@ class XboxNativePlayerActivity : ComponentActivity() { (m["currentRoundTripTime"] as? Number)?.toDouble()?.let { rttMs = it * 1000 } } } - // Zero-copy: WebRTC never sees a decoded frame, so size and decode time come from the decoder itself. if (zeroCopy) decoders?.let { d -> d.videoSize()?.let { size = it } val ms = d.takeDecodeMs() @@ -561,8 +516,6 @@ class XboxNativePlayerActivity : ComponentActivity() { val fgGpuMs = if (fgOn && fg!![5] > 0f) fg[5].toDouble() else 0.0 @Suppress("DEPRECATION") val refreshMs = 1000.0 / windowManager.defaultDisplay.refreshRate val total = (if (rttMs >= 0) rttMs / 2 else 0.0) + bufferMs + decodeMs + fgWaitMs + fgGpuMs + refreshMs - // What reaches the screen: the decoder's own count in zero-copy, the presented rate with frame generation, - // else the frames handed to the compositor (a frame-rate target drops some of WebRTC's decoded frames). val submitted = video?.frames ?: 0L val handed = (submitted - lastSubmitted).toInt().also { lastSubmitted = submitted } val shownFps = when { @@ -591,9 +544,6 @@ class XboxNativePlayerActivity : ComponentActivity() { } } - // ---- menu ---- - - /** The player menu (as the web player's): Resume, Xbox menu, Frame generation, Stream quality, overlay, Leave. */ private fun openMenu() { if (menu != null) return pad.reset() @@ -607,7 +557,6 @@ class XboxNativePlayerActivity : ComponentActivity() { val entries = androidx.compose.runtime.remember { List(7) { androidx.compose.ui.focus.FocusRequester() } } val choices = androidx.compose.runtime.remember { List(5) { androidx.compose.ui.focus.FocusRequester() } } androidx.compose.runtime.LaunchedEffect(menuPage) { - // Wait a frame so the entries are attached before one of them takes the selection. androidx.compose.runtime.withFrameNanos { } runCatching { if (menuPage.isEmpty()) entries[lastMainEntry.coerceIn(0, 6)].requestFocus() @@ -615,8 +564,6 @@ class XboxNativePlayerActivity : ComponentActivity() { } } val cs = androidx.compose.material3.MaterialTheme.colorScheme - // A full-size box first: the root of a ComposeView gets fixed full-screen constraints, so the panel's - // width only holds inside it (as the web player's menu does). androidx.compose.foundation.layout.Box(androidx.compose.ui.Modifier.fillMaxSize()) { androidx.compose.foundation.layout.Column( androidx.compose.ui.Modifier.fillMaxHeight().width(400.dp).background(cs.surface.copy(alpha = 0.95f)) @@ -695,11 +642,6 @@ class XboxNativePlayerActivity : ComponentActivity() { view.requestFocus() } - /** - * Applies a settings change from any menu page at once: frame generation, the frame-rate target, zero-copy, instant - * input and the overlay. Resolution, region, language, codec, bitrate, the network buffer, the decoder mode and the - * engine belong to the cloud session and need a restart (the page says so). - */ private fun applyLive(before: XboxCloudSettings, changed: XboxCloudSettings) { settings = changed XboxCloudSettings.save(this, changed) @@ -709,10 +651,6 @@ class XboxNativePlayerActivity : ComponentActivity() { applyOverlay() } - /** - * Zero-copy draws every decoded frame straight onto the screen, so it is used only when nothing has to touch the - * frames: frame generation off and no frame-rate target below the stream's 60 fps (the compositor drops frames for that). - */ private fun zeroCopyWanted(s: XboxCloudSettings) = s.zeroCopy && s.frameGen == XboxNativeVideo.FG_OFF && (s.fpsTarget == 0 || s.fpsTarget >= 60) @@ -720,7 +658,6 @@ class XboxNativePlayerActivity : ComponentActivity() { overlayOn = settings.statsLevel > 0 overlay.visibility = if (overlayOn) android.view.View.VISIBLE else android.view.View.GONE overlay.textSize = 12f - // Top left keeps clear of the clock Xbox draws top right while its guide is open. val left = settings.statsCorner == "left" overlay.layoutParams = (overlay.layoutParams as FrameLayout.LayoutParams).apply { gravity = Gravity.TOP or (if (left) Gravity.START else Gravity.END) @@ -729,7 +666,6 @@ class XboxNativePlayerActivity : ComponentActivity() { overlay.gravity = if (left) Gravity.START else Gravity.END } - /** Stream-start settings need a new cloud session: end this one, then open the player again. */ private fun restartStream() { val signals = signalling closed = true @@ -756,10 +692,6 @@ class XboxNativePlayerActivity : ComponentActivity() { worker.execute { video?.setFrameGeneration(effectiveFrameGen()) } } - /** - * Live route switch (UI thread): zero-copy when chosen and frame generation is off, else the compositor. - * The screen surface takes one producer at a time, so the old one lets go before the new one connects. - */ private fun applyRoute() { val d = decoders ?: return val want = zeroCopyWanted(settings) @@ -783,10 +715,6 @@ class XboxNativePlayerActivity : ComponentActivity() { video?.setSurface(target, screenW, screenH, windowManager.defaultDisplay.refreshRate) } - /** - * Ask Android for the display mode whose refresh rate fits the target (at least the target when possible, - * else the fastest; the fastest for "the screen's rate"), so generated frames are not held back at 60 Hz. - */ private fun applyDisplayRate(target: Int) { @Suppress("DEPRECATION") val display = windowManager.defaultDisplay val current = display.mode @@ -799,10 +727,6 @@ class XboxNativePlayerActivity : ComponentActivity() { private val rehideBars = Runnable { if (window.decorView.hasWindowFocus()) hideBars() } - /** - * Bars that come back while the player has focus (return from recents or another app, a swipe) are hidden - * again after a moment; focus alone missed the return from the background (10-24). - */ private fun watchBars() { androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets -> if (insets.isVisible(WindowInsetsCompat.Type.navigationBars()) || insets.isVisible(WindowInsetsCompat.Type.statusBars())) { @@ -844,11 +768,9 @@ class XboxNativePlayerActivity : ComponentActivity() { } companion object { - /** How long a stream may stay in the background (Android froze the app ~70 s after it left the screen, 10-24). */ private const val BACKGROUND_GRACE_MS = 45_000L private val FG_MODES = listOf(XboxNativeVideo.FG_OFF, XboxNativeVideo.FG_DDFG, XboxNativeVideo.FG_LSFG, XboxNativeVideo.FG_LSFG3, XboxNativeVideo.FG_LSFG4) - /** True when the native engine can run here (ImageReader GPU buffers need Android 10). */ fun supported(): Boolean = Build.VERSION.SDK_INT >= 29 } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt index 348079f527..cb44b43fe5 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt @@ -1,3 +1,4 @@ +// The xCloud data-channel protocol is ported from Greenlight by UnknownSKL (Jim Kroon), MIT; see tools/xcloud-player/NOTICE.md. package com.droiddeck.launcher.stores.xbox import org.json.JSONObject @@ -11,12 +12,6 @@ import java.util.concurrent.Executors import java.util.concurrent.ScheduledFuture import java.util.concurrent.TimeUnit -/** - * The xCloud data-channel protocol for the native player, ported from Greenlight's player (UnknownSKL, MIT; - * tools/xcloud-player/greenlight/lib/channel): chat / control / input / message channels, the message - * handshake, authorization and gamepad announcements, and the binary input reports. The controller state - * comes from Android input events ([pad]); rumble reports come back through [onRumble]. - */ internal class XboxNativeProtocol( pc: PeerConnection, private val pad: XboxNativePad, @@ -81,12 +76,10 @@ internal class XboxNativeProtocol( "HandshakeAck" -> { handshakeDone = true log("handshake done") - // Greenlight's order: authorization (announces controller 0 and removes it), input start, config. send(control, JSONObject().put("message", "authorizationRequest").put("accessKey", "4BDB3609-C1F1-4195-9B37-FEFF45DA8B8E").toString()) gamepadChanged(0, true); gamepadChanged(0, false) startInput() sendConfig() - // Our controller, after the authorization's add/remove. gamepadChanged(0, true) send(control, JSONObject().put("message", "videoKeyframeRequested").put("ifrRequested", true).toString()) } @@ -101,7 +94,6 @@ internal class XboxNativeProtocol( complete(data.optString("id"), "") onServerDisconnect() } - // The game's own dialogs: accept (Greenlight shows a confirm; the native player has no page). "/streaming/systemUi/messages/ShowMessageDialog" -> complete(data.optString("id"), JSONObject().put("Result", 0)) else -> {} } @@ -134,18 +126,14 @@ internal class XboxNativeProtocol( } private fun startInput() { - // Client metadata: max touch points. send(input, header(8, 15).apply { put(1.toByte()); flip() }) loop = timer.scheduleWithFixedDelay({ runCatching { tick() } }, 16, 16, TimeUnit.MILLISECONDS) } - /** Instant controller input: send a report now if the state changed (the 16 ms loop stays as the heartbeat). */ fun inputChanged() { - // At most one extra report every 4 ms (stick motion arrives far faster than that). if (handshakeDone && loop != null && System.nanoTime() - lastSentAt > 4_000_000L) timer.execute { runCatching { tick() } } } - /** Greenlight's queue: a gamepad frame when the state changed (sticks past a small threshold) or every 33 ms. */ @Synchronized private fun tick() { val state = pad.snapshot() @@ -154,13 +142,13 @@ internal class XboxNativeProtocol( if (!changed && now - lastSentAt < 33_000_000L) return lastSent = state; lastSentAt = now val packet = header(2, 14 + 1 + 23).apply { - put(1.toByte()) // one frame - put(0.toByte()) // gamepad index + put(1.toByte()) + put(0.toByte()) putShort(state.buttons.toShort()) putShort(axis(state.lx)); putShort(axis(-state.ly)); putShort(axis(state.rx)); putShort(axis(-state.ry)) putShort(trigger(state.lt)); putShort(trigger(state.rt)) - putInt(1) // physical physicality - order(ByteOrder.BIG_ENDIAN); putInt(1); order(ByteOrder.LITTLE_ENDIAN) // virtual physicality (Greenlight writes it big-endian) + putInt(1) + order(ByteOrder.BIG_ENDIAN); putInt(1); order(ByteOrder.LITTLE_ENDIAN) flip() } send(input, packet) @@ -171,7 +159,7 @@ internal class XboxNativeProtocol( private fun onInputData(buffer: DataChannel.Buffer) { val data = buffer.data.order(ByteOrder.LITTLE_ENDIAN) - if (data.remaining() < 13 || (data.get(0).toInt() and 0xFF) != 128) return // vibration report + if (data.remaining() < 13 || (data.get(0).toInt() and 0xFF) != 128) return val strong = (data.get(4).toInt() and 0xFF) / 100f val weak = (data.get(5).toInt() and 0xFF) / 100f val duration = data.getShort(8).toInt() and 0xFFFF diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt index dc3657dbef..193f4e58b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt @@ -20,13 +20,6 @@ import org.webrtc.VideoSink import java.io.File import java.util.ArrayDeque -/** - * The native player's picture: WebRTC's hardware-decoded frames are drawn (GL, WebRTC's EglRenderer) into an - * ImageReader whose images are GPU-shareable HardwareBuffers, and each one goes to DroidDeck's own compositor in - * stream mode (WaylandCompositor.nativeStreamFrame) as the whole scene, where DroidDeck's frame generation (DDFG, - * or LSFG with the Lossless.dll) multiplies it. The player runs in its own process (:xcloudnative), so this - * compositor is never the one a Linux session uses. Android 10+ (ImageReader usage flags). - */ internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, private val log: (String) -> Unit) : VideoSink { companion object { const val FG_OFF = "off" @@ -40,7 +33,6 @@ internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, p fun modeName(mode: String) = when (mode) { FG_DDFG -> "DDFG 2×"; FG_LSFG -> "LSFG 2×"; FG_LSFG3 -> "LSFG 3×"; FG_LSFG4 -> "LSFG 4×"; else -> "Off" } - /** LSFG can run: the Lossless.dll was imported (or found in Steam) and its shader cache built. */ fun lsfgReady(context: Context) = Lossless.state(context).ready private const val SCALE_FIT = 1 private const val ALIGN_CENTER = 0 @@ -53,19 +45,16 @@ internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, p private var reader: ImageReader? = null private var readerW = 0 private var readerH = 0 - /** Images the compositor may still read: the oldest goes back to the reader once two newer ones arrived. */ private val held = ArrayDeque<Image>() private var surface: Surface? = null private var attached = false @Volatile private var frameGen = FG_OFF @Volatile private var refreshHz = 60f - /** The frame-rate target (0 = the screen's rate): the frame-gen pacer's cap, or a limit on stream frames without it. */ @Volatile private var fpsTarget = 0 private var nextDueNs = 0L @Volatile var frames = 0L private set - /** The screen: the compositor presents to it (null detaches, e.g. for zero-copy or when the surface goes). */ fun setSurface(target: Surface?, width: Int, height: Int, displayRefreshHz: Float) = synchronized(lock) { refreshHz = displayRefreshHz if (target == null) { @@ -75,7 +64,6 @@ internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, p } surface = target val runtime = File(context.cacheDir, "xcloud-wayland").apply { mkdirs() } - // System Vulkan driver; this process's compositor shows only the stream. val started = CompositorHost.startOrAttach(context, target, runtime.path, null, null, context.applicationInfo.nativeLibraryDir, width, height, displayRefreshHz, 0) if (started) { @@ -89,10 +77,6 @@ internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, p applyFrameGen() } - /** - * Gives the screen surface up and waits until the compositor has really disconnected from it: the window request - * is applied on the compositor thread at its next tick, and the decoder (zero-copy) can only connect after that. - */ private fun letGo() { WaylandCompositor.nativeSetFrameGenArmed(false, 0, 0) CompositorHost.detach(surface) @@ -100,13 +84,11 @@ internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, p if (!WaylandCompositor.nativeWaitSurface(1000)) log("compositor did not let go of the screen within 1 s") } - /** Frame-rate target, 0 = the screen's rate. Live. */ fun setFpsTarget(fps: Int) { fpsTarget = fps synchronized(lock) { if (attached) applyFrameGen() } } - /** off, ddfg (2x) or lsfg / lsfg3 / lsfg4 (needs the Lossless.dll). Live. */ fun setFrameGeneration(mode: String) { frameGen = mode synchronized(lock) { if (attached) applyFrameGen() } @@ -137,8 +119,6 @@ internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, p synchronized(lock) { if (r !== reader) { image.close(); return } val buffer = image.hardwareBuffer - // Without frame generation a target below the stream's rate drops stream frames evenly: each frame has a - // due time one interval after the last one's, so 30 of 60 frames (or 45: three of four) reach the screen. val now = System.nanoTime() val target = fpsTarget val skip = frameGen == FG_OFF && target in 1 until 60 && run { @@ -154,7 +134,6 @@ internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, p } private fun applyFrameGen() { - // The pacer caps generated output at this rate: the user's target, else the screen's. val cap = if (fpsTarget > 0) fpsTarget.toFloat() else refreshHz val mode = when { frameGen == FG_DDFG -> FrameGen.Mode(FrameGen.ENGINE_DDFG, 2) @@ -165,7 +144,6 @@ internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, p log("native frame generation: $frameGen, target ${if (fpsTarget > 0) fpsTarget else "screen"} fps" + (problem?.let { " ($it)" } ?: "")) } - /** {planned, planned, sourceFps, presentedFps, thermal, -1}, or null while nothing is shown. */ fun stats(): FloatArray? = synchronized(lock) { if (attached) WaylandCompositor.nativeFrameGenStats() else null } fun frameGenProblem(): Int = synchronized(lock) { if (attached) WaylandCompositor.nativeFrameGenProblem() else -1 } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt index 5d6160c44d..f803d06416 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt @@ -154,7 +154,6 @@ internal object Xodus { const val SIGN_IN_REJECTED = "Microsoft content licensing rejected sign-in \\(HTTP 401\\)\\. Sign in again in Settings\\." - /** Passes the backend's known stderr diagnostics to [report]; other stderr text never leaves the process. */ fun diagnostics(child: Child, report: (String) -> Unit = { com.droiddeck.launcher.stores.StoresState.logLine("Xbox: $it") }): Thread = Thread({ runCatching { child.process.errorStream.bufferedReader().useLines { lines -> lines.forEach { line -> diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncPrefs.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncPrefs.kt new file mode 100644 index 0000000000..a0b1a63cec --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncPrefs.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.sync + +import android.content.Context +import java.security.SecureRandom + +object SyncPrefs { + const val RUN_WHILE_OPEN = "open" + const val RUN_BACKGROUND = "background" + + private fun prefs(context: Context) = context.getSharedPreferences("syncthing", Context.MODE_PRIVATE) + + fun enabled(context: Context): Boolean = prefs(context).getBoolean("enabled", false) + fun setEnabled(context: Context, on: Boolean) { prefs(context).edit().putBoolean("enabled", on).apply() } + + fun runMode(context: Context): String = + prefs(context).getString("run", RUN_WHILE_OPEN).takeIf { it == RUN_BACKGROUND } ?: RUN_WHILE_OPEN + fun setRunMode(context: Context, mode: String) { prefs(context).edit().putString("run", mode).apply() } + + fun wifiOnly(context: Context): Boolean = prefs(context).getBoolean("wifi-only", false) + fun setWifiOnly(context: Context, on: Boolean) { prefs(context).edit().putBoolean("wifi-only", on).apply() } + + fun pauseInGames(context: Context): Boolean = prefs(context).getBoolean("pause-in-games", false) + fun setPauseInGames(context: Context, on: Boolean) { prefs(context).edit().putBoolean("pause-in-games", on).apply() } + + fun userPaused(context: Context): Boolean = prefs(context).getBoolean("paused", false) + fun setUserPaused(context: Context, on: Boolean) { prefs(context).edit().putBoolean("paused", on).apply() } + + fun pauseApplied(context: Context): Boolean = prefs(context).getBoolean("pause-applied", false) + fun setPauseApplied(context: Context, on: Boolean) { prefs(context).edit().putBoolean("pause-applied", on).apply() } + + fun guiPassword(context: Context): String = prefs(context).getString("gui-password", null) ?: randomToken().also { + prefs(context).edit().putString("gui-password", it).apply() + } + + fun clearIdentity(context: Context) { prefs(context).edit().remove("gui-password").apply() } + + internal fun randomToken(length: Int = 32): String { + val alphabet = "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789" + val random = SecureRandom() + return String(CharArray(length) { alphabet[random.nextInt(alphabet.length)] }) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/Syncthing.kt b/app/src/main/java/com/droiddeck/launcher/sync/Syncthing.kt new file mode 100644 index 0000000000..c7879492f2 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/Syncthing.kt @@ -0,0 +1,534 @@ +package com.droiddeck.launcher.sync + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.net.ConnectivityManager +import android.net.Network +import android.net.NetworkCapabilities +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.util.Base64 +import android.util.Log +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.core.HostProcess +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.OrphanReaper +import com.droiddeck.launcher.session.SessionState +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.security.SecureRandom +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger + +object Syncthing { + enum class Phase { OFF, STARTING, RUNNING, STOPPING, FAILED } + enum class AutoPause { WIFI, GAME } + + const val FAILURE_MISSING = "binary-missing" + private const val FAILURE_POLICY = "Stopped because a folder outside DroidDeck's storage could not be paused" + private const val FAILURE_PAUSE = "Stopped because Syncthing could not be paused" + private const val FAILURE_STILL_RUNNING = "The previous Syncthing process did not exit" + private const val TAG = "Syncthing" + private const val GRACE_MS = 60_000L + private const val ENFORCE_ATTEMPTS = 3 + private const val LOG_LIMIT = 4L shl 20 + private const val FOLDER_ID_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789" + + var enabled by mutableStateOf(false); private set + var phase by mutableStateOf(Phase.OFF); private set + var snapshot by mutableStateOf<SyncSnapshot?>(null); private set + var failure by mutableStateOf<String?>(null); private set + var ports by mutableStateOf<SyncthingPorts?>(null); private set + var apiKeyTail by mutableStateOf<String?>(null); private set + var userPaused by mutableStateOf(false); private set + var autoPause by mutableStateOf<AutoPause?>(null); private set + var devicesPaused by mutableStateOf(false); private set + val pauseRequested get() = userPaused || autoPause != null + var openRequests by mutableStateOf(0) + private set + var openPending = false + + fun requestOpen() { + openPending = true + openRequests++ + } + + val needsAttention get() = phase == Phase.FAILED || snapshot?.needsAttention == true + + @Volatile var onChange: (() -> Unit)? = null + + private val main = Handler(Looper.getMainLooper()) + private val worker = Executors.newSingleThreadExecutor { Thread(it, "syncthing") } + private lateinit var app: Context + @Volatile private var process: Process? = null + @Volatile private var api: SyncthingApi? = null + @Volatile private var generation = 0 + @Volatile private var onWifi = true + private var visible = 0 + private var foreground = false + private val watchers = AtomicInteger() + private val pauseFailures = AtomicInteger() + private val pauseLock = Any() + private val leaveForeground = Runnable { foreground = false; evaluate() } + + fun home(context: Context) = File(context.filesDir, "syncthing") + fun folderRoot(context: Context) = File(context.getExternalFilesDir(null) ?: context.filesDir, "Sync") + fun logFile(context: Context) = File(home(context), "syncthing.log") + private fun config(context: Context) = File(home(context), "config.xml") + private fun guiSocket(context: Context) = File(home(context), "gui.sock") + private fun binary(context: Context) = File(context.applicationInfo.nativeLibraryDir, "libsyncthingnative.so") + + fun storageRoots(context: Context): List<File> = + listOf(context.dataDir) + context.getExternalFilesDirs(null).filterNotNull().mapNotNull { it.parentFile } + + fun guard(context: Context) = SyncthingGuard(folderRoot(context), storageRoots(context), listOf(home(context))) + + fun init(application: Application) { + app = application.applicationContext + userPaused = SyncPrefs.userPaused(app) + enabled = SyncPrefs.enabled(app) + val previous = Thread.getDefaultUncaughtExceptionHandler() + Thread.setDefaultUncaughtExceptionHandler { thread, error -> + runCatching { process?.destroyForcibly() } + previous?.uncaughtException(thread, error) ?: Runtime.getRuntime().halt(2) + } + application.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { + override fun onActivityStarted(activity: Activity) { + visible++ + main.removeCallbacks(leaveForeground) + if (!foreground) { foreground = true; evaluate() } + } + override fun onActivityStopped(activity: Activity) { + visible = (visible - 1).coerceAtLeast(0) + if (visible == 0) main.postDelayed(leaveForeground, GRACE_MS) + } + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {} + override fun onActivityResumed(activity: Activity) {} + override fun onActivityPaused(activity: Activity) {} + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} + override fun onActivityDestroyed(activity: Activity) {} + }) + val connectivity = app.getSystemService(ConnectivityManager::class.java) + onWifi = connectivity?.activeNetwork?.let { connectivity.getNetworkCapabilities(it) }?.let(::isWifi) ?: false + runCatching { + connectivity?.registerDefaultNetworkCallback(object : ConnectivityManager.NetworkCallback() { + override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) { networkChanged(isWifi(caps)) } + override fun onLost(network: Network) { networkChanged(false) } + }) + } + evaluate() + } + + private fun isWifi(caps: NetworkCapabilities) = + caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) || caps.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) + + private fun networkChanged(wifi: Boolean) { + if (wifi == onWifi) return + onWifi = wifi + worker.execute { api?.let { applyPause(it) } } + } + + fun evaluate() { + if (Looper.myLooper() != Looper.getMainLooper()) { main.post { evaluate() }; return } + val enabled = SyncPrefs.enabled(app) + val background = SyncPrefs.runMode(app) == SyncPrefs.RUN_BACKGROUND + if (enabled && background) SyncthingService.start(app) else SyncthingService.stop(app) + if (enabled && (background || foreground)) start() else stop() + } + + fun setEnabled(context: Context, on: Boolean, forget: Boolean = false) { + if (on && !LinuxRuntime.isInstalled(context)) return + SyncPrefs.setEnabled(context, on) + enabled = on + if (on && phase == Phase.FAILED) phase = Phase.OFF + evaluate() + if (!on && forget) worker.execute { + if (process != null) return@execute + home(context).deleteRecursively() + SyncPrefs.clearIdentity(context) + SyncPrefs.setPauseApplied(context, false) + } + } + + fun setPaused(context: Context, paused: Boolean) { + SyncPrefs.setUserPaused(context, paused) + userPaused = paused + changed() + worker.execute { api?.let { applyPause(it) } } + } + + fun settingsChanged() { + evaluate() + worker.execute { api?.let { applyPause(it) } } + } + + fun restart() { + stop() + evaluate() + } + + fun reset(context: Context) { + stop() + worker.execute { + if (process != null) return@execute + home(context).deleteRecursively() + SyncPrefs.clearIdentity(context) + SyncPrefs.setPauseApplied(context, false) + main.post { evaluate() } + } + } + + fun regenerateApiKey() { + worker.execute { + val current = api ?: return@execute + val key = SyncPrefs.randomToken() + runCatching { current.setApiKey(key) }.onSuccess { + api = SyncthingApi(current.socket, key) + main.post { apiKeyTail = key.takeLast(4); changed() } + }.onFailure { Log.w(TAG, "API key change failed", it) } + } + } + + fun addFolder(context: Context, path: File, label: String, devices: List<String>, id: String = newFolderId(), onDone: (Boolean) -> Unit) { + worker.execute { + val ok = runCatching { + val client = api ?: error("Syncthing is not running") + check(guard(context).allows(path.path)) { "${path.path} is outside DroidDeck's storage" } + path.mkdirs() + client.addFolder(client.defaultFolder().apply { + put("id", id) + put("label", label) + put("path", path.path) + put("devices", JSONArray(devices.map { JSONObject().put("deviceID", it) })) + }) + }.onFailure { Log.w(TAG, "add folder failed", it) }.isSuccess + main.post { onDone(ok) } + } + } + + private fun newFolderId(): String { + val random = SecureRandom() + fun part() = (1..5).map { FOLDER_ID_CHARS[random.nextInt(FOLDER_ID_CHARS.length)] }.joinToString("") + return "${part()}-${part()}" + } + + fun removeFolder(id: String) { + worker.execute { api?.let { a -> runCatching { a.removeFolder(id) }.onFailure { Log.w(TAG, "remove $id failed", it) } } } + } + + fun webUiProxy(context: Context): SyncthingProxy? { + if (phase != Phase.RUNNING) return null + val token = Base64.encodeToString("${SyncthingConfig.GUI_USER}:${SyncPrefs.guiPassword(context)}".toByteArray(), Base64.NO_WRAP) + return runCatching { SyncthingProxy(guiSocket(context), "Basic $token") }.onFailure { Log.w(TAG, "web UI proxy failed", it) }.getOrNull() + } + + fun watch(): () -> Unit { + watchers.incrementAndGet() + return { watchers.decrementAndGet() } + } + + private fun start() { + if (phase == Phase.STARTING || phase == Phase.RUNNING) return + if (phase == Phase.FAILED && failure == FAILURE_MISSING) return + val gen = ++generation + phase = Phase.STARTING + failure = null + changed() + worker.execute { launch(gen) } + } + + private fun stop() { + if (phase == Phase.OFF) return + val gen = ++generation + phase = if (process != null || phase == Phase.STARTING) Phase.STOPPING else Phase.OFF + changed() + worker.execute { + shutdown() + val stopped = process == null + main.post { + if (gen != generation) return@post + if (stopped) { phase = Phase.OFF; snapshot = null; ports = null } else { phase = Phase.FAILED; failure = FAILURE_STILL_RUNNING } + changed() + } + } + } + + private fun launch(gen: Int) { + val context = app + try { + if (!binary(context).isFile) throw SyncthingFailure(FAILURE_MISSING) + if (process != null) throw SyncthingFailure(FAILURE_STILL_RUNNING) + val name = binary(context).name + OrphanReaper.reap("stale Syncthing") { it.substringAfterLast('/') == name } + home(context).mkdirs() + folderRoot(context).mkdirs() + if (!config(context).isFile) generate(context) + val picked = SyncthingPortPicker.pick() + val guard = guard(context) + val paused = SyncPrefs.userPaused(context) || autoPauseReason() != null + SyncthingConfig.apply(config(context), picked, guiSocket(context), folderRoot(context), paused, guard::allows) + if (paused) SyncPrefs.setPauseApplied(context, true) + val key = SyncthingConfig.apiKey(config(context)) ?: throw SyncthingFailure("config.xml has no API key") + if (gen != generation) return + rotateLog(context) + val child = ProcessBuilder(binary(context).path, "serve", "--no-browser", "--no-restart") + .redirectErrorStream(true) + .also { environment(context, it.environment()) } + .start() + process = child + OrphanReaper.keep(HostProcess.pidOf(child)) + pump(gen, child, logFile(context)) + pauseFailures.set(0) + val client = SyncthingApi(guiSocket(context), key) + val deadline = System.currentTimeMillis() + 60_000 + while (!client.ping()) { + if (gen != generation) return + if (!child.isAlive) throw SyncthingFailure("Syncthing exited during start (${child.exitValue()})") + if (System.currentTimeMillis() > deadline) throw SyncthingFailure("Syncthing did not answer on ${guiSocket(context).name}") + Thread.sleep(250) + } + api = client + main.post { + if (gen == generation) { ports = picked; apiKeyTail = key.takeLast(4); devicesPaused = paused; phase = Phase.RUNNING; changed() } + } + Thread({ poll(gen, guard) }, "syncthing-status").start() + Thread({ enforce(gen, guard) }, "syncthing-guard").start() + } catch (e: Exception) { + Log.w(TAG, "start failed", e) + shutdown() + val reason = (e as? SyncthingFailure)?.message ?: e.toString() + main.post { if (gen == generation) { phase = Phase.FAILED; failure = reason; changed() } } + } + } + + private fun generate(context: Context) { + val output = File(home(context), "generate.log") + val child = ProcessBuilder(binary(context).path, "generate", "--gui-user", SyncthingConfig.GUI_USER, "--gui-password", "-") + .redirectErrorStream(true) + .redirectOutput(output) + .also { environment(context, it.environment()) } + .start() + val pid = HostProcess.pidOf(child) + OrphanReaper.keep(pid) + try { + child.outputStream.bufferedWriter().use { it.write(SyncPrefs.guiPassword(context) + "\n") } + if (!child.waitFor(60, TimeUnit.SECONDS) || child.exitValue() != 0 || !config(context).isFile) { + child.destroy() + val last = runCatching { output.readLines().lastOrNull { it.isNotBlank() } }.getOrNull().orEmpty() + throw SyncthingFailure("syncthing generate failed: $last") + } + } finally { + output.delete() + OrphanReaper.release(pid) + } + } + + private fun environment(context: Context, env: MutableMap<String, String>) { + listOf("LD_PRELOAD", "LD_AUDIT", "LD_LIBRARY_PATH").forEach { env.remove(it) } + env["STHOMEDIR"] = home(context).path + env["HOME"] = folderRoot(context).path + env["STNOUPGRADE"] = "1" + env["STNODEFAULTFOLDER"] = "1" + env["STMONITORED"] = "1" + env["SQLITE_TMPDIR"] = context.cacheDir.path + env["STVERSIONEXTRA"] = "DroidDeck" + } + + private fun rotateLog(context: Context) { + val log = logFile(context) + if (log.length() > 0) log.renameTo(File(log.parentFile, "syncthing.old.log")) + } + + private fun pump(gen: Int, child: Process, log: File) { + Thread({ + var last = "" + runCatching { + log.appendText("") + child.inputStream.bufferedReader().useLines { lines -> + lines.forEach { line -> + if (line.isNotBlank()) last = line + if (log.length() < LOG_LIMIT) log.appendText(line + "\n") + } + } + } + val code = runCatching { child.waitFor() }.getOrDefault(-1) + OrphanReaper.release(HostProcess.pidOf(child)) + main.post { + if (process !== child) return@post + process = null + if (gen == generation && phase == Phase.RUNNING) { + api = null + phase = Phase.FAILED; failure = "Syncthing stopped ($code): $last"; snapshot = null; changed() + } + } + }, "syncthing-output").start() + } + + private fun shutdown() { + val child = process ?: return + api?.let { runCatching { it.shutdown() } } + api = null + if (!child.waitFor(10, TimeUnit.SECONDS)) { + child.destroy() + if (!child.waitFor(3, TimeUnit.SECONDS)) { + child.destroyForcibly() + child.waitFor(3, TimeUnit.SECONDS) + } + } + if (child.isAlive) { + Log.w(TAG, "Syncthing did not exit") + return + } + process = null + } + + private fun poll(gen: Int, guard: SyncthingGuard) { + var previous: Pair<Long, Pair<Long, Long>>? = null + var myId: String? = null + while (gen == generation) { + val client = api ?: return + applyPause(client) + try { + val id = myId ?: client.myId().also { myId = it } + val connections = client.connections() + val total = connections.optJSONObject("total") + val now = System.currentTimeMillis() + val bytes = (total?.optLong("inBytesTotal") ?: 0L) to (total?.optLong("outBytesTotal") ?: 0L) + val rates = previous?.let { (at, was) -> + val seconds = ((now - at) / 1000.0).coerceAtLeast(0.5) + ((bytes.first - was.first).coerceAtLeast(0) / seconds).toLong() to ((bytes.second - was.second).coerceAtLeast(0) / seconds).toLong() + } ?: (0L to 0L) + previous = now to bytes + val snap = collect(client, guard, id, connections, rates) + main.post { if (gen == generation) { snapshot = snap; changed() } } + } catch (e: PolicyFailure) { + failClosed(gen, e) + return + } catch (e: Exception) { + Log.d(TAG, "status poll failed: $e") + } + Thread.sleep(if (watchers.get() > 0) 2_000 else 10_000) + } + } + + private fun collect(client: SyncthingApi, guard: SyncthingGuard, myId: String, connections: org.json.JSONObject, rates: Pair<Long, Long>): SyncSnapshot { + val names = SyncthingParse.deviceNames(client.devices(), myId) + val config = client.folders() + val folders = (0 until config.length()).map { config.getJSONObject(it) }.map { f -> + val id = f.getString("id") + val path = f.optString("path") + val blocked = !guard.allows(path) + if (blocked && !f.optBoolean("paused")) pauseFolder(client, id) + val paused = blocked || f.optBoolean("paused") + val status = if (paused) null else runCatching { client.folderStatus(id) }.getOrElse { SyncthingParse.unreadableStatus() } + SyncthingParse.folder(f, status, blocked, names) + } + val conns = connections.optJSONObject("connections") + val stats = runCatching { client.deviceStats() }.getOrNull() + val devices = names.map { (id, name) -> + val c = conns?.optJSONObject(id) + val seen = stats?.optJSONObject(id)?.optString("lastSeen")?.let(::parseTime) + SyncDevice(id, name, c?.optBoolean("connected") == true, c?.optString("address")?.takeIf { it.isNotEmpty() }, seen) + } + return SyncSnapshot( + myId, folders, devices, + runCatching { SyncthingParse.pendingFolders(client.pendingFolders(), names) }.getOrDefault(emptyList()), + runCatching { SyncthingParse.pendingDevices(client.pendingDevices()) }.getOrDefault(emptyList()), + rates.first, rates.second, + ) + } + + private fun parseTime(s: String): Long? = runCatching { + java.time.OffsetDateTime.parse(s).toInstant().toEpochMilli().takeIf { it > 86_400_000L } + }.getOrNull() + + private fun enforce(gen: Int, guard: SyncthingGuard) { + var since = 0L + var pending = true + var failures = 0 + while (gen == generation) { + val client = api ?: return + try { + if (!pending) { + val (last, saved) = client.waitForConfigSaved(since, 60) + since = last + pending = saved + } + if (pending && gen == generation) { + applyPause(client) + val folders = client.folders() + for (i in 0 until folders.length()) { + val f = folders.getJSONObject(i) + if (!f.optBoolean("paused") && !guard.allows(f.optString("path"))) pauseFolder(client, f.getString("id")) + } + pending = false + } + failures = 0 + } catch (e: PolicyFailure) { + failClosed(gen, e) + return + } catch (e: Exception) { + if (pending && ++failures >= ENFORCE_ATTEMPTS) { + failClosed(gen, PolicyFailure(e)) + return + } + Thread.sleep(2_000) + } + } + } + + private fun pauseFolder(client: SyncthingApi, id: String) { + try { + client.pauseFolder(id) + } catch (e: Exception) { + throw PolicyFailure(e) + } + } + + private fun failClosed(gen: Int, cause: Exception, reason: String = FAILURE_POLICY) { + Log.w(TAG, reason, cause) + worker.execute { + if (gen != generation) return@execute + shutdown() + main.post { if (gen == generation) { phase = Phase.FAILED; failure = reason; snapshot = null; changed() } } + } + } + + private fun applyPause(client: SyncthingApi) = synchronized(pauseLock) { + val context = app + val auto = autoPauseReason() + val want = SyncPrefs.userPaused(context) || auto != null + var held = SyncPrefs.pauseApplied(context) && !(want && hasUnpausedPeer(client)) + if (want != held) { + runCatching { if (want) client.pauseAll() else client.resumeAll() } + .onSuccess { SyncPrefs.setPauseApplied(context, want); held = want; pauseFailures.set(0) } + .onFailure { Log.w(TAG, "pause change failed", it); if (want) pauseFailures.incrementAndGet() } + } + if (auto != autoPause || held != devicesPaused) main.post { autoPause = auto; devicesPaused = held; changed() } + if (want && !held && pauseFailures.get() >= ENFORCE_ATTEMPTS) failClosed(generation, IllegalStateException(FAILURE_PAUSE), FAILURE_PAUSE) + } + + private fun hasUnpausedPeer(client: SyncthingApi): Boolean = runCatching { + val myId = client.myId() + val devices = client.devices() + (0 until devices.length()).map { devices.getJSONObject(it) } + .any { it.getString("deviceID") != myId && !it.optBoolean("paused") } + }.getOrDefault(true) + + private fun autoPauseReason(): AutoPause? = when { + SyncPrefs.wifiOnly(app) && !onWifi -> AutoPause.WIFI + SyncPrefs.pauseInGames(app) && SessionState.running -> AutoPause.GAME + else -> null + } + + private fun changed() { onChange?.invoke() } + + private class SyncthingFailure(message: String) : Exception(message) + private class PolicyFailure(cause: Exception) : Exception(cause) +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingApi.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingApi.kt new file mode 100644 index 0000000000..7a7eaab248 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingApi.kt @@ -0,0 +1,57 @@ +package com.droiddeck.launcher.sync + +import android.net.LocalSocket +import android.net.LocalSocketAddress +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.net.URLEncoder + +class SyncthingApi(val socket: File, private val apiKey: String) { + fun ping(): Boolean = runCatching { get("/rest/system/ping").optString("ping") == "pong" }.getOrDefault(false) + fun myId(): String = get("/rest/system/status").getString("myID") + fun folders(): JSONArray = getArray("/rest/config/folders") + fun devices(): JSONArray = getArray("/rest/config/devices") + fun folderStatus(id: String): JSONObject = get("/rest/db/status?folder=${enc(id)}") + fun connections(): JSONObject = get("/rest/system/connections") + fun deviceStats(): JSONObject = get("/rest/stats/device") + fun pendingDevices(): JSONObject = get("/rest/cluster/pending/devices") + fun pendingFolders(): JSONObject = get("/rest/cluster/pending/folders") + + fun defaultFolder(): JSONObject = get("/rest/config/defaults/folder") + fun addFolder(folder: JSONObject) = send("POST", "/rest/config/folders", folder) + fun pauseFolder(id: String) = merge("/rest/config/folders/${enc(id)}") { put("paused", true) } + fun removeFolder(id: String) { send("DELETE", "/rest/config/folders/${enc(id)}", null) } + fun pauseAll() { send("POST", "/rest/system/pause", null) } + fun resumeAll() { send("POST", "/rest/system/resume", null) } + fun setApiKey(key: String) = merge("/rest/config/gui") { put("apiKey", key) } + fun shutdown() { send("POST", "/rest/system/shutdown", null) } + + private fun merge(path: String, change: JSONObject.() -> Unit) = send("PUT", path, get(path).apply(change)) + + fun waitForConfigSaved(since: Long, timeoutSeconds: Int): Pair<Long, Boolean> { + val events = JSONArray(request("GET", "/rest/events?events=ConfigSaved&since=$since&timeout=$timeoutSeconds", null, (timeoutSeconds + 10) * 1000)) + if (events.length() == 0) return since to false + return events.getJSONObject(events.length() - 1).getLong("id") to true + } + + private fun get(path: String) = JSONObject(request("GET", path, null, TIMEOUT_MS)) + private fun getArray(path: String) = JSONArray(request("GET", path, null, TIMEOUT_MS)) + private fun send(method: String, path: String, body: JSONObject?) { request(method, path, body, TIMEOUT_MS) } + + private fun request(method: String, path: String, body: JSONObject?, timeoutMs: Int): String = LocalSocket().use { s -> + s.connect(LocalSocketAddress(socket.path, LocalSocketAddress.Namespace.FILESYSTEM)) + s.soTimeout = timeoutMs + val headers = listOf("X-API-Key" to apiKey) + if (body != null) listOf("Content-Type" to "application/json") else emptyList() + SyncthingHttp.writeRequest(s.outputStream, method, path, headers, body?.toString()?.toByteArray()) + val (code, text) = SyncthingHttp.readResponse(s.inputStream.buffered()) + if (code !in 200..299) throw SyncthingApiException(code, text) + text + } + + private fun enc(s: String) = URLEncoder.encode(s, "UTF-8") + + companion object { private const val TIMEOUT_MS = 5_000 } +} + +class SyncthingApiException(val code: Int, message: String) : Exception("HTTP $code: $message") diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingConfig.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingConfig.kt new file mode 100644 index 0000000000..b367d5908c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingConfig.kt @@ -0,0 +1,81 @@ +package com.droiddeck.launcher.sync + +import org.w3c.dom.Document +import org.w3c.dom.Element +import java.io.File +import java.io.IOException +import java.io.StringReader +import java.io.StringWriter +import javax.xml.parsers.DocumentBuilderFactory +import javax.xml.transform.OutputKeys +import javax.xml.transform.TransformerFactory +import javax.xml.transform.dom.DOMSource +import javax.xml.transform.stream.StreamResult +import org.xml.sax.InputSource + +object SyncthingConfig { + const val GUI_USER = "droiddeck" + private const val RELAYS = "dynamic+https://relays.syncthing.net/endpoint" + + fun apiKey(file: File): String? = runCatching { apiKey(file.readText()) }.getOrNull() + + internal fun apiKey(xml: String): String? = + parse(xml).documentElement.child("gui")?.child("apikey")?.textContent?.trim()?.takeIf { it.isNotEmpty() } + + fun apply(file: File, ports: SyncthingPorts, guiSocket: File, folderRoot: File, pauseDevices: Boolean, allows: (String) -> Boolean) { + val staged = File(file.parentFile, "${file.name}.tmp") + try { + staged.writeText(apply(file.readText(), ports, guiSocket.path, folderRoot.path, pauseDevices, allows)) + if (!staged.renameTo(file)) throw IOException("could not replace ${file.name}") + } finally { + staged.delete() + } + } + + internal fun apply(xml: String, ports: SyncthingPorts, guiSocket: String, folderRoot: String, pauseDevices: Boolean = false, allows: (String) -> Boolean): String { + val doc = parse(xml) + val root = doc.documentElement + val gui = root.child("gui") ?: doc.createElement("gui").also { root.appendChild(it) } + gui.setAttribute("tls", "false") + gui.set("address", guiSocket) + gui.set("unixSocketPermissions", "600") + val options = root.child("options") ?: doc.createElement("options").also { root.appendChild(it) } + options.setList("listenAddress", listOf("tcp://:${ports.sync}", "quic://:${ports.sync}", RELAYS)) + options.set("localAnnouncePort", ports.discovery.toString()) + options.set("urAccepted", "-1") + options.set("crashReportingEnabled", "false") + options.set("autoUpgradeIntervalH", "0") + options.set("startBrowser", "false") + val defaults = root.child("defaults") ?: doc.createElement("defaults").also { root.appendChild(it) } + val folder = defaults.child("folder") ?: doc.createElement("folder").also { defaults.appendChild(it) } + folder.setAttribute("path", folderRoot) + root.children("folder").filter { !allows(it.getAttribute("path")) }.forEach { it.set("paused", "true") } + if (pauseDevices) root.children("device").forEach { it.set("paused", "true") } + return write(doc) + } + + private fun parse(xml: String): Document = + DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(InputSource(StringReader(xml))) + + private fun write(doc: Document): String = StringWriter().also { + TransformerFactory.newInstance().newTransformer().apply { setOutputProperty(OutputKeys.INDENT, "no") } + .transform(DOMSource(doc), StreamResult(it)) + }.toString() + + private fun Element.children(name: String): List<Element> = + (0 until childNodes.length).map { childNodes.item(it) }.filterIsInstance<Element>().filter { it.tagName == name } + + private fun Element.child(name: String): Element? = children(name).firstOrNull() + + private fun Element.set(name: String, value: String) = setList(name, listOf(value)) + + private fun Element.setList(name: String, values: List<String>) { + val existing = children(name) + val anchor = existing.lastOrNull()?.nextSibling + existing.forEach { removeChild(it) } + values.forEach { value -> + val e = ownerDocument.createElement(name).apply { textContent = value } + if (anchor != null) insertBefore(e, anchor) else appendChild(e) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingGuard.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingGuard.kt new file mode 100644 index 0000000000..ae27645f69 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingGuard.kt @@ -0,0 +1,28 @@ +package com.droiddeck.launcher.sync + +import java.io.File + +class SyncthingGuard(private val home: File, roots: List<File>, forbidden: List<File>) { + private val roots = roots.map { it.canonicalFile } + private val forbidden = forbidden.map { it.canonicalFile } + + fun allows(path: String): Boolean { + val trimmed = path.trim() + if (trimmed.isEmpty()) return false + val expanded = when { + trimmed == "~" -> home + trimmed.startsWith("~/") -> File(home, trimmed.removePrefix("~/")) + else -> File(trimmed) + } + if (!expanded.isAbsolute) return false + val target = runCatching { expanded.canonicalFile }.getOrNull() ?: return false + return roots.any { within(target, it) } && forbidden.none { within(target, it) || within(it, target) } + } + + fun browsable(dir: File): Boolean { + val target = runCatching { dir.canonicalFile }.getOrNull() ?: return false + return roots.any { within(target, it) } && forbidden.none { within(target, it) } + } + + private fun within(target: File, root: File) = target == root || target.path.startsWith(root.path + File.separator) +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingHttp.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingHttp.kt new file mode 100644 index 0000000000..b2ebcb3c98 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingHttp.kt @@ -0,0 +1,80 @@ +package com.droiddeck.launcher.sync + +import java.io.ByteArrayOutputStream +import java.io.IOException +import java.io.InputStream +import java.io.OutputStream + +internal object SyncthingHttp { + private const val LINE_LIMIT = 16 shl 10 + private const val HEADER_LIMIT = 100 + + fun writeRequest(out: OutputStream, method: String, path: String, headers: List<Pair<String, String>>, body: ByteArray?) { + val head = StringBuilder("$method $path HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n") + headers.forEach { (name, value) -> head.append(name).append(": ").append(value).append("\r\n") } + head.append("Content-Length: ").append(body?.size ?: 0).append("\r\n\r\n") + out.write(head.toString().toByteArray(Charsets.ISO_8859_1)) + body?.let(out::write) + out.flush() + } + + fun readResponse(input: InputStream): Pair<Int, String> { + val status = readLine(input) ?: throw IOException("no response") + val code = status.split(' ').getOrNull(1)?.toIntOrNull() ?: throw IOException("bad status line: $status") + val headers = readHeaders(input) + fun header(name: String) = headers.lastOrNull { it.first.equals(name, ignoreCase = true) }?.second + val body = when { + header("Transfer-Encoding")?.contains("chunked", ignoreCase = true) == true -> chunked(input) + header("Content-Length") != null -> exactly(input, header("Content-Length")!!.trim().toInt()) + else -> input.readBytes() + } + return code to String(body, Charsets.UTF_8) + } + + fun readLine(input: InputStream): String? { + val line = ByteArrayOutputStream() + while (true) { + val b = input.read() + if (b == -1) return if (line.size() == 0) null else throw IOException("truncated line") + if (b == '\n'.code) break + if (line.size() >= LINE_LIMIT) throw IOException("line too long") + line.write(b) + } + return line.toString("ISO-8859-1").removeSuffix("\r") + } + + fun readHeaders(input: InputStream): List<Pair<String, String>> { + val headers = mutableListOf<Pair<String, String>>() + while (true) { + val line = readLine(input) ?: throw IOException("truncated headers") + if (line.isEmpty()) return headers + if (headers.size >= HEADER_LIMIT) throw IOException("too many headers") + val colon = line.indexOf(':') + if (colon <= 0) throw IOException("bad header: $line") + headers += line.substring(0, colon).trim() to line.substring(colon + 1).trim() + } + } + + private fun chunked(input: InputStream): ByteArray { + val out = ByteArrayOutputStream() + while (true) { + val size = readLine(input)?.substringBefore(';')?.trim()?.toIntOrNull(16) ?: throw IOException("bad chunk size") + if (size == 0) break + out.write(exactly(input, size)) + readLine(input) + } + while (readLine(input)?.isNotEmpty() == true) Unit + return out.toByteArray() + } + + private fun exactly(input: InputStream, size: Int): ByteArray { + val bytes = ByteArray(size) + var read = 0 + while (read < size) { + val n = input.read(bytes, read, size - read) + if (n == -1) throw IOException("truncated body") + read += n + } + return bytes + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingPorts.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingPorts.kt new file mode 100644 index 0000000000..671a98d0bc --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingPorts.kt @@ -0,0 +1,29 @@ +package com.droiddeck.launcher.sync + +import java.net.DatagramSocket +import java.net.InetSocketAddress +import java.net.ServerSocket + +data class SyncthingPorts(val sync: Int, val discovery: Int) + +object SyncthingPortPicker { + internal val RESERVED = setOf(8384, 8385, 22000, 22001, 21027, 21028) + internal const val SYNC = 22100 + internal const val DISCOVERY = 21127 + private const val SPAN = 50 + + fun pick(): SyncthingPorts = pick(::syncFree, ::udpFree) + + internal fun pick(syncFree: (Int) -> Boolean, discoveryFree: (Int) -> Boolean) = + SyncthingPorts(first(SYNC, syncFree), first(DISCOVERY, discoveryFree)) + + private fun first(base: Int, free: (Int) -> Boolean): Int = + (base until base + SPAN).firstOrNull { it !in RESERVED && free(it) } ?: error("no free port in $base..${base + SPAN - 1}") + + private fun tcpFree(port: Int): Boolean = runCatching { + ServerSocket().use { it.reuseAddress = false; it.bind(InetSocketAddress(port)) } + }.isSuccess + + private fun udpFree(port: Int) = runCatching { DatagramSocket(port).close() }.isSuccess + private fun syncFree(port: Int) = tcpFree(port) && udpFree(port) +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingProxy.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingProxy.kt new file mode 100644 index 0000000000..e4487f1e9d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingProxy.kt @@ -0,0 +1,121 @@ +package com.droiddeck.launcher.sync + +import android.net.LocalSocket +import android.net.LocalSocketAddress +import java.io.Closeable +import java.io.File +import java.io.FilterInputStream +import java.io.InputStream +import java.net.InetAddress +import java.net.ServerSocket +import java.net.Socket +import java.net.SocketTimeoutException +import java.security.MessageDigest +import java.util.Collections +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.Semaphore + +class SyncthingProxy(private val socket: File, private val auth: String) : Closeable { + private val server = ServerSocket(0, 16, InetAddress.getByAddress(byteArrayOf(127, 0, 0, 1))) + private val token = SyncPrefs.randomToken() + val url = "http://127.0.0.1:${server.localPort}/" + val cookie = "$COOKIE=$token" + private val workers = Semaphore(MAX_WORKERS) + private val open: MutableSet<Closeable> = Collections.newSetFromMap(ConcurrentHashMap()) + + init { + Thread(::accept, "syncthing-proxy").apply { isDaemon = true }.start() + } + + override fun close() { + runCatching { server.close() } + open.forEach { runCatching { it.close() } } + } + + private fun track(c: Closeable) { + open += c + if (server.isClosed) runCatching { c.close() } + } + + private fun accept() { + while (true) { + val client = runCatching { server.accept() }.getOrNull() ?: return + if (!workers.tryAcquire()) { + runCatching { client.close() } + continue + } + val worker = runCatching { + track(client) + Thread({ try { serve(client) } finally { open -= client; workers.release() } }, "syncthing-proxy-request").apply { isDaemon = true }.start() + } + if (worker.isFailure) { open -= client; workers.release(); runCatching { client.close() } } + } + } + + private fun serve(client: Socket) = client.use { + runCatching { + val deadline = HeadDeadline(client, client.getInputStream(), System.nanoTime() + HEAD_TIMEOUT_MS * 1_000_000L) + val input = deadline.buffered() + val request = SyncthingHttp.readLine(input) ?: return@runCatching + val headers = SyncthingHttp.readHeaders(input) + if (!authorized(headers)) { + client.getOutputStream().write(FORBIDDEN) + return@runCatching + } + deadline.lift() + LocalSocket().use { upstream -> + track(upstream) + try { relay(client, input, request, headers, upstream) } finally { open -= upstream } + } + } + } + + private fun relay(client: Socket, input: InputStream, request: String, headers: List<Pair<String, String>>, upstream: LocalSocket) { + upstream.connect(LocalSocketAddress(socket.path, LocalSocketAddress.Namespace.FILESYSTEM)) + val head = StringBuilder(request).append("\r\n") + headers.filter { it.first.lowercase() !in DROPPED }.forEach { (name, value) -> + val kept = if (name.equals("Cookie", ignoreCase = true)) withoutToken(value) else value + if (kept.isNotEmpty()) head.append(name).append(": ").append(kept).append("\r\n") + } + head.append("Authorization: ").append(auth).append("\r\nConnection: close\r\n\r\n") + upstream.outputStream.write(head.toString().toByteArray(Charsets.ISO_8859_1)) + Thread({ runCatching { input.copyTo(upstream.outputStream) } }, "syncthing-proxy-body").apply { isDaemon = true }.start() + upstream.inputStream.copyTo(client.getOutputStream()) + } + + private fun cookies(header: String) = header.split(';').map { it.trim() } + + private fun authorized(headers: List<Pair<String, String>>): Boolean = headers + .filter { it.first.equals("Cookie", ignoreCase = true) } + .flatMap { cookies(it.second) } + .any { MessageDigest.isEqual(it.toByteArray(), cookie.toByteArray()) } + + private fun withoutToken(header: String) = cookies(header).filter { !it.startsWith("$COOKIE=") }.joinToString("; ") + + private class HeadDeadline(private val client: Socket, input: InputStream, private val until: Long) : FilterInputStream(input) { + @Volatile private var lifted = false + + fun lift() { + lifted = true + client.soTimeout = 0 + } + + override fun read(): Int { arm(); return super.read() } + override fun read(b: ByteArray, off: Int, len: Int): Int { arm(); return super.read(b, off, len) } + + private fun arm() { + if (lifted) return + val left = (until - System.nanoTime()) / 1_000_000L + if (left <= 0) throw SocketTimeoutException("request head took too long") + client.soTimeout = left.toInt() + } + } + + private companion object { + const val COOKIE = "droiddeck-proxy" + const val HEAD_TIMEOUT_MS = 10_000 + const val MAX_WORKERS = 16 + val DROPPED = setOf("authorization", "x-api-key", "connection", "proxy-connection", "keep-alive", "upgrade") + val FORBIDDEN = "HTTP/1.1 403 Forbidden\r\nContent-Length: 0\r\nConnection: close\r\n\r\n".toByteArray() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingService.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingService.kt new file mode 100644 index 0000000000..9b47b03295 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingService.kt @@ -0,0 +1,104 @@ +package com.droiddeck.launcher.sync + +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.app.Service +import android.content.Context +import android.content.Intent +import android.os.Build +import android.os.IBinder +import com.droiddeck.launcher.FrontEndActivity +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.download.StoreDownloadService + +class SyncthingService : Service() { + override fun onBind(intent: Intent?): IBinder? = null + + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + when (intent?.action) { + ACTION_PAUSE -> Syncthing.setPaused(this, !Syncthing.userPaused) + ACTION_OFF -> { Syncthing.setEnabled(this, false); return START_NOT_STICKY } + } + if (!SyncPrefs.enabled(this) || SyncPrefs.runMode(this) != SyncPrefs.RUN_BACKGROUND) { + stopSelf() + return START_NOT_STICKY + } + val n = notification() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) startForeground(ID, n, android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC) + else startForeground(ID, n) + Syncthing.onChange = { getSystemService(NotificationManager::class.java)?.notify(ID, notification()) } + Syncthing.evaluate() + return START_STICKY + } + + override fun onDestroy() { + Syncthing.onChange = null + super.onDestroy() + } + + private fun notification(): Notification { + channel(this) + val snap = Syncthing.snapshot + val title = getString(when { + Syncthing.phase == Syncthing.Phase.FAILED -> R.string.sync_status_failed + Syncthing.phase != Syncthing.Phase.RUNNING -> R.string.sync_status_starting + Syncthing.pauseRequested && Syncthing.devicesPaused -> R.string.sync_status_paused + Syncthing.pauseRequested -> R.string.sync_status_pausing + Syncthing.devicesPaused -> R.string.sync_status_resuming + snap?.needsAttention == true -> R.string.sync_status_attention + snap?.syncing == true -> R.string.sync_status_syncing + else -> R.string.sync_status_up_to_date + }) + val text = snap?.let { + getString(R.string.sync_summary, it.folders.size, it.devices.count { d -> d.connected }, it.devices.size) + }.orEmpty() + val open = PendingIntent.getActivity(this, 0, Intent(this, FrontEndActivity::class.java) + .putExtra(StoreDownloadService.EXTRA_NAV, NAV).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP), + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) + val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) Notification.Builder(this, CHANNEL) else @Suppress("DEPRECATION") Notification.Builder(this) + return builder.setSmallIcon(R.drawable.ic_stat_session) + .setContentTitle(title) + .setContentText(text) + .setContentIntent(open) + .setOngoing(true) + .setOnlyAlertOnce(true) + .addAction(Notification.Action.Builder(null, getString(if (Syncthing.userPaused) R.string.sync_resume else R.string.sync_pause), action(ACTION_PAUSE, 1)).build()) + .addAction(Notification.Action.Builder(null, getString(R.string.sync_turn_off), action(ACTION_OFF, 2)).build()) + .build() + } + + private fun action(name: String, code: Int) = PendingIntent.getService(this, code, + Intent(this, SyncthingService::class.java).setAction(name), PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) + + companion object { + const val NAV = "setup:sync" + private const val CHANNEL = "syncthing" + private const val ID = 9203 + private const val ACTION_PAUSE = "droiddeck.sync.PAUSE" + private const val ACTION_OFF = "droiddeck.sync.OFF" + @Volatile private var running = false + + private fun channel(context: Context) { + val nm = context.getSystemService(NotificationManager::class.java) ?: return + if (nm.getNotificationChannel(CHANNEL) == null) { + nm.createNotificationChannel(NotificationChannel(CHANNEL, context.getString(R.string.sync_notification_channel), NotificationManager.IMPORTANCE_LOW).apply { + setShowBadge(false) + }) + } + } + + fun start(context: Context) { + if (running) return + running = true + runCatching { context.startForegroundService(Intent(context, SyncthingService::class.java)) }.onFailure { running = false } + } + + fun stop(context: Context) { + if (!running) return + running = false + context.stopService(Intent(context, SyncthingService::class.java)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingStatus.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingStatus.kt new file mode 100644 index 0000000000..c07439e0e7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingStatus.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.sync + +import org.json.JSONArray +import org.json.JSONObject + +data class SyncFolder( + val id: String, val label: String, val path: String, val paused: Boolean, val blocked: Boolean, + val state: String, val globalBytes: Long, val needBytes: Long, val errors: Int, val sharedWith: List<String>, +) { + val syncing get() = !paused && !blocked && state in ACTIVE && needBytes > 0 + val outOfSync get() = !paused && !blocked && (errors > 0 || state == "error" || (state == "idle" && needBytes > 0)) + + companion object { private val ACTIVE = setOf("syncing", "sync-preparing", "sync-waiting") } +} + +data class SyncDevice(val id: String, val name: String, val connected: Boolean, val address: String?, val lastSeen: Long?) + +data class SyncPendingFolder(val id: String, val label: String, val offeredBy: String, val deviceId: String) + +data class SyncSnapshot( + val myId: String, + val folders: List<SyncFolder>, + val devices: List<SyncDevice>, + val pendingFolders: List<SyncPendingFolder>, + val pendingDevices: List<String>, + val inBytesPerSecond: Long, + val outBytesPerSecond: Long, +) { + val blocked get() = folders.filter { it.blocked } + val needsAttention get() = blocked.isNotEmpty() || pendingFolders.isNotEmpty() || pendingDevices.isNotEmpty() || folders.any { it.outOfSync } + val syncing get() = folders.any { it.syncing } + val needBytes get() = folders.filter { it.syncing }.sumOf { it.needBytes } + + val percent: Int get() { + val active = folders.filter { it.syncing } + val global = active.sumOf { it.globalBytes } + if (global <= 0) return 0 + return (((global - active.sumOf { it.needBytes }).coerceAtLeast(0) * 100) / global).toInt().coerceIn(0, 99) + } +} + +internal object SyncthingParse { + fun unreadableStatus(): JSONObject = JSONObject().put("state", "error").put("errors", 1) + + fun folder(config: JSONObject, status: JSONObject?, blocked: Boolean, names: Map<String, String>): SyncFolder { + val id = config.getString("id") + val shared = config.optJSONArray("devices")?.let { d -> (0 until d.length()).mapNotNull { names[d.getJSONObject(it).optString("deviceID")] } }.orEmpty() + return SyncFolder( + id, config.optString("label").ifEmpty { id }, config.optString("path"), blocked || config.optBoolean("paused"), blocked, + status?.optString("state").orEmpty(), status?.optLong("globalBytes") ?: 0, status?.optLong("needBytes") ?: 0, + (status?.optInt("errors") ?: 0) + (status?.optInt("pullErrors") ?: 0), shared, + ) + } + + fun deviceNames(devices: JSONArray, myId: String): Map<String, String> = (0 until devices.length()) + .map { devices.getJSONObject(it) } + .filter { it.getString("deviceID") != myId } + .associate { it.getString("deviceID") to it.optString("name").ifEmpty { it.getString("deviceID").take(7) } } + + fun pendingDevices(json: JSONObject): List<String> = + json.keys().asSequence().map { id -> json.optJSONObject(id)?.optString("name").orEmpty().ifEmpty { id.take(7) } }.toList() + + fun pendingFolders(json: JSONObject, names: Map<String, String>): List<SyncPendingFolder> = + json.keys().asSequence().flatMap { folderId -> + val offeredBy = json.getJSONObject(folderId).optJSONObject("offeredBy") ?: JSONObject() + offeredBy.keys().asSequence().map { device -> + val label = offeredBy.getJSONObject(device).optString("label").ifEmpty { folderId } + SyncPendingFolder(folderId, label, names[device] ?: device.take(7), device) + } + }.toList() +} diff --git a/app/src/main/java/com/droiddeck/launcher/sync/SyncthingWebActivity.kt b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingWebActivity.kt new file mode 100644 index 0000000000..3e036f9436 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/sync/SyncthingWebActivity.kt @@ -0,0 +1,136 @@ +package com.droiddeck.launcher.sync + +import android.annotation.SuppressLint +import android.net.Uri +import android.os.Bundle +import android.webkit.CookieManager +import android.webkit.WebResourceRequest +import android.webkit.WebResourceResponse +import android.webkit.WebView +import android.webkit.WebViewClient +import androidx.activity.ComponentActivity +import androidx.activity.compose.BackHandler +import androidx.activity.compose.setContent +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.viewinterop.AndroidView +import com.droiddeck.launcher.R +import com.droiddeck.launcher.ui.BackLink +import com.droiddeck.launcher.ui.DroidDeckTheme +import com.droiddeck.launcher.ui.LocalPalette +import com.droiddeck.launcher.ui.SecondaryButton + +class SyncthingWebActivity : ComponentActivity() { + private var web: WebView? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { DroidDeckTheme(appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this)) { Screen() } } + } + + override fun onDestroy() { + web?.destroy() + web = null + super.onDestroy() + } + + @Composable + private fun Screen() { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val running = Syncthing.phase == Syncthing.Phase.RUNNING + val target = remember(running) { if (running) Syncthing.webUiProxy(this) else null } + DisposableEffect(target) { onDispose { target?.close() } } + LaunchedEffect(Syncthing.phase) { if (Syncthing.phase == Syncthing.Phase.OFF) finish() } + BackHandler { web?.takeIf { it.canGoBack() }?.goBack() ?: finish() } + Column(Modifier.fillMaxSize().background(colors.background)) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().background(colors.surface).padding(horizontal = 16.dp, vertical = 8.dp), + ) { + BackLink(stringResource(R.string.mode_back), compact = true) { finish() } + Text(stringResource(R.string.sync_web_title), fontSize = 17.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + Box(Modifier.weight(1f)) + target?.let { Text(Uri.parse(it.url).authority.orEmpty(), fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) } + SecondaryButton(stringResource(R.string.sync_web_reload), compact = true) { web?.reload() } + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + if (target == null) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.sync_not_running), fontSize = 14.sp, color = colors.onSurfaceVariant) + } + } else { + val view = remember(target) { webView(target.url, target.cookie) } + AndroidView({ view }, Modifier.fillMaxSize()) + } + } + } + + @SuppressLint("SetJavaScriptEnabled") + private fun webView(url: String, cookie: String): WebView = WebView(this).apply { + web?.destroy() + web = this + setBackgroundColor(0xFF0A0B0D.toInt()) + settings.javaScriptEnabled = true + settings.domStorageEnabled = true + settings.allowFileAccess = false + settings.allowContentAccess = false + val cookies = CookieManager.getInstance() + cookies.setAcceptCookie(true) + val origin = Uri.parse(url).authority + webViewClient = object : WebViewClient() { + override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? = + if (request.url.authority == origin) null else WebResourceResponse("text/plain", "utf-8", 403, "Forbidden", emptyMap(), null) + + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = + request.url.authority != origin + + override fun onPageFinished(view: WebView, url: String) { + view.evaluateJavascript(lockFolderPath(getString(R.string.sync_web_path_locked)), null) + } + } + cookies.setCookie(url, "$cookie; HttpOnly; SameSite=Strict") { loadUrl(url) } + } +} + +private fun lockFolderPath(note: String) = """ + (function (note) { + if (window.droiddeckPathLock) return; + window.droiddeckPathLock = true; + function lock() { + var input = document.getElementById('folderPath'); + if (!input) return; + if (!input.readOnly) input.readOnly = true; + if (input.hasAttribute('list')) input.removeAttribute('list'); + if (!document.getElementById('droiddeck-path-note')) { + var p = document.createElement('p'); + p.id = 'droiddeck-path-note'; + p.className = 'help-block'; + p.textContent = note; + input.parentNode.insertBefore(p, input.nextSibling); + } + } + new MutationObserver(lock).observe(document.documentElement, { subtree: true, childList: true, attributes: true, attributeFilter: ['readonly'] }); + lock(); + })(${org.json.JSONObject.quote(note)}); +""".trimIndent() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt index 6e2ae810c0..7e0103ec8e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt @@ -68,6 +68,7 @@ import com.droiddeck.launcher.frontend.AddedGames import com.droiddeck.launcher.frontend.LogoPosition import com.droiddeck.launcher.frontend.SteamGameArt import com.droiddeck.launcher.frontend.SteamGridDb +import com.droiddeck.launcher.frontend.SteamLaunchOptions import com.droiddeck.launcher.session.SessionPrefs import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -191,7 +192,7 @@ internal fun SteamGameArtEditor( game: com.droiddeck.launcher.frontend.Library.SteamGame, onClose: () -> Unit, onChanged: () -> Unit, ) { val target = remember(game.appId) { ArtTarget.of(game) } - ArtOnlyEditor(game.name, target, game, { SteamGameArt.describe(it, game) }, onClose, onChanged) + ArtOnlyEditor(game.name, target, game, { SteamGameArt.describe(it, game) }, onClose, onChanged, launchAppId = game.appId) } @Composable @@ -207,18 +208,25 @@ internal fun StoreGameArtEditor(folder: String, name: String, onClose: () -> Uni @Composable private fun ArtOnlyEditor( name: String, target: ArtTarget?, refresh: Any?, describe: (Context) -> List<AddedGameArt.SlotState>, - onClose: () -> Unit, onChanged: () -> Unit, + onClose: () -> Unit, onChanged: () -> Unit, launchAppId: Int? = null, ) { val app = LocalContext.current.applicationContext val colors = MaterialTheme.colorScheme + val scope = rememberCoroutineScope() val shown = rememberShown(onClose) val close = { shown.targetState = false } var version by remember { mutableIntStateOf(0) } var arts by remember { mutableStateOf<List<AddedGameArt.SlotState>>(emptyList()) } var artSlot by remember { mutableStateOf<AddedGameArt.Slot?>(null) } var logoOpen by remember { mutableStateOf(false) } + var launchOptions by remember { mutableStateOf<String?>(null) } + var launchVersion by remember { mutableIntStateOf(0) } + var editingLaunch by remember { mutableStateOf<String?>(null) } + var launchSaving by remember { mutableStateOf(false) } + var launchError by remember { mutableStateOf<Int?>(null) } val position = rememberLogoPosition(target, version) LaunchedEffect(version, refresh) { if (target != null) arts = withContext(Dispatchers.IO) { describe(app) } } + LaunchedEffect(launchAppId, launchVersion) { if (launchAppId != null) launchOptions = withContext(Dispatchers.IO) { SteamLaunchOptions.current(app, launchAppId) } } val first = remember { FocusRequester() } LaunchedEffect(Unit) { focusWithinFrames({ false }) { first } } AppDialog(shown, close, "artEditor", wide = false, maxWidth = 460.dp) { @@ -228,10 +236,19 @@ private fun ArtOnlyEditor( verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().heightIn(max = maxHeight).verticalScroll(rememberScrollState()), ) { - Text(stringResource(R.string.edit_artwork), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = 2.dp)) + if (launchAppId != null) { + FieldRow(stringResource(R.string.edit_launch_options), focus = first, onClick = { if (!launchSaving) launchOptions?.let { editingLaunch = it } }) { + val options = launchOptions + if (options == null || launchSaving) Loading() else ValueText(options.ifEmpty { "—" }, muted = options.isEmpty()) + } + val error = launchError + if (error != null) Text(stringResource(error), fontSize = 12.sp, color = colors.error, modifier = Modifier.padding(start = 4.dp)) + else Text(stringResource(R.string.edit_launch_options_steam_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp)) + } + Text(stringResource(R.string.edit_artwork), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = if (launchAppId != null) 8.dp else 2.dp)) for (slot in AddedGameArt.Slot.values()) key(slot) { val state = arts.firstOrNull { it.slot == slot } - FieldRow(slot.label(), focus = if (slot == AddedGameArt.Slot.COVER) first else null, onClick = { if (target != null) artSlot = slot }) { + FieldRow(slot.label(), focus = if (slot == AddedGameArt.Slot.COVER && launchAppId == null) first else null, onClick = { if (target != null) artSlot = slot }) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { SlotThumb(slot, state?.file) if (state != null) ValueText(artSourceLabel(state.source), muted = true) else Loading() @@ -241,6 +258,27 @@ private fun ArtOnlyEditor( PickerRow(Icons.Outlined.Tune, stringResource(R.string.art_adjust_logo), logoPositionSummary(position?.value), enabled = target != null && position != null) { logoOpen = true } } } + val before = editingLaunch + if (before != null && launchAppId != null) TextEntryDialog(stringResource(R.string.edit_launch_options), before, onDismiss = { editingLaunch = null }) { value -> + if (launchSaving || value == before.trim()) return@TextEntryDialog + launchSaving = true + scope.launch { + try { + val saved = withContext(Dispatchers.IO) { SteamLaunchOptions.set(app, launchAppId, value, before) } + launchError = when (saved) { + SteamLaunchOptions.Saved.YES -> null + SteamLaunchOptions.Saved.DESKTOP -> R.string.edit_launch_options_desktop + SteamLaunchOptions.Saved.NO -> R.string.edit_launch_options_not_saved + } + if (saved == SteamLaunchOptions.Saved.YES) launchOptions = value else { + launchOptions = null + launchVersion++ + } + } finally { + launchSaving = false + } + } + } val chosen = target ?: return artSlot?.let { slot -> ArtChooserDialog(chosen, slot, arts.firstOrNull { it.slot == slot }, onBack = { artSlot = null }, onCloseAll = { artSlot = null; close() }) { version++; onChanged() } @@ -249,7 +287,6 @@ private fun ArtOnlyEditor( if (logoOpen && loaded != null) LogoPositionHost(chosen, arts, loaded, onBack = { logoOpen = false }, onCloseAll = { logoOpen = false; close() }) { version++; onChanged() } } -/** The position as last read; null until it has been read, so the screen never opens on a guess and saves it over the real one. */ private class LoadedPosition(val value: LogoPosition.Value?) @Composable @@ -262,7 +299,6 @@ private fun rememberLogoPosition(target: ArtTarget?, version: Int): LoadedPositi return position } -/** The "Adjust logo" screen for [target], over the game's background and logo as they are now. */ @Composable private fun LogoPositionHost( target: ArtTarget, arts: List<AddedGameArt.SlotState>, start: LoadedPosition, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt index fdd0fdd8cb..f43e191a66 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt @@ -18,6 +18,7 @@ import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.focusGroup import androidx.compose.foundation.focusable import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown @@ -86,7 +87,13 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.layout.boundsInRoot import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.ExperimentalComposeUiApi +import androidx.compose.ui.focus.FocusDirection +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.input.InputMode +import androidx.compose.ui.platform.LocalInputModeManager import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role @@ -563,9 +570,10 @@ private fun AppIcon(app: HomeApp.LaunchableApp, size: androidx.compose.ui.unit.D private fun AppTile( app: HomeApp.LaunchableApp, folderId: String?, first: Boolean, onLaunch: (HomeApp.LaunchableApp) -> Unit, onNewFolder: (HomeApp.LaunchableApp) -> Unit, + modifier: Modifier = Modifier, ) { var menu by remember { mutableStateOf(false) } - Box { + Box(modifier) { TileFrame(app.key, first, onClick = { onLaunch(app) }, onMenu = { menu = true }) { AppIcon(app, 52.dp) TileLabel(app.label) @@ -710,6 +718,7 @@ private fun FolderTile(entry: AppEntry.Folder, first: Boolean, onOpen: () -> Uni } } +@OptIn(ExperimentalComposeUiApi::class) @Composable private fun FolderSheet( folder: HomeFolders.Folder, apps: List<HomeApp.LaunchableApp>, renameFirst: Boolean, @@ -726,7 +735,27 @@ private fun FolderSheet( if (n.isNotEmpty() && n != folder.name) HomeFolders.rename(ctx, folder.id, n) renaming = false } - val close = { if (renaming) commit(); onClose() } + val firstApp = remember { FocusRequester() } + val inputMode = LocalInputModeManager.current.inputMode + val ff = LocalFrontFocus.current + val grid = rememberLazyGridState() + var closing by remember { mutableStateOf(false) } + LaunchedEffect(renaming, inputMode) { + if (!renaming && !closing && inputMode == InputMode.Keyboard && apps.isNotEmpty()) { + grid.scrollToItem(0) + repeat(2) { androidx.compose.runtime.withFrameNanos { } } + if (!closing) runCatching { firstApp.requestFocus() } + } + } + val close = { + closing = true + if (renaming) commit() + onClose() + if (inputMode == InputMode.Keyboard && ff != null) { + runCatching { ff.items.getValue("tile:folder:${folder.id}").requestFocus() } + .onFailure { runCatching { ff.firstTile.requestFocus() } } + } + } BackHandler { close() } Box( contentAlignment = Alignment.Center, @@ -741,6 +770,13 @@ private fun FolderSheet( .glideBorder(false, Shape16, pal.signal, pal.signal.copy(alpha = 0.22f)) .pointerInput(Unit) { awaitEachGesture { awaitFirstDown(requireUnconsumed = false).consume() } } .controllerBack(close) + .focusProperties { + exit = { dir -> + if (dir == FocusDirection.Up || dir == FocusDirection.Down || dir == FocusDirection.Left || dir == FocusDirection.Right) FocusRequester.Cancel + else FocusRequester.Default + } + } + .focusGroup() .padding(16.dp), ) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp)) { @@ -759,11 +795,15 @@ private fun FolderSheet( } LazyVerticalGrid( columns = GridCells.Adaptive(92.dp), + state = grid, horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), ) { items(apps, key = { it.key }) { app -> - AppTile(app, folderId = folder.id, first = false, onLaunch = { onClose(); onLaunch(it) }, onNewFolder = onNewFolder) + AppTile( + app, folderId = folder.id, first = false, onLaunch = { onClose(); onLaunch(it) }, onNewFolder = onNewFolder, + modifier = if (app === apps.first()) Modifier.focusRequester(firstApp) else Modifier, + ) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt index 2c090048d4..8e84ae4cbf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt @@ -91,16 +91,12 @@ import java.io.File private enum class MovieTab { INSTALLED, IMPORT, REPO, SOUND } -/** Downloads run here rather than in a tab, so switching tabs or closing the settings does not cancel one halfway. */ private val installScope = CoroutineScope(SupervisorJob() + Dispatchers.Main) -/** The downloads under way, by post id and percent; kept here so they are still known when the tab or the settings come back. */ private val installProgress = mutableStateMapOf<String, Int>() -/** What the movie list looks like right now: every movie and the one Steam will play. */ private class MovieSnapshot(val entries: List<BootMovieLibrary.Entry>, val selected: String) -/** The movie list, read again every couple of seconds so a movie picked, added or removed inside Steam shows up here too. */ @Composable private fun rememberMovies(refresh: Int, onSelectionChanged: () -> Unit): MovieSnapshot? { val app = LocalContext.current.applicationContext @@ -143,7 +139,6 @@ private fun TabChip(label: String, selected: Boolean, modifier: Modifier = Modif } } -/** The "Boot movie" settings group: Installed movies, Import your own movies, SteamDeckRepo and Sound. */ @Composable internal fun BootMovieGroup(s: ModeSettings, a: ModeSettingsActions, host: MenuHost) { var tab by rememberSaveable { mutableStateOf(MovieTab.INSTALLED) } @@ -179,7 +174,6 @@ private fun InstalledTab(a: ModeSettingsActions) { val app = LocalContext.current.applicationContext val scope = rememberCoroutineScope() var saving by remember { mutableStateOf(false) } - // The report is for bug reports, so it shows only while Debugging tools is on (read each time this tab opens). val debugging = remember { com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(app) } if (debugging) { SettingsRow(stringResource(R.string.boot_movie_report), stringResource(R.string.boot_movie_report_hint)) { @@ -222,7 +216,6 @@ private fun movieSourceLabel(source: String): String = stringResource( }, ) -/** The installed movies as a list with covers; the one Steam plays is highlighted, and the list follows changes made in Steam. */ @Composable private fun InstalledMoviesDialog(a: ModeSettingsActions, onDismiss: () -> Unit) { val app = LocalContext.current.applicationContext @@ -497,10 +490,8 @@ private fun RepoTab(a: ModeSettingsActions) { } } -/** Downloads [post] and puts it among the installed movies; returns a message when it failed, null when it worked. */ private fun install(app: android.content.Context, post: SteamDeckRepo.Post, onProgress: (Int) -> Unit): String? { val folder = File(app.cacheDir, "boot-movie-download").apply { mkdirs() } - // Leftovers of a download that was cut short are cleared, and every download has a file of its own. folder.listFiles()?.forEach { if (System.currentTimeMillis() - it.lastModified() > 60 * 60 * 1000L) it.delete() } val file = File.createTempFile("movie-", ".webm", folder) return try { @@ -563,7 +554,6 @@ private const val AFTER_OPEN = 3 private const val AFTER_INSTALL = 1 private const val AFTER_USE = 2 -/** Install and Use are different buttons in turn, and the button is disabled while installing; it takes focus back for the controller. */ @Composable private fun RepoAction( installed: Boolean, inUse: Boolean, percent: Int?, busy: Boolean, modifier: Modifier, onInstall: () -> Unit, onUse: () -> Unit, @@ -593,7 +583,6 @@ private fun RepoAction( ) } -/** A movie from SteamDeckRepo played straight from the site, so it can be checked before it is installed. */ @Composable private fun PreviewDialog( post: SteamDeckRepo.Post, installed: Boolean, inUse: Boolean, percent: Int?, busy: Boolean, @@ -674,7 +663,6 @@ private fun MoviePreview(url: String, modifier: Modifier = Modifier) { } } -/** A dialog with one text box, for a search term or a page number; the Android keyboard comes up with it. */ @Composable internal fun TextEntryDialog( title: String, initial: String, number: Boolean, confirm: String, onSubmit: (String) -> Unit, onDismiss: () -> Unit, @@ -697,7 +685,6 @@ internal fun TextEntryDialog( } } -/** Page buttons around the current page, which opens a box to type another page into; first and last page show their numbers. */ @OptIn(ExperimentalLayoutApi::class) @Composable private fun RepoPager(page: Int, last: Int?, hasMore: Boolean, onPage: (Int) -> Unit, onJump: () -> Unit) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomChatPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomChatPage.kt new file mode 100644 index 0000000000..8fee83eb9c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomChatPage.kt @@ -0,0 +1,198 @@ +package com.droiddeck.launcher.ui + +import android.annotation.SuppressLint +import android.content.Context +import android.media.AudioManager +import android.view.ViewGroup +import android.webkit.CookieManager +import android.webkit.RenderProcessGoneDetail +import android.webkit.WebResourceRequest +import android.webkit.WebSettings +import android.webkit.WebView +import android.webkit.WebViewClient +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.viewinterop.AndroidView +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SteamWebLogin +import com.droiddeck.launcher.runtime.LinuxRuntime +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.withContext +import java.io.File +import kotlin.coroutines.resume +import kotlin.math.roundToInt + +private const val STEAM_CHAT = "https://steamcommunity.com/chat" +private const val CHAT_PAGE_SCALE = 0.75f +private val STEAM_HOSTS = listOf("steamcommunity.com", "steam-chat.com", "steampowered.com", "steamstatic.com", "steamcontent.com") + +internal fun steamChatAllows(host: String?): Boolean = + host != null && STEAM_HOSTS.any { host == it || host.endsWith(".$it") } + +internal fun desktopUserAgent(webView: String?): String { + val chrome = webView?.let { Regex("Chrome/[\\d.]+").find(it)?.value } ?: "Chrome/127.0.6533.103" + return "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) $chrome Safari/537.36" +} + +internal fun steamChatFitScript(cssWidth: Int, scale: Float): String { + val zoom = "%.2f".format(java.util.Locale.US, scale) + return "(function(){var m=document.querySelector('meta[name=viewport]');" + + "if(!m){m=document.createElement('meta');m.name='viewport';document.head.appendChild(m);}" + + "m.content='width=$cssWidth, initial-scale=$zoom';" + + "if(!document.getElementById('dd-chat-fit')){var s=document.createElement('style');s.id='dd-chat-fit';" + + "s.textContent='$STEAM_CHAT_FIT_CSS';document.head.appendChild(s);}" + + "window.dispatchEvent(new Event('resize'));})()" +} + +internal const val STEAM_CHAT_FIT_CSS = ".chat_main>:has(~.chat_main_flex){display:none!important}" + + ".ChatRoomList_Empty{display:none!important}" + + ".chatRoomListContainer{height:auto!important;max-height:25vh!important}" + +@Composable +fun BottomChatPage() { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + var chatOpen by remember { mutableStateOf(true) } + var stopped by remember { mutableStateOf(false) } + val lifecycle = LocalLifecycleOwner.current.lifecycle + DisposableEffect(lifecycle) { + val observer = LifecycleEventObserver { _, event -> + if (event == Lifecycle.Event.ON_RESUME && stopped) { + stopped = false + chatOpen = true + } + } + lifecycle.addObserver(observer) + onDispose { lifecycle.removeObserver(observer) } + } + var fromSteam by remember { mutableStateOf<Boolean?>(null) } + LaunchedEffect(chatOpen) { + if (!chatOpen) { + fromSteam = null + return@LaunchedEffect + } + val cookies = withContext(Dispatchers.IO) { + SteamWebLogin.read(LinuxRuntime.rootDir(context), SessionState.steamClientArch, File(context.cacheDir, "steam-web-login")) + } + val manager = CookieManager.getInstance() + for (c in cookies) suspendCancellableCoroutine { cont -> manager.setCookie("https://${c.host}", c.header) { cont.resume(Unit) } } + manager.flush() + fromSteam = cookies.any { it.header.startsWith("steamLoginSecure=") } + } + Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + if (!chatOpen) { + VoiceRow(context) + Column(Modifier.weight(1f).fillMaxWidth().padding(24.dp), horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)) { + if (stopped) Text(stringResource(R.string.bottom_chat_stopped), fontSize = 13.sp, color = colors.onSurfaceVariant, textAlign = TextAlign.Center) + Text(stringResource(R.string.bottom_chat_why), fontSize = 15.sp, color = colors.onBackground, textAlign = TextAlign.Center) + BottomPillButton(stringResource(R.string.bottom_chat_open), "bottom-chat-open") { + stopped = false + chatOpen = true + } + } + } else { + VoiceRow(context, onClose = { chatOpen = false }, + note = if (fromSteam == false) stringResource(R.string.bottom_chat_not_signed_in) else "") + Box(Modifier.weight(1f).fillMaxWidth().clip(RoundedCornerShape(14.dp))) { + if (fromSteam != null) SteamChatView(onStopped = { + stopped = true + chatOpen = false + }) + } + } + } +} + +@Composable +private fun VoiceRow(context: Context, onClose: (() -> Unit)? = null, note: String = "") { + val colors = MaterialTheme.colorScheme + val audio = remember { context.getSystemService(Context.AUDIO_SERVICE) as AudioManager } + val max = remember { audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC).coerceAtLeast(1) } + var volume by remember { mutableIntStateOf(audio.getStreamVolume(AudioManager.STREAM_MUSIC)) } + fun step(direction: Int) { + audio.adjustStreamVolume(AudioManager.STREAM_MUSIC, direction, 0) + volume = audio.getStreamVolume(AudioManager.STREAM_MUSIC) + } + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + if (onClose != null) BottomPillButton(stringResource(R.string.bottom_chat_close), "bottom-chat-close", onClose) + if (SessionState.micAvailable) { + val on = SessionState.micEnabled + BottomPillButton(stringResource(if (on) R.string.bottom_chat_mic_on else R.string.bottom_chat_mic_off), "bottom-chat-mic") { + SessionService.setMicEnabled(context, !on) + } + } + val hint = if (onClose == null && !SessionState.micAvailable) stringResource(R.string.bottom_chat_mic_unavailable) else note + Text(hint, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 3, modifier = Modifier.weight(1f)) + Text(stringResource(R.string.bottom_chat_volume, volume * 100 / max), fontSize = 14.sp, color = colors.onSurfaceVariant) + BottomPillButton("−", "bottom-chat-volume-down") { step(AudioManager.ADJUST_LOWER) } + BottomPillButton("+", "bottom-chat-volume-up") { step(AudioManager.ADJUST_RAISE) } + } +} + +@SuppressLint("SetJavaScriptEnabled") +@Composable +private fun SteamChatView(onStopped: () -> Unit) { + AndroidView(factory = { ctx -> + WebView(ctx).apply { + layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) + setBackgroundColor(0xFF0A0B0D.toInt()) + settings.javaScriptEnabled = true + settings.domStorageEnabled = true + settings.allowFileAccess = false + settings.allowContentAccess = false + settings.useWideViewPort = true + settings.loadWithOverviewMode = true + settings.userAgentString = desktopUserAgent(runCatching { WebSettings.getDefaultUserAgent(ctx) }.getOrNull()) + CookieManager.getInstance().setAcceptCookie(true) + webViewClient = object : WebViewClient() { + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = + !steamChatAllows(request.url.host) + + override fun onPageFinished(view: WebView, url: String) { + val scale = view.resources.displayMetrics.density * CHAT_PAGE_SCALE + if (view.width > 0) view.evaluateJavascript(steamChatFitScript((view.width / scale).roundToInt(), CHAT_PAGE_SCALE), null) + } + + override fun onRenderProcessGone(view: WebView, detail: RenderProcessGoneDetail): Boolean { + onStopped() + return true + } + } + loadUrl(STEAM_CHAT) + } + }, modifier = Modifier.fillMaxSize(), onRelease = { view -> + CookieManager.getInstance().flush() + view.destroy() + }) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt new file mode 100644 index 0000000000..6838a17760 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt @@ -0,0 +1,141 @@ +package com.droiddeck.launcher.ui + +import androidx.annotation.StringRes +import androidx.compose.foundation.background +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +class BottomPage( + val id: String, + @StringRes val label: Int, + val icon: ImageVector, + val content: @Composable () -> Unit, +) + +internal fun pickBottomPage(remembered: String?, ids: List<String>): String? = + ids.firstOrNull { it == remembered } ?: ids.firstOrNull { it == DEFAULT_PAGE } ?: ids.firstOrNull() + +internal object SessionBottomTab { + private var session: String? = null + private var tab: String? = null + + @Synchronized + fun picked(sessionId: String?): String? = tab.takeIf { sessionId != null && sessionId == session } + + @Synchronized + fun pick(sessionId: String?, id: String) { + session = sessionId + tab = id + } +} + +internal fun pageForGameStart(ids: List<String>): String? = GAME_PAGE.takeIf { it in ids } + +private const val DEFAULT_PAGE = "telemetry" +private const val GAME_PAGE = "telemetry" +private val MIN_TAB = 80.dp + +@Composable +internal fun BottomDashboard( + pages: List<BottomPage>, + remembered: String?, + onPage: (String) -> Unit, + bar: BottomBarModel? = null, + gameStarts: Int = 0, + strip: (@Composable (String?) -> Unit)? = null, +) { + val colors = MaterialTheme.colorScheme + var current by remember { mutableStateOf(pickBottomPage(remembered, pages.map { it.id })) } + val startsWhenOpened = remember { gameStarts } + LaunchedEffect(gameStarts) { + if (gameStarts != startsWhenOpened) pageForGameStart(pages.map { it.id })?.let { current = it } + } + val page = pages.firstOrNull { it.id == current } ?: pages.firstOrNull() + Column(Modifier.fillMaxSize().background(colors.background)) { + bar?.let { BottomScreenBar(it) } + BoxWithConstraints(Modifier.fillMaxWidth().padding(start = 12.dp, end = 12.dp, bottom = 8.dp).height(56.dp)) { + val roomy = pages.isEmpty() || (maxWidth - 6.dp * (pages.size - 1)) / pages.size >= MIN_TAB + Row( + Modifier.fillMaxSize().then(if (roomy) Modifier else Modifier.horizontalScroll(rememberScrollState())), + horizontalArrangement = Arrangement.spacedBy(6.dp), + ) { + pages.forEach { p -> + PageTab(p, p.id == page?.id, if (roomy) Modifier.weight(1f) else Modifier.width(MIN_TAB)) { + current = p.id + onPage(p.id) + } + } + } + } + Column(Modifier.weight(1f).fillMaxWidth().padding(horizontal = 12.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { + strip?.invoke(page?.id) + Box(Modifier.weight(1f).fillMaxWidth().padding(bottom = 10.dp)) { + if (page != null) page.content() + else Text(stringResource(R.string.bottom_dashboard_empty), fontSize = 15.sp, color = colors.onSurfaceVariant, + modifier = Modifier.align(Alignment.Center)) + } + } + } +} + +@Composable +private fun PageTab(page: BottomPage, selected: Boolean, modifier: Modifier, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = RoundedCornerShape(14.dp) + val name = stringResource(page.label) + Column( + modifier.fillMaxHeight().clip(shape) + .background(if (selected) pal.signal else Color.Transparent) + .border(1.dp, if (selected) pal.signal else pal.line, shape) + .semantics { contentDescription = name } + .clickable(role = Role.Tab, onClick = onClick).testTag("bottom-page-${page.id}") + .padding(horizontal = 4.dp, vertical = 6.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + ) { + val tint = if (selected) pal.onSignal else colors.onBackground + Icon(page.icon, contentDescription = null, tint = tint, modifier = Modifier.size(20.dp)) + Text(name, fontSize = 11.sp, lineHeight = 13.sp, fontWeight = FontWeight.SemiBold, color = tint, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(top = 2.dp)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt new file mode 100644 index 0000000000..88dd8c916e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt @@ -0,0 +1,349 @@ +package com.droiddeck.launcher.ui + +import android.annotation.SuppressLint +import android.content.Context +import android.content.res.Configuration +import android.graphics.Color +import android.os.Build +import android.os.SystemClock +import android.view.Gravity +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.SurfaceHolder +import android.view.SurfaceView +import android.view.View +import android.view.ViewConfiguration +import android.view.WindowInsets +import android.graphics.RectF +import androidx.compose.runtime.mutableStateOf +import androidx.compose.ui.platform.ComposeView +import android.widget.FrameLayout +import android.widget.LinearLayout +import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.GuestKeys +import com.droiddeck.launcher.input.InputSpace +import com.droiddeck.launcher.input.KeyboardHost +import com.droiddeck.launcher.input.PadBridge +import com.droiddeck.launcher.input.PointerGestures +import com.droiddeck.launcher.input.TouchpadGestures +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.BottomDesktop + +@SuppressLint("ViewConstructor") +class BottomDesktopPanel( + context: Context, + onClose: (() -> Unit)?, + onMenu: (() -> Unit)?, + steamButtons: Pair<() -> Unit, () -> Unit>?, + onSwap: (() -> Unit)? = null, + private val fullResolution: Boolean = false, +) : LinearLayout(context), SurfaceHolder.Callback { + private lateinit var surfaceView: SurfaceView + private val area = FrameLayout(context).apply { clipChildren = true } + private val state = mutableStateOf(BottomDesktop.state) + private val status = ComposeView(context).apply { + setContent { DroidDeckTheme { BottomDesktopStatus(state.value, ::startAgain) } } + } + private val keyboardHost = KeyboardHost(context) { event -> sendKey(event) } + private var directTouch = SessionPrefs.bottomDesktopDirectTouch(context) + private val touchMode = mutableStateOf(directTouch) + private val trackpad = TouchpadGestures(ViewConfiguration.get(context).scaledTouchSlop.toFloat(), TrackpadInput()).apply { + desktop = true + } + private var attached = false + /** The surface was given to a compositor process; a new process cannot connect to it again. */ + private var surfaceUsed = false + private var fullWidth = 0 + private var fullHeight = 0 + private var lastTouchY = 0f + private var lastPressMs = 0L + private var scrollRestX = 0f + private var scrollRestY = 0f + private val stateListener: () -> Unit = { showState() } + + init { + orientation = VERTICAL + setBackgroundColor(Color.BLACK) + isFocusable = true + isFocusableInTouchMode = true + addView(bar(onClose, onMenu, steamButtons, onSwap), LayoutParams(-1, -2)) + area.addView(keyboardHost) + addSurface() + area.addView(status, FrameLayout.LayoutParams(-1, -1)) + addView(area, LayoutParams(-1, 0, 1f)) + keyboardHost.onImeChanged = { pan() } + showTouchMode() + } + + private fun addSurface() { + surfaceView = SurfaceView(context) + surfaceView.holder.addCallback(this) + @Suppress("ClickableViewAccessibility") + surfaceView.setOnTouchListener { _, event -> onSurfaceTouch(event) } + area.addView(surfaceView, 1, FrameLayout.LayoutParams(fullWidth.takeIf { it > 0 } ?: -1, fullHeight.takeIf { it > 0 } ?: -1)) + } + + private fun bar(onClose: (() -> Unit)?, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?, onSwap: (() -> Unit)?): View = + bottomScreenBarView(context) { + val touch = touchMode.value + BottomBarModel( + context.getString(R.string.bottom_desktop_title, + context.getString(if (touch) R.string.bottom_desktop_mode_touch else R.string.bottom_desktop_mode_trackpad)), + onClose, onMenu, steamButtons?.first, steamButtons?.second, + listOfNotNull( + BarExtra(context.getString(if (touch) R.string.bottom_desktop_direct_touch else R.string.bottom_desktop_trackpad), + icon = if (touch) R.drawable.ic_bottom_touch else R.drawable.ic_bottom_mouse) { setDirectTouch(!directTouch) }, + BarExtra(context.getString(R.string.second_show_keyboard), icon = R.drawable.ic_bottom_keyboard) { keyboardHost.toggle() }, + onSwap?.let { BarExtra(context.getString(R.string.swap_screens), icon = R.drawable.ic_bottom_swap, onClick = it) }, + ), + ) + } + + private fun setDirectTouch(on: Boolean) { + trackpad.cancel() + BottomDesktop.sendTouch(3, -1, 0, 0) + directTouch = on + SessionPrefs.setBottomDesktopDirectTouch(context, on) + showTouchMode() + } + + private fun showTouchMode() { + touchMode.value = directTouch + BottomDesktop.showCursor(!directTouch) + if (!directTouch && surfaceView.width > 0) { + trackpad.bounds = RectF(0f, 0f, surfaceView.width.toFloat(), surfaceView.height.toFloat()) + trackpad.place(surfaceView.width / 2f, surfaceView.height / 2f) + movePointer(trackpad.x, trackpad.y) + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + BottomDesktop.addListener(stateListener) + BottomDesktop.setTextInputListener { focused -> + val tapped = SystemClock.uptimeMillis() - lastPressMs < TEXT_FIELD_TAP_MS + val hardKeyboard = resources.configuration.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO + if (focused && tapped && !hardKeyboard && !keyboardHost.shown) keyboardHost.show() + else if (!focused && keyboardHost.shown) keyboardHost.hide() + } + showState() + post { if (!keyboardHost.shown) requestFocus() } + } + + override fun onDetachedFromWindow() { + BottomDesktop.removeListener(stateListener) + BottomDesktop.setTextInputListener(null) + keyboardHost.takeIf { it.shown }?.hide() + trackpad.cancel() + status.disposeComposition() + super.onDetachedFromWindow() + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean = + if (BottomDesktop.state == BottomDesktop.State.RUNNING && !PadBridge.isControllerKeyEvent(event) && + event.keyCode != KeyEvent.KEYCODE_BACK && sendKey(event)) true + else super.dispatchKeyEvent(event) + + private fun sendKey(event: KeyEvent): Boolean { + if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount > 0) return true + if (GuestKeys.send(event, BottomDesktop::sendKey)) return true + val ch = event.unicodeChar + if (event.action == KeyEvent.ACTION_DOWN && ch > 0) { + BottomDesktop.sendText(String(Character.toChars(ch))) + return true + } + return false + } + + private fun startAgain() { + if (surfaceUsed && !BottomDesktop.connected) { + attached = false + surfaceUsed = false + area.removeView(surfaceView) + addSurface() + return + } + if (!attached) return + attached = false + syncSurface(surfaceView.holder) + } + + private fun showState() { + state.value = BottomDesktop.state + status.visibility = if (state.value == BottomDesktop.State.RUNNING) View.GONE else View.VISIBLE + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + post { holdSurfaceSize() } + } + + // The keyboard shrinks the window; the desktop keeps its size and slides up under it instead of being squeezed. + private fun holdSurfaceSize() { + val w = area.width + val h = area.height + if (w <= 0 || h <= 0) return + if (w != fullWidth || h > fullHeight || !keyboardHost.shown) { + fullWidth = w + fullHeight = h + val (desktopW, desktopH) = BottomDesktop.outputSizeFor(w, h, fullResolution) + val (fitW, fitH) = if (w - desktopW in 0..1 && h - desktopH in 0..1) desktopW to desktopH + else fitDesktop(w, h, desktopW, desktopH) + surfaceView.layoutParams = if (fitW == w && fitH == h) FrameLayout.LayoutParams(w, h) + else FrameLayout.LayoutParams(fitW, fitH, Gravity.CENTER_HORIZONTAL).apply { topMargin = (h - fitH) / 2 } + surfaceView.post { syncSurface(surfaceView.holder) } + } + pan() + } + + private fun imeOverlap(): Int { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return 0 + if (area.height < fullHeight) return 0 + val ime = rootWindowInsets?.getInsets(WindowInsets.Type.ime())?.bottom ?: return 0 + if (ime <= 0) return 0 + val at = IntArray(2) + area.getLocationInWindow(at) + return (at[1] + area.height - (rootView.height - ime)).coerceIn(0, area.height) + } + + private fun pan() { + val visible = area.height - imeOverlap() + val hidden = (fullHeight - visible).coerceAtLeast(0) + val anchor = if (directTouch) lastTouchY else trackpad.y + surfaceView.translationY = if (hidden == 0 || !keyboardHost.shown) 0f + else -(anchor - visible * 0.4f).coerceIn(0f, hidden.toFloat()) + } + + override fun surfaceCreated(holder: SurfaceHolder) = Unit + + override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) = syncSurface(holder) + + override fun surfaceDestroyed(holder: SurfaceHolder) { + if (holder !== surfaceView.holder) return + attached = false + surfaceUsed = false + BottomDesktop.detach(holder.surface) + } + + private fun syncSurface(holder: SurfaceHolder) { + if (holder !== surfaceView.holder || fullWidth <= 0 || fullHeight <= 0 || !holder.surface.isValid) return + val (width, height) = BottomDesktop.outputSizeFor(fullWidth, fullHeight, fullResolution) + if (width <= 0 || height <= 0) return + val frame = holder.surfaceFrame + if (frame.width() != width || frame.height() != height) { + val params = surfaceView.layoutParams + if (params.width == width && params.height == height) holder.setSizeFromLayout() else holder.setFixedSize(width, height) + return + } + if (attached) { + BottomDesktop.resize(holder.surface, width, height) + return + } + attached = true + surfaceUsed = true + BottomDesktop.attach(context, holder.surface, width, height, display?.refreshRate ?: 60f) + showTouchMode() + } + + private fun onSurfaceTouch(event: MotionEvent): Boolean { + val w = surfaceView.width + val h = surfaceView.height + if (w <= 0 || h <= 0 || BottomDesktop.state != BottomDesktop.State.RUNNING) return true + if (event.actionMasked == MotionEvent.ACTION_DOWN || event.actionMasked == MotionEvent.ACTION_UP) + lastPressMs = SystemClock.uptimeMillis() + if (directTouch) return forwardTouch(event, w, h) + val bounds = RectF(0f, 0f, w.toFloat(), h.toFloat()) + if (trackpad.bounds != bounds) { + trackpad.bounds = bounds + trackpad.place(trackpad.x, trackpad.y) + } + return trackpad.onTouch(event) + } + + private fun forwardTouch(event: MotionEvent, w: Int, h: Int): Boolean { + val action = when (event.actionMasked) { + MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> 0 + MotionEvent.ACTION_MOVE -> 1 + MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> 2 + MotionEvent.ACTION_CANCEL -> { BottomDesktop.sendTouch(3, -1, 0, 0); return true } + else -> return true + } + if (event.actionMasked == MotionEvent.ACTION_DOWN) lastTouchY = event.y + if (action == 1) { + for (i in 0 until event.pointerCount) send(1, event.getPointerId(i), event.getX(i), event.getY(i), w, h) + } else { + val i = event.actionIndex + send(action, event.getPointerId(i), event.getX(i), event.getY(i), w, h) + } + return true + } + + private fun send(action: Int, id: Int, x: Float, y: Float, w: Int, h: Int) = + BottomDesktop.sendTouch(action, id, InputSpace.x(x, w), InputSpace.y(y, h)) + + private fun movePointer(x: Float, y: Float) = + BottomDesktop.sendPointer(InputSpace.x(x, surfaceView.width), InputSpace.y(y, surfaceView.height)) + + private inner class TrackpadInput : PointerGestures.Listener { + override fun onMove(x: Float, y: Float) = movePointer(x, y) + + override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { + movePointer(x, y) + BottomDesktop.sendScene(SCENE_BUTTON, button, if (pressed) 1 else 0) + } + + override fun onWheel(steps: Int) = BottomDesktop.sendScene(SCENE_WHEEL, steps) + + override fun onScroll(dx: Float, dy: Float) { + val (outW, outH) = BottomDesktop.outputSize + scrollRestX += dx * outW / surfaceView.width.coerceAtLeast(1) * AXIS_UNITS_PER_PIXEL + scrollRestY += dy * outH / surfaceView.height.coerceAtLeast(1) * AXIS_UNITS_PER_PIXEL + val h = scrollRestX.toInt() + val v = scrollRestY.toInt() + if (h == 0 && v == 0) return + scrollRestX -= h + scrollRestY -= v + BottomDesktop.sendScene(SCENE_AXIS, v, h) + } + + override fun onScrollEnd() { + scrollRestX = 0f + scrollRestY = 0f + BottomDesktop.sendScene(SCENE_AXIS, 0, 0) + } + + override fun onZoom(steps: Int) { + BottomDesktop.sendKey(KEY_LEFTCTRL, true) + BottomDesktop.sendScene(SCENE_WHEEL, steps) + BottomDesktop.sendKey(KEY_LEFTCTRL, false) + } + + override fun onThreeFingerTap(): Boolean { + post { keyboardHost.toggle() } + return true + } + + override fun onLongPress() { + performHapticFeedback(android.view.HapticFeedbackConstants.LONG_PRESS) + } + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density + 0.5f).toInt() + + private companion object { + const val SCENE_BUTTON = 3 + const val SCENE_WHEEL = 4 + const val SCENE_AXIS = 12 + const val KEY_LEFTCTRL = 29 + const val AXIS_UNITS_PER_PIXEL = 3f + const val TEXT_FIELD_TAP_MS = 1_000L + } +} + +internal fun fitDesktop(areaW: Int, areaH: Int, desktopW: Int, desktopH: Int): Pair<Int, Int> { + if (areaW <= 0 || areaH <= 0 || desktopW <= 0 || desktopH <= 0) return areaW to areaH + val widthLimited = areaW.toLong() * desktopH <= areaH.toLong() * desktopW + val w = if (widthLimited) areaW else (desktopW.toLong() * areaH / desktopH).toInt() + val h = if (widthLimited) (desktopH.toLong() * areaW / desktopW).toInt() else areaH + return if (areaW - w <= 4 && areaH - h <= 4) areaW to areaH else w to h +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopStatus.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopStatus.kt new file mode 100644 index 0000000000..88bd567760 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopStatus.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.BottomDesktop + +/** What the bottom screen shows while the desktop is not drawing: the session loading screen's throbber and a line of text. */ +@Composable +internal fun BottomDesktopStatus(state: BottomDesktop.State, onStart: () -> Unit) { + val colors = MaterialTheme.colorScheme + val starting = state == BottomDesktop.State.STARTING + Box(Modifier.fillMaxSize().background(colors.background).blockTouches(), contentAlignment = Alignment.Center) { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + modifier = Modifier.padding(horizontal = 32.dp), + ) { + LogoThrobber(Modifier.width(if (starting) 96.dp else 76.dp), running = starting) + Spacer(Modifier.height(24.dp)) + Text( + stringResource(when (state) { + BottomDesktop.State.ENDED -> R.string.bottom_desktop_ended + BottomDesktop.State.FAILED -> R.string.bottom_desktop_failed + BottomDesktop.State.OFF -> R.string.bottom_desktop_off + else -> R.string.bottom_desktop_starting + }), + fontSize = 18.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + textAlign = TextAlign.Center, modifier = Modifier.widthIn(max = 420.dp), + ) + if (!starting) { + Spacer(Modifier.height(20.dp)) + PrimaryButton(stringResource(R.string.bottom_desktop_start), main = true, onClick = onStart) + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt new file mode 100644 index 0000000000..7ad576f956 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt @@ -0,0 +1,125 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SteamDownload +import com.droiddeck.launcher.session.SteamDownloads +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadState +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.formatSpeed +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext + +internal fun downloadRate(previousDone: Long, previousAt: Long, done: Long, at: Long): Long = + if (previousDone < 0L || done <= previousDone || at <= previousAt) 0L else (done - previousDone) * 1000L / (at - previousAt) + +private const val STEAM_POLL_MS = 2_000L + +private class SteamRow(val download: SteamDownload, val rate: Long) + +@Composable +fun BottomDownloadsPage() { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + var steam by remember { mutableStateOf<List<SteamRow>>(emptyList()) } + LaunchedEffect(Unit) { + var last = emptyMap<String, Pair<Long, Long>>() + while (true) { + val now = System.currentTimeMillis() + val read = withContext(Dispatchers.IO) { + runCatching { + SteamDownloads.read(LinuxRuntime.rootDir(context), SessionState.steamLibraryMounts, SessionState.steamClientArch) + }.getOrDefault(emptyList()) + } + steam = read.map { d -> + val before = last[d.appId] + SteamRow(d, if (before == null) 0L else downloadRate(before.first, before.second, d.done, now)) + } + last = read.associate { it.appId to (it.done to now) } + delay(STEAM_POLL_MS) + } + } + val store = StoresState.downloads.filter { it.isActive } + if (steam.isEmpty() && store.isEmpty()) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.bottom_downloads_none), fontSize = 15.sp, color = colors.onSurfaceVariant) + } + return + } + LazyColumn(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(steam, key = { "steam:${it.download.appId}:${it.download.shader}" }) { row -> + val d = row.download + val detail = when { + d.shader -> stringResource(R.string.bottom_downloads_shader) + d.paused -> stringResource(R.string.bottom_downloads_paused) + d.total <= 0L -> stringResource(R.string.bottom_downloads_queued) + else -> listOf("${formatBytes(d.done)} / ${formatBytes(d.total)}", formatSpeed(row.rate)).filter { it.isNotEmpty() }.joinToString(" · ") + } + BottomDownloadRow(d.name, stringResource(R.string.bottom_downloads_steam), detail, + if (d.total > 0L) (d.done.toFloat() / d.total).coerceIn(0f, 1f) else null) + } + items(store, key = { "store:${it.key}" }) { entry -> + val e = StoresState.download(entry.key) ?: entry + val detail = when (e.state) { + DownloadState.PAUSED -> stringResource(R.string.bottom_downloads_paused) + DownloadState.QUEUED -> stringResource(R.string.bottom_downloads_queued) + else -> listOf( + if (e.bytesTotal > 0L) "${formatBytes(e.bytesDone)} / ${formatBytes(e.bytesTotal)}" else "", + formatSpeed(e.speedBps), + ).filter { it.isNotEmpty() }.joinToString(" · ") + } + BottomDownloadRow(e.name, e.store.label, detail, e.stageFraction.takeIf { it >= 0f }) + } + } +} + +@Composable +private fun BottomDownloadRow(name: String, source: String, detail: String, fraction: Float?) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column( + Modifier.fillMaxWidth().clip(RoundedCornerShape(14.dp)).background(pal.surface).padding(horizontal = 14.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(name, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Text(source, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, modifier = Modifier.padding(start = 8.dp)) + } + if (fraction != null) LinearProgressIndicator(progress = { fraction }, modifier = Modifier.fillMaxWidth(), color = pal.signal) + else LinearProgressIndicator(modifier = Modifier.fillMaxWidth(), color = pal.signal) + if (detail.isNotEmpty()) Text(detail, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt new file mode 100644 index 0000000000..ba5b5af126 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.Presentation +import android.graphics.Color +import android.os.Bundle +import android.view.Display +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.SurfaceHolder +import android.view.SurfaceView +import android.view.View +import android.view.ViewGroup +import android.view.WindowManager +import android.widget.FrameLayout + +class BottomGameScreen( + private val activity: Activity, + display: Display, + private val callback: SurfaceHolder.Callback, + private val onTouch: (MotionEvent) -> Boolean, +) : Presentation(activity, display) { + val surfaceView = SurfaceView(getContext()) + val holder: SurfaceHolder get() = surfaceView.holder + + val hz: Float get() = display.mode.refreshRate + + init { + setCancelable(false) + setCanceledOnTouchOutside(false) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val root = FrameLayout(context).apply { setBackgroundColor(Color.BLACK) } + root.addView(surfaceView, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + setContentView(root) + window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + @Suppress("DEPRECATION") + window?.decorView?.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + or View.SYSTEM_UI_FLAG_FULLSCREEN + or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE + or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + surfaceView.setOnTouchListener { _, event -> onTouch(event) } + surfaceView.holder.addCallback(callback) + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean = + activity.dispatchKeyEvent(event) || super.dispatchKeyEvent(event) + + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean = + activity.dispatchGenericMotionEvent(event) || super.dispatchGenericMotionEvent(event) +} + +object GameScreenSwap { + fun wanted( + requested: Boolean, + activityStarted: Boolean, + sessionEnded: Boolean, + inPip: Boolean, + glassesOutput: Boolean, + bottomScreenFree: Boolean, + ): Boolean = requested && activityStarted && !sessionEnded && !inPip && !glassesOutput && bottomScreenFree +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt new file mode 100644 index 0000000000..266cb5a592 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt @@ -0,0 +1,116 @@ +package com.droiddeck.launcher.ui + +import android.content.Intent +import android.provider.Settings +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.BottomNotifications +import kotlinx.coroutines.delay + +internal fun notificationAccessIntent(context: android.content.Context): Intent = + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) { + Intent(Settings.ACTION_NOTIFICATION_LISTENER_DETAIL_SETTINGS).putExtra( + Settings.EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME, + android.content.ComponentName(context, com.droiddeck.launcher.session.BottomNotificationListener::class.java).flattenToString(), + ) + } else Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS) + +@Composable +fun BottomNotificationsPage(openSettings: ((Intent, () -> Boolean) -> Unit)?) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var granted by remember { mutableStateOf(BottomNotifications.granted(context)) } + LaunchedEffect(Unit) { + while (true) { + granted = BottomNotifications.granted(context) + delay(2_000L) + } + } + if (!granted) { + Column(Modifier.fillMaxSize().padding(24.dp), horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)) { + Text(stringResource(R.string.bottom_notifications_why), fontSize = 15.sp, color = colors.onBackground, textAlign = TextAlign.Center) + BottomPillButton(stringResource(R.string.bottom_notifications_allow), "bottom-notifications-allow") { + val intent = notificationAccessIntent(context) + if (openSettings != null) openSettings(intent) { BottomNotifications.granted(context) } + else runCatching { context.startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) } + } + } + return + } + val shown = BottomNotifications.items + if (shown.isEmpty()) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.bottom_notifications_none), fontSize = 15.sp, color = colors.onSurfaceVariant) + } + return + } + val timeFormat = remember { android.text.format.DateFormat.getTimeFormat(context) } + Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.bottom_notifications_count, shown.size), fontSize = 13.sp, color = colors.onSurfaceVariant, + modifier = Modifier.weight(1f)) + BottomPillButton(stringResource(R.string.bottom_notifications_clear), "bottom-notifications-clear") { BottomNotifications.clear() } + } + LazyColumn(Modifier.weight(1f).fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(shown.toList(), key = { it.key }) { n -> + Column(Modifier.fillMaxWidth().clip(RoundedCornerShape(14.dp)).background(pal.surface).padding(horizontal = 14.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(4.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(n.app, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Text(timeFormat.format(java.util.Date(n.postedAt)), fontSize = 12.sp, color = colors.onSurfaceVariant) + } + if (n.title.isNotBlank()) Text(n.title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis) + if (n.text.isNotBlank()) Text(n.text, fontSize = 14.sp, color = colors.onBackground, maxLines = 4, overflow = TextOverflow.Ellipsis) + } + } + } + } +} + +@Composable +internal fun BottomPillButton(label: String, tag: String, onClick: () -> Unit) { + val pal = LocalPalette.current + Box( + Modifier.height(40.dp).clip(RoundedCornerShape(20.dp)).background(pal.signal.copy(alpha = 0.16f)) + .clickable(role = Role.Button, onClick = onClick).testTag(tag).padding(horizontal = 16.dp), + contentAlignment = Alignment.Center, + ) { + Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt new file mode 100644 index 0000000000..a8884fdec7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Download +import androidx.compose.material.icons.outlined.Forum +import androidx.compose.material.icons.outlined.Speed +import androidx.compose.material.icons.outlined.Notifications +import androidx.compose.material.icons.outlined.PhotoLibrary +import com.droiddeck.launcher.R + +class BottomPageActions( + val takeScreenshot: ((onDone: (Boolean) -> Unit) -> Unit)? = null, + val fps: () -> Float? = { null }, + val openSettings: ((intent: android.content.Intent, done: () -> Boolean) -> Unit)? = null, + val runningGame: () -> String? = { null }, +) + +internal const val BOTTOM_PAGE_TELEMETRY = "telemetry" + +fun sessionBottomPages(actions: BottomPageActions): List<BottomPage> = listOf( + BottomPage(BOTTOM_PAGE_TELEMETRY, R.string.bottom_page_telemetry, Icons.Outlined.Speed) { BottomTelemetryPage(actions.fps, actions.runningGame) }, + BottomPage("downloads", R.string.bottom_page_downloads, Icons.Outlined.Download) { BottomDownloadsPage() }, + BottomPage("notifications", R.string.bottom_page_notifications, Icons.Outlined.Notifications) { BottomNotificationsPage(actions.openSettings) }, + BottomPage("screenshots", R.string.bottom_page_screenshots, Icons.Outlined.PhotoLibrary) { BottomScreenshotsPage(actions.takeScreenshot) }, + BottomPage("chat", R.string.bottom_page_chat, Icons.Outlined.Forum) { BottomChatPage() }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenBar.kt new file mode 100644 index 0000000000..4897801863 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenBar.kt @@ -0,0 +1,202 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsFocusedAsState +import androidx.compose.foundation.interaction.collectIsHoveredAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +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.widthIn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.MoreHoriz +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.foundation.rememberScrollState +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState + +internal class BarExtra( + val description: String, + val icon: Int? = null, + val vector: ImageVector? = null, + val active: Boolean = false, + val tag: String? = null, + val onClick: () -> Unit, +) + +internal class BottomBarModel( + val title: String?, + val onClose: (() -> Unit)?, + val onMenu: (() -> Unit)?, + val onSteam: (() -> Unit)?, + val onQam: (() -> Unit)?, + val extras: List<BarExtra> = emptyList(), + val menuActive: Boolean = false, +) + +@Composable +internal fun BottomScreenBar(model: BottomBarModel, modifier: Modifier = Modifier) { + val colors = MaterialTheme.colorScheme + BoxWithConstraints(modifier.fillMaxWidth().height(BAR_HEIGHT).blockTouches()) { + val buttons = listOfNotNull(model.onClose, model.onMenu, model.onQam).size + model.extras.size + val steamWidth = if (model.onSteam != null) STEAM_WIDTH + BAR_GAP else 0.dp + val titleWidth = if (model.title != null) MIN_TITLE + BAR_GAP else 0.dp + val needed = BAR_PAD * 2 + BUTTON * buttons + BAR_GAP * (buttons - 1).coerceAtLeast(0) + steamWidth + titleWidth + val fits = maxWidth >= needed + Row( + Modifier.fillMaxSize().then(if (fits) Modifier else Modifier.horizontalScroll(rememberScrollState())) + .padding(horizontal = BAR_PAD, vertical = 10.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(BAR_GAP), + ) { + model.onClose?.let { + BarButton(stringResource(R.string.common_close), Modifier.testTag("bottom-bar-close"), vector = Icons.Outlined.Close, onClick = it) + } + if (model.title != null) Text( + model.title, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onSurfaceVariant, + maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = (if (fits) Modifier.weight(1f) else Modifier).padding(start = 4.dp), + ) else if (fits) Spacer(Modifier.weight(1f)) + model.extras.forEach { extra -> + BarButton(extra.description, extra.tag?.let { Modifier.testTag(it) } ?: Modifier, icon = extra.icon, vector = extra.vector, + active = extra.active, onClick = extra.onClick) + } + BarActions(model.onMenu, model.menuActive, model.onSteam, model.onQam) + } + } +} + +@Composable +internal fun BarActions( + onMenu: (() -> Unit)?, + menuActive: Boolean, + onSteam: (() -> Unit)?, + onQam: (() -> Unit)?, + menuModifier: Modifier = Modifier, + steamModifier: Modifier = Modifier, + qamModifier: Modifier = Modifier, + qamInteraction: MutableInteractionSource? = null, + onQamConfirm: (() -> Unit)? = null, +) { + onMenu?.let { + BarButton(stringResource(R.string.touch_droiddeck_menu), menuModifier.testTag("bottom-bar-menu"), icon = R.drawable.ic_stat_session, + active = menuActive, onClick = it) + } + onSteam?.let { + BarButton(stringResource(R.string.drawer_steam_menu), steamModifier.testTag("bottom-bar-steam"), label = "STEAM", onClick = it) + } + onQam?.let { + BarButton(stringResource(R.string.drawer_open_qam), qamModifier.testTag("bottom-bar-qam"), vector = Icons.Outlined.MoreHoriz, + interactionSource = qamInteraction ?: remember { MutableInteractionSource() }, onConfirm = onQamConfirm, onClick = it) + } +} + +@Composable +internal fun BarButton( + description: String, + modifier: Modifier = Modifier, + icon: Int? = null, + vector: ImageVector? = null, + label: String? = null, + active: Boolean = false, + danger: Boolean = false, + shortcut: String? = null, + interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, + onConfirm: (() -> Unit)? = null, + onClick: () -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val hot = interactionSource.collectIsFocusedAsState().value || interactionSource.collectIsHoveredAsState().value + val shape = RoundedCornerShape(22.dp) + val accent = if (danger) colors.error else pal.signal + val tint = when { + active -> pal.onSignal + hot || danger -> accent + else -> colors.onBackground + } + val fill = when { + active -> pal.signal + hot -> accent.copy(alpha = 0.14f) + else -> Color.Transparent + } + val sized = if (label != null) Modifier.height(44.dp).widthIn(min = 44.dp) else Modifier.size(44.dp) + Box( + contentAlignment = Alignment.Center, + modifier = modifier.then(sized).semantics { contentDescription = description } + .clip(shape).background(fill) + .glideBorder(hot, shape, accent, if (active) pal.signal else if (danger) colors.error.copy(alpha = 0.6f) else pal.line) + .hoverable(interactionSource) + .clickable(role = Role.Button, interactionSource = interactionSource, indication = LocalIndication.current, onClick = onClick) + .controllerConfirm(onClick = onConfirm ?: onClick), + ) { + when { + label != null -> Text(label, fontSize = 13.sp, fontWeight = FontWeight.Bold, letterSpacing = 1.sp, color = tint, + maxLines = 1, modifier = Modifier.padding(horizontal = 14.dp)) + icon != null -> Icon(painterResource(icon), contentDescription = null, tint = tint, modifier = Modifier.size(20.dp)) + vector != null -> Icon(vector, contentDescription = null, tint = tint, modifier = Modifier.size(20.dp)) + } + if (shortcut != null) Text( + shortcut, fontSize = 8.sp, lineHeight = 9.sp, color = colors.onSurfaceVariant, + modifier = Modifier.align(Alignment.BottomEnd).padding(end = 8.dp, bottom = 6.dp), + ) + } +} + +internal val BAR_HEIGHT = 64.dp +private val BAR_PAD = 12.dp +private val BAR_GAP = 8.dp +private val BUTTON = 44.dp +private val STEAM_WIDTH = 80.dp +private val MIN_TITLE = 72.dp + +internal fun sessionBarModel( + title: String?, + onClose: (() -> Unit)?, + onMenu: (() -> Unit)?, + onSteam: () -> Unit, + onQam: () -> Unit, + extras: List<BarExtra> = emptyList(), +): BottomBarModel { + val steam = SessionState.mode == SessionService.MODE_STEAM + return BottomBarModel(title, onClose, onMenu, onSteam.takeIf { steam }, onQam.takeIf { steam }, extras) +} + +internal fun bottomScreenBarView(context: Context, model: () -> BottomBarModel): ComposeView = ComposeView(context).apply { + setContent { DroidDeckTheme { BottomScreenBar(model()) } } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenshotsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenshotsPage.kt new file mode 100644 index 0000000000..e854016fbe --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenshotsPage.kt @@ -0,0 +1,110 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import coil.compose.AsyncImage +import coil.request.ImageRequest +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.BottomScreenshots +import com.droiddeck.launcher.session.BottomShot +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext + +private const val SHOTS_POLL_MS = 5_000L + +@Composable +fun BottomScreenshotsPage(takeScreenshot: ((onDone: (Boolean) -> Unit) -> Unit)?) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + var shots by remember { mutableStateOf<List<BottomShot>>(emptyList()) } + var refresh by remember { mutableIntStateOf(0) } + var open by remember { mutableStateOf<BottomShot?>(null) } + var status by remember { mutableStateOf<Int?>(null) } + var busy by remember { mutableStateOf(false) } + LaunchedEffect(refresh) { + while (true) { + shots = withContext(Dispatchers.IO) { BottomScreenshots.list(context, LinuxRuntime.rootDir(context)) } + delay(SHOTS_POLL_MS) + } + } + LaunchedEffect(status) { + if (status != null) { + delay(3_000L) + status = null + } + } + open?.let { shot -> + Box(Modifier.fillMaxSize().clip(RoundedCornerShape(14.dp)).background(androidx.compose.ui.graphics.Color.Black) + .clickable(role = Role.Button) { open = null }.testTag("bottom-shot-full")) { + AsyncImage(ImageRequest.Builder(context).data(shot.model).build(), contentDescription = null, + contentScale = ContentScale.Fit, modifier = Modifier.fillMaxSize()) + } + return + } + Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(status?.let { stringResource(it) } ?: stringResource(R.string.bottom_shots_where), fontSize = 13.sp, + color = colors.onSurfaceVariant, maxLines = 2, modifier = Modifier.weight(1f).padding(end = 8.dp)) + if (takeScreenshot != null) BottomPillButton(stringResource(R.string.bottom_shots_take), "bottom-shots-take") { + if (!busy) { + busy = true + takeScreenshot { ok -> + busy = false + status = if (ok) R.string.bottom_shots_saved else R.string.bottom_shots_failed + refresh++ + } + } + } + } + if (shots.isEmpty()) { + Box(Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.bottom_shots_none), fontSize = 15.sp, color = colors.onSurfaceVariant) + } + } else { + LazyVerticalGrid(GridCells.Adaptive(150.dp), Modifier.weight(1f).fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(shots, key = { it.model.toString() }) { shot -> + AsyncImage( + ImageRequest.Builder(context).data(shot.model).size(480, 270).build(), contentDescription = null, + contentScale = ContentScale.Crop, + modifier = Modifier.fillMaxWidth().aspectRatio(16f / 9f).clip(RoundedCornerShape(10.dp)) + .background(LocalPalette.current.surface).clickable(role = Role.Button) { open = shot }, + ) + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt new file mode 100644 index 0000000000..3df2090bc4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt @@ -0,0 +1,85 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.runtime.setValue +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import com.droiddeck.launcher.hud.DroidDeckHudConfig +import com.droiddeck.launcher.hud.FrameStats +import com.droiddeck.launcher.hud.GameFrameFeed +import com.droiddeck.launcher.hud.HudFrames +import com.droiddeck.launcher.hud.HudMetrics +import com.droiddeck.launcher.hud.KeyValueSet +import com.droiddeck.launcher.hud.MangoReadings +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.StripMetric +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.isActive +import kotlinx.coroutines.withContext +import java.io.File + +private const val STRIP_FRAME_MS = 33L +private const val STRIP_METRICS_MS = 500L +private const val STRIP_TEMP_PLAIN = 0xFFF2F5F9.toInt() + +@Composable +internal fun SessionBottomStrip(pageId: String?, fps: () -> Float?) { + val context = LocalContext.current + val frames = remember { GameFrameFeed(File(LinuxRuntime.rootDir(context), HudFrames.PATH)) } + DisposableEffect(frames) { onDispose { frames.close() } } + val page by rememberUpdatedState(pageId) + var frameTick by remember { mutableIntStateOf(0) } + var device by remember { mutableStateOf<HudMetrics.Snapshot?>(null) } + var clock by remember { mutableStateOf("") } + var onTabs by remember { mutableStateOf(SessionPrefs.bottomHud(context) && SessionPrefs.bottomStripOnTabs(context)) } + var metrics by remember { mutableStateOf(SessionPrefs.bottomStripMetrics(context)) } + var thresholds by remember { mutableStateOf<Map<HudMetrics.TempSensor, HudMetrics.Thresholds>>(emptyMap()) } + val tempDisplay = remember { HudMetrics.TempDisplay.from(KeyValueSet(DroidDeckHudConfig.encode(DroidDeckHudConfig.load(context)))) } + LaunchedEffect(frames) { + while (isActive) { + if (frames.poll(System.nanoTime()) || !frames.live) frameTick++ + delay(STRIP_FRAME_MS) + } + } + LaunchedEffect(Unit) { + val reader = HudMetrics(context).apply { setMangoReadings(MangoReadings(File(context.filesDir, "session"), LinuxRuntime.rootDir(context))) } + thresholds = withContext(Dispatchers.IO) { + HudMetrics.TempSensor.values().mapNotNull { sensor -> runCatching { sensor to reader.resolveThresholds(sensor, tempDisplay) }.getOrNull() }.toMap() + } + while (isActive) { + onTabs = SessionPrefs.bottomHud(context) && SessionPrefs.bottomStripOnTabs(context) + metrics = SessionPrefs.bottomStripMetrics(context) + if (onTabs && page != BOTTOM_PAGE_TELEMETRY) { + if (StripMetric.GPU in metrics || StripMetric.VRAM in metrics) com.droiddeck.launcher.hud.BottomHudPresence.beat() + device = withContext(Dispatchers.IO) { runCatching { reader.snapshot() }.getOrNull() } + clock = java.text.DateFormat.getTimeInstance(java.text.DateFormat.SHORT).format(java.util.Date()) + } + delay(STRIP_METRICS_MS) + } + } + if (!onTabs || pageId == BOTTOM_PAGE_TELEMETRY) return + frameTick.let { + val live = frames.live + val stats = frames.stats + val graph = FloatArray(FrameStats.GRAPH_FRAMES).also { if (live) stats.graph(it) } + LineStrip(StripData( + fps = if (live) stats.fps else fps(), device = device, + fpsHistory = emptyList(), cpuHistory = emptyList(), gpuHistory = emptyList(), wattsHistory = emptyList(), clock = clock, + engine = if (live && !frames.steamFocused) frames.engine else "", + lows = if (live) stats.lows(System.nanoTime()) else null, graph = graph, metrics = metrics, + fahrenheit = tempDisplay.fahrenheit, + tempColor = { sensor, c -> + thresholds[sensor]?.let { Color(HudMetrics.tempColor(c.toFloat(), it, tempDisplay, STRIP_TEMP_PLAIN)) } ?: Color(STRIP_TEMP_PLAIN) + }, + )) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt new file mode 100644 index 0000000000..4aee7fc22f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt @@ -0,0 +1,513 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import android.content.res.Resources +import android.system.Os +import android.system.OsConstants +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.clickable +import androidx.compose.foundation.selection.toggleable +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.material3.SwitchDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.core.CpuCores +import com.droiddeck.launcher.frontend.AddedGameArt +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.frontend.SteamGameArt +import com.droiddeck.launcher.gpu.GpuInfo +import com.droiddeck.launcher.hud.DroidDeckHudConfig +import com.droiddeck.launcher.hud.DroidDeckHudHost +import com.droiddeck.launcher.hud.FrameStats +import com.droiddeck.launcher.hud.GameFrameFeed +import com.droiddeck.launcher.hud.HudFrames +import com.droiddeck.launcher.hud.HudMetrics +import com.droiddeck.launcher.hud.KeyValueSet +import com.droiddeck.launcher.hud.MangoReadings +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.GameStatusFiles +import com.droiddeck.launcher.session.GameTelemetry +import com.droiddeck.launcher.session.HwmonComponent +import com.droiddeck.launcher.input.SteamTouchConfig +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SpeedUnit +import com.droiddeck.launcher.session.StatsDash +import com.droiddeck.launcher.session.StatsHud +import com.droiddeck.launcher.session.StatsStrip +import com.droiddeck.launcher.session.Telemetry +import com.droiddeck.launcher.session.TelemetryOutput +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File +import java.net.DatagramPacket +import java.net.DatagramSocket +import java.net.HttpURLConnection +import java.net.InetSocketAddress +import java.net.SocketTimeoutException +import java.net.URL +import java.util.concurrent.atomic.AtomicReference + +private const val DRAW_MS = 66L +private const val TELEMETRY_STALE_MS = 3_000L +private const val METRICS_MS = 500L +private const val THUNDER_MS = 500L +private const val THUNDER_RETRY_MS = 3_000L +private const val ELITE_MS = 1_000L +private const val ELITE_SEARCH_MS = 10_000L +private const val OUTPUT_SCAN_MS = 3_000L +private const val PERF_N = 60 +private const val FRAME_MS = 33L +private const val MINUTE_NS = 60_000_000_000L +private const val TEMP_PLAIN = 0xFFF2F5F9.toInt() + +private class PortTraffic { + @Volatile var packets = 0L + @Volatile var length = 0 + @Volatile var readable = true +} + +private data class UnknownTraffic(val port: Int, val packets: Long, val length: Int) + +@Composable +fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null }) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val scope = rememberCoroutineScope() + var outputs by remember { mutableStateOf<List<TelemetryOutput.Game>>(emptyList()) } + var menuGames by remember { mutableStateOf<List<TelemetryOutput.MenuGame>>(emptyList()) } + var running by remember { mutableStateOf<String?>(null) } + var gameName by remember { mutableStateOf<String?>(null) } + val steamClient = remember { if (SessionState.mode == SessionService.MODE_STEAM) SessionPrefs.activeSteamClientArch(context) else null } + var outputFailed by remember { mutableStateOf<String?>(null) } + var rescan by remember { mutableIntStateOf(0) } + var auto by remember { mutableStateOf(SessionPrefs.telemetryAuto(context)) } + val latest = remember { AtomicReference<Pair<Long, Telemetry>?>(null) } + var race by remember { mutableStateOf<Telemetry?>(null) } + var fpsNow by remember { mutableStateOf<Float?>(null) } + var device by remember { mutableStateOf<HudMetrics.Snapshot?>(null) } + var thunder by remember { mutableStateOf<List<Pair<String, String>>>(emptyList()) } + var elite by remember { mutableStateOf<GameStatusFiles.Elite?>(null) } + var busyPorts by remember { mutableStateOf<Set<Int>>(emptySet()) } + val traffic = remember { GameTelemetry.PORTS.associateWith { PortTraffic() } } + var unknown by remember { mutableStateOf<List<UnknownTraffic>>(emptyList()) } + var strip by remember { mutableStateOf(StatsStrip.from(SessionPrefs.statsStrip(context))) } + var dash by remember { mutableStateOf(StatsDash.from(SessionPrefs.statsDash(context))) } + val speedUnit = SpeedUnit.from(SessionPrefs.statsSpeedUnit(context)) + val shownUnit = speedUnit.resolve(Resources.getSystem().configuration.locales[0].country) + val fpsHistory = remember { History(PERF_N) } + val cpuHistory = remember { History(PERF_N) } + val gpuHistory = remember { History(PERF_N) } + val wattsHistory = remember { History(PERF_N) } + val throttleTrace = remember { History(TRACE_N) } + val brakeTrace = remember { History(TRACE_N) } + val speedTrace = remember { History(TRACE_N) } + var perfTick by remember { mutableIntStateOf(0) } + var traceTick by remember { mutableIntStateOf(0) } + var clock by remember { mutableStateOf("") } + val frames = remember { GameFrameFeed(File(LinuxRuntime.rootDir(context), HudFrames.PATH)) } + DisposableEffect(frames) { onDispose { frames.close() } } + val currentFps = { if (frames.live) frames.stats.fps else fps() } + var hud by remember { mutableStateOf(StatsHud.from(SessionPrefs.statsHud(context))) } + var hudOn by remember { mutableStateOf(SessionPrefs.bottomHud(context)) } + var hudTick by remember { mutableIntStateOf(0) } + var fanRpm by remember { mutableStateOf<Long?>(null) } + var gpuName by remember { mutableStateOf("") } + var proton by remember { mutableStateOf<String?>(null) } + var playedSeconds by remember { mutableStateOf<Long?>(null) } + var cover by remember { mutableStateOf<File?>(null) } + var coreGroups by remember { mutableStateOf<List<CoreGroup>>(emptyList()) } + var thresholds by remember { mutableStateOf<Map<HudMetrics.TempSensor, HudMetrics.Thresholds>>(emptyMap()) } + val tempDisplay = remember { HudMetrics.TempDisplay.from(KeyValueSet(DroidDeckHudConfig.encode(DroidDeckHudConfig.load(context)))) } + val gameCores = remember { CpuCores.parse(SessionPrefs.gameCpus(context)) } + + LaunchedEffect(Unit) { + for (port in GameTelemetry.PORTS) launch(Dispatchers.IO) { + val socket = runCatching { + DatagramSocket(null).apply { + reuseAddress = true + soTimeout = 500 + bind(InetSocketAddress(GameTelemetry.LISTEN_ADDRESS, port)) + } + }.getOrNull() + if (socket == null) { + withContext(Dispatchers.Main) { busyPorts = busyPorts + port } + return@launch + } + val seen = traffic.getValue(port) + socket.use { + val data = ByteArray(2048) + val packet = DatagramPacket(data, data.size) + while (isActive) { + try { + packet.length = data.size + it.receive(packet) + val t = GameTelemetry.parse(port, data, packet.length) + seen.packets++ + seen.length = packet.length + seen.readable = t != null + if (t != null) latest.set(System.currentTimeMillis() to t) + } catch (_: SocketTimeoutException) { + } catch (_: java.io.IOException) { + break + } + } + } + } + while (isActive) { + val reading = latest.get() + race = reading?.takeIf { System.currentTimeMillis() - it.first < TELEMETRY_STALE_MS }?.second + race?.let { r -> + throttleTrace.add(r.throttle ?: 0f) + brakeTrace.add(r.brake ?: 0f) + speedTrace.add(r.speedKmh ?: 0f) + traceTick++ + } + fpsNow = currentFps() + unknown = traffic.filter { (_, t) -> t.packets > 0 && !t.readable }.map { (port, t) -> UnknownTraffic(port, t.packets, t.length) } + delay(DRAW_MS) + } + } + LaunchedEffect(frames) { + while (isActive) { + if (frames.poll(System.nanoTime())) hudTick++ + delay(FRAME_MS) + } + } + LaunchedEffect(Unit) { + val metrics = HudMetrics(context).apply { setMangoReadings(MangoReadings(File(context.filesDir, "session"), LinuxRuntime.rootDir(context))) } + val fanPath = withContext(Dispatchers.IO) { runCatching { HwmonComponent.fanSource() }.getOrNull() } + gpuName = withContext(Dispatchers.IO) { runCatching { GpuInfo.detect().displayName(context) }.getOrDefault("") } + coreGroups = withContext(Dispatchers.IO) { coreGroups() } + thresholds = withContext(Dispatchers.IO) { + HudMetrics.TempSensor.values().mapNotNull { sensor -> runCatching { sensor to metrics.resolveThresholds(sensor, tempDisplay) }.getOrNull() }.toMap() + } + var protonPid = 0 + while (isActive) { + device = withContext(Dispatchers.IO) { runCatching { metrics.snapshot() }.getOrNull() } + fanRpm = fanPath?.let { path -> withContext(Dispatchers.IO) { HwmonComponent.readRpm(path) } } + val pid = if (frames.live && !frames.steamFocused) frames.pid else 0 + if (pid == 0) { + protonPid = 0 + if (!frames.live) proton = null + } else if (pid != protonPid) { + val name = withContext(Dispatchers.IO) { DroidDeckHudHost.protonName(pid) } + proton = name + if (name != null) protonPid = pid + } + playedSeconds = if (pid > 0 && running != null) withContext(Dispatchers.IO) { processSeconds(pid) } else null + val sampledAt = android.os.SystemClock.elapsedRealtime() + currentFps()?.takeIf { it > 0f }?.let { fpsHistory.add(it, sampledAt) } + device?.let { s -> + s.cpuPercent?.let { cpuHistory.add(it.toFloat(), sampledAt) } + s.gpuPercent?.let { gpuHistory.add(it.toFloat(), sampledAt) } + s.battery?.watts?.takeIf { it > 0f }?.let { wattsHistory.add(it) } + } + clock = java.text.DateFormat.getTimeInstance(java.text.DateFormat.SHORT).format(java.util.Date()) + hudOn = SessionPrefs.bottomHud(context) + if (hudOn) com.droiddeck.launcher.hud.BottomHudPresence.beat() + perfTick++ + delay(METRICS_MS) + } + } + LaunchedEffect(Unit) { + while (isActive) { + val rows = withContext(Dispatchers.IO) { runCatching { GameStatusFiles.warThunder(httpGet(GameStatusFiles.WAR_THUNDER_STATE)) }.getOrNull() } + thunder = rows.orEmpty() + delay(if (rows == null) THUNDER_RETRY_MS else THUNDER_MS) + } + } + LaunchedEffect(Unit) { + var file: File? = null + var searchedAt = 0L + while (isActive) { + val now = System.currentTimeMillis() + if (file == null && now - searchedAt > ELITE_SEARCH_MS) { + searchedAt = now + file = withContext(Dispatchers.IO) { + runCatching { GameStatusFiles.eliteStatusFile(LinuxRuntime.rootDir(context), SessionState.steamLibraryMounts) }.getOrNull() + } + } + val f = file + elite = if (f != null && now - f.lastModified() < 60_000L) { + withContext(Dispatchers.IO) { runCatching { GameStatusFiles.elite(f.readText()) }.getOrNull() } + } else null + delay(ELITE_MS) + } + } + LaunchedEffect(Unit) { + menuGames = withContext(Dispatchers.IO) { + runCatching { Library.steamGames(context).mapNotNull { TelemetryOutput.MENU_GAMES[it.appId] }.distinct() }.getOrDefault(emptyList()) + } + } + LaunchedEffect(running) { + val id = running?.toLongOrNull() + gameName = if (id == null) null + else withContext(Dispatchers.IO) { runCatching { SteamTouchConfig.gameName(context, id.toInt()) }.getOrNull() } + cover = if (id == null) null else withContext(Dispatchers.IO) { runCatching { gameCover(context, id.toInt()) }.getOrNull() } + } + LaunchedEffect(rescan) { + while (isActive) { + outputs = withContext(Dispatchers.IO) { runCatching { TelemetryOutput.scan(Library.compatdataDirs(context)) }.getOrDefault(emptyList()) } + running = runningGame() + delay(OUTPUT_SCAN_MS) + } + } + + val title = if (running != null) gameName else steamClient?.let { stringResource(steamClientLabel(it)) } + val noData = race == null && thunder.isEmpty() && elite == null + BoxWithConstraints(Modifier.fillMaxSize()) { + val viewport = maxHeight + Column(Modifier.fillMaxSize().verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(10.dp)) { + if (!hudOn) Unit + else if (noData) hudTick.let { + perfTick.let { + val now = System.nanoTime() + val live = frames.live + val stats = frames.stats + val graph = FloatArray(FrameStats.GRAPH_FRAMES).also { if (live) stats.graph(it) } + val hz = (frames.refreshMilliHz + 499) / 1000 + val data = HudData( + fps = fpsNow, avgFps = if (live) stats.averageFps() else null, lows = if (live) stats.lows(now) else FrameStats.Lows.EMPTY, + graph = graph, slowPerMinute = if (live) stats.slowFrames(now, MINUTE_NS) else null, + engine = if (live && !frames.steamFocused) frames.engine else "", + resolution = if (frames.outputWidth > 0 && frames.outputHeight > 0) { + "${frames.outputWidth}x${frames.outputHeight}" + (if (hz > 0) " @ ${hz}Hz" else "") + } else "", + refreshHz = hz, proton = proton, device = device, gpuName = gpuName, fanRpm = fanRpm, + title = title, cover = cover, played = playedSeconds?.let(::playedText), clock = clock, + fpsHistory = fpsHistory.snapshot(), cpuHistory = cpuHistory.snapshot(), gpuHistory = gpuHistory.snapshot(), + historySeconds = maxOf(fpsHistory.spanSeconds(), cpuHistory.spanSeconds(), gpuHistory.spanSeconds()), + coreGroups = coreGroups, gameCores = gameCores, fahrenheit = tempDisplay.fahrenheit, + tempColor = { sensor, c -> + thresholds[sensor]?.let { Color(HudMetrics.tempColor(c.toFloat(), it, tempDisplay, TEMP_PLAIN)) } ?: Color(TEMP_PLAIN) + }, + redC = { thresholds[it]?.redC }, + ) + StatsHudView(hud, data, Modifier.fillMaxWidth().height(viewport)) { + hud = hud.next() + SessionPrefs.setStatsHud(context, hud.id) + } + } + } else hudTick.let { + perfTick.let { + val live = frames.live + val graph = FloatArray(FrameStats.GRAPH_FRAMES).also { if (live) frames.stats.graph(it) } + val data = StripData( + fpsNow, device, fpsHistory.snapshot(), cpuHistory.snapshot(), gpuHistory.snapshot(), wattsHistory.snapshot(), clock, title, + engine = if (live && !frames.steamFocused) frames.engine else "", + lows = if (live) frames.stats.lows(System.nanoTime()) else null, graph = graph, + metrics = SessionPrefs.bottomStripMetrics(context), fahrenheit = tempDisplay.fahrenheit, + tempColor = { sensor, c -> + thresholds[sensor]?.let { Color(HudMetrics.tempColor(c.toFloat(), it, tempDisplay, TEMP_PLAIN)) } ?: Color(TEMP_PLAIN) + }, + ) + StatsStripView(strip, data) { + strip = strip.next() + SessionPrefs.setStatsStrip(context, strip.id) + } + } + } + race?.let { r -> + val shown = dash.resolve(r.source) + traceTick.let { + RaceDashView(shown, r, TraceData(throttleTrace.snapshot(), brakeTrace.snapshot(), speedTrace.snapshot()), shownUnit) { + dash = StatsDash.tapped(shown) + SessionPrefs.setStatsDash(context, dash.id) + } + } + } + if (thunder.isNotEmpty()) { + if (FlightLabels.drawable(thunder)) FlightDash(thunder) + else TelemetryCard(stringResource(R.string.bottom_telemetry_war_thunder)) { ValueGrid(thunder.take(GameStatusFiles.WAR_THUNDER_ROWS)) } + } + elite?.let { e -> + if (e.pips != null || e.fuelMain != null) ShipDash(e) + else TelemetryCard(stringResource(R.string.bottom_telemetry_elite)) { + ValueGrid(listOfNotNull( + e.fuelMain?.let { stringResource(R.string.bottom_telemetry_fuel) to "%.1f t".format(it) }, + e.cargo?.let { stringResource(R.string.bottom_telemetry_cargo) to "%.0f t".format(it) }, + e.pips?.takeIf { it.size == 3 }?.let { p -> + stringResource(R.string.bottom_telemetry_pips) to p.joinToString(" · ") { "%.1f".format(it / 2f) } + }, + e.legal?.let { stringResource(R.string.bottom_telemetry_legal) to it }, + e.balance?.let { stringResource(R.string.bottom_telemetry_balance) to "%,d CR".format(it) }, + )) + } + } + if (outputs.isNotEmpty() || menuGames.isNotEmpty()) TelemetryCard(stringResource(R.string.bottom_telemetry_send_title)) { + if (outputs.isNotEmpty()) SwitchRow(stringResource(R.string.bottom_telemetry_send_auto), stringResource(R.string.bottom_telemetry_send_auto_hint), auto, true) { want -> + scope.launch { + withContext(Dispatchers.IO) { + SessionPrefs.setTelemetryAuto(context, want) + if (want) TelemetryOutput.applyAutomatic(context, running) + else TelemetryOutput.restoreTargets(outputs, running).forEach { TelemetryOutput.set(it, false) } + } + auto = want + rescan++ + } + } + for (game in outputs) { + val locked = TelemetryOutput.isRunning(game.prefixId, running) + val hint = if (locked) stringResource(R.string.bottom_telemetry_send_close, game.name) else null + SwitchRow(game.name, hint, game.on, !locked) { want -> + scope.launch { + val ok = withContext(Dispatchers.IO) { + val key = TelemetryOutput.key(game) + val off = SessionPrefs.telemetryOff(context) + SessionPrefs.setTelemetryOff(context, if (want) off - key else off + key) + TelemetryOutput.set(game, want) + } + outputFailed = if (ok) null else game.name + rescan++ + } + } + } + for (game in menuGames) { + Text(stringResource(R.string.bottom_telemetry_send_menu, game.name, game.setting, game.port), fontSize = 13.sp, color = colors.onSurfaceVariant) + } + if (outputs.isNotEmpty()) Text(stringResource(R.string.bottom_telemetry_send_note), fontSize = 12.sp, color = colors.onSurfaceVariant) + outputFailed?.let { Text(stringResource(R.string.bottom_telemetry_send_failed, it), fontSize = 12.sp, color = colors.error) } + } + for (u in unknown) { + Text(stringResource(R.string.bottom_telemetry_unknown_format, u.port, u.packets, u.length), fontSize = 13.sp, + color = colors.error, modifier = Modifier.padding(horizontal = 4.dp)) + } + if (busyPorts.isNotEmpty()) { + Text(stringResource(R.string.bottom_telemetry_port_busy, busyPorts.sorted().joinToString()), fontSize = 13.sp, + color = colors.error, modifier = Modifier.padding(horizontal = 4.dp)) + } + } + } +} + +private fun processSeconds(pid: Int): Long? = runCatching { + val fields = File("/proc/$pid/stat").readText().substringAfterLast(')').trim().split(' ') + val startTicks = fields[19].toLong() + val uptime = File("/proc/uptime").readText().substringBefore(' ').toDouble() + (uptime - startTicks.toDouble() / Os.sysconf(OsConstants._SC_CLK_TCK)).toLong() +}.getOrNull()?.takeIf { it >= 0 } + +private fun playedText(seconds: Long): String = + if (seconds >= 3600) "%d:%02d:%02d".format(seconds / 3600, seconds / 60 % 60, seconds % 60) else "%d:%02d".format(seconds / 60, seconds % 60) + +private fun gameCover(context: Context, appId: Int): File? = + SteamGameArt.chosenFile(context, appId, AddedGameArt.Slot.COVER) + ?: Library.steamCacheImage(File(SessionPrefs.activeSteamRoot(context), "appcache/librarycache"), appId, listOf("library_capsule.jpg", "library_600x900.jpg")) + +private fun coreGroups(): List<CoreGroup> { + val out = mutableListOf<CoreGroup>() + for (core in CpuCores.all) { + val ghz = CpuCores.maxGhz(core) + val last = out.lastOrNull() + if (last != null && last.maxGhz == ghz) out[out.lastIndex] = CoreGroup(last.cores + core, ghz) else out += CoreGroup(listOf(core), ghz) + } + return out +} + +private fun httpGet(url: String): String { + val c = URL(url).openConnection() as HttpURLConnection + c.connectTimeout = 300 + c.readTimeout = 500 + return try { + c.inputStream.bufferedReader().use { it.readText() } + } finally { + c.disconnect() + } +} + +internal fun steamClientLabel(arch: String): Int = if (arch == "x86_64") R.string.stats_steam_client_x86 else R.string.stats_steam_client_arm + +@Composable +private fun SwitchRow(title: String, hint: String?, checked: Boolean, enabled: Boolean, onChange: (Boolean) -> Unit) { + val colors = MaterialTheme.colorScheme + Row( + Modifier.fillMaxWidth().toggleable(checked, enabled = enabled, role = Role.Switch, onValueChange = onChange).padding(vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Column(Modifier.weight(1f).padding(end = 12.dp)) { + Text(title, fontSize = 15.sp, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (hint != null) Text(hint, fontSize = 12.sp, color = colors.onSurfaceVariant) + } + val pal = LocalPalette.current + Switch(checked, null, enabled = enabled, colors = SwitchDefaults.colors( + disabledCheckedTrackColor = pal.primary.copy(alpha = 0.45f), + disabledCheckedThumbColor = colors.background, + disabledCheckedBorderColor = pal.primary.copy(alpha = 0.45f), + )) + } +} + + +@Composable +private fun TelemetryCard(title: String, content: @Composable () -> Unit) { + val pal = LocalPalette.current + Column(Modifier.fillMaxWidth().clip(RoundedCornerShape(14.dp)).background(pal.surface).padding(12.dp), + verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text(title, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = pal.signal) + content() + } +} + +@Composable +private fun ValueGrid(rows: List<Pair<String, String>>) { + val colors = MaterialTheme.colorScheme + rows.chunked(2).forEach { pair -> + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + pair.forEach { (k, v) -> + Row(Modifier.weight(1f)) { + Text(k, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Text(v, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1) + } + } + if (pair.size == 1) Box(Modifier.weight(1f)) + } + } +} + +internal fun lapTime(seconds: Float): String { + val total = kotlin.math.round(seconds * 1000.0).toLong() + return "%d:%02d.%03d".format(total / 60_000, total / 1000 % 60, total % 1000) +} + + + diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt new file mode 100644 index 0000000000..648d754aac --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt @@ -0,0 +1,112 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Typeface +import android.os.Bundle +import android.text.TextPaint +import android.text.TextUtils +import android.util.TypedValue +import android.view.Gravity +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import com.droiddeck.launcher.BuildConfig +import com.droiddeck.launcher.QuestXrActivity + +object BuildWatermark { + private const val TITLE_LIMIT = 80 + + fun lines( + pr: Int = BuildConfig.PR_NUMBER, + ci: Boolean = BuildConfig.CI_BUILD, + commit: String = BuildConfig.SOURCE_COMMIT, + title: String = BuildConfig.PR_TITLE, + branch: String = BuildConfig.BUILD_BRANCH, + ): List<String>? { + if (ci && pr <= 0) return null + val hash = commit.take(7).ifEmpty { "unknown" } + val head = if (pr > 0) "PR-$pr | $hash" else "LOCAL | $hash" + val detail = (if (pr > 0) title else branch).trim() + return if (detail.isEmpty()) listOf(head) else listOf(head, truncate(detail)) + } + + private fun truncate(text: String) = + if (text.length <= TITLE_LIMIT) text else text.take(TITLE_LIMIT - 1).trimEnd() + "…" + + fun install(app: Application) { + val lines = lines() ?: return + app.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { + if (activity is QuestXrActivity) return + val decor = activity.window.decorView as? ViewGroup ?: return + if (decor.findViewWithTag<View>(TAG) != null) return + val margin = (8 * activity.resources.displayMetrics.density).toInt() + decor.addView( + MarkView(activity, lines).apply { tag = TAG }, + FrameLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + Gravity.BOTTOM or Gravity.END, + ).apply { setMargins(margin, margin, margin, margin) }, + ) + } + + override fun onActivityStarted(activity: Activity) = Unit + override fun onActivityResumed(activity: Activity) = Unit + override fun onActivityPaused(activity: Activity) = Unit + override fun onActivityStopped(activity: Activity) = Unit + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit + override fun onActivityDestroyed(activity: Activity) = Unit + }) + } + + private const val TAG = "build-watermark" + + private class MarkView(context: Context, private val lines: List<String>) : View(context) { + private var shown = lines + private val paint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply { + color = 0xE6FFFFFF.toInt() + typeface = Typeface.MONOSPACE + textSize = TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_SP, 9f, context.resources.displayMetrics, + ) + setShadowLayer(1.5f * context.resources.displayMetrics.density, 0f, 0f, 0xFF000000.toInt()) + textAlign = Paint.Align.RIGHT + } + private val backdrop = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = 0x66303030 } + private val lineHeight get() = paint.fontSpacing + + init { + isClickable = false + isFocusable = false + importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO + setLayerType(LAYER_TYPE_SOFTWARE, null) + } + + override fun onMeasure(widthSpec: Int, heightSpec: Int) { + val pad = paddingForShadow() * 2 + val limit = if (MeasureSpec.getMode(widthSpec) == MeasureSpec.UNSPECIFIED) Float.MAX_VALUE + else (MeasureSpec.getSize(widthSpec) - pad).coerceAtLeast(0).toFloat() + shown = lines.map { TextUtils.ellipsize(it, paint, limit, TextUtils.TruncateAt.END).toString() } + val width = shown.maxOf { paint.measureText(it) }.toInt() + pad + setMeasuredDimension(width, (lineHeight * shown.size).toInt() + pad) + } + + override fun onDraw(canvas: Canvas) { + val pad = paddingForShadow() + val radius = 3f * resources.displayMetrics.density + canvas.drawRoundRect(0f, 0f, width.toFloat(), height.toFloat(), radius, radius, backdrop) + shown.forEachIndexed { i, line -> + canvas.drawText(line, width - pad.toFloat(), pad - paint.ascent() + lineHeight * i, paint) + } + } + + override fun onTouchEvent(event: android.view.MotionEvent) = false + + private fun paddingForShadow() = (3 * resources.displayMetrics.density).toInt() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt index b7f5d44db4..2a50f3c35b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt @@ -40,10 +40,8 @@ import kotlinx.coroutines.delay import androidx.compose.runtime.setValue import androidx.compose.runtime.getValue -/** A grid of cards with a game page that floods out of the opened card and drains back into it. */ internal val LocalDetailFloor = compositionLocalOf<() -> Float> { { Float.MAX_VALUE } } -/** How far the host reaches past the page's padding, so a game page can paint to the screen edge and still inset its content. */ internal class DetailInset(val horizontal: Dp, val top: Dp) internal val LocalDetailInset = compositionLocalOf { DetailInset(0.dp, 0.dp) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt index d83e1abe10..d8b3c61a27 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt @@ -43,7 +43,6 @@ import kotlin.math.atan2 import kotlin.math.hypot import kotlin.math.min -/** A small colour square; pressing it opens the colour picker. */ @Composable internal fun ColorCube(color: Color, description: String, focus: FocusRequester? = null, onClick: () -> Unit) { val pal = LocalPalette.current @@ -59,7 +58,6 @@ internal fun ColorCube(color: Color, description: String, focus: FocusRequester? ) } -/** Colour wheel (touch), hue / saturation / brightness sliders (controller and touch) and a hex box for one colour. */ @Composable internal fun ColorPickerDialog(title: String, initial: Int, onDismiss: () -> Unit, onApply: (Int) -> Unit) { val shown = rememberShown(onDismiss) @@ -117,7 +115,6 @@ private fun Swatch(color: Color) { Box(Modifier.size(48.dp).clip(shape).background(color).border(1.dp, LocalPalette.current.line2, shape)) } -/** Hue around the circle and saturation out from the middle, at full brightness; brightness has its own slider. */ @Composable private fun ColorWheel(hue: Float, sat: Float, value: Float, onPick: (hue: Float, sat: Float) -> Unit) { val rim = MaterialTheme.colorScheme.onBackground diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index a934d39cfa..a28326a4b1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -930,7 +930,6 @@ private fun availableFor(l: String, catalog: List<CatalogItem>, snapshot: Snapsh return catalog.filter { it.comp == l && ComponentsManager.safeName(it.file) !in stored } } -// The rows to show: each stable row carries its paired nightly (if any), and a paired nightly has no row of its own. private fun availableRows(l: String, catalog: List<CatalogItem>, snapshot: Snapshot?): List<Pair<CatalogItem, CatalogItem?>> { val available = availableFor(l, catalog, snapshot) val pairs = ComponentsManager.nightlyPairs(available) @@ -1456,7 +1455,6 @@ private fun GetLine( Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) } -// Stable | Nightly in the same box as SmallButton: one focus stop, A (or a tap) flips it. @Composable private fun ChannelToggle(nightly: Boolean, enabled: Boolean, onFlip: () -> Unit) { val colors = MaterialTheme.colorScheme diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt index 07ae8178bb..86913ce4ea 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt @@ -44,6 +44,7 @@ class DeckControlsPanel( private val inputRole: InputRole = InputRole.SECONDARY, private val portraitDock: Boolean = false, private val onMenu: (() -> Unit)? = null, + private val onSwap: (() -> Unit)? = null, ) : LinearLayout(context) { private enum class Tab(val label: Int) { GAMEPAD(R.string.deck_tab_gamepad), GRIPS(R.string.deck_tab_grips), LEFT(R.string.deck_tab_left), RIGHT(R.string.deck_tab_right), BOTH(R.string.deck_tab_both) } @@ -51,12 +52,20 @@ class DeckControlsPanel( private val content = FrameLayout(context) val deckControls = pad == null || SessionState.deckPad private val tabViews = HashMap<Tab, TextView>() - private val topBar: View by lazy { topBar() } + private val topBar: View by lazy { tabsRow() } init { orientation = VERTICAL setBackgroundColor(Color.BLACK) - addView(topBar, LayoutParams(LayoutParams.MATCH_PARENT, dp(64))) + val title = context.getString(when { + customLayout != null -> R.string.input_custom_controls + deckControls -> R.string.second_mode_deck_controls + else -> R.string.deck_tab_gamepad + }) + val extras = listOfNotNull(onSwap?.let { BarExtra(context.getString(R.string.swap_screens), icon = R.drawable.ic_bottom_swap, onClick = it) }) + addView(bottomScreenBarView(context) { sessionBarModel(title, onClose, onMenu, onSteamMenu, onQam, extras) }, + LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) + addView(topBar, LayoutParams(LayoutParams.MATCH_PARENT, dp(52))) addView(content, LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f)) if (customLayout != null && pad != null) renderCustom(pad, customLayout) else select(if (pad != null && !deckControls) Tab.GAMEPAD else if (pad != null) selectedWithPad else selected) @@ -114,11 +123,10 @@ class DeckControlsPanel( super.onDetachedFromWindow() } - private fun topBar(): View = LinearLayout(context).apply { + private fun tabsRow(): View = LinearLayout(context).apply { orientation = HORIZONTAL - gravity = Gravity.CENTER_VERTICAL - setPadding(dp(12), dp(10), dp(12), dp(6)) - addView(roundButton("×", context.getString(R.string.deck_close), onClose)) + gravity = Gravity.CENTER + setPadding(dp(12), 0, dp(12), dp(8)) val tabs = LinearLayout(context).apply { orientation = HORIZONTAL background = outline(CORNER_PILL, SURFACE) @@ -144,16 +152,7 @@ class DeckControlsPanel( overScrollMode = View.OVER_SCROLL_NEVER addView(tabs, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, dp(44))) } - addView(centre, LayoutParams(0, LayoutParams.MATCH_PARENT, 1f)) - onMenu?.let { - addView(menuButton(context, it)) - addView(space(dp(8))) - } - if (SessionState.mode == SessionService.MODE_STEAM) { - addView(roundButton("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu, wide = true)) - addView(space(dp(8))) - addView(roundButton("•••", context.getString(R.string.drawer_open_qam), onQam, wide = true)) - } + addView(centre, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT)) } private fun select(tab: Tab) { @@ -177,7 +176,7 @@ class DeckControlsPanel( } content.removeAllViews() pad?.releaseTouch(this) - topBar.visibility = if (tab == Tab.GAMEPAD) View.GONE else View.VISIBLE + topBar.visibility = if (tab == Tab.GAMEPAD || tabViews.size < 2) View.GONE else View.VISIBLE content.addView( when (tab) { Tab.GRIPS -> gripsGrid() @@ -244,10 +243,6 @@ class DeckControlsPanel( place(pill("RB") { st, d -> st.press(PadState.RB, d) }, GamepadGeometry.Slot.RIGHT_INNER_SHOULDER) place(pill("RT") { st, d -> st.rightTrigger = if (d) 1f else 0f }, GamepadGeometry.Slot.RIGHT_OUTER_SHOULDER) place(pill("VIEW") { st, d -> st.press(PadState.SELECT, d) }, GamepadGeometry.Slot.VIEW) - if (SessionState.mode == SessionService.MODE_STEAM) { - place(centreTap("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu), GamepadGeometry.Slot.STEAM) - place(centreTap("\u2022\u2022\u2022", context.getString(R.string.drawer_open_qam), onQam), GamepadGeometry.Slot.QAM) - } place(pill("MENU") { st, d -> st.press(PadState.START, d) }, GamepadGeometry.Slot.MENU) if (deckControls) place(centreTap("\u25a6 " + context.getString(R.string.deck_panels), context.getString(R.string.deck_more_controls)) { select(Tab.BOTH) }, GamepadGeometry.Slot.PANELS) @@ -309,14 +304,12 @@ class DeckControlsPanel( show() } - /** Whether a finger going down at ([x], [y]) lands on one of the panel's controls. */ fun takesTouchAt(x: Float, y: Float): Boolean = controlUnder(this, x, y) - // Every control here takes the touches it gets: buttons and tabs (clickable), the scrolling tab strip, - // and the drawn surfaces, pads and face buttons. The layouts around them do not. private fun controlUnder(view: View, x: Float, y: Float): Boolean { if (view.visibility != VISIBLE || x < 0f || y < 0f || x >= view.width || y >= view.height) return false - if (view.isClickable || view is HorizontalScrollView || view is Surface || view is DirectionPad || view is FaceButtons) return true + if (view.isClickable || view is HorizontalScrollView || view is Surface || view is DirectionPad || view is FaceButtons || + view is androidx.compose.ui.platform.ComposeView) return true val group = view as? ViewGroup ?: return false return (group.childCount - 1 downTo 0).any { i -> val child = group.getChildAt(i) @@ -324,11 +317,6 @@ class DeckControlsPanel( } } - private fun roundButton(label: String, description: String, onClick: () -> Unit, wide: Boolean = false) = - roundButton(context, label, description, onClick, wide) - - private fun space(width: Int) = View(context).apply { layoutParams = LayoutParams(width, 1) } - private fun outline(radius: Float, fill: Int) = outline(context, radius, fill) private fun filled(radius: Float, fill: Int) = GradientDrawable().apply { @@ -772,10 +760,13 @@ class DeckControlsPanel( } } - internal fun menuButton(context: Context, onClick: () -> Unit) = android.widget.ImageView(context).apply { - setImageResource(R.drawable.ic_stat_session) + internal fun menuButton(context: Context, onClick: () -> Unit) = + iconButton(context, R.drawable.ic_stat_session, context.getString(R.string.touch_droiddeck_menu), onClick) + + internal fun iconButton(context: Context, icon: Int, description: String, onClick: () -> Unit) = android.widget.ImageView(context).apply { + setImageResource(icon) setColorFilter(TEXT) - contentDescription = context.getString(R.string.touch_droiddeck_menu) + contentDescription = description scaleType = android.widget.ImageView.ScaleType.CENTER_INSIDE val pad = dp(context, 11) setPadding(pad, pad, pad, pad) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FusionHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt similarity index 64% rename from app/src/main/java/com/droiddeck/launcher/ui/FusionHudSettings.kt rename to app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index 4fdac9566f..95768fb659 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FusionHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -1,14 +1,20 @@ package com.droiddeck.launcher.ui import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import com.droiddeck.launcher.R -import com.droiddeck.launcher.hud.FusionSize +import com.droiddeck.launcher.hud.DroidDeckHudSize +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.StripMetric -/** Bannerlator's Fusion HUD settings (DeckOverlaySettings): one row per key of the HUD's config string. */ @Composable -internal fun FusionHudSettings(host: MenuHost, a: DrawerActions, track: (String) -> Modifier) { +internal fun DroidDeckHudSettings(host: MenuHost, a: DrawerActions, track: (String) -> Modifier) { val cfg = a.hudConfig fun on(key: String) = cfg[key] == "1" fun int(key: String, fallback: Int) = cfg[key]?.toIntOrNull() ?: fallback @@ -16,19 +22,23 @@ internal fun FusionHudSettings(host: MenuHost, a: DrawerActions, track: (String) SettingsGroup(stringResource(R.string.drawer_hud)) { ToggleRow(host, "hud", stringResource(R.string.drawer_hud), null, a.hudOn, chipModifier = track("hud"), onChange = a.onHud) if (!a.hudOn) return@SettingsGroup - val size = FusionSize.from(cfg["hudSize"]) + val size = DroidDeckHudSize.from(cfg["hudSize"]) ChoiceRow(host, "hud-size", stringResource(R.string.hud_size), stringResource(R.string.hud_size_hint), listOf( - FusionSize.FULL to stringResource(R.string.hud_size_full), - FusionSize.TILES to stringResource(R.string.hud_size_tiles), - FusionSize.PILL to stringResource(R.string.hud_size_pill), - FusionSize.MINIMAL to stringResource(R.string.hud_size_minimal), - FusionSize.MEGA to stringResource(R.string.hud_size_mega), + DroidDeckHudSize.FULL to stringResource(R.string.hud_size_full), + DroidDeckHudSize.TILES to stringResource(R.string.hud_size_tiles), + DroidDeckHudSize.PILL to stringResource(R.string.hud_size_pill), + DroidDeckHudSize.MINIMAL to stringResource(R.string.hud_size_minimal), + DroidDeckHudSize.MEGA to stringResource(R.string.hud_size_mega), + DroidDeckHudSize.STRIP to stringResource(R.string.hud_size_strip), ), size, chipModifier = track("hud-size")) { a.onHudSetting("hudSize", it.token) } ToggleRow(host, "hud-locked", stringResource(R.string.hud_locked), stringResource(R.string.hud_locked_hint), on("hudLocked"), chipModifier = track("hud-locked")) { a.onHudSetting("hudLocked", flag(it)) } + ToggleRow(host, "hud-snap", stringResource(R.string.hud_snap), stringResource(R.string.hud_snap_hint), on("hudSnap"), + chipModifier = track("hud-snap")) { a.onHudSetting("hudSnap", flag(it)) } } + if (a.dashboardAvailable && a.secondScreenDisplays.isNotEmpty()) BottomStripSettings(host, track) if (!a.hudOn) return SettingsGroup(stringResource(R.string.hud_group_look)) { @@ -47,7 +57,7 @@ internal fun FusionHudSettings(host: MenuHost, a: DrawerActions, track: (String) if (cfg["hudOutlineAccent"] == "0") "0" else "1", chipModifier = track("hud-outline-color")) { a.onHudSetting("hudOutlineAccent", it) } } - val size = FusionSize.from(cfg["hudSize"]) + val size = DroidDeckHudSize.from(cfg["hudSize"]) val chips = size.supportedChips() + EXTRA[size].orEmpty() SettingsGroup(stringResource(R.string.hud_group_metrics)) { for (metric in METRICS) { @@ -84,7 +94,7 @@ internal fun FusionHudSettings(host: MenuHost, a: DrawerActions, track: (String) } } - SettingsGroup(stringResource(R.string.hud_group_more), detail = stringResource(R.string.hud_credit)) { + SettingsGroup(stringResource(R.string.hud_group_more)) { ActionRow(stringResource(R.string.hud_export), stringResource(R.string.hud_export_hint), stringResource(R.string.hud_export_button), onClick = a.onHudExport, modifier = track("hud-export")) ActionRow(stringResource(R.string.hud_reset), null, stringResource(R.string.hud_reset_button), @@ -94,12 +104,51 @@ internal fun FusionHudSettings(host: MenuHost, a: DrawerActions, track: (String) private fun flag(on: Boolean) = if (on) "1" else "0" -// The Pill also draws the battery temperature and watts. -private val EXTRA = mapOf(FusionSize.PILL to setOf("Temp", "Power")) +@Composable +private fun BottomStripSettings(host: MenuHost, track: (String) -> Modifier) { + val context = LocalContext.current + var hudOn by remember { mutableStateOf(SessionPrefs.bottomHud(context)) } + var onTabs by remember { mutableStateOf(SessionPrefs.bottomStripOnTabs(context)) } + var shown by remember { mutableStateOf(SessionPrefs.bottomStripMetrics(context)) } + SettingsGroup(stringResource(R.string.bottom_hud_group)) { + ToggleRow(host, "bottom-hud", stringResource(R.string.bottom_hud_group), null, hudOn, + chipModifier = track("bottom-hud")) { on -> + hudOn = on + SessionPrefs.setBottomHud(context, on) + } + ToggleRow(host, "bottom-strip-tabs", stringResource(R.string.bottom_strip_tabs), null, onTabs, + enabled = hudOn, chipModifier = track("bottom-strip-tabs")) { on -> + onTabs = on + SessionPrefs.setBottomStripOnTabs(context, on) + } + for ((metric, label) in BOTTOM_STRIP_ROWS) { + ToggleRow(host, "bottom-strip-${metric.id}", stringResource(label), null, metric in shown, + enabled = hudOn, chipModifier = track("bottom-strip-${metric.id}")) { on -> + shown = if (on) shown + metric else shown - metric + SessionPrefs.setBottomStripMetric(context, metric, on) + } + } + } +} + +private val BOTTOM_STRIP_ROWS = listOf( + StripMetric.ENGINE to R.string.hud_metric_engine, + StripMetric.GRAPH to R.string.hud_metric_graph, + StripMetric.LOWS to R.string.bottom_strip_lows, + StripMetric.LOW001 to R.string.hud_metric_low001, + StripMetric.GPU to R.string.hud_metric_gpu, + StripMetric.GPU_TEMP to R.string.hud_metric_gpu_temp, + StripMetric.CPU to R.string.hud_metric_cpu, + StripMetric.CPU_TEMP to R.string.bottom_strip_cpu_temp, + StripMetric.VRAM to R.string.hud_metric_vram, + StripMetric.RAM to R.string.hud_metric_ram, + StripMetric.CLOCK to R.string.hud_metric_clock, +) + +private val EXTRA = mapOf(DroidDeckHudSize.PILL to setOf("Temp", "Power")) private class HudMetric(val chip: String, val key: String, val label: Int) -// FusionSize.supportedChips() names; Wrapper and DX version have nothing to show in DroidDeck. private val METRICS = listOf( HudMetric("FPS", "showFPS", R.string.drawer_hud_fps), HudMetric("FPS graph", "showFPSGraph", R.string.hud_metric_graph), @@ -124,10 +173,9 @@ private val METRICS = listOf( HudMetric("Clock", "showClock", R.string.hud_metric_clock), ) -// Switches a size lists but never draws (FusionHudView): the Pill and Minimal always show the FPS, the -// Pill has no graph, Tiles has no graph and no 0.01% low. private val HIDDEN = mapOf( - FusionSize.PILL to setOf("FPS", "FPS graph"), - FusionSize.MINIMAL to setOf("FPS"), - FusionSize.TILES to setOf("FPS graph", "0.01% low"), + DroidDeckHudSize.PILL to setOf("FPS", "FPS graph"), + DroidDeckHudSize.MINIMAL to setOf("FPS"), + DroidDeckHudSize.TILES to setOf("FPS graph", "0.01% low"), + DroidDeckHudSize.STRIP to setOf("FPS"), ) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt index 348ad43ff6..b46afbb977 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -64,20 +64,23 @@ class DualPanelModel( object DualScreenPanel { var model by mutableStateOf<DualPanelModel?>(null) private var displayId = -1 + private var presentation: DualScreenPresentation? = null + set(value) { field = value; available = value != null || activity != null || launching } private var activity: DualScreenActivity? = null - set(value) { field = value; available = value != null || launching } + set(value) { field = value; available = value != null || presentation != null || launching } private var launching = false - set(value) { field = value; available = value || activity != null } + set(value) { field = value; available = value || activity != null || presentation != null } private var ownerTask = -1 private var ownerYielded = false + private var ownerPaused = false var typing by mutableStateOf<TypingRequest?>(null) private set var typingShown by mutableStateOf(false) private set - val shownOn: Int get() = if (activity != null || launching) displayId else -1 - val attached: Boolean get() = activity != null + val shownOn: Int get() = if (presentation != null || activity != null || launching) displayId else -1 + val attached: Boolean get() = presentation != null || activity != null var available by mutableStateOf(false) private set @@ -120,7 +123,20 @@ object DualScreenPanel { displayId = display ownerTask = task ownerYielded = false + ownerPaused = false launching = true + val host = context as? ComponentActivity + val target = host?.getSystemService(Context.DISPLAY_SERVICE) + ?.let { (it as android.hardware.display.DisplayManager).getDisplay(display) } + if (host != null && target != null) { + val shown = runCatching { DualScreenPresentation(host, target).also { it.show() } } + if (shown.isSuccess) { + presentation = shown.getOrThrow() + launching = false + return + } + android.util.Log.w("DualScreenPanel", "bottom panel presentation failed; falling back to an activity", shown.exceptionOrNull()) + } val intent = Intent(context, DualScreenActivity::class.java) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION) runCatching { @@ -132,6 +148,8 @@ object DualScreenPanel { stopTyping() launching = false displayId = -1 + presentation?.dismiss() + presentation = null activity?.finishAndRemoveTask() activity = null } @@ -142,26 +160,36 @@ object DualScreenPanel { internal fun attach(host: DualScreenActivity): Boolean { if (!launching && activity == null) return false + presentation?.dismiss() + presentation = null if (activity !== host) activity?.finishAndRemoveTask() activity = host launching = false return true } - // The panel resumes when an app opens over the owner on the primary screen; pulling the owner back would hide that app. fun yieldTo(task: Int, app: Boolean) { if (ownerTask == task) ownerYielded = app } - internal fun returnFocus(context: Context) { - if (ownerYielded) return - val task = ownerTask.takeIf { it >= 0 } ?: return + fun opensOutside(own: String, target: String?): Boolean = target != null && target != own + + fun ownerPaused(task: Int, paused: Boolean) { + if (ownerTask == task) ownerPaused = paused + } + + internal fun focusTask(fromPanel: Boolean): Int? { + if (ownerYielded || (ownerPaused && !fromPanel)) return null + return ownerTask.takeIf { it >= 0 } + } + + internal fun returnFocus(context: Context, fromPanel: Boolean = false) { + val task = focusTask(fromPanel) ?: return runCatching { (context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager).moveTaskToFront(task, 0) } } internal fun reclaimFocus(context: Context) { - if (ownerYielded) return - val task = ownerTask.takeIf { it >= 0 } ?: return + val task = focusTask(true) ?: return val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager runCatching { manager.appTasks.firstOrNull { @@ -177,6 +205,13 @@ object DualScreenPanel { displayId = -1 } } + + internal fun detach(host: DualScreenPresentation) { + if (presentation === host) { + presentation = null + displayId = -1 + } + } } class DualScreenActivity : ComponentActivity() { @@ -209,10 +244,10 @@ class DualScreenActivity : ComponentActivity() { runCatching { (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager).moveTaskToFront(taskId, 0) } } else { unfocusPending = true - DualScreenPanel.returnFocus(this) + DualScreenPanel.returnFocus(this, fromPanel = true) window.decorView.postDelayed({ if (!unfocusPending || DualScreenPanel.typingShown) return@postDelayed - if (window.decorView.hasWindowFocus()) DualScreenPanel.returnFocus(this) else dropFocus() + if (window.decorView.hasWindowFocus()) DualScreenPanel.returnFocus(this, fromPanel = true) else dropFocus() }, 400) } } @@ -228,9 +263,19 @@ class DualScreenActivity : ComponentActivity() { if (!DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this) } + private var topResumed = false + override fun onTopResumedActivityChanged(isTopResumedActivity: Boolean) { super.onTopResumedActivityChanged(isTopResumedActivity) - if (isTopResumedActivity && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this) + topResumed = isTopResumedActivity + if (isTopResumedActivity && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this, fromPanel = true) + } + + override fun dispatchTouchEvent(event: android.view.MotionEvent): Boolean { + if (event.actionMasked == android.view.MotionEvent.ACTION_DOWN && topResumed && !DualScreenPanel.typingShown) { + DualScreenPanel.returnFocus(this, fromPanel = true) + } + return super.dispatchTouchEvent(event) } override fun onWindowFocusChanged(hasFocus: Boolean) { @@ -251,6 +296,7 @@ class DualScreenActivity : ComponentActivity() { if (event.action == KeyEvent.ACTION_UP && !event.isCanceled) DualScreenPanel.finishTyping() return true } + if (topResumed && !DualScreenPanel.typingShown && event.action == KeyEvent.ACTION_DOWN) DualScreenPanel.returnFocus(this, fromPanel = true) return super.dispatchKeyEvent(event) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPresentation.kt new file mode 100644 index 0000000000..c3809d3b5a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPresentation.kt @@ -0,0 +1,99 @@ +package com.droiddeck.launcher.ui + +import android.app.Presentation +import android.os.Bundle +import android.view.Display +import android.view.KeyEvent +import android.view.View +import android.view.WindowManager +import androidx.activity.ComponentActivity +import androidx.activity.setViewTreeOnBackPressedDispatcherOwner +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.ComposeView +import androidx.lifecycle.setViewTreeLifecycleOwner +import androidx.lifecycle.setViewTreeViewModelStoreOwner +import androidx.savedstate.setViewTreeSavedStateRegistryOwner +import com.droiddeck.launcher.core.AppUiPrefs + +internal class DualScreenPresentation( + private val host: ComponentActivity, + display: Display, +) : Presentation(host, display) { + private var content: ComposeView? = null + + init { + setCancelable(false) + setCanceledOnTouchOutside(false) + setOnDismissListener { DualScreenPanel.detach(this) } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) + applyImmersiveMode() + val decor = window?.decorView ?: return + decor.setViewTreeLifecycleOwner(host) + decor.setViewTreeViewModelStoreOwner(host) + decor.setViewTreeSavedStateRegistryOwner(host) + decor.setViewTreeOnBackPressedDispatcherOwner(host) + val view = ComposeView(context) + content = view + view.setContent { + val model = DualScreenPanel.model + val request = DualScreenPanel.typing + val typingOn = request != null && DualScreenPanel.typingShown + LaunchedEffect(typingOn) { acceptFocus(typingOn) } + DroidDeckTheme(model?.theme, appScale = model?.appScale ?: AppUiPrefs.DEFAULT_SCALE) { + Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)) { + if (request != null && typingOn) TypingPanel(request) { + if (DualScreenPanel.typing === request) DualScreenPanel.finishTyping() + } else if (model != null) DualPanelContent(model) + } + } + } + setContentView(view) + } + + private fun acceptFocus(on: Boolean) { + val window = window ?: return + if (on) { + window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + content?.requestFocus() + } else { + window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + host.window?.decorView?.requestFocus() + } + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (hasFocus) applyImmersiveMode() + } + + @Suppress("OVERRIDE_DEPRECATION") + override fun onBackPressed() { + if (DualScreenPanel.typingShown) DualScreenPanel.finishTyping() + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (DualScreenPanel.typingShown && event.keyCode == KeyEvent.KEYCODE_BUTTON_B) { + if (event.action == KeyEvent.ACTION_UP && !event.isCanceled) DualScreenPanel.finishTyping() + return true + } + return super.dispatchKeyEvent(event) + } + + private fun applyImmersiveMode() { + @Suppress("DEPRECATION") + window?.decorView?.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt b/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt index bb1370c158..92a6d0b365 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt @@ -66,7 +66,6 @@ internal class FocusGlide(view: View?) { private set fun accepts(view: View): Boolean { - // DropdownMenu recreates its popup view after closing. if (this.view == null || deferredWindow && this.view !== view && host?.isAttached != true) this.view = view return this.view === view } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index 62c6a862e5..1c4536fc02 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -465,7 +465,8 @@ private fun UserAppPage(app: UserApps.App, s: FrontEndState, a: FrontEndActions, val ctx = LocalContext.current val narrow = LocalNarrowPane.current var editing by rememberSaveable(app.key) { mutableStateOf(false) } - val x86 = (app.arch == "x86_64" || app.arch == "i386") && app.fex != com.droiddeck.launcher.runtime.LinuxFex.OFF + val x86 = (app.arch == "x86_64" || app.arch == "i386") && app.fex != com.droiddeck.launcher.runtime.LinuxFex.OFF && + app.kind != UserApps.Kind.FLATPAK val fexReady by produceState<Boolean?>(null, app.key, x86, s.sessionRunning) { value = if (x86) kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { com.droiddeck.launcher.runtime.LinuxFex.ready(ctx) } else true } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index efc00297cd..45ef20fe8d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -74,7 +74,6 @@ internal fun UninstallEpicLauncher(s: FrontEndState, a: FrontEndActions) { } } -/** A skipped sync is not a success: "0 files" used to show for a signed-out store or cloud saves turned off. */ internal fun cloudMessage(context: android.content.Context, r: com.droiddeck.launcher.stores.CloudSaves.Result): String = when (r.result) { "ok" -> when { r.conflicts > 0 -> context.getString(R.string.cloud_conflict_files, r.conflicts) @@ -202,7 +201,6 @@ internal fun BusyChip(s: FrontEndState) { internal fun RuntimeChip(s: FrontEndState) = when { s.busy -> Chip(if (s.percent >= 0) stringResource(R.string.setup_runtime_progress, s.stage, s.percent) else s.stage, ok = false) s.removalPending -> Chip(stringResource(R.string.runtime_removal_incomplete), ok = false) - !s.ready -> Chip(stringResource(R.string.games_runtime_first_play), ok = false) s.available != null && s.available != s.installed -> Chip(stringResource(R.string.games_runtime_update), ok = false) else -> Chip(stringResource(R.string.games_runtime_ready), ok = true) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index dcd1f50ff4..ecc597c930 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -203,7 +203,7 @@ internal fun railLabelIcon(key: String): Pair<Int, ImageVector> = when (key) { } internal fun setupNeedsAttention(s: FrontEndState): Boolean = !s.ready || (s.available != null && s.available != s.installed) || - PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) + PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) || com.droiddeck.launcher.sync.Syncthing.needsAttention @Composable private fun NavigationItems( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index eec57cfb9f..9bf266b834 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -133,7 +133,7 @@ class FrontEndState( val dualScreen: Boolean = false, val dualScreenDevice: Boolean = false, val dualScreenMode: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, - val dualScreenLauncher: Boolean = true, + val dualScreenSessions: String = com.droiddeck.launcher.input.DualScreen.MODE_AUTO, val dualScreenControls: Boolean = true, val packages: List<PackageRow>? = null, val packageCatalogLoading: Boolean = false, @@ -149,6 +149,10 @@ class FrontEndState( val oscMode: String = SessionPrefs.OSC_AUTO, val controller: com.droiddeck.launcher.input.ControllerPrefs.Settings? = null, val phantomProcessStatus: PhantomProcessStatus = PhantomProcessStatus.NOT_APPLICABLE, + val adreno: Boolean = true, + val vkBridge: Boolean = false, + val vkBridgeSafe: Boolean = true, + val bridgeProtonDxvk: Boolean = false, val showPhantomGate: Boolean = false, val orientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, val launcherOrientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER, @@ -166,7 +170,7 @@ class FrontEndState( val sgdbUserKey: Boolean = false, val storesShowMature: Boolean = false, val storesSort: String = SessionPrefs.STORES_SORTS.first(), - val storesView: String = SessionPrefs.STORES_VIEWS.first(), + val storesView: String = SessionPrefs.DEFAULT_STORES_VIEW, val storeDownloadsActive: Int = 0, val updates: UpdatesState = UpdatesState(), ) @@ -205,6 +209,9 @@ class FrontEndActions( val onInstallPackage: (String) -> Unit, val onRemovePackage: (String) -> Unit, val onRuntime: () -> Unit, + val onVkBridge: (Boolean) -> Unit = {}, + val onVkBridgeSafe: (Boolean) -> Unit = {}, + val onBridgeProtonDxvk: (Boolean) -> Unit = {}, val onFrameGenPick: (FrameGen.Mode) -> Unit, val onImportLossless: () -> Unit, val onProtons: () -> Unit, @@ -238,7 +245,7 @@ class FrontEndActions( val onLauncherFullscreen: (Boolean) -> Unit = {}, val onAnimationsEnabled: (Boolean) -> Unit = {}, val onDualScreenMode: (String) -> Unit = {}, - val onDualScreenLauncher: (Boolean) -> Unit = {}, + val onDualScreenSessions: (String) -> Unit = {}, val onDualScreenControls: (Boolean) -> Unit = {}, val onDownloadSource: (String) -> Unit = {}, val onDownloadMirror: (String) -> Unit = {}, @@ -291,8 +298,6 @@ internal object Motion { if (scale == 0f) snap() else spring(damping, stiffness) } -private val Shape10 = RoundedCornerShape(10.dp) - internal val Shape12 = RoundedCornerShape(12.dp) internal fun hueOf(name: String) = (name.hashCode().toUInt() % 360u).toFloat() @@ -312,13 +317,6 @@ internal fun Rise(i: Int, modifier: Modifier = Modifier, content: @Composable () ) { content() } } -@Composable -private fun Modifier.staggerIn(i: Int): Modifier { - val t = remember { Animatable(0f) } - LaunchedEffect(Unit) { t.animateTo(1f, Motion.tw(360, i * 30)) } - return graphicsLayer { alpha = t.value; translationY = (1f - t.value) * 10.dp.toPx() } -} - @Composable internal fun Modifier.shine(trigger: Boolean, strength: Float = 0.22f): Modifier { val x = remember { Animatable(-1f) } @@ -435,6 +433,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com "stores:downloads" -> { com.droiddeck.launcher.stores.StoresState.openDownloads = true; selected = "stores" } "components" -> a.onComponents(true) "setup:launcher" -> { SetupTabs.openLauncher = true; selected = "setup" } + com.droiddeck.launcher.sync.SyncthingService.NAV -> com.droiddeck.launcher.sync.Syncthing.requestOpen() "setup:integration" -> { SetupTabs.openOverview = true; selected = "setup" } else -> selected = target } @@ -554,6 +553,9 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com LaunchedEffect(com.droiddeck.launcher.storage.StorageState.openRequests) { if (com.droiddeck.launcher.storage.StorageState.openPending) showRailPage("setup", true) } + LaunchedEffect(com.droiddeck.launcher.sync.Syncthing.openRequests) { + if (com.droiddeck.launcher.sync.Syncthing.openPending) showRailPage("setup", true) + } val onRailFocus: (String) -> Unit = { key -> if (key != railSelection) showRailPage(key, false) } @@ -706,6 +708,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com StoreTheme(com.droiddeck.launcher.stores.Store.XBOX) { XboxStoreDialogs() } com.droiddeck.launcher.stores.StoresState.pendingInstall?.let { item -> StoreTheme(item.store) { InstallWhere(item) } } com.droiddeck.launcher.stores.StoresState.itchPicking?.let { item -> StoreTheme(item.store) { ItchBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.itchPicking = null } } } + com.droiddeck.launcher.stores.StoresState.gameJoltPicking?.let { item -> StoreTheme(item.store) { GameJoltBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.gameJoltPicking = null } } } StepsLayer(screenAt) appToChooseDisplay?.let { app -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 383c5356ab..f7969fe6c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -93,7 +93,8 @@ internal object SetupTabs { var openLauncher = false var openOverview = false } -private const val GLASSES_TAB = 5 +private const val GLASSES_TAB = 6 +private const val SYNC_TAB = 4 @Composable private fun CheckRow(state: CheckState, title: String, detail: String?, divider: Boolean = true, action: (@Composable () -> Unit)? = null) { @@ -170,7 +171,7 @@ internal fun SetupPanel( val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val gpu = remember { com.droiddeck.launcher.gpu.GpuInfo.detect() } - val gpuOk = gpu.support == com.droiddeck.launcher.gpu.GpuInfo.Support.TESTED + val gpuOk = gpu.support == com.droiddeck.launcher.gpu.GpuInfo.Support.TESTED || s.vkBridge val gpuName = remember { DeviceSupport.gpuName(ctx) } val limitBlocks = PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) val signedIn = s.offlineAccount != null @@ -190,7 +191,7 @@ internal fun SetupPanel( onDismiss = { editDownloadProxy = false }, onSave = { a.onDownloadProxy(it); editDownloadProxy = false }, ) - val tabs = listOf(stringResource(R.string.setup_tab_overview), stringResource(R.string.setup_tab_controller), stringResource(R.string.setup_tab_launcher), stringResource(R.string.setup_tab_storage), stringResource(R.string.setup_tab_diagnostics), stringResource(R.string.setup_tab_glasses)) + val tabs = listOf(stringResource(R.string.setup_tab_overview), stringResource(R.string.setup_tab_controller), stringResource(R.string.setup_tab_launcher), stringResource(R.string.setup_tab_storage), stringResource(R.string.setup_tab_sync), stringResource(R.string.setup_tab_diagnostics), stringResource(R.string.setup_tab_glasses)) var tab by rememberSaveable { mutableStateOf(if (SetupTabs.openLauncher) LAUNCHER_TAB else 0) } SetupTabs.openLauncher = false if (SetupTabs.openOverview) { tab = 0; SetupTabs.openOverview = false } @@ -210,6 +211,18 @@ internal fun SetupPanel( a.onRefreshPhantomStatus() } } + LaunchedEffect(com.droiddeck.launcher.sync.Syncthing.openRequests) { + if (com.droiddeck.launcher.sync.Syncthing.openPending) { + com.droiddeck.launcher.sync.Syncthing.openPending = false + tab = SYNC_TAB + } + } + var syncAdvanced by rememberSaveable { mutableStateOf(false) } + if (syncAdvanced) { + androidx.activity.compose.BackHandler { syncAdvanced = false } + SyncAdvancedPage(host) { syncAdvanced = false } + return + } LaunchedEffect(tab) { if (tabTurned && inputModeManager.inputMode == InputMode.Keyboard) { androidx.compose.runtime.withFrameNanos { } @@ -219,7 +232,7 @@ internal fun SetupPanel( val runtimeOk = s.ready && !s.busy && !s.removalPending val checks = listOf(gpuOk, runtimeOk, !limitBlocks, signedIn) val passing = checks.count { it } - var showChecks by rememberSaveable { mutableStateOf(false) } + var showChecks by rememberSaveable { mutableStateOf(s.vkBridge) } Rise(0, Modifier.fillMaxSize()) { Column( modifier = Modifier.fillMaxSize().bumpers( @@ -236,17 +249,49 @@ internal fun SetupPanel( val gpuCheck: @Composable (Boolean) -> Unit = { divider -> CheckRow( if (gpuOk) CheckState.OK else CheckState.WARN, - when (gpu.support) { - com.droiddeck.launcher.gpu.GpuInfo.Support.TESTED -> stringResource(R.string.setup_gpu_supported) - com.droiddeck.launcher.gpu.GpuInfo.Support.UNTESTED -> stringResource(R.string.setup_gpu_untested) + when { + gpu.support == com.droiddeck.launcher.gpu.GpuInfo.Support.TESTED -> stringResource(R.string.setup_gpu_supported) + gpu.support == com.droiddeck.launcher.gpu.GpuInfo.Support.UNTESTED -> stringResource(R.string.setup_gpu_untested) + s.vkBridge -> stringResource(R.string.setup_gpu_bridged) else -> stringResource(R.string.setup_gpu_unsupported) }, when (gpu.support) { com.droiddeck.launcher.gpu.GpuInfo.Support.TESTED -> stringResource(R.string.setup_gpu_detail, gpu.displayName(ctx), gpuName) com.droiddeck.launcher.gpu.GpuInfo.Support.UNTESTED -> stringResource(R.string.setup_gpu_untested_detail, gpu.displayName(ctx), gpu.supportText(ctx).replaceFirstChar { it.lowercase() }) - else -> stringResource(R.string.setup_gpu_unsupported_detail, gpuName) + else -> if (s.vkBridge) stringResource(R.string.setup_gpu_bridge_detail, gpuName) + else stringResource(R.string.setup_gpu_unsupported_detail, gpuName) }, + divider = divider || (!s.adreno && s.vkBridge), + action = if (s.adreno) null else { { + SecondaryButton( + stringResource(if (s.vkBridge) R.string.setup_gpu_bridge_on else R.string.setup_gpu_bridge_off), + enabled = !s.sessionRunning, compact = true, onClick = { a.onVkBridge(!s.vkBridge) }, + ) + } }, + ) + if (!s.adreno && s.vkBridge) CheckRow( + CheckState.OK, + stringResource(R.string.setup_bridge_safe), + stringResource(if (s.vkBridgeSafe) R.string.setup_bridge_safe_on_detail else R.string.setup_bridge_safe_off_detail), divider = divider, + action = { + SecondaryButton( + stringResource(if (s.vkBridgeSafe) R.string.setup_bridge_safe_on else R.string.setup_bridge_safe_off), + enabled = !s.sessionRunning, compact = true, onClick = { a.onVkBridgeSafe(!s.vkBridgeSafe) }, + ) + }, + ) + if (!s.adreno && s.vkBridge) CheckRow( + CheckState.OK, + stringResource(R.string.setup_bridge_dxvk), + stringResource(if (s.bridgeProtonDxvk) R.string.setup_bridge_dxvk_proton_detail else R.string.setup_bridge_dxvk_auto_detail), + divider = divider, + action = { + SecondaryButton( + stringResource(if (s.bridgeProtonDxvk) R.string.setup_bridge_dxvk_proton else R.string.setup_bridge_dxvk_auto), + enabled = !s.sessionRunning, compact = true, onClick = { a.onBridgeProtonDxvk(!s.bridgeProtonDxvk) }, + ) + }, ) } val runtimeCheck: @Composable (Boolean) -> Unit = { divider -> @@ -422,21 +467,23 @@ internal fun SetupPanel( s.launcherFullscreen, ) { a.onLauncherFullscreen(it) } if (s.dualScreenDevice) { - ChoiceRow( - host, "dual-screen", stringResource(R.string.setup_dual_screen), stringResource(R.string.setup_dual_screen_hint), - listOf( - com.droiddeck.launcher.input.DualScreen.MODE_AUTO to stringResource(R.string.setup_dual_screen_auto), - com.droiddeck.launcher.input.DualScreen.MODE_ON to stringResource(R.string.setup_dual_screen_on), - com.droiddeck.launcher.input.DualScreen.MODE_OFF to stringResource(R.string.setup_dual_screen_off), - ), - s.dualScreenMode, onPick = a.onDualScreenMode, + val dualModes = listOf( + com.droiddeck.launcher.input.DualScreen.MODE_AUTO to stringResource(R.string.setup_dual_screen_auto), + com.droiddeck.launcher.input.DualScreen.MODE_ON to stringResource(R.string.setup_dual_screen_on), + com.droiddeck.launcher.input.DualScreen.MODE_OFF to stringResource(R.string.setup_dual_screen_off), ) - } - if (s.dualScreenDevice && s.dualScreenMode != com.droiddeck.launcher.input.DualScreen.MODE_OFF) { - ToggleRow(host, "dual-screen-menu", stringResource(R.string.setup_dual_screen_menu), - stringResource(R.string.setup_dual_screen_menu_hint), s.dualScreenLauncher) { a.onDualScreenLauncher(it) } - ToggleRow(host, "dual-screen-controls", stringResource(R.string.setup_dual_screen_controls), - stringResource(R.string.setup_dual_screen_controls_hint), s.dualScreenControls) { a.onDualScreenControls(it) } + ChoiceRow( + host, "dual-screen", stringResource(R.string.setup_dual_screen_launcher), stringResource(R.string.setup_dual_screen_launcher_hint), + dualModes, s.dualScreenMode, onPick = a.onDualScreenMode, + ) + ChoiceRow( + host, "dual-screen-sessions", stringResource(R.string.setup_dual_screen_sessions), stringResource(R.string.setup_dual_screen_sessions_hint), + dualModes, s.dualScreenSessions, onPick = a.onDualScreenSessions, + ) + if (s.dualScreenSessions != com.droiddeck.launcher.input.DualScreen.MODE_OFF) { + ToggleRow(host, "dual-screen-controls", stringResource(R.string.setup_dual_screen_controls), + stringResource(R.string.setup_dual_screen_controls_hint), s.dualScreenControls) { a.onDualScreenControls(it) } + } } } } @@ -492,7 +539,8 @@ internal fun SetupPanel( } } STORAGE_TAB -> StoragePanel(s, a) - 4 -> { + SYNC_TAB -> SyncPanel(host, runtimeOk) { syncAdvanced = true } + 5 -> { SettingsGroup(stringResource(R.string.setup_tab_diagnostics)) { ToggleRow(host, "logs", stringResource(R.string.setup_logs), stringResource(R.string.setup_logs_hint), s.logsEnabled) { a.onLogs() } ToggleRow( @@ -688,7 +736,6 @@ private fun GameSettingsCard(host: MenuHost, game: com.droiddeck.launcher.fronte GameSettingsMenus(host, game, state) } -/** The per-game settings menus, opened by setting [MenuHost.open] to [GAME_SETTINGS_MENU]. */ @Composable internal fun GameSettingsMenus(host: MenuHost, game: com.droiddeck.launcher.frontend.Library.SteamGame, state: GameSettingsState) { val appContext = androidx.compose.ui.platform.LocalContext.current.applicationContext @@ -897,14 +944,12 @@ private fun LanguageRow(host: MenuHost, chosen: String, onPick: (String) -> Unit } } -/** How fast Inner Gamer cycles its colours. */ @Composable private fun RgbSpeedRow() { val ctx = androidx.compose.ui.platform.LocalContext.current.applicationContext SliderRow(stringResource(R.string.theme_rgb_speed), stringResource(R.string.theme_rgb_speed_hint), Themes.rgbSpeed, 1..Themes.RGB_SPEEDS) { Themes.setRgbSpeed(ctx, it) } } -/** The two colours of the Gradient theme, each a small square that opens the colour picker. */ @Composable private fun GradientColorRows() { val ctx = androidx.compose.ui.platform.LocalContext.current.applicationContext diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt index 6f1aad1421..2ec816eb12 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt @@ -264,23 +264,3 @@ internal fun SecondaryButton(text: String, enabled: Boolean = true, compact: Boo } } -@Composable -internal fun Cog(size: androidx.compose.ui.unit.Dp = 48.dp, onClick: () -> Unit) { - val colors = MaterialTheme.colorScheme - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - var spins by remember { mutableIntStateOf(0) } - val rot by animateFloatAsState((if (hot) 90f else 0f) + spins * 180f, Motion.sp(0.55f), label = "cog") - val pal = LocalPalette.current - val placed = remember { arrayOfNulls<androidx.compose.ui.layout.LayoutCoordinates>(1) } - val cornerPx = with(androidx.compose.ui.platform.LocalDensity.current) { (if (size > 48.dp) 14.dp else 12.dp).toPx() } - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.paneItem("cog").downToFirstTile().size(size).onGloballyPositioned { placed[0] = it }.clip(if (size > 48.dp) Shape14 else Shape12).background(Color.White.copy(alpha = 0.03f)).glideBorder(hot, if (size > 48.dp) Shape14 else Shape12, pal.signal, pal.line2) - .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current) { - placed[0]?.takeIf { it.isAttached }?.let { PageOrigin.mark(Origin(it.boundsInRoot(), cornerPx)) } - spins++ - onClick() - }, - ) { Icon(Icons.Filled.Settings, stringResource(R.string.drawer_page_settings), tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(if (size > 48.dp) 20.dp else 18.dp).rotate(rot)) } -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index aa193883de..f7efc043ff 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -98,6 +98,7 @@ import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.StoreLanguage import com.droiddeck.launcher.stores.StoreSizes import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.gamejolt.GameJoltApi import com.droiddeck.launcher.stores.battlenet.BattleNetInstall import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.download.DownloadState @@ -115,7 +116,6 @@ import java.io.File import androidx.compose.runtime.setValue import androidx.compose.runtime.getValue -/** What a game page shows: `app:<appId>` for a game in the library, `[app:]<store>:<id>` for a store product. */ internal class GameRef(val appId: Int?, val store: Store?, val storeId: String?) { fun game(games: List<Library.SteamGame>): Library.SteamGame? = when { appId != null -> games.firstOrNull { it.appId == appId } @@ -140,7 +140,7 @@ internal enum class GameTab { ABOUT, ACHIEVEMENTS, LAUNCH, SAVES, INSTALL } @Composable internal fun GameDetail( - key: String, s: FrontEndState, a: FrontEndActions, lead: FocusRequester, backLabel: String, hopRail: String?, onBack: () -> Unit, + key: String, s: FrontEndState, a: FrontEndActions, lead: FocusRequester, backLabel: String, hopRail: String?, onBack: () -> Unit, inStore: Boolean = false, ) { val narrow = LocalNarrowPane.current val stacked = narrow || LocalConfiguration.current.screenWidthDp < 700 @@ -195,7 +195,6 @@ internal fun GameDetail( var inPage by remember(key) { mutableStateOf(false) } var onStrip by remember(key) { mutableStateOf(false) } var dropped by remember(key) { mutableStateOf(0) } - // A tab's content is swapped or refreshed under the focused row; focus goes back to the tabs, not to the rail. LaunchedEffect(dropped) { if (dropped == 0) return@LaunchedEffect androidx.compose.runtime.withFrameNanos { } @@ -220,6 +219,7 @@ internal fun GameDetail( if (!s.shortcutPicker) CompositionLocalProvider(LocalPillButtons provides true) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { if (installed != null && installed.sidecar.store == Store.ITCH) ItchCheckButton(installed) + if (installed != null && installed.sidecar.store == Store.GAMEJOLT) GameJoltCheckButton(installed) RemoveButton(title, game, installed, a) } } @@ -234,7 +234,7 @@ internal fun GameDetail( color = MaterialTheme.colorScheme.error, maxLines = 3, overflow = TextOverflow.Ellipsis, ) Spacer(Modifier.height(2.dp)) - GameCapsule(scores) { GameActions(store, id, game, item, installed, s, a, Modifier.focusRequester(lead), compactMenu = stacked) } + GameCapsule(scores) { GameActions(store, id, game, item, installed, s, a, Modifier.focusRequester(lead), compactMenu = stacked, inStore = inStore) } } } if (StoresMotion.heroLands) header() else Rise(1) { header() } @@ -319,7 +319,6 @@ private fun GameStatusLine(source: String, game: Library.SteamGame?, item: Catal } } -/** One frosted pill that holds the game's actions and its headline scores. */ @Composable private fun GameCapsule(scores: GameScores?, actions: @Composable () -> Unit) { Row( @@ -385,7 +384,7 @@ private fun GameTitle(title: String, logo: Any?, titleSize: TextUnit) { @Composable internal fun GameActions( store: Store?, id: String?, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, - s: FrontEndState, a: FrontEndActions, leadOn: Modifier, compactMenu: Boolean = false, + s: FrontEndState, a: FrontEndActions, leadOn: Modifier, compactMenu: Boolean = false, inStore: Boolean = false, ) { val ctx = LocalContext.current val storeKey = if (store != null && id != null) "${store.id}:$id" else null @@ -412,10 +411,16 @@ internal fun GameActions( if (compactMenu) GameMoreMenu(game, a) else { FileButtons(game, a) GameShortcutMenu(game, a) - EditArtButton(game) } } if (store == Store.ITCH && installed != null) ItchUpdateButton(installed, download == null && StoresState.uninstalling[installed.key] == null) + if (store == Store.GAMEJOLT && installed != null) GameJoltUpdateButton(installed, download == null && StoresState.uninstalling[installed.key] == null) + if (store == Store.GAMEJOLT && installed != null) GameJoltVersionButton(installed, download == null && StoresState.uninstalling[installed.key] == null) + if (inStore && store == Store.GAMEJOLT && installed != null) { + SecondaryButton(stringResource(R.string.stores_view_on, Store.GAMEJOLT.shortLabel)) { + openUrl(ctx, item?.storeUrl.orEmpty().ifBlank { GameJoltApi.pageUrl("game", installed.sidecar.id) }) + } + } if (store == Store.GOG && installed != null) GogMaintenanceActions(installed) if (store == Store.XBOX && id != null) XboxInstalledStream(id, game?.name ?: item?.title.orEmpty(), item) if (store == Store.XBOX && installed != null && id != null) { @@ -438,6 +443,7 @@ internal fun GameActions( } SecondaryButton(stringResource(R.string.bnet_open)) { a.onBattleNet() } } + if (game != null && !compactMenu) EditArtButton(game) } download != null -> { ActionChip(downloadLabel(download), ok = false) @@ -485,7 +491,7 @@ internal fun GameActions( } if (!item.accessible) SecondaryButton(buyLabel(item)) { openStoreUrl(ctx, item) } } - item != null && item.store == Store.ITCH && item.isFree -> { + item != null && (item.store == Store.ITCH || item.store == Store.GAMEJOLT) && item.isFree -> { InstallButton(stringResource(R.string.stores_install), leadOn) { StoresState.requestInstall(ctx, item) } SecondaryButton(stringResource(R.string.stores_view_on, item.store.shortLabel)) { openStoreUrl(ctx, item) } } @@ -500,7 +506,6 @@ internal fun GameActions( } } -/** Xbox Cloud Gaming rows the user added to the Library, for games not installed here. */ @Composable internal fun rememberXboxCloudRows(s: FrontEndState): List<Library.SteamGame> { val ctx = LocalContext.current @@ -535,7 +540,6 @@ private fun XboxInstalledStream(id: String, title: String, item: CatalogItem?) { private fun XboxLibraryButton(id: String, item: CatalogItem?) { val ctx = LocalContext.current LaunchedEffect(Unit) { XboxCloudGames.load(ctx) } - // Add and Remove replace each other; the controller focus moves to the new button instead of getting lost. val slot = remember { FocusRequester() } val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current val scope = rememberCoroutineScope() @@ -572,7 +576,6 @@ private fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) { } } -/** The pencil opens the editor each kind of game always had: the shortcut editor for added games, art for the rest. */ @Composable private fun rememberEditArt(g: Library.SteamGame): (() -> Unit)? { val ctx = LocalContext.current @@ -593,7 +596,6 @@ private fun EditArtButton(g: Library.SteamGame) { IconAction(Icons.Outlined.Edit, stringResource(R.string.game_edit_art), "game:edit", onClick = open) } -/** Narrow screens keep one More button in the capsule instead of a row of small ones. */ @Composable private fun GameMoreMenu(g: Library.SteamGame, a: FrontEndActions) { var open by remember(g.gameId) { mutableStateOf(false) } @@ -932,7 +934,6 @@ private fun InstallTab(game: Library.SteamGame?, installed: InstalledStoreGame?, } } -/** Text a controller has to land on to bring it into view: focusable, with the focus ring. */ @Composable internal fun Modifier.readable(): Modifier { val pal = LocalPalette.current @@ -953,7 +954,6 @@ internal fun FactRow(label: String, value: String, labelWidth: androidx.compose. } } -/** Store installs are measured by [StoreSizes]; Steam and added games by walking their folder once. */ @Composable internal fun diskSize(installed: InstalledStoreGame?, folder: File): Long? { val ctx = LocalContext.current diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt index dd5668ee8b..a2660d1b47 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt @@ -55,13 +55,8 @@ import coil.request.ImageRequest import coil.size.Precision import kotlin.math.max -/** Buttons in a capsule render as pills; elsewhere they keep their rounded-rectangle shape. */ internal val LocalPillButtons = compositionLocalOf { false } -/** - * The page's blurred art, shared so frosted surfaces can draw the part of it behind them. - * Coordinates are read when drawing, so a surface and the backdrop always agree on where they are. - */ internal class GlassBackdrop { var painter: Painter? = null var coords: LayoutCoordinates? = null @@ -79,7 +74,6 @@ internal class GlassBackdrop { scope.drawCover(art, size, if (light) LightAmbient else DarkAmbient) } - /** Drawn inside a layer, so it fades what was painted before it toward the page's end. */ fun fadeBottom(scope: DrawScope, size: Size) { val fade = minOf(size.height * 0.5f, with(scope) { 240.dp.toPx() }) if (size.height <= 0f) return @@ -121,7 +115,6 @@ private fun ambientRequest(ctx: android.content.Context, model: Any?): ImageRequ private const val AmbientPixels = 6 -/** How washed-out the art is: average brightness less its saturation, from a tiny decode, so pale art is dimmed while dark and vivid art are left alone. */ @Composable private fun rememberArtBrightness(model: Any?): Float { val ctx = LocalContext.current @@ -148,10 +141,6 @@ private fun rememberArtBrightness(model: Any?): Float { private const val SamplePixels = 8 private const val SaturationWeight = 0.6 -/** - * A page whose game art fills the background: a blurred wash behind everything and the sharp art - * across the top, fading into the page. Surfaces inside draw frosted glass over the wash. - */ @Composable internal fun GameBackdrop( art: Any?, ambient: Any?, fallbackHue: Float, @@ -241,7 +230,6 @@ private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, onPlaced: (and private val ArtMin = 220.dp private val ArtMax = 340.dp -/** A frosted surface: the page's wash behind it, a dark tint, and a thin rim. Plain surface when there is no backdrop. */ @Composable internal fun Modifier.glass(shape: Shape, lift: Float = 0f): Modifier { val g = LocalGlass.current diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBrowseBar.kt new file mode 100644 index 0000000000..96057ea1d7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBrowseBar.kt @@ -0,0 +1,157 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.gamejolt.GameJoltBrowse +import com.droiddeck.launcher.stores.gamejolt.GameJoltBrowseState +import com.droiddeck.launcher.stores.gamejolt.GameJoltQuery + +@Composable +internal fun GameJoltBrowseBar(showMature: Boolean) { + val ctx = LocalContext.current + val query = GameJoltBrowseState.query + var picking by remember { mutableStateOf(false) } + LaunchedEffect(Unit) { if (GameJoltBrowseState.items.isEmpty()) GameJoltBrowseState.more(ctx) } + fun toggle(set: Set<String>, value: String): Set<String> = if (value in set) set - value else set + value + Column(Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + ChipRow { + BrowseDropdown(sectionLabel(query.section)) { first, close -> + GameJoltBrowse.sections.forEachIndexed { index, section -> + MenuItem(sectionLabel(section), query.section == section, focusRequester = if (index == 0) first else null) { + GameJoltBrowseState.choose(ctx, query.copy(section = section)) + close() + } + } + } + BrowseDropdown(priceLabel(query.price)) { first, close -> + GameJoltBrowse.prices.forEachIndexed { index, price -> + MenuItem(priceLabel(price), query.price == price, focusRequester = if (index == 0) first else null) { + GameJoltBrowseState.choose(ctx, query.copy(price = price)) + close() + } + } + } + val anyPlatform = stringResource(R.string.stores_itch_platform_any) + BrowseDropdown(browseSummary(GameJoltBrowse.systems.filter { it in query.os }.map { systemLabel(it) }, anyPlatform)) { first, _ -> + MenuItem(anyPlatform, query.os.isEmpty(), focusRequester = first) { GameJoltBrowseState.choose(ctx, query.copy(os = emptySet())) } + for (os in GameJoltBrowse.systems) MenuItem(systemLabel(os), os in query.os) { GameJoltBrowseState.choose(ctx, query.copy(os = toggle(query.os, os))) } + } + BrowseDropdown(browseSummary(GameJoltBrowse.browsers.filter { it in query.browser }.map { browserLabel(it) }, stringResource(R.string.stores_gamejolt_filter_browser))) { first, _ -> + GameJoltBrowse.browsers.forEachIndexed { index, browser -> + MenuItem(browserLabel(browser), browser in query.browser, focusRequester = if (index == 0) first else null) { GameJoltBrowseState.choose(ctx, query.copy(browser = toggle(query.browser, browser))) } + } + } + val maturities = GameJoltBrowse.maturities.filter { showMature || it != "adult" } + BrowseDropdown(browseSummary(maturities.filter { it in query.maturity }.map { maturityLabel(it) }, stringResource(R.string.stores_gamejolt_filter_maturity))) { first, _ -> + maturities.forEachIndexed { index, maturity -> + MenuItem(maturityLabel(maturity), maturity in query.maturity, focusRequester = if (index == 0) first else null) { GameJoltBrowseState.choose(ctx, query.copy(maturity = toggle(query.maturity, maturity))) } + } + } + BrowseDropdown(browseSummary(GameJoltBrowse.statuses.filter { it in query.status }.map { statusLabel(it) }, stringResource(R.string.stores_gamejolt_filter_status))) { first, _ -> + GameJoltBrowse.statuses.forEachIndexed { index, status -> + MenuItem(statusLabel(status), status in query.status, focusRequester = if (index == 0) first else null) { GameJoltBrowseState.choose(ctx, query.copy(status = toggle(query.status, status))) } + } + } + val partners = stringResource(R.string.stores_gamejolt_partners) + BrowseDropdown(if (query.partners) partners else stringResource(R.string.stores_gamejolt_filter_partners)) { first, _ -> + MenuItem(partners, query.partners, focusRequester = first) { GameJoltBrowseState.choose(ctx, query.copy(partners = !query.partners)) } + } + } + ChipRow { + for (tag in query.tags) BrowseChip("$tag ✕", true) { GameJoltBrowseState.choose(ctx, query.copy(tags = query.tags - tag)) } + BrowseChip(stringResource(R.string.stores_itch_tag_add), false) { picking = true } + } + } + if (picking) TextEntryDialog( + stringResource(R.string.stores_itch_tag_title), "", number = false, confirm = stringResource(R.string.common_ok), + onSubmit = { value -> GameJoltBrowse.tagSlug(value).takeIf { it.isNotEmpty() }?.let { GameJoltBrowseState.choose(ctx, query.copy(tags = (query.tags + it).distinct())) } }, + onDismiss = { picking = false }, id = "gamejolt-tag", + ) +} + +@Composable +internal fun GameJoltLoadMore() { + val ctx = LocalContext.current + val count = GameJoltBrowseState.items.size + LaunchedEffect(Unit) { GameJoltBrowseState.more(ctx) } + if (GameJoltBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp)) + else if (GameJoltBrowseState.failed) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_dl_retry), false) { GameJoltBrowseState.more(ctx, retry = true) } + } + else if (!GameJoltBrowseState.ended && count > 0) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_itch_load_more), false) { GameJoltBrowseState.more(ctx) } + } +} + +@Composable +private fun sectionLabel(section: String): String = stringResource( + when (section) { + GameJoltBrowse.SECTION_HOT -> R.string.stores_gamejolt_section_hot + GameJoltBrowse.SECTION_BEST -> R.string.stores_gamejolt_section_best + GameJoltBrowse.SECTION_NEW -> R.string.stores_gamejolt_section_new + else -> R.string.stores_gamejolt_section_featured + }, +) + +@Composable +private fun priceLabel(price: String): String = stringResource( + when (price) { + GameJoltBrowse.PRICE_FREE -> R.string.stores_itch_price_free + GameJoltBrowse.PRICE_SALE -> R.string.stores_itch_price_sale + GameJoltBrowse.PRICE_PAID -> R.string.stores_itch_price_paid + GameJoltBrowse.PRICE_UNDER_5 -> R.string.stores_itch_price_under_5 + GameJoltBrowse.PRICE_UNDER_15 -> R.string.stores_itch_price_under_15 + GameJoltBrowse.PRICE_UNDER_30 -> R.string.stores_gamejolt_price_under_30 + else -> R.string.stores_itch_price_any + }, +) + +@Composable +private fun systemLabel(os: String): String = stringResource( + when (os) { + "windows" -> R.string.stores_itch_platform_windows + "mac" -> R.string.stores_itch_platform_macos + "linux" -> R.string.stores_itch_platform_linux + else -> R.string.stores_gamejolt_os_other + }, +) + +@Composable +private fun browserLabel(browser: String): String = when (browser) { + "html" -> "HTML" + "flash" -> "Flash" + else -> "Unity" +} + +@Composable +private fun maturityLabel(maturity: String): String = stringResource( + when (maturity) { + "everyone" -> R.string.stores_gamejolt_maturity_everyone + "teen" -> R.string.stores_gamejolt_maturity_teen + else -> R.string.stores_gamejolt_maturity_adult + }, +) + +@Composable +private fun statusLabel(status: String): String = stringResource( + when (status) { + "complete" -> R.string.stores_gamejolt_status_complete + else -> R.string.stores_gamejolt_status_early + }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBuildPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBuildPicker.kt new file mode 100644 index 0000000000..7e5f06600a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltBuildPicker.kt @@ -0,0 +1,129 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.gamejolt.GameJoltApi +import com.droiddeck.launcher.stores.gamejolt.GameJoltBuild +import com.droiddeck.launcher.stores.gamejolt.GameJoltBuilds +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private const val CHOOSE = "choose" + +@Composable +internal fun GameJoltVersionButton(installed: InstalledStoreGame, enabled: Boolean) { + SecondaryButton(stringResource(R.string.stores_itch_pick_title), enabled = enabled) { + val sidecar = installed.sidecar + val paid = sidecar.extra["paid"] == "1" + StoresState.gameJoltPicking = CatalogItem( + store = Store.GAMEJOLT, id = sidecar.id, title = sidecar.title, imageUrl = sidecar.cover, isFree = !paid, + storeUrl = GameJoltApi.pageUrl("game", sidecar.id), + extra = mapOf("gameId" to (sidecar.extra["gameId"] ?: sidecar.id), CHOOSE to "1"), + ) + } +} + +@Composable +internal fun GameJoltBuildPicker(requested: CatalogItem, onDismiss: () -> Unit) { + val item = requested.copy(owned = requested.owned || StoresState.library[Store.GAMEJOLT].orEmpty().any { it.id == requested.id && it.owned }) + val ctx = LocalContext.current + val app = ctx.applicationContext + val colors = MaterialTheme.colorScheme + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + var loaded by remember(requested) { mutableStateOf<List<GameJoltBuild>?>(null) } + var failed by remember(requested) { mutableStateOf(false) } + + val install: (GameJoltBuild) -> Unit = install@{ build -> + if (!shown.targetState) return@install + val tagged = item.copy( + extra = item.extra + mapOf("buildId" to build.id), + sizeBytes = build.size.takeIf { it > 0 } ?: item.sizeBytes, + ) + close() + StoresState.requestInstall(ctx, tagged) + } + + LaunchedEffect(requested) { + val gameId = item.extra["gameId"].orEmpty().ifEmpty { item.id } + val result = withContext(Dispatchers.IO) { GameJoltBuilds.load(app, gameId) } + if (result == null) { failed = true; return@LaunchedEffect } + loaded = result + if ((item.isFree || item.owned) && item.extra[CHOOSE] != "1" && shown.targetState) result.singleOrNull()?.takeIf { it.installable }?.let { install(it) } + } + + AppDialog(shown, close, "gameJoltBuilds", wide = false, maxWidth = 460.dp) { + DialogTitleRow(stringResource(R.string.stores_itch_pick_title), close) + Text(item.title, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + val list = loaded + when { + failed -> Text(stringResource(R.string.stores_gamejolt_pick_failed), fontSize = 13.sp, color = colors.onSurfaceVariant) + list == null -> LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 8.dp)) + list.isEmpty() -> Text(stringResource(R.string.stores_itch_pick_none), fontSize = 13.sp, color = colors.onSurfaceVariant) + else -> Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { + for (build in list) key(build.id) { BuildRow(item, build) { install(build) } } + } + } + } +} + +@Composable +private fun BuildRow(item: CatalogItem, build: GameJoltBuild, onInstall: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val linux = "linux" in build.platforms && !build.installable + val canInstall = build.installable && (item.isFree || item.owned) + val names = build.platforms.map { platformName(it) } + val detail = listOfNotNull( + names.joinToString(", "), + build.size.takeIf { it > 0 }?.let { formatBytes(it) }, + build.version.takeIf { it.isNotBlank() }, + ).joinToString(" · ") + ListRow(enabled = !linux, onClick = { if (canInstall) onInstall() else openStoreUrl(ctx, item) }) { + Column(Modifier.weight(1f)) { + Text(build.filename.ifBlank { build.packageTitle.ifBlank { item.title } }, fontSize = 13.sp, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(detail, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + val label = when { + canInstall -> stringResource(R.string.stores_install) + linux -> stringResource(R.string.stores_itch_build_linux_soon) + else -> stringResource(R.string.stores_gamejolt_build_open) + } + Text(label, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) + } +} + +@Composable +private fun platformName(platform: String): String = stringResource( + when (platform) { + "windows" -> R.string.stores_itch_build_windows + "linux" -> R.string.stores_itch_build_linux + "osx" -> R.string.stores_itch_build_macos + "other" -> R.string.stores_gamejolt_os_other + else -> R.string.stores_itch_build_web + }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameJoltUpdateButton.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltUpdateButton.kt new file mode 100644 index 0000000000..c351495142 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameJoltUpdateButton.kt @@ -0,0 +1,61 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.gamejolt.GameJoltUpdate +import com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates + +@Composable +internal fun GameJoltCheckButton(installed: InstalledStoreGame) { + val ctx = LocalContext.current + IconAction(Icons.Filled.Refresh, stringResource(R.string.store_check_updates), "game:check-updates", enabled = GameJoltUpdates.checkingKey == null, frosted = true) { + GameJoltUpdates.checkGame(ctx, installed) + } +} + +@Composable +internal fun GameJoltUpdateButton(installed: InstalledStoreGame, enabled: Boolean) { + val ctx = LocalContext.current + val update = GameJoltUpdates.available[installed.key] ?: return + var asking by remember { mutableStateOf(false) } + SecondaryButton(stringResource(R.string.common_update), enabled = enabled) { + if (update.replaced) asking = true else GameJoltUpdates.start(ctx, installed, update) + } + if (asking) GameJoltReplacedDialog(installed, update) { asking = false } +} + +@Composable +private fun GameJoltReplacedDialog(installed: InstalledStoreGame, update: GameJoltUpdate, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + AppDialog(shown, close, "gameJoltUpdate", wide = false, maxWidth = 460.dp) { + DialogTitleRow(installed.sidecar.title, close) + Text( + stringResource(R.string.stores_itch_update_replaced, update.filename.ifBlank { update.buildId }), + fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + PrimaryButton(stringResource(R.string.common_update)) { + close() + GameJoltUpdates.start(ctx, installed, update) + } + SecondaryButton(stringResource(R.string.common_cancel)) { close() } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GestureActions.kt b/app/src/main/java/com/droiddeck/launcher/ui/GestureActions.kt index 56643effe7..2ada3923e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GestureActions.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GestureActions.kt @@ -41,7 +41,6 @@ internal fun filterGestureActions(actions: List<GestureAction>, query: String, g action.title.contains(word, ignoreCase = true) || action.id.removePrefix("key_").replace('_', ' ').contains(word, ignoreCase = true) } }.sortedWith(compareBy<GestureAction> { it.group.ordinal }.thenComparator { a, b -> - // Function keys follow their numeric sequence; names use the UI locale. if (a.group == GestureActionGroup.FUNCTION) { a.id.removePrefix("key_F").toInt().compareTo(b.id.removePrefix("key_F").toInt()) } else collator.compare(a.title, b.title) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt index 625c30efb8..f5e9138bd7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPhonePanel.kt @@ -28,7 +28,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.droiddeck.launcher.R -/** Actions for the phone while the picture is on the glasses. Null hides the button. */ internal class GlassesPhoneActions( val onRecenter: (() -> Unit)?, val onRecenterJoyCons: (() -> Unit)?, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt index dd362fe528..36d4fcdd10 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt @@ -18,13 +18,36 @@ import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupPositionProvider import androidx.compose.ui.window.PopupProperties +internal object KeyWindows { + private val views = java.util.concurrent.CopyOnWriteArrayList<android.view.View>() + + fun add(view: android.view.View) { + views.remove(view) + views.add(view) + } + + fun remove(view: android.view.View) { views.remove(view) } + + fun topOn(displayId: Int): android.view.View? = + views.lastOrNull { it.isAttachedToWindow && it.display?.displayId == displayId } +} + +@Composable +internal fun TrackKeyWindow() { + val view = androidx.compose.ui.platform.LocalView.current + androidx.compose.runtime.DisposableEffect(view) { + KeyWindows.add(view) + onDispose { KeyWindows.remove(view) } + } +} + @Composable internal fun GlideDialog( onDismissRequest: () -> Unit, properties: DialogProperties = DialogProperties(), content: @Composable () -> Unit, ) { - Dialog(onDismissRequest, properties) { FocusGlideHost(content = content) } + Dialog(onDismissRequest, properties) { TrackKeyWindow(); FocusGlideHost(content = content) } } @Composable @@ -34,7 +57,10 @@ internal fun GlidePopup( properties: PopupProperties = PopupProperties(), content: @Composable () -> Unit, ) { - Popup(popupPositionProvider, onDismissRequest, properties) { FocusGlideHost(content = content) } + Popup(popupPositionProvider, onDismissRequest, properties) { + if (properties.focusable) TrackKeyWindow() + FocusGlideHost(content = content) + } } @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt index fddb98c60b..69936548ce 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt @@ -225,7 +225,6 @@ internal fun GpuDriversBody( val scroll = rememberScrollState() val scope = rememberCoroutineScope() val placed = remember { arrayOfNulls<LayoutCoordinates>(2) } - // Focusing the top mode shows as much of the in-use card above it as fits, without hiding the mode itself. val revealCard = { val (viewport, top) = placed if (viewport != null && top != null && viewport.isAttached && top.isAttached) scope.launch { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index 276d131fee..fe65d598f4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -19,6 +20,7 @@ import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -27,6 +29,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role @@ -44,16 +47,29 @@ internal fun ItchBrowseBar() { var picking by remember { mutableStateOf(false) } Column(Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { ChipRow { - for (sort in ItchBrowse.sorts) BrowseChip(sortLabel(sort), query.sort == sort) { ItchBrowseState.choose(ctx, query.copy(sort = sort)) } - } - ChipRow { - for (price in ItchBrowse.prices) BrowseChip(priceLabel(price), query.price == price) { ItchBrowseState.choose(ctx, query.copy(price = price)) } - } - ChipRow { - BrowseChip(stringResource(R.string.stores_itch_platform_any), query.platforms.isEmpty()) { ItchBrowseState.choose(ctx, query.copy(platforms = emptySet())) } - for (platform in ItchBrowse.platformNames) { - val on = platform in query.platforms - BrowseChip(platformLabel(platform), on) { ItchBrowseState.choose(ctx, query.copy(platforms = if (on) query.platforms - platform else query.platforms + platform)) } + BrowseDropdown(sortLabel(query.sort)) { first, close -> + ItchBrowse.sorts.forEachIndexed { index, sort -> + MenuItem(sortLabel(sort), query.sort == sort, focusRequester = if (index == 0) first else null) { + ItchBrowseState.choose(ctx, query.copy(sort = sort)) + close() + } + } + } + BrowseDropdown(priceLabel(query.price)) { first, close -> + ItchBrowse.prices.forEachIndexed { index, price -> + MenuItem(priceLabel(price), query.price == price, focusRequester = if (index == 0) first else null) { + ItchBrowseState.choose(ctx, query.copy(price = price)) + close() + } + } + } + val anyPlatform = stringResource(R.string.stores_itch_platform_any) + BrowseDropdown(browseSummary(ItchBrowse.platformNames.filter { it in query.platforms }.map { platformLabel(it) }, anyPlatform)) { first, _ -> + MenuItem(anyPlatform, query.platforms.isEmpty(), focusRequester = first) { ItchBrowseState.choose(ctx, query.copy(platforms = emptySet())) } + for (platform in ItchBrowse.platformNames) { + val on = platform in query.platforms + MenuItem(platformLabel(platform), on) { ItchBrowseState.choose(ctx, query.copy(platforms = if (on) query.platforms - platform else query.platforms + platform)) } + } } } ChipRow { @@ -83,7 +99,7 @@ internal fun ItchLoadMore() { } @Composable -private fun ChipRow(content: @Composable () -> Unit) { +internal fun ChipRow(content: @Composable () -> Unit) { Row( horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).selectableGroup(), @@ -91,7 +107,22 @@ private fun ChipRow(content: @Composable () -> Unit) { } @Composable -private fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) { +internal fun BrowseDropdown(text: String, content: @Composable ColumnScope.(FocusRequester, () -> Unit) -> Unit) { + var expanded by remember { mutableStateOf(false) } + Box { + CompositionLocalProvider(LocalChipMinWidth provides 0.dp) { ValueChip(text, expanded) { expanded = !expanded } } + AnchoredMenu(expanded, onDismiss = { expanded = false }, compact = true, minWidth = 160.dp) { first -> content(first) { expanded = false } } + } +} + +internal fun browseSummary(labels: List<String>, empty: String): String = when (labels.size) { + 0 -> empty + 1, 2 -> labels.joinToString(", ") + else -> "${labels.first()} +${labels.size - 1}" +} + +@Composable +internal fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val shape = RoundedCornerShape(8.dp) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index fe0866e8a7..6550a2fd06 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -102,7 +102,8 @@ import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.download.DownloadStage import com.droiddeck.launcher.stores.download.DownloadState import com.droiddeck.launcher.stores.formatBytes -import com.droiddeck.launcher.stores.itch.ItchCollection +import com.droiddeck.launcher.stores.gamejolt.GameJoltCollections +import com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates import com.droiddeck.launcher.stores.itch.ItchCollections import com.droiddeck.launcher.stores.itch.ItchUpdates import com.droiddeck.launcher.stores.gog.GogMaintenance @@ -112,7 +113,6 @@ import com.droiddeck.launcher.stores.sortGames import kotlinx.coroutines.launch import androidx.compose.runtime.setValue -/** One owned game: installed ones carry their [game], store products not installed yet only their [item]. */ internal class LibraryEntry( val key: String, val source: String, val title: String, val game: Library.SteamGame?, val item: CatalogItem?, val installed: Boolean, @@ -120,7 +120,6 @@ internal class LibraryEntry( val storeKey: String? get() = item?.key ?: game?.storeId?.let { "${game.source}:$it" } } -/** Installed games first claim their store product, so a game owned and installed shows once. */ internal fun libraryEntries( games: List<Library.SteamGame>, owned: Map<Store, List<CatalogItem>>, installedStore: Set<String>, ): List<LibraryEntry> { @@ -144,22 +143,21 @@ internal fun libraryEntries( return out.distinctBy { it.key } } -internal fun collectionEntries(all: List<LibraryEntry>, items: List<CatalogItem>): List<LibraryEntry> { +internal fun collectionEntries(all: List<LibraryEntry>, items: List<CatalogItem>, store: Store = Store.ITCH): List<LibraryEntry> { val keys = items.map { it.key }.toSet() - val itch = all.filter { it.source == Store.ITCH.id } - val have = itch.mapNotNull { it.storeKey }.toSet() - return itch.filter { it.storeKey in keys } + - items.filter { it.key !in have }.map { LibraryEntry(GameRef.key(it), Store.ITCH.id, it.title, null, it, false) } + val own = all.filter { it.source == store.id } + val have = own.mapNotNull { it.storeKey }.toSet() + return own.filter { it.storeKey in keys } + + items.filter { it.key !in have }.map { LibraryEntry(GameRef.key(it), store.id, it.title, null, it, false) } } internal fun installedFirst(entries: List<LibraryEntry>): List<LibraryEntry> = entries.partition { it.installed }.let { (on, off) -> on + off } internal const val LIBRARY_ALL = "all" -internal fun librarySources(entries: List<LibraryEntry>, order: List<String>): List<String> = +internal fun librarySources(entries: List<LibraryEntry>, order: List<String>, always: Set<String> = emptySet()): List<String> = (listOf(Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED) - .filter { source -> entries.any { it.source == source } } + .filter { source -> source in always || entries.any { it.source == source } } -/** Survives leaving the page, so Stores can open the Library on one store's owned games. */ internal object LibraryDisplay { val scales = listOf(0.75f, 0.875f, 1f, 1.2f, 1.45f) var level by mutableIntStateOf(2) @@ -228,7 +226,11 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, var showUninstalled by remember(LibraryView.ownedRequest) { mutableStateOf(SessionPrefs.libraryShowUninstalled(ctx)) } var collectionShows by remember { mutableStateOf<Pair<String, Boolean>?>(null) } val setShowUninstalled = { show: Boolean -> - val picked = ItchCollections.selected.takeIf { LibraryView.source == Store.ITCH.id } + val picked = when (LibraryView.source) { + Store.ITCH.id -> ItchCollections.selected + Store.GAMEJOLT.id -> GameJoltCollections.selected + else -> null + } if (picked != null) collectionShows = picked to show else { showUninstalled = show @@ -236,21 +238,32 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } } val itchSignedIn = owned.containsKey(Store.ITCH) - val listed = librarySources(all, SessionPrefs.storesTabOrder(ctx)) - val sources = if (itchSignedIn && Store.ITCH.id !in listed) listed + Store.ITCH.id else listed + val gameJoltSignedIn = owned.containsKey(Store.GAMEJOLT) + val sources = librarySources(all, SessionPrefs.storesTabOrder(ctx), listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn }).toSet()) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() val xboxFilter = if (source == Store.XBOX.id) XboxLibraryFilter.current else XboxLibraryFilter.ALL - LaunchedEffect(source, itchSignedIn) { if (source == Store.ITCH.id && itchSignedIn) { - ItchCollections.load(ctx) - ItchUpdates.check(ctx) - } } - val collection = if (source == Store.ITCH.id) ItchCollections.chosen() else null - val pool = if (collection == null) all else collectionEntries(all, ItchCollections.gamesOf(collection.id).orEmpty()) + LaunchedEffect(source, itchSignedIn, gameJoltSignedIn) { + if (source == Store.ITCH.id && itchSignedIn) { + ItchCollections.load(ctx) + ItchUpdates.check(ctx) + } + if (source == Store.GAMEJOLT.id && gameJoltSignedIn) { + GameJoltCollections.load(ctx) + GameJoltUpdates.check(ctx) + } + } + val collectionId = when (source) { + Store.ITCH.id -> ItchCollections.chosen()?.id + Store.GAMEJOLT.id -> GameJoltCollections.chosen()?.id + else -> null + } + val collectionItems = collectionId?.let { if (source == Store.GAMEJOLT.id) GameJoltCollections.gamesOf(it) else ItchCollections.gamesOf(it) } + val pool = if (collectionId == null) all else collectionEntries(all, collectionItems.orEmpty(), Store.byId(source) ?: Store.ITCH) val matching = pool.filter { (source == LIBRARY_ALL || it.source == source) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } - val listUninstalled = if (collection == null) showUninstalled else collectionShows?.takeIf { it.first == collection.id }?.second ?: true + val listUninstalled = if (collectionId == null) showUninstalled else collectionShows?.takeIf { it.first == collectionId }?.second ?: true val candidates = if (listUninstalled) matching else matching.filter { it.installed } val hiddenUninstalled = if (listUninstalled) 0 else matching.count { !it.installed } val sort = s.storesSort @@ -335,7 +348,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, kotlinx.coroutines.delay(Motion.ms(240).toLong()) focusWithinFrames({ ff.last?.startsWith("card:") == true }) { if (ff.firstTileAttached > 0) ff.firstTile else FocusRequester.Default } } - if (all.isEmpty() && open == null && !itchSignedIn) { + if (all.isEmpty() && open == null && !itchSignedIn && !gameJoltSignedIn) { LibraryEmpty(s, a, modifier) return } @@ -456,7 +469,7 @@ private fun LibraryGrid( contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), ) { item(key = "header", span = { GridItemSpan(maxLineSpan) }) { - Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = source == Store.ITCH.id) } + Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = Store.byId(source)?.takeIf { it == Store.ITCH || it == Store.GAMEJOLT }) } } item(key = "filters", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { LibraryFilters(sources, source, onSource) } @@ -517,7 +530,7 @@ private fun LazyGridScope.libraryGrid(entries: List<LibraryEntry>, empty: Int, t @Composable private fun LibraryHeader( s: FrontEndState, a: FrontEndActions, total: Int, searchCleared: Boolean, xbox: Boolean, - showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Boolean, + showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Store?, ) { val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current @@ -535,7 +548,7 @@ private fun LibraryHeader( ) { DisplayButton() if (showUninstalled != null || xbox) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) - if (collections) CollectionsButton() + if (collections != null) CollectionsButton(collections) SortButton(s, a) ViewButton(s, a) GameFileFolderActions(s, a) @@ -728,7 +741,7 @@ internal fun LibraryMarker(e: LibraryEntry, download: DownloadEntry?, showDownlo } } -private fun libraryUpdateAvailable(e: LibraryEntry): Boolean = e.storeKey?.let { it in ItchUpdates.available } == true || +private fun libraryUpdateAvailable(e: LibraryEntry): Boolean = e.storeKey?.let { it in ItchUpdates.available || it in GameJoltUpdates.available } == true || e.source == Store.GOG.id && (e.item?.id ?: e.game?.storeId)?.let { GogMaintenance.checks[it]?.state } == GogMaintenance.State.AVAILABLE @Composable @@ -797,7 +810,6 @@ internal fun HeaderIconButton(description: String, icon: androidx.compose.ui.gra ) { Icon(icon, null, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(18.dp)) } } -/** Choosing Library in the rail lands on the first game, as Play Steam does on the Steam page. */ @Composable internal fun Modifier.paneEntry(): Modifier { val ff = LocalFrontFocus.current ?: return this @@ -867,16 +879,21 @@ private fun LibraryFilterButton(showUninstalled: Boolean?, onShowUninstalled: (B } @Composable -private fun CollectionsButton() { +private fun CollectionsButton(store: Store) { val pal = LocalPalette.current val ctx = LocalContext.current val title = stringResource(R.string.itch_collections) val all = stringResource(R.string.stores_tab_all) var at by remember { mutableStateOf<Rect?>(null) } + val gameJolt = store == Store.GAMEJOLT + val chosenTitle = if (gameJolt) GameJoltCollections.chosen()?.title else ItchCollections.chosen()?.title + val selectedId = if (gameJolt) GameJoltCollections.selected else ItchCollections.selected Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { - HeaderIconButton(title + " · " + (ItchCollections.chosen()?.title ?: all), CollectionsIcon, "itch-collections") { + HeaderIconButton(title + " · " + (chosenTitle ?: all), CollectionsIcon, "${store.id}-collections") { val from = at ?: return@HeaderIconButton - val choices = listOf<ItchCollection?>(null) + ItchCollections.list + val choices = listOf<Pair<String, String>?>(null) + if (gameJolt) GameJoltCollections.list.map { c -> + c.id to (c.title + (GameJoltCollections.gamesOf(c.id)?.let { " (" + it.size + ")" }.orEmpty())) + } else ItchCollections.list.map { c -> c.id to (c.title + " (" + c.count + ")") } Steps.ask(StepAsk( anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = choices.size, handle = { Icon(CollectionsIcon, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, @@ -884,12 +901,12 @@ private fun CollectionsButton() { StepTitle(title) StepList { choices.forEachIndexed { i, c -> - val picked = c?.id == ItchCollections.selected + val picked = c?.first == selectedId StepChoice( - c?.let { it.title + " (" + it.count + ")" } ?: all, selected = picked, enabled = open, + c?.second ?: all, selected = picked, enabled = open, modifier = Modifier.fillMaxWidth().stepItem(i).then(if (picked) Modifier.focusRequester(first) else Modifier), ) { - ItchCollections.select(ctx, c?.id) + if (gameJolt) GameJoltCollections.select(ctx, c?.first) else ItchCollections.select(ctx, c?.first) Steps.fold() } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt index c428b8b97d..3b89f47d2e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt @@ -460,7 +460,7 @@ internal fun LiftHero( scrim { sink.value } if (shown || open) Box( Modifier.fillMaxSize() - .graphicsLayer { alpha = sink.value }.background(Color.Black.copy(alpha = 0.42f)) + .overhang().graphicsLayer { alpha = sink.value }.background(Color.Black.copy(alpha = 0.42f)) .focusProperties { canFocus = false } .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, enabled = open && !launching) { close() }, ) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt index 2ddbdbe287..a6501dacfd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt @@ -57,10 +57,8 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.io.File -/** Steam's library hero is 3840 x 1240, so the preview keeps that shape. */ private const val HERO_RATIO = 3840f / 1240f -/** The gap Steam leaves between the pinned logo and the edge of the hero, as a share of the hero's width. */ private const val EDGE = 0.03f @Composable @@ -86,10 +84,6 @@ private fun LogoPosition.Pin.alignment(): Alignment = when (this) { internal fun logoPositionSummary(value: LogoPosition.Value?): String = if (value == null) stringResource(R.string.logo_pos_default) else "${value.pin.label()} · ${value.widthPct}%" -/** - * Where a game's logo sits on its background in Steam's library: the logo box is [Value.widthPct] x [Value.heightPct] of the - * background, pinned to one of five places, and the logo is drawn as large as fits in it. - */ @Composable private fun LogoPreview(hero: File?, logo: File?, value: LogoPosition.Value) { val shape = RoundedCornerShape(10.dp) @@ -130,7 +124,6 @@ private fun PinChip(label: String, selected: Boolean, focus: FocusRequester?, on } } -/** The "Adjust logo" screen: the game's background with its logo on it, where to pin the logo and how large to draw it. */ @OptIn(ExperimentalLayoutApi::class) @Composable internal fun LogoPositionDialog( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index d81015d610..dfaf8b6f71 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -68,11 +68,15 @@ class ModeSettings( val pipSupported: Boolean = false, val pipAutoEnter: Boolean = false, val oscMode: String?, + val backHold: Boolean = true, val backActionsInverted: Boolean = false, val directAudio: Boolean?, val mic: Boolean?, val gameStorage: String? = null, val storageOptions: List<com.droiddeck.launcher.session.GameStorage.Option> = emptyList(), + val steamLibraries: List<com.droiddeck.launcher.session.SteamLibraries.Entry> = emptyList(), + val foundSteamLibraries: List<com.droiddeck.launcher.session.SteamLibraries.Found> = emptyList(), + val allFilesAccessMissing: Boolean = false, val storageDiagnostics: Boolean = false, val fexPreset: String? = null, val forceSsbs: Boolean = false, @@ -80,16 +84,14 @@ class ModeSettings( val picturePosition: String? = null, val stretch16x9: Boolean? = null, val steamClientArch: String? = null, - /** Steam only: a game launched from the front end returns there when it closes; null hides the row. */ val returnAfterGame: Boolean? = null, - /** Steam only: the client's Shader Pre-Caching setting; null hides the row. */ val shaderPrecache: Boolean? = null, val steamRepairQueued: Boolean = false, val mangoapp: Boolean = true, val steamController: String? = null, val unfoldedControls: Boolean? = null, val unfoldedControlsWithController: Boolean = false, - val runSteamAtStartup: Boolean = false, + val startupSession: String = SessionPrefs.STARTUP_OFF, val bootMovie: String? = null, val bootMovieSound: Boolean = true, val bootMovieCustomName: String? = null, @@ -118,12 +120,18 @@ class ModeSettingsActions( val onSteamDownloadsInBackground: (Boolean) -> Unit = {}, val onPipAutoEnter: (Boolean) -> Unit = {}, val onOsc: (String) -> Unit, + val onBackHold: (Boolean) -> Unit = {}, val onBackActionsInverted: (Boolean) -> Unit = {}, val onDirectAudio: (Boolean) -> Unit, val onMic: (Boolean) -> Unit, val onGameStorage: (path: String, label: String) -> Unit = { _, _ -> }, val onPickGameStorageFolder: () -> Unit = {}, val onStorageDiagnostics: (Boolean) -> Unit = {}, + val onAddSteamLibrary: () -> Unit = {}, + val onAddFoundSteamLibrary: (path: String) -> Unit = {}, + val onAllowAllFilesAccess: () -> Unit = {}, + val onRenameSteamLibrary: (id: String, label: String) -> Unit = { _, _ -> }, + val onRemoveSteamLibrary: (id: String) -> Unit = {}, val onFexPreset: (String) -> Unit = {}, val onForceSsbs: (Boolean) -> Unit = {}, val onSyncBackend: (String) -> Unit = {}, @@ -137,7 +145,7 @@ class ModeSettingsActions( val onSteamController: (String) -> Unit = {}, val onUnfoldedControls: (Boolean) -> Unit = {}, val onUnfoldedControlsWithController: (Boolean) -> Unit = {}, - val onRunSteamAtStartup: (Boolean) -> Unit = {}, + val onStartupSession: (String) -> Unit = {}, val onBootMovie: (String) -> Unit = {}, val onBootMovieSound: (Boolean) -> Unit = {}, val onImportBootMovie: () -> Unit = {}, @@ -154,15 +162,12 @@ class ModeSettingsActions( val onDismiss: () -> Unit, ) -/** "2610 r3" from droiddeck-fex-update's FEX_TAG line (fex-2610-r3), the build x86 programs fall back to. */ internal fun fexVersionOf(script: String): String? = Regex("""(?m)^FEX_TAG=(fex-\d+-r\d+)\s*$""").find(script)?.let { fexVersionOfTag(it.groupValues[1]) } -/** "2610 r5" from a tag such as fex-2610-r5. */ internal fun fexVersionOfTag(tag: String): String? = Regex("""fex-(\d+)-r(\d+)""").matchEntire(tag.trim())?.let { "${it.groupValues[1]} r${it.groupValues[2]}" } -/** The build installed in the runtime, else the one fex.json names, else the one the launcher pins. */ @Composable private fun x64FexVersion(context: android.content.Context): String? = remember { val root = com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context) @@ -223,7 +228,7 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: } if (s.stretch16x9 != null && (com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(s.panelSize) || com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize))) { - val canStretch = s.resolution != com.droiddeck.launcher.session.SessionDisplay.FOLLOW_SCREEN && + val canStretch = !com.droiddeck.launcher.session.SessionDisplay.isFollow(s.resolution) && com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize) ChoiceRow(host, "game-fit", stringResource(R.string.display_game_fit), stringResource(if (canStretch) R.string.display_game_fit_hint else R.string.display_game_fit_unavailable), @@ -296,6 +301,10 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: stringResource(R.string.unfolded_controls_with_controller_hint), s.unfoldedControlsWithController, onChange = a.onUnfoldedControlsWithController, ) + if (steam) ToggleRow( + host, "back-hold", stringResource(R.string.back_hold), + stringResource(R.string.back_hold_hint), s.backHold, onChange = a.onBackHold, + ) if (steam) ChoiceRow( host, "back-actions", stringResource(R.string.mode_back), stringResource(SessionPrefs.backActionsOrder(s.backActionsInverted)), listOf( @@ -303,7 +312,7 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU), ), s.backActionsInverted, onPick = a.onBackActionsInverted, ) - if (steam && s.steamController in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { + if (steam && s.backHold && s.steamController in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { Note(stringResource(R.string.back_native_qam_hint)) } PhysicalShortcutRows() @@ -350,11 +359,15 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: ToggleRow(host, "pip-auto", stringResource(R.string.pip_auto), null, s.pipAutoEnter, onChange = a.onPipAutoEnter) } - if (steam) SettingsGroup(stringResource(R.string.mode_startup)) { - ToggleRow( - host, "steam-startup", stringResource(R.string.mode_steam_startup), - stringResource(R.string.mode_steam_startup_hint), - s.runSteamAtStartup, onChange = a.onRunSteamAtStartup, + SettingsGroup(stringResource(R.string.mode_startup)) { + ChoiceRow( + host, "startup-session", stringResource(R.string.mode_startup_session), + stringResource(R.string.mode_startup_session_hint), + listOf( + SessionPrefs.STARTUP_OFF to stringResource(R.string.common_never), + SessionPrefs.STARTUP_STEAM to stringResource(R.string.rail_steam), + SessionPrefs.STARTUP_DESKTOP to stringResource(R.string.rail_desktop), + ), s.startupSession, onPick = a.onStartupSession, ) } extras.performance() @@ -401,6 +414,47 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: onChange = a.onStorageDiagnostics, ) } + if (s.gameStorage != null) SettingsGroup(stringResource(R.string.libraries_title), detail = stringResource(R.string.libraries_applies_next)) { + var renaming by remember { mutableStateOf<com.droiddeck.launcher.session.SteamLibraries.Entry?>(null) } + for (library in s.steamLibraries) { + val attached = library.host.isDirectory + SettingsRow(library.label, if (attached) library.path else stringResource(R.string.libraries_missing, library.path)) { + Row(horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(6.dp)) { + SecondaryButton(stringResource(R.string.libraries_rename), compact = true) { renaming = library } + SecondaryButton(stringResource(R.string.edit_remove), compact = true) { a.onRemoveSteamLibrary(library.id) } + } + } + } + if (s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) for (found in s.foundSteamLibraries) { + SettingsRow( + found.label, + stringResource(R.string.libraries_found_hint, pluralStringResource(R.plurals.mode_added_count, found.games, found.games), found.shown), + ) { + SecondaryButton(stringResource(R.string.libraries_add_found), compact = true) { a.onAddFoundSteamLibrary(found.path) } + } + } + if (s.allFilesAccessMissing && s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) { + SettingsRow(stringResource(R.string.libraries_access_title), stringResource(R.string.libraries_access_hint)) { + SecondaryButton(stringResource(R.string.libraries_access_allow), compact = true, onClick = a.onAllowAllFilesAccess) + } + } + SettingsRow( + stringResource(R.string.libraries_add), + if (s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) stringResource(R.string.libraries_hint) + else stringResource(R.string.libraries_full, com.droiddeck.launcher.session.SteamLibraries.MAX), + ) { + SecondaryButton( + stringResource(R.string.mode_choose_folder), + enabled = s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX, + onClick = a.onAddSteamLibrary, + ) + } + renaming?.let { library -> + TextEntryDialog(stringResource(R.string.libraries_rename_title), library.label, onDismiss = { renaming = null }) { name -> + a.onRenameSteamLibrary(library.id, name) + } + } + } } if (tab == SheetTab.STEAM && steam) { extras.account(host) @@ -665,3 +719,23 @@ internal fun CustomResolutionDialog(initial: Pair<Int, Int>?, onSave: (Pair<Int, dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } + +@Composable +internal fun CustomFollowScaleDialog(initial: Float?, onSave: (Float) -> Unit, onDismiss: () -> Unit) { + var text by remember { mutableStateOf(initial?.let(com.droiddeck.launcher.session.SessionDisplay::formatScale) ?: "") } + val parsed = com.droiddeck.launcher.session.SessionDisplay.parseFollowScale(text) + com.droiddeck.launcher.ui.GlideAlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.display_follow_screen_scaled, "…")) }, + text = { + androidx.compose.material3.OutlinedTextField( + text, { v -> text = v.filter { it.isDigit() || it == '.' || it == ',' }.take(4) }, + label = { Text("÷") }, singleLine = true, isError = parsed == null && text.isNotEmpty(), + keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(keyboardType = androidx.compose.ui.text.input.KeyboardType.Decimal), + modifier = Modifier.focusGlide(), + ) + }, + confirmButton = { androidx.compose.material3.TextButton(enabled = parsed != null, onClick = { parsed?.let(onSave) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_use)) } }, + dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, + ) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PageSwipe.kt b/app/src/main/java/com/droiddeck/launcher/ui/PageSwipe.kt index 94c7a8cf3c..3e4b57fb26 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PageSwipe.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PageSwipe.kt @@ -21,7 +21,6 @@ internal object PageSwipe { var direction by mutableIntStateOf(0) } -// Runs on the Final pass so carousels, sliders, scrollers and widgets that consumed the drag keep it. @Composable internal fun Modifier.pageSwipe(enabled: () -> Boolean, onSwipe: (Int) -> Unit): Modifier { val enabledNow by rememberUpdatedState(enabled) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt index 6c68c9cfc6..5c40727031 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.ui import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.PC_KEY_HIDDEN_GROUPS import com.droiddeck.launcher.input.PC_KEY_ROWS import com.droiddeck.launcher.input.PC_MODIFIERS import com.droiddeck.launcher.input.PcKey @@ -35,6 +36,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.key import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf @@ -45,12 +47,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.key.nativeKeyCode import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.input.key.type import androidx.compose.ui.input.key.KeyEventType import androidx.compose.ui.input.key.key import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -98,10 +102,17 @@ fun PcKeyboard( } LaunchedEffect(Unit) { runCatching { firstKey.requestFocus() } } + val prefsContext = LocalContext.current + remember { PcKeyboardPrefs.load(prefsContext) } + val hiddenCodes = PcKeyboardPrefs.hiddenKeys.flatMap { PC_KEY_HIDDEN_GROUPS[it].orEmpty() }.toSet() + val rows = PC_KEY_ROWS.map { row -> row.filter { it.code !in hiddenCodes } }.filter { it.isNotEmpty() } + BoxWithConstraints(Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) { - val rowHeight = ((maxHeight * 0.47f - 24.dp - 3.dp * 6 - 10.dp) / 6).coerceIn(24.dp, 44.dp) + val rowHeight = ((maxHeight * (PcKeyboardPrefs.size / 100f) - 24.dp - 3.dp * rows.size - 10.dp) / rows.size) + .coerceIn(20.dp, 56.dp) Box( Modifier.fillMaxWidth() + .graphicsLayer { alpha = PcKeyboardPrefs.opacity / 100f } .background(Color(0xE6101418), RoundedCornerShape(topStart = 14.dp, topEnd = 14.dp)) .border(1.dp, pal.line2, RoundedCornerShape(topStart = 14.dp, topEnd = 14.dp)) .pointerInput(Unit) { awaitEachGesture { awaitFirstDown().consume(); waitForUpOrCancellation()?.consume() } } @@ -115,7 +126,7 @@ fun PcKeyboard( Spacer(Modifier.width(8.dp)) HeaderButton(stringResource(R.string.pckb_hide), onClose) } - PC_KEY_ROWS.forEachIndexed { r, row -> + rows.forEachIndexed { r, row -> Row(horizontalArrangement = Arrangement.spacedBy(3.dp), modifier = Modifier.fillMaxWidth().height(rowHeight)) { row.forEachIndexed { i, key -> val state = mods[key.code] ?: MOD_OFF @@ -126,11 +137,13 @@ fun PcKeyboard( key.label.length == 1 && key.label[0].isLetter() && (shifted xor capsOn) -> key.label.uppercase() else -> key.label } - KeyCap( - label, key.weight, lit, locked = state == MOD_LOCKED, - modifier = if (r == 0 && i == 0) Modifier.focusRequester(firstKey) else Modifier, - onDown = { press(key) }, onUp = { release(key) }, - ) + key(key.code) { + KeyCap( + label, key.weight, lit, locked = state == MOD_LOCKED, + modifier = if (r == 0 && i == 0) Modifier.focusRequester(firstKey) else Modifier, + onDown = { press(key) }, onUp = { release(key) }, + ) + } } } } @@ -164,8 +177,11 @@ private fun RowScope.KeyCap( awaitEachGesture { awaitFirstDown().consume() down = true; onDown() - waitForUpOrCancellation()?.consume() - down = false; onUp() + try { + waitForUpOrCancellation()?.consume() + } finally { + down = false; onUp() + } } } .onPreviewKeyEvent { e -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboardPrefs.kt b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboardPrefs.kt new file mode 100644 index 0000000000..3b31e0b992 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboardPrefs.kt @@ -0,0 +1,38 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.input.PC_KEY_HIDDEN_GROUPS +import com.droiddeck.launcher.session.SessionPrefs + +internal object PcKeyboardPrefs { + var size by mutableStateOf(SessionPrefs.PC_KEYBOARD_SIZE_DEFAULT) + private set + var opacity by mutableStateOf(SessionPrefs.PC_KEYBOARD_OPACITY_DEFAULT) + private set + var hiddenKeys by mutableStateOf(emptySet<String>()) + private set + + fun load(context: Context) { + size = SessionPrefs.pcKeyboardSize(context) + opacity = SessionPrefs.pcKeyboardOpacity(context) + hiddenKeys = SessionPrefs.pcKeyboardHiddenKeys(context).filter { it in PC_KEY_HIDDEN_GROUPS }.toSet() + } + + fun setSize(context: Context, percent: Int) { + size = percent + SessionPrefs.setPcKeyboardSize(context, percent) + } + + fun setOpacity(context: Context, percent: Int) { + opacity = percent + SessionPrefs.setPcKeyboardOpacity(context, percent) + } + + fun toggleHiddenKey(context: Context, group: String, on: Boolean) { + hiddenKeys = if (on) hiddenKeys + group else hiddenKeys - group + SessionPrefs.setPcKeyboardHiddenKeys(context, hiddenKeys) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialog.kt index 3ad5cea7a5..7331d49fb0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PhysicalShortcutsDialog.kt @@ -179,7 +179,6 @@ private fun CaptureShortcutKeys(onKey: (KeyEvent) -> Boolean) { val window = (LocalView.current.parent as DialogWindowProvider).window DisposableEffect(window) { val previous = window.callback - // Capture before dialog navigation so Back and gamepad buttons can be assigned. window.callback = object : Window.Callback by previous { override fun dispatchKeyEvent(event: KeyEvent): Boolean = currentOnKey(event) || previous.dispatchKeyEvent(event) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt index 8db8910a80..7112d4f399 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt @@ -20,22 +20,34 @@ fun ResolutionRow( val size = SessionDisplay.resolveChoice(panel, choice, portrait) val screen = SessionDisplay.resolveChoice(panel, SessionDisplay.MATCH_SCREEN, portrait) val choices = SessionDisplay.resolutionOptions(panel) - val selected = if (choice == SessionDisplay.FOLLOW_SCREEN) choice + val customFollow = SessionDisplay.isFollow(choice) && choice !in choices + val selected = if (SessionDisplay.isFollow(choice)) choice else if (size == screen) SessionDisplay.MATCH_SCREEN else choice var editCustom by remember { mutableStateOf(false) } + var editFollow by remember { mutableStateOf(false) } val options = choices.map { value -> val dimensions = SessionDisplay.resolveChoice(panel, value, portrait) value to if (value == SessionDisplay.MATCH_SCREEN) stringResource(R.string.display_match_screen, screen.first, screen.second) else if (value == SessionDisplay.FOLLOW_SCREEN) stringResource(R.string.display_follow_screen) + else if (SessionDisplay.isFollow(value)) stringResource(R.string.display_follow_screen_scaled, + SessionDisplay.formatScale(SessionDisplay.followScale(value) ?: 1f)) + " (${dimensions.first}×${dimensions.second})" else if (value == SessionDisplay.DEFAULT_RESOLUTION) stringResource(R.string.mode_res_default, "${dimensions.first}×${dimensions.second}") else "${dimensions.first}×${dimensions.second}" - } + (custom to if (selected in choices) stringResource(R.string.mode_res_custom) + } + listOf(SessionDisplay.FOLLOW_CUSTOM to stringResource(R.string.display_follow_screen_scaled, + if (customFollow) SessionDisplay.formatScale(SessionDisplay.followScale(choice) ?: 1f) else "…" + ) + if (customFollow) " (${size.first}×${size.second})" else "") + (custom to if (selected in choices) stringResource(R.string.mode_res_custom) else stringResource(R.string.mode_res_custom_value, size.first, size.second)) ChoiceRow(host, "resolution", stringResource(R.string.display_resolution), stringResource(R.string.common_applies_next_session), - options, if (selected in choices) selected else custom, chipModifier = chipModifier, - onPick = { value -> if (value == custom) editCustom = true else onPick(value) }) + options, if (selected in choices) selected else if (customFollow) SessionDisplay.FOLLOW_CUSTOM else custom, chipModifier = chipModifier, + onPick = { value -> + if (value == custom) editCustom = true + else if (value == SessionDisplay.FOLLOW_CUSTOM) editFollow = true + else onPick(value) }) if (editCustom) CustomResolutionDialog(size, onSave = { value -> editCustom = false; onPick("${value.first}x${value.second}") }, onDismiss = { editCustom = false }) + if (editFollow) CustomFollowScaleDialog(SessionDisplay.followScale(choice)?.takeIf { it > 1f }, + onSave = { value -> editFollow = false; onPick(SessionDisplay.followScaled(value)) }, + onDismiss = { editFollow = false }) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index cc391f8c1e..a531752134 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -2,48 +2,31 @@ package com.droiddeck.launcher.ui import com.droiddeck.launcher.R import android.app.Presentation -import android.content.ClipboardManager -import android.content.Context -import android.graphics.Canvas import android.graphics.Color import android.os.Build import android.os.Bundle -import android.util.Log import android.view.Display -import android.view.Gravity import android.view.KeyEvent import android.view.MotionEvent import android.view.View import android.view.ViewGroup -import android.view.ViewConfiguration import android.view.WindowInsets import android.view.WindowManager -import android.view.inputmethod.InputMethodManager -import android.widget.Button import android.widget.FrameLayout -import android.widget.HorizontalScrollView import android.widget.LinearLayout -import android.widget.TextView import androidx.activity.setViewTreeOnBackPressedDispatcherOwner import androidx.lifecycle.setViewTreeLifecycleOwner import androidx.lifecycle.setViewTreeViewModelStoreOwner import androidx.savedstate.setViewTreeSavedStateRegistryOwner import com.droiddeck.launcher.input.KeyboardHost import com.droiddeck.launcher.input.PadBridge -import com.droiddeck.launcher.input.PointerGestures import com.droiddeck.launcher.input.SecondScreenMode -import com.droiddeck.launcher.input.TouchpadGestures import com.droiddeck.launcher.input.InputProfiles import com.droiddeck.launcher.input.InputSurfaceLayout import com.droiddeck.launcher.SessionActivity +import com.droiddeck.launcher.session.BottomDesktop import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState -import com.droiddeck.launcher.session.SessionTerminal -import com.termux.terminal.TerminalEmulator -import com.termux.terminal.TerminalSession -import com.termux.terminal.TerminalSessionClient -import com.termux.view.TerminalView -import com.termux.view.TerminalViewClient class SecondScreenPresentation( private val sessionActivity: SessionActivity, @@ -59,27 +42,27 @@ class SecondScreenPresentation( private val onKeyboardClosed: () -> Unit = {}, private val onMenu: (() -> Unit)? = null, private val menu: (@androidx.compose.runtime.Composable () -> Unit)? = null, + private val dashboard: (@androidx.compose.runtime.Composable () -> Unit)? = null, + private val onSwap: (() -> Unit)? = null, + private val onMenuTouched: () -> Unit = {}, ) : Presentation(sessionActivity, display) { private val frame = FrameLayout(context) private var menuView: androidx.compose.ui.platform.ComposeView? = null + private var dashboardView: androidx.compose.ui.platform.ComposeView? = null var menuShown = false private set private val root = LinearLayout(context).apply { orientation = LinearLayout.VERTICAL - setBackgroundColor(Color.rgb(15, 18, 22)) + setBackgroundColor(Color.BLACK) isFocusableInTouchMode = true } private var currentMode = SecondScreenMode.NONE private var keyboardHost: KeyboardHost? = null - private var keyboardButton: TextView? = null + private val keyboardShown = androidx.compose.runtime.mutableStateOf(false) private var keyboardPending = false private var imeSeen = false private var fieldKeyboard = false - private var terminalSession: TerminalSession? = null - private var terminalView: TerminalView? = null - private var terminalPid = -1 - private var ctrlActive = false - private var altActive = false + private var terminalPanel: SessionTerminalPanel? = null private var created = false init { @@ -115,10 +98,10 @@ class SecondScreenPresentation( private fun showPendingKeyboard() { keyboardPending = false - keyboardButton?.text = context.getString(R.string.second_hide_keyboard) + keyboardShown.value = true + val host = keyboardHost ?: return for (delay in longArrayOf(150L, 450L)) root.postDelayed({ - val host = keyboardHost - if (host != null && !imeSeen && showsKeyboard) host.show() + if (keyboardHost === host && keyboardShown.value && !imeSeen && showsKeyboard) host.show() }, delay) } @@ -134,7 +117,7 @@ class SecondScreenPresentation( fieldKeyboard = false imeSeen = false keyboardHost?.takeIf { it.shown }?.hide() - keyboardButton?.text = context.getString(R.string.second_show_keyboard) + keyboardShown.value = false onKeyboardClosed() } @@ -144,6 +127,10 @@ class SecondScreenPresentation( if (created) renderMode() } + fun retryTerminal() { + if (created && isShowing && currentMode == SecondScreenMode.TERMINAL && terminalPanel?.ready != true) renderMode() + } + val showsKeyboard: Boolean get() = isShowing && !menuShown && currentMode == SecondScreenMode.KEYBOARD_TRACKPAD val showsControls: Boolean get() = isShowing && currentMode != SecondScreenMode.NONE @@ -154,12 +141,8 @@ class SecondScreenPresentation( menuShown = on if (on) { keyboardHost?.takeIf { it.shown }?.hide() - window?.decorView?.let { decor -> - decor.setViewTreeLifecycleOwner(sessionActivity) - decor.setViewTreeViewModelStoreOwner(sessionActivity) - decor.setViewTreeSavedStateRegistryOwner(sessionActivity) - decor.setViewTreeOnBackPressedDispatcherOwner(sessionActivity) - } + keyboardShown.value = false + ownComposeViews() val view = menuView ?: androidx.compose.ui.platform.ComposeView(context).apply { isFocusable = true isFocusableInTouchMode = true @@ -178,12 +161,25 @@ class SecondScreenPresentation( } } + private fun ownComposeViews() { + window?.decorView?.let { decor -> + decor.setViewTreeLifecycleOwner(sessionActivity) + decor.setViewTreeViewModelStoreOwner(sessionActivity) + decor.setViewTreeSavedStateRegistryOwner(sessionActivity) + decor.setViewTreeOnBackPressedDispatcherOwner(sessionActivity) + } + } + fun focusMenu(): Boolean = menuView?.requestFocus() == true - fun dispatchMenuKey(event: KeyEvent): Boolean = menuView?.dispatchKeyEvent(event) == true + fun dispatchMenuKey(event: KeyEvent): Boolean { + KeyWindows.topOn(display.displayId)?.let { return it.rootView.dispatchKeyEvent(event) } + return menuView?.dispatchKeyEvent(event) == true + } fun closeControls() { showMenu(false) + closeDashboard() closeTerminal() keyboardHost?.hide() keyboardHost = null @@ -191,11 +187,19 @@ class SecondScreenPresentation( } override fun dispatchKeyEvent(event: KeyEvent): Boolean { - val forward = menuShown || currentMode != SecondScreenMode.TERMINAL || PadBridge.isControllerKeyEvent(event) + val ownKeys = currentMode == SecondScreenMode.TERMINAL || currentMode == SecondScreenMode.DASHBOARD || + currentMode == SecondScreenMode.DESKTOP + val back = event.keyCode == KeyEvent.KEYCODE_BACK && currentMode == SecondScreenMode.DASHBOARD + val forward = menuShown || !ownKeys || back || PadBridge.isControllerKeyEvent(event) if (forward && sessionActivity.dispatchKeyEvent(event)) return true return super.dispatchKeyEvent(event) } + override fun dispatchTouchEvent(event: MotionEvent): Boolean { + if (menuShown && event.actionMasked == MotionEvent.ACTION_DOWN) onMenuTouched() + return super.dispatchTouchEvent(event) + } + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { if (PadBridge.isControllerMotionEvent(event) && sessionActivity.dispatchGenericMotionEvent(event)) return true return super.dispatchGenericMotionEvent(event) @@ -222,193 +226,99 @@ class SecondScreenPresentation( fieldKeyboard = false keyboardHost?.hide() keyboardHost = null - keyboardButton = null + keyboardShown.value = false keyboardPending = false + imeSeen = false closeTerminal() + closeDashboard() root.removeAllViews() - val mode = if (currentMode == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad) SecondScreenMode.NONE - else currentMode + ownComposeViews() + val mode = when { + currentMode == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad -> SecondScreenMode.NONE + currentMode == SecondScreenMode.DASHBOARD && dashboard == null -> SecondScreenMode.NONE + currentMode == SecondScreenMode.DESKTOP && !BottomDesktop.available() -> SecondScreenMode.NONE + else -> currentMode + } if (mode == SecondScreenMode.NONE) return when (mode) { SecondScreenMode.KEYBOARD_TRACKPAD -> renderKeyboardAndTrackpad() SecondScreenMode.TERMINAL -> renderTerminal() - SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad, onMenu = onMenu), weightParams()) SecondScreenMode.CUSTOM_CONTROLS -> { val profile = InputProfiles.active(context, SessionState.mode == SessionService.MODE_DESKTOP) root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad, - InputSurfaceLayout.read(context, profile.id), onMenu = onMenu), weightParams()) + InputSurfaceLayout.read(context, profile.id), onMenu = onMenu, onSwap = onSwap), weightParams()) keyboardHost = KeyboardHost(context) { sessionActivity.dispatchKeyEvent(it) }.also { root.addView(it, ViewGroup.LayoutParams(1, 1)) } } + SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad, onMenu = onMenu, onSwap = onSwap), weightParams()) + SecondScreenMode.DASHBOARD -> renderDashboard() + SecondScreenMode.DESKTOP -> { + root.addView(BottomDesktopPanel(context, onClose, onMenu, + (onSteamMenu to onQam).takeIf { SessionState.mode == SessionService.MODE_STEAM }, onSwap), weightParams()) + } SecondScreenMode.NONE -> Unit } } + private fun bar(mode: SecondScreenMode, extras: () -> List<BarExtra> = { emptyList() }) { + root.addView(bottomScreenBarView(context) { + sessionBarModel(context.getString(mode.label), onClose, onMenu, onSteamMenu, onQam, extras()) + }, LinearLayout.LayoutParams(-1, -2)) + } + + private fun renderDashboard() { + val content = dashboard ?: return + bar(SecondScreenMode.DASHBOARD) { + listOfNotNull(onSwap?.let { BarExtra(context.getString(R.string.swap_screens), icon = R.drawable.ic_bottom_swap, tag = "bottom-swap", onClick = it) }) + } + val view = androidx.compose.ui.platform.ComposeView(context).apply { setContent { content() } } + dashboardView = view + root.addView(view, weightParams()) + } + + private fun closeDashboard() { + dashboardView?.disposeComposition() + dashboardView = null + } + private fun renderKeyboardAndTrackpad() { - val panel = FrameLayout(context) - panel.addView(trackpadView(), FrameLayout.LayoutParams(-1, -1)) - val controls = LinearLayout(context).apply { - gravity = Gravity.CENTER_VERTICAL - orientation = LinearLayout.HORIZONTAL - setPadding(dp(12), dp(10), dp(12), dp(6)) - setBackgroundColor(Color.BLACK) - } - fun gap() = View(context).apply { layoutParams = LinearLayout.LayoutParams(dp(8), 1) } - controls.addView(DeckControlsPanel.roundButton(context, "×", context.getString(R.string.deck_close), onClose)) - controls.addView(TextView(context).apply { - text = context.getString(R.string.second_trackpad) - textSize = 14f - typeface = android.graphics.Typeface.create(android.graphics.Typeface.DEFAULT, android.graphics.Typeface.BOLD) - setTextColor(Color.rgb(0x7A, 0x80, 0x8A)) - setPadding(dp(14), 0, dp(8), 0) - isSingleLine = true - }, LinearLayout.LayoutParams(0, -2, 1f)) - lateinit var keyboardButton: TextView - keyboardButton = DeckControlsPanel.roundButton(context, context.getString(R.string.second_show_keyboard), - context.getString(R.string.second_show_keyboard), { - val host = keyboardHost - if (host != null) { + bar(SecondScreenMode.KEYBOARD_TRACKPAD) { + listOf(BarExtra(context.getString(if (keyboardShown.value) R.string.second_hide_keyboard else R.string.second_show_keyboard), + icon = R.drawable.ic_bottom_keyboard, active = keyboardShown.value, tag = "bottom-keyboard") { + keyboardHost?.let { host -> host.toggle() - keyboardButton.text = context.getString(if (host.shown) R.string.second_hide_keyboard else R.string.second_show_keyboard) + keyboardShown.value = host.shown } - }, wide = true) - controls.addView(keyboardButton) - this.keyboardButton = keyboardButton - onMenu?.let { - controls.addView(gap()) - controls.addView(DeckControlsPanel.menuButton(context, it)) + }) } - if (SessionState.mode == SessionService.MODE_STEAM) { - controls.addView(gap()) - controls.addView(DeckControlsPanel.roundButton(context, "STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu, wide = true)) - controls.addView(gap()) - controls.addView(DeckControlsPanel.roundButton(context, "•••", context.getString(R.string.drawer_open_qam), onQam, wide = true)) - } - panel.addView(controls, FrameLayout.LayoutParams(-1, -2, Gravity.TOP)) - root.addView(panel, weightParams()) + root.addView(trackpadView(), weightParams()) val host = KeyboardHost(context) { event -> val handled = sessionActivity.dispatchKeyEvent(event) if (fieldKeyboard && event.action == KeyEvent.ACTION_UP && (event.keyCode == KeyEvent.KEYCODE_ENTER || event.keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER)) root.post { closeFieldKeyboard() } handled } + host.onImeChanged = { visible -> if (!visible && keyboardShown.value) keyboardClosed() } keyboardHost = host root.addView(host, ViewGroup.LayoutParams(1, 1)) } - private fun trackpadView(): View = TrackpadView(context) + private fun trackpadView(): View = SessionTrackpadView(context, sendPointer, sendButton, sendWheel, pointerPosition) private fun renderTerminal() { - val bar = LinearLayout(context).apply { - orientation = LinearLayout.HORIZONTAL - gravity = Gravity.CENTER_VERTICAL - setPadding(dp(8), dp(4), dp(8), dp(4)) - setBackgroundColor(Color.rgb(27, 32, 38)) - } - bar.addView(Button(context).apply { - text = "×" - contentDescription = context.getString(R.string.deck_close) - minWidth = dp(48) - setOnClickListener { onClose() } - }) - bar.addView(TextView(context).apply { - text = context.getString(R.string.second_terminal) - textSize = 14f - setTextColor(Color.WHITE) - }, LinearLayout.LayoutParams(0, -2, 1f)) - bar.addView(Button(context).apply { - text = context.getString(R.string.drawer_keyboard) - setOnClickListener { showTerminalKeyboard() } - }) - root.addView(bar, LinearLayout.LayoutParams(-1, -2)) - - val terminalClient = TerminalClient() - val view = TerminalView(context, null).apply { - setTerminalViewClient(terminalClient) - setTextSize(dp(14)) - isFocusable = true - isFocusableInTouchMode = true - } - terminalView = view - val session = SessionTerminal.create(terminalClient) - if (session == null) { - root.addView(TextView(context).apply { - text = context.getString(R.string.second_terminal_not_ready) - setTextColor(Color.WHITE) - gravity = Gravity.CENTER - }, LinearLayout.LayoutParams(-1, 0, 1f)) - return - } - terminalSession = session - - val keyStrip = HorizontalScrollView(context).apply { isHorizontalScrollBarEnabled = false } - val keys = LinearLayout(context).apply { orientation = LinearLayout.HORIZONTAL; setPadding(dp(4), dp(2), dp(4), dp(2)) } - fun key(label: String, input: String, onClick: ((Button) -> Unit)? = null) { - val button = Button(context).apply { - text = label - setOnClickListener { if (onClick != null) onClick(this) else session.write(input) } - } - keys.addView(button) - } - val ctrl = context.getString(R.string.pckb_key_ctrl) - val alt = context.getString(R.string.pckb_key_alt) - key(context.getString(R.string.pckb_key_esc), "\u001b") - key(context.getString(R.string.second_key_tab), "\t") - key(ctrl, "") { button -> - ctrlActive = !ctrlActive - button.text = if (ctrlActive) context.getString(R.string.second_key_on, ctrl) else ctrl - } - key(alt, "") { button -> - altActive = !altActive - button.text = if (altActive) context.getString(R.string.second_key_on, alt) else alt - } - key("↑", "\u001b[A") - key("↓", "\u001b[B") - key("←", "\u001b[D") - key("→", "\u001b[C") - key(context.getString(R.string.second_key_ctrl_c), "\u0003") - key(context.getString(R.string.second_key_ctrl_d), "\u0004") - keyStrip.addView(keys) - root.addView(keyStrip, LinearLayout.LayoutParams(-1, -2)) - - root.addView(view, LinearLayout.LayoutParams(-1, 0, 1f)) - view.attachSession(session) - - view.post { - registerTerminalPid() - view.requestFocus() - showTerminalKeyboard() - } - } - - private fun showTerminalKeyboard() { - terminalView?.let { view -> - view.requestFocus() - (context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager) - .showSoftInput(view, InputMethodManager.SHOW_IMPLICIT) - } - } - - private fun registerTerminalPid() { - val pid = terminalSession?.pid ?: -1 - if (pid > 1 && pid != terminalPid) { - terminalPid = pid - SessionService.registerTerminalProcess(context, pid) + bar(SecondScreenMode.TERMINAL) { + listOf(BarExtra(context.getString(R.string.drawer_keyboard), icon = R.drawable.ic_bottom_keyboard, tag = "bottom-keyboard") { + terminalPanel?.showKeyboard() + }) } + val panel = SessionTerminalPanel(context) + terminalPanel = panel + root.addView(panel, weightParams()) } private fun closeTerminal() { - terminalView?.let { view -> - (context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager) - .hideSoftInputFromWindow(view.windowToken, 0) - } - val pid = terminalPid.takeIf { it > 1 } ?: (terminalSession?.pid ?: -1) - if (pid > 1) SessionService.stopTerminalProcess(context, pid) - terminalPid = -1 - terminalSession = null - terminalView = null - ctrlActive = false - altActive = false + terminalPanel?.close() + terminalPanel = null } private fun dp(value: Int): Int = (value * resources.displayMetrics.density + 0.5f).toInt() @@ -424,112 +334,4 @@ class SecondScreenPresentation( or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) } - - private inner class TrackpadView(context: Context) : View(context) { - private val gestures = TouchpadGestures(ViewConfiguration.get(context).scaledTouchSlop.toFloat(), - object : PointerGestures.Listener { - override fun onMove(x: Float, y: Float) { - sendPointer(x, y, width.toFloat(), height.toFloat()) - invalidate() - } - - override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { - sendPointer(x, y, width.toFloat(), height.toFloat()) - sendButton(button, pressed) - } - - override fun onWheel(steps: Int) = sendWheel(steps) - override fun onLongPress() { performHapticFeedback(android.view.HapticFeedbackConstants.LONG_PRESS) } - }) - - init { isFocusable = true } - - override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { - gestures.bounds = android.graphics.RectF(0f, 0f, w.toFloat(), h.toFloat()) - if (oldw == 0 || oldh == 0) gestures.place(w / 2f, h / 2f) - } - - private val surface = android.graphics.RectF() - private val fill = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply { color = Color.rgb(0x0A, 0x0B, 0x0D) } - private val edge = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply { - style = android.graphics.Paint.Style.STROKE - color = Color.rgb(0x26, 0x29, 0x2E) - strokeWidth = resources.displayMetrics.density - } - - override fun onDraw(canvas: Canvas) { - canvas.drawColor(Color.BLACK) - val inset = dp(12).toFloat() - surface.set(inset, dp(72).toFloat(), width - inset, height - inset) - if (surface.height() <= inset) return - val radius = dp(20).toFloat() - canvas.drawRoundRect(surface, radius, radius, fill) - canvas.drawRoundRect(surface, radius, radius, edge) - } - - override fun onTouchEvent(event: MotionEvent): Boolean { - if (event.actionMasked == MotionEvent.ACTION_DOWN) pointerPosition()?.let { - gestures.place(it.x * width, it.y * height) - } - return gestures.onTouch(event) - } - } - - private inner class TerminalClient : TerminalSessionClient, TerminalViewClient { - override fun onTextChanged(changedSession: TerminalSession) { - terminalView?.onScreenUpdated() - } - override fun onTitleChanged(changedSession: TerminalSession) = Unit - override fun onSessionFinished(finishedSession: TerminalSession) { - val pid = terminalPid.takeIf { it > 1 } ?: finishedSession.pid - if (pid > 1) SessionService.terminalProcessExited(context, pid) - terminalPid = -1 - terminalView?.onScreenUpdated() - } - override fun onCopyTextToClipboard(session: TerminalSession, text: String) { - (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager) - .setPrimaryClip(android.content.ClipData.newPlainText("Terminal", text)) - } - override fun onPasteTextFromClipboard(session: TerminalSession) { - val clip = (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).primaryClip - if (clip != null && clip.itemCount > 0) session.write(clip.getItemAt(0).coerceToText(context).toString()) - } - override fun onBell(session: TerminalSession) { - terminalView?.performHapticFeedback(android.view.HapticFeedbackConstants.KEYBOARD_TAP) - } - override fun onColorsChanged(changedSession: TerminalSession) { - terminalView?.invalidate() - } - override fun onTerminalCursorStateChange(state: Boolean) { - terminalView?.setTerminalCursorBlinkerRate(if (state) 600 else 0) - } - override fun getTerminalCursorStyle(): Int = TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK - override fun logError(tag: String, message: String) { Log.e(tag, message) } - override fun logWarn(tag: String, message: String) { Log.w(tag, message) } - override fun logInfo(tag: String, message: String) { Log.i(tag, message) } - override fun logDebug(tag: String, message: String) { Log.d(tag, message) } - override fun logVerbose(tag: String, message: String) { Log.v(tag, message) } - override fun logStackTraceWithMessage(tag: String, message: String, e: Exception) { Log.e(tag, message, e) } - override fun logStackTrace(tag: String, e: Exception) { Log.e(tag, e.message, e) } - - override fun onScale(scale: Float): Float = 1f - override fun onSingleTapUp(e: MotionEvent) = showTerminalKeyboard() - override fun shouldBackButtonBeMappedToEscape(): Boolean = true - override fun shouldEnforceCharBasedInput(): Boolean = false - override fun shouldUseCtrlSpaceWorkaround(): Boolean = false - override fun isTerminalViewSelected(): Boolean = true - override fun copyModeChanged(copyMode: Boolean) = Unit - override fun onKeyDown(keyCode: Int, e: KeyEvent, session: TerminalSession): Boolean = false - override fun onKeyUp(keyCode: Int, e: KeyEvent): Boolean = false - override fun onLongPress(event: MotionEvent): Boolean = false - override fun readControlKey(): Boolean = ctrlActive - override fun readAltKey(): Boolean = altActive - override fun readShiftKey(): Boolean = false - override fun readFnKey(): Boolean = false - override fun onCodePoint(codePoint: Int, ctrlDown: Boolean, session: TerminalSession): Boolean = false - override fun onEmulatorSet() { - terminalView?.onScreenUpdated() - registerTerminalPid() - } - } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt index e7db9c561a..ec13f79997 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -3,7 +3,7 @@ package com.droiddeck.launcher.ui internal enum class SessionDrawerPage(val firstControl: String) { CONTROLLER("touch"), GLASSES("glasses-game"), - SECOND_SCREEN("second-screen:none"), + SECOND_SCREEN("second-screen:keyboard-trackpad"), DISPLAY("fg"), HUD("hud"), EFFECTS("look"), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 6e413b099f..3dad9fe1fa 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -29,8 +29,11 @@ import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.foundation.layout.offset import androidx.compose.material.icons.Icons import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.widthIn import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Terminal +import androidx.compose.material.icons.outlined.Dashboard +import androidx.compose.material.icons.outlined.DesktopWindows import androidx.compose.material.icons.outlined.Keyboard import androidx.compose.material.icons.outlined.AutoFixHigh import androidx.compose.material.icons.outlined.ExpandMore @@ -151,6 +154,7 @@ import com.droiddeck.launcher.gpu.SteamVr import com.droiddeck.launcher.gpu.ScreenEffects import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.ComponentsManager +import com.droiddeck.launcher.input.PC_KEY_GROUP_IDS import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenMode import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_CLICK @@ -220,6 +224,8 @@ class DrawerActions( val micAvailable: Boolean = false, val micEnabled: Boolean = false, val onMicEnabled: (Boolean) -> Unit = {}, + val backHold: Boolean = true, + val onBackHold: (Boolean) -> Unit = {}, val backActionsInverted: Boolean, val backDoubleTapMs: Int = 500, val onBackDoubleTapMs: (Int) -> Unit = {}, @@ -240,6 +246,12 @@ class DrawerActions( val textureAnisotropy: Int? = 0, val textureLodBias: String? = TextureFiltering.LOD_BIAS_OFF, val secondScreenMode: SecondScreenMode, + val secondScreenNone: Boolean = true, + val gameOnBottom: Boolean = false, + val gameSwapAvailable: Boolean = false, + val onGameOnBottom: (Boolean) -> Unit = {}, + val dashboardAvailable: Boolean = false, + val desktopAvailable: Boolean = false, val secondScreenDisplays: List<SecondScreenDisplay>, val selectedSecondScreenDisplay: Int, val onHud: (Boolean) -> Unit, @@ -270,6 +282,8 @@ class DrawerActions( val onLowLatency: (Boolean) -> Unit = {}, val evdevMouse: Boolean = false, val onEvdevMouse: (Boolean) -> Unit = {}, + val relativeMouseMode: Int = 0, + val onRelativeMouseMode: (Int) -> Unit = {}, val directCursor: Boolean = false, val onDirectCursor: (Boolean) -> Unit = {}, val onTouch: (String) -> Unit, @@ -309,6 +323,7 @@ class DrawerActions( val onStop: () -> Unit, val onStopFrom: ((androidx.compose.ui.geometry.Rect?) -> Unit)? = null, val onClose: () -> Unit, + val onDismissScreen: (() -> Unit)? = null, val components: ComponentsManager.Snapshot? = null, val onComponentsRefresh: () -> Unit = {}, val componentCatalog: List<ComponentsManager.CatalogItem> = emptyList(), @@ -412,7 +427,8 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont val first = when { page == SessionDrawerPage.GLASSES -> "glasses-tab-$glassesTab" page == SessionDrawerPage.SESSION && a.isHomeApp -> "apps" - page == SessionDrawerPage.SECOND_SCREEN -> "second-screen:${a.secondScreenMode.id}" + page == SessionDrawerPage.SECOND_SCREEN -> "second-screen:" + + (if (a.secondScreenMode == SecondScreenMode.NONE && !a.secondScreenNone) SecondScreenMode.KEYBOARD_TRACKPAD else a.secondScreenMode).id else -> page.firstControl } if (turned) focus.forget(page) @@ -442,7 +458,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } androidx.compose.foundation.layout.BoxWithConstraints(modifier = Modifier.fillMaxSize().exposeTestTags(), contentAlignment = Alignment.CenterEnd) { val short = maxHeight < 440.dp - val sheetWidth = if (docked) maxWidth else minOf(360.dp, maxWidth * 0.92f) + val sheetWidth = if (docked) maxWidth else minOf(420.dp, maxWidth * 0.92f) val narrow = sheetWidth < 320.dp AnimatedVisibility( open, @@ -461,52 +477,52 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } .padding(12.dp), ) { + val roomyHeader = sheetWidth >= 408.dp Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier.fillMaxWidth().heightIn(min = 44.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth().heightIn(min = 44.dp) + .then(if (roomyHeader) Modifier else Modifier.horizontalScroll(rememberScrollState())), ) { - if (docked) { - SteamActionPill( - stringResource(R.string.common_close), Icons.Outlined.Close, focus.track(page, "close"), - ) { host.open = null; a.onClose() } - Spacer(Modifier.width(4.dp)) - BottomScreenModes(a, focus.track(page, "bottom-modes")) { host.open = null } - } - Spacer(Modifier.weight(1f)) + SteamActionPill( + stringResource(R.string.common_close), Icons.Outlined.Close, focus.track(page, "close"), + ) { host.open = null; (a.onDismissScreen ?: a.onClose)() } + if (roomyHeader) Spacer(Modifier.weight(1f)) SteamActionPill( stringResource(R.string.stores_dl_pause), Icons.Outlined.Pause, focus.track(page, "pause"), ) { host.open = null; a.onPause() } if (a.pipSupported) SteamActionPill( stringResource(R.string.pip_title), Icons.Outlined.PictureInPictureAlt, focus.track(page, "pip"), ) { host.open = null; a.onPip() } - if (a.steam && a.onSteamMenu != null && a.onQam != null) { - val qamInteraction = remember { MutableInteractionSource() } - var qamStartedOnPress by remember { mutableStateOf(false) } - LaunchedEffect(qamInteraction) { - qamInteraction.interactions.collect { interaction -> - if (interaction is PressInteraction.Press) { - qamStartedOnPress = true - host.open = null - a.onQam.invoke() - } + StopSessionButton(modifier = focus.track(page, "stop").onGloballyPositioned { stopCoords = it }) { host.open = null; confirmStop = true } + val steamActions = a.steam && a.onSteamMenu != null && a.onQam != null + val qamInteraction = remember { MutableInteractionSource() } + var qamStartedOnPress by remember { mutableStateOf(false) } + if (steamActions) LaunchedEffect(qamInteraction) { + qamInteraction.interactions.collect { interaction -> + if (interaction is PressInteraction.Press) { + qamStartedOnPress = true + host.open = null + a.onQam?.invoke() + } else if (interaction is PressInteraction.Cancel) { + qamStartedOnPress = false } } - SteamActionPill(stringResource(R.string.drawer_steam_menu), Icons.Outlined.Home, focus.track(page, "steam"), shortcut = "⧉") { - host.open = null - a.onSteamMenu.invoke() - } - SteamActionPill( - stringResource(R.string.drawer_open_qam), Icons.Outlined.MoreHoriz, focus.track(page, "qam"), - interactionSource = qamInteraction, shortcut = "☰", - onConfirm = { host.open = null; a.onQam.invoke() }, - ) { - host.open = null - if (!qamStartedOnPress) a.onQam.invoke() - qamStartedOnPress = false - } } - StopSessionButton(modifier = focus.track(page, "stop").onGloballyPositioned { stopCoords = it }) { host.open = null; confirmStop = true } + BarActions( + onMenu = { host.open = null; a.onClose() }, menuActive = true, + onSteam = if (steamActions) ({ host.open = null; a.onSteamMenu?.invoke() }) else null, + onQam = if (steamActions) ({ + host.open = null + if (!qamStartedOnPress) a.onQam?.invoke() + qamStartedOnPress = false + }) else null, + menuModifier = focus.track(page, "menu"), + steamModifier = focus.track(page, "steam"), + qamModifier = focus.track(page, "qam"), + qamInteraction = qamInteraction, + onQamConfirm = { host.open = null; a.onQam?.invoke() }, + ) } a.onAchievements?.let { show -> DrawerAchievementsRow(a.achievementsProgress, Modifier.padding(top = if (short) 6.dp else 10.dp).then(focus.track(page, "achievements"))) { @@ -534,7 +550,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(pageScroll.getValue(page)), ) { CompositionLocalProvider(LocalChipMinWidth provides 96.dp, LocalCompactSettings provides true) { when (page) { - SessionDrawerPage.HUD -> FusionHudSettings(host, a) { key -> focus.track(page, key) } + SessionDrawerPage.HUD -> DroidDeckHudSettings(host, a) { key -> focus.track(page, key) } SessionDrawerPage.DISPLAY -> { SettingsGroup(stringResource(R.string.drawer_page_display)) { val fgOpen = host.open == "fg" @@ -588,6 +604,8 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont a.touchMode, chipModifier = focus.track(page, "touch"), onPick = a.onTouch) ActionRow(stringResource(R.string.input_settings), null, stringResource(R.string.ctrl_edit), a.onInputSettings, modifier = focus.track(page, "input-settings")) + if (a.touchActive == SessionPrefs.TOUCH_PAD) + RelativeMouseRow(host, a, focus.track(page, "relative-mouse")) if (a.touchActive == SessionPrefs.TOUCH_DIRECT) ToggleRow(host, "direct-cursor", stringResource(R.string.drawer_direct_cursor), null, a.directCursor, @@ -609,7 +627,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), ) { - SecondaryButton(stringResource(R.string.ctrl_edit), + SecondaryButton(stringResource(R.string.ctrl_edit), enabled = a.screenKeysShown, modifier = focus.track(page, "screen-keys"), onClick = a.onScreenKeys) a.onScreenLayouts?.let { open -> SecondaryButton(stringResource(R.string.screen_key_layout), @@ -642,6 +660,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont chipModifier = focus.track(page, "keyboard-button"), onChange = a.onKeyboardButton) } } + if (a.steam) ToggleRow(host, "back-hold", stringResource(R.string.back_hold), + stringResource(R.string.back_hold_hint), a.backHold, + chipModifier = focus.track(page, "back-hold"), onChange = a.onBackHold) if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.mode_back), null, listOf(false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU)), a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) @@ -665,6 +686,8 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ToggleRow(host, "evdev-mouse", stringResource(R.string.drawer_evdev_mouse), null, a.evdevMouse, chipModifier = focus.track(page, "evdev-mouse"), onChange = a.onEvdevMouse) + if (a.touchActive != SessionPrefs.TOUCH_PAD) + RelativeMouseRow(host, a, focus.track(page, "relative-mouse")) } SettingsGroup(stringResource(R.string.drawer_keyboard)) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(8.dp)) { @@ -675,6 +698,28 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont host.open = null; a.onKeyboard() } } + val keyboardContext = LocalContext.current + remember { PcKeyboardPrefs.load(keyboardContext) } + SliderRow( + stringResource(R.string.pckb_size), stringResource(R.string.pckb_size_hint), + PcKeyboardPrefs.size, SessionPrefs.PC_KEYBOARD_SIZE_RANGE, step = 1, + format = { "$it%" }, modifier = focus.track(page, "pckb-size"), + onChange = { PcKeyboardPrefs.setSize(keyboardContext, it) }) + SliderRow( + stringResource(R.string.pckb_opacity), stringResource(R.string.pckb_opacity_hint), + PcKeyboardPrefs.opacity, SessionPrefs.PC_KEYBOARD_OPACITY_RANGE, step = 5, + format = { "$it%" }, modifier = focus.track(page, "pckb-opacity"), + onChange = { PcKeyboardPrefs.setOpacity(keyboardContext, it) }) + MultiRow( + host, "pckb-hidden", stringResource(R.string.pckb_hidden_keys), + stringResource(R.string.pckb_hidden_keys_hint), + listOf( + 0 to stringResource(R.string.pckb_group_function), + 1 to stringResource(R.string.pckb_group_nav), + 2 to stringResource(R.string.pckb_group_arrows), + ), + PC_KEY_GROUP_IDS.filterValues { it in PcKeyboardPrefs.hiddenKeys }.keys, + onToggle = { id, on -> PcKeyboardPrefs.toggleHiddenKey(keyboardContext, PC_KEY_GROUP_IDS.getValue(id), on) }) } } SessionDrawerPage.SECOND_SCREEN -> { @@ -870,67 +915,15 @@ private fun StopSessionButton(modifier: Modifier = Modifier, onClick: () -> Unit val fill by animateColorAsState(if (hot) colors.error.copy(alpha = 0.18f) else Color.Transparent, Motion.tw(220), label = "dangerFill") val shape = RoundedCornerShape(20.dp) val stopDescription = stringResource(R.string.stop_session) - val stopLabel = stringResource(R.string.drawer_stop) - var iconOnly by remember(stopLabel, androidx.compose.ui.platform.LocalConfiguration.current.screenWidthDp) { mutableStateOf(false) } Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), - modifier = modifier.heightIn(min = 44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop") + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center, + modifier = modifier.heightIn(min = 44.dp).widthIn(min = 44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop") .clip(shape).background(fill).glideBorder(hot, shape, colors.error.copy(alpha = 0.9f), colors.error.copy(alpha = 0.55f)) .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = onClick) .controllerConfirm(onClick = onClick) - .padding(start = 12.dp, end = 14.dp), + .padding(horizontal = 12.dp), ) { Icon(Icons.Outlined.PowerSettingsNew, contentDescription = null, tint = colors.error, modifier = Modifier.size(18.dp)) - if (!iconOnly) Text( - stopLabel, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.error, - maxLines = 1, softWrap = false, onTextLayout = { if (it.hasVisualOverflow) iconOnly = true }, - ) - } -} - -@Composable -private fun BottomScreenModes(a: DrawerActions, modifier: Modifier, onPick: () -> Unit) { - val pal = LocalPalette.current - val colors = MaterialTheme.colorScheme - val modes = buildList { - if (com.droiddeck.launcher.session.SessionState.deckPad) add(SecondScreenMode.DECK_CONTROLS to Icons.Outlined.SportsEsports) - add(SecondScreenMode.KEYBOARD_TRACKPAD to Icons.Outlined.Keyboard) - add(SecondScreenMode.TERMINAL to Icons.Outlined.Terminal) - } - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(4.dp), - modifier = modifier.focusGroup().clip(RoundedCornerShape(26.dp)).border(1.dp, pal.line, RoundedCornerShape(26.dp)).padding(4.dp), - ) { - modes.forEach { (mode, icon) -> - val selected = a.secondScreenMode == mode - val source = remember { MutableInteractionSource() } - val hot = source.collectIsFocusedAsState().value || source.collectIsHoveredAsState().value - val shape = RoundedCornerShape(20.dp) - val pick = { onPick(); a.onSecondScreenMode(mode) } - val label = stringResource(mode.label) - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.size(width = 52.dp, height = 40.dp).semantics { contentDescription = label } - .clip(shape) - .background(when { - selected -> pal.signal - hot -> pal.signal.copy(alpha = 0.14f) - else -> Color.Transparent - }) - .glideBorder(hot, shape, pal.signal) - .hoverable(source) - .selectable(selected, interactionSource = source, indication = LocalIndication.current, role = Role.Tab, onClick = pick) - .controllerConfirm(onClick = pick), - ) { - Icon(icon, contentDescription = null, modifier = Modifier.size(22.dp), - tint = when { - selected -> colors.background - hot -> pal.signal - else -> colors.onBackground - }) - } - } } } @@ -941,27 +934,7 @@ private fun SteamActionPill( onConfirm: (() -> Unit)? = null, shortcut: String? = null, onClick: () -> Unit, -) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val hot = interactionSource.collectIsFocusedAsState().value || interactionSource.collectIsHoveredAsState().value - val shape = RoundedCornerShape(22.dp) - Box( - contentAlignment = Alignment.Center, - modifier = modifier.size(44.dp).semantics { contentDescription = description } - .clip(shape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) - .glideBorder(hot, shape, pal.signal, pal.line) - .hoverable(interactionSource) - .clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = interactionSource, indication = LocalIndication.current, onClick = onClick) - .controllerConfirm(onClick = onConfirm ?: onClick), - ) { - Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(20.dp)) - if (shortcut != null) Text( - shortcut, fontSize = 8.sp, lineHeight = 9.sp, color = colors.onSurfaceVariant, - modifier = Modifier.align(Alignment.BottomEnd).padding(end = 8.dp, bottom = 6.dp), - ) - } -} +) = BarButton(description, modifier, vector = icon, shortcut = shortcut, interactionSource = interactionSource, onConfirm = onConfirm, onClick = onClick) @Composable private fun DrawerBumper(label: String, description: String, modifier: Modifier = Modifier, onClick: () -> Unit) { @@ -1188,12 +1161,17 @@ private fun SteamVrRow(a: DrawerActions) { } } +internal fun secondScreenModes(none: Boolean, deckPad: Boolean, dashboard: Boolean, desktop: Boolean): List<SecondScreenMode> = + (if (none) listOf(SecondScreenMode.NONE) else emptyList()) + listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.TERMINAL) + + (if (deckPad) listOf(SecondScreenMode.DECK_CONTROLS) else emptyList()) + + (if (dashboard) listOf(SecondScreenMode.DASHBOARD) else emptyList()) + + (if (desktop) listOf(SecondScreenMode.DESKTOP) else emptyList()) + @Composable private fun SecondScreenGroup(host: MenuHost, a: DrawerActions, track: (String) -> Modifier) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val modes = listOf(SecondScreenMode.NONE, SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.TERMINAL) + - if (com.droiddeck.launcher.session.SessionState.deckPad) listOf(SecondScreenMode.DECK_CONTROLS) else emptyList() + val modes = secondScreenModes(a.secondScreenNone, com.droiddeck.launcher.session.SessionState.deckPad, a.dashboardAvailable, a.desktopAvailable) SettingsGroup(stringResource(R.string.drawer_second_screen_mode)) { Column(Modifier.fillMaxWidth().selectableGroup()) { modes.forEach { mode -> @@ -1221,6 +1199,20 @@ private fun SecondScreenGroup(host: MenuHost, a: DrawerActions, track: (String) a.secondScreenDisplays.map { it.id to it.label }, a.selectedSecondScreenDisplay, chipModifier = track("second-screen-display"), onPick = a.onSecondScreenDisplay) } + if (a.gameSwapAvailable || a.gameOnBottom) SettingsGroup(stringResource(R.string.swap_game_screen_group)) { + ChoiceRow(host, "game-screen", stringResource(R.string.swap_game_screen), null, + listOf(false to stringResource(R.string.swap_game_screen_top), true to stringResource(R.string.swap_game_screen_bottom)), + a.gameOnBottom, chipModifier = track("game-screen"), onPick = a.onGameOnBottom) + } +} + +@Composable +private fun RelativeMouseRow(host: MenuHost, a: DrawerActions, modifier: Modifier) { + ChoiceRow(host, "relative-mouse", stringResource(R.string.drawer_relative_mouse), null, + listOf(com.droiddeck.launcher.input.TouchGestureConfig.RELATIVE_MOUSE_AUTO to stringResource(R.string.drawer_relative_mouse_auto), + com.droiddeck.launcher.input.TouchGestureConfig.RELATIVE_MOUSE_ON to stringResource(R.string.drawer_relative_mouse_on), + com.droiddeck.launcher.input.TouchGestureConfig.RELATIVE_MOUSE_OFF to stringResource(R.string.drawer_relative_mouse_off)), + a.relativeMouseMode, chipModifier = modifier, onPick = a.onRelativeMouseMode) } @Composable @@ -1595,7 +1587,6 @@ internal fun ComponentDownloadsDrawerGroup( } AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = ComponentsManager.LABEL.getValue(comp)) { firstItemFocus -> - // A nightly paired with a stable build rides on that row; Stable/Nightly tabs beside the row pick which one. val pairs = ComponentsManager.nightlyPairs(items) val rows = items.filter { it !in pairs.values } fun shown(row: ComponentsManager.CatalogItem) = pairs[row]?.takeIf { nightlyPicked[row.file] == true } ?: row diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionPanels.kt new file mode 100644 index 0000000000..3dbd0da611 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionPanels.kt @@ -0,0 +1,261 @@ +package com.droiddeck.launcher.ui + +import android.content.ClipboardManager +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.util.Log +import android.view.Gravity +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import android.view.inputmethod.InputMethodManager +import android.widget.HorizontalScrollView +import android.widget.LinearLayout +import android.widget.TextView +import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.PointerGestures +import com.droiddeck.launcher.input.TouchpadGestures +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionTerminal +import com.termux.terminal.TerminalEmulator +import com.termux.terminal.TerminalSession +import com.termux.terminal.TerminalSessionClient +import com.termux.view.TerminalView +import com.termux.view.TerminalViewClient + +class SessionTrackpadView( + context: Context, + private val sendPointer: (x: Float, y: Float, width: Float, height: Float) -> Unit, + private val sendButton: (button: Int, pressed: Boolean) -> Unit, + private val sendWheel: (steps: Int) -> Unit, + private val pointerPosition: () -> androidx.compose.ui.geometry.Offset? = { null }, +) : View(context) { + private fun dp(value: Int): Int = (value * resources.displayMetrics.density + 0.5f).toInt() + + private val gestures = TouchpadGestures(ViewConfiguration.get(context).scaledTouchSlop.toFloat(), + object : PointerGestures.Listener { + override fun onMove(x: Float, y: Float) { + sendPointer(x, y, width.toFloat(), height.toFloat()) + invalidate() + } + + override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { + sendPointer(x, y, width.toFloat(), height.toFloat()) + sendButton(button, pressed) + } + + override fun onWheel(steps: Int) = sendWheel(steps) + override fun onLongPress() { performHapticFeedback(android.view.HapticFeedbackConstants.LONG_PRESS) } + }) + + init { + isFocusable = true + setBackgroundColor(Color.BLACK) + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + gestures.bounds = android.graphics.RectF(0f, 0f, w.toFloat(), h.toFloat()) + if (oldw == 0 || oldh == 0) gestures.place(w / 2f, h / 2f) + } + + private val surface = android.graphics.RectF() + private val fill = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply { color = Color.rgb(0x0A, 0x0B, 0x0D) } + private val edge = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply { + style = android.graphics.Paint.Style.STROKE + color = Color.rgb(0x26, 0x29, 0x2E) + strokeWidth = resources.displayMetrics.density + } + + override fun onDraw(canvas: Canvas) { + val inset = dp(12).toFloat() + surface.set(inset, 0f, width - inset, height - inset) + if (surface.height() <= inset) return + val radius = dp(20).toFloat() + canvas.drawRoundRect(surface, radius, radius, fill) + canvas.drawRoundRect(surface, radius, radius, edge) + } + + override fun onTouchEvent(event: MotionEvent): Boolean { + if (event.actionMasked == MotionEvent.ACTION_DOWN) pointerPosition()?.let { + gestures.place(it.x * width, it.y * height) + } + return gestures.onTouch(event) + } + + override fun onDetachedFromWindow() { + gestures.cancel() + super.onDetachedFromWindow() + } +} + +class SessionTerminalPanel(context: Context) : LinearLayout(context) { + private var terminalSession: TerminalSession? = null + private var terminalView: TerminalView? = null + private var terminalPid = -1 + private var ctrlActive = false + private var altActive = false + + val ready: Boolean get() = terminalSession != null + + init { + orientation = VERTICAL + setBackgroundColor(Color.BLACK) + build() + } + + private fun build() { + val terminalClient = TerminalClient() + val view = TerminalView(context, null).apply { + setTerminalViewClient(terminalClient) + setTextSize(dp(14)) + isFocusable = true + isFocusableInTouchMode = true + } + terminalView = view + val session = SessionTerminal.create(terminalClient) + if (session == null) { + addView(TextView(context).apply { + text = context.getString(R.string.second_terminal_not_ready) + setTextColor(Color.WHITE) + gravity = Gravity.CENTER + }, LayoutParams(-1, 0, 1f)) + return + } + terminalSession = session + + val keyStrip = HorizontalScrollView(context).apply { isHorizontalScrollBarEnabled = false } + val keys = LinearLayout(context).apply { orientation = HORIZONTAL; setPadding(dp(12), 0, dp(12), dp(8)) } + fun key(label: String, input: String, onClick: ((TextView) -> Unit)? = null) { + lateinit var button: TextView + button = DeckControlsPanel.roundButton(context, label, label, { if (onClick != null) onClick(button) else session.write(input) }, wide = true) + if (keys.childCount > 0) keys.addView(View(context), LinearLayout.LayoutParams(dp(8), 1)) + keys.addView(button) + } + val ctrl = context.getString(R.string.pckb_key_ctrl) + val alt = context.getString(R.string.pckb_key_alt) + key(context.getString(R.string.pckb_key_esc), "\u001b") + key(context.getString(R.string.second_key_tab), "\t") + key(ctrl, "") { button -> + ctrlActive = !ctrlActive + button.text = if (ctrlActive) context.getString(R.string.second_key_on, ctrl) else ctrl + } + key(alt, "") { button -> + altActive = !altActive + button.text = if (altActive) context.getString(R.string.second_key_on, alt) else alt + } + key("↑", "\u001b[A") + key("↓", "\u001b[B") + key("←", "\u001b[D") + key("→", "\u001b[C") + key(context.getString(R.string.second_key_ctrl_c), "\u0003") + key(context.getString(R.string.second_key_ctrl_d), "\u0004") + keyStrip.addView(keys) + addView(keyStrip, LayoutParams(-1, -2)) + + addView(view, LayoutParams(-1, 0, 1f)) + view.attachSession(session) + + view.post { + registerTerminalPid() + view.requestFocus() + showKeyboard() + } + } + + override fun onDetachedFromWindow() { + close() + super.onDetachedFromWindow() + } + + fun showKeyboard() { + terminalView?.let { view -> + view.requestFocus() + (context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager) + .showSoftInput(view, InputMethodManager.SHOW_IMPLICIT) + } + } + + private fun registerTerminalPid() { + val pid = terminalSession?.pid ?: -1 + if (pid > 1 && pid != terminalPid) { + terminalPid = pid + SessionService.registerTerminalProcess(context, pid) + } + } + + fun close() { + terminalView?.let { view -> + (context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager) + .hideSoftInputFromWindow(view.windowToken, 0) + } + val pid = terminalPid.takeIf { it > 1 } ?: (terminalSession?.pid ?: -1) + if (pid > 1) SessionService.stopTerminalProcess(context, pid) + terminalPid = -1 + terminalSession = null + terminalView = null + ctrlActive = false + altActive = false + } + + private fun dp(value: Int): Int = (value * resources.displayMetrics.density + 0.5f).toInt() + + private inner class TerminalClient : TerminalSessionClient, TerminalViewClient { + override fun onTextChanged(changedSession: TerminalSession) { + terminalView?.onScreenUpdated() + } + override fun onTitleChanged(changedSession: TerminalSession) = Unit + override fun onSessionFinished(finishedSession: TerminalSession) { + val pid = terminalPid.takeIf { it > 1 } ?: finishedSession.pid + if (pid > 1) SessionService.terminalProcessExited(context, pid) + terminalPid = -1 + terminalView?.onScreenUpdated() + } + override fun onCopyTextToClipboard(session: TerminalSession, text: String) { + (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager) + .setPrimaryClip(android.content.ClipData.newPlainText("Terminal", text)) + } + override fun onPasteTextFromClipboard(session: TerminalSession) { + val clip = (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).primaryClip + if (clip != null && clip.itemCount > 0) session.write(clip.getItemAt(0).coerceToText(context).toString()) + } + override fun onBell(session: TerminalSession) { + terminalView?.performHapticFeedback(android.view.HapticFeedbackConstants.KEYBOARD_TAP) + } + override fun onColorsChanged(changedSession: TerminalSession) { + terminalView?.invalidate() + } + override fun onTerminalCursorStateChange(state: Boolean) { + terminalView?.setTerminalCursorBlinkerRate(if (state) 600 else 0) + } + override fun getTerminalCursorStyle(): Int = TerminalEmulator.TERMINAL_CURSOR_STYLE_BLOCK + override fun logError(tag: String, message: String) { Log.e(tag, message) } + override fun logWarn(tag: String, message: String) { Log.w(tag, message) } + override fun logInfo(tag: String, message: String) { Log.i(tag, message) } + override fun logDebug(tag: String, message: String) { Log.d(tag, message) } + override fun logVerbose(tag: String, message: String) { Log.v(tag, message) } + override fun logStackTraceWithMessage(tag: String, message: String, e: Exception) { Log.e(tag, message, e) } + override fun logStackTrace(tag: String, e: Exception) { Log.e(tag, e.message, e) } + + override fun onScale(scale: Float): Float = 1f + override fun onSingleTapUp(e: MotionEvent) = showKeyboard() + override fun shouldBackButtonBeMappedToEscape(): Boolean = true + override fun shouldEnforceCharBasedInput(): Boolean = false + override fun shouldUseCtrlSpaceWorkaround(): Boolean = false + override fun isTerminalViewSelected(): Boolean = true + override fun copyModeChanged(copyMode: Boolean) = Unit + override fun onKeyDown(keyCode: Int, e: KeyEvent, session: TerminalSession): Boolean = false + override fun onKeyUp(keyCode: Int, e: KeyEvent): Boolean = false + override fun onLongPress(event: MotionEvent): Boolean = false + override fun readControlKey(): Boolean = ctrlActive + override fun readAltKey(): Boolean = altActive + override fun readShiftKey(): Boolean = false + override fun readFnKey(): Boolean = false + override fun onCodePoint(codePoint: Int, ctrlDown: Boolean, session: TerminalSession): Boolean = false + override fun onEmulatorSet() { + terminalView?.onScreenUpdated() + registerTerminalPid() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt index 2b91273065..3e5551ab36 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt @@ -72,7 +72,6 @@ import kotlinx.coroutines.flow.first import kotlinx.coroutines.launch import kotlinx.coroutines.withTimeoutOrNull -/** The last game frame, captured as the session left the screen, and where it sat in the overlay. */ class PausedFrame(val image: ImageBitmap, val bounds: android.graphics.Rect) private const val CARD_SCALE = 0.82f @@ -125,7 +124,6 @@ fun SessionPausedOverlay( onFrameNeeded() withTimeoutOrNull(FRAME_WAIT_MS) { snapshotFlow { currentFrame }.first { it != null } } } - // Pausing mostly happens while the screen is off or the app is away, so it appears already settled. press.snapTo(1f) ring.snapTo(0f) lift.snapTo(1f) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index 50df03a741..2189b26ba1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -26,6 +26,7 @@ import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.size import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.stateDescription import androidx.compose.foundation.shape.CircleShape @@ -262,6 +263,7 @@ private class BelowEndProvider(private val gap: Int) : PopupPositionProvider { } } +@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) @Composable fun AnchoredMenu( open: Boolean, onDismiss: () -> Unit, title: String? = null, note: String? = null, @@ -287,6 +289,20 @@ fun AnchoredMenu( val colors = MaterialTheme.colorScheme val pal = LocalPalette.current Popup(popupPositionProvider = provider, onDismissRequest = onDismiss, properties = PopupProperties(focusable = true)) { + TrackKeyWindow() + val popupInput = LocalInputModeManager.current + LaunchedEffect(open, inputMode) { + if (!open || inputMode != InputMode.Keyboard) return@LaunchedEffect + popupInput.requestInputMode(InputMode.Keyboard) + repeat(8) { + androidx.compose.runtime.withFrameNanos { } + if (runCatching { firstItemFocus.captureFocus() }.getOrDefault(false)) { + firstItemFocus.freeFocus() + return@LaunchedEffect + } + runCatching { firstItemFocus.requestFocus() } + } + } CompositionLocalProvider(LocalDensity provides density, LocalConfiguration provides configuration) { AnimatedVisibility( visibleState = state, @@ -371,11 +387,12 @@ fun MenuItem( .background(if (hot && enabled) Color.White.copy(alpha = 0.07f) else Color.Transparent) .glideBorder(hot && enabled, RoundedCornerShape(8.dp), pal.signal) .alpha(if (enabled) 1f else 0.4f) + .semantics { selected = checked } .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) .controllerConfirm(enabled = enabled, onClick = onClick) .padding(horizontal = 10.dp, vertical = 9.dp), ) { - Text("✓", fontSize = 12.sp, color = pal.signal, modifier = Modifier.width(18.dp).alpha(if (checked) 1f else 0f)) + Text("✓", fontSize = 12.sp, color = pal.signal, modifier = Modifier.width(18.dp).alpha(if (checked) 1f else 0f).clearAndSetSemantics {}) if (leading != null) { leading() Spacer(Modifier.width(8.dp)) @@ -489,10 +506,11 @@ fun <T> ChoiceRow( options: List<Pair<T, String>>, selected: T, enabled: Boolean = true, note: String? = null, chipModifier: Modifier = Modifier, hintLines: Int? = null, + stacked: Boolean = false, onPick: (T) -> Unit, ) { val open = host.open == key - SettingsRow(label, hint, highlighted = open, hintLines = hintLines) { + SettingsRow(label, hint, highlighted = open, hintLines = hintLines, stacked = stacked) { Box { ValueChip(options.firstOrNull { it.first == selected }?.second ?: "-", open, enabled, modifier = chipModifier.testTag("setting-$key")) { host.open = if (open) null else key } AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = label, note = note) { firstItemFocus -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsDashes.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsDashes.kt new file mode 100644 index 0000000000..fc76799434 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsDashes.kt @@ -0,0 +1,583 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextMeasurer +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.drawText +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.rememberTextMeasurer +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.GameStatusFiles +import com.droiddeck.launcher.session.GameTelemetry +import com.droiddeck.launcher.session.SpeedUnit +import com.droiddeck.launcher.session.StatsDash +import com.droiddeck.launcher.session.Telemetry +import kotlin.math.abs +import kotlin.math.cos +import kotlin.math.floor +import kotlin.math.max +import kotlin.math.min +import kotlin.math.roundToInt +import kotlin.math.sin + +private val DASH_H = 290.dp +internal const val TRACE_N = 150 + +internal class TraceData(val throttle: List<Float>, val brake: List<Float>, val speed: List<Float>) + +@Composable +internal fun RaceDashView(style: StatsDash, t: Telemetry, trace: TraceData, unit: SpeedUnit, onTap: () -> Unit) { + Box(Modifier.fillMaxWidth().clickable(onClick = onTap)) { + when (style) { + StatsDash.AUTO, StatsDash.SPEEDOMETER -> SpeedometerDash(t, unit) + StatsDash.CIRCUIT -> CircuitDash(t, unit) + StatsDash.TRACE -> TraceDash(t, trace, unit) + StatsDash.DIALS -> DialsDash(t, unit) + StatsDash.GLANCE -> GlanceDash(t, unit) + } + } +} + +private fun polar(cx: Float, cy: Float, r: Float, deg: Float): Offset { + val a = Math.toRadians((deg - 90f).toDouble()) + return Offset(cx + r * cos(a).toFloat(), cy + r * sin(a).toFloat()) +} + +private const val DIAL_START = -125f +private const val DIAL_SWEEP = 250f + +private fun dialAngle(v: Float, max: Float) = DIAL_START + DIAL_SWEEP * (v / max).coerceIn(0f, 1f) + +private fun DrawScope.dialFace( + cx: Float, cy: Float, r: Float, max: Float, major: Float, label: (Float) -> String, + measurer: TextMeasurer, labelStyle: TextStyle, tick: Color, minor: Color, track: Color, red: Float?, redColor: Color, +) { + val box = Size(2 * r, 2 * r) + val tl = Offset(cx - r, cy - r) + drawArc(track, DIAL_START - 90f, DIAL_SWEEP, false, topLeft = tl, size = box, style = Stroke(6.dp.toPx(), cap = StrokeCap.Round)) + if (red != null && red < max) { + drawArc(redColor, dialAngle(red, max) - 90f, dialAngle(max, max) - dialAngle(red, max), false, topLeft = tl, size = box, style = Stroke(6.dp.toPx())) + } + val steps = (max / (major / 2f)).roundToInt() + for (i in 0..steps) { + val v = i * major / 2f + val isMajor = i % 2 == 0 + val deg = dialAngle(v, max) + drawLine(if (isMajor) tick else minor, polar(cx, cy, r - (if (isMajor) 14.dp else 7.dp).toPx(), deg), polar(cx, cy, r - 2.dp.toPx(), deg), + strokeWidth = (if (isMajor) 2.5f else 1.2f).dp.toPx()) + if (isMajor) { + val layout = measurer.measure(label(v), labelStyle) + val p = polar(cx, cy, r - 27.dp.toPx(), deg) + drawText(layout, topLeft = Offset(p.x - layout.size.width / 2f, p.y - layout.size.height / 2f)) + } + } +} + +private fun DrawScope.needle(cx: Float, cy: Float, len: Float, deg: Float, color: Color, hub: Color) { + drawLine(color, Offset(cx, cy), polar(cx, cy, len, deg), strokeWidth = 4.dp.toPx(), cap = StrokeCap.Round) + drawCircle(hub, radius = 7.dp.toPx(), center = Offset(cx, cy)) +} + +private fun speedValue(t: Telemetry, unit: SpeedUnit): Float = (t.speedKmh ?: 0f) * unit.perKmh + +private fun speedScale(speed: Float, unit: SpeedUnit): Float = + if (unit == SpeedUnit.MPH) (if (speed > 130f) 200f else 140f) else (if (speed > 210f) 320f else 220f) + +private fun rpmScale(t: Telemetry): Float = max(t.maxRpm ?: 9000f, t.rpm ?: 0f) + +private fun speedText(t: Telemetry, unit: SpeedUnit) = t.speedKmh?.let { "%.0f".format(it * unit.perKmh) } ?: "–" + +@Composable +private fun unitAndGear(t: Telemetry, unit: SpeedUnit) = "${unit.label} · ${stringResource(R.string.stats_gear)} ${t.gear ?: "–"}" + +@Composable +private fun SpeedometerDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.primary + Row(Modifier.fillMaxWidth().height(DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_speed), Modifier.weight(1.55f).fillMaxHeight()) { + Box(Modifier.fillMaxWidth().weight(1f)) { + SpeedDial(t, unit, Modifier.fillMaxSize()) + Column(Modifier.align(Alignment.BottomCenter), horizontalAlignment = Alignment.CenterHorizontally) { + Text(speedText(t, unit), fontSize = 44.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent) + Text(unitAndGear(t, unit), fontSize = 16.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(t.rpm?.let { "%,.0f rpm".format(it) } ?: "", fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + } + } + Column(Modifier.weight(1f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_pedals), Modifier.fillMaxWidth().weight(1f)) { Pedals(t, Modifier.fillMaxWidth().weight(1f)) } + if (t.gLat != null && t.gLon != null) { + StatsCard(stringResource(R.string.stats_gforce), Modifier.fillMaxWidth().weight(1f)) { GForce(t, Modifier.fillMaxWidth().weight(1f)) } + } + } + } +} + +@Composable +private fun SpeedDial(t: Telemetry, unit: SpeedUnit, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val labelStyle = TextStyle(color = colors.onSurfaceVariant, fontSize = 11.sp, fontFamily = FontFamily.Monospace) + val speed = speedValue(t, unit) + val vmax = speedScale(speed, unit) + val rpmFraction = ((t.rpm ?: 0f) / rpmScale(t)).coerceIn(0f, 1f) + Canvas(modifier) { + val r = min(size.width * 0.42f, size.height * 0.47f) + val cx = size.width / 2f + val cy = r + 12.dp.toPx() + dialFace(cx, cy, r, vmax, 20f, { "%.0f".format(it) }, measurer, labelStyle, colors.onBackground, colors.onSurfaceVariant, pal.line, null, StatsColors.brake) + val rr = r + 9.dp.toPx() + val box = Size(2 * rr, 2 * rr) + val tl = Offset(cx - rr, cy - rr) + drawArc(pal.line, DIAL_START - 90f, DIAL_SWEEP, false, topLeft = tl, size = box, style = Stroke(5.dp.toPx(), cap = StrokeCap.Round)) + if (rpmFraction > 0f) drawArc(if (rpmFraction > 0.9f) StatsColors.brake else pal.primary, DIAL_START - 90f, DIAL_SWEEP * rpmFraction, false, + topLeft = tl, size = box, style = Stroke(5.dp.toPx(), cap = StrokeCap.Round)) + needle(cx, cy, r - 16.dp.toPx(), dialAngle(speed, vmax), colors.onBackground, pal.primary) + } +} + +@Composable +private fun Pedals(t: Telemetry, modifier: Modifier) { + Row(modifier, horizontalArrangement = Arrangement.SpaceEvenly) { + PedalBar("THR", t.throttle, StatsColors.throttle) + PedalBar("BRK", t.brake, StatsColors.brake) + } +} + +@Composable +private fun PedalBar(label: String, value: Float?, color: Color) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + Column(Modifier.fillMaxHeight(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) { + Text(value?.let { "${(it * 100).roundToInt()}%" } ?: "–", fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Box(Modifier.weight(1f).width(26.dp).clip(RoundedCornerShape(6.dp)).background(pal.line)) { + Box(Modifier.fillMaxWidth().fillMaxHeight((value ?: 0f).coerceIn(0f, 1f)).align(Alignment.BottomCenter).background(color)) + } + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = colors.onSurfaceVariant) + } +} + +@Composable +private fun GForce(t: Telemetry, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val g = kotlin.math.hypot(t.gLat ?: 0f, t.gLon ?: 0f) + Box(modifier) { + Canvas(Modifier.fillMaxSize()) { + val steerH = if (t.steer != null) 10.dp.toPx() else 0f + val r = min(size.width / 2f, (size.height - steerH) / 2f) - 2.dp.toPx() + val cx = size.width / 2f + val cy = (size.height - steerH) / 2f + for (k in listOf(1f, 0.62f, 0.24f)) drawCircle(pal.line, radius = r * k, center = Offset(cx, cy), style = Stroke(1.dp.toPx())) + drawLine(pal.line, Offset(cx - r, cy), Offset(cx + r, cy), strokeWidth = 1.dp.toPx()) + drawLine(pal.line, Offset(cx, cy - r), Offset(cx, cy + r), strokeWidth = 1.dp.toPx()) + val gx = (t.gLat ?: 0f).coerceIn(-2f, 2f) / 2f * r + val gy = (t.gLon ?: 0f).coerceIn(-2f, 2f) / 2f * r + drawCircle(colors.onBackground, radius = 6.dp.toPx(), center = Offset(cx + gx, cy - gy)) + t.steer?.let { s -> + val y = size.height - 3.dp.toPx() + drawLine(pal.line, Offset(cx - r, y), Offset(cx + r, y), strokeWidth = 5.dp.toPx(), cap = StrokeCap.Round) + drawLine(pal.primary, Offset(cx, y), Offset(cx + s * r, y), strokeWidth = 5.dp.toPx(), cap = StrokeCap.Round) + } + } + Text("%.1f G".format(g), fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant, modifier = Modifier.align(Alignment.TopEnd)) + } +} + +@Composable +private fun CircuitDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.primary + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(null, Modifier.fillMaxWidth()) { ShiftLights(t, Modifier.fillMaxWidth().height(20.dp)) } + Row(Modifier.fillMaxWidth().height(DASH_H - 48.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_timing), Modifier.weight(1f).fillMaxHeight()) { + KvRow(stringResource(R.string.bottom_telemetry_lap), t.lap?.let { lap -> t.laps?.let { "$lap / $it" } ?: "$lap" } ?: "–") + KvRow(stringResource(R.string.bottom_telemetry_position), t.position?.let { "P$it" } ?: "–") + KvRow(stringResource(R.string.bottom_telemetry_this_lap), t.currentLapS?.let { lapTime(it) } ?: "–") + KvRow(stringResource(R.string.bottom_telemetry_last_lap), t.lastLapS?.let { lapTime(it) } ?: "–") + t.bestLapS?.let { KvRow(stringResource(R.string.stats_best_lap), lapTime(it), accent) } + } + StatsCard("", Modifier.weight(1.2f).fillMaxHeight()) { + Column(Modifier.fillMaxWidth().weight(1f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) { + Text(speedText(t, unit), fontSize = 72.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent) + Text(unitAndGear(t, unit), fontSize = 24.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(t.rpm?.let { rpm -> t.maxRpm?.let { "%,.0f / %,.0f rpm".format(rpm, it) } ?: "%,.0f rpm".format(rpm) } ?: "", + fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + } + val fuel = t.fuel + val tires = t.tireTempsC?.takeIf { it.size == 4 } + if (fuel != null || tires != null) Column(Modifier.weight(0.9f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + if (fuel != null) StatsCard(stringResource(R.string.bottom_telemetry_fuel), Modifier.fillMaxWidth().weight(1f)) { + Bar(fuel, colors.onBackground, Modifier.fillMaxWidth().height(14.dp)) + Text("${(fuel * 100).roundToInt()}%", fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + if (tires != null) StatsCard(stringResource(R.string.stats_tires), Modifier.fillMaxWidth().weight(1.3f)) { Tires(tires, Modifier.fillMaxWidth().weight(1f)) } + } + } + } +} + +@Composable +private fun ShiftLights(t: Telemetry, modifier: Modifier) { + val pal = LocalPalette.current + val ratio = ((t.rpm ?: 0f) / rpmScale(t)).coerceIn(0f, 1f) + val lit = (((ratio - 0.6f) / 0.35f).coerceIn(0f, 1f) * 15).roundToInt() + val flash = ratio > 0.95f && (System.currentTimeMillis() / 120) % 2 == 0L + Canvas(modifier) { + val step = size.width / 15f + val r = min(size.height / 2f, step / 2f - 2.dp.toPx()) + for (i in 0 until 15) { + val c = when { + flash -> pal.primary + i >= lit -> pal.line + i < 5 -> StatsColors.shiftGreen + i < 10 -> StatsColors.warn + i < 13 -> StatsColors.brake + else -> pal.primary + } + drawCircle(c, radius = r, center = Offset(step * i + step / 2f, size.height / 2f)) + } + } +} + +@Composable +private fun KvRow(label: String, value: String, valueColor: Color = MaterialTheme.colorScheme.onBackground) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.weight(1f), maxLines = 1) + Text(value, fontSize = 15.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = valueColor, maxLines = 1) + } +} + +@Composable +private fun Bar(fraction: Float, color: Color, modifier: Modifier) { + Box(modifier.clip(RoundedCornerShape(5.dp)).background(LocalPalette.current.line)) { + Box(Modifier.fillMaxWidth(fraction.coerceIn(0f, 1f)).fillMaxHeight().background(color)) + } +} + +@Composable +private fun Tires(tires: List<Float>, modifier: Modifier) { + Column(modifier, verticalArrangement = Arrangement.spacedBy(6.dp)) { + Row(Modifier.fillMaxWidth().weight(1f), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + TireBox(tires[0], Modifier.weight(1f).fillMaxHeight()) + TireBox(tires[1], Modifier.weight(1f).fillMaxHeight()) + } + Row(Modifier.fillMaxWidth().weight(1f), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + TireBox(tires[2], Modifier.weight(1f).fillMaxHeight()) + TireBox(tires[3], Modifier.weight(1f).fillMaxHeight()) + } + } +} + +@Composable +private fun TireBox(c: Float, modifier: Modifier) { + val bg = when { + c > 100f -> Color(0xFF5A2A2C) + c < 70f -> Color(0xFF1D3550) + else -> Color(0xFF23352B) + } + Box(modifier.clip(RoundedCornerShape(6.dp)).background(bg), contentAlignment = Alignment.Center) { + Text("%.0f".format(c), fontSize = 13.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = MaterialTheme.colorScheme.onBackground) + } +} + +@Composable +private fun TraceDash(t: Telemetry, trace: TraceData, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_trace), Modifier.fillMaxWidth().height(168.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(14.dp)) { + Legend(StatsColors.throttle, "${stringResource(R.string.stats_throttle)} ${t.throttle?.let { (it * 100).roundToInt() } ?: 0}%") + Legend(StatsColors.brake, "${stringResource(R.string.stats_brake)} ${t.brake?.let { (it * 100).roundToInt() } ?: 0}%") + } + TraceChart(listOf(trace.throttle to StatsColors.throttle, trace.brake to StatsColors.brake), 1f, Modifier.fillMaxWidth().weight(1f)) + } + val speeds = trace.speed.map { it * unit.perKmh } + val top = max(if (unit == SpeedUnit.MPH) 125f else 200f, (speeds.maxOrNull() ?: 0f) * 1.1f) + StatsCard(stringResource(R.string.stats_speed_chart, unit.label), Modifier.fillMaxWidth().height(114.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(14.dp)) { + Legend(StatsColors.speed, "${stringResource(R.string.stats_speed)} ${speedText(t, unit)}") + Text("0 – %.0f".format(top), fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + TraceChart(listOf(speeds to StatsColors.speed), top, Modifier.fillMaxWidth().weight(1f)) + } + } +} + +@Composable +private fun Legend(color: Color, text: String) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp)) { + Box(Modifier.size(8.dp).clip(CircleShape).background(color)) + Text(text, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = MaterialTheme.colorScheme.onBackground, maxLines = 1) + } +} + +@Composable +private fun TraceChart(series: List<Pair<List<Float>, Color>>, max: Float, modifier: Modifier) { + val pal = LocalPalette.current + Canvas(modifier) { + for (k in listOf(0f, 0.5f, 1f)) { + val y = size.height - k * size.height + drawLine(pal.line, Offset(0f, y), Offset(size.width, y), strokeWidth = 1.dp.toPx()) + } + for ((values, color) in series) { + if (values.size < 2) continue + val path = Path() + val offset = TRACE_N - values.size + values.forEachIndexed { i, v -> + val x = (i + offset) / (TRACE_N - 1f) * size.width + val y = size.height - (v / max).coerceIn(0f, 1f) * size.height + if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) + } + drawPath(path, color, style = Stroke(width = 2.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round)) + } + } +} + +@Composable +private fun DialsDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val rpmMax = (rpmScale(t) / 1000f).let { kotlin.math.ceil(it) * 1000f } + val hasExtras = t.lights != null || t.turboBar != null || t.engineTempC != null || t.oilTempC != null + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.fillMaxWidth().height(if (hasExtras) DASH_H - 56.dp else DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard("", Modifier.weight(1f).fillMaxHeight()) { + val speed = speedValue(t, unit) + ArcDial(speed, speedScale(speed, unit), if (unit == SpeedUnit.MPH) 20f else 40f, { "%.0f".format(it) }, null, + speedText(t, unit), unit.label, Modifier.fillMaxWidth().weight(1f)) + } + StatsCard("", Modifier.weight(1f).fillMaxHeight()) { + ArcDial(t.rpm ?: 0f, rpmMax, 1000f, { "%.0f".format(it / 1000f) }, t.maxRpm?.let { it * 0.9f }, + t.rpm?.let { "%,.0f".format(it) } ?: "–", "rpm × 1000 · ${t.gear ?: "–"}", Modifier.fillMaxWidth().weight(1f)) + } + } + if (hasExtras) StatsCard(stringResource(R.string.stats_lights), Modifier.fillMaxWidth()) { + Row(Modifier.horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + t.lights?.let { on -> + Lamp(stringResource(R.string.stats_lamp_shift), on and GameTelemetry.DL_SHIFT != 0, LocalPalette.current.primary) + Lamp(stringResource(R.string.stats_lamp_handbrake), on and GameTelemetry.DL_HANDBRAKE != 0, StatsColors.brake) + Lamp(stringResource(R.string.stats_lamp_pit), on and GameTelemetry.DL_PITSPEED != 0, StatsColors.warn) + Lamp(stringResource(R.string.stats_lamp_tc), on and GameTelemetry.DL_TC != 0, StatsColors.warn) + Lamp(stringResource(R.string.stats_lamp_abs), on and GameTelemetry.DL_ABS != 0, StatsColors.warn) + } + t.turboBar?.let { Lamp(stringResource(R.string.stats_turbo, "%.1f".format(it)), false, colors.onBackground) } + t.engineTempC?.let { Lamp(stringResource(R.string.stats_engine_temp, "%.0f".format(it)), false, colors.onBackground) } + t.oilTempC?.let { Lamp(stringResource(R.string.stats_oil_temp, "%.0f".format(it)), false, colors.onBackground) } + } + } + } +} + +@Composable +private fun ArcDial(value: Float, max: Float, major: Float, label: (Float) -> String, red: Float?, readout: String, unit: String, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val labelStyle = TextStyle(color = colors.onSurfaceVariant, fontSize = 11.sp, fontFamily = FontFamily.Monospace) + Box(modifier) { + Canvas(Modifier.fillMaxSize()) { + val r = min(size.width * 0.46f, size.height * 0.5f) + val cx = size.width / 2f + val cy = r + 6.dp.toPx() + dialFace(cx, cy, r, max, major, label, measurer, labelStyle, colors.onBackground, colors.onSurfaceVariant, pal.line, red, StatsColors.brake) + needle(cx, cy, r - 18.dp.toPx(), dialAngle(value, max), colors.onBackground, pal.primary) + } + Column(Modifier.align(Alignment.BottomCenter), horizontalAlignment = Alignment.CenterHorizontally) { + Text(readout, fontSize = 22.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(unit, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1) + } + } +} + +@Composable +private fun Lamp(label: String, on: Boolean, color: Color) { + val pal = LocalPalette.current + val shape = RoundedCornerShape(8.dp) + Text(label, fontSize = 12.sp, fontFamily = FontFamily.Monospace, fontWeight = if (on) FontWeight.Bold else FontWeight.Normal, + color = if (on) MaterialTheme.colorScheme.background else MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, + modifier = Modifier.clip(shape).background(if (on) color else Color.Transparent).border(1.dp, if (on) color else pal.line, shape) + .padding(horizontal = 10.dp, vertical = 4.dp)) +} + +@Composable +private fun GlanceDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.primary + val ratio = ((t.rpm ?: 0f) / rpmScale(t)).coerceIn(0f, 1f) + Row(Modifier.fillMaxWidth().height(DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + EdgeBar(t.throttle, StatsColors.throttle) + StatsCard("", Modifier.weight(1f).fillMaxHeight()) { + Bar(ratio, if (ratio > 0.9f) StatsColors.brake else accent, Modifier.fillMaxWidth().height(14.dp)) + Column(Modifier.fillMaxWidth().weight(1f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) { + Text(speedText(t, unit), fontSize = 110.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent, lineHeight = 112.sp) + Text(unitAndGear(t, unit), fontSize = 34.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + } + } + EdgeBar(t.brake, StatsColors.brake) + } +} + +@Composable +private fun EdgeBar(value: Float?, color: Color) { + Box(Modifier.width(14.dp).fillMaxHeight().clip(RoundedCornerShape(5.dp)).background(LocalPalette.current.line)) { + Box(Modifier.fillMaxWidth().fillMaxHeight((value ?: 0f).coerceIn(0f, 1f)).align(Alignment.BottomCenter).background(color)) + } +} + +internal object FlightLabels { + const val IAS = "IAS, km/h" + const val ALTITUDE = "H, m" + const val G = "Ny" + const val FUEL = "Mfuel, kg" + const val THROTTLE = "throttle 1, %" + + fun drawable(rows: List<Pair<String, String>>): Boolean = rows.any { it.first == IAS || it.first == ALTITUDE } +} + +@Composable +internal fun FlightDash(rows: List<Pair<String, String>>) { + val colors = MaterialTheme.colorScheme + val v = rows.toMap() + fun num(key: String) = v[key]?.toFloatOrNull() + Row(Modifier.fillMaxWidth().height(DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(FlightLabels.IAS, Modifier.weight(1f).fillMaxHeight()) { + num(FlightLabels.IAS)?.let { Tape(it, 10f, 50f, Modifier.fillMaxWidth().weight(1f)) } ?: Text("–", color = colors.onSurfaceVariant) + } + Column(Modifier.weight(1.3f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(FlightLabels.THROTTLE, Modifier.fillMaxWidth().weight(1f)) { + val thr = num(FlightLabels.THROTTLE) + Bar((thr ?: 0f) / 110f, StatsColors.throttle, Modifier.fillMaxWidth().height(16.dp)) + Text(thr?.let { "%.0f%%".format(it) } ?: "–", fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + StatsCard(FlightLabels.G, Modifier.fillMaxWidth().weight(1f)) { + Text(num(FlightLabels.G)?.let { "%.1f".format(it) } ?: "–", fontSize = 34.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, + color = colors.onBackground) + num(FlightLabels.FUEL)?.let { Text("${FlightLabels.FUEL} %.0f".format(it), fontSize = 12.sp, color = colors.onSurfaceVariant) } + } + } + StatsCard(FlightLabels.ALTITUDE, Modifier.weight(1f).fillMaxHeight()) { + num(FlightLabels.ALTITUDE)?.let { Tape(it, 100f, 500f, Modifier.fillMaxWidth().weight(1f)) } ?: Text("–", color = colors.onSurfaceVariant) + } + } +} + +@Composable +private fun Tape(value: Float, step: Float, every: Float, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val small = TextStyle(color = colors.onSurfaceVariant, fontSize = 11.sp, fontFamily = FontFamily.Monospace) + val big = TextStyle(color = colors.onBackground, fontSize = 18.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace) + Canvas(modifier) { + val cy = size.height / 2f + val px = (size.height / 2f) / (step * 4f) + val boxH = 32.dp.toPx() + var m = floor((value - step * 5f) / step) * step + while (m < value + step * 6f) { + val y = cy - (m - value) * px + if (y in 0f..size.height) { + val labelled = abs((m / every).roundToInt() * every - m) < 0.01f + drawLine(colors.onSurfaceVariant, Offset(size.width * 0.74f, y), Offset(size.width, y), strokeWidth = (if (labelled) 2.5f else 1f).dp.toPx()) + if (labelled && abs(y - cy) > boxH * 0.75f) { + val layout = measurer.measure("%.0f".format(m), small) + drawText(layout, topLeft = Offset(size.width * 0.70f - layout.size.width, y - layout.size.height / 2f)) + } + } + m += step + } + drawRoundRect(pal.primary, topLeft = Offset(1.dp.toPx(), cy - boxH / 2f), size = Size(size.width - 2.dp.toPx(), boxH), + cornerRadius = CornerRadius(8.dp.toPx()), style = Stroke(2.dp.toPx())) + val layout = measurer.measure("%.0f".format(value), big) + drawText(layout, topLeft = Offset(size.width / 2f - layout.size.width / 2f, cy - layout.size.height / 2f)) + } +} + +@Composable +internal fun ShipDash(e: GameStatusFiles.Elite) { + val colors = MaterialTheme.colorScheme + Row(Modifier.fillMaxWidth().height(210.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_power), Modifier.weight(1.2f).fillMaxHeight()) { + e.pips?.takeIf { it.size == 3 }?.let { Pips(it, Modifier.fillMaxWidth().weight(1f)) } ?: Text("–", color = colors.onSurfaceVariant) + } + Column(Modifier.weight(1f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_fuel_t), Modifier.fillMaxWidth().weight(1f)) { + e.fuelMain?.let { Text(stringResource(R.string.stats_fuel_main, "%.1f".format(it)), fontSize = 15.sp, fontWeight = FontWeight.Bold, + fontFamily = FontFamily.Monospace, color = colors.onBackground) } + e.fuelReserve?.let { Text(stringResource(R.string.stats_fuel_reserve, "%.2f".format(it)), fontSize = 12.sp, color = colors.onSurfaceVariant) } + } + StatsCard("", Modifier.fillMaxWidth().weight(1f)) { + e.cargo?.let { KvRow(stringResource(R.string.bottom_telemetry_cargo), "%.0f t".format(it)) } + e.legal?.let { KvRow(stringResource(R.string.bottom_telemetry_legal), it, if (it == "Clean") StatsColors.gpu else StatsColors.warn) } + e.balance?.let { KvRow(stringResource(R.string.bottom_telemetry_balance), "%,d CR".format(it)) } + } + } + } +} + +@Composable +private fun Pips(pips: List<Int>, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val style = TextStyle(color = colors.onSurfaceVariant, fontSize = 12.sp, fontWeight = FontWeight.Bold) + val names = listOf("SYS", "ENG", "WEP") + Canvas(modifier) { + val colW = size.width / 3f + val pipW = colW * 0.62f + val labelH = 18.dp.toPx() + val pipH = (size.height - labelH) / 4f - 4.dp.toPx() + for (col in 0 until 3) { + val x = col * colW + (colW - pipW) / 2f + val value = pips[col] / 2f + for (i in 0 until 4) { + val y = size.height - labelH - (i + 1) * (pipH + 4.dp.toPx()) + drawRoundRect(pal.line, topLeft = Offset(x, y), size = Size(pipW, pipH), cornerRadius = CornerRadius(4.dp.toPx())) + val fill = (value - i).coerceIn(0f, 1f) + if (fill > 0f) drawRoundRect(pal.primary, topLeft = Offset(x, y), size = Size(pipW * fill, pipH), cornerRadius = CornerRadius(4.dp.toPx())) + } + val layout = measurer.measure(names[col], style) + drawText(layout, topLeft = Offset(col * colW + colW / 2f - layout.size.width / 2f, size.height - layout.size.height)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt new file mode 100644 index 0000000000..b14dd39dc3 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt @@ -0,0 +1,666 @@ +package com.droiddeck.launcher.ui + +import android.graphics.BlurMaskFilter +import android.graphics.LinearGradient +import android.graphics.Paint +import android.graphics.Shader +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawWithCache +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.PathEffect +import androidx.compose.ui.graphics.Shadow +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.drawscope.drawIntoCanvas +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.graphics.nativeCanvas +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.text.withStyle +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.TextUnit +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import coil.compose.AsyncImage +import com.droiddeck.launcher.R +import com.droiddeck.launcher.hud.FrameStats +import com.droiddeck.launcher.hud.HudMetrics +import com.droiddeck.launcher.session.StatsHud +import java.io.File +import kotlin.math.ceil +import kotlin.math.max +import kotlin.math.min +import kotlin.math.roundToInt + +internal class CoreGroup(val cores: List<Int>, val maxGhz: Double?) + +internal class HudData( + val fps: Float?, + val avgFps: Float?, + val lows: FrameStats.Lows, + val graph: FloatArray, + val slowPerMinute: Int?, + val engine: String, + val resolution: String, + val refreshHz: Int, + val proton: String?, + val device: HudMetrics.Snapshot?, + val gpuName: String, + val fanRpm: Long?, + val title: String?, + val cover: File?, + val played: String?, + val clock: String, + val fpsHistory: List<Float>, + val cpuHistory: List<Float>, + val gpuHistory: List<Float>, + val coreGroups: List<CoreGroup>, + val gameCores: Set<Int>, + val fahrenheit: Boolean, + val tempColor: (HudMetrics.TempSensor, Int) -> Color, + val redC: (HudMetrics.TempSensor) -> Int?, + val historySeconds: Int = 0, +) { + val frametimeMs: Float? get() = fps?.takeIf { it > 0f }?.let { 1000f / it } + val hz: Int get() = if (refreshHz > 0) refreshHz else 60 +} + +private object HudInk { + val value = Color(0xFFF2F5F9) + val dim = Color(0xFF9AA4B2) + val low = Color(0xFFE4E8EE) + val vram = Color(0xFFC98BFF) + val sep = Color(0xFF5D6876) + val header = Color(0xFFEAF4FF) + val amber = Color(0xFFFFB74D) + val tile = Color(0x0EFFFFFF) +} + +private val Mono = FontFamily.Monospace +private val HEADER = 40.dp +private const val UNIT = 0.62f + +@Composable +internal fun StatsHudView(style: StatsHud, d: HudData, modifier: Modifier, onTap: () -> Unit) { + val accent = LocalPalette.current.primary + val night = style == StatsHud.NIGHT + Box(modifier.clickable(onClick = onTap)) { + HudPanel(d.clock, if (style == StatsHud.GRAPHS) stringResource(R.string.stats_hud_last_seconds, d.historySeconds) else null, night, accent) { + when (style) { + StatsHud.BIG_FPS -> BigFps(d, accent) + StatsHud.FULL -> Full(d, accent) + StatsHud.TILES -> Tiles(d, accent) + StatsHud.RINGS -> Rings(d, accent) + StatsHud.GRAPHS -> Graphs(d, accent) + StatsHud.CORES -> Cores(d, accent) + StatsHud.HEAT -> Heat(d) + StatsHud.GAME -> GameCard(d, accent) + StatsHud.PACING -> Pacing(d, accent) + StatsHud.NIGHT -> Night(d, night) + StatsHud.MEGA -> Mega(d, accent) + } + } + } +} + +@Composable +private fun HudPanel(clock: String, right: String?, dim: Boolean, accent: Color, content: @Composable ColumnScope.() -> Unit) { + val headerInk = if (dim) Color(0xFF7D8794) else HudInk.header + Column( + Modifier.fillMaxSize() + .drawWithCache { + val w = size.width + val h = size.height + val stroke = 2.dp.toPx() + val corner = 7.dp.toPx() + val radius = min(h / 2f, 64.dp.toPx()) + val headerPx = HEADER.toPx() + val a = accent.toArgb() + val body = dPath(0f, 0f, w, h, radius, corner) + val half = stroke / 2f + val outline = dPath(half, half, w - half, h - half, radius - half, corner) + val fill = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = if (dim) argb(245, 0xFF040507.toInt()) else argb(240, 0xFF0E1014.toInt()) } + val band = Paint(Paint.ANTI_ALIAS_FLAG).apply { + shader = LinearGradient(0f, 0f, w, 0f, argb(if (dim) 20 else 56, a), argb(0, a), Shader.TileMode.CLAMP) + } + val divider = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = argb(if (dim) 38 else 90, a) } + val blur = BlurMaskFilter(4.dp.toPx(), BlurMaskFilter.Blur.NORMAL) + val line = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE; strokeWidth = stroke; color = argb(if (dim) 90 else 255, a) } + onDrawBehind { + drawIntoCanvas { canvas -> + val c = canvas.nativeCanvas + c.drawPath(body, fill) + c.save() + c.clipPath(body) + c.drawRect(0f, 0f, w, headerPx + 1f, band) + c.drawRect(0f, headerPx, w, headerPx + max(1f, density), divider) + c.restore() + for (pass in 0..2) { + line.maskFilter = if (pass < 2) blur else null + c.drawPath(outline, line) + } + line.maskFilter = null + } + } + } + .padding(start = 24.dp, end = 34.dp, bottom = 14.dp), + ) { + Row(Modifier.fillMaxWidth().height(HEADER), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Wordmark(14.dp, ink = headerInk, ball = if (dim) accent.copy(alpha = 0.5f) else accent) + if (clock.isNotEmpty()) { + Text("·", fontSize = 13.sp, fontFamily = Mono, color = HudInk.sep) + Text(clock, fontSize = 13.sp, fontFamily = Mono, fontWeight = FontWeight.Bold, color = HudInk.dim, maxLines = 1) + } + if (right != null) { + Spacer(Modifier.weight(1f)) + Text(right, fontSize = 13.sp, fontFamily = Mono, fontWeight = FontWeight.Bold, color = HudInk.dim, maxLines = 1) + } + } + Spacer(Modifier.height(12.dp)) + content() + } +} + +private fun argb(alpha: Int, rgb: Int): Int = (alpha shl 24) or (rgb and 0xFFFFFF) + +private fun dPath(l: Float, t: Float, r: Float, b: Float, rad: Float, corner: Float) = android.graphics.Path().apply { + moveTo(l, t + corner) + lineTo(l, b - corner); quadTo(l, b, l + corner, b) + lineTo(r - rad, b) + arcTo(r - 2f * rad, b - 2f * rad, r, b, 90f, -90f, false) + lineTo(r, t + rad) + arcTo(r - 2f * rad, t, r, t + 2f * rad, 0f, -90f, false) + lineTo(l + corner, t); quadTo(l, t, l, t + corner) + close() +} + +private fun f1(v: Float?): String = v?.takeIf { it > 0f }?.let { "%.1f".format(it) } ?: "–" + +private fun gib(bytes: Long?): String = bytes?.let { "%.1f".format(it / 1073741824.0) } ?: "–" + +private fun AnnotatedString.Builder.num(value: String, unit: String, size: TextUnit, color: Color = HudInk.value, unitScale: Float = UNIT) { + withStyle(SpanStyle(color = color)) { append(value) } + if (unit.isNotEmpty()) withStyle(SpanStyle(color = HudInk.dim, fontSize = size * unitScale)) { append(unit) } +} + +private fun AnnotatedString.Builder.gap() = append(" ") + +private fun tempLabel(d: HudData, c: Int): String = if (d.fahrenheit) "${c * 9 / 5 + 32}°F" else "$c°C" + +private fun AnnotatedString.Builder.temp(d: HudData, sensor: HudMetrics.TempSensor, c: Int?, size: TextUnit) { + if (c == null) { num("–", "", size); return } + val shown = if (d.fahrenheit) (c * 9 / 5 + 32) else c + num(shown.toString(), if (d.fahrenheit) "°F" else "°C", size, d.tempColor(sensor, c)) +} + +@Composable +private fun Big(value: String, unit: String, size: TextUnit, color: Color, glow: Boolean, unitScale: Float = 0.27f, modifier: Modifier = Modifier) { + Text( + buildAnnotatedString { num(value, unit, size, color, unitScale) }, + modifier = modifier, fontSize = size, fontFamily = Mono, fontWeight = FontWeight.Bold, maxLines = 1, softWrap = false, + style = if (glow) TextStyle(shadow = Shadow(color.copy(alpha = 0.85f), Offset.Zero, 18f)) else TextStyle.Default, + ) +} + +@Composable +private fun Line(text: AnnotatedString, size: TextUnit, modifier: Modifier = Modifier, align: TextAlign = TextAlign.Start) { + Text(text, modifier = modifier, fontSize = size, fontFamily = Mono, fontWeight = FontWeight.Bold, color = HudInk.value, maxLines = 1, + softWrap = false, overflow = TextOverflow.Clip, textAlign = align) +} + +@Composable +private fun Small(text: String, size: TextUnit = 12.sp, color: Color = HudInk.dim, modifier: Modifier = Modifier) { + Text(text, modifier = modifier, fontSize = size, fontFamily = Mono, fontWeight = FontWeight.Bold, color = color, maxLines = 1, overflow = TextOverflow.Ellipsis) +} + +private fun lowsText(d: HudData, size: TextUnit, accent: Color, deep: Boolean = true): AnnotatedString = buildAnnotatedString { + fun part(label: String, v: Float) { + withStyle(SpanStyle(color = HudInk.dim)) { append("$label ") } + withStyle(SpanStyle(color = accent)) { append(f1(v)) } + } + part("1%", d.lows.low1Fps) + withStyle(SpanStyle(color = HudInk.sep)) { append(" · ") } + part("0.1%", d.lows.low01Fps) + if (deep) { + withStyle(SpanStyle(color = HudInk.sep)) { append(" · ") } + part("0.01%", d.lows.low001Fps) + } +} + +private val GRAPH_MIN_GAP = 3.dp + +@Composable +private fun Graph(values: List<Float>, lo: Float, hi: Float, color: Color, modifier: Modifier) { + Canvas(modifier) { + if (values.size < 2 || hi <= lo) return@Canvas + val stride = ceil(GRAPH_MIN_GAP.toPx() * (values.size - 1) / size.width).toInt().coerceAtLeast(1) + val points = if (stride == 1) values else values.chunked(stride) { it.average().toFloat() } + if (points.size < 2) return@Canvas + val path = Path() + points.forEachIndexed { i, v -> + val x = i / (points.size - 1f) * size.width + val y = size.height - ((v - lo) / (hi - lo)).coerceIn(0f, 1f) * size.height + if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) + } + drawPath(path, color.copy(alpha = 0.22f), style = Stroke(width = 6.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round)) + drawPath(path, color, style = Stroke(width = 2.2f.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round)) + } +} + +@Composable +private fun FrameGraph(d: HudData, accent: Color, height: Dp) { + Graph(d.graph.toList(), 0f, FrameStats.GRAPH_MAX_MS, lerp(accent, Color.White, 0.3f), Modifier.fillMaxWidth().height(height)) +} + +@Composable +private fun Rows(rows: List<Pair<Pair<String, Color>, AnnotatedString>>, size: TextUnit, labelWidth: Dp, gap: Dp) { + Column(verticalArrangement = Arrangement.spacedBy(gap)) { + for ((label, value) in rows) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(label.first, modifier = Modifier.width(labelWidth), fontSize = size, fontFamily = Mono, fontWeight = FontWeight.Bold, + color = label.second, maxLines = 1, softWrap = false) + Line(value, size) + } + } + } +} + +private fun row(label: String, color: Color, value: AnnotatedString) = (label to color) to value + +@Composable +private fun RowScope.Tile(key: String, keyColor: Color, value: AnnotatedString, sub: String, glow: Color? = null) { + Column( + Modifier.weight(1f).fillMaxHeight().clip(RoundedCornerShape(9.dp)).background(HudInk.tile).padding(horizontal = 11.dp, vertical = 6.dp), + verticalArrangement = Arrangement.Center, + ) { + Small(key, 12.sp, keyColor) + Text(value, fontSize = 28.sp, fontFamily = Mono, fontWeight = FontWeight.Bold, color = HudInk.value, maxLines = 1, softWrap = false, + style = if (glow != null) TextStyle(shadow = Shadow(glow.copy(alpha = 0.85f), Offset.Zero, 16f)) else TextStyle.Default) + Small(sub) + } +} + +@Composable +private fun Ring(ringSize: Dp, fraction: Float?, color: Color, label: String, sub: String?, center: @Composable () -> Unit) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Box(Modifier.size(ringSize), contentAlignment = Alignment.Center) { + Canvas(Modifier.fillMaxSize()) { + val w = size.minDimension * 0.085f + val tl = Offset(w, w) + val sz = Size(size.width - 2 * w, size.height - 2 * w) + drawArc(Color.White.copy(alpha = 0.08f), 0f, 360f, false, topLeft = tl, size = sz, style = Stroke(width = w)) + if (fraction != null) { + val sweep = (fraction.coerceIn(0f, 1f) * 360f).coerceAtLeast(1f) + drawArc(color.copy(alpha = 0.25f), -90f, sweep, false, topLeft = tl, size = sz, style = Stroke(width = w * 1.9f, cap = StrokeCap.Round)) + drawArc(color, -90f, sweep, false, topLeft = tl, size = sz, style = Stroke(width = w, cap = StrokeCap.Round)) + } + } + center() + } + Small(label, 13.sp, color) + if (sub != null) Small(sub, 11.5.sp) + } +} + +@Composable +private fun ColumnScope.BigFps(d: HudData, accent: Color) { + Big(f1(d.fps), "fps", 104.sp, accent, glow = true, modifier = Modifier.offset(x = (-4).dp)) + Line(lowsText(d, 16.sp, accent), 16.sp, Modifier.padding(top = 10.dp)) + Spacer(Modifier.weight(1f)) + FrameGraph(d, accent, 72.dp) + Small(listOfNotNull(d.engine.ifEmpty { null }, d.title, d.played).joinToString(" · "), modifier = Modifier.padding(top = 8.dp)) +} + +@Composable +private fun ColumnScope.Full(d: HudData, accent: Color) { + val s = d.device + val z = 16.sp + val left = listOf( + row("GPU", StatsColors.gpu, AnnotatedString(d.gpuName)), + row("GPU", StatsColors.gpu, buildAnnotatedString { num(s?.gpuPercent?.toString() ?: "–", "%", z); gap(); temp(d, HudMetrics.TempSensor.GPU, s?.gpuTempC, z) }), + row("", StatsColors.gpu, buildAnnotatedString { num(s?.gpuClockMhz?.toString() ?: "–", "MHz", z) }), + row("CPU", StatsColors.cpu, buildAnnotatedString { num(s?.cpuPercent?.toString() ?: "–", "%", z); gap(); temp(d, HudMetrics.TempSensor.CPU, s?.cpuTempC, z) }), + row("", StatsColors.cpu, buildAnnotatedString { num(s?.cpuClockMhz?.toString() ?: "–", "MHz", z) }), + row("VRAM", HudInk.vram, buildAnnotatedString { num(gib(s?.vramUsedBytes), "GiB", z) }), + row("RAM", StatsColors.ram, buildAnnotatedString { num(gib(s?.ramUsedBytes), "GiB", z); gap(); num(s?.ramPercent?.roundToInt()?.toString() ?: "–", "%", z) }), + row("BAT", StatsColors.bat, buildAnnotatedString { num(s?.battery?.percent?.toString() ?: "–", "%", z); gap(); num(s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f".format(it) } ?: "–", "W", z) }), + ) + val right = listOf( + row(d.engine.ifEmpty { "FPS" }, accent, buildAnnotatedString { num(f1(d.fps), "FPS", z, accent) }), + row("", accent, buildAnnotatedString { num(f1(d.frametimeMs), "ms", z) }), + row("AVG", HudInk.low, buildAnnotatedString { num(f1(d.avgFps), "FPS", z) }), + row("1%", HudInk.low, buildAnnotatedString { num(f1(d.lows.low1Fps), "FPS", z) }), + row("0.1%", HudInk.low, buildAnnotatedString { num(f1(d.lows.low01Fps), "FPS", z) }), + row("0.01%", HudInk.low, buildAnnotatedString { num(f1(d.lows.low001Fps), "FPS", z) }), + row("TEMP", StatsColors.bat, buildAnnotatedString { temp(d, HudMetrics.TempSensor.BATTERY, s?.battery?.tempC, z) }), + row("FAN", HudInk.dim, buildAnnotatedString { num(d.fanRpm?.toString() ?: "–", "rpm", z) }), + ) + Row(horizontalArrangement = Arrangement.spacedBy(28.dp)) { + Rows(left, z, 52.dp, 6.dp) + Rows(right, z, 62.dp, 6.dp) + } + Spacer(Modifier.weight(1f)) + val frametime = stringResource(R.string.stats_hud_frametime) + Line(buildAnnotatedString { + withStyle(SpanStyle(color = accent)) { append(frametime) } + withStyle(SpanStyle(color = HudInk.dim)) { append(" min %.1f · max %.1f ms".format(d.graph.filter { it > 0f }.minOrNull() ?: 0f, d.graph.maxOrNull() ?: 0f)) } + }, 12.5.sp, Modifier.padding(bottom = 6.dp)) + FrameGraph(d, accent, 44.dp) +} + +@Composable +private fun ColumnScope.Tiles(d: HudData, accent: Color) { + val s = d.device + val z = 28.sp + val u = 0.5f + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.weight(1f), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Tile("FPS", accent, buildAnnotatedString { num(f1(d.fps), "", z) }, "${f1(d.avgFps)} avg · ${f1(d.lows.low1Fps)} 1%", glow = accent) + Tile("FRAME", HudInk.dim, buildAnnotatedString { num(f1(d.frametimeMs), "ms", z, unitScale = u) }, "max %.1f ms".format(d.graph.maxOrNull() ?: 0f)) + Tile("GPU", StatsColors.gpu, buildAnnotatedString { num(s?.gpuPercent?.toString() ?: "–", "%", z, unitScale = u) }, + listOfNotNull(s?.gpuTempC?.let { tempLabel(d, it) }, s?.gpuClockMhz?.let { "$it MHz" }).joinToString(" · ")) + } + Row(Modifier.weight(1f), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Tile("CPU", StatsColors.cpu, buildAnnotatedString { num(s?.cpuPercent?.toString() ?: "–", "%", z, unitScale = u) }, + listOfNotNull(s?.cpuTempC?.let { tempLabel(d, it) }, s?.cpuClockMhz?.let { "$it MHz" }).joinToString(" · ")) + Tile("RAM", StatsColors.ram, buildAnnotatedString { num(s?.ramPercent?.roundToInt()?.toString() ?: "–", "%", z, unitScale = u) }, + "${gib(s?.ramUsedBytes)} / ${gib(s?.ramTotalBytes)} GiB") + Tile("VRAM", HudInk.vram, buildAnnotatedString { num(gib(s?.vramUsedBytes), "GiB", z, unitScale = u) }, d.gpuName) + } + Row(Modifier.weight(1f), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Tile("BAT TEMP", StatsColors.bat, buildAnnotatedString { temp(d, HudMetrics.TempSensor.BATTERY, s?.battery?.tempC, z) }, stringResource(R.string.stats_hud_battery_temp)) + Tile("FAN", HudInk.dim, buildAnnotatedString { num(d.fanRpm?.toString() ?: "–", "", z) }, "rpm") + Tile("BATTERY", StatsColors.bat, buildAnnotatedString { num(s?.battery?.percent?.toString() ?: "–", "%", z, unitScale = u) }, + listOfNotNull(s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f W".format(it) }, s?.battery?.runtimeText).joinToString(" · ")) + } + } +} + +@Composable +private fun ColumnScope.Rings(d: HudData, accent: Color) { + val s = d.device + Row(Modifier.weight(1f).fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(26.dp)) { + Ring(200.dp, d.fps?.let { it / d.hz }, accent, stringResource(R.string.stats_hud_fps_of, d.hz), "1% ${f1(d.lows.low1Fps)} · 0.1% ${f1(d.lows.low01Fps)}") { + Big(f1(d.fps), "fps", 40.sp, HudInk.value, glow = true, unitScale = 0.4f) + } + Column(verticalArrangement = Arrangement.spacedBy(14.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(22.dp)) { + Ring(96.dp, s?.gpuPercent?.let { it / 100f }, StatsColors.gpu, "GPU", s?.gpuTempC?.let { tempLabel(d, it) }) { Big(s?.gpuPercent?.toString() ?: "–", "%", 20.sp, HudInk.value, false, 0.6f) } + Ring(96.dp, s?.cpuPercent?.let { it / 100f }, StatsColors.cpu, "CPU", s?.cpuTempC?.let { tempLabel(d, it) }) { Big(s?.cpuPercent?.toString() ?: "–", "%", 20.sp, HudInk.value, false, 0.6f) } + } + Row(horizontalArrangement = Arrangement.spacedBy(22.dp)) { + Ring(96.dp, s?.ramPercent?.let { it / 100f }, StatsColors.ram, "RAM", s?.let { "${gib(it.ramUsedBytes)} GiB" }) { + Big(s?.ramPercent?.roundToInt()?.toString() ?: "–", "%", 20.sp, HudInk.value, false, 0.6f) + } + Ring(96.dp, s?.battery?.percent?.let { it / 100f }, StatsColors.bat, "BAT", s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f W".format(it) }) { + Big(s?.battery?.percent?.toString() ?: "–", "%", 20.sp, HudInk.value, false, 0.6f) + } + } + } + } +} + +@Composable +private fun ColumnScope.Graphs(d: HudData, accent: Color) { + val s = d.device + val frameMs = d.fpsHistory.map { 1000f / max(it, 1f) } + @Composable + fun graphRow(label: String, color: Color, values: List<Float>, hi: Float, value: AnnotatedString) { + Row(Modifier.fillMaxWidth().height(56.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { + Small(label, 14.sp, color, Modifier.width(62.dp)) + Graph(values, 0f, hi, color, Modifier.weight(1f).height(52.dp)) + Line(value, 24.sp, Modifier.width(128.dp), TextAlign.End) + } + } + Column(Modifier.weight(1f), verticalArrangement = Arrangement.SpaceEvenly) { + graphRow("FPS", accent, d.fpsHistory, max(d.hz.toFloat(), d.fpsHistory.maxOrNull() ?: 0f) * 1.1f, buildAnnotatedString { num(f1(d.fps), "fps", 24.sp, accent, 0.5f) }) + graphRow("FRAME", lerp(accent, Color.White, 0.3f), frameMs, max(40f, (frameMs.maxOrNull() ?: 0f) * 1.2f), buildAnnotatedString { num(f1(d.frametimeMs), "ms", 24.sp, unitScale = 0.5f) }) + graphRow("CPU", StatsColors.cpu, d.cpuHistory, 100f, buildAnnotatedString { num(s?.cpuPercent?.toString() ?: "–", "%", 24.sp, unitScale = 0.5f) }) + graphRow("GPU", StatsColors.gpu, d.gpuHistory, 100f, buildAnnotatedString { num(s?.gpuPercent?.toString() ?: "–", "%", 24.sp, unitScale = 0.5f) }) + } +} + +@Composable +private fun ColumnScope.Cores(d: HudData, accent: Color) { + val s = d.device + Row(verticalAlignment = Alignment.Bottom, horizontalArrangement = Arrangement.spacedBy(16.dp)) { + Big(f1(d.fps), "fps", 40.sp, accent, glow = true, unitScale = 0.38f) + Small(listOfNotNull(d.engine.ifEmpty { null }, d.frametimeMs?.let { "%.1f ms".format(it) }, + s?.cpuPercent?.let { "CPU $it%" }, s?.cpuTempC?.let { tempLabel(d, it) }).joinToString(" · "), 15.sp, modifier = Modifier.padding(bottom = 6.dp)) + } + Spacer(Modifier.height(10.dp)) + val gameTag = stringResource(R.string.stats_hud_game_cores) + Column(verticalArrangement = Arrangement.spacedBy(5.dp)) { + for (group in d.coreGroups) { + for (core in group.cores) { + val p = s?.perCorePercent?.getOrNull(core)?.takeIf { it >= 0 } + val mhz = s?.perCoreClockMhz?.getOrNull(core)?.takeIf { it > 0 } + Row(Modifier.fillMaxWidth().height(20.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + Small("C$core", 14.sp, StatsColors.cpu, Modifier.width(40.dp)) + Box(Modifier.weight(1f).height(14.dp).clip(RoundedCornerShape(7.dp)).background(Color.White.copy(alpha = 0.07f))) { + if (p != null && p > 0) Box( + Modifier.fillMaxHeight().fillMaxWidth(p / 100f).clip(RoundedCornerShape(7.dp)) + .background(Brush.horizontalGradient(listOf(Color(0xFF2B6FC9), if (p >= 80) HudInk.amber else StatsColors.cpu))), + ) + } + Line(buildAnnotatedString { num(p?.toString() ?: "–", "%", 14.sp); append(" "); num(mhz?.toString() ?: "–", "MHz", 14.sp) }, + 14.sp, Modifier.width(118.dp), TextAlign.End) + } + } + val label = group.maxGhz?.let { stringResource(R.string.stats_hud_core_group, group.cores.size, "%.2f".format(it)) } + ?: stringResource(R.string.stats_hud_core_group_unknown, group.cores.size) + Row(Modifier.padding(start = 50.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + Small(label, 11.5.sp) + if (d.gameCores.isNotEmpty() && group.cores.any { it in d.gameCores }) { + Text(gameTag.uppercase(), fontSize = 10.sp, fontFamily = Mono, fontWeight = FontWeight.Bold, color = Color(0xFF0A0B0D), + modifier = Modifier.clip(RoundedCornerShape(4.dp)).background(StatsColors.cpu).padding(horizontal = 4.dp)) + } + } + } + } +} + +@Composable +private fun ColumnScope.Heat(d: HudData) { + val s = d.device + @Composable + fun bar(label: String, color: Color, sensor: HudMetrics.TempSensor, c: Int?) { + val red = d.redC(sensor) + Row(Modifier.fillMaxWidth().height(28.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { + Small(label, 15.sp, color, Modifier.width(48.dp)) + BoxWithConstraints(Modifier.weight(1f).height(20.dp).clip(RoundedCornerShape(10.dp)).background(Color.White.copy(alpha = 0.07f))) { + if (c != null && c > 0) Box(Modifier.fillMaxHeight().fillMaxWidth((c / 100f).coerceIn(0f, 1f)).clip(RoundedCornerShape(10.dp)) + .background(Brush.horizontalGradient(listOf(color.copy(alpha = 0.55f), color)))) + if (red != null && red in 1..99) Box(Modifier.offset(x = maxWidth * (red / 100f)).width(2.dp).fillMaxHeight().background(Color(0xFFEF5350))) + } + Line(buildAnnotatedString { temp(d, sensor, c, 24.sp) }, 24.sp, Modifier.width(92.dp), TextAlign.End) + } + } + Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { + bar("CPU", StatsColors.cpu, HudMetrics.TempSensor.CPU, s?.cpuTempC) + bar("GPU", StatsColors.gpu, HudMetrics.TempSensor.GPU, s?.gpuTempC) + bar("BAT", StatsColors.bat, HudMetrics.TempSensor.BATTERY, s?.battery?.tempC) + } + Small(stringResource(R.string.stats_hud_red_mark), 12.sp, modifier = Modifier.padding(top = 8.dp)) + Spacer(Modifier.weight(1f)) + Row(Modifier.fillMaxWidth().height(96.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Tile("FAN", HudInk.dim, buildAnnotatedString { num(d.fanRpm?.toString() ?: "–", "", 28.sp) }, "rpm") + Tile("POWER", StatsColors.bat, buildAnnotatedString { num(s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f".format(it) } ?: "–", "W", 28.sp, unitScale = 0.5f) }, + stringResource(R.string.stats_hud_whole_device)) + Tile("BATTERY", StatsColors.bat, buildAnnotatedString { num(s?.battery?.percent?.toString() ?: "–", "%", 28.sp, unitScale = 0.5f) }, s?.battery?.runtimeText ?: "") + } +} + +@Composable +private fun ColumnScope.GameCard(d: HudData, accent: Color) { + Row(Modifier.weight(1f).fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(20.dp)) { + Box( + Modifier.width(150.dp).fillMaxHeight().clip(RoundedCornerShape(10.dp)) + .background(Brush.linearGradient(listOf(lerp(accent, Color.Black, 0.55f), Color(0xFF0B0D10)))), + contentAlignment = Alignment.BottomStart, + ) { + if (d.cover != null) AsyncImage(model = d.cover, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.fillMaxSize()) + else Text(d.title.orEmpty(), fontSize = 20.sp, fontWeight = FontWeight.Bold, color = Color.White.copy(alpha = 0.85f), maxLines = 3, + modifier = Modifier.padding(12.dp)) + } + Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + Text(d.title.orEmpty(), fontSize = 26.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 2, overflow = TextOverflow.Ellipsis) + d.played?.let { Small(stringResource(R.string.stats_hud_playing_for, it), 13.5.sp) } + Line(buildAnnotatedString { + withStyle(SpanStyle(color = accent)) { append(d.engine) } + if (d.engine.isNotEmpty() && d.proton != null) withStyle(SpanStyle(color = HudInk.dim)) { append(" · ") } + d.proton?.let { withStyle(SpanStyle(color = HudInk.vram)) { append(it) } } + }, 13.5.sp) + if (d.resolution.isNotEmpty()) Small(d.resolution, 13.5.sp) + Big(f1(d.fps), "fps", 60.sp, accent, glow = true, unitScale = 0.3f, modifier = Modifier.padding(top = 6.dp)) + Line(lowsText(d, 14.sp, accent, deep = false), 14.sp) + } + } + Spacer(Modifier.height(10.dp)) + FrameGraph(d, accent, 40.dp) +} + +@Composable +private fun ColumnScope.Pacing(d: HudData, accent: Color) { + @Composable + fun stat(label: String, value: String, color: Color = HudInk.value) { + Column { + Small(label, 13.sp) + Text(value, fontSize = 22.sp, fontFamily = Mono, fontWeight = FontWeight.Bold, color = color, maxLines = 1) + } + } + Row(verticalAlignment = Alignment.Bottom, horizontalArrangement = Arrangement.spacedBy(24.dp)) { + Big(f1(d.fps), "fps", 52.sp, accent, glow = true, unitScale = 0.3f) + stat(stringResource(R.string.stats_hud_avg_frame), d.frametimeMs?.let { "%.1f ms".format(it) } ?: "–") + stat(stringResource(R.string.stats_hud_low), f1(d.lows.low1Fps)) + val slow = d.slowPerMinute + stat(stringResource(R.string.stats_hud_slow_frames), slow?.let { stringResource(R.string.stats_hud_per_minute, it) } ?: "–", + if ((slow ?: 0) > 0) HudInk.amber else HudInk.value) + } + Spacer(Modifier.height(12.dp)) + val target = 1000f / d.hz + BoxWithConstraints(Modifier.weight(1f).fillMaxWidth()) { + val graphColor = lerp(accent, Color.White, 0.3f) + Canvas(Modifier.fillMaxSize()) { + val axis = Color.White.copy(alpha = 0.12f) + drawLine(axis, Offset(0f, 0f), Offset(0f, size.height), 1.dp.toPx()) + drawLine(axis, Offset(0f, size.height), Offset(size.width, size.height), 1.dp.toPx()) + val dash = PathEffect.dashPathEffect(floatArrayOf(6.dp.toPx(), 5.dp.toPx())) + for ((ms, color) in listOf(target to Color.White.copy(alpha = 0.25f), target * 2 to HudInk.amber.copy(alpha = 0.5f))) { + val y = size.height * (1f - ms / FrameStats.GRAPH_MAX_MS) + drawLine(color, Offset(0f, y), Offset(size.width, y), 1.dp.toPx(), pathEffect = dash) + } + } + Graph(d.graph.toList(), 0f, FrameStats.GRAPH_MAX_MS, graphColor, Modifier.fillMaxSize()) + for ((ms, color) in listOf(target to HudInk.dim, target * 2 to HudInk.amber)) { + Small("%.1f ms · %d fps".format(ms, (1000f / ms).roundToInt()), 11.sp, color, + Modifier.align(Alignment.TopEnd).offset(y = maxHeight * (1f - ms / FrameStats.GRAPH_MAX_MS) - 17.dp)) + } + } +} + +@Composable +private fun ColumnScope.Night(d: HudData, dim: Boolean) { + val clockInk = if (dim) Color(0xFF6F7A87) else HudInk.value + val fpsInk = if (dim) Color(0xFF4D7FA8) else LocalPalette.current.primary + Column(Modifier.weight(1f), verticalArrangement = Arrangement.Center) { + Text(d.clock, fontSize = 88.sp, fontWeight = FontWeight.Light, color = clockInk, maxLines = 1, softWrap = false) + Line(buildAnnotatedString { + num(f1(d.fps), "fps", 30.sp, fpsInk) + d.device?.battery?.percent?.let { + withStyle(SpanStyle(color = HudInk.sep)) { append(" · ") } + num(it.toString(), "%", 30.sp, if (dim) Color(0xFF6B5A44) else StatsColors.bat) + } + }, 30.sp, Modifier.padding(top = 14.dp)) + } +} + +@Composable +private fun ColumnScope.Mega(d: HudData, accent: Color) { + val s = d.device + val z = 13.5.sp + val left = mutableListOf( + row("GPU", StatsColors.gpu, AnnotatedString(d.gpuName)), + row("GPU", StatsColors.gpu, buildAnnotatedString { + num(s?.gpuPercent?.toString() ?: "–", "%", z); gap(); temp(d, HudMetrics.TempSensor.GPU, s?.gpuTempC, z); gap(); num(s?.gpuClockMhz?.toString() ?: "–", "MHz", z) + }), + row("CPU", StatsColors.cpu, buildAnnotatedString { + num(s?.cpuPercent?.toString() ?: "–", "%", z); gap(); temp(d, HudMetrics.TempSensor.CPU, s?.cpuTempC, z); gap(); num(s?.cpuClockMhz?.toString() ?: "–", "MHz", z) + }), + ) + val cores = s?.perCorePercent?.size ?: 0 + for (i in 0 until cores) { + left += row("C$i", StatsColors.cpu, buildAnnotatedString { + num(s?.perCorePercent?.getOrNull(i)?.takeIf { it >= 0 }?.toString() ?: "–", "%", z); gap() + num(s?.perCoreClockMhz?.getOrNull(i)?.takeIf { it > 0 }?.toString() ?: "–", "MHz", z) + }) + } + val right = listOf( + row("VRAM", HudInk.vram, buildAnnotatedString { num(gib(s?.vramUsedBytes), "GiB", z) }), + row("RAM", StatsColors.ram, buildAnnotatedString { num("${gib(s?.ramUsedBytes)}/${gib(s?.ramTotalBytes)}", "GiB", z); gap(); num(s?.ramPercent?.roundToInt()?.toString() ?: "–", "%", z) }), + row("SWP", StatsColors.ram, buildAnnotatedString { num("${gib(s?.swapUsedBytes)}/${gib(s?.swapTotalBytes)}", "GiB", z) }), + row("NET", accent, buildAnnotatedString { + withStyle(SpanStyle(color = HudInk.dim)) { append("↓") }; num(s?.netDownBps?.let { (it / 1024).toString() } ?: "–", "", z) + append(" "); withStyle(SpanStyle(color = HudInk.dim)) { append("↑") }; num(s?.netUpBps?.let { (it / 1024).toString() } ?: "–", "KB/s", z) + }), + row("BAT", StatsColors.bat, buildAnnotatedString { + num(s?.battery?.percent?.toString() ?: "–", "%", z); gap(); temp(d, HudMetrics.TempSensor.BATTERY, s?.battery?.tempC, z); gap() + num(s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f".format(it) } ?: "–", "W", z) + }), + row("FAN", HudInk.dim, buildAnnotatedString { num(d.fanRpm?.toString() ?: "–", "rpm", z) }), + row(d.engine.ifEmpty { "FPS" }, accent, buildAnnotatedString { num(f1(d.fps), "FPS", z, accent); gap(); num(f1(d.frametimeMs), "ms", z) }), + row("AVG", HudInk.low, buildAnnotatedString { num(f1(d.avgFps), "FPS", z) }), + row("1%", HudInk.low, buildAnnotatedString { num(f1(d.lows.low1Fps), "FPS", z) }), + row("0.1%", HudInk.low, buildAnnotatedString { num(f1(d.lows.low01Fps), "FPS", z) }), + row("0.01%", HudInk.low, buildAnnotatedString { num(f1(d.lows.low001Fps), "FPS", z) }), + ) + Row(horizontalArrangement = Arrangement.spacedBy(24.dp)) { + Rows(left, z, 44.dp, 3.dp) + Rows(right, z, 58.dp, 3.dp) + } + Spacer(Modifier.weight(1f)) + Line(buildAnnotatedString { + withStyle(SpanStyle(color = HudInk.dim)) { append("RES ") }; append(d.resolution.ifEmpty { "–" }) + d.proton?.let { withStyle(SpanStyle(color = HudInk.dim)) { append(" · ") }; withStyle(SpanStyle(color = HudInk.vram)) { append(it) } } + d.played?.let { withStyle(SpanStyle(color = HudInk.dim)) { append(" · ") }; append(it) } + }, 12.5.sp, Modifier.padding(bottom = 6.dp)) + FrameGraph(d, accent, 30.dp) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt new file mode 100644 index 0000000000..fc900a4f56 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt @@ -0,0 +1,413 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.drawscope.drawIntoCanvas +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.graphics.nativeCanvas +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.layout.Layout +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Constraints +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.TextUnit +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.hud.DroidDeckMark +import com.droiddeck.launcher.hud.FrameStats +import com.droiddeck.launcher.hud.HudMetrics +import com.droiddeck.launcher.session.StatsStrip +import com.droiddeck.launcher.session.StripMetric +import kotlin.math.max +import kotlin.math.roundToInt + +internal object StatsColors { + val cpu = Color(0xFF58A6FF) + val gpu = Color(0xFF5EE08A) + val ram = Color(0xFFFF7BC0) + val bat = Color(0xFFFFAB5E) + val throttle = Color(0xFF14A39A) + val brake = Color(0xFFE5484D) + val speed = Color(0xFF2E8FD6) + val warn = Color(0xFFF2C94C) + val shiftGreen = Color(0xFF2FB36A) + val badge = Color(0xFF0B0D10) +} + +internal class History(private val capacity: Int) { + private val values = ArrayDeque<Float>(capacity) + private val times = ArrayDeque<Long>(capacity) + fun add(v: Float, atMs: Long = 0L) { + if (values.size == capacity) { + values.removeFirst() + times.removeFirst() + } + values.addLast(v) + times.addLast(atMs) + } + fun snapshot(): List<Float> = values.toList() + fun spanSeconds(): Int { + val first = times.firstOrNull()?.takeIf { it > 0L } ?: return 0 + val last = times.last() + return ((last - first + 500L) / 1000L).toInt() + } +} + +private val MARK_RATIO = DroidDeckMark.widthFor(1f) + +@Composable +internal fun DroidDeckLogo(height: Dp, modifier: Modifier = Modifier, body: Color = Color.White, orb: Color = LocalPalette.current.primary) { + Canvas(modifier.size(height * MARK_RATIO, height)) { + val b = body.toArgb() + val o = orb.toArgb() + drawIntoCanvas { DroidDeckMark.draw(it.nativeCanvas, 0f, 0f, size.height, b, o) } + } +} + +@Composable +private fun LogoBadge(size: Dp) { + val shape = RoundedCornerShape(size * 0.22f) + Box(Modifier.size(size).clip(shape).background(StatsColors.badge).border(2.dp, LocalPalette.current.primary, shape), contentAlignment = Alignment.Center) { + DroidDeckLogo(size * 0.62f) + } +} + +@Composable +private fun LogoHeader(clock: String, game: String?) { + val colors = MaterialTheme.colorScheme + Row(Modifier.fillMaxWidth().padding(horizontal = 2.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + Wordmark(14.dp, ink = colors.onBackground) + Text(game.orEmpty(), fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, textAlign = TextAlign.Center, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + if (clock.isNotEmpty()) Text(clock, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } +} + +@Composable +internal fun Sparkline(values: List<Float>, min: Float, max: Float, color: Color, modifier: Modifier) { + Canvas(modifier) { + if (values.size < 2 || max <= min) return@Canvas + val path = Path() + values.forEachIndexed { i, v -> + val x = i / (values.size - 1f) * size.width + val y = size.height - ((v - min) / (max - min)).coerceIn(0f, 1f) * (size.height - 2f) - 1f + if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) + } + drawPath(path, color, style = Stroke(width = 2.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round)) + } +} + +@Composable +internal fun StatsCard(title: String?, modifier: Modifier = Modifier, content: @Composable ColumnScope.() -> Unit) { + val pal = LocalPalette.current + val shape = RoundedCornerShape(14.dp) + Column( + modifier.clip(shape).background(pal.surface).border(1.dp, pal.primary.copy(alpha = 0.22f), shape).padding(horizontal = 12.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + if (title != null) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + DroidDeckLogo(12.dp, body = MaterialTheme.colorScheme.onSurfaceVariant) + if (title.isNotEmpty()) Text(title.uppercase(), fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = pal.primary, letterSpacing = 0.6.sp, + maxLines = 1, overflow = TextOverflow.Ellipsis) + } + content() + } +} + +internal class StripData( + val fps: Float?, + val device: HudMetrics.Snapshot?, + val fpsHistory: List<Float>, + val cpuHistory: List<Float>, + val gpuHistory: List<Float>, + val wattsHistory: List<Float>, + val clock: String, + val game: String? = null, + val engine: String = "", + val lows: FrameStats.Lows? = null, + val graph: FloatArray? = null, + val metrics: Set<StripMetric> = StripMetric.defaults, + val fahrenheit: Boolean = false, + val tempColor: ((HudMetrics.TempSensor, Int) -> Color)? = null, +) + +private fun percentTemp(percent: Int?, temp: Int?): String = + listOfNotNull(percent?.let { "$it%" }, temp?.let { "$it°" }).joinToString(" · ").ifEmpty { "–" } + +private fun batteryText(s: HudMetrics.Snapshot?): String = + listOfNotNull(s?.battery?.percent?.let { "$it%" }, s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f W".format(it) }).joinToString(" · ").ifEmpty { "–" } + +private fun fpsText(fps: Float?): String = fps?.takeIf { it > 0f }?.let { "%.1f".format(it) } ?: "–" + +@Composable +internal fun StatsStripView(style: StatsStrip, d: StripData, onTap: () -> Unit) { + Box(Modifier.fillMaxWidth().clickable(onClick = onTap)) { + when (style) { + StatsStrip.LINE -> LineStrip(d) + StatsStrip.PANEL -> PanelStrip(d) + StatsStrip.TILES -> TilesStrip(d) + StatsStrip.RINGS -> RingsStrip(d) + } + } +} + +private object LineInk { + val value = Color(0xFFF2F5F9) + val dim = Color(0xFF9AA4B2) + val vram = Color(0xFFC98BFF) +} + +private class LineItem(val priority: Int, val content: @Composable () -> Unit) + +@Composable +internal fun LineStrip(d: StripData, modifier: Modifier = Modifier) { + val pal = LocalPalette.current + val shape = RoundedCornerShape(12.dp) + val m = d.metrics + val s = d.device + val items = ArrayList<LineItem>() + items += LineItem(0) { DroidDeckLogo(16.dp) } + if (StripMetric.ENGINE in m && d.engine.isNotEmpty()) items += LineItem(70) { LineText(d.engine, LineInk.dim, 12.sp) } + items += LineItem(0) { + Row(verticalAlignment = Alignment.Bottom) { + LineText(fpsText(d.fps), LineInk.value, 17.sp) + LineText("fps", LineInk.dim, 10.sp, Modifier.padding(start = 2.dp, bottom = 2.dp)) + } + } + val graph = d.graph + if (StripMetric.GRAPH in m && graph != null) items += LineItem(60) { + Sparkline(graph.asList(), 0f, FrameStats.GRAPH_MAX_MS, lerp(pal.primary, Color.White, 0.3f), Modifier.width(56.dp).height(16.dp)) + } + if (StripMetric.LOWS in m) { + items += LineItem(10) { LinePair("1%", LineInk.dim, lowText(d.lows?.low1Fps), StatsColors.cpu) } + items += LineItem(90) { LinePair("0.1%", LineInk.dim, lowText(d.lows?.low01Fps), StatsColors.cpu) } + } + if (StripMetric.LOW001 in m) items += LineItem(100) { LinePair("0.01%", LineInk.dim, lowText(d.lows?.low001Fps), StatsColors.cpu) } + if (StripMetric.GPU in m || StripMetric.GPU_TEMP in m) items += LineItem(20) { + LineMetric("GPU", StatsColors.gpu, if (StripMetric.GPU in m) s?.gpuPercent else null, + if (StripMetric.GPU_TEMP in m) s?.gpuTempC else null, HudMetrics.TempSensor.GPU, d) + } + if (StripMetric.CPU in m || StripMetric.CPU_TEMP in m) items += LineItem(30) { + LineMetric("CPU", StatsColors.cpu, if (StripMetric.CPU in m) s?.cpuPercent else null, + if (StripMetric.CPU_TEMP in m) s?.cpuTempC else null, HudMetrics.TempSensor.CPU, d) + } + if (StripMetric.VRAM in m) items += LineItem(80) { LinePair("VRAM", LineInk.vram, gibText(s?.vramUsedBytes), LineInk.vram) } + if (StripMetric.RAM in m) items += LineItem(40) { LinePair("RAM", StatsColors.ram, s?.let { "${it.ramPercent.roundToInt()}%" } ?: "–", StatsColors.ram) } + val clock = StripMetric.CLOCK in m && d.clock.isNotEmpty() + if (clock) items += LineItem(50) { LineText(d.clock, LineInk.dim, 12.sp) } + PriorityRow( + IntArray(items.size) { items[it].priority }, 10.dp, pinLast = clock, + modifier = modifier.fillMaxWidth().clip(shape).background(pal.surface).border(1.dp, pal.primary.copy(alpha = 0.35f), shape) + .padding(horizontal = 10.dp, vertical = 6.dp), + ) { + items.forEach { it.content() } + } +} + +@Composable +private fun PriorityRow(priorities: IntArray, spacing: Dp, pinLast: Boolean, modifier: Modifier = Modifier, content: @Composable () -> Unit) { + Layout(content, modifier) { measurables, constraints -> + val gap = spacing.roundToPx() + val loose = Constraints(maxHeight = constraints.maxHeight) + val placeables = measurables.map { it.measure(loose) } + val max = if (constraints.hasBoundedWidth) constraints.maxWidth else Int.MAX_VALUE + val keep = fitByPriority(IntArray(placeables.size) { placeables[it].width }, priorities.copyOf(placeables.size), gap, max) + val height = maxOf(constraints.minHeight, placeables.filterIndexed { i, _ -> keep[i] }.maxOfOrNull { it.height } ?: 0) + val used = placeables.filterIndexed { i, _ -> keep[i] }.sumOf { it.width } + gap * maxOf(0, keep.count { it } - 1) + val width = if (constraints.hasBoundedWidth) constraints.maxWidth else used + layout(width, height) { + var x = 0 + val last = placeables.lastIndex + placeables.forEachIndexed { i, p -> + if (!keep[i]) return@forEachIndexed + val px = if (pinLast && i == last) width - p.width else x + p.placeRelative(px, (height - p.height) / 2) + x += p.width + gap + } + } + } +} + +@Composable +private fun LineText(text: String, color: Color, size: TextUnit = 13.sp, modifier: Modifier = Modifier) { + Text(text, fontSize = size, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = color, maxLines = 1, softWrap = false, + modifier = modifier) +} + +@Composable +private fun LinePair(label: String, labelColor: Color, value: String, valueColor: Color) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { + LineText(label, labelColor, 11.sp) + LineText(value, valueColor) + } +} + +@Composable +private fun LineMetric(label: String, color: Color, percent: Int?, tempC: Int?, sensor: HudMetrics.TempSensor, d: StripData) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { + LineText(label, color, 11.sp) + if (percent == null && tempC == null) LineText("–", color) + if (percent != null) LineText("$percent%", color) + if (tempC != null) LineText(tempText(tempC, d.fahrenheit), d.tempColor?.invoke(sensor, tempC) ?: LineInk.value) + } +} + +private fun lowText(fps: Float?): String = fps?.takeIf { it > 0f }?.let { "%.1f".format(it) } ?: "–" + +private fun gibText(bytes: Long?): String = bytes?.let { "%.1fGiB".format(it / 1073741824.0) } ?: "–" + +private fun tempText(c: Int, fahrenheit: Boolean): String = if (fahrenheit) "${(c * 9f / 5f + 32f).roundToInt()}°F" else "$c°C" + +@Composable +private fun PanelStrip(d: StripData) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val accent = pal.primary + val shape = RoundedCornerShape(18.dp) + Row( + Modifier.fillMaxWidth().clip(shape).background(pal.surface).border(2.dp, accent, shape).padding(horizontal = 12.dp, vertical = 10.dp), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + LogoBadge(40.dp) + Column(Modifier.widthIn(min = 84.dp)) { + Row(verticalAlignment = Alignment.Bottom) { + Text(fpsText(d.fps), fontSize = 30.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent, maxLines = 1) + Text(" fps", fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(bottom = 4.dp)) + } + Text(d.fps?.takeIf { it > 0f }?.let { "%.1f ms".format(1000f / it) } ?: stringResource(R.string.stats_fps_needs_hud), + fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant, maxLines = 1) + } + Sparkline(d.fpsHistory.map { 1000f / max(it, 1f) }, 8f, 34f, lerp(accent, Color.White, 0.3f), Modifier.weight(1f).height(44.dp)) + Column(verticalArrangement = Arrangement.spacedBy(1.dp)) { + MetricRow("CPU", percentTemp(d.device?.cpuPercent, d.device?.cpuTempC), StatsColors.cpu) + MetricRow("GPU", percentTemp(d.device?.gpuPercent, d.device?.gpuTempC), StatsColors.gpu) + MetricRow("RAM", d.device?.let { "${it.ramPercent.roundToInt()}%" } ?: "–", StatsColors.ram) + MetricRow("BAT", batteryText(d.device), StatsColors.bat) + } + } +} + +@Composable +private fun MetricRow(label: String, value: String, color: Color) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = color, modifier = Modifier.width(36.dp)) + Text(value, fontSize = 13.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = MaterialTheme.colorScheme.onBackground, maxLines = 1) + } +} + +@Composable +private fun TilesStrip(d: StripData) { + val accent = LocalPalette.current.primary + val s = d.device + val gpuPercent: Int? = s?.gpuPercent + val gpuTemp: Int? = s?.gpuTempC + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(6.dp)) { + LogoHeader(d.clock, d.game) + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + HistoryTile("FPS", accent, fpsText(d.fps), "fps", d.fpsHistory, 75f) + HistoryTile("CPU", StatsColors.cpu, s?.cpuPercent?.let { "$it%" } ?: "–", s?.cpuTempC?.let { "$it°" } ?: "", d.cpuHistory, 100f) + HistoryTile("GPU", StatsColors.gpu, gpuPercent?.let { "$it%" } ?: gpuTemp?.let { "$it°" } ?: "–", + if (gpuPercent != null) gpuTemp?.let { "$it°" } ?: "" else "", d.gpuHistory, 100f) + HistoryTile(stringResource(R.string.bottom_telemetry_battery).uppercase(), StatsColors.bat, s?.battery?.percent?.let { "$it%" } ?: "–", + s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1fW".format(it) } ?: "", d.wattsHistory, 10f) + } + } +} + +@Composable +private fun RowScope.HistoryTile(label: String, color: Color, value: String, unit: String, history: List<Float>, max: Float) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + Column( + Modifier.weight(1f).clip(RoundedCornerShape(12.dp)).background(pal.surface) + .drawBehind { drawRect(color, topLeft = Offset.Zero, size = Size(size.width, 3.dp.toPx())) } + .padding(start = 10.dp, end = 10.dp, top = 9.dp, bottom = 6.dp), + ) { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = color, letterSpacing = 0.8.sp, maxLines = 1) + Row(verticalAlignment = Alignment.Bottom) { + Text(value, fontSize = 22.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground, maxLines = 1) + if (unit.isNotEmpty()) Text(" $unit", fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, modifier = Modifier.padding(bottom = 3.dp)) + } + Sparkline(history, 0f, max, color, Modifier.fillMaxWidth().height(24.dp)) + } +} + +@Composable +private fun RingsStrip(d: StripData) { + val s = d.device + val gpuPercent: Int? = s?.gpuPercent + val gpuTemp: Int? = s?.gpuTempC + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(6.dp)) { + LogoHeader(d.clock, d.game) + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + RingTile("CPU", StatsColors.cpu, s?.cpuPercent?.let { it / 100f }, s?.cpuPercent?.let { "$it%" } ?: "–", s?.cpuTempC?.let { "$it °C" } ?: "") + RingTile("GPU", StatsColors.gpu, gpuPercent?.let { it / 100f }, gpuPercent?.let { "$it%" } ?: gpuTemp?.let { "$it°" } ?: "–", + if (gpuPercent != null) gpuTemp?.let { "$it °C" } ?: "" else "") + RingTile("RAM", StatsColors.ram, s?.ramPercent?.let { it / 100f }, s?.let { "${it.ramPercent.roundToInt()}%" } ?: "–", + s?.let { "%.1f of %.1f GB".format(it.ramUsedBytes / 1e9, it.ramTotalBytes / 1e9) } ?: "") + RingTile(stringResource(R.string.bottom_telemetry_battery).uppercase(), StatsColors.bat, s?.battery?.percent?.let { it / 100f }, + s?.battery?.percent?.let { "$it%" } ?: "–", s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f W".format(it) } ?: "") + } + } +} + +@Composable +private fun RowScope.RingTile(label: String, color: Color, fraction: Float?, center: String, sub: String) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + Row( + Modifier.weight(1f).clip(RoundedCornerShape(12.dp)).background(pal.surface).padding(8.dp), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + Box(Modifier.size(52.dp), contentAlignment = Alignment.Center) { + Canvas(Modifier.fillMaxSize()) { + val w = 6.dp.toPx() + val tl = Offset(w / 2, w / 2) + val sz = Size(size.width - w, size.height - w) + drawArc(pal.line, 0f, 360f, false, topLeft = tl, size = sz, style = Stroke(width = w)) + if (fraction != null) drawArc(color, -90f, (fraction.coerceIn(0f, 1f) * 360f).coerceAtLeast(1f), false, topLeft = tl, size = sz, + style = Stroke(width = w, cap = StrokeCap.Round)) + } + Text(center, fontSize = 12.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground, maxLines = 1) + } + Column { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = color, letterSpacing = 0.8.sp, maxLines = 1) + if (sub.isNotEmpty()) Text(sub, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index 4a93056dda..b24c0f2cf1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -38,6 +38,8 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.geometry.Rect import androidx.compose.ui.layout.boundsInParent +import androidx.compose.ui.layout.layout +import androidx.compose.ui.unit.Constraints import androidx.compose.ui.layout.onPlaced import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -142,7 +144,7 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) scrim = { if (games.size >= WALL_MIN_GAMES) WallFade() }, words = { val runtimeStatus: @Composable () -> Unit = { - if (s.busy || !s.ready || (s.available != null && s.available != s.installed)) RuntimeChip(s) + if (s.busy || (s.available != null && s.available != s.installed)) RuntimeChip(s) else if (s.integration.suggested && signedIn && !com.droiddeck.launcher.core.PhantomProcessLimit.blocksSteam(s.phantomProcessStatus)) IntegrationSuggestion(s.integration, { a.onSteamIntegration(null) }, a.onDismissIntegration) } @@ -166,11 +168,17 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) ) } +internal fun Modifier.overhang(by: androidx.compose.ui.unit.Dp = 4.dp): Modifier = layout { measurable, constraints -> + val e = by.roundToPx() + val placeable = measurable.measure(Constraints.fixed(constraints.maxWidth + e * 2, constraints.maxHeight + e * 2)) + layout(constraints.maxWidth, constraints.maxHeight) { placeable.place(-e, -e) } +} + @Composable internal fun WallFade() { val colors = MaterialTheme.colorScheme Box( - Modifier.fillMaxSize().background( + Modifier.fillMaxSize().overhang().background( Brush.horizontalGradient( 0f to colors.background.copy(alpha = 0.97f), 0.34f to colors.background.copy(alpha = 0.86f), @@ -179,7 +187,7 @@ internal fun WallFade() { ), ), ) - Box(Modifier.fillMaxSize().background(Brush.verticalGradient(0.55f to Color.Transparent, 1f to colors.background.copy(alpha = 0.9f)))) + Box(Modifier.fillMaxSize().overhang().background(Brush.verticalGradient(0.55f to Color.Transparent, 1f to colors.background.copy(alpha = 0.9f)))) } @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt index 8e2380e94e..2827e3c7cd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt @@ -60,7 +60,7 @@ internal fun SteamIntegration.State.enabled(feature: Feature) = when (feature) { Feature.WIFI -> wifi && locationPermission && locationOn Feature.BRIGHTNESS -> brightness Feature.HOME -> home - Feature.SHORTCUTS -> home && shortcuts + Feature.SHORTCUTS -> shortcuts } internal fun SteamIntegration.State.enabledCount() = Feature.entries.count { enabled(it) } @@ -105,14 +105,12 @@ private fun IntegrationRow( val bg by animateColorAsState(if (flash) pal.signal.copy(alpha = 0.12f) else Color.Transparent, Motion.tw(400), label = "integrationFlash") val wifiLocationOff = feature == Feature.WIFI && state.wifi && state.locationPermission && !state.locationOn val wifiDenied = feature == Feature.WIFI && !state.locationPermission && state.locationBlocked - val needsHome = feature == Feature.SHORTCUTS && !state.home - val restricted = feature == Feature.SHORTCUTS && !needsHome && !state.shortcuts && state.shortcutsRestricted - val maybeRestricted = feature == Feature.SHORTCUTS && !needsHome && !state.shortcuts && !restricted && state.shortcutsTried && + val restricted = feature == Feature.SHORTCUTS && !state.shortcuts && state.shortcutsRestricted + val maybeRestricted = feature == Feature.SHORTCUTS && !state.shortcuts && !restricted && state.shortcutsTried && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU val hint = stringResource(when { wifiLocationOff -> R.string.integration_wifi_location_off wifiDenied -> R.string.integration_wifi_denied - needsHome -> R.string.integration_shortcuts_needs_home restricted -> R.string.integration_shortcuts_restricted maybeRestricted -> R.string.integration_shortcuts_maybe_restricted feature == Feature.WIFI -> if (on) R.string.integration_wifi_on else R.string.integration_wifi_hint @@ -141,7 +139,7 @@ private fun IntegrationRow( restricted || maybeRestricted -> SecondaryButton(stringResource(R.string.integration_app_info), compact = true, onClick = onAppInfo) } val checked = if (feature == Feature.WIFI) state.wifi && state.locationPermission else on - ToggleSwitch(checked, enabled = !needsHome && !restricted, label = stringResource(featureTitle(feature)), + ToggleSwitch(checked, enabled = !restricted, label = stringResource(featureTitle(feature)), modifier = Modifier.testTag("integration-action-${feature.name.lowercase()}")) { onFeature(feature) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt b/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt index 3791fb7820..73e68986de 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt @@ -124,6 +124,18 @@ internal enum class StepSide { Right, } +internal fun fitStepSide(preferred: StepSide, pill: Rect, hostWidth: Float, wanted: Float): StepSide { + val leftRoom = pill.right + val rightRoom = hostWidth - pill.left + val room = if (preferred == StepSide.Left) leftRoom else rightRoom + val other = if (preferred == StepSide.Left) rightRoom else leftRoom + return if (room >= wanted || other <= room) preferred else if (preferred == StepSide.Left) StepSide.Right else StepSide.Left +} + +internal fun stepReach(side: StepSide, pill: Rect, hostWidth: Float, width: Int): Pair<Float, Float> = + if (side == StepSide.Left) pill.left to (pill.right - width).coerceAtLeast(0f) + else pill.right to (pill.left + width).coerceAtMost(hostWidth) + internal class StepOutScope(private val items: List<Animatable<Float, AnimationVector1D>>, val first: FocusRequester, val open: Boolean, val maxHeight: Dp) { fun Modifier.stepItem(i: Int): Modifier = graphicsLayer { val v = items[i.coerceIn(0, items.lastIndex)].value @@ -141,7 +153,7 @@ private val OutFillet = 10.dp internal fun StepOut( open: Boolean, pill: Rect, - side: StepSide, + preferredSide: StepSide, accent: Color, onDismiss: () -> Unit, onClosed: () -> Unit, @@ -166,6 +178,7 @@ internal fun StepOut( val opener = remember { arrayOfNulls<GlideSource>(1) } val openNow = androidx.compose.runtime.rememberUpdatedState(open) var moving by remember { mutableStateOf(false) } + val placed = remember { arrayOfNulls<Any>(3) } if (moving) VeilRing() val pull = with(density) { OutPull.toPx() } val corner = pillCorner?.let { with(density) { it.toPx() } } ?: minOf(pill.height, pill.width) / 2f @@ -177,13 +190,18 @@ internal fun StepOut( maxOf(hostHeight - pill.bottom - pull, pill.top - pull).coerceAtLeast(44.dp.toPx()).toDp() } val up = measured?.let { pill.bottom + pull + it.height > hostHeight && pill.top - pull - it.height >= 0f } ?: false + val wantedW = with(density) { maxWidth.toPx() } + val side = fitStepSide(preferredSide, pill, hostWidth, wantedW) val room = if (side == StepSide.Left) pill.right else hostWidth - pill.left - val maxW = with(density) { maxWidth.toPx() }.coerceAtMost(room).coerceAtLeast(pill.width) - LaunchedEffect(open, measured) { - if (!open && !grown) { onClosed(); return@LaunchedEffect } + val maxW = wantedW.coerceAtMost(room).coerceAtLeast(pill.width) + LaunchedEffect(open, measured, side, pill, hostWidth) { + val moved = placed[0] == open && placed[1] == measured + val flipped = placed[2] != null && placed[2] != side + placed[0] = open; placed[1] = measured; placed[2] = side + if (!open && !grown) { if (!moved) onClosed(); return@LaunchedEffect } val c = measured ?: return@LaunchedEffect - val rest = if (side == StepSide.Left) pill.left else pill.right - val out = if (side == StepSide.Left) (pill.right - c.width).coerceAtLeast(0f) else (pill.left + c.width).coerceAtMost(hostWidth) + val (rest, out) = stepReach(side, pill, hostWidth, c.width) + if (grown && flipped) edge.snapTo(if (open) out else rest) val boxBottom = pill.bottom + pull + c.height if (open) { if (!grown) { @@ -202,11 +220,6 @@ internal fun StepOut( pieces.forEachIndexed { i, a -> launch { delay(Motion.ms(260 + i * 55).toLong()); a.animateTo(1f, Motion.tw(220)) } } - if (inputMode.inputMode == InputMode.Keyboard) launch { - delay(Motion.ms(300).toLong()) - withFrameNanos { } - runCatching { first.requestFocus() } - } } } else { opener[0]?.let { o -> if (inputMode.inputMode == InputMode.Keyboard) runCatching { o.requester.requestFocus() } } @@ -225,6 +238,13 @@ internal fun StepOut( } } + LaunchedEffect(open, measured) { + if (!open || measured == null || inputMode.inputMode != InputMode.Keyboard) return@LaunchedEffect + delay(Motion.ms(300).toLong()) + withFrameNanos { } + runCatching { first.requestFocus() } + } + LaunchedEffect(open, grown, inputMode.inputMode) { if (open && grown && inputMode.inputMode == InputMode.Keyboard) { withFrameNanos { }; runCatching { first.requestFocus() } } } @@ -245,8 +265,7 @@ internal fun StepOut( else stepPathRight(path, pill, edge.value, bottom.value, pill.bottom + pull, boxCorner, fillet, corner) if (up) path.transform(Matrix().apply { this[1, 1] = -1f; this[3, 1] = pill.top + pill.bottom }) val a = measured?.let { c -> - val rest = if (side == StepSide.Left) pill.left else pill.right - val out = if (side == StepSide.Left) (pill.right - c.width).coerceAtLeast(0f) else (pill.left + c.width).coerceAtMost(hostWidth) + val (rest, out) = stepReach(side, pill, hostWidth, c.width) val down = pill.bottom + pull + c.height - pill.bottom val across = kotlin.math.abs(out - rest) val fd = if (down < 1f) 1f else (bottom.value - pill.bottom) / down diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt b/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt index 18a4b9703c..9adfb00dbc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt @@ -39,7 +39,7 @@ internal fun StepsLayer(origin: Offset) { androidx.activity.compose.BackHandler(enabled = Steps.open) { Steps.fold() } key(ask) { StepOut( - open = Steps.open, pill = ask.anchor.translate(-origin), side = ask.side, accent = ask.accent, + open = Steps.open, pill = ask.anchor.translate(-origin), preferredSide = ask.side, accent = ask.accent, onDismiss = { Steps.fold() }, onClosed = { Steps.closed(ask) }, pillCorner = ask.pillCorner, maxWidth = ask.maxWidth, items = ask.items, handle = ask.handle, content = ask.content, ) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt index 0c1f66b9d4..acf6753bf1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -621,7 +621,6 @@ private fun GamesView(report: StorageReport, sessionRunning: Boolean, a: FrontEn Spacer(Modifier.height(8.dp)) Note(stringResource(R.string.storage_games_note)) confirm?.let { g -> - // steam://uninstall reaches only the session's client, the selected one. val otherClient = g.x64 != (SessionPrefs.steamClientArch(LocalContext.current) == "x86_64") if (otherClient) AlertDialog( onDismissRequest = { confirm = null }, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt index 642160b158..5d9adf2cbf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt @@ -204,22 +204,6 @@ internal fun AchievementRow(a: Achievement, compact: Boolean, modifier: Modifier } } -@Composable -internal fun StoreAchievementsCard(game: StoreAchievements.Game, title: String, modifier: Modifier = Modifier) { - val label = StoreAchievements.forSource(game.source)?.label ?: return - val state = rememberAchievements(game) ?: return - var open by remember { mutableStateOf(false) } - StoreAchievementsCardContent(label, state, modifier) { open = true } - if (open) { - VeilRing() - Dialog(onDismissRequest = { open = false }, properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false)) { - CompositionLocalProvider(LocalFrontFocus provides null) { - SessionAchievementsPanel(label, state, title, veil = Color.Transparent, floating = true, onClose = { open = false }) - } - } - } -} - @Composable internal fun StoreAchievementsCardContent(label: String, state: AchievementsState, modifier: Modifier = Modifier, onOpen: () -> Unit) { val colors = MaterialTheme.colorScheme diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index 40bfd22c4c..1d2aef9d6e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -31,6 +31,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.AMAZON.id -> SourceColours(Color(0xFF3A2A0A), Color(0xFFFFC266), Color(0xFFFF9900)) Store.XBOX.id -> SourceColours(Color(0xFF17381B), Color(0xFFC6EDC2), Color(0xFF70C850)) Store.ITCH.id -> SourceColours(Color(0xFF3A1A1E), Color(0xFFFFB3B3), Color(0xFFFF5C5C)) + Store.GAMEJOLT.id -> SourceColours(Color(0xFF232E00), Color(0xFFE3FF66), Color(0xFFCCFF00)) Store.BATTLENET.id -> SourceColours(Color(0xFF0A2440), Color(0xFF9DD1FF), Color(0xFF148EFF)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) @@ -45,6 +46,7 @@ internal fun sourceLabel(source: String): String = when (source) { Store.AMAZON.id -> Store.AMAZON.label Store.XBOX.id -> Store.XBOX.label Store.ITCH.id -> Store.ITCH.label + Store.GAMEJOLT.id -> Store.GAMEJOLT.label Store.BATTLENET.id -> Store.BATTLENET.label else -> stringResource(R.string.source_added) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreGameFacts.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreGameFacts.kt index 314cb13dac..90d6d4ac1a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreGameFacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreGameFacts.kt @@ -177,7 +177,6 @@ internal fun StoreGameFacts(developer: String, publisher: String, releaseDate: S } } -/** The headline scores, small enough to sit inside the action capsule. */ @Composable internal fun CapsuleScores(scores: GameScores, modifier: Modifier = Modifier) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(2.dp), modifier = modifier) { @@ -216,7 +215,6 @@ private fun CapsuleStat(label: String, link: String?, showLabel: Boolean = true, } } -/** Credits and times as label and value rows, for the details panel. */ @Composable internal fun StoreDetailRows(developer: String, publisher: String, releaseDate: String, scores: GameScores) { val released = remember(releaseDate) { GameFacts.releaseLabel(releaseDate) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt index 3996d30423..8cba37f917 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt @@ -1,6 +1,5 @@ package com.droiddeck.launcher.ui -// `split` is the size of a leading section that starts its own rows; 0 means one continuous grid. internal fun storeGridNeighbor(index: Int, count: Int, columns: Int, direction: Int, split: Int = 0): Int? { if (index !in 0 until count || columns < 1 || direction !in listOf(-1, 1)) return null if (split !in 1 until count) return (index + columns * direction).takeIf { it in 0 until count } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 1b965ee4c3..f9e2ed798f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -130,6 +130,7 @@ import coil.compose.AsyncImage import com.droiddeck.launcher.R import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.gamejolt.GameJoltBrowseState import com.droiddeck.launcher.stores.itch.ItchBrowseState import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreTab @@ -389,13 +390,13 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier } } }, - ) { key -> GameDetail(key, s, a, heroFocus, backLabel, hopRail = null, onBack = { closeGame() }) } + ) { key -> GameDetail(key, s, a, heroFocus, backLabel, hopRail = null, onBack = { closeGame() }, inStore = true) } } FlightLayer(hostAt) StoresMotion.step?.let { ask -> key(ask) { StepOut( - open = StoresMotion.stepOpen, pill = ask.anchor.translate(-hostAt), side = ask.side, accent = ask.accent, + open = StoresMotion.stepOpen, pill = ask.anchor.translate(-hostAt), preferredSide = ask.side, accent = ask.accent, onDismiss = { StoresMotion.fold() }, onClosed = { StoresMotion.closed(ask) }, pillCorner = ask.pillCorner, maxWidth = ask.maxWidth, items = ask.items, handle = ask.handle, content = ask.content, ) @@ -808,14 +809,6 @@ private fun SignInButton(store: Store, large: Boolean = false) { } } -@Composable -internal fun StoreLogo(store: Store, size: Dp) { - val c = sourceColours(store.id) - Box(contentAlignment = Alignment.Center, modifier = Modifier.size(size).clip(Shape14).background(c.fill).border(1.dp, c.dot.copy(alpha = 0.5f), Shape14)) { - Text(store.shortLabel, fontSize = (size.value / 4).sp, fontWeight = FontWeight.Black, color = c.ink, maxLines = 1) - } -} - @Composable private fun Storefront( @@ -835,8 +828,10 @@ private fun Storefront( fun shown(i: CatalogItem) = s.storesShowMature || !i.mature || i.accessible fun shelf(l: List<CatalogItem>?) = l?.filter(::shown) LaunchedEffect(store, q) { StoresState.search(ctx, store, q) } - val browsing = store == Store.ITCH && q.isEmpty() && ItchBrowseState.active - val browseItems = if (browsing) ItchBrowseState.items else emptyList() + val gameJolt = store == Store.GAMEJOLT + LaunchedEffect(gameJolt, s.storesShowMature) { if (gameJolt) GameJoltBrowseState.sync(ctx, s.storesShowMature) } + val browsing = q.isEmpty() && ((store == Store.ITCH && ItchBrowseState.active) || gameJolt) + val browseItems = if (!browsing) emptyList() else if (gameJolt) GameJoltBrowseState.items else ItchBrowseState.items val catalog = store == Store.BATTLENET && q.isEmpty() val visible = remember(found, library, shelves, q, s.storesShowMature, browsing, browseItems, catalog) { if (catalog) shelf(shelves?.trending) ?: emptyList() @@ -848,8 +843,10 @@ private fun Storefront( .filter { (it.title.lowercase().contains(q) || it.key in foundKeys) && shown(it) } } val nothing = stringResource(when { - browsing && ItchBrowseState.loading -> R.string.stores_shelves_loading - browsing && ItchBrowseState.failed -> R.string.stores_itch_browse_failed + browsing && gameJolt && GameJoltBrowseState.loading -> R.string.stores_shelves_loading + browsing && gameJolt && GameJoltBrowseState.failed -> R.string.stores_gamejolt_browse_failed + browsing && !gameJolt && ItchBrowseState.loading -> R.string.stores_shelves_loading + browsing && !gameJolt && ItchBrowseState.failed -> R.string.stores_itch_browse_failed catalog && shelves == null -> R.string.stores_shelves_loading else -> R.string.stores_nothing_matches }) @@ -862,11 +859,11 @@ private fun Storefront( val focus = LocalFrontFocus.current val scope = rememberCoroutineScope() val searching = q.isNotEmpty() || browsing || catalog - // A bar only while there is nothing else to look at: no shelves yet and no search results. val bareTab = if (searching) visible.isEmpty() else shelves == null || shelves.isEmpty val barLine = StoresState.status[store]?.takeIf { bareTab && syncCount(it) != null } val itchBar = store == Store.ITCH && q.isEmpty() - val headerItems = 2 + (if (barLine != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + (if (itchBar) 1 else 0) + (if (catalog) 1 else 0) + val gameJoltBar = gameJolt && q.isEmpty() + val headerItems = 2 + (if (barLine != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + (if (itchBar || gameJoltBar) 1 else 0) + (if (catalog) 1 else 0) val card: @Composable (CatalogItem) -> Unit = { item -> val first = if (searching) item.key == visible.firstOrNull()?.key else !firstPlaced firstPlaced = true @@ -915,12 +912,14 @@ private fun Storefront( barLine?.let { line -> item(key = "sync", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { SyncBar(line) } } } StoresState.problems[store]?.let { line -> item(key = "problem", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { Box(Modifier.padding(bottom = 8.dp)) { Note(line) } } } } if (itchBar) item(key = "itch-browse-bar", span = { GridItemSpan(maxLineSpan) }) { ItchBrowseBar() } + if (gameJoltBar) item(key = "gamejolt-browse-bar", span = { GridItemSpan(maxLineSpan) }) { GameJoltBrowseBar(s.storesShowMature) } if (catalog) item(key = "catalog-label", span = { GridItemSpan(maxLineSpan) }) { Box(Modifier.padding(top = 10.dp)) { SectionLabel(stringResource(R.string.bnet_store)) } } if (searching) { storeGrid(visible, nothing, card) - if (browsing) item(key = "itch-more", span = { GridItemSpan(maxLineSpan) }) { ItchLoadMore() } + if (browsing && gameJolt) item(key = "gamejolt-more", span = { GridItemSpan(maxLineSpan) }) { GameJoltLoadMore() } + else if (browsing) item(key = "itch-more", span = { GridItemSpan(maxLineSpan) }) { ItchLoadMore() } } else item(key = "shelves", span = { GridItemSpan(maxLineSpan) }) { Column { Shelf(stringResource(R.string.stores_shelf_new), shelf(shelves?.whatsNew), card) @@ -1156,6 +1155,7 @@ internal fun storePalette(base: Palette, store: Store?): Palette { Store.AMAZON -> Color(0xFFFF9900) to Color(0xFFE07800) Store.XBOX -> Color(0xFF70C850) to Color(0xFF107C10) Store.ITCH -> Color(0xFFFF5C5C) to Color(0xFFD93B3B) + Store.GAMEJOLT -> Color(0xFFCCFF00) to Color(0xFFA3CC00) Store.BATTLENET -> Color(0xFF148EFF) to Color(0xFF0B6BD3) null -> return base } @@ -1423,15 +1423,6 @@ internal fun ConfirmButton(label: String, confirm: String, compact: Boolean = fa SecondaryButton(if (armed) confirm else label, compact = compact) { if (!armed) armed = true else { armed = false; onConfirm() } } } -@Composable -internal fun stageLabel(stage: DownloadStage): String = when (stage) { - DownloadStage.MANIFEST -> stringResource(R.string.stores_stage_manifest) - DownloadStage.DOWNLOAD -> stringResource(R.string.stores_stage_download) - DownloadStage.VERIFY -> stringResource(R.string.stores_stage_verify) - DownloadStage.INSTALL -> stringResource(R.string.stores_stage_install) - DownloadStage.DONE -> stringResource(R.string.stores_stage_done) -} - internal fun openStoreUrl(ctx: android.content.Context, item: CatalogItem) = openUrl(ctx, item.storeUrl) internal fun openUrl(ctx: android.content.Context, url: String) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StripFit.kt b/app/src/main/java/com/droiddeck/launcher/ui/StripFit.kt new file mode 100644 index 0000000000..fa4131ca8b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/StripFit.kt @@ -0,0 +1,15 @@ +package com.droiddeck.launcher.ui + +internal fun fitByPriority(widths: IntArray, priorities: IntArray, spacing: Int, maxWidth: Int): BooleanArray { + val keep = BooleanArray(widths.size) + var used = 0 + var count = 0 + for (i in widths.indices.sortedWith(compareBy({ priorities[it] }, { it }))) { + val add = widths[i] + if (count > 0) spacing else 0 + if (used + add > maxWidth) break + keep[i] = true + used += add + count++ + } + return keep +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SyncAdvancedPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SyncAdvancedPage.kt new file mode 100644 index 0000000000..332be2b0df --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SyncAdvancedPage.kt @@ -0,0 +1,109 @@ +package com.droiddeck.launcher.ui + +import android.content.ClipData +import android.content.Context +import android.content.Intent +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.core.content.FileProvider +import com.droiddeck.launcher.R +import com.droiddeck.launcher.sync.SyncPrefs +import com.droiddeck.launcher.sync.Syncthing +import java.io.File + +@Composable +internal fun SyncAdvancedPage(host: MenuHost, onBack: () -> Unit) { + val ctx = LocalContext.current + var runMode by remember { mutableStateOf(SyncPrefs.runMode(ctx)) } + var wifiOnly by remember { mutableStateOf(SyncPrefs.wifiOnly(ctx)) } + var pauseInGames by remember { mutableStateOf(SyncPrefs.pauseInGames(ctx)) } + var confirmReset by rememberSaveable { mutableStateOf(false) } + if (confirmReset) ResetDialog(onDismiss = { confirmReset = false }) { Syncthing.reset(ctx) } + val ports = Syncthing.ports + SettingsPage(host, stringResource(R.string.sync_advanced), onBack, eyebrow = stringResource(R.string.setup_tab_sync)) { + PairedColumns( + { + SettingsGroup(stringResource(R.string.sync_ports)) { + PortRow(stringResource(R.string.sync_port_sync), ports?.sync?.toString()) + PortRow(stringResource(R.string.sync_port_discovery), ports?.discovery?.toString()) + ActionRow(stringResource(R.string.sync_repick), stringResource(R.string.sync_repick_hint), stringResource(R.string.sync_repick_button), onClick = { Syncthing.restart() }) + } + }, + { + SettingsGroup(stringResource(R.string.sync_running_group)) { + ChoiceRow( + host, "sync-run", stringResource(R.string.sync_run), null, + listOf(SyncPrefs.RUN_WHILE_OPEN to stringResource(R.string.sync_run_open), SyncPrefs.RUN_BACKGROUND to stringResource(R.string.sync_run_background)), + runMode, stacked = true, + ) { SyncPrefs.setRunMode(ctx, it); runMode = it; Syncthing.settingsChanged() } + ToggleRow(host, "sync-wifi", stringResource(R.string.sync_wifi_only), null, wifiOnly) { + SyncPrefs.setWifiOnly(ctx, it); wifiOnly = it; Syncthing.settingsChanged() + } + ToggleRow(host, "sync-games", stringResource(R.string.sync_pause_games), null, pauseInGames) { + SyncPrefs.setPauseInGames(ctx, it); pauseInGames = it; Syncthing.settingsChanged() + } + ActionRow(stringResource(R.string.sync_logs), stringResource(R.string.sync_logs_hint), stringResource(R.string.sync_logs_share), onClick = { shareLog(ctx) }) + } + }, + ) + SettingsGroup(stringResource(R.string.sync_reset_group)) { + SettingsRow(stringResource(R.string.sync_api_key), Syncthing.apiKeyTail?.let { "••••••••••••••••••••$it" }) { + SecondaryButton(stringResource(R.string.sync_regenerate), enabled = Syncthing.phase == Syncthing.Phase.RUNNING, compact = true) { Syncthing.regenerateApiKey() } + } + ActionRow(stringResource(R.string.sync_reset), stringResource(R.string.sync_reset_hint), stringResource(R.string.sync_reset_button), onClick = { confirmReset = true }) + } + } +} + +@Composable +private fun PortRow(label: String, value: String?) { + val colors = MaterialTheme.colorScheme + SettingsRow(label, null) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(value ?: "—", fontSize = 14.sp, fontWeight = FontWeight.SemiBold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(stringResource(R.string.common_auto).uppercase(), fontSize = 11.sp, fontWeight = FontWeight.Bold, color = colors.onSurfaceVariant) + } + } +} + +@Composable +private fun ResetDialog(onDismiss: () -> Unit, onReset: () -> Unit) { + val colors = MaterialTheme.colorScheme + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + AppDialog(shown, close, "syncReset", wide = false, maxWidth = 480.dp) { + DialogTitleRow(stringResource(R.string.sync_reset_confirm_title), onClose = close) + Text(stringResource(R.string.sync_reset_hint), fontSize = 13.5.sp, color = colors.onSurfaceVariant) + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.common_cancel), compact = true, onClick = close) + PrimaryButton(stringResource(R.string.sync_reset_button), compact = true) { onReset(); close() } + } + } +} + +private fun shareLog(context: Context) { + val log = Syncthing.logFile(context).takeIf { it.isFile } ?: return + val out = File(File(context.cacheDir, "share").apply { mkdirs() }, "syncthing-log.txt") + log.copyTo(out, overwrite = true) + val uri = FileProvider.getUriForFile(context, context.packageName + ".logs", out) + val send = Intent(Intent.ACTION_SEND).setType("text/plain").putExtra(Intent.EXTRA_STREAM, uri).addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + send.clipData = ClipData.newRawUri(out.name, uri) + context.startActivity(Intent.createChooser(send, context.getString(R.string.logshare_chooser)).addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SyncFolderPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/SyncFolderPicker.kt new file mode 100644 index 0000000000..092b69615e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SyncFolderPicker.kt @@ -0,0 +1,130 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.outlined.ArrowBack +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.outlined.CreateNewFolder +import androidx.compose.material.icons.outlined.Folder +import androidx.compose.material.icons.outlined.FolderSpecial +import androidx.compose.material.icons.outlined.Home +import androidx.compose.material.icons.outlined.SdCard +import androidx.compose.material.icons.outlined.Smartphone +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.sync.Syncthing +import java.io.File + +internal class SyncLocation(val root: File, val label: String, val icon: ImageVector) + +internal fun containerHome(context: Context) = File(LinuxRuntime.rootDir(context), "root") + +internal fun syncLocations(context: Context): List<SyncLocation> { + val volumes = pickVolumes(context) + val roots = Syncthing.storageRoots(context) + val shared = roots.drop(1).mapIndexed { i, root -> + val volume = volumes.firstOrNull { root.path.startsWith(it.root.path + "/") } + if (i == 0) SyncLocation(root, context.getString(R.string.sync_location_shared), Icons.Outlined.Smartphone) + else SyncLocation(root, context.getString(R.string.sync_location_card, volume?.label ?: root.path), Icons.Outlined.SdCard) + } + val home = containerHome(context).takeIf { it.isDirectory }?.let { SyncLocation(it, context.getString(R.string.sync_location_home), Icons.Outlined.Home) } + return listOfNotNull(home, SyncLocation(Syncthing.folderRoot(context), context.getString(R.string.sync_location_sync), Icons.Outlined.FolderSpecial)) + + shared + SyncLocation(roots.first(), context.getString(R.string.sync_location_app), Icons.Outlined.Folder) +} + +@Composable +internal fun SyncFolderPicker(title: String, suggestedName: String?, onDismiss: () -> Unit, onPick: (File) -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val density = LocalDensity.current + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + val locations = remember { syncLocations(ctx) } + val guard = remember { Syncthing.guard(ctx) } + fun locationOf(d: File) = locations.filter { d.path == it.root.path || d.path.startsWith(it.root.path + "/") }.maxByOrNull { it.root.path.length } + var dir by remember { mutableStateOf<File?>(containerHome(ctx).takeIf { it.isDirectory } ?: Syncthing.folderRoot(ctx).also { it.mkdirs() }) } + var refresh by remember { mutableIntStateOf(0) } + var naming by remember { mutableStateOf(false) } + val location = dir?.let { locationOf(it) } + val up = { dir = dir?.let { d -> if (location == null || d.path == location.root.path) null else d.parentFile } } + val back = { if (dir == null) close() else up() } + val first = remember(dir) { FocusRequester() } + LaunchedEffect(dir) { focusWithinFrames({ false }) { first } } + val folders = remember(dir, refresh) { + dir?.listFiles()?.filter { it.isDirectory && it.canRead() && guard.browsable(it) } + ?.sortedBy { it.name.lowercase() }.orEmpty() + } + var locked by remember { mutableStateOf<Dp?>(null) } + if (naming) { + TextEntryDialog(stringResource(R.string.sync_new_folder), suggestedName.orEmpty(), onDismiss = { naming = false }) { name -> + val parent = dir + if (parent != null && validName(name)) { + val created = File(parent, name) + if (created.isDirectory || created.mkdirs()) { dir = created; refresh++ } + } + } + } + AppDialog( + shown, close, "syncFolderPicker", wide = false, maxWidth = 520.dp, width = locked, fitContent = locked == null, back = back, + modifier = Modifier.onSizeChanged { if (locked == null && it.width > 0) locked = with(density) { it.width.toDp() } }, + ) { + Column(verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth()) { + DialogTitleRow(title, onClose = close) + if (dir != null && location != null) { + val crumbs = listOf(location.label) + dir!!.path.removePrefix(location.root.path).split('/').filter { it.isNotEmpty() } + Text(crumbs.joinToString(" › "), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + val maxHeight = (LocalConfiguration.current.screenHeightDp * 0.7f).dp + Column( + verticalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth().heightIn(max = maxHeight).verticalScroll(rememberScrollState()).padding(top = 4.dp), + ) { + if (dir == null) { + locations.forEachIndexed { i, l -> + key(l.root.path) { PickerRow(l.icon, l.label, null, tall = true, focus = if (i == 0) first else null) { dir = l.root.also { it.mkdirs() } } } + } + } else { + PickerRow(Icons.AutoMirrored.Outlined.ArrowBack, "..", null, focus = first, onClick = up) + PickerRow(Icons.Filled.Check, stringResource(R.string.sync_use_folder), null, accent = true, enabled = guard.allows(dir!!.path)) { + onPick(dir!!); close() + } + PickerRow(Icons.Outlined.CreateNewFolder, stringResource(R.string.sync_new_folder), null) { naming = true } + for (f in folders) key(f.path) { + PickerRow(Icons.Outlined.Folder, f.name, null) { dir = f } + } + } + } + } + } +} + +private fun validName(name: String) = name.isNotBlank() && '/' !in name && name != "." && name != ".." diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SyncPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/SyncPanel.kt new file mode 100644 index 0000000000..e6073d710f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SyncPanel.kt @@ -0,0 +1,436 @@ +package com.droiddeck.launcher.ui + +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.content.Intent +import android.text.format.DateUtils +import android.text.format.Formatter +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Block +import androidx.compose.material.icons.outlined.Sync +import androidx.compose.material.icons.outlined.WarningAmber +import androidx.compose.material3.Checkbox +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ImageBitmap +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.graphics.FilterQuality +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.sync.SyncDevice +import com.droiddeck.launcher.sync.SyncFolder +import com.droiddeck.launcher.sync.SyncPendingFolder +import com.droiddeck.launcher.sync.SyncSnapshot +import com.droiddeck.launcher.sync.Syncthing +import com.droiddeck.launcher.sync.SyncthingWebActivity +import java.io.File + +@Composable +internal fun SyncPanel(host: MenuHost, runtimeReady: Boolean, onAdvanced: () -> Unit) { + val ctx = LocalContext.current + DisposableEffect(Unit) { val release = Syncthing.watch(); onDispose { release() } } + var showId by rememberSaveable { mutableStateOf(false) } + var confirmOff by rememberSaveable { mutableStateOf(false) } + val snap = Syncthing.snapshot + if (showId && snap != null) DeviceIdDialog(snap.myId) { showId = false } + if (confirmOff) TurnOffDialog(onDismiss = { confirmOff = false }) { forget -> + Syncthing.setEnabled(ctx, false, forget) + } + val phase = Syncthing.phase + when { + phase == Syncthing.Phase.FAILED -> SyncFailed( + if (Syncthing.failure == Syncthing.FAILURE_MISSING) stringResource(R.string.sync_missing) else Syncthing.failure.orEmpty(), + onRetry = { Syncthing.restart() }, onAdvanced = onAdvanced, onOff = { confirmOff = true }) + !Syncthing.enabled -> SyncOff(host, runtimeReady) { Syncthing.setEnabled(ctx, true) } + phase != Syncthing.Phase.RUNNING || snap == null -> SyncStarting() + else -> SyncRunning(snap, onShowId = { showId = true }, onAdvanced = onAdvanced, onOff = { confirmOff = true }) + } +} + +@Composable +private fun SyncOff(host: MenuHost, runtimeReady: Boolean, onEnable: () -> Unit) { + val missing = Syncthing.failure == Syncthing.FAILURE_MISSING + val hint = when { + missing -> R.string.sync_missing + !runtimeReady -> R.string.sync_needs_runtime + else -> R.string.sync_enable_hint + } + SettingsGroup(stringResource(R.string.sync_group)) { + ToggleRow( + host, "sync-enable", stringResource(R.string.sync_enable), stringResource(hint), false, enabled = !missing && runtimeReady, + ) { if (it) onEnable() } + } +} + +@Composable +private fun SyncStarting() { + val colors = MaterialTheme.colorScheme + Column( + horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(14.dp), + modifier = Modifier.fillMaxWidth().padding(vertical = 96.dp), + ) { + CircularProgressIndicator(strokeWidth = 3.dp, color = LocalPalette.current.signal, modifier = Modifier.size(40.dp)) + Text(stringResource(R.string.sync_starting), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant) + } +} + +@Composable +private fun SyncFailed(reason: String, onRetry: () -> Unit, onAdvanced: () -> Unit, onOff: () -> Unit) { + SettingsGroup(stringResource(R.string.sync_group)) { + SettingsRow(stringResource(R.string.sync_status_failed), reason) { + SecondaryButton(stringResource(R.string.sync_failed_retry), compact = true, onClick = onRetry) + } + SettingsRow(stringResource(R.string.sync_advanced), stringResource(R.string.sync_advanced_hint)) { + SecondaryButton(stringResource(R.string.sync_open), compact = true, onClick = onAdvanced) + } + SettingsRow(stringResource(R.string.sync_running), stringResource(R.string.sync_running_hint)) { + ToggleSwitch(true, label = stringResource(R.string.sync_running)) { if (!it) onOff() } + } + } +} + +@Composable +private fun SyncRunning(snap: SyncSnapshot, onShowId: () -> Unit, onAdvanced: () -> Unit, onOff: () -> Unit) { + PairedColumns( + { + SettingsGroup(stringResource(R.string.sync_group)) { + StatusCard(snap) + SettingsRow(stringResource(R.string.sync_running), stringResource(R.string.sync_running_hint)) { + ToggleSwitch(true, label = stringResource(R.string.sync_running)) { if (!it) onOff() } + } + } + SettingsGroup(stringResource(R.string.sync_this_device)) { + SettingsRow(stringResource(R.string.sync_device_id), shortId(snap.myId)) { + SecondaryButton(stringResource(R.string.sync_show_qr), compact = true, onClick = onShowId) + } + SettingsRow(stringResource(R.string.sync_advanced), stringResource(R.string.sync_advanced_hint)) { + SecondaryButton(stringResource(R.string.sync_open), compact = true, onClick = onAdvanced) + } + } + }, + { + Waiting(snap) + SettingsGroup(stringResource(R.string.sync_folders)) { + if (snap.folders.isEmpty()) SettingsRow(stringResource(R.string.sync_no_folders), null) {} + snap.folders.sortedByDescending { it.blocked }.forEach { FolderRow(it) } + AddFolderRow(snap.devices) + } + SettingsGroup(stringResource(R.string.sync_devices)) { + if (snap.devices.isEmpty()) SettingsRow(stringResource(R.string.sync_no_devices), null) {} + snap.devices.forEach { DeviceRow(it) } + } + }, + ) +} + +@Composable +internal fun PairedColumns(left: @Composable ColumnScope.() -> Unit, right: @Composable ColumnScope.() -> Unit) { + if (LocalNarrowPane.current) { + Column { left(); right() } + return + } + Row(horizontalArrangement = Arrangement.spacedBy(20.dp), verticalAlignment = Alignment.Top, modifier = Modifier.fillMaxWidth()) { + Column(Modifier.weight(1f)) { left() } + Column(Modifier.weight(1f)) { right() } + } +} + +@Composable +private fun StatusCard(snap: SyncSnapshot) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val paused = Syncthing.pauseRequested || Syncthing.devicesPaused + val (headline, tint) = when { + Syncthing.pauseRequested && Syncthing.devicesPaused -> stringResource(R.string.sync_status_paused) to colors.onSurfaceVariant + Syncthing.pauseRequested -> stringResource(R.string.sync_status_pausing) to colors.onSurfaceVariant + Syncthing.devicesPaused -> stringResource(R.string.sync_status_resuming) to colors.onSurfaceVariant + snap.needsAttention -> stringResource(R.string.sync_status_attention) to AttentionAmber + snap.syncing -> stringResource(R.string.sync_status_syncing) to pal.signal + else -> stringResource(R.string.sync_status_up_to_date) to pal.good + } + val detail = when (Syncthing.autoPause) { + Syncthing.AutoPause.WIFI -> stringResource(R.string.sync_paused_wifi) + Syncthing.AutoPause.GAME -> stringResource(R.string.sync_paused_game) + null -> if (snap.syncing && !paused) stringResource(R.string.sync_left, Formatter.formatShortFileSize(ctx, snap.needBytes)) + else stringResource(R.string.sync_summary, snap.folders.size, snap.devices.count { it.connected }, snap.devices.size) + } + Column(Modifier.fillMaxWidth().padding(16.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + when { + snap.syncing && !paused -> Icon(Icons.Outlined.Sync, null, tint = tint, modifier = Modifier.size(22.dp)) + snap.needsAttention && !paused -> Icon(Icons.Outlined.WarningAmber, null, tint = tint, modifier = Modifier.size(22.dp)) + else -> Box(Modifier.size(12.dp).clip(CircleShape).background(tint)) + } + Text(headline, fontSize = 22.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, modifier = Modifier.weight(1f)) + if (snap.syncing && !paused) Text("${snap.percent}%", fontSize = 22.sp, fontWeight = FontWeight.Bold, color = pal.signal) + } + if (snap.syncing && !paused) LinearProgressIndicator( + progress = { snap.percent / 100f }, color = pal.signal, trackColor = pal.line, modifier = Modifier.fillMaxWidth().height(4.dp).clip(CircleShape), + ) + Text(detail, fontSize = 12.5.sp, color = colors.onSurfaceVariant) + Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + Text("↓ ${rate(ctx, snap.inBytesPerSecond)}", fontSize = 13.sp, color = colors.onSurfaceVariant) + Text("↑ ${rate(ctx, snap.outBytesPerSecond)}", fontSize = 13.sp, color = colors.onSurfaceVariant) + } + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) { + PrimaryButton(stringResource(R.string.sync_open_web_ui), compact = true, modifier = Modifier.weight(1f)) { openWebUi(ctx) } + SecondaryButton(stringResource(if (Syncthing.userPaused) R.string.sync_resume else R.string.sync_pause), compact = true) { + Syncthing.setPaused(ctx, !Syncthing.userPaused) + } + } + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) +} + +@Composable +private fun Waiting(snap: SyncSnapshot) { + if (snap.pendingFolders.isEmpty() && snap.pendingDevices.isEmpty()) return + val ctx = LocalContext.current + var accepting by remember { mutableStateOf<SyncPendingFolder?>(null) } + accepting?.let { f -> + SyncFolderPicker(stringResource(R.string.sync_accept_title, f.label), f.label, onDismiss = { accepting = null }) { dir -> + Syncthing.addFolder(ctx, dir, f.label, listOf(f.deviceId), f.id) { ok -> if (!ok) addFailed(ctx) } + } + } + SettingsGroup(stringResource(R.string.sync_waiting)) { + snap.pendingDevices.forEach { name -> + SettingsRow(stringResource(R.string.sync_pending_device, name), null, highlighted = true) { + SecondaryButton(stringResource(R.string.sync_review), compact = true) { openWebUi(ctx) } + } + } + snap.pendingFolders.forEach { f -> + SettingsRow(stringResource(R.string.sync_pending_folder, f.offeredBy, f.label), stringResource(R.string.sync_pending_folder_hint), highlighted = true) { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + SecondaryButton(stringResource(R.string.sync_review), compact = true) { openWebUi(ctx) } + PrimaryButton(stringResource(R.string.sync_accept), compact = true) { accepting = f } + } + } + } + } +} + +@Composable +private fun AddFolderRow(devices: List<SyncDevice>) { + val ctx = LocalContext.current + var picking by remember { mutableStateOf(false) } + var picked by remember { mutableStateOf<File?>(null) } + if (picking) SyncFolderPicker(stringResource(R.string.sync_add_folder), null, onDismiss = { picking = false }) { picked = it } + picked?.let { dir -> + ShareFolderDialog(dir, devices, onDismiss = { picked = null }) { chosen -> + Syncthing.addFolder(ctx, dir, dir.name, chosen) { ok -> if (!ok) addFailed(ctx) } + } + } + SettingsRow(stringResource(R.string.sync_add_folder), stringResource(R.string.sync_add_folder_hint)) { + SecondaryButton(stringResource(R.string.sync_choose), compact = true) { picking = true } + } +} + +@Composable +private fun ShareFolderDialog(folder: File, devices: List<SyncDevice>, onDismiss: () -> Unit, onAdd: (List<String>) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + val chosen = remember { mutableStateListOf<String>() } + AppDialog(shown, close, "syncShareFolder", wide = false, maxWidth = 520.dp) { + DialogTitleRow(folder.name, onClose = close) + Text(folder.path, fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis) + if (devices.isEmpty()) { + Text(stringResource(R.string.sync_share_none), fontSize = 13.5.sp, color = colors.onSurfaceVariant) + } else { + Text(stringResource(R.string.sync_share_with), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + devices.forEach { d -> + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().clip(Shape12).border(1.dp, pal.line, Shape12).background(colors.background).padding(end = 12.dp), + ) { + Checkbox(d.id in chosen, { if (it) chosen.add(d.id) else chosen.remove(d.id) }) + Text(d.name, fontSize = 14.sp, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.common_cancel), compact = true, onClick = close) + PrimaryButton(stringResource(R.string.sync_add), compact = true) { onAdd(chosen.toList()); close() } + } + } +} + +private fun addFailed(context: Context) { + android.widget.Toast.makeText(context, R.string.sync_add_failed, android.widget.Toast.LENGTH_LONG).show() +} + +@Composable +private fun FolderRow(f: SyncFolder) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + if (f.blocked) { + Column(Modifier.fillMaxWidth().background(colors.error.copy(alpha = 0.06f)).padding(horizontal = 14.dp, vertical = 12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + Icon(Icons.Outlined.Block, null, tint = colors.error, modifier = Modifier.size(18.dp)) + Text(f.label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.weight(1f)) + Text(stringResource(R.string.sync_folder_blocked), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.error) + } + Text(f.path, fontSize = 12.5.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant, maxLines = 2, overflow = TextOverflow.Ellipsis) + Text(stringResource(R.string.sync_folder_blocked_hint), fontSize = 12.5.sp, color = colors.onSurfaceVariant) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = 4.dp)) { + SecondaryButton(stringResource(R.string.sync_remove_folder), compact = true) { Syncthing.removeFolder(f.id) } + SecondaryButton(stringResource(R.string.sync_open_web_ui), compact = true) { openWebUi(ctx) } + } + Text(stringResource(R.string.sync_remove_folder_hint), fontSize = 12.sp, color = colors.onSurfaceVariant) + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + return + } + val (state, tint) = when { + f.paused -> stringResource(R.string.sync_folder_paused) to colors.onSurfaceVariant + f.syncing -> stringResource(R.string.sync_folder_syncing, percent(f)) to pal.signal + f.outOfSync -> stringResource(R.string.sync_folder_out_of_sync) to AttentionAmber + f.state == "scanning" || f.state == "scan-waiting" -> stringResource(R.string.sync_folder_scanning) to colors.onSurfaceVariant + else -> stringResource(R.string.sync_folder_up_to_date) to pal.good + } + val detail = when { + f.errors > 0 -> stringResource(R.string.sync_folder_errors, f.errors) + f.sharedWith.isEmpty() -> Formatter.formatShortFileSize(ctx, f.globalBytes) + else -> stringResource(R.string.sync_folder_detail, Formatter.formatShortFileSize(ctx, f.globalBytes), f.sharedWith.joinToString(", ")) + } + SettingsRow(f.label, detail) { StateLabel(state, tint) } +} + +@Composable +private fun DeviceRow(d: SyncDevice) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val detail = when { + d.connected -> d.address?.substringAfter("://") + d.lastSeen != null -> stringResource(R.string.sync_last_seen, DateUtils.getRelativeTimeSpanString(d.lastSeen).toString()) + else -> null + } + SettingsRow(d.name, detail) { + if (d.connected) StateLabel(stringResource(R.string.sync_connected), pal.good) + else StateLabel(stringResource(R.string.sync_offline), colors.onSurfaceVariant) + } +} + +@Composable +private fun StateLabel(text: String, tint: Color) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp)) { + Box(Modifier.size(9.dp).clip(CircleShape).background(tint)) + Text(text, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = tint, maxLines = 1) + } +} + +@Composable +private fun DeviceIdDialog(id: String, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + val qr = remember(id) { qrBitmap(id) } + AppDialog(shown, close, "syncDeviceId", wide = true, maxWidth = 640.dp) { + DialogTitleRow(stringResource(R.string.sync_device_id_title), onClose = close) + Row(horizontalArrangement = Arrangement.spacedBy(22.dp), verticalAlignment = Alignment.CenterVertically) { + Image(qr, stringResource(R.string.sync_device_id), filterQuality = FilterQuality.None, + modifier = Modifier.size(208.dp).clip(Shape14).background(Color.White).padding(10.dp)) + Column(verticalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.weight(1f)) { + Text(id.chunked(32).joinToString("\n"), fontSize = 16.sp, fontWeight = FontWeight.SemiBold, fontFamily = FontFamily.Monospace, + color = colors.onBackground, lineHeight = 26.sp) + Text(stringResource(R.string.sync_device_id_hint), fontSize = 13.sp, color = colors.onSurfaceVariant) + } + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.sync_copy), compact = true) { + ctx.getSystemService(ClipboardManager::class.java)?.setPrimaryClip(ClipData.newPlainText("Syncthing device ID", id)) + } + SecondaryButton(stringResource(R.string.sync_share), compact = true) { + ctx.startActivity(Intent.createChooser(Intent(Intent.ACTION_SEND).setType("text/plain").putExtra(Intent.EXTRA_TEXT, id), null)) + } + PrimaryButton(stringResource(R.string.sync_done), compact = true, onClick = close) + } + } +} + +@Composable +private fun TurnOffDialog(onDismiss: () -> Unit, onTurnOff: (Boolean) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + var forget by remember { mutableStateOf(false) } + AppDialog(shown, close, "syncTurnOff", wide = false, maxWidth = 520.dp) { + DialogTitleRow(stringResource(R.string.sync_off_title), onClose = close) + Text(stringResource(R.string.sync_off_body), fontSize = 13.5.sp, color = colors.onSurfaceVariant) + Row( + verticalAlignment = Alignment.Top, horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxWidth().clip(Shape12).border(1.dp, pal.line, Shape12).background(colors.background).padding(end = 12.dp, top = 2.dp, bottom = 8.dp), + ) { + Checkbox(forget, { forget = it }) + Column(Modifier.padding(top = 12.dp)) { + Text(stringResource(R.string.sync_off_forget), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + Text(stringResource(R.string.sync_off_forget_hint), fontSize = 12.5.sp, color = colors.onSurfaceVariant) + } + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.common_cancel), compact = true, onClick = close) + PrimaryButton(stringResource(R.string.sync_turn_off), compact = true) { onTurnOff(forget); close() } + } + } +} + +internal fun openWebUi(context: Context) { + context.startActivity(Intent(context, SyncthingWebActivity::class.java)) +} + +private fun shortId(id: String) = if (id.length > 16) "${id.take(7)}-…-${id.takeLast(7)}" else id + +private fun rate(context: Context, bytesPerSecond: Long) = Formatter.formatShortFileSize(context, bytesPerSecond) + "/s" + +private fun percent(f: SyncFolder): Int = + if (f.globalBytes <= 0) 0 else (((f.globalBytes - f.needBytes).coerceAtLeast(0) * 100) / f.globalBytes).toInt().coerceIn(0, 99) + +private fun qrBitmap(text: String): ImageBitmap { + val matrix = com.google.zxing.qrcode.QRCodeWriter().encode(text, com.google.zxing.BarcodeFormat.QR_CODE, 0, 0) + val bitmap = android.graphics.Bitmap.createBitmap(matrix.width, matrix.height, android.graphics.Bitmap.Config.ARGB_8888) + for (x in 0 until matrix.width) for (y in 0 until matrix.height) { + bitmap.setPixel(x, y, if (matrix[x, y]) android.graphics.Color.BLACK else android.graphics.Color.WHITE) + } + return bitmap.asImageBitmap() +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt index 352b29a544..cb6d5ed22f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -52,7 +52,6 @@ object Themes { const val DEFAULT_PRIMARY = 0xFF8B5CF6.toInt() const val DEFAULT_SECONDARY = 0xFF22D3EE.toInt() - /** The two colours of the custom Gradient theme: primary, then secondary. Changing them restyles the app at once. */ var gradientColors by mutableStateOf(DEFAULT_PRIMARY to DEFAULT_SECONDARY) private set @@ -60,11 +59,9 @@ object Themes { const val DEFAULT_RGB_SPEED = 3 const val RGB_HUE_STEP = 3f - /** How fast Inner Gamer cycles, 1 (slow) to [RGB_SPEEDS] (fast). */ var rgbSpeed by mutableStateOf(DEFAULT_RGB_SPEED) private set - /** Where Inner Gamer is on the colour wheel, in whole [RGB_HUE_STEP] steps so the app restyles only when the colour visibly moves. */ var rgbHue by mutableStateOf(0f) private set @@ -78,7 +75,6 @@ object Themes { rgbSpeed = value } - /** Milliseconds for one trip round the colour wheel. */ fun rgbCycleMillis(speed: Int): Int = 30_000 / speed.coerceIn(1, RGB_SPEEDS) fun loadGradient(context: Context) { @@ -86,7 +82,6 @@ object Themes { rgbSpeed = SessionPrefs.rgbSpeed(context) } - /** The Inner Gamer palette at one point on the colour wheel. */ fun innerGamer(hue: Float): Palette = ThemeColors.palette( Color.hsv(hue % 360f, 0.9f, 1f).toArgb(), Color.hsv((hue + 60f) % 360f, 0.9f, 1f).toArgb(), R.string.theme_inner_gamer, R.string.theme_inner_gamer_detail, INNER_GAMER, @@ -97,7 +92,6 @@ object Themes { gradientColors = primary to secondary } - /** The theme the person chose, with the custom colours read first; for code that is not in a composition. */ fun current(context: Context): Palette { val id = SessionPrefs.theme(context) if (id == GRADIENT || id == INNER_GAMER) loadGradient(context) @@ -186,14 +180,12 @@ private val ContentDirected = Typography().run { ) } -/** Turns the colour wheel on the system's own animation clock; with animations off, in the app or in Android, the colour holds still. */ @Composable private fun InnerGamerHue(speed: Int) { if (Motion.scale == 0f) return key(speed) { InnerGamerCycle(speed) } } -/** One run of the cycle at one speed, picking up from the colour on screen so a new speed takes over at once without a jump. */ @Composable private fun InnerGamerCycle(speed: Int) { val start = remember { Themes.rgbHue } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt b/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt index b2db635623..938d2ef90a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ThemeColors.kt @@ -7,9 +7,7 @@ import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt -/** Colour maths for the custom gradient theme: hue, saturation and brightness in, a readable palette out. */ internal object ThemeColors { - /** Hue 0..360, saturation and brightness 0..1. */ class Hsv(val h: Float, val s: Float, val v: Float) fun toHsv(argb: Int): Hsv { @@ -32,7 +30,6 @@ internal object ThemeColors { fun hex(argb: Int): String = "#%06X".format(argb and 0xFFFFFF) - /** `#RRGGBB`, `RRGGBB` or `#RGB`; null for anything else. */ fun parseHex(text: String): Int? { val digits = text.trim().removePrefix("#") if (!digits.all { it in '0'..'9' || it in 'a'..'f' || it in 'A'..'F' }) return null @@ -46,7 +43,6 @@ internal object ThemeColors { private const val MIN_LUMINANCE = 0.10f - /** The colour, made brighter (then paler, for a deep blue that brightness alone cannot lift) when it is too dark to show on the dark background. */ fun readable(argb: Int): Int { if (Color(argb).luminance() >= MIN_LUMINANCE) return argb or 0xFF000000.toInt() val hsv = toHsv(argb) @@ -64,7 +60,6 @@ internal object ThemeColors { return out } - /** A dark neutral tinted with the primary's hue; plain greys stay grey. */ fun tint(primary: Int, saturation: Float, brightness: Float): Color { val hsv = toHsv(primary) val strength = (hsv.s / 0.35f).coerceIn(0f, 1f) @@ -79,7 +74,6 @@ internal object ThemeColors { return (max(x, y) + 0.05f) / (min(x, y) + 0.05f) } - /** Dark or white text, whichever reads better on the worse of the two gradient colours. */ internal fun inkFor(first: Int, second: Int): Color { fun worst(ink: Color) = min(contrast(ink, Color(first)), contrast(ink, Color(second))) return if (worst(DARK_INK) >= worst(Color.White)) DARK_INK else Color.White @@ -87,7 +81,6 @@ internal object ThemeColors { private const val MIN_CONTRAST = 4.5f - /** The colour nudged just enough, lighter for dark text and darker for white text, to give [ink] a readable contrast on it. */ private fun fitTo(ink: Color, argb: Int): Int { fun short(color: Int) = contrast(ink, Color(color)) < MIN_CONTRAST if (!short(argb)) return argb diff --git a/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt index 0fda34fc28..96502bb79c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt @@ -55,7 +55,6 @@ import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_DRAG_MOVE @Composable fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit) { val context = LocalContext.current - // Keep an open editor attached to the game it was opened for. val targetGame = remember { game } val initialDefaults = remember { GesturePrefs.read(context) } val initialGame = remember { targetGame?.takeIf { GesturePrefs.hasOverride(context, it) }?.let { GesturePrefs.read(context, it) } } @@ -169,7 +168,6 @@ fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit private fun GestureDialogFrame(onDismiss: () -> Unit, footer: @Composable () -> Unit = {}, content: @Composable ColumnScope.() -> Unit) { val p = LocalPalette.current - // The app window does not opt into RTL, so these dialogs follow their resource locale explicitly. val direction = if (LocalConfiguration.current.layoutDirection == android.view.View.LAYOUT_DIRECTION_RTL) LayoutDirection.Rtl else LayoutDirection.Ltr Dialog(onDismissRequest = onDismiss, properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false)) { CompositionLocalProvider(LocalLayoutDirection provides direction) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt b/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt index c0aefad254..887caa3c37 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt @@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.drawscope.scale import androidx.compose.ui.graphics.drawscope.translate import androidx.compose.ui.graphics.vector.PathParser @@ -16,22 +17,21 @@ import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.Dp import com.droiddeck.launcher.R +import com.droiddeck.launcher.hud.WordmarkArt @Composable -internal fun Wordmark(height: Dp, modifier: Modifier = Modifier) { - val ink = MaterialTheme.colorScheme.onBackground - val ball = LocalPalette.current.signal +internal fun Wordmark(height: Dp, modifier: Modifier = Modifier, ink: Color = MaterialTheme.colorScheme.onBackground, ball: Color = LocalPalette.current.signal) { val name = stringResource(R.string.app_name) - val letters = remember { PathParser().parsePathString(LETTERS).toPath() } - val leftHalf = remember { PathParser().parsePathString(LEFT_HALF).toPath() } - val rightHalf = remember { PathParser().parsePathString(RIGHT_HALF).toPath() } - Canvas(modifier.height(height).width(height * (BOX_W / BOX_H)).semantics { contentDescription = name }) { - val k = size.height / BOX_H + val letters = remember { PathParser().parsePathString(WordmarkArt.LETTERS).toPath() } + val leftHalf = remember { PathParser().parsePathString(WordmarkArt.LEFT_HALF).toPath() } + val rightHalf = remember { PathParser().parsePathString(WordmarkArt.RIGHT_HALF).toPath() } + Canvas(modifier.height(height).width(height * (WordmarkArt.BOX_W / WordmarkArt.BOX_H)).semantics { contentDescription = name }) { + val k = size.height / WordmarkArt.BOX_H scale(k, k, Offset.Zero) { - translate(-BOX_X, -BOX_Y) { + translate(-WordmarkArt.BOX_X, -WordmarkArt.BOX_Y) { drawPath(letters, ink) translate(239.135f, 123.36f) { - scale(MARK_SCALE, MARK_SCALE, Offset.Zero) { + scale(WordmarkArt.MARK_SCALE, WordmarkArt.MARK_SCALE, Offset.Zero) { translate(31.98f, 0f) { drawPath(leftHalf, ink) drawPath(rightHalf, ink) @@ -43,22 +43,3 @@ internal fun Wordmark(height: Dp, modifier: Modifier = Modifier) { } } } - -private const val BOX_X = 239.135f -private const val BOX_Y = 120.02f -private const val BOX_W = 1040.7f - 239.135f -private const val BOX_H = 243.2f - 120.02f -private const val MARK_SCALE = 0.527445f - -private const val LEFT_HALF = "M-31.98 0H56.055V40.489A71.81 71.81 0 0 0 56.055 183.231V223.72H-31.98Z" -private const val RIGHT_HALF = "M71.885 0.28A111.86 111.86 0 0 1 71.885 223.44V183.234A71.81 71.81 0 0 0 71.885 40.486Z" -private const val LETTERS = - "M361.45 241.36V160.13H387.02V241.36ZM387.02 196.73 376.32 188.38Q379.5 174.17 387.02 166.31Q394.54 158.46 407.91 158.46Q413.76 158.46 418.19 160.21Q422.62 161.97 425.96 165.65L410.75 184.87Q409.08 183.03 406.57 182.03Q404.07 181.02 400.89 181.02Q394.54 181.02 390.78 184.95Q387.02 188.88 387.02 196.73" + - "ZM467.91 243.2Q455.38 243.2 445.27 237.6Q435.15 232 429.3 222.31Q423.45 212.61 423.45 200.58Q423.45 188.54 429.3 179.02Q435.15 169.49 445.18 163.89Q455.21 158.29 467.91 158.29Q480.62 158.29 490.64 163.81Q500.67 169.32 506.52 178.93Q512.37 188.54 512.37 200.58Q512.37 212.61 506.52 222.31Q500.67 232 490.64 237.6Q480.62 243.2 467.91 243.2" + - "ZM467.91 219.97Q473.43 219.97 477.61 217.54Q481.79 215.12 484.04 210.69Q486.3 206.26 486.3 200.58Q486.3 194.9 483.96 190.63Q481.62 186.37 477.52 183.95Q473.43 181.52 467.91 181.52Q462.56 181.52 458.39 183.95Q454.21 186.37 451.87 190.72Q449.53 195.06 449.53 200.75Q449.53 206.26 451.87 210.69Q454.21 215.12 458.39 217.54Q462.56 219.97 467.91 219.97" + - "ZM523.4 241.36V160.13H548.98V241.36ZM536.27 148.93Q530.26 148.93 526.33 144.84Q522.4 140.74 522.4 134.89Q522.4 128.88 526.33 124.86Q530.26 120.85 536.27 120.85Q542.29 120.85 546.13 124.86Q549.98 128.88 549.98 134.89Q549.98 140.74 546.13 144.84Q542.29 148.93 536.27 148.93ZM599.95 243.03Q588.42 243.03 579.48 237.52Q570.54 232 565.44 222.47Q560.34 212.95 560.34 200.75Q560.34 188.54 565.44 179.02Q570.54 169.49 579.48 163.97Q588.42 158.46 599.95 158.46Q608.31 158.46 615.08 161.63Q621.85 164.81 626.28 170.41Q630.71 176.01 631.21 183.2V217.46Q630.71 224.65 626.36 230.41Q622.02 236.18 615.16 239.61Q608.31 243.03 599.95 243.03" + - "ZM604.47 219.97Q609.98 219.97 613.99 217.54Q618 215.12 620.34 210.77Q622.68 206.43 622.68 200.75Q622.68 195.06 620.43 190.8Q618.17 186.54 614.08 184.03Q609.98 181.52 604.63 181.52Q599.28 181.52 595.19 184.03Q591.09 186.54 588.67 190.88Q586.25 195.23 586.25 200.75Q586.25 206.26 588.59 210.61Q590.93 214.95 595.11 217.46Q599.28 219.97 604.47 219.97" + - "ZM646.75 241.36H621.68V219.46L625.53 199.74L621.18 180.02V120.02H646.75ZM683.19 241.36V218.29H712.44Q723.13 218.29 731.16 214.03Q739.18 209.77 743.53 201.58Q747.87 193.39 747.87 182.19Q747.87 170.99 743.44 162.97Q739.01 154.95 731.07 150.6Q723.13 146.26 712.44 146.26H682.35V123.36H712.77Q726.14 123.36 737.42 127.62Q748.71 131.88 757.15 139.82Q765.59 147.76 770.18 158.54Q774.78 169.32 774.78 182.36Q774.78 195.23 770.18 206.09Q765.59 216.96 757.23 224.81Q748.87 232.67 737.59 237.01Q726.31 241.36 713.11 241.36" + - "ZM665.47 241.36V123.36H691.71V241.36ZM827.6 243.2Q814.39 243.2 804.11 237.77Q793.83 232.33 787.98 222.64Q782.13 212.95 782.13 200.75Q782.13 188.54 787.9 178.93Q793.67 169.32 803.53 163.81Q813.39 158.29 825.76 158.29Q837.79 158.29 846.98 163.47Q856.18 168.65 861.44 177.85Q866.71 187.04 866.71 198.91Q866.71 201.08 866.46 203.5Q866.21 205.93 865.54 209.1L795.51 209.27V191.72L854.67 191.55L843.64 198.91Q843.47 191.89 841.47 187.29Q839.46 182.69 835.54 180.27Q831.61 177.85 825.92 177.85Q819.91 177.85 815.48 180.61Q811.05 183.36 808.63 188.38Q806.2 193.39 806.2 200.58Q806.2 207.77 808.79 212.86Q811.38 217.96 816.15 220.72Q820.91 223.48 827.43 223.48Q833.45 223.48 838.29 221.39Q843.14 219.3 846.82 215.12L860.86 229.16Q854.84 236.18 846.32 239.69Q837.79 243.2 827.6 243.2" + - "ZM916.68 243.2Q904.15 243.2 893.95 237.68Q883.75 232.17 877.9 222.47Q872.05 212.78 872.05 200.75Q872.05 188.54 877.99 178.93Q883.92 169.32 894.12 163.81Q904.31 158.29 917.02 158.29Q926.54 158.29 934.48 161.55Q942.42 164.81 948.6 171.33L932.22 187.71Q929.38 184.53 925.62 183.03Q921.86 181.52 917.02 181.52Q911.5 181.52 907.24 183.95Q902.98 186.37 900.55 190.63Q898.13 194.9 898.13 200.58Q898.13 206.26 900.55 210.61Q902.98 214.95 907.32 217.46Q911.67 219.97 917.02 219.97Q922.03 219.97 925.96 218.21Q929.88 216.46 932.73 213.28L948.94 229.66Q942.59 236.35 934.56 239.77Q926.54 243.2 916.68 243.2" + - "ZM1010.61 241.36 982.2 199.24 1010.45 160.13H1039.03L1004.93 204.09L1005.77 193.56L1040.7 241.36ZM958.63 241.36V120.02H984.21V241.36Z" diff --git a/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt b/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt index 3a86e28af3..1bbeb18e2f 100644 --- a/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt +++ b/app/src/main/java/com/droiddeck/launcher/update/AppUpdates.kt @@ -211,10 +211,6 @@ object AppUpdates { internal class Guess(val follow: Follow, val certain: Boolean) - /** - * Stable and Preview builds of one commit are the same APK. Preview history can include older Stable releases, - * so an overlapping older-build guess keeps the Stable default for this run without persisting it. - */ internal fun guessFollow(catalog: Catalog?, me: Installed): Guess { if (me.pr != 0) return Guess(Follow(Channel.TEST, me.pr), true) val stable = catalog?.stable diff --git a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt index 87d958889e..5d1d33455c 100644 --- a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt @@ -57,7 +57,6 @@ object SelfInstaller { } @Suppress("DEPRECATION") val flags = if (Build.VERSION.SDK_INT >= 28) { - // Android 9 and 10 only collect an archive's certificates when GET_SIGNATURES is set. PackageManager.GET_SIGNING_CERTIFICATES or PackageManager.GET_SIGNATURES } else { PackageManager.GET_SIGNATURES @@ -91,7 +90,6 @@ object SelfInstaller { } } - /** Reports the session id before the commit, so a status broadcast that arrives right away is recognised. */ fun install(context: Context, apk: File, onSession: (Int) -> Unit = {}) { val installer = context.packageManager.packageInstaller val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply { @@ -114,7 +112,6 @@ object SelfInstaller { } } - /** Only a system installer activity may be launched from the status broadcast, without URI grants. */ fun safeConfirmIntent(context: Context, confirm: Intent): Intent? { val target = confirm.resolveActivity(context.packageManager) ?: return null val info = runCatching { context.packageManager.getApplicationInfo(target.packageName, 0) }.getOrNull() ?: return null diff --git a/app/src/main/java/com/droiddeck/launcher/wallpaper/SteamWallService.kt b/app/src/main/java/com/droiddeck/launcher/wallpaper/SteamWallService.kt new file mode 100644 index 0000000000..97dbceac75 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/wallpaper/SteamWallService.kt @@ -0,0 +1,223 @@ +package com.droiddeck.launcher.wallpaper + +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Path +import android.graphics.RectF +import android.os.Handler +import android.os.HandlerThread +import android.os.SystemClock +import android.service.wallpaper.WallpaperService +import android.view.Choreographer +import android.view.SurfaceHolder +import androidx.compose.ui.graphics.toArgb +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.ui.Themes +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit +import kotlin.math.cos +import kotlin.math.sin + +class SteamWallService : WallpaperService() { + override fun onCreateEngine(): Engine = WallEngine() + + private inner class WallEngine : Engine() { + private val thread = HandlerThread("steam-wall").also { it.start() } + private val handler = Handler(thread.looper) + private val fill = Paint(Paint.ANTI_ALIAS_FLAG) + private val stroke = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } + private val rect = RectF() + private val clip = Path() + private val art = Paint(Paint.FILTER_BITMAP_FLAG or Paint.ANTI_ALIAS_FLAG) + @Volatile private var covers: List<Bitmap> = emptyList() + private val lock = Any() + private val redraw = Runnable { draw() } + private var visible = false + private var surfaceLive = false + private var lastFrame = 0L + private var phase = 0f + private var choreographer: Choreographer? = null + private var lastDrawNanos = 0L + private val tick = object : Choreographer.FrameCallback { + override fun doFrame(frameTimeNanos: Long) { + if (!visible) return + val interval = if (WallPrefs.fps(applicationContext) == WallPrefs.MATCH_SCREEN) 0L else 1_000_000_000L / framesPerSecond() + if (frameTimeNanos - lastDrawNanos >= interval - SLACK_NANOS) { + lastDrawNanos = frameTimeNanos + runCatching { draw() } + } + if (synchronized(lock) { surfaceLive }) choreographer?.postFrameCallback(this) + } + } + + private fun startTicking() { + val c = choreographer ?: Choreographer.getInstance().also { choreographer = it } + c.removeFrameCallback(tick) + c.postFrameCallback(tick) + } + + private fun stopTicking() { + choreographer?.removeFrameCallback(tick) + } + + private fun framesPerSecond(): Int = WallPrefs.fps(applicationContext) + + override fun onCreate(surfaceHolder: SurfaceHolder) { + handler.post { covers = loadCovers() } + } + + private fun loadCovers(): List<Bitmap> { + val d = resources.displayMetrics.density + val targetW = (112f * d).toInt() + val files = runCatching { Library.steamLibraryArt(applicationContext).distinctBy { it.first }.shuffled().take(MAX_COVERS) } + .getOrDefault(emptyList()) + return files.mapNotNull { (_, file) -> + runCatching { + val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true } + BitmapFactory.decodeFile(file.path, bounds) + var sample = 1 + while (bounds.outWidth / (sample * 2) >= targetW) sample *= 2 + BitmapFactory.decodeFile(file.path, BitmapFactory.Options().apply { + inSampleSize = sample + inPreferredConfig = Bitmap.Config.RGB_565 + }) + }.getOrNull() + } + } + + override fun onVisibilityChanged(visible: Boolean) { + handler.post { + this.visible = visible + stopTicking() + if (visible) { + lastFrame = SystemClock.uptimeMillis() + startTicking() + } + } + } + + override fun onSurfaceCreated(holder: SurfaceHolder) { + synchronized(lock) { surfaceLive = true } + handler.post { + stopTicking() + if (visible) startTicking() + } + } + + override fun onSurfaceRedrawNeeded(holder: SurfaceHolder) { + redrawNow() + } + + override fun onSurfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) { + handler.removeCallbacks(redraw) + handler.post(redraw) + } + + override fun onSurfaceDestroyed(holder: SurfaceHolder) { + stopTicking() + handler.removeCallbacks(redraw) + synchronized(lock) { surfaceLive = false } + handler.post { stopTicking() } + } + + override fun onDestroy() { + synchronized(lock) { surfaceLive = false } + handler.post { + visible = false + stopTicking() + handler.removeCallbacks(redraw) + } + thread.quitSafely() + covers = emptyList() + } + + private fun redrawNow() { + val done = CountDownLatch(1) + handler.removeCallbacks(redraw) + handler.post(redraw) + handler.post { done.countDown() } + done.await(REDRAW_WAIT_MS, TimeUnit.MILLISECONDS) + } + + private fun draw() { + synchronized(lock) { + if (!surfaceLive || !surfaceHolder.surface.isValid) return + val canvas = surfaceHolder.surface.lockHardwareCanvas() ?: return + try { + render(canvas, canvas.width.toFloat(), canvas.height.toFloat()) + } finally { + surfaceHolder.surface.unlockCanvasAndPost(canvas) + } + } + } + + private fun render(canvas: Canvas, w: Float, h: Float) { + val pal = Themes.current(applicationContext) + val bg = pal.background.toArgb() + val d = resources.displayMetrics.density + val capW = 112f * d + val capH = 168f * d + val gap = 14f * d + val radius = 10f * d + val tilt = Math.toRadians(TILT.toDouble()) + val cs = cos(tilt).toFloat() + val sn = sin(tilt).toFloat() + val wallW = (w * cs + h * sn) * 1.1f + val wallH = maxOf(h * 2.4f, (w * sn + h * cs) * 1.1f) + val columns = ((wallW + gap) / (capW + gap)).toInt() + 1 + val perRun = ((wallH + gap) / (capH + gap)).toInt() + 1 + val run = (capH + gap) * perRun + val now = SystemClock.uptimeMillis() + if (lastFrame != 0L) phase = (phase + (now - lastFrame) * WallPrefs.speed(applicationContext) / DRIFT_MS) % 1f + lastFrame = now + val shift = run * phase + val px = w / 2f + val py = h / 2f + val left = px - wallW / 2f + val top = py - wallH / 2f + + val deck = covers + canvas.drawColor(bg) + fill.color = pal.surface.toArgb() + stroke.color = pal.line.toArgb() + stroke.strokeWidth = d + canvas.save() + canvas.rotate(-TILT, px, py) + for (c in 0 until columns) { + val x = left + c * (capW + gap) + val dy = if (c % 2 == 0) -shift else shift - run + for (i in 0 until perRun * 2) { + val y = top + i * (capH + gap) + dy + val lx = x + capW / 2 - px + val ly = y + capH / 2 - py + val sx = px + lx * cs + ly * sn + val sy = py - lx * sn + ly * cs + if (sx < -capH || sx > w + capH || sy < -capH || sy > h + capH) continue + rect.set(x, y, x + capW, y + capH) + canvas.drawRoundRect(rect, radius, radius, fill) + if (deck.isNotEmpty()) { + val cover = deck[(c * 5 + (i % perRun) * 3) % deck.size] + clip.rewind() + clip.addRoundRect(rect, radius, radius, Path.Direction.CW) + canvas.save() + canvas.clipPath(clip) + canvas.drawBitmap(cover, null, rect, art) + canvas.restore() + } + canvas.drawRoundRect(rect, radius, radius, stroke) + } + } + canvas.restore() + } + } + + private companion object { + const val MAX_COVERS = 48 + const val TILT = 13f + const val DRIFT_MS = 50_000L + const val REDRAW_WAIT_MS = 200L + const val SLACK_NANOS = 2_000_000L + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/wallpaper/WallPrefs.kt b/app/src/main/java/com/droiddeck/launcher/wallpaper/WallPrefs.kt new file mode 100644 index 0000000000..f92ea57262 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/wallpaper/WallPrefs.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher.wallpaper + +import android.content.Context + +object WallPrefs { + val FPS_CHOICES = listOf(15, 30, 60, MATCH_SCREEN) + val SPEED_CHOICES = listOf(0.5f, 1f, 2f) + const val MATCH_SCREEN = 0 + private const val FILE = "wall_wallpaper" + private const val KEY_FPS = "fps" + private const val KEY_SPEED = "speed" + + private fun prefs(context: Context) = context.getSharedPreferences(FILE, Context.MODE_PRIVATE) + + fun fps(context: Context): Int = prefs(context).getInt(KEY_FPS, 30).let { if (it == MATCH_SCREEN) it else it.coerceIn(5, 120) } + + fun speed(context: Context): Float = prefs(context).getFloat(KEY_SPEED, 1f).coerceIn(0.1f, 4f) + + fun setFps(context: Context, value: Int) = prefs(context).edit().putInt(KEY_FPS, value).apply() + + fun setSpeed(context: Context, value: Float) = prefs(context).edit().putFloat(KEY_SPEED, value).apply() +} diff --git a/app/src/main/java/com/droiddeck/launcher/wallpaper/WallpaperSettingsActivity.kt b/app/src/main/java/com/droiddeck/launcher/wallpaper/WallpaperSettingsActivity.kt new file mode 100644 index 0000000000..1afb63805f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/wallpaper/WallpaperSettingsActivity.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.wallpaper + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.FilterChip +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.core.AppUiPrefs +import com.droiddeck.launcher.ui.DroidDeckTheme + +class WallpaperSettingsActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + DroidDeckTheme(appScale = AppUiPrefs.scale(this)) { + val ink = MaterialTheme.colorScheme.onBackground + var fps by remember { mutableIntStateOf(WallPrefs.fps(this)) } + var speed by remember { mutableFloatStateOf(WallPrefs.speed(this)) } + Column(Modifier.fillMaxSize().padding(24.dp), verticalArrangement = Arrangement.Bottom) { + Column( + Modifier.background(MaterialTheme.colorScheme.background.copy(alpha = 0.88f), RoundedCornerShape(20.dp)) + .verticalScroll(rememberScrollState()).padding(20.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text(getString(R.string.steam_wall_label), style = MaterialTheme.typography.titleLarge, color = ink) + Text(getString(R.string.wall_settings_fps), style = MaterialTheme.typography.titleMedium, color = ink) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + WallPrefs.FPS_CHOICES.forEach { choice -> + FilterChip( + selected = fps == choice, + onClick = { fps = choice; WallPrefs.setFps(this@WallpaperSettingsActivity, choice) }, + label = { Text(if (choice == WallPrefs.MATCH_SCREEN) getString(R.string.wall_settings_match) else "$choice") }, + ) + } + } + Text(getString(R.string.wall_settings_speed), style = MaterialTheme.typography.titleMedium, color = ink) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + WallPrefs.SPEED_CHOICES.forEach { choice -> + FilterChip( + selected = speed == choice, + onClick = { speed = choice; WallPrefs.setSpeed(this@WallpaperSettingsActivity, choice) }, + label = { Text(if (choice == 1f) "1x" else "${choice.toString().removeSuffix(".0")}x") }, + ) + } + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt new file mode 100644 index 0000000000..26faded94c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt @@ -0,0 +1,132 @@ +package com.droiddeck.launcher.wayland + +import android.app.Service +import android.content.Intent +import android.os.Handler +import android.os.IBinder +import android.os.Looper +import android.os.Message +import android.os.Messenger +import android.util.Log +import android.view.Surface +import com.droiddeck.launcher.core.FileUtils +import java.io.File + +/** + * The bottom-screen desktop's compositor. The compositor's native state is one per process, so the + * desktop gets a process of its own while the session's compositor keeps the top screen. + */ +class BottomDesktopCompositorService : Service() { + private var client: Messenger? = null + /** Echoed in every reply, so the session process can tell replies to an earlier attach apart. */ + @Volatile private var attachTag = 0 + private var outputWidth = 0 + private var outputHeight = 0 + + private val handler = object : Handler(Looper.getMainLooper()) { + override fun handleMessage(msg: Message) { + when (msg.what) { + MSG_ATTACH -> attach(msg) + MSG_DETACH -> CompositorHost.detach(null) + MSG_RESIZE -> resize(msg.arg1, msg.arg2) + MSG_TOUCH -> WaylandCompositor.nativeSendTouch(msg.arg1 and 0xff, msg.arg1 shr 8, + msg.arg2 ushr 16, msg.arg2 and 0xffff) + MSG_KEY -> WaylandCompositor.nativeSendKey(msg.arg1, msg.arg2) + MSG_POINTER -> WaylandCompositor.nativeSendPointer(1, msg.arg1, msg.arg2) + MSG_SCENE -> WaylandCompositor.nativeSendSceneInput(msg.arg1, msg.arg2, msg.peekData()?.getInt(KEY_B) ?: 0) + MSG_CURSOR -> if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(msg.arg1 != 0) + MSG_NEW_GUEST -> WaylandCompositor.nativeResetFirstFrame() + MSG_TEXT -> msg.data?.getString(KEY_TEXT)?.let { WaylandCompositor.textInputCommit(it) } + MSG_STOP -> { + Log.i(TAG, "bottom-screen desktop closed; ending its compositor process") + // A producer that dies still connected keeps the panel's surface from taking another one. + CompositorHost.detach(null) + postDelayed({ android.os.Process.killProcess(android.os.Process.myPid()) }, 300) + } + else -> super.handleMessage(msg) + } + } + } + + private val messenger = Messenger(handler) + + override fun onBind(intent: Intent?): IBinder = messenger.binder + + override fun onUnbind(intent: Intent?): Boolean { + // The session process went away without saying so; nothing is left to draw for. + android.os.Process.killProcess(android.os.Process.myPid()) + return false + } + + private fun attach(msg: Message) { + val surface = msg.obj as? Surface ?: return + val data = msg.data ?: return + client = msg.replyTo + attachTag = msg.arg1 + val runtimeDir = File(data.getString(KEY_RUNTIME_DIR) ?: return).apply { mkdirs() } + val width = data.getInt(KEY_WIDTH) + val height = data.getInt(KEY_HEIGHT) + if (!CompositorHost.isStarted) { + FileUtils.copyAsset(this, "wayland/keymap.xkb", File(runtimeDir, "keymap.xkb")) + data.getString(KEY_LOG)?.let { path -> + WaylandCompositor.setSessionLogFile(File(path)) + runCatching { android.system.Os.setenv("BL_WAYLAND_LOG", path, true) } + .onFailure { Log.w(TAG, "could not point the compositor's log at $path", it) } + } + WaylandCompositor.setFirstFrameListener { reply(MSG_FIRST_FRAME) } + WaylandCompositor.nativeSetScaleMode(SCALE_FIT, ALIGN_CENTER) + } + val turnip = com.droiddeck.launcher.gpu.TurnipDriver(this) + val driverId = if (CompositorHost.isStarted) null else turnip.install() + val resized = CompositorHost.isStarted && (width != outputWidth || height != outputHeight) + val started = CompositorHost.startOrAttach( + this, surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, + applicationInfo.nativeLibraryDir, + width, height, data.getFloat(KEY_REFRESH, 60f), 0, + ) + outputWidth = width + outputHeight = height + if (resized) WaylandCompositor.nativeResizeOutput(width, height) + Log.i(TAG, (if (started) "compositor started" else "compositor attached") + " at ${width}x$height in ${runtimeDir.path}") + reply(MSG_ATTACHED) + } + + private fun resize(width: Int, height: Int) { + if (width <= 0 || height <= 0 || !CompositorHost.isStarted || (width == outputWidth && height == outputHeight)) return + outputWidth = width + outputHeight = height + WaylandCompositor.nativeResizeOutput(width, height) + } + + private fun reply(what: Int) { + val target = client ?: return + runCatching { target.send(Message.obtain(null, what, attachTag, 0)) } + .onFailure { Log.w(TAG, "the session process did not take message $what", it) } + } + + companion object { + private const val TAG = "BottomDesktopComp" + const val MSG_ATTACH = 1 + const val MSG_DETACH = 2 + const val MSG_TOUCH = 3 + const val MSG_KEY = 4 + const val MSG_TEXT = 5 + const val MSG_STOP = 6 + const val MSG_NEW_GUEST = 7 + const val MSG_POINTER = 8 + const val MSG_SCENE = 9 + const val MSG_CURSOR = 10 + const val MSG_RESIZE = 11 + const val MSG_ATTACHED = 101 + const val MSG_FIRST_FRAME = 102 + const val KEY_RUNTIME_DIR = "runtimeDir" + const val KEY_WIDTH = "width" + const val KEY_HEIGHT = "height" + const val KEY_REFRESH = "refresh" + const val KEY_LOG = "log" + const val KEY_TEXT = "text" + const val KEY_B = "b" + private const val SCALE_FIT = 1 + private const val ALIGN_CENTER = 0 + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt index e1e54f7701..7166440029 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/CompositorHost.kt @@ -21,7 +21,6 @@ object CompositorHost { @Volatile private var ownVsyncThread = true - // The screen tick gets its own thread so a busy main thread cannot delay the compositor's frames. private val vsyncThread: HandlerThread by lazy { HandlerThread("droiddeck-vsync", Process.THREAD_PRIORITY_DISPLAY).apply { start() } } @@ -30,7 +29,6 @@ object CompositorHost { @Volatile private var vsyncGeneration = 0 - // Each resume gets a new callback; one left queued from an earlier resume, on either thread, stops itself. private fun vsyncCallback(generation: Int) = object : Choreographer.FrameCallback { override fun doFrame(frameTimeNanos: Long) { if (generation != vsyncGeneration) return @@ -51,11 +49,10 @@ object CompositorHost { outputHeight: Int, refreshHz: Float, fpsLimit: Int, - uiLimit: Int = 0, ): Boolean { ownVsyncThread = SessionPrefs.vsyncThread(context) WaylandCompositor.nativeSetRenderOnCommit(SessionPrefs.renderOnCommit(context)) - pace(refreshHz, fpsLimit, uiLimit) + pace(refreshHz, fpsLimit) if (!SessionState.running) WaylandCompositor.nativeSetOutputSize(outputWidth, outputHeight) if (started) { attached = surface @@ -73,16 +70,16 @@ object CompositorHost { return true } - private fun pace(refreshHz: Float, fpsLimit: Int, uiLimit: Int = 0) { - WaylandCompositor.nativeSetFpsLimit(if (fpsLimit == SessionPrefs.FPS_UNPACED && uiLimit > 0) uiLimit else fpsLimit) + private fun pace(refreshHz: Float, fpsLimit: Int) { + WaylandCompositor.nativeSetFpsLimit(fpsLimit) WaylandCompositor.nativeSetLayerFrameRate(if (fpsLimit > 0) fpsLimit.toFloat() else refreshHz) WaylandCompositor.nativeSetOutputRefreshRate(refreshHz) SessionState.refreshHz = refreshHz } @Synchronized - fun updatePacing(refreshHz: Float, fpsLimit: Int, uiLimit: Int = 0) { - if (started) pace(refreshHz, fpsLimit, uiLimit) + fun updatePacing(refreshHz: Float, fpsLimit: Int) { + if (started) pace(refreshHz, fpsLimit) } @Synchronized diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index a31847a333..8fd329ce2f 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -45,9 +45,8 @@ public final class WaylandCompositor { private static volatile long lastFrameNanos; private static volatile long frameIntervalNanos; - private static volatile long gameFrames; // written by the compositor thread only + private static volatile long gameFrames; - /** Frames the game has presented since the app started; the rate is the difference over time. */ public static long gameFrameCount() { return gameFrames; } public static long recentFrameIntervalMs() { @@ -148,6 +147,10 @@ public final class WaylandCompositor { public static native void nativeStart(String xdgRuntimeDir); + /** Nanoseconds of the compositor's own GPU work while timing is on, or -1 when it is not timed. */ + public static native long nativeGpuBusyNs(); + public static native void nativeSetGpuTiming(boolean on); + public static native void nativeStartWithSurface(Surface surface, String xdgRuntimeDir, String driverPath, String libraryName, String nativeLibDir); @@ -163,6 +166,8 @@ public final class WaylandCompositor { public static native int nativeCursorSerial(); + public static native void nativeSetCursorComposite(boolean on); + public static final int CURSOR_BUF_INTS = 6 + 256 * 256; public static native void nativeSendKey(int evdev, int state); @@ -315,7 +320,6 @@ public final class WaylandCompositor { public static native long nativeHudFrameTimes(float[] out); - /** Stream mode: the scene is the Xbox Cloud Gaming native player's picture, handed over frame by frame. */ public static native void nativeStreamMode(boolean on); public static native void nativeStreamFrame(android.hardware.HardwareBuffer buffer); @@ -330,7 +334,6 @@ public final class WaylandCompositor { private static float pendingDeltaX, pendingDeltaY; public static void sendPointerDelta(float dx, float dy) { - // Round-to-zero per event would drop slow motion entirely; carry the remainder. pendingDeltaX += dx * 256f; pendingDeltaY += dy * 256f; int x = (int) Math.floor(pendingDeltaX); diff --git a/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java b/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java index 2a196ed2d9..c26b295e84 100644 --- a/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java +++ b/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java @@ -19,31 +19,14 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.HashMap; -/** - * DroidDeck's hardware video decoder factory for the native Xbox Cloud Gaming player. It builds WebRTC's own - * AndroidVideoDecoder (hence this package) around a MediaCodec wrapper that can: - * - ask the decoder for low-latency output (Android's KEY_LOW_LATENCY and Qualcomm's low-latency / picture-order - * vendor keys; unknown keys are ignored, and a decoder that refuses them is configured without them); - * - for zero-copy, decode straight onto the player's SurfaceView instead of WebRTC's texture, rendering every - * output buffer there (no GL copy, no compositor; WebRTC then gets no decoded frames to draw). - * Without either option it behaves like WebRTC's HardwareVideoDecoderFactory. - * The route is switchable while the decoder runs (setOutputSurface): {@link #useScreen} sends frames straight to the - * screen (zero-copy) or, with null, back to WebRTC's texture (for the Vulkan compositor and frame generation); - * {@link #setZeroCopySurface} moves a zero-copy decoder to a stand-in surface while the screen surface is gone. - * The factory also reports the decoded size and the decode time (input queued to output ready), which WebRTC's - * stats lack in zero-copy. - */ public class DroidDeckLowLatencyDecoderFactory implements VideoDecoderFactory { - /** Counts frames sent to the display in zero-copy mode (WebRTC's own stats see none). */ public interface FrameCounter { void onFrameShown(); } private final HardwareVideoDecoderFactory hardware; private final EglBase.Context sharedContext; private final boolean lowLatency; - /** Frames go to {@link #zeroCopySurface} (the screen or the stand-in), not WebRTC's texture. */ private volatile boolean zeroCopy; private volatile Surface zeroCopySurface; - /** Back on WebRTC's texture: render the next buffer there, so WebRTC's pending texture frame completes. */ private volatile boolean renderNext; private final FrameCounter counter; private volatile Wrapper live; @@ -64,19 +47,11 @@ public class DroidDeckLowLatencyDecoderFactory implements VideoDecoderFactory { this.counter = counter; } - /** - * Zero-copy: the surface to decode onto from now on; null = a stand-in that drops every frame (the screen - * surface is being destroyed). Must be called before a destroyed surface's callback returns. - */ public synchronized void setZeroCopySurface(Surface surface) { if (!zeroCopy) return; moveTo(surface != null ? surface : standInSurface(), surface != null ? "the screen" : "a stand-in"); } - /** - * Switch the route live: a surface = zero-copy onto it; null = WebRTC's texture again. Returns false when the - * decoder refused the new surface (the route is then unchanged). - */ public synchronized boolean useScreen(Surface screen) { if (screen != null) { Wrapper w = live; @@ -120,12 +95,10 @@ public class DroidDeckLowLatencyDecoderFactory implements VideoDecoderFactory { return standIn.getSurface(); } - /** The decoder's picture size, or null before the first decoder is configured. */ public String videoSize() { return width > 0 ? width + "x" + height : null; } - /** Average decode time since the last call, in ms (-1 when no frame was decoded in between). */ public double takeDecodeMs() { synchronized (decodeLock) { double avg = decodeCount > 0 ? decodeSumMs / decodeCount : -1; @@ -170,10 +143,8 @@ public class DroidDeckLowLatencyDecoderFactory implements VideoDecoderFactory { } } - /** MediaCodec itself (not WebRTC's wrapper) so the output surface can be changed while it runs. */ private class Wrapper implements MediaCodecWrapper { final MediaCodec raw; - /** WebRTC's texture surface, the route back from zero-copy. */ Surface texture; Wrapper(MediaCodec raw) { this.raw = raw; } @@ -207,8 +178,6 @@ public class DroidDeckLowLatencyDecoderFactory implements VideoDecoderFactory { if (from.containsKey(key)) to.setInteger(key, from.getInteger(key)); } - // Zero-copy: AndroidVideoDecoder renders one buffer to its texture and drops the rest until the texture - // hands the frame back, which never happens with the display surface; show every buffer instead. @Override public void releaseOutputBuffer(int index, boolean render) { if (zeroCopy) { raw.releaseOutputBuffer(index, true); if (counter != null) counter.onFrameShown(); } else if (renderNext) { renderNext = false; raw.releaseOutputBuffer(index, true); } diff --git a/app/src/main/res/drawable/ic_bottom_keyboard.xml b/app/src/main/res/drawable/ic_bottom_keyboard.xml new file mode 100644 index 0000000000..ff8aa75002 --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_keyboard.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + <path android:fillColor="#FFFFFFFF" + android:pathData="M20,5H4c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2V8zM11,11h2v2h-2v-2zM8,8h2v2H8V8zM8,11h2v2H8v-2zM7,13H5v-2h2v2zM7,10H5V8h2v2zM16,17H8v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2V8h2v2zM19,13h-2v-2h2v2zM19,10h-2V8h2v2z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_bottom_mouse.xml b/app/src/main/res/drawable/ic_bottom_mouse.xml new file mode 100644 index 0000000000..7a55849853 --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_mouse.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + <path android:fillColor="#FFFFFFFF" + android:pathData="M13,1.07V9h7c0,-4.08 -3.05,-7.44 -7,-7.93zM4,15c0,4.42 3.58,8 8,8s8,-3.58 8,-8v-4H4v4zM11,1.07C7.05,1.56 4,4.92 4,9h7V1.07z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_bottom_swap.xml b/app/src/main/res/drawable/ic_bottom_swap.xml new file mode 100644 index 0000000000..e8ef8120df --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_swap.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + <path android:fillColor="#FFFFFFFF" + android:pathData="M16,17.01V10h-2v7.01h-3L15,21l4,-3.99h-3zM9,3L5,6.99h3V14h2V6.99h3L9,3z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_bottom_touch.xml b/app/src/main/res/drawable/ic_bottom_touch.xml new file mode 100644 index 0000000000..ff90202a8c --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_touch.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + <path android:fillColor="#FFFFFFFF" + android:pathData="M9,11.24V7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11H13v-6C13,6.67 12.33,6 11.5,6S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z" /> +</vector> diff --git a/app/src/main/res/drawable/steam_wall_thumb.xml b/app/src/main/res/drawable/steam_wall_thumb.xml new file mode 100644 index 0000000000..928e86ee11 --- /dev/null +++ b/app/src/main/res/drawable/steam_wall_thumb.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="270dp" + android:height="480dp" + android:viewportWidth="270" + android:viewportHeight="480"> + <path android:fillColor="#0B0F14" android:pathData="M0,0h270v480h-270z" /> + <group android:pivotX="135" android:pivotY="240" android:rotation="-13"> + <path android:fillColor="#161C24" android:strokeColor="#262F3B" android:strokeWidth="1.5" + android:pathData="M-10,-20h70a8,8 0,0 1,8 8v110a8,8 0,0 1,-8 8h-70a8,8 0,0 1,-8 -8v-110a8,8 0,0 1,8 -8z" /> + <path android:fillColor="#161C24" android:strokeColor="#262F3B" android:strokeWidth="1.5" + android:pathData="M-10,140h70a8,8 0,0 1,8 8v110a8,8 0,0 1,-8 8h-70a8,8 0,0 1,-8 -8v-110a8,8 0,0 1,8 -8z" /> + <path android:fillColor="#161C24" android:strokeColor="#262F3B" android:strokeWidth="1.5" + android:pathData="M-10,300h70a8,8 0,0 1,8 8v110a8,8 0,0 1,-8 8h-70a8,8 0,0 1,-8 -8v-110a8,8 0,0 1,8 -8z" /> + <path android:fillColor="#161C24" android:strokeColor="#262F3B" android:strokeWidth="1.5" + android:pathData="M100,60h70a8,8 0,0 1,8 8v110a8,8 0,0 1,-8 8h-70a8,8 0,0 1,-8 -8v-110a8,8 0,0 1,8 -8z" /> + <path android:fillColor="#161C24" android:strokeColor="#262F3B" android:strokeWidth="1.5" + android:pathData="M100,220h70a8,8 0,0 1,8 8v110a8,8 0,0 1,-8 8h-70a8,8 0,0 1,-8 -8v-110a8,8 0,0 1,8 -8z" /> + <path android:fillColor="#161C24" android:strokeColor="#262F3B" android:strokeWidth="1.5" + android:pathData="M210,-20h70a8,8 0,0 1,8 8v110a8,8 0,0 1,-8 8h-70a8,8 0,0 1,-8 -8v-110a8,8 0,0 1,8 -8z" /> + <path android:fillColor="#161C24" android:strokeColor="#262F3B" android:strokeWidth="1.5" + android:pathData="M210,140h70a8,8 0,0 1,8 8v110a8,8 0,0 1,-8 8h-70a8,8 0,0 1,-8 -8v-110a8,8 0,0 1,8 -8z" /> + </group> +</vector> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 6f1e416824..b3068a6f5e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">خيارات VKD3D لـ D3D12. يعطّل nodxr تتبع الأشعة؛ استخدمه فقط للعبة تحتاج إليه.</string> <string name="game_env_proton_log">اضبطه على 1 للحصول على سجل تشخيص Proton. قد يقلل التسجيل من الأداء ويستهلك مساحة التخزين.</string> <string name="game_env_wined3d">اضبطه على 1 لاستخدام WineD3D المعتمد على OpenGL بدلًا من DXVK لاختبار توافق D3D9–11.</string> + <string name="game_env_wined3d_renderer">أداة العرض لـ DirectDraw وDirect3D 1-7 والألعاب التي تعمل عبر WineD3D. يتخطّى Vulkan مسار OpenGL عبر Zink، وهو أسرع بكثير لألعاب DirectDraw وDirect3D 7 القديمة على Adreno.</string> + <string name="game_env_dxvk_d3d8">اضبطه على 1 لتشغيل Direct3D 8 عبر DXVK بدلًا من WineD3D. أسرع في اختبار Direct3D 8 ضمن AIO Graphics Test على Adreno.</string> <string name="game_env_no_ntsync">اضبطه على 1 لإبعاد هذه اللعبة عن ntsync (droiddeck-ntsync أو برنامج تشغيل في النواة)؛ فتستخدم droiddeck-esync حيث تتوفر حزمة، وإلا droiddeck-fsync.</string> <string name="game_env_no_esync">اضبطه على 1 لإيقاف droiddeck-esync لهذه اللعبة؛ فتستخدم droiddeck-fsync بدلًا منه، أو droiddeck-ntsync إذا كان fsync متوقفًا أيضًا.</string> <string name="game_env_no_fsync">اضبطه على 1 لإبعاد هذه اللعبة عن droiddeck-fsync؛ فتستخدم droiddeck-esync حيث تتوفر حزمة، وإلا droiddeck-ntsync.</string> <string name="game_env_fsync_first">اضبطه على 1 لتشغيل هذه اللعبة على droiddeck-fsync، أو على 0 لتقديم droiddeck-esync حيث تتوفر حزمة تناسب إصدار Proton الخاص بها.</string> <string name="game_env_xalia">اضبطه على 0 لتعطيل مساعد التنقل بوحدة التحكم في Proton لهذه اللعبة.</string> + <string name="game_env_anticheat_offline">مفعَّل افتراضيًا. يشغّل لعبة Easy Anti-Cheat دون مكافحة الغش عندما تدعم اللعبة اللعب بلا اتصال. أوقفه للتشغيل عبر Easy Anti-Cheat كالمعتاد. تبقى الأوضاع عبر الإنترنت التي تتطلب Easy Anti-Cheat غير متاحة.</string> <string name="game_env_hud">تراكب DXVK لـ D3D9–11. القيمة fps تعرض معدل الإطارات، وتركه دون تعيين يخفيه.</string> <string name="game_env_dxvk_config">إعدادات DXVK مفصولة بفواصل منقوطة. تستخدم الإصدارات الحديثة dxvk.maxFrameRate لتحديد الإطارات؛ يُفضَّل استخدام محدِّد الإطارات الخاص بالجلسة للعب العادي.</string> + <string name="game_env_cores">أنوية CPU لهذه اللعبة، مثل 0-4 أو 0,2,4، بدلًا من أنوية الألعاب في الجلسة. عدد أقل من الأنوية يعني حرارة أقل.</string> <string name="game_env_vkd3d_limit">حد معدل الإطارات في D3D12. القيمة 0 تلغي الحد.</string> <string name="game_env_glthread">تعدد مؤشرات الترابط في OpenGL ضمن Mesa. قد تساعد القيمة true ألعاب OpenGL المقيدة بأداء CPU؛ جرّبها لكل لعبة.</string> <string name="sync_backend_title">مزامنة Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">يشغّل FEX برامج Linux المخصصة لـ x86 على جهاز ARM64 هذا. يستخدمه الخيار «تلقائي» عندما يكون البرنامج مبنيًا لـ x86.</string> <string name="app_fex_x86">%1$s عبر FEX</string> <string name="app_fex_not_ready">هذا البرنامج مبني لأجهزة كمبيوتر %1$s ويعمل عبر FEX، الذي لم يتم إعداده بعد. افتح Steam مرة واحدة أثناء تسجيل الدخول: سيجعله DroidDeck يُنزّل FEX وSteam Linux Runtime اللازمة، ثم يُفتح هذا البرنامج.</string> + <string name="session_proot_missing">تعذّر تنزيل proot الخاص بـ DroidDeck. تحقّق من الاتصال وحاول مرة أخرى. لم تبدأ الجلسة لأن proot الاحتياطي أبطأ من أن يصلح للعب.</string> + <string name="session_directaudio_missing">تعذّر تنزيل DirectAudio، لذا يستخدم صوت الألعاب المسار الأبطأ في هذه الجلسة.</string> <string name="session_end_program">هذا البرنامج</string> <string name="session_end_steam_download">تعذّر تنزيل عميل Steam. قد تكون شبكتك أو VPN تحظر خوادم Steam؛ تحقّق من الاتصال وحاول مرة أخرى.</string> <string name="session_end_steam_setup">تعذّر إعداد عميل Steam. تحقّق من الاتصال والمساحة الفارغة، ثم حاول مرة أخرى.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">وحدة تحكم Xbox 360</string> <string name="mode_controller_note">Deck: زر «الوصول السريع» والجيروسكوب. Steam Controller: الشيء نفسه، مع استشعار القبضة على الأزرار الخلفية. DualShock 4 وDualSense: الجيروسكوب، ولوحتا التتبع كلوحة اللمس الخاصة بها. Xbox 360: افتح «الوصول السريع» باستخدام Guide+A.</string> <string name="mode_back">زر الرجوع</string> + <string name="back_hold">الضغط المطوّل على الرجوع لاختصارات Steam</string> + <string name="back_hold_hint">الضغط المطوّل على الرجوع يفتح الوصول السريع أو ينشئ اختصارات Steam مع أزرار أخرى. أوقفه لتجاهل الضغط المطوّل؛ النقر والنقر المزدوج يبقيان يعملان.</string> + <string name="back_native_qam_hint">اضغط مطوّلًا على زر الرجوع لمدة 700 ملّي ثانية، أو اضغط عليه مطوّلًا مع زر آخر لاختصارات Steam.</string> + <string name="back_double_tap_window">مهلة النقر المزدوج</string> + <string name="back_tap_ms">%1$d ملّي ثانية</string> + <string name="brightness_permission_title">السماح بالتحكّم في السطوع</string> + <string name="brightness_permission_text">اضبط التحكّم في السطوع في DroidDeck.</string> <string name="back_menu_then_qam">القائمة ← الوصول السريع</string> <string name="back_qam_then_menu">الوصول السريع ← القائمة</string> <string name="mode_session">الجلسة</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">تأخير التعليق في الخلفية أثناء قيام Steam بالتنزيل.</string> <string name="mode_suspend_note">«تلقائي» يوقف مؤقتًا في الخلفية ويستأنف عند الظهور. «يدوي» ينتظر الضغط على «استئناف». «أبدًا» يُبقيه قيد التشغيل.</string> <string name="mode_startup">بدء التشغيل</string> - <string name="mode_steam_startup">تشغيل Steam مع DroidDeck</string> - <string name="mode_steam_startup_hint">يفتح جلسة Steam عند تشغيل DroidDeck.</string> + <string name="mode_startup_session">الفتح عند التشغيل</string> + <string name="mode_startup_session_hint">يبدأ هذه الجلسة عند تشغيل DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">جارٍ البحث عن إصدارات…</string> <string name="mode_decky_ready">جاهز لتثبيت %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">محدَّث · %1$s</string> <string name="mode_decky_loader">المُحمِّل</string> <string name="mode_decky_install_latest">تثبيت أحدث إصدار</string> + <string name="decky_channel">قناة التحديث</string> + <string name="decky_channel_hint">إصدارات Decky Loader التي تُثبَّت. يستخدم مُحدِّث Decky نفسه القناة ذاتها.</string> + <string name="decky_channel_stable">مستقرة</string> + <string name="decky_channel_prerelease">إصدار تجريبي مسبق</string> + <string name="decky_channel_testing">اختبار</string> + <string name="decky_channel_failed">تعذّر حفظ قناة تحديث Decky</string> <string name="mode_decky_on">يبدأ مع Steam. أثناء تفعيله، قد تتمكن التطبيقات الأخرى على هذا الجهاز من التحكم في Steam.</string> <string name="mode_decky_off">متوقف. يبقى منفذ تصحيح الأخطاء عن بُعد في Steam مغلقًا.</string> <string name="mode_decky_remove_title">هل تريد إلغاء تثبيت Decky Loader؟</string> @@ -323,6 +342,10 @@ <string name="mode_client">العميل</string> <string name="mode_mangoapp">تراكب الأداء</string> <string name="mode_mangoapp_hint">أوقفه إذا تعطلت الألعاب أو أصبحت شاشتها سوداء في وضع Deck. يُطبَّق في الجلسة التالية.</string> + <string name="mode_return_after_game">العودة إلى DroidDeck بعد اللعبة</string> + <string name="mode_return_after_game_hint">عند إغلاق لعبة بدأتها من DroidDeck أو من مشغّل آخر، يُغلَق Steam بشكل سليم (بعد اكتمال الحفظ السحابي) وتعود إلى هناك. عند الإيقاف: تبقى في Steam.</string> + <string name="mode_shader_precache">التخزين المسبق للمظلِّلات</string> + <string name="mode_shader_precache_hint">ينزّل Steam مظلِّلات مُعدّة مسبقًا لألعابك ويعالجها في الخلفية، فتقلّ التقطّعات في الألعاب. يوفّر الإيقاف البيانات والتخزين والبطارية، وتبني الألعاب المظلِّلات أثناء اللعب بدلًا من ذلك. هو الإعداد نفسه في Steam ضمن التنزيلات > التخزين المسبق للمظلِّلات. يُطبَّق في الجلسة التالية.</string> <string name="mode_steam_repair">إصلاح عميل Steam</string> <string name="mode_steam_repair_hint">يُنزّل عميل Steam مجددًا في المرة التالية التي يبدأ فيها Steam. استخدمه إذا بقي Steam على شاشة التحميل. يتم الاحتفاظ بالألعاب وتسجيل الدخول والإعدادات.</string> <string name="mode_steam_repair_queued">سيتم تنزيل عميل Steam مجددًا في المرة التالية التي يبدأ فيها Steam.</string> @@ -394,6 +417,8 @@ <string name="mode_directaudio_hint">يتجاوز PulseAudio لتقليل زمن الاستجابة.</string> <string name="mode_mic">الميكروفون</string> <string name="mode_mic_hint">للدردشة الصوتية.</string> + <string name="drawer_mic_hint">شغّل التقاط الميكروفون أو أوقفه لهذه الجلسة.</string> + <string name="drawer_mic_failed">تعذّر تغيير الميكروفون. يُرجى المحاولة مرة أخرى.</string> <string name="mode_network">الشبكة</string> <string name="mode_wifi_discovery">اكتشاف Wi-Fi</string> <string name="mode_wifi_discovery_hint">عرض أسماء شبكات Wi-Fi والشبكات القريبة في Steam.</string> @@ -559,6 +584,16 @@ <string name="perf_gsrealtime">gamescope: طابور GPU بأولوية الوقت الفعلي</string> <string name="perf_gsrealtime_hint">يعطي الأولوية لعمل GPU الخاص بالمُركِّب. قد يحسّن انتظام الإطارات على حساب أداء الألعاب قليلًا.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">الذاكرة</string> + <string name="perf_cap_off">إيقاف</string> + <string name="perf_cap_auto">افتراضي برنامج التشغيل</string> + <string name="perf_zram_client">ضغط Steam أثناء تشغيل لعبة</string> + <string name="perf_zram_client_hint">بعد 20 ثانية من بدء اللعبة، يُضغط عميل Steam في zRAM لترك ذاكرة أكبر للعبة، ثم يُقرأ مجددًا عند إغلاقها. أوقف هذا الخيار إذا كانت الجلسة تُغلَق بعد بدء الألعاب بقليل. يظل حد RAM أعلاه يضغط Steam عندما تتجاوزه الجلسة.</string> + <string name="perf_ram_cap">حد RAM</string> + <string name="perf_ram_cap_hint">يُطبَّق أثناء تشغيل عميل Steam، في جلسة Steam أو من سطح المكتب. عندما تستخدم الجلسة أكثر من هذا الحد، يُضغط Steam ثم عمليات الجلسة المدعومة الأخرى في zRAM. حد مرن: لا يُغلَق شيء، لكن قد تتقطّع الألعاب أثناء استعادة الصفحات.</string> + <string name="perf_ram_cap_unavailable">يتطلب مساحة تبديل zRAM، وهي غير متوفرة على هذا الجهاز.</string> + <string name="perf_vram_cap">حد VRAM</string> + <string name="perf_vram_cap_hint">ذاكرة الفيديو التي يُبلغ بها DXVK ألعاب Direct3D، فتخصّص للأنسجة مساحة أقل. تظل إعدادات DXVK الخاصة باللعبة هي الأولى. يسري في الجلسة التالية.</string> <string name="perf_gpuclock">تثبيت GPU على أعلى تردد له</string> <string name="perf_gpuclock_hint">لـ Adreno فقط. تقطّع أقل، مع استهلاك أكبر للبطارية والحرارة.</string> <string name="perf_fixes">إصلاحات الجلسة</string> @@ -577,6 +612,8 @@ <string name="perf_fastpath">مسار proot السريع</string> <string name="perf_fastpath_needs_seccomp">يحتاج إلى مرشّح seccomp في proot.</string> <string name="perf_fastpath_hint">عمليات بحث أسرع عن الملفات وتقطّع أقل. أوقفه إذا تعذّر على برنامج العثور على ملفاته.</string> + <string name="perf_cursor_composite">رسم المؤشر داخل gamescope</string> + <string name="perf_cursor_composite_hint">يرسم Gamescope المؤشر بنفسه بدلًا من تسليمه إلى Android. فعّله لمؤشر تتحكّم فيه وحدة التحكم. الإيقاف أسرع على الهاتف. يُطبَّق في الجلسة التالية.</string> <string name="perf_identity">هوية الجلسة</string> <string name="perf_hostname">اسم المضيف</string> <string name="perf_hostname_hint">الاسم الذي يراه Steam لهذا الجهاز. اتركه خاليًا للاستعادة إلى %1$s.</string> @@ -591,6 +628,8 @@ <string name="driver_delete_plain">تُزال ملفاته من التطبيق.</string> <string name="driver_delete_in_use">تُزال ملفاته. إنه قيد الاستخدام، فيتولى الافتراضي مكانه.</string> <string name="drawer_page_display">العرض</string> + <string name="drawer_frame_limit">حد الإطارات</string> + <string name="drawer_frame_limit_note">يحدّ هذه اللعبة. تنتقل الشاشة إلى معدل تحديث يقبل القسمة على الحد إن وُجد، وقد تبدو الحدود الأخرى غير منتظمة. تستخدم ألعاب Steam حد الإطارات في Steam ضمن قائمة الوصول السريع.</string> <string name="drawer_page_effects">المؤثرات</string> <string name="drawer_page_controls">عناصر التحكم</string> <string name="drawer_page_components">المكوّنات</string> @@ -622,8 +661,11 @@ <string name="hud_size_pill">كبسولة</string> <string name="hud_size_minimal">مصغّر</string> <string name="hud_size_mega">ضخم</string> + <string name="hud_size_strip">شريط</string> <string name="hud_locked">تثبيت في مكانه</string> <string name="hud_locked_hint">اسحب HUD لتحريكه؛ والضغط مطولًا يثبّته أو يلغي تثبيته. أثناء تثبيته، تظل عناصر التحكم على الشاشة الموجودة تحته تعمل.</string> + <string name="hud_snap">الالتصاق بالجانبين</string> + <string name="hud_snap_hint">اترك الواجهة لتنتقل إلى أقرب جانب من الشاشة. اسحبها بسرعة لترميها في ذلك الاتجاه.</string> <string name="hud_group_look">المظهر</string> <string name="hud_scale">الحجم على الشاشة</string> <string name="hud_color_soft">هادئ</string> @@ -672,7 +714,6 @@ <string name="hud_export_failed">تعذّر حفظ تقرير HUD.</string> <string name="hud_reset">إعادة ضبط إعدادات HUD</string> <string name="hud_reset_button">إعادة ضبط</string> - <string name="hud_credit">FusionHUD من The412Banner، github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">وضع التحجيم</string> <string name="drawer_scaling_sharpness">حدة التحجيم</string> <string name="drawer_effects">مؤثرات الشاشة</string> @@ -707,11 +748,17 @@ <string name="drawer_touch_auto">تلقائي (%1$s)</string> <string name="drawer_keyboard">لوحة المفاتيح</string> <string name="drawer_latency">زمن الاستجابة</string> + <string name="drawer_low_latency">وضع زمن الاستجابة المنخفض</string> + <string name="drawer_low_latency_hint">يزيد استهلاك CPU والبطارية</string> <string name="drawer_low_latency_controller">وحدة تحكم بزمن استجابة منخفض</string> <string name="drawer_low_latency_controller_hint">تبلغ وحدة التحكم بمعدل 1000 هرتز بدلًا من 250 هرتز. استهلاك معالج أعلى قليلًا.</string> <string name="drawer_low_latency_touch">لمس بزمن استجابة منخفض</string> <string name="drawer_low_latency_touch_hint">تتجاوز اللمسات تجميع الإطارات، فيعمل اللمس في Steam بمعدل 1000 هرتز. استهلاك معالج أعلى قليلًا.</string> <string name="drawer_evdev_mouse">قناة فأرة خام</string> + <string name="drawer_relative_mouse">فأرة نسبية</string> + <string name="drawer_relative_mouse_auto">تلقائي</string> + <string name="drawer_relative_mouse_on">تشغيل</string> + <string name="drawer_relative_mouse_off">إيقاف</string> <string name="drawer_direct_cursor">المؤشر</string> <string name="drawer_pc_keyboard">لوحة مفاتيح الكمبيوتر</string> <string name="drawer_android_keyboard">Android</string> @@ -803,6 +850,10 @@ <string name="setup_session">الجلسة</string> <string name="setup_logs">سجلات الجلسة</string> <string name="setup_logs_hint">تُحفَظ بعد كل جلسة</string> + <string name="setup_game_debug_logs">سجلات تصحيح الألعاب</string> + <string name="setup_game_debug_logs_hint">تضمين بيانات تشخيص Proton وWine والرسومات عند تشغيل اللعبة التالية. قد يقلّل الأداء ويستهلك مساحة تخزين أكبر.</string> + <string name="setup_game_debug_logs_restart">أعِد تشغيل هذه الجلسة لحفظ سجلات تصحيح الألعاب</string> + <string name="setup_logging_update_failed">تعذّر تحديث التسجيل. تحقّق من المفتاح وحاول مرة أخرى.</string> <string name="setup_agent_commands">أدوات تصحيح الأخطاء</string> <string name="setup_latest_logs">أحدث سجلات الجلسة</string> <string name="setup_saved_logs">سجلات الجلسة المحفوظة</string> @@ -834,20 +885,22 @@ <string name="setup_home">استخدام كشاشة رئيسية</string> <string name="setup_home_on">يمكن أن يكون DroidDeck تطبيق الشاشة الرئيسية</string> <string name="setup_home_off">لا يُعرَض DroidDeck أبدًا كتطبيق للشاشة الرئيسية</string> + <string name="setup_home_game_space_first">في إضافة الألعاب، اضبط DroidDeck على تضمين</string> <string name="setup_orientation">الاتجاه</string> + <string name="setup_launcher_orientation">اتجاه المشغّل</string> + <string name="setup_launcher_orientation_auto">اتّباع تدوير الجهاز</string> + <string name="setup_orientation_portrait">عمودي</string> + <string name="setup_session_orientation">اتجاه الجلسة</string> + <string name="setup_session_orientation_hint">يُطبَّق على Steam والألعاب وسطح المكتب ومحرّر وحدة التحكم. تدور الدقّات المُعدّة مسبقًا مع الجلسة، ويبقى العرض والارتفاع المخصّصان كما أُدخلا.</string> <string name="setup_orientation_auto">أفقي تلقائي</string> <string name="setup_orientation_landscape">أفقي</string> <string name="setup_orientation_reverse">أفقي معكوس</string> <string name="setup_fullscreen">ملء الشاشة</string> <string name="setup_fullscreen_on">يخفي شريطي الحالة والتنقّل في Android</string> <string name="setup_fullscreen_off">يعرض شريطي الحالة والتنقّل في Android</string> - <string name="setup_dual_screen">الشاشة المزدوجة</string> - <string name="setup_dual_screen_hint">يستخدم الوضع التلقائي الشاشة الثانية في الأجهزة المحمولة التي تحتوي على شاشة مدمجة. يستخدم وضع التشغيل أي شاشة ثانية. يُبقي وضع الإيقاف كل شيء على شاشة واحدة.</string> <string name="setup_dual_screen_auto">تلقائي</string> <string name="setup_dual_screen_on">تشغيل</string> <string name="setup_dual_screen_off">إيقاف</string> - <string name="setup_dual_screen_menu">قائمة الشاشة السفلية</string> - <string name="setup_dual_screen_menu_hint">ينقل الأقسام وقائمة اللعبة إلى الشاشة الثانية ويتم الكتابة هناك، لتبقى الشاشة العلوية بعرضها الكامل. يبدّل L2 وR2 بين الأقسام.</string> <string name="setup_dual_screen_controls">عناصر تحكم الشاشة السفلية في الألعاب</string> <string name="setup_dual_screen_controls_hint">يفتح لوحة اللمس ولوحة المفاتيح على الشاشة الثانية عند بدء الجلسة.</string> <string name="dual_typing_title">الكتابة على الشاشة العلوية</string> @@ -1011,6 +1064,14 @@ <string name="gate_step1">افتح الإعدادات ← خيارات المطوّرين ← تصحيح الأخطاء اللاسلكي وفعِّله</string> <string name="gate_step2">اضغط على «إقران جهاز برمز إقران»</string> <string name="gate_step3">أدخل الرمز في إشعار DroidDeck</string> + <string name="pairguide_build_number">في «لمحة عن الهاتف»، انقر على «رقم الإصدار» 7 مرات</string> + <string name="pairguide_wireless">فعّل «تصحيح الأخطاء اللاسلكي»</string> + <string name="pairguide_pair">افتح «تصحيح الأخطاء اللاسلكي»، ثم انقر على «إقران الجهاز باستخدام رمز الإقران»</string> + <string name="pairguide_child_process">فعّل «إيقاف قيود العمليات الفرعية»</string> + <string name="pairguide_row_child_process">إيقاف قيود العمليات الفرعية</string> + <string name="pairguide_row_build_number">رقم الإصدار</string> + <string name="pairguide_row_wireless">تصحيح الأخطاء اللاسلكي</string> + <string name="pairguide_row_pair">إقران الجهاز باستخدام رمز الإقران</string> <string name="gate_waiting">في انتظار نافذة الإقران المنبثقة…</string> <string name="gate_code_needed">تم العثور على النافذة المنبثقة. أدخل رمزها في الإشعار.</string> <string name="gate_status">الحالة</string> @@ -1149,7 +1210,6 @@ <string name="games_never_played">لم يتم تشغيلها أبدًا</string> <string name="games_runtime_busy_percent">بيئة التشغيل مشغولة · %1$d%%</string> <string name="games_runtime_busy">بيئة التشغيل مشغولة</string> - <string name="games_runtime_first_play">تُثبَّت بيئة التشغيل عند أول تشغيل</string> <string name="games_runtime_update">يتوفر تحديث لبيئة التشغيل</string> <string name="games_runtime_ready">● بيئة التشغيل جاهزة</string> <string name="games_internal">التخزين الداخلي</string> @@ -1166,6 +1226,9 @@ <string name="gpu_hide_other">إخفاء برامج التشغيل لوحدات GPU الأخرى</string> <string name="gpu_show_other">إظهار برامج التشغيل لوحدات GPU الأخرى</string> <string name="gpu_advanced">متقدّم</string> + <string name="gpu_ubwc_title">توافق UBWC</string> + <string name="gpu_ubwc_hint">جرّب التشغيل أو الإيقاف إذا ظهرت خطوط أو وميض في Steam أو Android. يُطبَّق على برنامجَي التشغيل كليهما بعد إعادة تشغيل DroidDeck.</string> + <string name="gpu_ubwc_restart">أعِد تشغيل DroidDeck للتطبيق.</string> <string name="gpu_set_with_display">يُضبَط مع برنامج تشغيل العرض معًا: يحمل %1$s كلاهما.</string> <string name="gpu_set_with_runtime">يُضبَط مع برنامج تشغيل بيئة التشغيل معًا: يحمل %1$s كلاهما.</string> <string name="gpu_runtime_hint">يُستخدَم في الألعاب وسطح المكتب.</string> @@ -1274,10 +1337,15 @@ <string name="pip_auto">الدخول تلقائيًا إلى وضع نافذة ضمن النافذة</string> <string name="unfolded_controls">عناصر التحكّم على الشاشة غير المطوية</string> <string name="unfolded_controls_hint">عند فتح الجهاز، تظهر اللعبة فوق لوحتَي اللمس والمقابض الخلفية بأسلوب Steam Deck. وعند طيّه، تُعرض اللعبة بملء الشاشة.</string> + <string name="unfolded_controls_with_controller">إبقاؤها مع وحدة التحكم</string> + <string name="unfolded_controls_with_controller_hint">إظهار عناصر التحكّم باللمس هذه أيضًا أثناء توصيل وحدة تحكم.</string> <string name="pip_suspended">معلَّقة</string> <string name="pip_not_ready">تتوفّر ميزة نافذة ضمن النافذة عندما تصبح الجلسة جاهزة.</string> <string name="pip_permission">اسمح بميزة نافذة ضمن النافذة لتطبيق DroidDeck في إعدادات Android.</string> <string name="pip_unavailable">تعذّر على Android فتح نافذة ضمن النافذة.</string> + <string name="game_more">المزيد</string> + <string name="game_edit_art">تعديل الصور</string> + <string name="stores_in_steam_label">في Steam</string> <string name="game_shortcut">اختصار</string> <string name="game_shortcut_add">إضافة إلى الشاشة الرئيسية</string> <string name="game_shortcut_choose">اختيار لعبة</string> @@ -1301,6 +1369,10 @@ <string name="main_wait_runtime">انتظر حتى تنتهي عملية بيئة التشغيل</string> <string name="main_wait_proton_install">انتظر حتى ينتهي تثبيت أداة التوافق</string> + <string name="load_compat_title">جارٍ تجهيز أدوات التوافق</string> + <string name="load_compat_wait">في انتظار اكتمال إعداد التوافق</string> + <string name="load_compat_hint">ستبدأ جلستك عند اكتمال الإعداد.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">انتظر حتى ينتهي تثبيت تطبيق سطح المكتب</string> <string name="main_wait_install_game">انتظر حتى ينتهي التثبيت قبل تشغيل لعبة</string> <string name="main_saves_close_session">أغلِق جلسة Steam أولاً حتى لا تحفظ اللعبة فوق الملفات المستورَدة</string> @@ -1353,6 +1425,9 @@ <string name="main_install_anyway">التثبيت على أي حال</string> <string name="main_remove_runtime_title">إزالة بيئة تشغيل Linux</string> <string name="main_remove_runtime_text">سيؤدي هذا إلى حذف بيئة التشغيل وعميل Steam بداخلها وكل لعبة مثبَّتة فيها.</string> + <string name="runtime_actions_title">بيئة تشغيل Linux</string> + <string name="runtime_actions_text">يعيد الإصلاح تثبيت ملفات النظام في بيئة التشغيل ويحتفظ بـ Steam وألعابك وإعداداتك. تُثبَّت الإضافات مثل سطح المكتب مجددًا عند استخدامها لاحقًا. أما الإزالة فتحذف كل شيء.</string> + <string name="runtime_repair">إصلاح بيئة التشغيل</string> <string name="main_applied">تم التطبيق: %1$s</string> <string name="android_app_open_failed_primary">تعذّر فتح %1$s على الشاشة الأساسية</string> <string name="android_app_open_failed_on">تعذّر فتح %1$s على %2$s</string> @@ -1494,6 +1569,15 @@ <string name="session_runtime_catalog_unreachable">تعذّر الوصول إلى كتالوج بيئة التشغيل. تحقَّق من الاتصال واضغط على «تشغيل» مرة أخرى.</string> <string name="session_runtime_install_failed">لم يتم تثبيت بيئة تشغيل Linux. تحقَّق من بيئة التشغيل في «الإعداد» واضغط على «تشغيل» مرة أخرى.</string> <string name="session_desktop_install_failed">لم يتم تثبيت سطح المكتب (%1$s). تحقَّق من الاتصال واضغط على «سطح المكتب» مرة أخرى.</string> + <string name="session_package_resume_failed">تعذّر إكمال تثبيت توقّف قبل انتهائه (%1$s). تحقّق من الاتصال والمساحة، ثم حاول مرة أخرى.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="zero">بيئة تشغيل Linux تالفة: %1$d رابط مكتبة يشير إلى ملفات مفقودة (%2$s وغيرها)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + <item quantity="one">بيئة تشغيل Linux تالفة: رابط مكتبة واحد يشير إلى ملف مفقود (%2$s)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + <item quantity="two">بيئة تشغيل Linux تالفة: رابطا مكتبة يشيران إلى ملفات مفقودة (%2$s وغيره)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + <item quantity="few">بيئة تشغيل Linux تالفة: %1$d روابط مكتبات تشير إلى ملفات مفقودة (%2$s وغيرها)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + <item quantity="many">بيئة تشغيل Linux تالفة: %1$d رابطًا لمكتبات تشير إلى ملفات مفقودة (%2$s وغيرها)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + <item quantity="other">بيئة تشغيل Linux تالفة: %1$d رابط مكتبة يشير إلى ملفات مفقودة (%2$s وغيرها)، وعادةً بعد توقّف تثبيت قبل انتهائه. يحتفظ الإصلاح بألعابك وإعداداتك.</item> + </plurals> <string name="session_ended_named">توقّف %1$s بشكل غير متوقَّع. شارِك السجلات مع بلاغ عن الخطأ، أو حاوِل مرة أخرى.</string> <string name="session_ended_program">توقّف البرنامج بشكل غير متوقَّع. شارِك السجلات مع بلاغ عن الخطأ، أو حاوِل مرة أخرى.</string> <string name="session_ended_desktop">توقّف سطح المكتب بشكل غير متوقَّع. شارِك السجلات مع بلاغ عن الخطأ، أو حاوِل مرة أخرى.</string> @@ -1512,6 +1596,17 @@ <string name="mode_decky_plugins_hint">ثبِّت ملف ZIP لإضافة في جلسة Steam التالية.</string> <string name="mode_decky_plugin_downloading">جارٍ التنزيل…</string> <string name="mode_decky_plugin_install_zip">التثبيت من ملف ZIP</string> + <string name="decky_zip_warning_title">تثبيت إضافة من جهة خارجية</string> + <string name="decky_zip_warning_text">لم يراجع فريق Decky Loader هذه الإضافة. قد تحتوي على برامج ضارة، مثل برامج لسرقة حساب Steam الخاص بك أو إلحاق الضرر بجهازك. بتثبيت هذه الإضافة، فإنك توافق على تحمّل جميع المخاطر على جهازك.</string> + <string name="decky_zip_warning_continue">متابعة</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="zero">يُرجى الانتظار %1$d ثانية</item> + <item quantity="one">يُرجى الانتظار ثانية واحدة</item> + <item quantity="two">يُرجى الانتظار ثانيتين</item> + <item quantity="few">يُرجى الانتظار %1$d ثوانٍ</item> + <item quantity="many">يُرجى الانتظار %1$d ثانية</item> + <item quantity="other">يُرجى الانتظار %1$d ثانية</item> + </plurals> <string name="store_cat_games">الألعاب</string> <string name="store_cat_audio_video">الصوت والفيديو</string> <string name="store_cat_graphics">الرسومات</string> @@ -1693,6 +1788,8 @@ <string name="fm_accept">موافق</string> <string name="fm_decline">رفض</string> <string name="fm_drive_not_readable">تم تركيب %1$s لكن تتعذّر قراءته حاليًا</string> + <string name="fm_drive_access_title">السماح بالوصول إلى %1$s</string> + <string name="fm_drive_access_text">يتيح Android لتطبيق DroidDeck رؤية محرك الأقراص هذا دون قراءته. فعّل الوصول إلى جميع الملفات لتطبيق DroidDeck ثم عُد.</string> <string name="fm_list_view">عرض القائمة</string> <string name="fm_grid_view">عرض الشبكة</string> <string name="fm_search">بحث</string> @@ -1768,6 +1865,89 @@ <string name="second_mode_keyboard_trackpad">لوحة المفاتيح + لوحة اللمس</string> <string name="second_mode_terminal">الوحدة الطرفية</string> <string name="second_mode_deck_controls">مقابض Deck + لوحتا اللمس</string> + <string name="second_mode_dashboard">لوحة المعلومات</string> + <string name="bottom_dashboard_empty">لا يوجد ما يُعرض هنا بعد.</string> + <string name="bottom_page_downloads">التنزيلات</string> + <string name="bottom_downloads_none">لا توجد تنزيلات جارية.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">جارٍ تنزيل ذاكرة المظلِّلات المؤقتة</string> + <string name="bottom_downloads_paused">متوقف مؤقتًا</string> + <string name="bottom_downloads_queued">بانتظار البدء</string> + <string name="bottom_page_notifications">الإشعارات</string> + <string name="bottom_notifications_listener">الشاشة السفلية لـ DroidDeck</string> + <string name="bottom_notifications_why">اعرض الرسائل والإشعارات الأخرى هنا أثناء اللعب. تبقى على هذه الشاشة فقط ولا تُحفظ. يطلب Android الإذن مرة واحدة: تُفتح صفحة الوصول إلى الإشعارات على هذه الشاشة؛ فعِّل DroidDeck هناك وستعود هذه الصفحة تلقائيًا.</string> + <string name="bottom_notifications_allow">السماح بالوصول إلى الإشعارات</string> + <string name="bottom_notifications_none">لا توجد إشعارات.</string> + <string name="bottom_notifications_count">الإشعارات: %1$d</string> + <string name="bottom_notifications_clear">مسح</string> + <string name="bottom_page_screenshots">لقطات الشاشة</string> + <string name="stats_fps_needs_hud">يتطلب FPS تشغيل واجهة الأداء</string> + <string name="stats_speed">السرعة</string> + <string name="stats_pedals">الدواسات</string> + <string name="stats_gforce">قوة G</string> + <string name="stats_timing">التوقيت</string> + <string name="stats_best_lap">أفضل لفة</string> + <string name="stats_tires">الإطارات °C</string> + <string name="stats_trace">دواسة الوقود والمكابح، آخر 10 s</string> + <string name="stats_speed_chart">السرعة، %1$s</string> + <string name="stats_gear">الترس</string> + <string name="stats_steam_client_arm">عميل Steam ARM</string> + <string name="stats_steam_client_x86">عميل Steam x86</string> + <string name="stats_throttle">دواسة الوقود</string> + <string name="stats_brake">المكابح</string> + <string name="stats_lights">لوحة العدادات</string> + <string name="stats_lamp_shift">تبديل الترس</string> + <string name="stats_lamp_handbrake">فرامل اليد</string> + <string name="stats_lamp_pit">محدِّد سرعة حارة الصيانة</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">التيربو %1$s bar</string> + <string name="stats_engine_temp">المحرك %1$s °C</string> + <string name="stats_oil_temp">الزيت %1$s °C</string> + <string name="stats_power">موزّع الطاقة</string> + <string name="stats_fuel_t">الوقود، t</string> + <string name="stats_fuel_main">الرئيسي %1$s t</string> + <string name="stats_fuel_reserve">الاحتياطي %1$s t</string> + <string name="bottom_telemetry_send_title">إرسال بيانات لوحة العدادات</string> + <string name="bottom_telemetry_send_auto">تلقائي</string> + <string name="bottom_telemetry_send_auto_hint">يفعّلها لكل لعبة مدرجة هنا، بما في ذلك الألعاب التي يُعثر عليها لاحقًا. تبقى الألعاب التي توقفها متوقفة.</string> + <string name="bottom_telemetry_send_note">يغيّر هذا إعداد إخراج البيانات الخاص باللعبة نفسها. يسري في المرة التالية التي تبدأ فيها اللعبة، وإيقافه يعيد الإعداد القديم.</string> + <string name="bottom_telemetry_send_close">أغلق %1$s لتغيير هذا.</string> + <string name="bottom_telemetry_send_failed">تعذّر تغيير إعدادات %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: فعِّل %2$s في إعدادات اللعبة باستخدام IP 127.0.0.1 والمنفذ %3$d.</string> + <string name="bottom_shots_where">تُحفظ في Pictures/DroidDeck. تظهر لقطات شاشة Steam هنا أيضًا.</string> + <string name="bottom_shots_take">التقاط لقطة شاشة</string> + <string name="bottom_shots_saved">تم حفظ لقطة الشاشة.</string> + <string name="bottom_shots_failed">تعذّر التقاط لقطة شاشة.</string> + <string name="bottom_shots_none">لا توجد لقطات شاشة بعد.</string> + <string name="bottom_page_chat">الدردشة والصوت</string> + <string name="bottom_chat_why">اقرأ دردشة Steam وردّ عليها هنا بينما تستمر اللعبة على الشاشة الرئيسية. تستخدم الحساب المسجَّل دخوله في Steam.</string> + <string name="bottom_chat_not_signed_in">لا يملك Steam بعد تسجيل دخول على الويب لمشاركته، لذا سجّل الدخول هنا مرة واحدة.</string> + <string name="bottom_chat_stopped">أغلق Android صفحة الدردشة بينما كان DroidDeck في الخلفية. ستُفتح مجددًا عند عودتك إلى DroidDeck.</string> + <string name="bottom_chat_open">فتح Steam Chat</string> + <string name="bottom_chat_close">إغلاق الدردشة</string> + <string name="bottom_chat_mic_on">الميكروفون مفعّل</string> + <string name="bottom_chat_mic_off">الميكروفون متوقف</string> + <string name="bottom_chat_mic_unavailable">الميكروفون متوقف لهذه اللعبة. للتحدث، فعِّل «الميكروفون» في إعدادات Steam في DroidDeck (الصوت) وابدأ اللعبة من جديد.</string> + <string name="bottom_chat_volume">مستوى الصوت %1$d%%</string> + <string name="bottom_page_telemetry">إحصاءات داخل اللعبة</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">البطارية</string> + <string name="bottom_telemetry_lap">اللفة</string> + <string name="bottom_telemetry_position">المركز</string> + <string name="bottom_telemetry_this_lap">اللفة الحالية</string> + <string name="bottom_telemetry_last_lap">اللفة السابقة</string> + <string name="bottom_telemetry_fuel">الوقود</string> + <string name="bottom_telemetry_cargo">الحمولة</string> + <string name="bottom_telemetry_pips">توزيع الطاقة SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">الوضع القانوني</string> + <string name="bottom_telemetry_balance">الرصيد</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">يستقبل المنفذ %1$d بيانات (%2$d حزمة بحجم %3$d بايت)، لكن بتنسيق لا تستطيع هذه الصفحة قراءته بعد.</string> + <string name="bottom_telemetry_port_busy">يستخدم برنامج آخر المنفذ %1$s بالفعل، لذا لا يمكن عرض تلك اللعبة هنا.</string> <string name="rtinst_removing">جارٍ إزالة بيئة تشغيل Linux</string> <plurals name="rtinst_removing_entries"> @@ -1802,6 +1982,7 @@ <string name="flatpakmgr_not_ready">أعِدّ Flatpak أولاً</string> <string name="flatpakmgr_starting">جارٍ البدء</string> <string name="flatpakmgr_exit_status">خرج Flatpak بالحالة %1$d</string> + <string name="flatpakmgr_wrong_arch">تم بناء %1$s لمعمارية %2$s، ولا يستطيع DroidDeck تشغيلها. تحتاج تطبيقات Flatpak هنا إلى إصدار لمعمارية ARM64 أو x86_64.</string> <string name="flatpakmgr_installing">جارٍ تثبيت %1$s</string> <string name="flatpakmgr_updating">جارٍ تحديث %1$s</string> <string name="flatpakmgr_removing">جارٍ إزالة %1$s</string> @@ -1895,6 +2076,7 @@ <string name="adbpair_applying">جارٍ تطبيق الإعداد…</string> <string name="adbpair_command_failed">فشل أمر تصحيح الأخطاء اللاسلكي</string> <string name="adbpair_channel_name">إعداد تصحيح الأخطاء اللاسلكي</string> + <string name="adbpair_progress_channel_name">تقدّم إعداد تصحيح الأخطاء اللاسلكي</string> <string name="adbpair_channel_description">يطلب رمز إقران تصحيح الأخطاء اللاسلكي أثناء فتح الإعدادات</string> <string name="adbpair_title_pair">إقران تصحيح الأخطاء اللاسلكي</string> <string name="adbpair_waiting_text">فعِّل تصحيح الأخطاء اللاسلكي، ثم اضغط على «إقران الجهاز برمز الإقران».</string> @@ -2003,6 +2185,7 @@ <string name="gpuinfo_not_adreno">وحدة GPU ليست من نوع Adreno</string> <string name="gpuinfo_supported">مدعوم</string> <string name="gpuinfo_experimental">تجريبي: برامج تشغيله إصدارات اختبارية</string> + <string name="gpuinfo_a850_experimental">دعم تجريبي لـ Adreno 850: يتطلب برامج تشغيل تجريبية متوافقة للعرض والألعاب، ولم يُتحقَّق منه على هذا الجهاز</string> <string name="gpuinfo_below_tested">أقل من العتاد المُختبَر (Adreno 725 وأحدث): قد لا يعمل</string> <string name="gpuinfo_unsupported">غير مدعوم: يحتاج DroidDeck إلى وحدة GPU من نوع Adreno (Snapdragon)</string> @@ -2099,6 +2282,7 @@ <string name="display_look_filter">%1$s يضبط أسلوب التكبير على %2$s.</string> <string name="display_match_screen">مطابقة الشاشة (%1$d×%2$d)</string> <string name="display_follow_screen">اتباع الشاشة (يُغيَّر الحجم عند الطي أو الفتح)</string> + <string name="display_follow_screen_scaled">مقياس %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">إظهار تفاصيل الجهاز</string> <string name="device_info_hide">إخفاء تفاصيل الجهاز</string> @@ -2205,6 +2389,13 @@ <string name="stores_resume">استئناف</string> <string name="stores_refresh">تحديث</string> <string name="stores_sort">ترتيب</string> + <string name="setup_rail_labels">تسميات الشريط الجانبي</string> + <string name="setup_rail_labels_hint">إظهار الأسماء أسفل رموز الشريط الجانبي. أوقفه للحصول على شريط جانبي أنحف.</string> + <string name="library_display">العرض</string> + <string name="library_display_larger">بطاقات أكبر</string> + <string name="library_display_smaller">بطاقات أصغر</string> + <string name="library_display_title">إظهار العنوان</string> + <string name="library_display_size">إظهار الحجم</string> <string name="stores_sort_last_played">لُعب مؤخرًا</string> <string name="stores_sort_recently_installed">ثُبت مؤخرًا</string> <string name="stores_sort_title_asc">العنوان أ–ي</string> @@ -2331,6 +2522,9 @@ <string name="stores_download_manager">مدير التنزيلات</string> <string name="stores_parallel">عدد التنزيلات المتزامنة</string> <string name="stores_install_where">التثبيت في</string> + <string name="stores_install_language">لغة اللعبة</string> + <string name="stores_install_language_hint">يثبّت GOG وEpic هذه اللغة. خيار «النظام» يتبع لغة التطبيق.</string> + <string name="stores_install_language_system">النظام</string> <string name="stores_install_title">تثبيت %1$s:</string> <string name="stores_target_internal">التخزين الداخلي</string> <string name="stores_target_free">%1$s متاحة</string> @@ -2369,6 +2563,9 @@ <string name="edit_target">الهدف</string> <string name="edit_start_in">بدء التشغيل في</string> <string name="edit_launch_options">خيارات التشغيل</string> + <string name="edit_launch_options_steam_hint">مشتركة مع خصائص Steam: أي تغيير في أحدهما يظهر في كليهما.</string> + <string name="edit_launch_options_not_saved">تعذّر حفظ خيارات التشغيل في Steam. حاول مرة أخرى.</string> + <string name="edit_launch_options_desktop">قد يكون Steam مفتوحًا في جلسة سطح المكتب. غيّر خيارات التشغيل من خصائصه، أو أغلق الجلسة أولًا.</string> <string name="edit_artwork">الصور الفنية</string> <string name="edit_other_exe">ملف exe آخر…</string> <string name="edit_remove">إزالة</string> @@ -2504,6 +2701,7 @@ <string name="setup_download_source_custom">بادئة خاصة</string> <string name="setup_download_mirror">الموقع</string> <string name="setup_download_prefix">البادئة</string> + <string name="setup_download_proxy">وكيل HTTP</string> <string name="flathub_eyebrow">تطبيقات Linux</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">تطبيقات سطح المكتب لسطح مكتب Linux، تُفتح من سطح المكتب.</string> @@ -2652,6 +2850,22 @@ <string name="glasses_tracking_flat_hint">يُبقي الوضع «تلقائي» لعبة 2D هذه ثابتة أمامك. اختر «شاشة افتراضية» في «العرض» لاستخدام تتبّع الرأس.</string> <string name="glasses_tracking_sbs_hint">يُطبَّق تتبّع الرأس على الشاشة الافتراضية أو على لعبة SteamVR قيد التشغيل.</string> <string name="glasses_hardware">الجهاز</string> + <string name="vr_controllers_tab">وحدات التحكم</string> + <string name="vr_controllers_group">وحدات تحكم SteamVR</string> + <string name="vr_controllers_emulate">ذراع الألعاب في VR</string> + <string name="vr_controllers_emulate_hint">يدا VR اللتان تؤدي وحدة التحكم دورهما. تُطبَّق التغييرات فورًا، حتى أثناء تشغيل SteamVR. تظل وحدات Joy-Con والأيدي المتتبَّعة تتولى جانبها.</string> + <string name="vr_controllers_off">ذراع ألعاب عادية</string> + <string name="vr_controllers_index">وحدات تحكم Valve Index</string> + <string name="vr_controllers_touch">وحدات تحكم Meta Quest 3</string> + <string name="vr_controllers_vive">عصيّ HTC Vive</string> + <string name="vr_controllers_sticks">تبدأ العصا بـ</string> + <string name="vr_controllers_sticks_hint">اضغط على العصوين معًا أثناء VR للتبديل.</string> + <string name="vr_controllers_sticks_game">تحريكك داخل اللعبة</string> + <string name="vr_controllers_sticks_hands">تحريك اليدين</string> + <string name="vr_controllers_buttons">الأزرار</string> + <string name="vr_controllers_buttons_stick">الزنادات زنادات، والأزرار الكتفية للإمساك، وA/B وX/Y هي أزرار الوجه لكل يد، والنقر على العصا ينقر عصا الإبهام، وGuide يفتح قائمة SteamVR. أعلى وأسفل لوحة الاتجاهات يقرّبان اليدين أو يبعدانهما.</string> + <string name="vr_controllers_buttons_vive">العصوان لوحتا لمس، والضغط عليهما بـ A/X أو بالنقر على العصا. الزنادات زنادات، والأزرار الكتفية للإمساك، وStart وSelect للقائمة، وGuide يفتح قائمة SteamVR.</string> + <string name="vr_controllers_buttons_off">بلا أيدٍ في VR. تتلقّى الألعاب التي تدعم ذراع الألعاب، وقائمة SteamVR، وحدة التحكم كالمعتاد.</string> <string name="glasses_brightness">السطوع</string> <string name="glasses_volume">مستوى الصوت</string> <string name="glasses_sunblock">حجب الشمس</string> @@ -2709,6 +2923,12 @@ <string name="hand_camera_placement">وضع الكاميرا</string> <string name="hand_camera_placement_hint">تحقّق من أن الكاميرا تراك قبل اللعب.</string> <string name="hand_camera_check">تحقّق</string> + <string name="tracking_pack_title">تنزيل تتبّع اليدين</string> + <string name="tracking_pack_hint">يتطلب تتبّع اليدين تنزيلًا لمرة واحدة بحجم %1$s.</string> + <string name="tracking_pack_download">تنزيل</string> + <string name="tracking_pack_retry">إعادة المحاولة</string> + <string name="tracking_pack_downloading">جارٍ تنزيل تتبّع اليدين… %1$d%%</string> + <string name="tracking_pack_failed">تعذّر تنزيل تتبّع اليدين. تحقّق من اتصالك وحاول مرة أخرى.</string> <string name="hand_camera_check_title">وضع الكاميرا</string> <string name="hand_camera_how_rear">ضع الجهاز واقفًا على بُعد 1.5 إلى 2 متر تقريبًا بارتفاع الصدر، مع توجيه الكاميرا الخلفية نحوك. ثم ادخل إلى مجال الرؤية ويداك ممدودتان.</string> <string name="hand_camera_how_front">ضع الجهاز واقفًا على بُعد 1.5 إلى 2 متر تقريبًا بارتفاع الصدر، مع توجيه الشاشة نحوك. ثم ادخل إلى مجال الرؤية ويداك ممدودتان.</string> @@ -2780,6 +3000,21 @@ <string name="storage_safe_hint">بيئات تشغيل غير مستخدمة وبقايا وسجلات قديمة</string> <string name="storage_clean_up">جارٍ التنظيف…</string> <string name="storage_session_running">أوقف الجلسة لتنظيف التخزين أو حذف شيء. تبقى الأحجام ظاهرة.</string> + <string name="storage_default_group">موقع التثبيت</string> + <string name="storage_default_title">التخزين الافتراضي</string> + <string name="storage_default_hint">تُثبَّت ألعاب المتاجر الجديدة في الموقع المحدد. تبقى الألعاب الحالية في مكانها. تحتفظ مكتبات Steam بإعدادها الخاص.</string> + <string name="storage_default_ask">السؤال في كل مرة</string> + <string name="storage_default_ask_detail">اختر وجهة لكل تثبيت</string> + <string name="storage_default_internal">مساحة التخزين الداخلية</string> + <string name="storage_default_external">مساحة التخزين الخارجية</string> + <string name="storage_default_external_detail">%1$s · %2$s متاحة</string> + <string name="storage_default_external_missing">غير متصل</string> + <string name="storage_default_folder">مجلد · %1$s</string> + <string name="storage_default_folder_free">%1$s متاحة</string> + <string name="storage_default_folder_missing">غير متصل</string> + <string name="storage_default_choose_folder">اختيار مجلد…</string> + <string name="storage_default_choose_folder_detail">استخدم أي مجلد على بطاقة SD أو محرك USB</string> + <string name="storage_default_note">توضع الألعاب في مجلد Games داخل الموقع المحدد. لا تُنقل الألعاب الحالية.</string> <string name="storage_where">إلى أين يذهب</string> <string name="storage_games">ألعاب Steam</string> <string name="storage_game_data">بيانات الألعاب</string> @@ -2929,6 +3164,9 @@ <string name="storage_data_installed">الألعاب المثبَّتة</string> <string name="storage_data_parts">البادئة %1$s · الشيدرات %2$s · الورشة %3$s</string> <string name="storage_clear_shaders">مسح الشيدرات</string> + <string name="storage_reset_prefix">إعادة ضبط البادئة</string> + <string name="storage_reset_prefix_title">هل تريد إعادة ضبط بادئة %1$s؟</string> + <string name="storage_reset_prefix_confirm">يحذف بادئة Wine الخاصة بها (%1$s) في %2$s ويعيد إنشاءها عند التشغيل التالي. تُفقد عمليات الحفظ والإعدادات والحزم القابلة لإعادة التوزيع المثبَّتة داخلها، وتبقى حفظات Steam Cloud في حسابك.</string> <string name="storage_data_leftovers">ألعاب محذوفة</string> <string name="storage_steam_app">تطبيق Steam %1$d</string> <string name="storage_leftover_unsure_detail">البادئة تحتوي على ملفات، ربما حفظات محلية</string> @@ -3238,6 +3476,117 @@ <string name="spatial_saved_views_hint">يمكن إعادة حساب المشاهدات المحفوظة. ابدأ معايرة جديدة لالتقاطها في نظام إحداثيات التتبع الحالي.</string> <string name="spatial_model_checksum_error">المجموع الاختباري لنموذج تتبع اليدين غير مطابق</string> <string name="spatial_opencv_load_error">تعذر تحميل OpenCV</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">المزامنة عبر Syncthing</string> + <string name="sync_enable_hint">هذا تطبيق لـ Syncthing مبني على Syncthing-Fork، يتيح لك مزامنة الملفات الموجودة في نظام الملفات الداخلي لـ DroidDeck مع نسخ Syncthing أخرى. ينطبق ذلك فقط على الملفات التي تخزّنها داخل نظام الملفات الداخلي لـ DroidDeck.</string> + <string name="sync_missing">هذا الإصدار لا يتضمن Syncthing.</string> + <string name="sync_starting">جارٍ تشغيل Syncthing</string> + <string name="sync_status_starting">جارٍ البدء</string> + <string name="sync_status_up_to_date">محدَّث</string> + <string name="sync_status_syncing">جارٍ المزامنة</string> + <string name="sync_status_paused">متوقف مؤقتًا</string> + <string name="sync_status_pausing">جارٍ الإيقاف المؤقت</string> + <string name="sync_status_resuming">جارٍ الاستئناف</string> + <string name="sync_status_attention">يحتاج إلى انتباه</string> + <string name="sync_status_failed">توقف Syncthing</string> + <string name="sync_failed_retry">إعادة المحاولة</string> + <string name="sync_paused_wifi">متوقف مؤقتًا حتى الاتصال بشبكة Wi-Fi</string> + <string name="sync_paused_game">متوقف مؤقتًا أثناء اللعب</string> + <string name="sync_summary">المجلدات: %1$d · الأجهزة المتصلة: %2$d من %3$d</string> + <string name="sync_left">المتبقي: %1$s</string> + <string name="sync_open_web_ui">فتح واجهة الويب</string> + <string name="sync_pause">إيقاف مؤقت</string> + <string name="sync_resume">استئناف</string> + <string name="sync_running">قيد التشغيل</string> + <string name="sync_running_hint">أوقف هذا الخيار لإيقاف Syncthing تمامًا.</string> + <string name="sync_this_device">هذا الجهاز</string> + <string name="sync_device_id">معرّف الجهاز</string> + <string name="sync_show_qr">عرض رمز QR</string> + <string name="sync_advanced">متقدم</string> + <string name="sync_advanced_hint">المنافذ، وقت التشغيل، إعادة التعيين</string> + <string name="sync_open">فتح</string> + <string name="sync_waiting">بانتظارك</string> + <string name="sync_pending_device">يريد %1$s الاتصال</string> + <string name="sync_pending_folder">يريد %1$s مشاركة «%2$s»</string> + <string name="sync_pending_folder_hint">اقبل لاختيار مكان حفظه في DroidDeck.</string> + <string name="sync_review">المراجعة في واجهة الويب</string> + <string name="sync_folders">المجلدات</string> + <string name="sync_no_folders">لا توجد مجلدات بعد.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">محدَّث</string> + <string name="sync_folder_syncing">جارٍ المزامنة %1$d%%</string> + <string name="sync_folder_scanning">جارٍ الفحص</string> + <string name="sync_folder_paused">متوقف مؤقتًا</string> + <string name="sync_folder_out_of_sync">غير متزامن</string> + <string name="sync_folder_errors">تعذّرت مزامنة ملفات: %1$d</string> + <string name="sync_folder_blocked">محظور</string> + <string name="sync_folder_blocked_hint">يقع هذا المجلد خارج مساحة تخزين DroidDeck، لذلك أوقفه DroidDeck مؤقتًا. لمزامنة مجلدات خارج DroidDeck، استخدم تطبيق Syncthing-Fork.</string> + <string name="sync_remove_folder">إزالة من Syncthing</string> + <string name="sync_remove_folder_hint">لا تؤدي إزالته إلى حذف أي ملفات.</string> + <string name="sync_devices">الأجهزة</string> + <string name="sync_no_devices">لا توجد أجهزة بعد.</string> + <string name="sync_connected">متصل</string> + <string name="sync_offline">غير متصل</string> + <string name="sync_last_seen">آخر ظهور %1$s</string> + <string name="sync_device_id_title">معرّف هذا الجهاز</string> + <string name="sync_device_id_hint">على جهازك الآخر، أضف جهازًا في Syncthing وامسح هذا الرمز أو الصق المعرّف. ثم اقبله هنا في واجهة الويب.</string> + <string name="sync_copy">نسخ</string> + <string name="sync_share">مشاركة</string> + <string name="sync_done">تم</string> + <string name="sync_off_title">هل تريد إيقاف Syncthing؟</string> + <string name="sync_off_body">سيتوقف Syncthing الآن ويظل متوقفًا إلى أن تعيد تشغيله. تبقى الملفات المتزامنة في مكانها.</string> + <string name="sync_off_forget">حذف إعدادات Syncthing أيضًا</string> + <string name="sync_off_forget_hint">يزيل معرّف هذا الجهاز والمجلدات والأجهزة. عند تشغيله مجددًا يبدأ من جديد.</string> + <string name="sync_turn_off">إيقاف</string> + <string name="sync_ports">المنافذ</string> + <string name="sync_port_sync">المزامنة</string> + <string name="sync_port_discovery">الاكتشاف المحلي</string> + <string name="sync_repick">اختيار منافذ جديدة</string> + <string name="sync_repick_hint">يُعاد التحقق منها عند كل تشغيل.</string> + <string name="sync_repick_button">إعادة الاختيار</string> + <string name="sync_reset_group">إعادة التعيين</string> + <string name="sync_api_key">مفتاح API</string> + <string name="sync_regenerate">إعادة الإنشاء</string> + <string name="sync_reset">إعادة تعيين Syncthing</string> + <string name="sync_reset_hint">معرّف جهاز جديد، وتُزال المجلدات والأجهزة. يُحتفظ بالملفات الموجودة في مساحة تخزين DroidDeck.</string> + <string name="sync_reset_button">إعادة التعيين</string> + <string name="sync_reset_confirm_title">هل تريد إعادة تعيين Syncthing؟</string> + <string name="sync_running_group">التشغيل</string> + <string name="sync_run">التشغيل</string> + <string name="sync_run_open">أثناء فتح DroidDeck</string> + <string name="sync_run_background">في الخلفية</string> + <string name="sync_wifi_only">عبر Wi-Fi فقط</string> + <string name="sync_pause_games">إيقاف مؤقت أثناء الألعاب</string> + <string name="sync_logs">السجلات</string> + <string name="sync_logs_hint">مخرجات Syncthing لهذه الجلسة</string> + <string name="sync_logs_share">مشاركة</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">اضبط بيئة تشغيل Linux أولًا.</string> + <string name="sync_accept">قبول</string> + <string name="sync_accept_title">حفظ «%1$s» في</string> + <string name="sync_add_folder">إضافة مجلد</string> + <string name="sync_add_folder_hint">مزامنة مجلد في مساحة تخزين DroidDeck</string> + <string name="sync_choose">اختيار</string> + <string name="sync_add">إضافة</string> + <string name="sync_add_failed">تعذّرت إضافة المجلد.</string> + <string name="sync_share_with">المشاركة مع</string> + <string name="sync_share_none">لا توجد أجهزة بعد. يمكنك مشاركة هذا المجلد من واجهة الويب لاحقًا.</string> + <string name="sync_use_folder">استخدام هذا المجلد</string> + <string name="sync_new_folder">مجلد جديد</string> + <string name="sync_location_home">المجلد الرئيسي للحاوية</string> + <string name="sync_location_sync">مجلد Sync</string> + <string name="sync_location_shared">مساحة تخزين DroidDeck المشتركة</string> + <string name="sync_location_card">DroidDeck على %1$s</string> + <string name="sync_location_app">بيانات تطبيق DroidDeck</string> + <string name="sync_web_path_locked">تُحفظ المجلدات الجديدة في مجلد Sync الخاص بـ DroidDeck. لمزامنة مجلد آخر في DroidDeck، استخدم «إضافة مجلد» في علامة تبويب Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">إعادة التحميل</string> + <string name="sync_not_running">Syncthing لا يعمل.</string> + <string name="session_end_steam_sigill">توقّف Steam بسبب تعليمة غير صالحة (SIGILL). قد تكون مشكلة توافق في تعليمات CPU أو تعطّلًا في العميل. شارك السجلات مع تفاصيل جهازك.</string> + <string name="session_end_steam_try_x64">يمكنك تجربة إعدادات Steam → عميل Steam → x86-64 (تجريبي). يتطلب تنزيلًا إضافيًا وقد يعمل بشكل أبطأ.</string> + <string name="session_end_vulkan_device">تعذّر على برنامج تشغيل رسومات Linux العثور على جهاز Vulkan صالح للاستخدام. تحقّق من أن برنامج تشغيل GPU المحدد لـ Linux يدعم هذا الـ GPU.</string> + <string name="session_end_gpu_unsupported">لا يمكن بدء هذه الجلسة لأن هذا الـ GPU ليس له برنامج تشغيل Vulkan متوافق لـ Linux في الإعداد الحالي. لا يمكن لبرامج تشغيل Adreno Turnip تفعيل دعم وحدات MediaTek/Mali GPU.</string> <string name="setup_group_memory">الذاكرة</string> <string name="setup_clear_cached">إغلاق التطبيقات المخزّنة مؤقتًا قبل الجلسة</string> <string name="setup_clear_cached_hint">عند بدء الجلسة، يُغلق DroidDeck التطبيقات التي يُبقيها Android في الخلفية، لتحصل اللعبة على ذاكرة أكبر. يجب تفعيل تصحيح الأخطاء اللاسلكي.</string> @@ -3261,6 +3610,12 @@ <string name="epic_client_open">فتح</string> <string name="epic_client_install">تثبيت</string> <string name="game_tab_about">حول</string> + <string name="game_resources_browser">يُفتح في متصفحك</string> + <string name="game_resource_guides">الأدلة</string> + <string name="game_resource_protondb_detail">تقارير توافق Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">للألعاب التي تُحفظ بياناتها في حساب Steam الخاص بك</string> + <string name="game_resource_search">البحث في الويب</string> <string name="game_tab_install">تثبيت</string> <string name="game_install_location">الموقع</string> <string name="game_install_folder">مجلد</string> @@ -3277,6 +3632,11 @@ <string name="stores_eyebrow_pass">متاحة مع %1$s</string> <string name="stores_owned_in_library">الألعاب المملوكة في المكتبة</string> <string name="library_filter_added">مُضافة</string> + <string name="library_filter">تصفية</string> + <string name="library_filter_installed">المثبَّتة فقط</string> + <string name="library_filter_all_owned">كل الألعاب المملوكة</string> + <string name="library_no_installed_matches">لا توجد ألعاب مثبَّتة تطابق عوامل التصفية هذه.</string> + <string name="library_browse_owned">تصفّح الألعاب المملوكة</string> <string name="game_tab_launch">التشغيل</string> <string name="game_tab_saves_cloud">الحفظ والسحابة</string> <string name="game_launch_shortcut">اختصار Steam</string> @@ -3294,6 +3654,40 @@ <string name="stores_itch_update_replaced">استبدل المطوّر هذا الإصدار بـ %1$s. هل تريد التحديث إليه؟</string> <string name="xbox_filter_cloud">سحابية</string> <string name="stores_xbox_cloud_settings">إعدادات السحابة</string> + <string name="integration_title">تكامل Steam</string> + <string name="integration_count">%1$d من %2$d مفعّلة</string> + <string name="integration_set_up">إعداد</string> + <string name="integration_location">الموقع الجغرافي</string> + <string name="integration_app_info">معلومات التطبيق</string> + <string name="integration_wifi">أسماء شبكات Wi-Fi</string> + <string name="integration_brightness">السطوع</string> + <string name="integration_home">DroidDeck كشاشة رئيسية</string> + <string name="integration_shortcuts">مفاتيح النظام</string> + <string name="integration_wifi_hint">إظهار الشبكات في Steam · يتطلب الوصول إلى الموقع الجغرافي، دون تتبّع أبدًا</string> + <string name="integration_wifi_on">تظهر الشبكات في Steam</string> + <string name="integration_wifi_location_off">الموقع الجغرافي متوقف</string> + <string name="integration_wifi_denied">رُفض الوصول إلى الموقع الجغرافي · اسمح به في معلومات التطبيق</string> + <string name="integration_brightness_hint">شريط التمرير في Steam يضبط سطوع الشاشة</string> + <string name="integration_home_hint">زر الشاشة الرئيسية يفتح قائمة Steam أثناء الجلسة</string> + <string name="integration_shortcuts_hint">يبقى Alt+Tab ومفتاح Win وزر الرئيسية داخل الجلسة</string> + <string name="integration_shortcuts_maybe_restricted">غير متاح في Android؟ معلومات التطبيق → ⋮ → السماح بالإعدادات المحظورة</string> + <string name="integration_shortcuts_restricted">محظور من Android · معلومات التطبيق → ⋮ → السماح بالإعدادات المحظورة</string> + <string name="integration_shortcuts_service">مفاتيح نظام DroidDeck</string> + <string name="integration_shortcuts_service_description">إبقاء Alt+Tab ومفتاح Win وزر الرئيسية داخل جلسة DroidDeck النشطة بدلاً من Android.</string> + <string name="integration_brightness_needed">فعّل «السطوع» من الإعداد → تكامل Steam</string> + <string name="setup_gpu_bridge_off">جسر Mali: متوقف</string> + <string name="setup_gpu_bridge_on">جسر Mali: يعمل</string> + <string name="setup_gpu_bridge_detail">%1$s ليس Adreno. جسر Vulkan التجريبي يعمل: تعرض الجلسة الرسومات عبر برنامج تشغيل الهاتف نفسه. توقّع وجود أخطاء؛ أرسل سجلات الجلسة.</string> + <string name="setup_bridge_safe">الوضع الآمن</string> + <string name="setup_bridge_safe_on">الوضع الآمن: يعمل</string> + <string name="setup_bridge_safe_off">الوضع الآمن: متوقف</string> + <string name="setup_bridge_safe_on_detail">الأكثر توافقًا. يوصى به لجهاز جديد.</string> + <string name="setup_bridge_safe_off_detail">أسرع حيث اجتاز معالج الرسومات هذا فحوصاته.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: تلقائي</string> + <string name="setup_bridge_dxvk_proton">DXVK: الخاص بـ Proton</string> + <string name="setup_bridge_dxvk_auto_detail">يستخدم إصدار DXVK أقدم عندما يكون Vulkan في معالج الرسومات هذا أقدم من أن يدعم DXVK الخاص بـ Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">يحتفظ كل Proton بـ DXVK الخاص به، حتى عندما قد يكون Vulkan في معالج الرسومات هذا أقدم من اللازم.</string> <string name="apps_search_hint">البحث في التطبيقات</string> <string name="apps_no_match">لا توجد تطبيقات تطابق ”%1$s“.</string> <string name="apps_add_widget">إضافة أداة</string> @@ -3346,6 +3740,8 @@ <string name="desktop_restore_done_body">التطبيقات التي أضفتها مثبتة مرة أخرى.</string> <string name="desktop_restore_failed_title">تعذّرت استعادة بعض البرامج</string> <string name="desktop_restore_failed_body">راجع ‎~/.cache/droiddeck/apt-restore.log ثم جرّب sudo apt install في Konsole.</string> + <string name="gog_full_files">التحسينات الأصلية غير متاحة. يتضمن التنزيل ملفات بديلة كاملة.</string> + <string name="gog_recover">التحقق من نتيجة التصحيح</string> <string name="slow_usb_title">اتصال USB بطيء</string> <string name="slow_usb_cable">%1$s متصل عبر %2$s (%3$s ميغابت/ث، حوالي %4$d ميغابايت/ث)، لذا ستُحمَّل الألعاب عليه ببطء. استخدم كابل USB 3 بسرعة 5 جيجابت/ث أو أكثر، أو جرّب قلب قابس USB-C، أو استخدم محركًا أسرع.</string> <string name="slow_usb_port">%1$s متصل عبر %2$s (%3$s ميغابت/ث، حوالي %4$d ميغابايت/ث). لا يدعم منفذ USB في هذا الجهاز سرعة أعلى، لذا ستُحمَّل الألعاب عليه ببطء. قد تكون الذاكرة الداخلية أو بطاقة microSD أسرع.</string> @@ -3356,4 +3752,52 @@ <string name="steam_import_names_more">%1$s و%2$d أخرى</string> <string name="steam_import_now">إعادة التشغيل الآن</string> <string name="steam_import_later">لاحقًا</string> + <string name="gog_maintenance">إدارة تثبيت GOG</string> + <string name="gog_check">التحقق من وجود تحديثات</string> + <string name="gog_repair">التحقق/الإصلاح</string> + <string name="gog_patches">تصحيحات بلا اتصال</string> + <string name="gog_refresh">تنزيل المثبِّت الكامل بلا اتصال</string> + <string name="gog_update">التحديث إلى %1$s</string> + <string name="gog_resume">استئناف صيانة GOG</string> + <string name="gog_open_patch">فتح مثبِّت التصحيح</string> + <string name="gog_patch_in_session">أكمِل مثبِّت التصحيح أو ألغِه في جلسة Linux.</string> + <string name="gog_patch_requirements">اختر تصحيحًا يناسب الإصدار المثبَّت ولغتك. قد لا تظهر كل إصدارات المصدر المدعومة.</string> + <string name="gog_no_patches">لا تتوفّر لدى GOG تصحيحات Windows مستقلة لهذه اللعبة.</string> + <string name="gog_managed_files">قد تُستبدل ملفات اللعبة المعدَّلة.</string> + <string name="gog_patch_installer_note">يُفتح المثبِّت في جلسة Linux الخاصة بك.</string> + <string name="gog_download_label">التنزيل</string> + <string name="gog_space_label">مساحة إضافية</string> + <string name="gog_space_estimate_label">المساحة التقديرية</string> + <string name="gog_repair_action">إصلاح الملفات</string> + <string name="gog_refresh_action">تحديث التثبيت</string> + <string name="gog_select_patch">اختيار</string> + <string name="stores_gamejolt_not_owned">ليس في مكتبة Game Jolt الخاصة بك</string> + <string name="stores_gamejolt_no_build">لا يوجد تنزيل لنظام Windows لهذه اللعبة</string> + <string name="stores_gamejolt_no_exe">لم يتم العثور على لعبة Windows في التنزيل</string> + <string name="stores_gamejolt_no_game">تعذر العثور على هذه اللعبة على Game Jolt</string> + <string name="stores_gamejolt_browse_failed">تعذّر تحميل الألعاب من Game Jolt</string> + <string name="stores_gamejolt_download_failed">استجاب Game Jolt بـ HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">تعذر تحميل التنزيلات من Game Jolt</string> + <string name="stores_gamejolt_build_open">فتح على Game Jolt</string> + <string name="stores_gamejolt_archive">أرشيفات %1$s غير مدعومة</string> + <string name="stores_gamejolt_extract_failed">تعذر استخراج التنزيل (رمز الخروج %1$d)</string> + <string name="stores_gamejolt_download_unreachable">تعذر الوصول إلى Game Jolt</string> + <string name="stores_gamejolt_download_no_link">لم يوفر Game Jolt رابط تنزيل</string> + <string name="stores_gamejolt_section_featured">مميزة</string> + <string name="stores_gamejolt_section_hot">رائجة</string> + <string name="stores_gamejolt_section_best">الأفضل</string> + <string name="stores_gamejolt_section_new">جديدة</string> + <string name="stores_gamejolt_price_under_30">30$ أو أقل</string> + <string name="stores_gamejolt_os_other">أخرى</string> + <string name="stores_gamejolt_maturity_everyone">لجميع الأعمار</string> + <string name="stores_gamejolt_maturity_teen">المراهقون</string> + <string name="stores_gamejolt_maturity_adult">للبالغين</string> + <string name="stores_gamejolt_status_complete">مكتملة</string> + <string name="stores_gamejolt_status_early">وصول مبكر</string> + <string name="stores_gamejolt_partners">ألعاب الشركاء</string> + <string name="stores_gamejolt_filter_browser">المتصفح</string> + <string name="stores_gamejolt_filter_maturity">التصنيف العمري</string> + <string name="stores_gamejolt_filter_status">الحالة</string> + <string name="stores_gamejolt_filter_partners">الشركاء</string> + <string name="stores_gamejolt_followed">الألعاب المتابَعة</string> </resources> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 7aff2ca582..4f608ee523 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opciones de VKD3D para D3D12. nodxr desactiva el trazado de rayos; úsalo solo en un juego que lo necesite.</string> <string name="game_env_proton_log">Pon 1 para obtener un registro de diagnóstico de Proton. El registro puede reducir el rendimiento y usar almacenamiento.</string> <string name="game_env_wined3d">Pon 1 para usar WineD3D basado en OpenGL en lugar de DXVK, para pruebas de compatibilidad con D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderizador para DirectDraw, Direct3D 1-7 y los juegos que se ejecutan con WineD3D. Vulkan evita la ruta de OpenGL sobre Zink y es mucho más rápido en juegos antiguos de DirectDraw y Direct3D 7 en Adreno.</string> + <string name="game_env_dxvk_d3d8">Pon 1 para ejecutar Direct3D 8 con DXVK en lugar de WineD3D. Más rápido en la prueba de Direct3D 8 de AIO Graphics Test en Adreno.</string> <string name="game_env_no_ntsync">Pon 1 para que este juego no use ntsync (droiddeck-ntsync o un controlador del kernel); usa droiddeck-esync si hay un paquete y, si no, droiddeck-fsync.</string> <string name="game_env_no_esync">Pon 1 para desactivar droiddeck-esync en este juego; usa droiddeck-fsync en su lugar, o droiddeck-ntsync si fsync también está desactivado.</string> <string name="game_env_no_fsync">Pon 1 para que este juego no use droiddeck-fsync; usa droiddeck-esync si hay un paquete y, si no, droiddeck-ntsync.</string> <string name="game_env_fsync_first">Pon 1 para que este juego use droiddeck-fsync, o 0 para dar prioridad a droiddeck-esync cuando haya un paquete para su Proton.</string> <string name="game_env_xalia">Pon 0 para desactivar el asistente de navegación con control de Proton en este juego.</string> + <string name="game_env_anticheat_offline">Activado de forma predeterminada. Inicia un juego con Easy Anti-Cheat sin su antitrampas cuando el juego admite el modo sin conexión. Desactívalo para iniciarlo con Easy Anti-Cheat como siempre. Los modos en línea que requieren Easy Anti-Cheat siguen sin estar disponibles.</string> <string name="game_env_hud">Superposición de DXVK para D3D9–11. fps muestra la tasa de fotogramas; sin definir la oculta.</string> <string name="game_env_dxvk_config">Ajustes de DXVK separados por punto y coma. Las versiones recientes usan dxvk.maxFrameRate para limitar fotogramas; para el uso normal prefiere el límite de fotogramas de la sesión.</string> + <string name="game_env_cores">Núcleos de CPU para este juego, como 0-4 o 0,2,4, en lugar de los núcleos de juegos de la sesión. Con menos núcleos se calienta menos.</string> <string name="game_env_vkd3d_limit">Límite de fotogramas de D3D12. 0 desactiva el límite.</string> <string name="game_env_glthread">Subprocesos de OpenGL de Mesa. true puede ayudar a juegos OpenGL limitados por la CPU; pruébalo en cada juego.</string> <string name="sync_backend_title">Sincronización de Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX ejecuta programas Linux x86 en este dispositivo ARM64. Auto lo usa cuando el programa es para x86.</string> <string name="app_fex_x86">%1$s con FEX</string> <string name="app_fex_not_ready">Este programa está hecho para PC %1$s y se ejecuta con FEX, que aún no está listo. Abre Steam una vez con tu sesión iniciada: DroidDeck hará que descargue FEX y el Steam Linux Runtime que necesita, y después se abrirá.</string> + <string name="session_proot_missing">No se pudo descargar el proot de DroidDeck. Revisa la conexión e inténtalo de nuevo. La sesión no se inició porque el proot alternativo es demasiado lento para jugar.</string> + <string name="session_directaudio_missing">No se pudo descargar DirectAudio, así que el audio de los juegos usa la ruta más lenta en esta sesión.</string> <string name="session_end_program">Este programa</string> <string name="session_end_steam_download">No se pudo descargar el cliente de Steam. Es posible que tu red o VPN esté bloqueando los servidores de Steam; revisa la conexión e inténtalo de nuevo.</string> <string name="session_end_steam_setup">No se pudo configurar el cliente de Steam. Revisa la conexión y el espacio libre, y vuelve a intentarlo.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Control de Xbox 360</string> <string name="mode_controller_note">Deck: botón de Quick Access y giroscopio. Steam Controller: lo mismo, con detección de agarre en los botones traseros. DualShock 4 y DualSense: giroscopio, y los trackpads como su panel táctil. Xbox 360: abre Quick Access con Guide+A.</string> <string name="mode_back">Atrás</string> + <string name="back_hold">Mantener Atrás para atajos de Steam</string> + <string name="back_hold_hint">Mantener Atrás abre Acceso rápido o crea combinaciones de Steam con otros botones. Desactívalo para ignorar Atrás mantenido; tocar y tocar dos veces siguen funcionando.</string> + <string name="back_native_qam_hint">Mantén Atrás 700 ms, o mantén Atrás y pulsa otro botón para los atajos de Steam.</string> + <string name="back_double_tap_window">Intervalo de doble toque</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Permitir el control del brillo</string> + <string name="brightness_permission_text">Configura el control del brillo en DroidDeck.</string> <string name="back_menu_then_qam">Menú → QAM</string> <string name="back_qam_then_menu">QAM → Menú</string> <string name="mode_session">Sesión</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Retrasa la suspensión en segundo plano mientras Steam esté descargando.</string> <string name="mode_suspend_note">Auto pausa en segundo plano y reanuda al mostrarse. Manual espera a Reanudar. Nunca sigue ejecutándose.</string> <string name="mode_startup">Inicio</string> - <string name="mode_steam_startup">Iniciar Steam con DroidDeck</string> - <string name="mode_steam_startup_hint">Abre la sesión de Steam al iniciar DroidDeck.</string> + <string name="mode_startup_session">Abrir al iniciar</string> + <string name="mode_startup_session_hint">Inicia esta sesión cuando se abre DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Buscando versiones…</string> <string name="mode_decky_ready">Listo para instalar %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Al día · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Instalar la última</string> + <string name="decky_channel">Canal de actualizaciones</string> + <string name="decky_channel_hint">Qué versiones de Decky Loader se instalan. El actualizador propio de Decky usa el mismo canal.</string> + <string name="decky_channel_stable">Estable</string> + <string name="decky_channel_prerelease">Preliminar</string> + <string name="decky_channel_testing">Pruebas</string> + <string name="decky_channel_failed">No se pudo guardar el canal de actualizaciones de Decky</string> <string name="mode_decky_on">Se inicia con Steam. Mientras esté activado, otras apps de este dispositivo podrían controlar Steam.</string> <string name="mode_decky_off">Desactivado. El puerto de depuración remota de Steam permanece cerrado.</string> <string name="mode_decky_remove_title">¿Desinstalar Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Cliente</string> <string name="mode_mangoapp">Superposición de rendimiento</string> <string name="mode_mangoapp_hint">Desactívalo si los juegos fallan o se quedan en negro en modo Deck. Se aplica en la próxima sesión.</string> + <string name="mode_return_after_game">Volver a DroidDeck al cerrar un juego</string> + <string name="mode_return_after_game_hint">Cuando se cierra un juego que iniciaste desde DroidDeck u otro launcher, Steam se cierra correctamente (primero termina de sincronizar las partidas en la nube) y vuelves allí. Desactivado: te quedas en Steam.</string> + <string name="mode_shader_precache">Precarga de shaders</string> + <string name="mode_shader_precache_hint">Steam descarga shaders precompilados para tus juegos y los procesa en segundo plano, para que los juegos tengan menos microcortes. Desactivado ahorra datos, almacenamiento y batería; los juegos compilan los shaders mientras juegas. Es el mismo ajuste que Descargas > Precarga de shaders en Steam. Se aplica en la próxima sesión.</string> <string name="mode_steam_repair">Reparar el cliente de Steam</string> <string name="mode_steam_repair_hint">Vuelve a descargar el cliente de Steam la próxima vez que se inicie Steam. Úsalo si Steam se queda en la pantalla de carga. Se conservan los juegos, la sesión iniciada y los ajustes.</string> <string name="mode_steam_repair_queued">El cliente de Steam se volverá a descargar la próxima vez que se inicie Steam.</string> @@ -391,6 +414,8 @@ <string name="mode_directaudio_hint">Evita PulseAudio para menor latencia.</string> <string name="mode_mic">Micrófono</string> <string name="mode_mic_hint">Para el chat de voz.</string> + <string name="drawer_mic_hint">Activa o desactiva la captura del micrófono en esta sesión.</string> + <string name="drawer_mic_failed">No se pudo cambiar el micrófono. Inténtalo de nuevo.</string> <string name="mode_network">Red</string> <string name="mode_wifi_discovery">Detección de redes Wi-Fi</string> <string name="mode_wifi_discovery_hint">Muestra en Steam los nombres de Wi-Fi y las redes cercanas.</string> @@ -468,6 +493,13 @@ <string name="game_no_steam_title">Iniciar sin Steam</string> <string name="game_no_steam_detail">Para un juego que se cierra enseguida: lo inicia sin la configuración de Steam de Proton. Las funciones de Steam, como la superposición, están desactivadas para él.</string> <string name="game_no_steam_on">Activado</string> + <string name="game_steam_with">Se inicia con Steam</string> + <string name="game_steam_without">Se inicia sin Steam</string> + <string name="game_settings_card">Ajustes</string> + <string name="game_settings_menu_title">Ajustes de %1$s</string> + <string name="game_settings_default">Predeterminado</string> + <string name="game_settings_default_detail">Devuelve todo lo cambiado para este juego a los ajustes de la app.</string> + <string name="game_sync_custom">Variables de sincronización personalizadas</string> <string name="comp_game_proton_live">La elección de Proton de %1$s se ha guardado y ya está disponible en Steam.</string> <string name="comp_game_proton_next">La elección de Proton de %1$s se ha guardado. Reinicia Steam antes de iniciar el juego.</string> <string name="comp_game_proton_not_runnable">%1$s no puede usar el Proton elegido en este dispositivo.</string> @@ -546,6 +578,16 @@ <string name="perf_gsrealtime">gamescope: cola de GPU en tiempo real</string> <string name="perf_gsrealtime_hint">Da prioridad al trabajo de GPU del compositor. Puede suavizar el ritmo de fotogramas a costa de algo de rendimiento en los juegos.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memoria</string> + <string name="perf_cap_off">Desactivado</string> + <string name="perf_cap_auto">Predeterminado del controlador</string> + <string name="perf_zram_client">Comprimir Steam mientras se ejecuta un juego</string> + <string name="perf_zram_client_hint">20 s después de que empiece un juego, el cliente de Steam se comprime en zRAM para dejarle más memoria al juego, y se vuelve a leer cuando el juego se cierra. Desactívalo si la sesión se cierra poco después de iniciar los juegos. Un límite de RAM definido arriba sigue comprimiendo Steam cuando la sesión lo supera.</string> + <string name="perf_ram_cap">Límite de RAM</string> + <string name="perf_ram_cap_hint">Se aplica mientras se ejecuta el cliente de Steam, en modo Steam o desde el escritorio. Cuando la sesión usa más de esto, Steam y luego los demás procesos compatibles de la sesión se comprimen en zRAM. Es un límite flexible: no se cierra nada, pero los juegos pueden tener microcortes mientras se recuperan las páginas.</string> + <string name="perf_ram_cap_unavailable">Requiere swap de zRAM, y este dispositivo no lo tiene.</string> + <string name="perf_vram_cap">Límite de VRAM</string> + <string name="perf_vram_cap_hint">La memoria de video que DXVK informa a los juegos Direct3D, para que calculen sus texturas con menos. Los ajustes de DXVK propios de un juego siguen teniendo prioridad. Se aplica en la próxima sesión.</string> <string name="perf_gpuclock">Mantener la GPU a su reloj máximo</string> <string name="perf_gpuclock_hint">Solo Adreno. Menos microcortes, más consumo de batería y calor.</string> <string name="perf_fixes">Correcciones de sesión</string> @@ -564,6 +606,8 @@ <string name="perf_fastpath">Ruta rápida de proot</string> <string name="perf_fastpath_needs_seccomp">Requiere el filtro seccomp de proot.</string> <string name="perf_fastpath_hint">Búsquedas de archivos más rápidas y menos microcortes. Desactívalo si un programa no encuentra sus archivos.</string> + <string name="perf_cursor_composite">Dibujar el cursor dentro de gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope dibuja el puntero por sí mismo en lugar de pasárselo a Android. Actívalo para un cursor manejado con el control. Desactivado es más rápido en un celular. Se aplica en la próxima sesión.</string> <string name="perf_identity">Identidad de la sesión</string> <string name="perf_hostname">Nombre del host</string> <string name="perf_hostname_hint">El nombre que Steam ve para este dispositivo. En blanco restaura %1$s.</string> @@ -578,6 +622,8 @@ <string name="driver_delete_plain">Sus archivos se eliminan de la app.</string> <string name="driver_delete_in_use">Sus archivos se eliminan. Está en uso, así que pasa a usarse el predeterminado.</string> <string name="drawer_page_display">Pantalla</string> + <string name="drawer_frame_limit">Límite de fotogramas</string> + <string name="drawer_frame_limit_note">Limita este juego. La pantalla cambia a una frecuencia de actualización que sea múltiplo exacto del límite cuando la hay; otros límites pueden verse irregulares. Los juegos de Steam usan el Límite de fotogramas de Steam en el menú Quick Access.</string> <string name="drawer_page_effects">Efectos</string> <string name="drawer_page_controls">Controles</string> <string name="drawer_page_components">Componentes</string> @@ -609,8 +655,11 @@ <string name="hud_size_pill">Píldora</string> <string name="hud_size_minimal">Mínimo</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Barra</string> <string name="hud_locked">Fijar posición</string> <string name="hud_locked_hint">Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando.</string> + <string name="hud_snap">Ajustar a los lados</string> + <string name="hud_snap_hint">Al soltar el HUD, se mueve al lado más cercano de la pantalla. Un gesto rápido lo lanza en esa dirección.</string> <string name="hud_group_look">Aspecto</string> <string name="hud_scale">Tamaño en pantalla</string> <string name="hud_color_soft">Suave</string> @@ -659,7 +708,6 @@ <string name="hud_export_failed">No se pudo guardar el informe del HUD.</string> <string name="hud_reset">Restablecer ajustes del HUD</string> <string name="hud_reset_button">Restablecer</string> - <string name="hud_credit">FusionHUD de The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Modo de escalado</string> <string name="drawer_scaling_sharpness">Nitidez del escalado</string> <string name="drawer_effects">Efectos de pantalla</string> @@ -718,11 +766,17 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Teclado</string> <string name="drawer_latency">Latencia</string> + <string name="drawer_low_latency">Modo de baja latencia</string> + <string name="drawer_low_latency_hint">Aumenta el uso de CPU y batería</string> <string name="drawer_low_latency_controller">Control de baja latencia</string> <string name="drawer_low_latency_controller_hint">El control informa a 1000 Hz en lugar de 250 Hz. Usa algo más de CPU.</string> <string name="drawer_low_latency_touch">Táctil de baja latencia</string> <string name="drawer_low_latency_touch_hint">Los toques omiten la agrupación de fotogramas; los controles táctiles de Steam van a 1000 Hz. Usa algo más de CPU.</string> <string name="drawer_evdev_mouse">Canal de ratón sin procesar</string> + <string name="drawer_relative_mouse">Ratón relativo</string> + <string name="drawer_relative_mouse_auto">Automático</string> + <string name="drawer_relative_mouse_on">Activado</string> + <string name="drawer_relative_mouse_off">Desactivado</string> <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Teclado de PC</string> <string name="drawer_android_keyboard">Android</string> @@ -814,6 +868,10 @@ <string name="setup_session">Sesión</string> <string name="setup_logs">Registros de sesión</string> <string name="setup_logs_hint">Se guardan tras cada sesión</string> + <string name="setup_game_debug_logs">Registros de depuración de juegos</string> + <string name="setup_game_debug_logs_hint">Incluye diagnósticos de Proton, Wine y gráficos en el próximo inicio de un juego. Puede reducir el rendimiento y usar más almacenamiento.</string> + <string name="setup_game_debug_logs_restart">Reinicia esta sesión para guardar los registros de depuración de juegos</string> + <string name="setup_logging_update_failed">No se pudo actualizar el registro. Revisa el interruptor e inténtalo de nuevo.</string> <string name="setup_agent_commands">Herramientas de depuración</string> <string name="setup_latest_logs">Últimos registros de sesión</string> <string name="setup_saved_logs">Registros de sesión guardados</string> @@ -845,20 +903,22 @@ <string name="setup_home">Usar como pantalla de inicio</string> <string name="setup_home_on">DroidDeck puede ser la app de inicio</string> <string name="setup_home_off">DroidDeck nunca se ofrece como app de inicio</string> + <string name="setup_home_game_space_first">En Agregar juegos, cambia DroidDeck a Incluir</string> <string name="setup_orientation">Orientación</string> + <string name="setup_launcher_orientation">Orientación del launcher</string> + <string name="setup_launcher_orientation_auto">Seguir la rotación del dispositivo</string> + <string name="setup_orientation_portrait">Vertical</string> + <string name="setup_session_orientation">Orientación de la sesión</string> + <string name="setup_session_orientation_hint">Se aplica a Steam, los juegos, el escritorio y el editor de controles. Los ajustes predefinidos de resolución giran con la sesión; el ancho y el alto personalizados se mantienen como se ingresaron.</string> <string name="setup_orientation_auto">Horizontal automática</string> <string name="setup_orientation_landscape">Horizontal</string> <string name="setup_orientation_reverse">Horizontal invertida</string> <string name="setup_fullscreen">Pantalla completa</string> <string name="setup_fullscreen_on">Oculta las barras de estado y navegación de Android</string> <string name="setup_fullscreen_off">Muestra las barras de estado y navegación de Android</string> - <string name="setup_dual_screen">Pantalla dual</string> - <string name="setup_dual_screen_hint">Automático usa la segunda pantalla en consolas portátiles que la traen integrada. Activado usa cualquier segunda pantalla. Desactivado deja todo en una sola pantalla.</string> <string name="setup_dual_screen_auto">Automático</string> <string name="setup_dual_screen_on">Activado</string> <string name="setup_dual_screen_off">Desactivado</string> - <string name="setup_dual_screen_menu">Menú en la pantalla inferior</string> - <string name="setup_dual_screen_menu_hint">Mueve las secciones y el menú del juego a la segunda pantalla y escribe ahí, para que la pantalla superior conserve la vista completa. L2 y R2 cambian de sección.</string> <string name="setup_dual_screen_controls">Controles en la pantalla inferior en juegos</string> <string name="setup_dual_screen_controls_hint">Abre el trackpad y el teclado en la segunda pantalla cuando empieza una sesión.</string> <string name="dual_typing_title">Escribiendo en la pantalla superior</string> @@ -1013,6 +1073,14 @@ <string name="gate_step1">Abre Ajustes → Opciones de desarrollador → Depuración inalámbrica y actívala</string> <string name="gate_step2">Toca “Vincular dispositivo con código de vinculación”</string> <string name="gate_step3">Escribe el código en la notificación de DroidDeck</string> + <string name="pairguide_build_number">En Acerca del teléfono, toca Número de compilación 7 veces</string> + <string name="pairguide_wireless">Activa la Depuración inalámbrica</string> + <string name="pairguide_pair">Abre Depuración inalámbrica y toca “Vincular dispositivo con código de vinculación”</string> + <string name="pairguide_child_process">Activa “Inhabilitar restricciones de procesos secundarios”</string> + <string name="pairguide_row_child_process">Inhabilitar restricciones de procesos secundarios</string> + <string name="pairguide_row_build_number">Número de compilación</string> + <string name="pairguide_row_wireless">Depuración inalámbrica</string> + <string name="pairguide_row_pair">Vincular dispositivo con código de vinculación</string> <string name="gate_waiting">Esperando la ventana de vinculación…</string> <string name="gate_code_needed">Ventana encontrada. Ingresa su código en la notificación.</string> <string name="gate_status">Estado</string> @@ -1095,6 +1163,12 @@ <string name="hand_camera_placement">Posición de la cámara</string> <string name="hand_camera_placement_hint">Comprueba que la cámara pueda verte antes de jugar.</string> <string name="hand_camera_check">Comprobar</string> + <string name="tracking_pack_title">Descarga del seguimiento de manos</string> + <string name="tracking_pack_hint">El seguimiento de manos necesita una descarga única de %1$s.</string> + <string name="tracking_pack_download">Descargar</string> + <string name="tracking_pack_retry">Reintentar</string> + <string name="tracking_pack_downloading">Descargando el seguimiento de manos… %1$d%%</string> + <string name="tracking_pack_failed">No se pudo descargar el seguimiento de manos. Revisa tu conexión e inténtalo de nuevo.</string> <string name="hand_camera_check_title">Posición de la cámara</string> <string name="hand_camera_how_rear">Coloca el dispositivo de pie a 1,5-2 metros de distancia, a la altura del pecho, con la cámara trasera hacia ti. Luego entra en el encuadre con las manos extendidas.</string> <string name="hand_camera_how_front">Coloca el dispositivo de pie a 1,5-2 metros de distancia, a la altura del pecho, con la pantalla hacia ti. Luego entra en el encuadre con las manos extendidas.</string> @@ -1188,7 +1262,6 @@ <string name="games_never_played">Nunca jugado</string> <string name="games_runtime_busy_percent">Runtime ocupado · %1$d%%</string> <string name="games_runtime_busy">Runtime ocupado</string> - <string name="games_runtime_first_play">El runtime se instala al jugar</string> <string name="games_runtime_update">Actualización del runtime disponible</string> <string name="games_runtime_ready">● Runtime listo</string> <string name="games_internal">Almacenamiento interno</string> @@ -1205,6 +1278,9 @@ <string name="gpu_hide_other">Ocultar controladores de otras GPU</string> <string name="gpu_show_other">Mostrar controladores de otras GPU</string> <string name="gpu_advanced">Avanzado</string> + <string name="gpu_ubwc_title">Compatibilidad con UBWC</string> + <string name="gpu_ubwc_hint">Prueba Activado o Desactivado si Steam o Android muestran franjas o parpadeos. Se aplica a ambos controladores después de reiniciar DroidDeck.</string> + <string name="gpu_ubwc_restart">Reinicia DroidDeck para aplicarlo.</string> <string name="gpu_set_with_display">Se define junto con el controlador de pantalla: %1$s incluye ambos.</string> <string name="gpu_set_with_runtime">Se define junto con el controlador de runtime: %1$s incluye ambos.</string> <string name="gpu_runtime_hint">Lo usan los juegos y el escritorio.</string> @@ -1313,10 +1389,15 @@ <string name="pip_auto">Entrar en PiP automáticamente</string> <string name="unfolded_controls">Controles con la pantalla desplegada</string> <string name="unfolded_controls_hint">Desplegado, el juego queda encima de los trackpads y los agarres traseros de Steam Deck. Plegado, el juego ocupa toda la pantalla.</string> + <string name="unfolded_controls_with_controller">Mantenerlos con un control</string> + <string name="unfolded_controls_with_controller_hint">Muestra también estos controles táctiles mientras haya un control conectado.</string> <string name="pip_suspended">Suspendida</string> <string name="pip_not_ready">Imagen en imagen estará disponible cuando la sesión esté lista.</string> <string name="pip_permission">Permite imagen en imagen para DroidDeck en los ajustes de Android.</string> <string name="pip_unavailable">Android no pudo abrir imagen en imagen.</string> + <string name="game_more">Más</string> + <string name="game_edit_art">Editar imágenes</string> + <string name="stores_in_steam_label">En Steam</string> <string name="game_shortcut">Acceso directo</string> <string name="game_shortcut_add">Agregar a la pantalla de inicio</string> <string name="game_shortcut_choose">Elegir juego</string> @@ -1339,6 +1420,10 @@ <string name="game_frontend_files">Archivos para frontends</string> <string name="main_wait_runtime">Espera a que termine la operación del runtime</string> <string name="main_wait_proton_install">Espera a que termine la instalación de la herramienta de compatibilidad</string> + <string name="load_compat_title">Preparando las herramientas de compatibilidad</string> + <string name="load_compat_wait">Esperando a que termine la configuración de compatibilidad</string> + <string name="load_compat_hint">Tu sesión se iniciará cuando termine la configuración.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Espera a que termine la instalación de la app de escritorio</string> <string name="main_wait_install_game">Espera a que termine la instalación antes de iniciar un juego</string> <string name="main_saves_close_session">Cierra primero la sesión de Steam para que el juego no guarde encima de lo importado</string> @@ -1379,6 +1464,9 @@ <string name="main_install_anyway">Instalar de todos modos</string> <string name="main_remove_runtime_title">Eliminar el runtime de Linux</string> <string name="main_remove_runtime_text">Esto elimina el runtime, el cliente de Steam que contiene y todos los juegos instalados en él.</string> + <string name="runtime_actions_title">Runtime de Linux</string> + <string name="runtime_actions_text">Reparar reinstala los archivos del sistema del runtime y conserva Steam, tus juegos y tus ajustes. Los extras, como el escritorio, se vuelven a instalar la próxima vez que los uses. Eliminar borra todo.</string> + <string name="runtime_repair">Reparar el runtime</string> <string name="main_applied">Aplicado: %1$s</string> <string name="android_app_open_failed_primary">No se pudo abrir %1$s en la pantalla principal</string> <string name="android_app_open_failed_on">No se pudo abrir %1$s en %2$s</string> @@ -1507,6 +1595,12 @@ <string name="session_runtime_catalog_unreachable">No se pudo acceder al catálogo del runtime. Revisa la conexión y vuelve a presionar Jugar.</string> <string name="session_runtime_install_failed">El runtime de Linux no se instaló. Revisa el runtime en Configuración y vuelve a presionar Jugar.</string> <string name="session_desktop_install_failed">El escritorio no se instaló (%1$s). Revisa la conexión y presiona Escritorio de nuevo.</string> + <string name="session_package_resume_failed">No se pudo terminar una instalación interrumpida (%1$s). Revisa la conexión y el espacio, e inténtalo de nuevo.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">El runtime de Linux está dañado: %1$d enlace de biblioteca apunta a un archivo que falta (%2$s), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + <item quantity="many">El runtime de Linux está dañado: %1$d enlaces de biblioteca apuntan a archivos que faltan (%2$s y otros), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + <item quantity="other">El runtime de Linux está dañado: %1$d enlaces de biblioteca apuntan a archivos que faltan (%2$s y otros), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + </plurals> <string name="session_ended_named">%1$s se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> <string name="session_ended_program">El programa se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> <string name="session_ended_desktop">El escritorio se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> @@ -1521,6 +1615,14 @@ <string name="mode_decky_plugins_hint">Instala un ZIP de plugin para la próxima sesión de Steam.</string> <string name="mode_decky_plugin_downloading">Descargando…</string> <string name="mode_decky_plugin_install_zip">Instalar desde ZIP</string> + <string name="decky_zip_warning_title">Instalación de plugin de terceros</string> + <string name="decky_zip_warning_text">El equipo de Decky Loader no ha revisado este plugin. Puede contener malware, como software para robar tu cuenta de Steam o dañar tu dispositivo. Al instalar este plugin, aceptas que asumes todos los riesgos para tu dispositivo.</string> + <string name="decky_zip_warning_continue">Continuar</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Espera %1$d segundo</item> + <item quantity="many">Espera %1$d segundos</item> + <item quantity="other">Espera %1$d segundos</item> + </plurals> <string name="store_cat_games">Juegos</string> <string name="store_cat_audio_video">Audio y video</string> <string name="store_cat_graphics">Gráficos</string> @@ -1687,6 +1789,8 @@ <string name="fm_accept">Aceptar</string> <string name="fm_decline">Rechazar</string> <string name="fm_drive_not_readable">%1$s está montado, pero ahora mismo no se puede leer</string> + <string name="fm_drive_access_title">Permitir acceso a %1$s</string> + <string name="fm_drive_access_text">Android deja que DroidDeck vea esta unidad, pero no que la lea. Activa Acceso a todos los archivos para DroidDeck y vuelve.</string> <string name="fm_list_view">Vista de lista</string> <string name="fm_grid_view">Vista de cuadrícula</string> <string name="fm_search">Buscar</string> @@ -1759,6 +1863,89 @@ <string name="second_mode_keyboard_trackpad">Teclado + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Agarres de Deck + trackpads</string> + <string name="second_mode_dashboard">Panel</string> + <string name="bottom_dashboard_empty">Todavía no hay nada que mostrar aquí.</string> + <string name="bottom_page_downloads">Descargas</string> + <string name="bottom_downloads_none">No hay descargas en curso.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Descargando caché de shaders</string> + <string name="bottom_downloads_paused">En pausa</string> + <string name="bottom_downloads_queued">Esperando para empezar</string> + <string name="bottom_page_notifications">Notificaciones</string> + <string name="bottom_notifications_listener">DroidDeck – pantalla inferior</string> + <string name="bottom_notifications_why">Muestra aquí los mensajes y otras notificaciones mientras juegas. Solo permanecen en esta pantalla y no se guardan. Android lo pregunta una vez: su página de acceso a notificaciones se abre en esta pantalla; activa DroidDeck ahí y esta página volverá sola.</string> + <string name="bottom_notifications_allow">Permitir acceso a notificaciones</string> + <string name="bottom_notifications_none">No hay notificaciones.</string> + <string name="bottom_notifications_count">%1$d notificaciones</string> + <string name="bottom_notifications_clear">Borrar</string> + <string name="bottom_page_screenshots">Capturas de pantalla</string> + <string name="stats_fps_needs_hud">Los FPS requieren el HUD activado</string> + <string name="stats_speed">Velocidad</string> + <string name="stats_pedals">Pedales</string> + <string name="stats_gforce">Fuerza G</string> + <string name="stats_timing">Tiempos</string> + <string name="stats_best_lap">Mejor vuelta</string> + <string name="stats_tires">Llantas °C</string> + <string name="stats_trace">Acelerador y freno, últimos 10 s</string> + <string name="stats_speed_chart">Velocidad, %1$s</string> + <string name="stats_gear">Marcha</string> + <string name="stats_steam_client_arm">Cliente de Steam ARM</string> + <string name="stats_steam_client_x86">Cliente de Steam x86</string> + <string name="stats_throttle">Acelerador</string> + <string name="stats_brake">Freno</string> + <string name="stats_lights">Luces del tablero</string> + <string name="stats_lamp_shift">Cambio</string> + <string name="stats_lamp_handbrake">Freno de mano</string> + <string name="stats_lamp_pit">Limitador de pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Aceite %1$s °C</string> + <string name="stats_power">Distribuidor de energía</string> + <string name="stats_fuel_t">Combustible, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Reserva %1$s t</string> + <string name="bottom_telemetry_send_title">Enviar datos al panel</string> + <string name="bottom_telemetry_send_auto">Automático</string> + <string name="bottom_telemetry_send_auto_hint">Lo activa en todos los juegos de esta lista, incluidos los que se encuentren más adelante. Los juegos que desactives seguirán desactivados.</string> + <string name="bottom_telemetry_send_note">Esto cambia el ajuste de salida de datos del propio juego. Se aplica la próxima vez que se inicie el juego; al desactivarlo se restaura el ajuste anterior.</string> + <string name="bottom_telemetry_send_close">Cierra %1$s para cambiar esto.</string> + <string name="bottom_telemetry_send_failed">No se pudieron cambiar los ajustes de %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: activa %2$s en los ajustes del juego con la IP 127.0.0.1 y el puerto %3$d.</string> + <string name="bottom_shots_where">Se guardan en Pictures/DroidDeck. Las capturas de Steam también aparecen aquí.</string> + <string name="bottom_shots_take">Hacer captura de pantalla</string> + <string name="bottom_shots_saved">Captura de pantalla guardada.</string> + <string name="bottom_shots_failed">No se pudo hacer la captura de pantalla.</string> + <string name="bottom_shots_none">Todavía no hay capturas de pantalla.</string> + <string name="bottom_page_chat">Chat y voz</string> + <string name="bottom_chat_why">Lee y responde el chat de Steam aquí mientras el juego sigue en la pantalla principal. Usa la cuenta con la que se inició sesión en Steam.</string> + <string name="bottom_chat_not_signed_in">Steam todavía no tiene una sesión web que compartir, así que inicia sesión aquí una vez.</string> + <string name="bottom_chat_stopped">Android cerró la página del chat mientras DroidDeck estaba en segundo plano. Se volverá a abrir cuando regreses a DroidDeck.</string> + <string name="bottom_chat_open">Abrir Steam Chat</string> + <string name="bottom_chat_close">Cerrar chat</string> + <string name="bottom_chat_mic_on">Micro activado</string> + <string name="bottom_chat_mic_off">Micro desactivado</string> + <string name="bottom_chat_mic_unavailable">El micro está desactivado en este juego. Para hablar, activa Micrófono en los ajustes de Steam de DroidDeck (Audio) y vuelve a iniciar el juego.</string> + <string name="bottom_chat_volume">Volumen %1$d%%</string> + <string name="bottom_page_telemetry">Estadísticas del juego</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batería</string> + <string name="bottom_telemetry_lap">Vuelta</string> + <string name="bottom_telemetry_position">Posición</string> + <string name="bottom_telemetry_this_lap">Vuelta actual</string> + <string name="bottom_telemetry_last_lap">Última vuelta</string> + <string name="bottom_telemetry_fuel">Combustible</string> + <string name="bottom_telemetry_cargo">Carga</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Estado legal</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">El puerto %1$d recibe datos (%2$d paquetes de %3$d bytes), pero en un formato que esta página aún no puede leer.</string> + <string name="bottom_telemetry_port_busy">Otro programa ya usa el puerto %1$s, así que ese juego no se puede mostrar aquí.</string> <string name="rtinst_removing">Eliminando el runtime de Linux</string> <plurals name="rtinst_removing_entries"> <item quantity="one">Eliminando el runtime de Linux · %1$d elemento</item> @@ -1787,6 +1974,7 @@ <string name="flatpakmgr_not_ready">Configura Flatpak primero</string> <string name="flatpakmgr_starting">Iniciando</string> <string name="flatpakmgr_exit_status">Flatpak terminó con el código %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s está compilado para %2$s, que DroidDeck no puede ejecutar. Aquí las apps Flatpak necesitan una versión para ARM64 o x86_64.</string> <string name="flatpakmgr_installing">Instalando %1$s</string> <string name="flatpakmgr_updating">Actualizando %1$s</string> <string name="flatpakmgr_removing">Quitando %1$s</string> @@ -1876,6 +2064,7 @@ <string name="adbpair_applying">Aplicando el ajuste…</string> <string name="adbpair_command_failed">Falló el comando de la Depuración inalámbrica</string> <string name="adbpair_channel_name">Configuración de la Depuración inalámbrica</string> + <string name="adbpair_progress_channel_name">Progreso de la configuración de la Depuración inalámbrica</string> <string name="adbpair_channel_description">Pide el código de vinculación de la Depuración inalámbrica mientras Ajustes está abierto</string> <string name="adbpair_title_pair">Vincular Depuración inalámbrica</string> <string name="adbpair_waiting_text">Activa la Depuración inalámbrica y toca “Vincular dispositivo con código de vinculación”.</string> @@ -1977,6 +2166,7 @@ <string name="gpuinfo_not_adreno">La GPU no es Adreno</string> <string name="gpuinfo_supported">Compatible</string> <string name="gpuinfo_experimental">Experimental: sus controladores son versiones de prueba</string> + <string name="gpuinfo_a850_experimental">Compatibilidad experimental con Adreno 850: requiere controladores experimentales de pantalla y de juegos compatibles; no verificada en este dispositivo</string> <string name="gpuinfo_below_tested">Por debajo del hardware probado (Adreno 725 y posteriores): puede que no funcione</string> <string name="gpuinfo_unsupported">No compatible: DroidDeck necesita una GPU Adreno (Snapdragon)</string> <string name="turnip_rate_limited">Se alcanzó el límite de solicitudes de GitHub - inténtalo más tarde</string> @@ -2068,6 +2258,7 @@ <string name="display_look_filter">%1$s Cambia el escalado a %2$s.</string> <string name="display_match_screen">Igual a la pantalla (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir la pantalla (cambia de tamaño al plegar o desplegar)</string> + <string name="display_follow_screen_scaled">Escalado %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Mostrar detalles del dispositivo</string> <string name="device_info_hide">Ocultar detalles del dispositivo</string> @@ -2139,6 +2330,13 @@ <string name="stores_resume">Reanudar</string> <string name="stores_refresh">Actualizar</string> <string name="stores_sort">Ordenar</string> + <string name="setup_rail_labels">Etiquetas de la barra lateral</string> + <string name="setup_rail_labels_hint">Muestra los nombres debajo de los íconos de la barra lateral. Desactívalo para una barra lateral más estrecha.</string> + <string name="library_display">Vista</string> + <string name="library_display_larger">Tarjetas más grandes</string> + <string name="library_display_smaller">Tarjetas más pequeñas</string> + <string name="library_display_title">Mostrar título</string> + <string name="library_display_size">Mostrar tamaño</string> <string name="stores_sort_last_played">Jugados recientemente</string> <string name="stores_sort_recently_installed">Instalados recientemente</string> <string name="stores_sort_title_asc">Título A–Z</string> @@ -2157,6 +2355,20 @@ <string name="epic_eos">Inicio de sesión de Epic (EOS)</string> <string name="epic_offline">Iniciar sin conexión</string> <string name="epic_resolve">Solucionar el inicio de sesión de Epic</string> + <string name="epic_client_version">Versión %1$s</string> + <string name="epic_client_no_runtime">Instala primero el runtime de Linux</string> + <string name="epic_client_checking">Buscando la última versión…</string> + <string name="epic_client_unpacking">Descomprimiendo…</string> + <string name="epic_client_unreachable">El servidor de descargas no respondió</string> + <string name="epic_client_needs_fex">Epic Games Launcher necesita FEX, que descarga Steam. Vuelve a abrir el launcher cuando Steam se haya iniciado.</string> + <string name="epic_client_download_failed">Falló la descarga: %1$s</string> + <string name="epic_client_unpack_failed">No se pudo descomprimir el launcher: %1$s</string> + <string name="epic_client_sign_in_failed">Epic Games Launcher no aceptó el inicio de sesión. Vuelve a iniciarlo desde el launcher.</string> + <string name="epic_client_uninstall_body">Quita el launcher y libera su espacio. Tus juegos de Epic siguen instalados y funcionando, y su inicio de sesión se conserva para cuando lo vuelvas a instalar.</string> + <string name="epic_client_uninstall_stops">Primero se cierra la sesión en curso.</string> + <string name="epic_client_uninstalled">Epic Games Launcher desinstalado</string> + <string name="epic_client_uninstall_failed">No se pudieron quitar algunos archivos del launcher. Inténtalo de nuevo.</string> + <string name="epic_client_uninstalling">Espera a que Epic Games Launcher termine de desinstalarse</string> <string name="store_cloud_saves">Partidas en la nube</string> <string name="cloud_upload">Subir a la nube</string> <string name="cloud_download">Descargar de la nube</string> @@ -2259,6 +2471,9 @@ <string name="stores_download_manager">Administrador de descargas</string> <string name="stores_parallel">Descargas simultáneas</string> <string name="stores_install_where">Instalar en</string> + <string name="stores_install_language">Idioma del juego</string> + <string name="stores_install_language_hint">GOG y Epic instalan este idioma. Sistema sigue el idioma de la app.</string> + <string name="stores_install_language_system">Sistema</string> <string name="stores_install_title">Instalar %1$s:</string> <string name="stores_target_internal">Interno</string> <string name="stores_target_free">%1$s libres</string> @@ -2297,6 +2512,9 @@ <string name="edit_target">Destino</string> <string name="edit_start_in">Iniciar en</string> <string name="edit_launch_options">Opciones de lanzamiento</string> + <string name="edit_launch_options_steam_hint">Se comparten con las Propiedades de Steam: un cambio en cualquiera de los dos se ve en ambos.</string> + <string name="edit_launch_options_not_saved">No se pudieron guardar las opciones de lanzamiento en Steam. Inténtalo de nuevo.</string> + <string name="edit_launch_options_desktop">Es posible que Steam esté abierto en la sesión de escritorio. Cambia las opciones de lanzamiento en sus Propiedades o cierra primero la sesión.</string> <string name="edit_artwork">Ilustraciones</string> <string name="edit_other_exe">Otro exe…</string> <string name="edit_remove">Quitar</string> @@ -2426,6 +2644,7 @@ <string name="setup_download_source_custom">Prefijo propio</string> <string name="setup_download_mirror">Sitio</string> <string name="setup_download_prefix">Prefijo</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APPS DE LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Apps para el escritorio de Linux, que se abren desde Escritorio.</string> @@ -2487,7 +2706,7 @@ <string name="touch_done">Hecho</string> <string name="touch_save_failed">No se pudo guardar la disposición táctil</string> <string name="touch_saved">Disposición táctil guardada en Steam</string> - <string name="touch_app_id">App %1$d</string> + <string name="touch_app_id">App %1$s</string> <string name="touch_label_hint">Etiqueta (opcional)</string> <string name="touch_icons_missing">No se encontraron los iconos de Steam</string> <plurals name="touch_icons_found"> @@ -2567,6 +2786,22 @@ <string name="glasses_tracking_flat_hint">Automático mantiene este juego 2D fijo en la vista. Elige Pantalla virtual en la sección Pantalla para usar el seguimiento de cabeza.</string> <string name="glasses_tracking_sbs_hint">El seguimiento de cabeza se aplica a una pantalla virtual o a un juego de SteamVR en marcha.</string> <string name="glasses_hardware">Dispositivo</string> + <string name="vr_controllers_tab">Controles</string> + <string name="vr_controllers_group">Controles de SteamVR</string> + <string name="vr_controllers_emulate">Control en RV</string> + <string name="vr_controllers_emulate_hint">Las dos manos de RV que imita tu control. Los cambios se aplican al instante, también mientras se ejecuta SteamVR. Los Joy-Con y las manos con seguimiento siguen controlando su lado.</string> + <string name="vr_controllers_off">Control normal</string> + <string name="vr_controllers_index">Controles de Valve Index</string> + <string name="vr_controllers_touch">Controles de Meta Quest 3</string> + <string name="vr_controllers_vive">Controles de HTC Vive</string> + <string name="vr_controllers_sticks">Al empezar, los sticks</string> + <string name="vr_controllers_sticks_hint">Presiona ambos sticks a la vez durante la RV para cambiar.</string> + <string name="vr_controllers_sticks_game">Te mueven en el juego</string> + <string name="vr_controllers_sticks_hands">Mueven las manos</string> + <string name="vr_controllers_buttons">Botones</string> + <string name="vr_controllers_buttons_stick">Los gatillos son gatillos, los bumpers agarran, A/B y X/Y son los botones frontales de cada mano, al presionar los sticks se pulsan los joysticks, Guide abre el menú de SteamVR. Arriba y abajo en la cruceta acercan o alejan las manos.</string> + <string name="vr_controllers_buttons_vive">Los sticks son trackpads; A/X o presionar un stick los pulsa. Los gatillos son gatillos, los bumpers agarran, Start y Select son menú, Guide abre el menú de SteamVR.</string> + <string name="vr_controllers_buttons_off">Sin manos de RV. Los juegos compatibles con control, y el menú de SteamVR, reciben tu control como siempre.</string> <string name="glasses_brightness">Brillo</string> <string name="glasses_volume">Volumen</string> <string name="glasses_sunblock">Bloqueo solar</string> @@ -2623,6 +2858,21 @@ <string name="storage_safe_hint">Runtimes sin usar, restos, registros antiguos</string> <string name="storage_clean_up">Limpiar…</string> <string name="storage_session_running">Detén la sesión para limpiar o eliminar algo. Los tamaños se siguen mostrando.</string> + <string name="storage_default_group">Ubicación de instalación</string> + <string name="storage_default_title">Almacenamiento predeterminado</string> + <string name="storage_default_hint">Las nuevas instalaciones de las tiendas van a la ubicación seleccionada. Los juegos existentes se quedan donde están. Las bibliotecas de Steam conservan su propio ajuste.</string> + <string name="storage_default_ask">Preguntar siempre</string> + <string name="storage_default_ask_detail">Elige un destino para cada instalación</string> + <string name="storage_default_internal">Almacenamiento interno</string> + <string name="storage_default_external">Almacenamiento externo</string> + <string name="storage_default_external_detail">%1$s · %2$s libres</string> + <string name="storage_default_external_missing">No conectado</string> + <string name="storage_default_folder">Carpeta · %1$s</string> + <string name="storage_default_folder_free">%1$s libres</string> + <string name="storage_default_folder_missing">No conectada</string> + <string name="storage_default_choose_folder">Elegir carpeta…</string> + <string name="storage_default_choose_folder_detail">Usa cualquier carpeta de una tarjeta SD o unidad USB</string> + <string name="storage_default_note">Los juegos se guardan en una carpeta Games dentro de la ubicación seleccionada. Los juegos existentes no se mueven.</string> <string name="storage_where">Dónde va</string> <string name="storage_games">Juegos de Steam</string> <string name="storage_game_data">Datos de juegos</string> @@ -2751,6 +3001,9 @@ <string name="storage_data_installed">Juegos instalados</string> <string name="storage_data_parts">Prefijo %1$s · shaders %2$s · taller %3$s</string> <string name="storage_clear_shaders">Borrar shaders</string> + <string name="storage_reset_prefix">Restablecer prefijo</string> + <string name="storage_reset_prefix_title">¿Restablecer el prefijo de %1$s?</string> + <string name="storage_reset_prefix_confirm">Borra su prefijo de Wine (%1$s) en %2$s y lo vuelve a crear en el próximo inicio. Se pierden las partidas, los ajustes y los redistribuibles instalados dentro; las partidas de Steam Cloud se conservan en tu cuenta.</string> <string name="storage_data_leftovers">Juegos desinstalados</string> <string name="storage_steam_app">App de Steam %1$d</string> <string name="storage_leftover_unsure_detail">Su prefijo aún contiene archivos, que pueden incluir partidas guardadas locales</string> @@ -3088,6 +3341,117 @@ <string name="spatial_saved_views_hint">Las vistas guardadas se pueden recalcular. Inicie una nueva calibración para capturar en el sistema de coordenadas de seguimiento actual.</string> <string name="spatial_model_checksum_error">La suma de comprobación del modelo de mano no coincide</string> <string name="spatial_opencv_load_error">OpenCV no se pudo cargar</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizar con Syncthing</string> + <string name="sync_enable_hint">Basada en Syncthing-Fork, es una implementación de Syncthing que te permite sincronizar archivos del sistema de archivos interno de DroidDeck con otras instancias de Syncthing. Solo sirve para los archivos que guardas en el sistema de archivos interno de DroidDeck.</string> + <string name="sync_missing">Esta compilación no incluye Syncthing.</string> + <string name="sync_starting">Iniciando Syncthing</string> + <string name="sync_status_starting">Iniciando</string> + <string name="sync_status_up_to_date">Actualizado</string> + <string name="sync_status_syncing">Sincronizando</string> + <string name="sync_status_paused">En pausa</string> + <string name="sync_status_pausing">Pausando</string> + <string name="sync_status_resuming">Reanudando</string> + <string name="sync_status_attention">Requiere atención</string> + <string name="sync_status_failed">Syncthing se detuvo</string> + <string name="sync_failed_retry">Reintentar</string> + <string name="sync_paused_wifi">En pausa hasta tener Wi-Fi</string> + <string name="sync_paused_game">En pausa durante el juego</string> + <string name="sync_summary">%1$d carpetas · %2$d de %3$d dispositivos conectados</string> + <string name="sync_left">Faltan %1$s</string> + <string name="sync_open_web_ui">Abrir la interfaz web</string> + <string name="sync_pause">Pausar</string> + <string name="sync_resume">Reanudar</string> + <string name="sync_running">En ejecución</string> + <string name="sync_running_hint">Desactívalo para detener Syncthing por completo.</string> + <string name="sync_this_device">Este dispositivo</string> + <string name="sync_device_id">ID del dispositivo</string> + <string name="sync_show_qr">Mostrar QR</string> + <string name="sync_advanced">Avanzado</string> + <string name="sync_advanced_hint">Puertos, cuándo se ejecuta, restablecer</string> + <string name="sync_open">Abrir</string> + <string name="sync_waiting">Esperando tu respuesta</string> + <string name="sync_pending_device">%1$s quiere conectarse</string> + <string name="sync_pending_folder">%1$s quiere compartir “%2$s”</string> + <string name="sync_pending_folder_hint">Acepta para elegir dónde se guarda en DroidDeck.</string> + <string name="sync_review">Revisar en la interfaz web</string> + <string name="sync_folders">Carpetas</string> + <string name="sync_no_folders">Aún no hay carpetas.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Actualizada</string> + <string name="sync_folder_syncing">Sincronizando %1$d%%</string> + <string name="sync_folder_scanning">Escaneando</string> + <string name="sync_folder_paused">En pausa</string> + <string name="sync_folder_out_of_sync">No sincronizada</string> + <string name="sync_folder_errors">No se pudieron sincronizar %1$d archivos</string> + <string name="sync_folder_blocked">Bloqueada</string> + <string name="sync_folder_blocked_hint">Esta carpeta está fuera del almacenamiento de DroidDeck, así que DroidDeck la puso en pausa. Para sincronizar carpetas fuera de DroidDeck, usa la app Syncthing-Fork.</string> + <string name="sync_remove_folder">Quitar de Syncthing</string> + <string name="sync_remove_folder_hint">Quitarla no borra ningún archivo.</string> + <string name="sync_devices">Dispositivos</string> + <string name="sync_no_devices">Aún no hay dispositivos.</string> + <string name="sync_connected">Conectado</string> + <string name="sync_offline">Sin conexión</string> + <string name="sync_last_seen">Visto por última vez %1$s</string> + <string name="sync_device_id_title">ID de este dispositivo</string> + <string name="sync_device_id_hint">En tu otro dispositivo, agrega un dispositivo en Syncthing y escanea este código o pega el ID. Después, acéptalo aquí en la interfaz web.</string> + <string name="sync_copy">Copiar</string> + <string name="sync_share">Compartir</string> + <string name="sync_done">Listo</string> + <string name="sync_off_title">¿Desactivar Syncthing?</string> + <string name="sync_off_body">Syncthing se detiene ahora y seguirá detenido hasta que vuelvas a activarlo. Los archivos sincronizados se quedan donde están.</string> + <string name="sync_off_forget">Borrar también la configuración de Syncthing</string> + <string name="sync_off_forget_hint">Quita el ID de este dispositivo, las carpetas y los dispositivos. Al volver a activarlo, empieza desde cero.</string> + <string name="sync_turn_off">Desactivar</string> + <string name="sync_ports">Puertos</string> + <string name="sync_port_sync">Sincronización</string> + <string name="sync_port_discovery">Descubrimiento local</string> + <string name="sync_repick">Elegir puertos nuevos</string> + <string name="sync_repick_hint">Se vuelve a revisar en cada inicio.</string> + <string name="sync_repick_button">Volver a elegir</string> + <string name="sync_reset_group">Restablecer</string> + <string name="sync_api_key">Clave API</string> + <string name="sync_regenerate">Regenerar</string> + <string name="sync_reset">Restablecer Syncthing</string> + <string name="sync_reset_hint">ID de dispositivo nuevo; se quitan las carpetas y los dispositivos. Los archivos del almacenamiento de DroidDeck se conservan.</string> + <string name="sync_reset_button">Restablecer</string> + <string name="sync_reset_confirm_title">¿Restablecer Syncthing?</string> + <string name="sync_running_group">Ejecución</string> + <string name="sync_run">Ejecutar</string> + <string name="sync_run_open">Mientras DroidDeck está abierto</string> + <string name="sync_run_background">En segundo plano</string> + <string name="sync_wifi_only">Solo con Wi-Fi</string> + <string name="sync_pause_games">Pausar durante los juegos</string> + <string name="sync_logs">Registros</string> + <string name="sync_logs_hint">Salida de Syncthing de esta sesión</string> + <string name="sync_logs_share">Compartir</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Configura primero el runtime de Linux.</string> + <string name="sync_accept">Aceptar</string> + <string name="sync_accept_title">Guardar “%1$s” en</string> + <string name="sync_add_folder">Agregar carpeta</string> + <string name="sync_add_folder_hint">Sincroniza una carpeta del almacenamiento de DroidDeck</string> + <string name="sync_choose">Elegir</string> + <string name="sync_add">Agregar</string> + <string name="sync_add_failed">No se pudo agregar la carpeta.</string> + <string name="sync_share_with">Compartir con</string> + <string name="sync_share_none">Aún no hay dispositivos. Puedes compartir esta carpeta más tarde desde la interfaz web.</string> + <string name="sync_use_folder">Usar esta carpeta</string> + <string name="sync_new_folder">Carpeta nueva</string> + <string name="sync_location_home">Carpeta personal del contenedor</string> + <string name="sync_location_sync">Carpeta Sync</string> + <string name="sync_location_shared">Almacenamiento compartido de DroidDeck</string> + <string name="sync_location_card">DroidDeck en %1$s</string> + <string name="sync_location_app">Datos de la app DroidDeck</string> + <string name="sync_web_path_locked">Las carpetas nuevas se guardan en la carpeta Sync de DroidDeck. Para sincronizar otra carpeta de DroidDeck, usa Agregar carpeta en la pestaña Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Recargar</string> + <string name="sync_not_running">Syncthing no se está ejecutando.</string> + <string name="session_end_steam_sigill">Steam se detuvo por una instrucción ilegal (SIGILL). Puede ser un problema de compatibilidad con instrucciones de la CPU o un fallo del cliente. Comparte los registros con los datos de tu dispositivo.</string> + <string name="session_end_steam_try_x64">Puedes probar Ajustes de Steam → Cliente de Steam → x86-64 (experimental). Requiere una descarga adicional y puede ir más lento.</string> + <string name="session_end_vulkan_device">El controlador gráfico de Linux no encontró un dispositivo Vulkan utilizable. Comprueba que el controlador de GPU de Linux seleccionado sea compatible con esta GPU.</string> + <string name="session_end_gpu_unsupported">Esta sesión no puede iniciarse porque esta GPU no tiene un controlador Vulkan de Linux compatible en la configuración actual. Los controladores Turnip de Adreno no pueden habilitar la compatibilidad con GPU MediaTek/Mali.</string> <string name="setup_group_memory">Memoria</string> <string name="setup_clear_cached">Cerrar apps en caché antes de una sesión</string> <string name="setup_clear_cached_hint">Al iniciar una sesión, DroidDeck cierra las apps que Android mantiene en segundo plano para que el juego tenga más memoria. La Depuración inalámbrica debe estar activada.</string> @@ -3111,6 +3475,12 @@ <string name="epic_client_open">Abrir</string> <string name="epic_client_install">Instalar</string> <string name="game_tab_about">Acerca de</string> + <string name="game_resources_browser">Se abre en tu navegador</string> + <string name="game_resource_guides">Guías</string> + <string name="game_resource_protondb_detail">Informes de compatibilidad de Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Para juegos con partidas guardadas en tu cuenta de Steam</string> + <string name="game_resource_search">Búsqueda web</string> <string name="game_tab_install">Instalar</string> <string name="game_install_location">Ubicación</string> <string name="game_install_folder">Carpeta</string> @@ -3127,6 +3497,11 @@ <string name="stores_eyebrow_pass">disponible con %1$s</string> <string name="stores_owned_in_library">Juegos comprados en Biblioteca</string> <string name="library_filter_added">Agregados</string> + <string name="library_filter">Filtro</string> + <string name="library_filter_installed">Solo instalados</string> + <string name="library_filter_all_owned">Todos los juegos que tienes</string> + <string name="library_no_installed_matches">Ningún juego instalado coincide con estos filtros.</string> + <string name="library_browse_owned">Explorar los juegos que tienes</string> <string name="game_tab_launch">Inicio</string> <string name="game_tab_saves_cloud">Partidas y nube</string> <string name="game_launch_shortcut">Acceso directo de Steam</string> @@ -3144,6 +3519,40 @@ <string name="stores_itch_update_replaced">El desarrollador reemplazó esta versión por %1$s. ¿Actualizar a ella?</string> <string name="xbox_filter_cloud">Nube</string> <string name="stores_xbox_cloud_settings">Configuración de nube</string> + <string name="integration_title">Integración con Steam</string> + <string name="integration_count">%1$d de %2$d activadas</string> + <string name="integration_set_up">Configurar</string> + <string name="integration_location">Ubicación</string> + <string name="integration_app_info">Información de la app</string> + <string name="integration_wifi">Nombres de Wi-Fi</string> + <string name="integration_brightness">Brillo</string> + <string name="integration_home">DroidDeck como inicio</string> + <string name="integration_shortcuts">Teclas del sistema</string> + <string name="integration_wifi_hint">Muestra las redes en Steam · requiere acceso a la ubicación, nunca se rastrea</string> + <string name="integration_wifi_on">Las redes se muestran en Steam</string> + <string name="integration_wifi_location_off">La ubicación está desactivada</string> + <string name="integration_wifi_denied">Ubicación denegada · permítela en Información de la app</string> + <string name="integration_brightness_hint">El control deslizante de Steam ajusta el brillo de la pantalla</string> + <string name="integration_home_hint">Inicio abre el menú de Steam en una sesión</string> + <string name="integration_shortcuts_hint">Alt+Tab, la tecla Win y el botón Inicio se quedan en la sesión</string> + <string name="integration_shortcuts_maybe_restricted">¿Aparece en gris en Android? Información de la app → ⋮ → Permitir configuración restringida</string> + <string name="integration_shortcuts_restricted">Bloqueado por Android · Información de la app → ⋮ → Permitir configuración restringida</string> + <string name="integration_shortcuts_service">Teclas del sistema de DroidDeck</string> + <string name="integration_shortcuts_service_description">Mantiene Alt+Tab, la tecla Win y el botón Inicio dentro de una sesión activa de DroidDeck en lugar de Android.</string> + <string name="integration_brightness_needed">Activa Brillo en Configuración → Integración con Steam</string> + <string name="setup_gpu_bridge_off">Puente Mali: desactivado</string> + <string name="setup_gpu_bridge_on">Puente Mali: activado</string> + <string name="setup_gpu_bridge_detail">%1$s no es una Adreno. El puente Vulkan experimental está activado: la sesión dibuja a través del propio controlador del teléfono. Espera errores; envía los registros de la sesión.</string> + <string name="setup_bridge_safe">Modo seguro</string> + <string name="setup_bridge_safe_on">Modo seguro: activado</string> + <string name="setup_bridge_safe_off">Modo seguro: desactivado</string> + <string name="setup_bridge_safe_on_detail">El más compatible. Recomendado para un dispositivo nuevo.</string> + <string name="setup_bridge_safe_off_detail">Más rápido donde esta GPU pasó sus pruebas.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automático</string> + <string name="setup_bridge_dxvk_proton">DXVK: el de Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Usa un DXVK más antiguo cuando el Vulkan de esta GPU es demasiado antiguo para el de Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Cada Proton conserva su propio DXVK, aunque el Vulkan de esta GPU pueda ser demasiado antiguo para él.</string> <string name="apps_search_hint">Buscar apps</string> <string name="apps_no_match">Ninguna app coincide con «%1$s».</string> <string name="apps_add_widget">Agregar widget</string> @@ -3193,6 +3602,8 @@ <string name="desktop_restore_done_body">Las apps que agregaste están instaladas otra vez.</string> <string name="desktop_restore_failed_title">No se pudo restaurar parte del software</string> <string name="desktop_restore_failed_body">Revisa ~/.cache/droiddeck/apt-restore.log y luego prueba sudo apt install en Konsole.</string> + <string name="gog_full_files">Las optimizaciones nativas no están disponibles. La descarga incluye archivos de reemplazo completos.</string> + <string name="gog_recover">Verificar el resultado del parche</string> <string name="slow_usb_title">Conexión USB lenta</string> <string name="slow_usb_cable">%1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s), así que los juegos cargarán lento. Usa un cable USB 3 de 5 Gbps o más, prueba a voltear el conector USB-C o usa una unidad más rápida.</string> <string name="slow_usb_port">%1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s). El puerto USB de este dispositivo no admite más velocidad, así que los juegos cargarán lento. El almacenamiento interno o una microSD pueden ser más rápidos.</string> @@ -3203,4 +3614,52 @@ <string name="steam_import_names_more">%1$s y %2$d más</string> <string name="steam_import_now">Reiniciar ahora</string> <string name="steam_import_later">Más tarde</string> + <string name="gog_maintenance">Administrar la instalación de GOG</string> + <string name="gog_check">Buscar actualizaciones</string> + <string name="gog_repair">Verificar/Reparar</string> + <string name="gog_patches">Parches sin conexión</string> + <string name="gog_refresh">Descargar el instalador sin conexión completo</string> + <string name="gog_update">Actualizar a %1$s</string> + <string name="gog_resume">Reanudar el mantenimiento de GOG</string> + <string name="gog_open_patch">Abrir el instalador del parche</string> + <string name="gog_patch_in_session">Termina o cancela el instalador del parche en la sesión de Linux.</string> + <string name="gog_patch_requirements">Elige un parche para tu versión instalada y tu idioma. Puede que no aparezcan todas las versiones de origen compatibles.</string> + <string name="gog_no_patches">GOG no tiene parches independientes de Windows para este juego.</string> + <string name="gog_managed_files">Los archivos del juego modificados pueden reemplazarse.</string> + <string name="gog_patch_installer_note">El instalador se abre en tu sesión de Linux.</string> + <string name="gog_download_label">Descarga</string> + <string name="gog_space_label">Espacio adicional</string> + <string name="gog_space_estimate_label">Espacio estimado</string> + <string name="gog_repair_action">Reparar archivos</string> + <string name="gog_refresh_action">Renovar la instalación</string> + <string name="gog_select_patch">Seleccionar</string> + <string name="stores_gamejolt_not_owned">No está en tu biblioteca de Game Jolt</string> + <string name="stores_gamejolt_no_build">Este juego no tiene descarga para Windows</string> + <string name="stores_gamejolt_no_exe">No se encontró un juego de Windows en la descarga</string> + <string name="stores_gamejolt_no_game">No se encontró este juego en Game Jolt</string> + <string name="stores_gamejolt_browse_failed">No se pudieron cargar los juegos de Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt respondió HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">No se pudieron cargar las descargas de Game Jolt</string> + <string name="stores_gamejolt_build_open">Abrir en Game Jolt</string> + <string name="stores_gamejolt_archive">Los archivos %1$s no son compatibles</string> + <string name="stores_gamejolt_extract_failed">No se pudo extraer la descarga (salida %1$d)</string> + <string name="stores_gamejolt_download_unreachable">No se pudo conectar con Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt no entregó un enlace de descarga</string> + <string name="stores_gamejolt_section_featured">Destacados</string> + <string name="stores_gamejolt_section_hot">Populares</string> + <string name="stores_gamejolt_section_best">Mejores</string> + <string name="stores_gamejolt_section_new">Nuevos</string> + <string name="stores_gamejolt_price_under_30">$30 o menos</string> + <string name="stores_gamejolt_os_other">Otros</string> + <string name="stores_gamejolt_maturity_everyone">Todas las edades</string> + <string name="stores_gamejolt_maturity_teen">Adolescentes</string> + <string name="stores_gamejolt_maturity_adult">Maduro</string> + <string name="stores_gamejolt_status_complete">Completo</string> + <string name="stores_gamejolt_status_early">Acceso anticipado</string> + <string name="stores_gamejolt_partners">Juegos de socios</string> + <string name="stores_gamejolt_filter_browser">Navegador</string> + <string name="stores_gamejolt_filter_maturity">Clasificación</string> + <string name="stores_gamejolt_filter_status">Estado</string> + <string name="stores_gamejolt_filter_partners">Socios</string> + <string name="stores_gamejolt_followed">Juegos seguidos</string> </resources> diff --git a/app/src/main/res/values-bg/gestures.xml b/app/src/main/res/values-bg/gestures.xml index 15898ef0ec..60d56796ff 100644 --- a/app/src/main/res/values-bg/gestures.xml +++ b/app/src/main/res/values-bg/gestures.xml @@ -71,7 +71,7 @@ <string name="gesture_key_backspace">Backspace</string> <string name="gesture_key_enter">Enter</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">Интервал</string> <string name="gesture_key_delete">Delete</string> <string name="gesture_key_insert">Insert</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 3f998b5437..4f5c248d61 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Настройки на VKD3D за D3D12. nodxr изключва трасирането на лъчи; използвайте само за игра, която го изисква.</string> <string name="game_env_proton_log">Задайте 1 за диагностичен дневник на Proton. Записването на дневник може да намали производителността и да използва място в хранилището.</string> <string name="game_env_wined3d">Задайте 1, за да използвате WineD3D, базиран на OpenGL, вместо DXVK за тестване на съвместимост с D3D9–11.</string> + <string name="game_env_wined3d_renderer">Рендерер за DirectDraw, Direct3D 1-7 и игри, стартирани с WineD3D. Vulkan пропуска пътя OpenGL през Zink и е много по-бърз за стари игри с DirectDraw и Direct3D 7 на Adreno.</string> + <string name="game_env_dxvk_d3d8">Задайте 1, за да се изпълнява Direct3D 8 през DXVK вместо WineD3D. По-бързо в теста за Direct3D 8 на AIO Graphics Test на Adreno.</string> <string name="game_env_no_ntsync">Задайте 1, за да изключите ntsync (droiddeck-ntsync или драйвер на ядрото) за тази игра; тогава се използва droiddeck-esync, ако има пакет, или droiddeck-fsync в противен случай.</string> <string name="game_env_no_esync">Задайте 1, за да изключите droiddeck-esync за тази игра; вместо това се използва droiddeck-fsync, или droiddeck-ntsync, ако fsync също е изключен.</string> <string name="game_env_no_fsync">Задайте 1, за да изключите droiddeck-fsync за тази игра; тогава се използва droiddeck-esync, ако има пакет, или droiddeck-ntsync в противен случай.</string> <string name="game_env_fsync_first">Задайте 1, за да стартирате тази игра с droiddeck-fsync, или 0, за да поставите droiddeck-esync на първо място, ако има пакет, подходящ за нейния Proton.</string> <string name="game_env_xalia">Задайте 0, за да изключите помощника на Proton за навигация с контролер за тази игра.</string> + <string name="game_env_anticheat_offline">Включено по подразбиране. Стартира игра с Easy Anti-Cheat без античийта ѝ, когато играта поддържа офлайн игра. Изключете, за да стартирате през Easy Anti-Cheat както обикновено. Онлайн режимите, които изискват Easy Anti-Cheat, остават недостъпни.</string> <string name="game_env_hud">Насложен слой на DXVK за D3D9–11. fps показва честотата на кадрите; незададено го скрива.</string> <string name="game_env_dxvk_config">Настройки на DXVK, разделени с точка и запетая. По-новите версии използват dxvk.maxFrameRate за ограничаване на кадрите; за обикновена игра предпочитайте ограничителя на кадри на сесията.</string> + <string name="game_env_cores">CPU ядра за тази игра, например 0-4 или 0,2,4, вместо ядрата за игри на сесията. По-малко ядра означават по-ниска температура.</string> <string name="game_env_vkd3d_limit">Ограничение на честотата на кадрите за D3D12. 0 изключва ограничението.</string> <string name="game_env_glthread">Многонишковост на Mesa OpenGL. true може да помогне при игри с OpenGL, ограничени от процесора; тествайте за всяка игра.</string> <string name="sync_backend_title">Синхронизация на Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX стартира x86 Linux програми на това ARM64 устройство. Автоматично го използва, когато програмата е компилирана за x86.</string> <string name="app_fex_x86">%1$s през FEX</string> <string name="app_fex_not_ready">Тази програма е компилирана за %1$s компютри и се стартира през FEX, който още не е настроен. Отворете Steam веднъж, докато сте влезли: DroidDeck ще изтегли FEX и необходимата Steam Linux Runtime, след което тя ще се отвори.</string> + <string name="session_proot_missing">proot на DroidDeck не можа да бъде изтеглен. Проверете връзката и опитайте пак. Сесията не беше стартирана, защото резервният proot е твърде бавен за игра.</string> + <string name="session_directaudio_missing">DirectAudio не можа да бъде изтеглен, затова звукът на игрите използва по-бавния път в тази сесия.</string> <string name="session_end_program">Тази програма</string> <string name="session_end_steam_download">Клиентът на Steam не можа да бъде изтеглен. Мрежата или VPN връзката ви може да блокира сървърите на Steam; проверете връзката и опитайте отново.</string> <string name="session_end_steam_setup">Клиентът на Steam не можа да бъде настроен. Проверете връзката и свободното място, след което опитайте отново.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Контролер Xbox 360</string> <string name="mode_controller_note">Deck: бутон Quick Access и гироскоп. Steam Controller: същото, с усещане за захват на задните бутони. DualShock 4 и DualSense: гироскоп, а тракпадовете служат като тъчпад. Xbox 360: отворете Quick Access с Guide+A.</string> <string name="mode_back">Back</string> + <string name="back_hold">Задържане на Назад за преки пътища в Steam</string> + <string name="back_hold_hint">Задържането на Назад отваря Бърз достъп или прави комбинации в Steam с други бутони. Изключете, за да се пренебрегва задържането; докосване и двойно докосване още работят.</string> + <string name="back_native_qam_hint">Задръжте Back за 700 ms или задръжте Back и натиснете друг бутон за преки пътища на Steam.</string> + <string name="back_double_tap_window">Интервал за двойно докосване</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Разрешаване на управлението на яркостта</string> + <string name="brightness_permission_text">Настройте управлението на яркостта в DroidDeck.</string> <string name="back_menu_then_qam">Меню → QAM</string> <string name="back_qam_then_menu">QAM → Меню</string> <string name="mode_session">Сесия</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Отлага фоновото спиране, докато Steam активно изтегля.</string> <string name="mode_suspend_note">Автоматично поставя на пауза във фонов режим и продължава при показване. Ръчно изчаква „Продължи“. Никога продължава да работи.</string> <string name="mode_startup">Стартиране</string> - <string name="mode_steam_startup">Стартиране на Steam заедно с DroidDeck</string> - <string name="mode_steam_startup_hint">Отваря сесията на Steam при стартиране на DroidDeck.</string> + <string name="mode_startup_session">Отваряне при стартиране</string> + <string name="mode_startup_session_hint">Стартира тази сесия, когато DroidDeck се стартира.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Проверка за издания…</string> <string name="mode_decky_ready">Готово за инсталиране на %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Актуално · %1$s</string> <string name="mode_decky_loader">Зареждач</string> <string name="mode_decky_install_latest">Инсталиране на последната версия</string> + <string name="decky_channel">Канал за актуализации</string> + <string name="decky_channel_hint">Кои издания на Decky Loader да се инсталират. Собственият актуализатор на Decky използва същия канал.</string> + <string name="decky_channel_stable">Стабилен</string> + <string name="decky_channel_prerelease">Предварителен</string> + <string name="decky_channel_testing">Тестов</string> + <string name="decky_channel_failed">Каналът за актуализации на Decky не можа да бъде запазен</string> <string name="mode_decky_on">Стартира заедно със Steam. Докато е включено, други приложения на това устройство може да могат да контролират Steam.</string> <string name="mode_decky_off">Изключено. Портът за отдалечено дебъгване на Steam остава затворен.</string> <string name="mode_decky_remove_title">Деинсталиране на Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Клиент</string> <string name="mode_mangoapp">Насложен слой за производителност</string> <string name="mode_mangoapp_hint">Изключете, ако игрите забиват или екранът става черен в режим Deck. Прилага се от следващата сесия.</string> + <string name="mode_return_after_game">Връщане в DroidDeck след игра</string> + <string name="mode_return_after_game_hint">Когато игра, стартирана от DroidDeck или друг стартер, се затвори, Steam излиза правилно (първо се довършват облачните записи) и се връщате там. Изключено: оставате в Steam.</string> + <string name="mode_shader_precache">Предварително кеширане на шейдъри</string> + <string name="mode_shader_precache_hint">Steam изтегля предварително изградени шейдъри за игрите ви и ги обработва във фонов режим, така че игрите засичат по-малко. Изключено пести данни, място и батерия; вместо това игрите изграждат шейдърите по време на игра. Същата настройка като „Изтегляния > Предварително кеширане на шейдъри“ в Steam. Прилага се от следващата сесия.</string> <string name="mode_steam_repair">Поправка на клиента на Steam</string> <string name="mode_steam_repair_hint">Изтегля отново клиента на Steam при следващото стартиране на Steam. Използвайте, ако Steam остава на екрана за зареждане. Игрите, влизането в профила и настройките се запазват.</string> <string name="mode_steam_repair_queued">Клиентът на Steam ще бъде изтеглен отново при следващото стартиране на Steam.</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">Пропуска PulseAudio за по-ниска латентност.</string> <string name="mode_mic">Микрофон</string> <string name="mode_mic_hint">За гласов чат.</string> + <string name="drawer_mic_hint">Включване или изключване на записа от микрофона за тази сесия.</string> + <string name="drawer_mic_failed">Микрофонът не можа да бъде променен. Опитайте пак.</string> <string name="mode_network">Мрежа</string> <string name="mode_wifi_discovery">Откриване на Wi-Fi</string> <string name="mode_wifi_discovery_hint">Показва имената на Wi-Fi и близките мрежи в Steam.</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: GPU опашка в реално време</string> <string name="perf_gsrealtime_hint">Дава приоритет на GPU работата на компоситора. Може да изглади темпото на кадрите с известна цена за игрите.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Памет</string> + <string name="perf_cap_off">Изкл.</string> + <string name="perf_cap_auto">По подразбиране за драйвера</string> + <string name="perf_zram_client">Компресиране на Steam, докато върви игра</string> + <string name="perf_zram_client_hint">20 s след стартиране на игра клиентът на Steam се компресира в zRAM, за да остави повече памет на играта, и се прочита обратно, когато играта се затвори. Изключете, ако сесията се затваря малко след стартиране на игри. Ограничение на RAM по-горе пак компресира Steam, когато сесията го надхвърли.</string> + <string name="perf_ram_cap">Ограничение на RAM</string> + <string name="perf_ram_cap_hint">Прилага се, докато клиентът на Steam работи, в режим Steam или от работния плот. Когато сесията използва повече от това, Steam и след това другите поддържани процеси на сесията се компресират в zRAM. Меко ограничение: нищо не се затваря, но игрите може да засичат, докато страниците се връщат.</string> + <string name="perf_ram_cap_unavailable">Изисква zRAM swap, който това устройство няма.</string> + <string name="perf_vram_cap">Ограничение на VRAM</string> + <string name="perf_vram_cap_hint">Видеопаметта, която DXVK отчита на игрите с Direct3D, за да планират текстури за по-малко. Собствените настройки на DXVK на играта имат предимство. Прилага се от следващата сесия.</string> <string name="perf_gpuclock">Задръжте GPU на максималната му честота</string> <string name="perf_gpuclock_hint">Само за Adreno. По-малко засечки, по-голямо използване на батерията и повече топлина.</string> <string name="perf_fixes">Корекции на сесията</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">Бърз път на proot</string> <string name="perf_fastpath_needs_seccomp">Изисква филтъра seccomp на proot.</string> <string name="perf_fastpath_hint">По-бързо търсене на файлове и по-малко заекване. Изключете, ако програма не може да намери файловете си.</string> + <string name="perf_cursor_composite">Изобразяване на курсора в gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope сам рисува показалеца, вместо да го предава на Android. Включете за курсор, управляван с контролер. Изключено е по-бързо на телефон. Прилага се от следващата сесия.</string> <string name="perf_identity">Идентичност на сесията</string> <string name="perf_hostname">Име на хоста</string> <string name="perf_hostname_hint">Името, което Steam вижда за това устройство. Оставено празно възстановява %1$s.</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">Файловете му се премахват от приложението.</string> <string name="driver_delete_in_use">Файловете му се премахват. В употреба е, затова стандартният драйвер поема.</string> <string name="drawer_page_display">Екран</string> + <string name="drawer_frame_limit">Ограничение на кадрите</string> + <string name="drawer_frame_limit_note">Ограничава тази игра. Екранът преминава към честота на опресняване, която се дели точно на ограничението, ако има такава; другите ограничения може да изглеждат неравномерни. Игрите в Steam използват Frame Limit на Steam в менюто Quick Access.</string> <string name="drawer_page_effects">Ефекти</string> <string name="drawer_page_controls">Контроли</string> <string name="drawer_page_components">Компоненти</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">Хапче</string> <string name="hud_size_minimal">Минимален</string> <string name="hud_size_mega">Мега</string> + <string name="hud_size_strip">Лента</string> <string name="hud_locked">Заключване на място</string> <string name="hud_locked_hint">Плъзнете HUD, за да го преместите; продължително натискане го заключва или отключва. Докато е заключен, екранните контроли под него продължават да работят.</string> + <string name="hud_snap">Залепване отстрани</string> + <string name="hud_snap_hint">Пуснете HUD и той отива към по-близката страна на екрана. Бързо плъзване го хвърля в тази посока.</string> <string name="hud_group_look">Визия</string> <string name="hud_scale">Размер на екрана</string> <string name="hud_color_soft">Мек</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">Отчетът за HUD не можа да бъде записан.</string> <string name="hud_reset">Нулиране на настройките на HUD</string> <string name="hud_reset_button">Нулиране</string> - <string name="hud_credit">FusionHUD от The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Режим на мащабиране</string> <string name="drawer_scaling_sharpness">Острота на мащабиране</string> <string name="drawer_effects">Ефекти на екрана</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">Автоматично (%1$s)</string> <string name="drawer_keyboard">Клавиатура</string> <string name="drawer_latency">Закъснение</string> + <string name="drawer_low_latency">Режим на ниска латентност</string> + <string name="drawer_low_latency_hint">Увеличава използването на CPU и батерията</string> <string name="drawer_low_latency_controller">Контролер с ниско закъснение</string> <string name="drawer_low_latency_controller_hint">Контролерът докладва при 1000 Hz вместо 250 Hz. Малко повече CPU.</string> <string name="drawer_low_latency_touch">Докосване с ниско закъснение</string> <string name="drawer_low_latency_touch_hint">Докосванията пропускат групирането на кадри; управлението с докосване в Steam работи при 1000 Hz. Малко повече CPU.</string> <string name="drawer_evdev_mouse">Суров канал за мишка</string> + <string name="drawer_relative_mouse">Относителна мишка</string> + <string name="drawer_relative_mouse_auto">Автоматично</string> + <string name="drawer_relative_mouse_on">Включено</string> + <string name="drawer_relative_mouse_off">Изключено</string> <string name="drawer_direct_cursor">Курсор</string> <string name="drawer_pc_keyboard">Клавиатура за компютър</string> <string name="drawer_android_keyboard">Android</string> @@ -791,6 +838,10 @@ <string name="setup_session">Сесия</string> <string name="setup_logs">Дневници на сесията</string> <string name="setup_logs_hint">Запазват се след всяка сесия</string> + <string name="setup_game_debug_logs">Дневници за дебъгване на игри</string> + <string name="setup_game_debug_logs_hint">Включва диагностика на Proton, Wine и графиката при следващото стартиране на игра. Може да намали производителността и да заеме повече място.</string> + <string name="setup_game_debug_logs_restart">Рестартирайте тази сесия, за да запазите дневниците за дебъгване на игри</string> + <string name="setup_logging_update_failed">Записването в дневник не можа да бъде променено. Проверете превключвателя и опитайте пак.</string> <string name="setup_agent_commands">Инструменти за отстраняване на грешки</string> <string name="setup_latest_logs">Последни дневници на сесията</string> <string name="setup_saved_logs">Запазени дневници на сесията</string> @@ -822,20 +873,22 @@ <string name="setup_home">Използване като начален екран</string> <string name="setup_home_on">DroidDeck може да бъде приложението за начален екран</string> <string name="setup_home_off">DroidDeck никога не се предлага като приложение за начален екран</string> + <string name="setup_home_game_space_first">В „Добавяне на игри“ задайте DroidDeck на „Включване“</string> <string name="setup_orientation">Ориентация</string> + <string name="setup_launcher_orientation">Ориентация на стартера</string> + <string name="setup_launcher_orientation_auto">Следва завъртането на устройството</string> + <string name="setup_orientation_portrait">Вертикална</string> + <string name="setup_session_orientation">Ориентация на сесията</string> + <string name="setup_session_orientation_hint">Прилага се за Steam, игрите, работния плот и редактора на контролера. Предварително зададените резолюции се завъртат със сесията; персонализираните ширина и височина остават както са въведени.</string> <string name="setup_orientation_auto">Автоматичен хоризонтален</string> <string name="setup_orientation_landscape">Хоризонтална</string> <string name="setup_orientation_reverse">Обърната хоризонтална</string> <string name="setup_fullscreen">Цял екран</string> <string name="setup_fullscreen_on">Скрива лентите за състояние и навигация на Android</string> <string name="setup_fullscreen_off">Показва лентите за състояние и навигация на Android</string> - <string name="setup_dual_screen">Двоен екран</string> - <string name="setup_dual_screen_hint">Автоматично използва втория екран на преносими устройства с вграден такъв. Вкл. използва всеки втори дисплей. Изкл. държи всичко на един екран.</string> <string name="setup_dual_screen_auto">Автоматично</string> <string name="setup_dual_screen_on">Вкл.</string> <string name="setup_dual_screen_off">Изкл.</string> - <string name="setup_dual_screen_menu">Меню на долния екран</string> - <string name="setup_dual_screen_menu_hint">Премества секциите и менюто по време на игра на втория екран и въвеждането става там, така горният екран остава с пълен изглед. L2 и R2 сменят секциите.</string> <string name="setup_dual_screen_controls">Контроли на долния екран в игрите</string> <string name="setup_dual_screen_controls_hint">Отваря тракпада и клавиатурата на втория екран при стартиране на сесия.</string> <string name="dual_typing_title">Въвеждане за горния екран</string> @@ -987,6 +1040,14 @@ <string name="gate_step1">Отворете Настройки → Опции за програмисти → Безжично отстраняване на грешки и го включете</string> <string name="gate_step2">Докоснете „Сдвояване на устройство с код за сдвояване“</string> <string name="gate_step3">Въведете кода в известието на DroidDeck</string> + <string name="pairguide_build_number">В „Всичко за телефона“ докоснете „Номер на версията“ 7 пъти</string> + <string name="pairguide_wireless">Включете „Безжично отстраняване на грешки“</string> + <string name="pairguide_pair">Отворете „Безжично отстраняване на грешки“, след което докоснете „Сдвояване на устройството с код за сдвояване“</string> + <string name="pairguide_child_process">Включете „Деактивиране на ограниченията за дъщерните процеси“</string> + <string name="pairguide_row_child_process">Деактивиране на ограниченията за дъщерните процеси</string> + <string name="pairguide_row_build_number">Номер на версията</string> + <string name="pairguide_row_wireless">Безжично отстраняване на грешки</string> + <string name="pairguide_row_pair">Сдвояване на устройството с код за сдвояване</string> <string name="gate_waiting">Изчакване на изскачащия прозорец за сдвояване…</string> <string name="gate_code_needed">Изскачащият прозорец е намерен. Въведете кода му в известието.</string> <string name="gate_status">Състояние</string> @@ -1125,7 +1186,6 @@ <string name="games_never_played">Никога не е играна</string> <string name="games_runtime_busy_percent">Средата за изпълнение е заета · %1$d%%</string> <string name="games_runtime_busy">Средата за изпълнение е заета</string> - <string name="games_runtime_first_play">Средата за изпълнение се инсталира при първото Play</string> <string name="games_runtime_update">Налична актуализация на средата за изпълнение</string> <string name="games_runtime_ready">● Средата за изпълнение е готова</string> <string name="games_internal">Вътрешна памет</string> @@ -1142,6 +1202,9 @@ <string name="gpu_hide_other">Скриване на драйверите за други GPU</string> <string name="gpu_show_other">Показване на драйверите за други GPU</string> <string name="gpu_advanced">Разширени</string> + <string name="gpu_ubwc_title">Съвместимост с UBWC</string> + <string name="gpu_ubwc_hint">Опитайте Вкл. или Изкл., ако Steam или Android показва ивици или трептене. Прилага се и за двата драйвера след рестартиране на DroidDeck.</string> + <string name="gpu_ubwc_restart">Рестартирайте DroidDeck, за да се приложи.</string> <string name="gpu_set_with_display">Задава се заедно с драйвера за дисплея: %1$s включва и двете.</string> <string name="gpu_set_with_runtime">Задава се заедно с драйвера за изпълнение: %1$s включва и двете.</string> <string name="gpu_runtime_hint">Използва се от игрите и работния плот.</string> @@ -1250,10 +1313,15 @@ <string name="pip_auto">Автоматично влизане в „Картина в картината“</string> <string name="unfolded_controls">Контроли на разгънатия екран</string> <string name="unfolded_controls_hint">Разгънат, играта стои над тракпадите и задните захвати на Steam Deck. Сгънат, играта е на цял екран.</string> + <string name="unfolded_controls_with_controller">Запазване при контролер</string> + <string name="unfolded_controls_with_controller_hint">Показване на тези контроли с докосване и когато има свързан контролер.</string> <string name="pip_suspended">Прекъсната</string> <string name="pip_not_ready">Картина в картината е достъпна само когато сесията е готова.</string> <string name="pip_permission">Разреши картина в картината за DroidDeck в настройките на Android.</string> <string name="pip_unavailable">Android не можа да отвори картина в картината.</string> + <string name="game_more">Още</string> + <string name="game_edit_art">Редактиране на изображенията</string> + <string name="stores_in_steam_label">В Steam</string> <string name="game_shortcut">Пряк път</string> <string name="game_shortcut_add">Добавяне към началния екран</string> <string name="game_shortcut_choose">Избор на игра</string> @@ -1277,6 +1345,10 @@ <string name="main_wait_runtime">Изчакай операцията със средата да приключи</string> <string name="main_wait_proton_install">Изчакай инсталирането на инструмента за съвместимост да приключи</string> + <string name="load_compat_title">Подготовка на инструментите за съвместимост</string> + <string name="load_compat_wait">Изчакване настройката за съвместимост да завърши</string> + <string name="load_compat_hint">Сесията ви ще започне, когато настройката завърши.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Изчакай инсталирането на работния плот да приключи</string> <string name="main_wait_install_game">Изчакай инсталирането да приключи, преди да пуснеш игра.</string> <string name="main_saves_close_session">Затвори сесията на Steam, за да играта не презапише импортираните файлове.</string> @@ -1313,6 +1385,9 @@ <string name="main_install_anyway">Инсталиране въпреки това</string> <string name="main_remove_runtime_title">Премахване на средата на Linux</string> <string name="main_remove_runtime_text">Това изтрива средата, клиента на Steam в нея и всяка инсталирана в нея игра.</string> + <string name="runtime_actions_title">Среда на Linux</string> + <string name="runtime_actions_text">Поправката преинсталира системните файлове на средата и запазва Steam, игрите и настройките ви. Допълнения като работния плот се инсталират отново, когато ги използвате следващия път. Премахването изтрива всичко.</string> + <string name="runtime_repair">Поправка на средата</string> <string name="main_applied">Приложено: %1$s</string> <string name="android_app_open_failed_primary">%1$s не можа да се отвори на основния екран</string> <string name="android_app_open_failed_on">%1$s не можа да се отвори на %2$s</string> @@ -1442,6 +1517,11 @@ <string name="session_runtime_catalog_unreachable">Каталогът на средата не можа да бъде достигнат. Провери връзката и натисни „Пускане“ отново.</string> <string name="session_runtime_install_failed">Средата на Linux не се инсталира. Провери средата в „Настройка“ и натисни „Пускане“ отново.</string> <string name="session_desktop_install_failed">Работният плот не се инсталира (%1$s). Провери връзката и натисни „Desktop“ отново.</string> + <string name="session_package_resume_failed">Прекъсната инсталация не можа да бъде довършена (%1$s). Проверете връзката и мястото, след което опитайте пак.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Средата на Linux е повредена: %1$d връзка към библиотека сочи към липсващ файл (%2$s), обикновено след прекъсната инсталация. Поправката запазва игрите и настройките ви.</item> + <item quantity="other">Средата на Linux е повредена: %1$d връзки към библиотеки сочат към липсващи файлове (%2$s и други), обикновено след прекъсната инсталация. Поправката запазва игрите и настройките ви.</item> + </plurals> <string name="session_ended_named">%1$s спря неочаквано. Сподели логовете в отчет за грешка или опитай отново.</string> <string name="session_ended_program">Програмата спря неочаквано. Сподели логовете в отчет за грешка или опитай отново.</string> <string name="session_ended_desktop">Работният плот спря неочаквано. Сподели логовете в отчет за грешка или опитай отново.</string> @@ -1456,6 +1536,13 @@ <string name="mode_decky_plugins_hint">Инсталирай ZIP с плъгин за следващата сесия на Steam.</string> <string name="mode_decky_plugin_downloading">Изтегляне…</string> <string name="mode_decky_plugin_install_zip">Инсталиране от ZIP</string> + <string name="decky_zip_warning_title">Инсталиране на плъгин от трета страна</string> + <string name="decky_zip_warning_text">Екипът на Decky Loader не е прегледал този плъгин. Той може да съдържа зловреден софтуер, например за кражба на акаунта ви в Steam или за увреждане на устройството ви. С инсталирането на този плъгин приемате, че поемате всички рискове за устройството си.</string> + <string name="decky_zip_warning_continue">Продължи</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Изчакайте %1$d секунда</item> + <item quantity="other">Изчакайте %1$d секунди</item> + </plurals> <string name="store_cat_games">Игри</string> <string name="store_cat_audio_video">Аудио и видео</string> <string name="store_cat_graphics">Графика</string> @@ -1511,7 +1598,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">Интервал</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1617,6 +1704,8 @@ <string name="fm_accept">Приемам</string> <string name="fm_decline">Отказвам</string> <string name="fm_drive_not_readable">%1$s е монтирано, но в момента не може да се прочете</string> + <string name="fm_drive_access_title">Разрешаване на достъп до %1$s</string> + <string name="fm_drive_access_text">Android позволява на DroidDeck да вижда това устройство, но не и да го чете. Включете Достъп до всички файлове за DroidDeck и се върнете.</string> <string name="fm_list_view">Изглед като списък</string> <string name="fm_grid_view">Изглед като мрежа</string> <string name="fm_search">Търсене</string> @@ -1688,6 +1777,89 @@ <string name="second_mode_keyboard_trackpad">Клавиатура + тракпад</string> <string name="second_mode_terminal">Терминал</string> <string name="second_mode_deck_controls">Захвати + тракпади на Deck</string> + <string name="second_mode_dashboard">Табло</string> + <string name="bottom_dashboard_empty">Все още няма нищо за показване.</string> + <string name="bottom_page_downloads">Изтегляния</string> + <string name="bottom_downloads_none">Няма активни изтегляния.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Изтегляне на кеша на шейдърите</string> + <string name="bottom_downloads_paused">На пауза</string> + <string name="bottom_downloads_queued">Изчаква стартиране</string> + <string name="bottom_page_notifications">Известия</string> + <string name="bottom_notifications_listener">Долен екран на DroidDeck</string> + <string name="bottom_notifications_why">Показвайте тук съобщения и други известия, докато играете. Те остават само на този екран и не се запазват. Android пита веднъж: страницата за достъп до известията се отваря на този екран; включете DroidDeck там и тази страница ще се върне сама.</string> + <string name="bottom_notifications_allow">Разрешаване на достъпа до известията</string> + <string name="bottom_notifications_none">Няма известия.</string> + <string name="bottom_notifications_count">Известия: %1$d</string> + <string name="bottom_notifications_clear">Изчисти</string> + <string name="bottom_page_screenshots">Екранни снимки</string> + <string name="stats_fps_needs_hud">За FPS трябва HUD да е включен</string> + <string name="stats_speed">Скорост</string> + <string name="stats_pedals">Педали</string> + <string name="stats_gforce">G-сила</string> + <string name="stats_timing">Времена</string> + <string name="stats_best_lap">Най-добра обиколка</string> + <string name="stats_tires">Гуми °C</string> + <string name="stats_trace">Газ и спирачка, последните 10 s</string> + <string name="stats_speed_chart">Скорост, %1$s</string> + <string name="stats_gear">Предавка</string> + <string name="stats_steam_client_arm">Steam клиент ARM</string> + <string name="stats_steam_client_x86">Steam клиент x86</string> + <string name="stats_throttle">Газ</string> + <string name="stats_brake">Спирачка</string> + <string name="stats_lights">Табло</string> + <string name="stats_lamp_shift">Смяна на предавка</string> + <string name="stats_lamp_handbrake">Ръчна спирачка</string> + <string name="stats_lamp_pit">Ограничител за бокса</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Турбо %1$s bar</string> + <string name="stats_engine_temp">Двигател %1$s °C</string> + <string name="stats_oil_temp">Масло %1$s °C</string> + <string name="stats_power">Разпределител на енергия</string> + <string name="stats_fuel_t">Гориво, t</string> + <string name="stats_fuel_main">Основно %1$s t</string> + <string name="stats_fuel_reserve">Резерв %1$s t</string> + <string name="bottom_telemetry_send_title">Изпращане на данни за таблото</string> + <string name="bottom_telemetry_send_auto">Автоматично</string> + <string name="bottom_telemetry_send_auto_hint">Включва го за всяка игра от списъка тук, включително игри, открити по-късно. Игрите, които изключите, остават изключени.</string> + <string name="bottom_telemetry_send_note">Това променя собствената настройка на играта за извеждане на данни. Влиза в сила при следващото стартиране на играта; изключването връща старата настройка.</string> + <string name="bottom_telemetry_send_close">Затворете %1$s, за да промените това.</string> + <string name="bottom_telemetry_send_failed">Настройките на %1$s не можаха да бъдат променени.</string> + <string name="bottom_telemetry_send_menu">%1$s: включете %2$s в настройките на играта с IP 127.0.0.1 и порт %3$d.</string> + <string name="bottom_shots_where">Запазват се в Pictures/DroidDeck. Екранните снимки от Steam също се показват тук.</string> + <string name="bottom_shots_take">Направи екранна снимка</string> + <string name="bottom_shots_saved">Екранната снимка е запазена.</string> + <string name="bottom_shots_failed">Не можа да се направи екранна снимка.</string> + <string name="bottom_shots_none">Все още няма екранни снимки.</string> + <string name="bottom_page_chat">Чат и глас</string> + <string name="bottom_chat_why">Четете и отговаряйте на чата в Steam тук, докато играта продължава на основния екран. Използва се акаунтът, с който сте влезли в Steam.</string> + <string name="bottom_chat_not_signed_in">Steam все още няма уеб вход за споделяне, затова влезте тук веднъж.</string> + <string name="bottom_chat_stopped">Android затвори страницата на чата, докато DroidDeck беше на заден фон. Тя ще се отвори отново, когато се върнете в DroidDeck.</string> + <string name="bottom_chat_open">Отвори Steam Chat</string> + <string name="bottom_chat_close">Затвори чата</string> + <string name="bottom_chat_mic_on">Микрофонът е включен</string> + <string name="bottom_chat_mic_off">Микрофонът е изключен</string> + <string name="bottom_chat_mic_unavailable">Микрофонът е изключен за тази игра. За да говорите, включете „Микрофон“ в настройките на Steam в DroidDeck (Звук) и стартирайте играта отново.</string> + <string name="bottom_chat_volume">Сила на звука %1$d%%</string> + <string name="bottom_page_telemetry">Статистика в играта</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Батерия</string> + <string name="bottom_telemetry_lap">Обиколка</string> + <string name="bottom_telemetry_position">Позиция</string> + <string name="bottom_telemetry_this_lap">Тази обиколка</string> + <string name="bottom_telemetry_last_lap">Последна обиколка</string> + <string name="bottom_telemetry_fuel">Гориво</string> + <string name="bottom_telemetry_cargo">Товар</string> + <string name="bottom_telemetry_pips">Енергия SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Правен статус</string> + <string name="bottom_telemetry_balance">Баланс</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Порт %1$d получава данни (%2$d пакета по %3$d байта), но във формат, който тази страница все още не може да чете.</string> + <string name="bottom_telemetry_port_busy">Друга програма вече използва порт %1$s, затова тази игра не може да се показва тук.</string> <string name="rtinst_removing">Премахване на средата на Linux</string> <plurals name="rtinst_removing_entries"> @@ -1718,6 +1890,7 @@ <string name="flatpakmgr_not_ready">Настрой Flatpak първо</string> <string name="flatpakmgr_starting">Стартиране</string> <string name="flatpakmgr_exit_status">Flatpak приключи със код %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s е създадено за %2$s, което DroidDeck не може да изпълнява. Приложенията Flatpak тук трябва да са за ARM64 или x86_64.</string> <string name="flatpakmgr_installing">Инсталиране на %1$s</string> <string name="flatpakmgr_updating">Актуализиране на %1$s</string> <string name="flatpakmgr_removing">Премахване на %1$s</string> @@ -1811,6 +1984,7 @@ <string name="adbpair_applying">Прилагане на настройката…</string> <string name="adbpair_command_failed">Командата за безжично отстраняване на грешки се провали</string> <string name="adbpair_channel_name">Настройка на безжично отстраняване на грешки</string> + <string name="adbpair_progress_channel_name">Напредък на настройката на безжичното отстраняване на грешки</string> <string name="adbpair_channel_description">Пита за кода за чифтосване за безжично отстраняване на грешки, докато Настройки е отворено</string> <string name="adbpair_title_pair">Чифтосване на безжично отстраняване на грешки</string> <string name="adbpair_waiting_text">Включи безжичното отстраняване на грешки, после докосни „Чифтосване на устройство с код за чифтосване“.</string> @@ -1919,6 +2093,7 @@ <string name="gpuinfo_not_adreno">Не е GPU Adreno</string> <string name="gpuinfo_supported">Поддържан</string> <string name="gpuinfo_experimental">Експериментален: драйверите му са тестови версии</string> + <string name="gpuinfo_a850_experimental">Експериментална поддръжка на Adreno 850: изисква съвместими експериментални драйвери за дисплея и игрите; не е проверена на това устройство</string> <string name="gpuinfo_below_tested">Под тестваните устройства (Adreno 725 и по-нови): може да не работи</string> <string name="gpuinfo_unsupported">Не се поддържа: DroidDeck изисква GPU Adreno (Snapdragon)</string> @@ -2015,6 +2190,7 @@ <string name="display_look_filter">%1$s Задава мащабиране на %2$s.</string> <string name="display_match_screen">Напасване на екрана (%1$d×%2$d)</string> <string name="display_follow_screen">Следване на екрана (преоразмерява при сгъване или разгъване)</string> + <string name="display_follow_screen_scaled">Мащабирано %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Покажи данните за устройството</string> <string name="device_info_hide">Скрий данните за устройството</string> @@ -2121,6 +2297,13 @@ <string name="stores_resume">Продължи</string> <string name="stores_refresh">Обнови</string> <string name="stores_sort">Сортиране</string> + <string name="setup_rail_labels">Етикети в страничната лента</string> + <string name="setup_rail_labels_hint">Показване на имена под иконите в страничната лента. Изключете за по-тясна странична лента.</string> + <string name="library_display">Изглед</string> + <string name="library_display_larger">По-големи карти</string> + <string name="library_display_smaller">По-малки карти</string> + <string name="library_display_title">Показване на заглавието</string> + <string name="library_display_size">Показване на размера</string> <string name="stores_sort_last_played">Играни наскоро</string> <string name="stores_sort_recently_installed">Инсталирани наскоро</string> <string name="stores_sort_title_asc">Заглавие А–Я</string> @@ -2247,6 +2430,9 @@ <string name="stores_download_manager">Диспечер на изтеглянията</string> <string name="stores_parallel">Изтегляния едновременно</string> <string name="stores_install_where">Инсталирай в</string> + <string name="stores_install_language">Език на играта</string> + <string name="stores_install_language_hint">GOG и Epic инсталират на този език. „Системен“ следва езика на приложението.</string> + <string name="stores_install_language_system">Системен</string> <string name="stores_install_title">Инсталация на %1$s:</string> <string name="stores_target_internal">Вътрешна памет</string> <string name="stores_target_free">%1$s свободни</string> @@ -2285,6 +2471,9 @@ <string name="edit_target">Цел</string> <string name="edit_start_in">Старт в</string> <string name="edit_launch_options">Настройки за стартиране</string> + <string name="edit_launch_options_steam_hint">Общи са със „Свойства“ в Steam: промяна на едното място се вижда и на двете.</string> + <string name="edit_launch_options_not_saved">Настройките за стартиране не можаха да бъдат запазени в Steam. Опитайте отново.</string> + <string name="edit_launch_options_desktop">Steam може да е отворен в сесията на работния плот. Променете настройките за стартиране в неговите „Свойства“ или първо затворете сесията.</string> <string name="edit_artwork">Визия</string> <string name="edit_other_exe">Друг exe…</string> <string name="edit_remove">Премахни</string> @@ -2412,6 +2601,7 @@ <string name="setup_download_source_custom">Собствен префикс</string> <string name="setup_download_mirror">Сайт</string> <string name="setup_download_prefix">Префикс</string> + <string name="setup_download_proxy">HTTP прокси</string> <string name="flathub_eyebrow">ПРИЛОЖЕНИЯ ЗА LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Приложения за десктоп на Linux, отваряни от Desktop.</string> @@ -2552,6 +2742,22 @@ <string name="glasses_tracking_flat_hint">„Автоматично“ държи тази 2D игра неподвижна в изгледа. Изберете „Виртуален екран“ в „Екран“, за да използвате проследяване на главата.</string> <string name="glasses_tracking_sbs_hint">Проследяването на главата се отнася за виртуален екран или за работеща игра в SteamVR.</string> <string name="glasses_hardware">Устройство</string> + <string name="vr_controllers_tab">Контролери</string> + <string name="vr_controllers_group">Контролери за SteamVR</string> + <string name="vr_controllers_emulate">Геймпад във VR</string> + <string name="vr_controllers_emulate_hint">Двете VR ръце, като които играе контролерът ви. Промените се прилагат веднага, дори докато SteamVR работи. Joy-Con и проследяваните ръце пак поемат своята страна.</string> + <string name="vr_controllers_off">Обикновен геймпад</string> + <string name="vr_controllers_index">Контролери Valve Index</string> + <string name="vr_controllers_touch">Контролери Meta Quest 3</string> + <string name="vr_controllers_vive">Контролери HTC Vive</string> + <string name="vr_controllers_sticks">Стиковете първоначално</string> + <string name="vr_controllers_sticks_hint">Натиснете двата стика едновременно във VR, за да превключите.</string> + <string name="vr_controllers_sticks_game">Ви придвижват в играта</string> + <string name="vr_controllers_sticks_hands">Придвижват ръцете</string> + <string name="vr_controllers_buttons">Бутони</string> + <string name="vr_controllers_buttons_stick">Тригерите са тригери, бъмперите хващат, A/B и X/Y са предните бутони на всяка ръка, натискането на стиковете натиска джойстиците, Guide отваря менюто на SteamVR. Кръстачката нагоре и надолу приближава или отдалечава ръцете.</string> + <string name="vr_controllers_buttons_vive">Стиковете са тракпадове; A/X или натискане на стика ги натиска. Тригерите са тригери, бъмперите хващат, Start и Select са меню, Guide отваря менюто на SteamVR.</string> + <string name="vr_controllers_buttons_off">Без VR ръце. Игрите, които поддържат геймпад, и менюто на SteamVR получават контролера ви както обикновено.</string> <string name="glasses_brightness">Яркост</string> <string name="glasses_volume">Сила на звука</string> <string name="glasses_sunblock">Затъмняване</string> @@ -2609,6 +2815,12 @@ <string name="hand_camera_placement">Разположение на камерата</string> <string name="hand_camera_placement_hint">Проверете дали камерата ви вижда, преди да играете.</string> <string name="hand_camera_check">Проверка</string> + <string name="tracking_pack_title">Изтегляне за проследяване на ръцете</string> + <string name="tracking_pack_hint">Проследяването на ръцете изисква еднократно изтегляне от %1$s.</string> + <string name="tracking_pack_download">Изтегляне</string> + <string name="tracking_pack_retry">Повторен опит</string> + <string name="tracking_pack_downloading">Изтегляне на проследяването на ръцете… %1$d%%</string> + <string name="tracking_pack_failed">Проследяването на ръцете не можа да бъде изтеглено. Проверете връзката си и опитайте пак.</string> <string name="hand_camera_check_title">Разположение на камерата</string> <string name="hand_camera_how_rear">Поставете устройството изправено на 1,5–2 метра разстояние, приблизително на нивото на гърдите, със задната камера, насочена към вас. След това застанете в кадър с протегнати ръце.</string> <string name="hand_camera_how_front">Поставете устройството изправено на 1,5–2 метра разстояние, приблизително на нивото на гърдите, с екрана, насочен към вас. След това застанете в кадър с протегнати ръце.</string> @@ -2680,6 +2892,21 @@ <string name="storage_safe_hint">Неизползвани среди, остатъци, стари логове</string> <string name="storage_clean_up">Почистване…</string> <string name="storage_session_running">Спри сесията, за да почистиш или изтриеш нещо. Размерите остават видими.</string> + <string name="storage_default_group">Място за инсталиране</string> + <string name="storage_default_title">Хранилище по подразбиране</string> + <string name="storage_default_hint">Новите инсталации от магазини отиват в избраното място. Съществуващите игри остават, където са. Библиотеките на Steam запазват собствената си настройка.</string> + <string name="storage_default_ask">Питане всеки път</string> + <string name="storage_default_ask_detail">Избор на място за всяка инсталация</string> + <string name="storage_default_internal">Вътрешна памет</string> + <string name="storage_default_external">Външна памет</string> + <string name="storage_default_external_detail">%1$s · %2$s свободни</string> + <string name="storage_default_external_missing">Не е свързано</string> + <string name="storage_default_folder">Папка · %1$s</string> + <string name="storage_default_folder_free">%1$s свободни</string> + <string name="storage_default_folder_missing">Не е свързано</string> + <string name="storage_default_choose_folder">Избор на папка…</string> + <string name="storage_default_choose_folder_detail">Използвайте която и да е папка на SD карта или USB устройство</string> + <string name="storage_default_note">Игрите отиват в папка Games в избраното място. Съществуващите игри не се преместват.</string> <string name="storage_where">Къде отива</string> <string name="storage_games">Игри от Steam</string> <string name="storage_game_data">Данни на игрите</string> @@ -2801,6 +3028,9 @@ <string name="storage_data_installed">Инсталирани игри</string> <string name="storage_data_parts">Префикс %1$s · шейдъри %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Изчисти шейдърите</string> + <string name="storage_reset_prefix">Нулиране на префикса</string> + <string name="storage_reset_prefix_title">Нулиране на префикса за %1$s?</string> + <string name="storage_reset_prefix_confirm">Изтрива префикса на Wine (%1$s) в %2$s и го създава отново при следващото стартиране. Записите, настройките и инсталираните в него допълнителни компоненти се губят; записите в Steam Cloud остават в акаунта ви.</string> <string name="storage_data_leftovers">Изтрити игри</string> <string name="storage_steam_app">Приложение Steam %1$d</string> <string name="storage_leftover_unsure_detail">Префиксът още съдържа файлове, може би локални записи</string> @@ -3102,6 +3332,117 @@ <string name="spatial_saved_views_hint">Запазените изгледи могат да бъдат преизчислени. Започнете ново калибриране за заснемане в текущата координатна система за проследяване.</string> <string name="spatial_model_checksum_error">Несъответствие на контролната сума на модела на ръката</string> <string name="spatial_opencv_load_error">OpenCV не можа да се зареди</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Синхронизиране със Syncthing</string> + <string name="sync_enable_hint">Базирана на Syncthing-Fork, това е реализация на Syncthing, която ви позволява да синхронизирате файлове във вътрешната файлова система на DroidDeck с други екземпляри на Syncthing. Това важи само за файлове, които съхранявате във вътрешната файлова система на DroidDeck.</string> + <string name="sync_missing">Тази компилация не включва Syncthing.</string> + <string name="sync_starting">Стартиране на Syncthing</string> + <string name="sync_status_starting">Стартиране</string> + <string name="sync_status_up_to_date">Актуално</string> + <string name="sync_status_syncing">Синхронизиране</string> + <string name="sync_status_paused">На пауза</string> + <string name="sync_status_pausing">Поставяне на пауза</string> + <string name="sync_status_resuming">Възобновяване</string> + <string name="sync_status_attention">Изисква внимание</string> + <string name="sync_status_failed">Syncthing спря</string> + <string name="sync_failed_retry">Опитай отново</string> + <string name="sync_paused_wifi">На пауза до връзка с Wi-Fi</string> + <string name="sync_paused_game">На пауза по време на играта</string> + <string name="sync_summary">Папки: %1$d · свързани устройства: %2$d от %3$d</string> + <string name="sync_left">Остават %1$s</string> + <string name="sync_open_web_ui">Отвори уеб интерфейса</string> + <string name="sync_pause">Пауза</string> + <string name="sync_resume">Продължи</string> + <string name="sync_running">Работи</string> + <string name="sync_running_hint">Изключете, за да спрете Syncthing напълно.</string> + <string name="sync_this_device">Това устройство</string> + <string name="sync_device_id">Идентификатор на устройството</string> + <string name="sync_show_qr">Покажи QR</string> + <string name="sync_advanced">Разширени</string> + <string name="sync_advanced_hint">Портове, кога да работи, нулиране</string> + <string name="sync_open">Отвори</string> + <string name="sync_waiting">Очаква ви</string> + <string name="sync_pending_device">%1$s иска да се свърже</string> + <string name="sync_pending_folder">%1$s иска да сподели „%2$s“</string> + <string name="sync_pending_folder_hint">Приемете, за да изберете къде да се запази в DroidDeck.</string> + <string name="sync_review">Преглед в уеб интерфейса</string> + <string name="sync_folders">Папки</string> + <string name="sync_no_folders">Все още няма папки.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Актуално</string> + <string name="sync_folder_syncing">Синхронизиране %1$d%%</string> + <string name="sync_folder_scanning">Сканиране</string> + <string name="sync_folder_paused">На пауза</string> + <string name="sync_folder_out_of_sync">Несинхронизирано</string> + <string name="sync_folder_errors">Файлове, които не можаха да се синхронизират: %1$d</string> + <string name="sync_folder_blocked">Блокирано</string> + <string name="sync_folder_blocked_hint">Тази папка е извън хранилището на DroidDeck, затова DroidDeck я постави на пауза. За да синхронизирате папки извън DroidDeck, използвайте приложението Syncthing-Fork.</string> + <string name="sync_remove_folder">Премахни от Syncthing</string> + <string name="sync_remove_folder_hint">Премахването не изтрива файлове.</string> + <string name="sync_devices">Устройства</string> + <string name="sync_no_devices">Все още няма устройства.</string> + <string name="sync_connected">Свързано</string> + <string name="sync_offline">Офлайн</string> + <string name="sync_last_seen">Последно видяно %1$s</string> + <string name="sync_device_id_title">Идентификатор на това устройство</string> + <string name="sync_device_id_hint">На другото си устройство добавете устройство в Syncthing и сканирайте този код или поставете идентификатора. След това го приемете тук в уеб интерфейса.</string> + <string name="sync_copy">Копирай</string> + <string name="sync_share">Сподели</string> + <string name="sync_done">Готово</string> + <string name="sync_off_title">Изключване на Syncthing?</string> + <string name="sync_off_body">Syncthing спира сега и остава спрян, докато не бъде включен отново. Синхронизираните файлове остават на мястото си.</string> + <string name="sync_off_forget">Изтрий и конфигурацията на Syncthing</string> + <string name="sync_off_forget_hint">Премахва идентификатора на това устройство, папките и устройствата. При повторно включване започва отначало.</string> + <string name="sync_turn_off">Изключи</string> + <string name="sync_ports">Портове</string> + <string name="sync_port_sync">Синхронизиране</string> + <string name="sync_port_discovery">Локално откриване</string> + <string name="sync_repick">Избор на нови портове</string> + <string name="sync_repick_hint">Проверява се отново при всяко стартиране.</string> + <string name="sync_repick_button">Избери отново</string> + <string name="sync_reset_group">Нулиране</string> + <string name="sync_api_key">API ключ</string> + <string name="sync_regenerate">Генерирай нов</string> + <string name="sync_reset">Нулиране на Syncthing</string> + <string name="sync_reset_hint">Нов идентификатор на устройството, папките и устройствата се премахват. Файловете в хранилището на DroidDeck се запазват.</string> + <string name="sync_reset_button">Нулирай</string> + <string name="sync_reset_confirm_title">Нулиране на Syncthing?</string> + <string name="sync_running_group">Работа</string> + <string name="sync_run">Изпълнение</string> + <string name="sync_run_open">Докато DroidDeck е отворен</string> + <string name="sync_run_background">На заден план</string> + <string name="sync_wifi_only">Само през Wi-Fi</string> + <string name="sync_pause_games">Пауза по време на игри</string> + <string name="sync_logs">Журнали</string> + <string name="sync_logs_hint">Изход на Syncthing за тази сесия</string> + <string name="sync_logs_share">Сподели</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Първо настройте средата на Linux.</string> + <string name="sync_accept">Приеми</string> + <string name="sync_accept_title">Запазване на „%1$s“ в</string> + <string name="sync_add_folder">Добави папка</string> + <string name="sync_add_folder_hint">Синхронизиране на папка в хранилището на DroidDeck</string> + <string name="sync_choose">Избери</string> + <string name="sync_add">Добави</string> + <string name="sync_add_failed">Папката не можа да бъде добавена.</string> + <string name="sync_share_with">Споделяне с</string> + <string name="sync_share_none">Все още няма устройства. Можете да споделите тази папка по-късно от уеб интерфейса.</string> + <string name="sync_use_folder">Използвай тази папка</string> + <string name="sync_new_folder">Нова папка</string> + <string name="sync_location_home">Домашна папка на контейнера</string> + <string name="sync_location_sync">Папка Sync</string> + <string name="sync_location_shared">Споделено хранилище на DroidDeck</string> + <string name="sync_location_card">DroidDeck на %1$s</string> + <string name="sync_location_app">Данни на приложението DroidDeck</string> + <string name="sync_web_path_locked">Новите папки се запазват в папката Sync на DroidDeck. За да синхронизирате друга папка на DroidDeck, използвайте „Добави папка“ в раздела Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Презареди</string> + <string name="sync_not_running">Syncthing не работи.</string> + <string name="session_end_steam_sigill">Steam спря с невалидна инструкция (SIGILL). Това може да е проблем със съвместимостта на CPU инструкциите или срив на клиента. Споделете дневниците с данни за устройството си.</string> + <string name="session_end_steam_try_x64">Можете да опитате Настройки на Steam → Клиент на Steam → x86-64 (експериментално). Изисква допълнително изтегляне и може да работи по-бавно.</string> + <string name="session_end_vulkan_device">Графичният драйвер на Linux не намери използваемо устройство Vulkan. Проверете дали избраният GPU драйвер за Linux поддържа този GPU.</string> + <string name="session_end_gpu_unsupported">Тази сесия не може да започне, защото този GPU няма съвместим Vulkan драйвер за Linux в текущата настройка. Драйверите Adreno Turnip не могат да добавят поддръжка за GPU на MediaTek/Mali.</string> <string name="setup_group_memory">Памет</string> <string name="setup_clear_cached">Затваряне на кешираните приложения преди сесия</string> <string name="setup_clear_cached_hint">При стартиране на сесия DroidDeck затваря приложенията, които Android държи във фонов режим, за да има играта повече памет. Безжичното отстраняване на грешки трябва да е включено.</string> @@ -3125,6 +3466,12 @@ <string name="epic_client_open">Отвори</string> <string name="epic_client_install">Инсталиране</string> <string name="game_tab_about">За приложението</string> + <string name="game_resources_browser">Отваря се в браузъра ви</string> + <string name="game_resource_guides">Ръководства</string> + <string name="game_resource_protondb_detail">Доклади за съвместимост с Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">За игри със записи в акаунта ви в Steam</string> + <string name="game_resource_search">Търсене в мрежата</string> <string name="game_tab_install">Инсталиране</string> <string name="game_install_location">Местоположение</string> <string name="game_install_folder">Папка</string> @@ -3141,6 +3488,11 @@ <string name="stores_eyebrow_pass">налична с %1$s</string> <string name="stores_owned_in_library">Притежавани игри в Библиотека</string> <string name="library_filter_added">Добавени</string> + <string name="library_filter">Филтър</string> + <string name="library_filter_installed">Само инсталирани</string> + <string name="library_filter_all_owned">Всички притежавани игри</string> + <string name="library_no_installed_matches">Няма инсталирани игри, отговарящи на тези филтри.</string> + <string name="library_browse_owned">Разглеждане на притежаваните игри</string> <string name="game_tab_launch">Стартиране</string> <string name="game_tab_saves_cloud">Записи и облак</string> <string name="game_launch_shortcut">Пряк път в Steam</string> @@ -3158,6 +3510,40 @@ <string name="stores_itch_update_replaced">Разработчикът замени тази версия с %1$s. Да се актуализира ли до нея?</string> <string name="xbox_filter_cloud">Облак</string> <string name="stores_xbox_cloud_settings">Настройки на облака</string> + <string name="integration_title">Интеграция със Steam</string> + <string name="integration_count">%1$d от %2$d включени</string> + <string name="integration_set_up">Настройване</string> + <string name="integration_location">Местоположение</string> + <string name="integration_app_info">Информация за приложението</string> + <string name="integration_wifi">Имена на Wi-Fi</string> + <string name="integration_brightness">Яркост</string> + <string name="integration_home">DroidDeck като начален екран</string> + <string name="integration_shortcuts">Системни клавиши</string> + <string name="integration_wifi_hint">Показване на мрежите в Steam · изисква достъп до местоположението, никога не се проследява</string> + <string name="integration_wifi_on">Мрежите се показват в Steam</string> + <string name="integration_wifi_location_off">Местоположението е изключено</string> + <string name="integration_wifi_denied">Местоположението е отказано · разрешете го в „Информация за приложението“</string> + <string name="integration_brightness_hint">Плъзгачът на Steam задава яркостта на екрана</string> + <string name="integration_home_hint">Бутонът за начален екран отваря менюто на Steam в сесия</string> + <string name="integration_shortcuts_hint">Alt+Tab, клавишът Win и бутонът Начало остават в сесията</string> + <string name="integration_shortcuts_maybe_restricted">Неактивно в Android? Информация за приложението → ⋮ → Разрешаване на ограничените настройки</string> + <string name="integration_shortcuts_restricted">Блокирано от Android · Информация за приложението → ⋮ → Разрешаване на ограничените настройки</string> + <string name="integration_shortcuts_service">Системни клавиши на DroidDeck</string> + <string name="integration_shortcuts_service_description">Задържа Alt+Tab, клавиша Win и бутона Начало в активната сесия на DroidDeck вместо в Android.</string> + <string name="integration_brightness_needed">Включете „Яркост“ в Настройка → Интеграция със Steam</string> + <string name="setup_gpu_bridge_off">Mali мост: изкл.</string> + <string name="setup_gpu_bridge_on">Mali мост: вкл.</string> + <string name="setup_gpu_bridge_detail">%1$s не е Adreno. Експерименталният Vulkan мост е включен: сесията рисува през собствения драйвер на телефона. Очаквайте грешки; изпратете логовете на сесията.</string> + <string name="setup_bridge_safe">Безопасен режим</string> + <string name="setup_bridge_safe_on">Безопасен режим: вкл.</string> + <string name="setup_bridge_safe_off">Безопасен режим: изкл.</string> + <string name="setup_bridge_safe_on_detail">Най-съвместим. Препоръчва се за ново устройство.</string> + <string name="setup_bridge_safe_off_detail">По-бързо там, където този GPU е минал проверките си.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: автоматично</string> + <string name="setup_bridge_dxvk_proton">DXVK: на Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Използва по-стар DXVK, когато Vulkan на този GPU е твърде стар за този на Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Всеки Proton запазва своя DXVK, дори когато Vulkan на този GPU може да е твърде стар за него.</string> <string name="apps_search_hint">Търсене на приложения</string> <string name="apps_no_match">Няма приложения, отговарящи на „%1$s“.</string> <string name="apps_add_widget">Добавяне на приспособление</string> @@ -3206,6 +3592,8 @@ <string name="desktop_restore_done_body">Добавените от вас приложения са инсталирани отново.</string> <string name="desktop_restore_failed_title">Част от софтуера не можа да бъде възстановена</string> <string name="desktop_restore_failed_body">Вижте ~/.cache/droiddeck/apt-restore.log, след това опитайте sudo apt install в Konsole.</string> + <string name="gog_full_files">Оптимизациите за платформата не са налични. Изтеглянето включва пълни файлове за замяна.</string> + <string name="gog_recover">Проверка на резултата от корекцията</string> <string name="slow_usb_title">Бавна USB връзка</string> <string name="slow_usb_cable">%1$s е свързан чрез %2$s (%3$s Mbps, около %4$d MB/s), затова игрите на него ще се зареждат бавно. Използвайте USB 3 кабел за 5 Gbps или повече, обърнете USB-C щекера или използвайте по-бързо устройство.</string> <string name="slow_usb_port">%1$s е свързан чрез %2$s (%3$s Mbps, около %4$d MB/s). USB портът на това устройство не поддържа по-висока скорост, затова игрите ще се зареждат бавно. Вътрешната памет или microSD карта може да са по-бързи.</string> @@ -3216,4 +3604,52 @@ <string name="steam_import_names_more">%1$s и още %2$d</string> <string name="steam_import_now">Рестартиране сега</string> <string name="steam_import_later">По-късно</string> + <string name="gog_maintenance">Управление на инсталацията от GOG</string> + <string name="gog_check">Проверка за актуализации</string> + <string name="gog_repair">Проверка/поправка</string> + <string name="gog_patches">Офлайн корекции</string> + <string name="gog_refresh">Изтегляне на пълния офлайн инсталатор</string> + <string name="gog_update">Актуализиране до %1$s</string> + <string name="gog_resume">Продължаване на поддръжката от GOG</string> + <string name="gog_open_patch">Отваряне на инсталатора на корекцията</string> + <string name="gog_patch_in_session">Завършете или откажете инсталатора на корекцията в сесията на Linux.</string> + <string name="gog_patch_requirements">Изберете корекция за инсталираната версия и език. Поддържаните изходни версии може да не са посочени.</string> + <string name="gog_no_patches">GOG няма самостоятелни корекции за Windows за тази игра.</string> + <string name="gog_managed_files">Променените файлове на играта може да бъдат заменени.</string> + <string name="gog_patch_installer_note">Инсталаторът се отваря в сесията ви на Linux.</string> + <string name="gog_download_label">Изтегляне</string> + <string name="gog_space_label">Допълнително място</string> + <string name="gog_space_estimate_label">Приблизително място</string> + <string name="gog_repair_action">Поправка на файловете</string> + <string name="gog_refresh_action">Обновяване на инсталацията</string> + <string name="gog_select_patch">Избор</string> + <string name="stores_gamejolt_not_owned">Не е в библиотеката ви в Game Jolt</string> + <string name="stores_gamejolt_no_build">Няма изтегляне за Windows за тази игра</string> + <string name="stores_gamejolt_no_exe">В изтеглянето не е намерена игра за Windows</string> + <string name="stores_gamejolt_no_game">Играта не беше намерена в Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Игрите от Game Jolt не можаха да се заредят</string> + <string name="stores_gamejolt_download_failed">Game Jolt отговори HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Изтеглянията от Game Jolt не можаха да се заредят</string> + <string name="stores_gamejolt_build_open">Отваряне в Game Jolt</string> + <string name="stores_gamejolt_archive">Архивите %1$s не се поддържат</string> + <string name="stores_gamejolt_extract_failed">Изтеглянето не можа да бъде разархивирано (код %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt не може да бъде достигнат</string> + <string name="stores_gamejolt_download_no_link">Game Jolt не даде връзка за изтегляне</string> + <string name="stores_gamejolt_section_featured">Препоръчани</string> + <string name="stores_gamejolt_section_hot">Популярни</string> + <string name="stores_gamejolt_section_best">Най-добри</string> + <string name="stores_gamejolt_section_new">Нови</string> + <string name="stores_gamejolt_price_under_30">$30 или по-малко</string> + <string name="stores_gamejolt_os_other">Други</string> + <string name="stores_gamejolt_maturity_everyone">За всички възрасти</string> + <string name="stores_gamejolt_maturity_teen">Тийнейджъри</string> + <string name="stores_gamejolt_maturity_adult">За възрастни</string> + <string name="stores_gamejolt_status_complete">Завършени</string> + <string name="stores_gamejolt_status_early">Ранен достъп</string> + <string name="stores_gamejolt_partners">Игри на партньори</string> + <string name="stores_gamejolt_filter_browser">Браузър</string> + <string name="stores_gamejolt_filter_maturity">Зрялост</string> + <string name="stores_gamejolt_filter_status">Статус</string> + <string name="stores_gamejolt_filter_partners">Партньори</string> + <string name="stores_gamejolt_followed">Следвани игри</string> </resources> diff --git a/app/src/main/res/values-cs/gestures.xml b/app/src/main/res/values-cs/gestures.xml index 3b1b30f3a1..6252bf73e5 100644 --- a/app/src/main/res/values-cs/gestures.xml +++ b/app/src/main/res/values-cs/gestures.xml @@ -71,7 +71,7 @@ <string name="gesture_key_backspace">Backspace</string> <string name="gesture_key_enter">Enter</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">Mezerník</string> <string name="gesture_key_delete">Delete</string> <string name="gesture_key_insert">Insert</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 17f4b320c8..954f6e48e9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Možnosti VKD3D pro D3D12. nodxr vypíná ray tracing; použijte jen pro hru, která to vyžaduje.</string> <string name="game_env_proton_log">Nastavte na 1 pro diagnostický log Protonu. Protokolování může snížit výkon a zabírat úložiště.</string> <string name="game_env_wined3d">Nastavte na 1 pro použití WineD3D založeného na OpenGL místo DXVK, pro testování kompatibility D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderer pro DirectDraw, Direct3D 1-7 a hry spuštěné s WineD3D. Vulkan obchází cestu OpenGL přes Zink a je u starých her DirectDraw a Direct3D 7 na Adreno mnohem rychlejší.</string> + <string name="game_env_dxvk_d3d8">Nastavte na 1 pro běh Direct3D 8 přes DXVK místo WineD3D. Rychlejší v testu Direct3D 8 v AIO Graphics Test na Adreno.</string> <string name="game_env_no_ntsync">Nastavte na 1, aby tato hra nepoužívala ntsync (droiddeck-ntsync nebo ovladač jádra); použije droiddeck-esync, pokud existuje balíček, jinak droiddeck-fsync.</string> <string name="game_env_no_esync">Nastavte na 1 pro vypnutí droiddeck-esync u této hry; místo něj použije droiddeck-fsync, nebo droiddeck-ntsync, pokud je vypnutý i fsync.</string> <string name="game_env_no_fsync">Nastavte na 1, aby tato hra nepoužívala droiddeck-fsync; použije droiddeck-esync, pokud existuje balíček, jinak droiddeck-ntsync.</string> <string name="game_env_fsync_first">Nastavte na 1 pro spuštění této hry na droiddeck-fsync, nebo na 0, aby měl droiddeck-esync přednost, pokud balíček odpovídá jejímu Protonu.</string> <string name="game_env_xalia">Nastavte na 0 pro vypnutí pomocníka Protonu pro navigaci gamepadem u této hry.</string> + <string name="game_env_anticheat_offline">Ve výchozím stavu zapnuto. Spustí hru s Easy Anti-Cheat bez anti-cheatu, pokud hra podporuje hraní offline. Vypněte pro běžné spuštění přes Easy Anti-Cheat. Online režimy vyžadující Easy Anti-Cheat zůstanou nedostupné.</string> <string name="game_env_hud">Překryvná vrstva DXVK pro D3D9–11. fps zobrazuje snímkovou frekvenci; bez nastavení se skryje.</string> <string name="game_env_dxvk_config">Nastavení DXVK oddělená středníky. Novější verze používají pro omezení snímků dxvk.maxFrameRate; pro běžné hraní dejte přednost omezovači snímků relace.</string> + <string name="game_env_cores">Jádra CPU pro tuto hru, například 0-4 nebo 0,2,4, místo jader pro hru z relace. Méně jader znamená nižší teplotu.</string> <string name="game_env_vkd3d_limit">Omezení snímkové frekvence D3D12. 0 omezení vypíná.</string> <string name="game_env_glthread">Vícevláknové OpenGL Mesa. true může pomoci hrám OpenGL omezeným CPU; vyzkoušejte u každé hry zvlášť.</string> <string name="sync_backend_title">Synchronizace Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX spouští programy pro x86 Linux na tomto zařízení ARM64. Automaticky ho použije, když je program sestaven pro x86.</string> <string name="app_fex_x86">%1$s přes FEX</string> <string name="app_fex_not_ready">Tento program je sestaven pro PC %1$s a běží přes FEX, který ještě není nastaven. Jednou spusťte přihlášený Steam: DroidDeck tím stáhne FEX a Steam Linux Runtime, který potřebuje, a pak se tento program otevře.</string> + <string name="session_proot_missing">Proot od DroidDeck se nepodařilo stáhnout. Zkontrolujte připojení a zkuste to znovu. Relace nebyla spuštěna, protože záložní proot je na hraní příliš pomalý.</string> + <string name="session_directaudio_missing">DirectAudio se nepodařilo stáhnout, takže zvuk her v této relaci používá pomalejší cestu.</string> <string name="session_end_program">Tento program</string> <string name="session_end_steam_download">Klienta Steam se nepodařilo stáhnout. Vaše síť nebo VPN možná blokuje servery Steamu; zkontrolujte připojení a zkuste to znovu.</string> <string name="session_end_steam_setup">Klienta Steam se nepodařilo nastavit. Zkontrolujte připojení a volné místo a zkuste to znovu.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Ovladač Xbox 360</string> <string name="mode_controller_note">Deck: tlačítko Quick Access a gyroskop. Steam Controller: totéž, navíc snímání úchopu na zadních tlačítkách. DualShock 4 a DualSense: gyroskop, trackpad slouží jako touchpad. Xbox 360: Quick Access otevřete kombinací Guide+A.</string> <string name="mode_back">Zpět</string> + <string name="back_hold">Podržení Zpět pro zkratky Steam</string> + <string name="back_hold_hint">Podržení Zpět otevře Rychlý přístup nebo vytváří kombinace Steam s dalšími tlačítky. Vypnutím se podržení Zpět ignoruje; klepnutí a dvojité klepnutí fungují dál.</string> + <string name="back_native_qam_hint">Podržte Zpět 700 ms, nebo podržte Zpět a stiskněte jiné tlačítko pro zkratky Steamu.</string> + <string name="back_double_tap_window">Interval dvojitého klepnutí</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Povolit ovládání jasu</string> + <string name="brightness_permission_text">Nastavte ovládání jasu v DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Relace</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Oddálí pozastavení na pozadí, pokud Steam aktivně stahuje.</string> <string name="mode_suspend_note">Automaticky pozastaví na pozadí a obnoví při zobrazení. Manuálně čeká na Obnovit. Nikdy běh nezastavuje.</string> <string name="mode_startup">Spouštění</string> - <string name="mode_steam_startup">Spustit Steam s DroidDeck</string> - <string name="mode_steam_startup_hint">Otevře relaci Steamu při spuštění DroidDeck.</string> + <string name="mode_startup_session">Otevřít při spuštění</string> + <string name="mode_startup_session_hint">Spustí tuto relaci při spuštění DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Hledání vydání…</string> <string name="mode_decky_ready">Připraveno k instalaci %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Aktuální · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Nainstalovat nejnovější</string> + <string name="decky_channel">Kanál aktualizací</string> + <string name="decky_channel_hint">Která vydání Decky Loader instalovat. Vlastní aktualizátor Decky používá stejný kanál.</string> + <string name="decky_channel_stable">Stabilní</string> + <string name="decky_channel_prerelease">Předběžné vydání</string> + <string name="decky_channel_testing">Testovací</string> + <string name="decky_channel_failed">Kanál aktualizací Decky se nepodařilo uložit</string> <string name="mode_decky_on">Spouští se se Steamem. Když je zapnuto, jiné aplikace na tomto zařízení mohou mít možnost ovládat Steam.</string> <string name="mode_decky_off">Vypnuto. Port pro vzdálené ladění Steamu zůstává zavřený.</string> <string name="mode_decky_remove_title">Odinstalovat Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Klient</string> <string name="mode_mangoapp">Výkonový overlay</string> <string name="mode_mangoapp_hint">Vypněte, pokud hry v režimu Deck padají nebo zčernají. Použije se od příští relace.</string> + <string name="mode_return_after_game">Po hře se vrátit do DroidDeck</string> + <string name="mode_return_after_game_hint">Když se zavře hra spuštěná z DroidDeck nebo jiného launcheru, Steam se čistě ukončí (nejprve dokončí cloudová uložení) a vrátíte se tam. Vypnuto: zůstanete ve Steamu.</string> + <string name="mode_shader_precache">Předběžné ukládání shaderů</string> + <string name="mode_shader_precache_hint">Steam stahuje předem sestavené shadery pro vaše hry a zpracovává je na pozadí, takže hry méně trhají. Vypnutí šetří data, úložiště a baterii; hry pak shadery sestavují během hraní. Stejné nastavení jako Stahování > Předběžné ukládání shaderů ve Steamu. Použije se od příští relace.</string> <string name="mode_steam_repair">Opravit klienta Steam</string> <string name="mode_steam_repair_hint">Při dalším spuštění znovu stáhne klienta Steam. Použijte, pokud Steam zůstává na načítací obrazovce. Hry, přihlášení a nastavení zůstanou zachovány.</string> <string name="mode_steam_repair_queued">Klient Steam se znovu stáhne při dalším spuštění Steamu.</string> @@ -392,6 +415,8 @@ <string name="mode_directaudio_hint">Obchází PulseAudio pro nižší latenci.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Pro hlasový chat.</string> + <string name="drawer_mic_hint">Zapnout nebo vypnout snímání mikrofonu pro tuto relaci.</string> + <string name="drawer_mic_failed">Mikrofon se nepodařilo změnit. Zkuste to znovu.</string> <string name="mode_network">Síť</string> <string name="mode_wifi_discovery">Vyhledávání Wi-Fi</string> <string name="mode_wifi_discovery_hint">Zobrazí názvy Wi-Fi a okolních sítí ve Steamu.</string> @@ -555,6 +580,16 @@ <string name="perf_gsrealtime">gamescope: fronta GPU v reálném čase</string> <string name="perf_gsrealtime_hint">Dává prioritu práci GPU kompozitoru. Může vyhladit tempo snímků na úkor her.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Paměť</string> + <string name="perf_cap_off">Vypnuto</string> + <string name="perf_cap_auto">Výchozí ovladače</string> + <string name="perf_zram_client">Komprimovat Steam během hry</string> + <string name="perf_zram_client_hint">20 s po spuštění hry se klient Steam zkomprimuje do zRAM, aby hře zbylo více paměti, a po zavření hry se načte zpět. Vypněte, pokud se relace krátce po spuštění her zavírá. Limit RAM výše stále komprimuje Steam, když ho relace překročí.</string> + <string name="perf_ram_cap">Limit RAM</string> + <string name="perf_ram_cap_hint">Platí, když běží klient Steam, v režimu Steam nebo z Plochy. Když relace použije víc, zkomprimuje se do zRAM Steam a poté další podporované procesy relace. Měkký limit: nic se nezavře, ale hry mohou trhat, než se stránky načtou zpět.</string> + <string name="perf_ram_cap_unavailable">Vyžaduje swap zRAM, který toto zařízení nemá.</string> + <string name="perf_vram_cap">Limit VRAM</string> + <string name="perf_vram_cap_hint">Video paměť, kterou DXVK hlásí hrám Direct3D, aby počítaly s menším rozpočtem na textury. Vlastní nastavení DXVK hry mají přednost. Použije se od příští relace.</string> <string name="perf_gpuclock">Udržet GPU na nejvyšších taktech</string> <string name="perf_gpuclock_hint">Jen Adreno. Méně zadrhávání, více spotřeby baterie a tepla.</string> <string name="perf_fixes">Opravy relace</string> @@ -573,6 +608,8 @@ <string name="perf_fastpath">Rychlá cesta proot</string> <string name="perf_fastpath_needs_seccomp">Vyžaduje filtr seccomp od proot.</string> <string name="perf_fastpath_hint">Rychlejší vyhledávání souborů a méně zadrhávání. Vypněte, pokud program nemůže najít své soubory.</string> + <string name="perf_cursor_composite">Kreslit kurzor v gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope kreslí ukazatel sám, místo aby ho předal Androidu. Zapněte pro kurzor ovládaný ovladačem. Vypnuto je na telefonu rychlejší. Použije se od příští relace.</string> <string name="perf_identity">Identita relace</string> <string name="perf_hostname">Název hostitele</string> <string name="perf_hostname_hint">Název, který Steam vidí pro toto zařízení. Prázdné obnoví %1$s.</string> @@ -587,6 +624,8 @@ <string name="driver_delete_plain">Jeho soubory se odstraní z aplikace.</string> <string name="driver_delete_in_use">Jeho soubory se odstraní. Používá se, takže převezme výchozí.</string> <string name="drawer_page_display">Displej</string> + <string name="drawer_frame_limit">Limit snímků</string> + <string name="drawer_frame_limit_note">Omezí tuto hru. Displej se přepne na obnovovací frekvenci, kterou limit beze zbytku dělí, pokud nějakou má; jiné limity mohou působit nerovnoměrně. Hry ze Steamu používají Limit snímků Steamu v nabídce Rychlý přístup.</string> <string name="drawer_page_effects">Efekty</string> <string name="drawer_page_controls">Ovládání</string> <string name="drawer_page_components">Komponenty</string> @@ -618,8 +657,11 @@ <string name="hud_size_pill">Pilulka</string> <string name="hud_size_minimal">Minimální</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Lišta</string> <string name="hud_locked">Zamknout na místě</string> <string name="hud_locked_hint">Přetažením HUD přesunete; dlouhým stiskem ho zamknete nebo odemknete. Když je zamknutý, ovládací prvky na obrazovce pod ním dál fungují.</string> + <string name="hud_snap">Přichytit ke stranám</string> + <string name="hud_snap_hint">Pusťte HUD a přesune se k bližší straně obrazovky. Rychlým švihnutím ho hodíte tím směrem.</string> <string name="hud_group_look">Vzhled</string> <string name="hud_scale">Velikost na obrazovce</string> <string name="hud_color_soft">Jemná</string> @@ -668,7 +710,6 @@ <string name="hud_export_failed">Zprávu HUD se nepodařilo uložit.</string> <string name="hud_reset">Obnovit nastavení HUD</string> <string name="hud_reset_button">Obnovit</string> - <string name="hud_credit">FusionHUD od The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Režim škálování</string> <string name="drawer_scaling_sharpness">Ostrost škálování</string> <string name="drawer_effects">Efekty obrazovky</string> @@ -703,11 +744,17 @@ <string name="drawer_touch_auto">Automaticky (%1$s)</string> <string name="drawer_keyboard">Klávesnice</string> <string name="drawer_latency">Zpoždění</string> + <string name="drawer_low_latency">Režim nízkého zpoždění</string> + <string name="drawer_low_latency_hint">Zvyšuje využití CPU a baterie</string> <string name="drawer_low_latency_controller">Ovladač s nízkým zpožděním</string> <string name="drawer_low_latency_controller_hint">Ovladač hlásí na 1000 Hz místo 250 Hz. O něco víc CPU.</string> <string name="drawer_low_latency_touch">Dotek s nízkým zpožděním</string> <string name="drawer_low_latency_touch_hint">Doteky přeskakují dávkování snímků, takže ovládání dotykem ve Steamu běží na 1000 Hz. O něco víc CPU.</string> <string name="drawer_evdev_mouse">Surový kanál myši</string> + <string name="drawer_relative_mouse">Relativní myš</string> + <string name="drawer_relative_mouse_auto">Automaticky</string> + <string name="drawer_relative_mouse_on">Zapnuto</string> + <string name="drawer_relative_mouse_off">Vypnuto</string> <string name="drawer_direct_cursor">Kurzor</string> <string name="drawer_pc_keyboard">Klávesnice PC</string> <string name="drawer_android_keyboard">Android</string> @@ -797,6 +844,10 @@ <string name="setup_session">Relace</string> <string name="setup_logs">Protokoly relace</string> <string name="setup_logs_hint">Uloženo po každé relaci</string> + <string name="setup_game_debug_logs">Ladicí protokoly her</string> + <string name="setup_game_debug_logs_hint">Při dalším spuštění hry zahrnout diagnostiku Protonu, Wine a grafiky. Může snížit výkon a zabrat více úložiště.</string> + <string name="setup_game_debug_logs_restart">Pro ukládání ladicích protokolů her restartujte tuto relaci</string> + <string name="setup_logging_update_failed">Protokolování se nepodařilo změnit. Zkontrolujte přepínač a zkuste to znovu.</string> <string name="setup_agent_commands">Nástroje pro ladění</string> <string name="setup_latest_logs">Protokoly poslední relace</string> <string name="setup_saved_logs">Uložené protokoly relací</string> @@ -828,20 +879,22 @@ <string name="setup_home">Použít jako domovskou obrazovku</string> <string name="setup_home_on">DroidDeck může být domovská aplikace</string> <string name="setup_home_off">DroidDeck se nikdy nenabízí jako domovská aplikace</string> + <string name="setup_home_game_space_first">V Přidat hry nastavte DroidDeck na Zahrnout</string> <string name="setup_orientation">Orientace</string> + <string name="setup_launcher_orientation">Orientace launcheru</string> + <string name="setup_launcher_orientation_auto">Podle otočení zařízení</string> + <string name="setup_orientation_portrait">Na výšku</string> + <string name="setup_session_orientation">Orientace relace</string> + <string name="setup_session_orientation_hint">Platí pro Steam, hry, Plochu a editor ovladače. Předvolby rozlišení se otáčejí s relací; vlastní šířka a výška zůstávají, jak jsou zadány.</string> <string name="setup_orientation_auto">Automaticky na šířku</string> <string name="setup_orientation_landscape">Na šířku</string> <string name="setup_orientation_reverse">Na šířku obráceně</string> <string name="setup_fullscreen">Celá obrazovka</string> <string name="setup_fullscreen_on">Skryje stavový a navigační panel Androidu</string> <string name="setup_fullscreen_off">Zobrazí stavový a navigační panel Androidu</string> - <string name="setup_dual_screen">Dvě obrazovky</string> - <string name="setup_dual_screen_hint">Automaticky používá druhou obrazovku na kapesních zařízeních, která ji mají vestavěnou. Zapnuto používá jakýkoli druhý displej. Vypnuto nechá vše na jedné obrazovce.</string> <string name="setup_dual_screen_auto">Automaticky</string> <string name="setup_dual_screen_on">Zapnuto</string> <string name="setup_dual_screen_off">Vypnuto</string> - <string name="setup_dual_screen_menu">Nabídka na spodní obrazovce</string> - <string name="setup_dual_screen_menu_hint">Přesune sekce a herní nabídku na druhou obrazovku a píše se tam, takže horní obrazovka zůstane celá volná. L2 a R2 přepínají sekce.</string> <string name="setup_dual_screen_controls">Ovládání na spodní obrazovce ve hrách</string> <string name="setup_dual_screen_controls_hint">Při spuštění relace otevře touchpad a klávesnici na druhé obrazovce.</string> <string name="dual_typing_title">Psaní pro horní obrazovku</string> @@ -999,6 +1052,14 @@ <string name="gate_step1">Otevřete Nastavení → Možnosti pro vývojáře → Bezdrátové ladění a zapněte ho</string> <string name="gate_step2">Klepněte na „Spárovat zařízení pomocí párovacího kódu“</string> <string name="gate_step3">Zadejte kód do oznámení DroidDecku</string> + <string name="pairguide_build_number">V části O telefonu klepněte 7krát na Číslo sestavení</string> + <string name="pairguide_wireless">Zapněte Bezdrátové ladění</string> + <string name="pairguide_pair">Otevřete Bezdrátové ladění a klepněte na „Spárovat zařízení pomocí párovacího kódu“</string> + <string name="pairguide_child_process">Zapněte „Deaktivace omezení podřízených procesů“</string> + <string name="pairguide_row_child_process">Deaktivace omezení podřízených procesů</string> + <string name="pairguide_row_build_number">Číslo sestavení</string> + <string name="pairguide_row_wireless">Bezdrátové ladění</string> + <string name="pairguide_row_pair">Spárovat zařízení pomocí párovacího kódu</string> <string name="gate_waiting">Čekání na párovací okno…</string> <string name="gate_code_needed">Okno nalezeno. Zadejte jeho kód do oznámení.</string> <string name="gate_status">Stav</string> @@ -1137,7 +1198,6 @@ <string name="games_never_played">Nikdy nehráno</string> <string name="games_runtime_busy_percent">Runtime zaneprázdněn · %1$d%%</string> <string name="games_runtime_busy">Runtime zaneprázdněn</string> - <string name="games_runtime_first_play">Runtime se nainstaluje při prvním spuštění hry</string> <string name="games_runtime_update">K dispozici aktualizace runtime</string> <string name="games_runtime_ready">● Runtime připraven</string> <string name="games_internal">Interní úložiště</string> @@ -1154,6 +1214,9 @@ <string name="gpu_hide_other">Skrýt ovladače pro jiné GPU</string> <string name="gpu_show_other">Zobrazit ovladače pro jiné GPU</string> <string name="gpu_advanced">Pokročilé</string> + <string name="gpu_ubwc_title">Kompatibilita UBWC</string> + <string name="gpu_ubwc_hint">Pokud Steam nebo Android zobrazuje pruhy nebo blikání, zkuste Zapnuto nebo Vypnuto. Platí pro oba ovladače po restartu DroidDeck.</string> + <string name="gpu_ubwc_restart">Pro použití restartujte DroidDeck.</string> <string name="gpu_set_with_display">Nastaveno společně s ovladačem displeje: %1$s obsahuje oba.</string> <string name="gpu_set_with_runtime">Nastaveno společně s ovladačem runtime: %1$s obsahuje oba.</string> <string name="gpu_runtime_hint">Používají hry a desktop.</string> @@ -1262,10 +1325,15 @@ <string name="pip_auto">Automaticky přejít do PiP</string> <string name="unfolded_controls">Ovládání na rozložené obrazovce</string> <string name="unfolded_controls_hint">Po rozložení je hra zobrazena nad trackpady a zadními rukojeťmi Steam Decku. Po složení je hra na celou obrazovku.</string> + <string name="unfolded_controls_with_controller">Ponechat i s ovladačem</string> + <string name="unfolded_controls_with_controller_hint">Zobrazovat toto dotykové ovládání i při připojeném ovladači.</string> <string name="pip_suspended">Pozastaveno</string> <string name="pip_not_ready">Obraz v obraze bude dostupný, jakmile bude relace připravena.</string> <string name="pip_permission">Povolte obraz v obraze pro DroidDeck v nastavení Androidu.</string> <string name="pip_unavailable">Android nemohl otevřít obraz v obraze.</string> + <string name="game_more">Další</string> + <string name="game_edit_art">Upravit grafiku</string> + <string name="stores_in_steam_label">Ve Steamu</string> <string name="game_shortcut">Zkratka</string> <string name="game_shortcut_add">Přidat na domovskou obrazovku</string> <string name="game_shortcut_choose">Vybrat hru</string> @@ -1289,6 +1357,10 @@ <string name="main_wait_runtime">Počkejte, až skončí operace s runtime</string> <string name="main_wait_proton_install">Počkejte, až skončí instalace nástroje kompatibility</string> + <string name="load_compat_title">Příprava nástrojů kompatibility</string> + <string name="load_compat_wait">Čekání na dokončení nastavení kompatibility</string> + <string name="load_compat_hint">Relace se spustí po dokončení nastavení.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Počkejte, až skončí instalace plochy</string> <string name="main_wait_install_game">Před spuštěním hry počkejte, až skončí instalace</string> <string name="main_saves_close_session">Nejprve zavřete relaci Steamu, aby hra svým uložením nepřepsala import.</string> @@ -1333,6 +1405,9 @@ <string name="main_install_anyway">Přesto instalovat</string> <string name="main_remove_runtime_title">Odstranit runtime Linuxu</string> <string name="main_remove_runtime_text">Tím se odstraní runtime, klient Steam v něm a všechny hry v něm nainstalované.</string> + <string name="runtime_actions_title">Běhové prostředí Linuxu</string> + <string name="runtime_actions_text">Oprava znovu nainstaluje systémové soubory prostředí a zachová Steam, vaše hry a nastavení. Doplňky, jako je Plocha, se znovu nainstalují při dalším použití. Odebrání smaže vše.</string> + <string name="runtime_repair">Opravit prostředí</string> <string name="main_applied">Použito: %1$s</string> <string name="android_app_open_failed_primary">Nepodařilo se otevřít %1$s na hlavní obrazovce</string> <string name="android_app_open_failed_on">Nepodařilo se otevřít %1$s na %2$s</string> @@ -1468,6 +1543,13 @@ <string name="session_runtime_catalog_unreachable">Nepodařilo se spojit s katalogem runtime. Zkontrolujte připojení a znovu stiskněte Hrát.</string> <string name="session_runtime_install_failed">Runtime Linuxu se nenainstaloval. Zkontrolujte runtime v Přípravě a znovu stiskněte Hrát.</string> <string name="session_desktop_install_failed">Plocha se nenainstalovala (%1$s). Zkontrolujte připojení a znovu stiskněte Plocha.</string> + <string name="session_package_resume_failed">Přerušenou instalaci se nepodařilo dokončit (%1$s). Zkontrolujte připojení a místo a zkuste to znovu.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Běhové prostředí Linuxu je poškozené: %1$d odkaz knihovny vede na chybějící soubor (%2$s), obvykle po přerušené instalaci. Oprava zachová vaše hry a nastavení.</item> + <item quantity="few">Běhové prostředí Linuxu je poškozené: %1$d odkazy knihoven vedou na chybějící soubory (%2$s a další), obvykle po přerušené instalaci. Oprava zachová vaše hry a nastavení.</item> + <item quantity="many">Běhové prostředí Linuxu je poškozené: %1$d odkazu knihoven vede na chybějící soubory (%2$s a další), obvykle po přerušené instalaci. Oprava zachová vaše hry a nastavení.</item> + <item quantity="other">Běhové prostředí Linuxu je poškozené: %1$d odkazů knihoven vede na chybějící soubory (%2$s a další), obvykle po přerušené instalaci. Oprava zachová vaše hry a nastavení.</item> + </plurals> <string name="session_ended_named">Došlo k neočekávanému zastavení %1$s. Přiložte logy k hlášení chyby, nebo zkuste znovu.</string> <string name="session_ended_program">Program neočekávaně skončil. Přiložte logy k hlášení chyby, nebo zkuste znovu.</string> <string name="session_ended_desktop">Plocha neočekávaně skončila. Přiložte logy k hlášení chyby, nebo zkuste znovu.</string> @@ -1484,6 +1566,15 @@ <string name="mode_decky_plugins_hint">Nainstalujte ZIP s pluginem pro další relaci Steamu.</string> <string name="mode_decky_plugin_downloading">Stahování…</string> <string name="mode_decky_plugin_install_zip">Instalovat ze ZIP</string> + <string name="decky_zip_warning_title">Instalace pluginu třetí strany</string> + <string name="decky_zip_warning_text">Tým Decky Loader tento plugin nezkontroloval. Může obsahovat malware, například software, který ukradne váš účet Steam nebo poškodí zařízení. Instalací tohoto pluginu souhlasíte, že přebíráte veškerá rizika pro své zařízení.</string> + <string name="decky_zip_warning_continue">Pokračovat</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Počkejte %1$d sekundu</item> + <item quantity="few">Počkejte %1$d sekundy</item> + <item quantity="many">Počkejte %1$d sekundy</item> + <item quantity="other">Počkejte %1$d sekund</item> + </plurals> <string name="store_cat_games">Hry</string> <string name="store_cat_audio_video">Zvuk a video</string> <string name="store_cat_graphics">Grafika</string> @@ -1539,7 +1630,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">Mezerník</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1655,6 +1746,8 @@ <string name="fm_accept">Přijmout</string> <string name="fm_decline">Odmítnout</string> <string name="fm_drive_not_readable">%1$s je připojeno, ale momentálně není čitelné</string> + <string name="fm_drive_access_title">Povolit přístup k %1$s</string> + <string name="fm_drive_access_text">Android umožňuje aplikaci DroidDeck tento disk vidět, ale ne číst. Zapněte pro DroidDeck Přístup ke všem souborům a pak se vraťte.</string> <string name="fm_list_view">Zobrazení seznamu</string> <string name="fm_grid_view">Zobrazení mřížky</string> <string name="fm_search">Hledat</string> @@ -1728,6 +1821,89 @@ <string name="second_mode_keyboard_trackpad">Klávesnice + trackpad</string> <string name="second_mode_terminal">Terminál</string> <string name="second_mode_deck_controls">Rukojeti + trackpady Deck</string> + <string name="second_mode_dashboard">Přehled</string> + <string name="bottom_dashboard_empty">Zatím tu není nic k zobrazení.</string> + <string name="bottom_page_downloads">Stahování</string> + <string name="bottom_downloads_none">Neprobíhá žádné stahování.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Stahování mezipaměti shaderů</string> + <string name="bottom_downloads_paused">Pozastaveno</string> + <string name="bottom_downloads_queued">Čeká na spuštění</string> + <string name="bottom_page_notifications">Oznámení</string> + <string name="bottom_notifications_listener">Spodní obrazovka DroidDeck</string> + <string name="bottom_notifications_why">Zobrazujte zde zprávy a další oznámení během hraní. Zůstávají jen na této obrazovce a neukládají se. Android se zeptá jednou: na této obrazovce se otevře jeho stránka přístupu k oznámením; zapněte tam DroidDeck a tato stránka se sama vrátí.</string> + <string name="bottom_notifications_allow">Povolit přístup k oznámením</string> + <string name="bottom_notifications_none">Žádná oznámení.</string> + <string name="bottom_notifications_count">Oznámení: %1$d</string> + <string name="bottom_notifications_clear">Vymazat</string> + <string name="bottom_page_screenshots">Snímky obrazovky</string> + <string name="stats_fps_needs_hud">FPS vyžaduje zapnutý HUD</string> + <string name="stats_speed">Rychlost</string> + <string name="stats_pedals">Pedály</string> + <string name="stats_gforce">Přetížení (G)</string> + <string name="stats_timing">Časy</string> + <string name="stats_best_lap">Nejlepší kolo</string> + <string name="stats_tires">Pneumatiky °C</string> + <string name="stats_trace">Plyn a brzda, posledních 10 s</string> + <string name="stats_speed_chart">Rychlost, %1$s</string> + <string name="stats_gear">Rychlostní stupeň</string> + <string name="stats_steam_client_arm">Klient Steam ARM</string> + <string name="stats_steam_client_x86">Klient Steam x86</string> + <string name="stats_throttle">Plyn</string> + <string name="stats_brake">Brzda</string> + <string name="stats_lights">Kontrolky</string> + <string name="stats_lamp_shift">Řazení</string> + <string name="stats_lamp_handbrake">Ruční brzda</string> + <string name="stats_lamp_pit">Omezovač v boxech</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olej %1$s °C</string> + <string name="stats_power">Rozdělovač energie</string> + <string name="stats_fuel_t">Palivo, t</string> + <string name="stats_fuel_main">Hlavní %1$s t</string> + <string name="stats_fuel_reserve">Rezerva %1$s t</string> + <string name="bottom_telemetry_send_title">Odesílat data pro palubní desku</string> + <string name="bottom_telemetry_send_auto">Automaticky</string> + <string name="bottom_telemetry_send_auto_hint">Zapne to pro každou zde uvedenou hru, včetně her nalezených později. Hry, které vypnete, zůstanou vypnuté.</string> + <string name="bottom_telemetry_send_note">Tím se mění vlastní nastavení výstupu dat ve hře. Projeví se při příštím spuštění hry; vypnutím se obnoví původní nastavení.</string> + <string name="bottom_telemetry_send_close">Pro změnu zavřete %1$s.</string> + <string name="bottom_telemetry_send_failed">Nastavení hry %1$s se nepodařilo změnit.</string> + <string name="bottom_telemetry_send_menu">%1$s: zapněte %2$s v nastavení hry s IP 127.0.0.1 a portem %3$d.</string> + <string name="bottom_shots_where">Ukládá se do Pictures/DroidDeck. Zobrazují se zde i snímky obrazovky ze Steamu.</string> + <string name="bottom_shots_take">Pořídit snímek obrazovky</string> + <string name="bottom_shots_saved">Snímek obrazovky uložen.</string> + <string name="bottom_shots_failed">Snímek obrazovky se nepodařilo pořídit.</string> + <string name="bottom_shots_none">Zatím žádné snímky obrazovky.</string> + <string name="bottom_page_chat">Chat a hlas</string> + <string name="bottom_chat_why">Čtěte chat Steamu a odpovídejte na něj zde, zatímco hra dál běží na hlavní obrazovce. Používá účet, kterým je Steam přihlášen.</string> + <string name="bottom_chat_not_signed_in">Steam zatím nemá webové přihlášení ke sdílení, proto se zde jednou přihlaste.</string> + <string name="bottom_chat_stopped">Android zavřel stránku chatu, když byl DroidDeck na pozadí. Znovu se otevře, až se do DroidDecku vrátíte.</string> + <string name="bottom_chat_open">Otevřít Steam Chat</string> + <string name="bottom_chat_close">Zavřít chat</string> + <string name="bottom_chat_mic_on">Mikrofon zapnut</string> + <string name="bottom_chat_mic_off">Mikrofon vypnut</string> + <string name="bottom_chat_mic_unavailable">Mikrofon je pro tuto hru vypnutý. Chcete-li mluvit, zapněte Mikrofon v nastavení Steamu v DroidDecku (Zvuk) a spusťte hru znovu.</string> + <string name="bottom_chat_volume">Hlasitost %1$d%%</string> + <string name="bottom_page_telemetry">Statistiky ve hře</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Baterie</string> + <string name="bottom_telemetry_lap">Kolo</string> + <string name="bottom_telemetry_position">Pozice</string> + <string name="bottom_telemetry_this_lap">Aktuální kolo</string> + <string name="bottom_telemetry_last_lap">Poslední kolo</string> + <string name="bottom_telemetry_fuel">Palivo</string> + <string name="bottom_telemetry_cargo">Náklad</string> + <string name="bottom_telemetry_pips">Energie SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Právní stav</string> + <string name="bottom_telemetry_balance">Zůstatek</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Port %1$d přijímá data (%2$d paketů po %3$d bajtech), ale ve formátu, který tato stránka zatím neumí přečíst.</string> + <string name="bottom_telemetry_port_busy">Port %1$s již používá jiný program, takže se zde tato hra nemůže zobrazit.</string> <string name="rtinst_removing">Odstraňování runtime Linuxu</string> <plurals name="rtinst_removing_entries"> @@ -1760,6 +1936,7 @@ <string name="flatpakmgr_not_ready">Nejprve nastavte Flatpak</string> <string name="flatpakmgr_starting">Spouštění</string> <string name="flatpakmgr_exit_status">Flatpak skončil s návratovým kódem %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s je sestaveno pro %2$s, které DroidDeck neumí spustit. Aplikace Flatpak zde potřebují verzi pro ARM64 nebo x86_64.</string> <string name="flatpakmgr_installing">Instalování %1$s</string> <string name="flatpakmgr_updating">Aktualizování %1$s</string> <string name="flatpakmgr_removing">Odstraňování %1$s</string> @@ -1853,6 +2030,7 @@ <string name="adbpair_applying">Použití nastavení…</string> <string name="adbpair_command_failed">Příkaz bezdrátového ladění se nezdařil</string> <string name="adbpair_channel_name">Nastavení bezdrátového ladění</string> + <string name="adbpair_progress_channel_name">Průběh nastavení bezdrátového ladění</string> <string name="adbpair_channel_description">Vyžádá kód pro párování bezdrátového ladění, dokud je otevřené Nastavení</string> <string name="adbpair_title_pair">Zpárovat bezdrátové ladění</string> <string name="adbpair_waiting_text">Zapněte bezdrátové ladění a pak klepněte na „Párování zařízení pomocí párovacího kódu“.</string> @@ -1961,6 +2139,7 @@ <string name="gpuinfo_not_adreno">Není GPU Adreno</string> <string name="gpuinfo_supported">Podporováno</string> <string name="gpuinfo_experimental">Experimentální: jeho ovladače jsou testovací sestavení</string> + <string name="gpuinfo_a850_experimental">Experimentální podpora Adreno 850: vyžaduje kompatibilní experimentální ovladače displeje a her; na tomto zařízení neověřeno</string> <string name="gpuinfo_below_tested">Pod testovaným hardwarem (Adreno 725 a novější): nemusí fungovat</string> <string name="gpuinfo_unsupported">Není podporováno: DroidDeck potřebuje GPU Adreno (Snapdragon)</string> @@ -2057,6 +2236,7 @@ <string name="display_look_filter">%1$s Nastaví škálování na %2$s.</string> <string name="display_match_screen">Podle obrazovky (%1$d×%2$d)</string> <string name="display_follow_screen">Sledovat obrazovku (změní velikost při složení nebo rozložení)</string> + <string name="display_follow_screen_scaled">Zmenšeno %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Zobrazit podrobnosti o zařízení</string> <string name="device_info_hide">Skrýt podrobnosti o zařízení</string> @@ -2163,6 +2343,13 @@ <string name="stores_resume">Pokračovat</string> <string name="stores_refresh">Obnovit</string> <string name="stores_sort">Řazení</string> + <string name="setup_rail_labels">Popisky postranního panelu</string> + <string name="setup_rail_labels_hint">Zobrazovat názvy pod ikonami postranního panelu. Vypněte pro užší panel.</string> + <string name="library_display">Zobrazení</string> + <string name="library_display_larger">Větší karty</string> + <string name="library_display_smaller">Menší karty</string> + <string name="library_display_title">Zobrazit název</string> + <string name="library_display_size">Zobrazit velikost</string> <string name="stores_sort_last_played">Nedávno hrané</string> <string name="stores_sort_recently_installed">Nedávno nainstalované</string> <string name="stores_sort_title_asc">Název A–Z</string> @@ -2289,6 +2476,9 @@ <string name="stores_download_manager">Správce stahování</string> <string name="stores_parallel">Souběžných stahování</string> <string name="stores_install_where">Instalovat do</string> + <string name="stores_install_language">Jazyk hry</string> + <string name="stores_install_language_hint">GOG a Epic nainstalují tento jazyk. Systémový se řídí jazykem aplikace.</string> + <string name="stores_install_language_system">Systémový</string> <string name="stores_install_title">Instalace %1$s:</string> <string name="stores_target_internal">Interní úložiště</string> <string name="stores_target_free">%1$s volných</string> @@ -2327,6 +2517,9 @@ <string name="edit_target">Cíl</string> <string name="edit_start_in">Spustit v</string> <string name="edit_launch_options">Možnosti spuštění</string> + <string name="edit_launch_options_steam_hint">Sdíleno s Vlastnostmi ve Steamu: změna na jednom místě se projeví na obou.</string> + <string name="edit_launch_options_not_saved">Možnosti spuštění se nepodařilo uložit do Steamu. Zkuste to znovu.</string> + <string name="edit_launch_options_desktop">Steam může být otevřený v relaci Plochy. Změňte možnosti spuštění v jeho Vlastnostech, nebo nejdřív relaci ukončete.</string> <string name="edit_artwork">Grafika</string> <string name="edit_other_exe">Jiný exe…</string> <string name="edit_remove">Odstranit</string> @@ -2458,6 +2651,7 @@ <string name="setup_download_source_custom">Vlastní prefix</string> <string name="setup_download_mirror">Web</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">LINUXOVÉ APLIKACE</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Desktopové aplikace pro Linuxový desktop, otevírané z Desktopu.</string> @@ -2602,6 +2796,22 @@ <string name="glasses_tracking_flat_hint">Režim Automaticky drží tuto 2D hru pevně v zorném poli. Chcete-li použít sledování hlavy, zvolte v části Displej možnost „Virtuální obrazovka“.</string> <string name="glasses_tracking_sbs_hint">Sledování hlavy platí pro virtuální obrazovku nebo spuštěnou hru SteamVR.</string> <string name="glasses_hardware">Zařízení</string> + <string name="vr_controllers_tab">Ovladače</string> + <string name="vr_controllers_group">Ovladače SteamVR</string> + <string name="vr_controllers_emulate">Gamepad ve VR</string> + <string name="vr_controllers_emulate_hint">Dvě ruce ve VR, za které váš ovladač hraje. Změny platí hned, i když běží SteamVR. Joy-Cony a sledované ruce svou stranu stále převezmou.</string> + <string name="vr_controllers_off">Běžný gamepad</string> + <string name="vr_controllers_index">Ovladače Valve Index</string> + <string name="vr_controllers_touch">Ovladače Meta Quest 3</string> + <string name="vr_controllers_vive">Ovladače HTC Vive</string> + <string name="vr_controllers_sticks">Páčky na začátku</string> + <string name="vr_controllers_sticks_hint">Pro přepnutí ve VR stiskněte obě páčky současně.</string> + <string name="vr_controllers_sticks_game">Pohybují vámi ve hře</string> + <string name="vr_controllers_sticks_hands">Pohybují rukama</string> + <string name="vr_controllers_buttons">Tlačítka</string> + <string name="vr_controllers_buttons_stick">Spouště jsou spouště, bumpery úchop, A/B a X/Y jsou čelní tlačítka každé ruky, stisk páčky klikne thumbstickem, Guide otevře nabídku SteamVR. D-pad nahoru a dolů přibližuje a vzdaluje ruce.</string> + <string name="vr_controllers_buttons_vive">Páčky jsou trackpady; A/X nebo stisk páčky je stiskne. Spouště jsou spouště, bumpery úchop, Start a Select jsou menu, Guide otevře nabídku SteamVR.</string> + <string name="vr_controllers_buttons_off">Žádné ruce ve VR. Hry podporující gamepad a nabídka SteamVR dostanou váš ovladač jako obvykle.</string> <string name="glasses_brightness">Jas</string> <string name="glasses_volume">Hlasitost</string> <string name="glasses_sunblock">Zatmavení</string> @@ -2659,6 +2869,12 @@ <string name="hand_camera_placement">Umístění kamery</string> <string name="hand_camera_placement_hint">Než začnete hrát, zkontrolujte, že vás kamera vidí.</string> <string name="hand_camera_check">Zkontrolovat</string> + <string name="tracking_pack_title">Stažení sledování rukou</string> + <string name="tracking_pack_hint">Sledování rukou vyžaduje jednorázové stažení %1$s.</string> + <string name="tracking_pack_download">Stáhnout</string> + <string name="tracking_pack_retry">Zkusit znovu</string> + <string name="tracking_pack_downloading">Stahování sledování rukou… %1$d%%</string> + <string name="tracking_pack_failed">Sledování rukou se nepodařilo stáhnout. Zkontrolujte připojení a zkuste to znovu.</string> <string name="hand_camera_check_title">Umístění kamery</string> <string name="hand_camera_how_rear">Postavte zařízení svisle do vzdálenosti 1,5 až 2 metry přibližně ve výšce hrudníku tak, aby zadní kamera směřovala k vám. Pak se postavte do záběru s nataženýma rukama.</string> <string name="hand_camera_how_front">Postavte zařízení svisle do vzdálenosti 1,5 až 2 metry přibližně ve výšce hrudníku tak, aby obrazovka směřovala k vám. Pak se postavte do záběru s nataženýma rukama.</string> @@ -2730,6 +2946,21 @@ <string name="storage_safe_hint">Nevyužitá prostředí, zbytky, staré logy</string> <string name="storage_clean_up">Čištění…</string> <string name="storage_session_running">Zastav relaci, ať můžeš uklidit nebo něco smazat. Velikosti zůstávají vidět.</string> + <string name="storage_default_group">Umístění instalace</string> + <string name="storage_default_title">Výchozí úložiště</string> + <string name="storage_default_hint">Nové instalace z obchodů půjdou do vybraného umístění. Stávající hry zůstanou, kde jsou. Knihovny Steamu mají vlastní nastavení.</string> + <string name="storage_default_ask">Vždy se zeptat</string> + <string name="storage_default_ask_detail">Vybrat cíl u každé instalace</string> + <string name="storage_default_internal">Interní úložiště</string> + <string name="storage_default_external">Externí úložiště</string> + <string name="storage_default_external_detail">%1$s · volně %2$s</string> + <string name="storage_default_external_missing">Nepřipojeno</string> + <string name="storage_default_folder">Složka · %1$s</string> + <string name="storage_default_folder_free">volně %1$s</string> + <string name="storage_default_folder_missing">Nepřipojeno</string> + <string name="storage_default_choose_folder">Vybrat složku…</string> + <string name="storage_default_choose_folder_detail">Použít libovolnou složku na kartě SD nebo disku USB</string> + <string name="storage_default_note">Hry se ukládají do složky Games ve vybraném umístění. Stávající hry se nepřesouvají.</string> <string name="storage_where">Kam to jde</string> <string name="storage_games">Hry ze Steamu</string> <string name="storage_game_data">Data her</string> @@ -2865,6 +3096,9 @@ <string name="storage_data_installed">Nainstalované hry</string> <string name="storage_data_parts">Prefix %1$s · shadery %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Vymazat shadery</string> + <string name="storage_reset_prefix">Resetovat prefix</string> + <string name="storage_reset_prefix_title">Resetovat prefix pro %1$s?</string> + <string name="storage_reset_prefix_confirm">Smaže její prefix Wine (%1$s) v %2$s a při dalším spuštění ho vytvoří znovu. Uložené hry, nastavení a nainstalované redistribuovatelné balíčky v něm budou ztraceny; uložení ve Steam Cloud zůstanou ve vašem účtu.</string> <string name="storage_data_leftovers">Smazané hry</string> <string name="storage_steam_app">Aplikace Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefix stále obsahuje soubory, možná místní uložené pozice</string> @@ -3170,6 +3404,117 @@ <string name="spatial_saved_views_hint">Uložená zobrazení lze přepočítat. Spusťte novou kalibraci pro zachycení v aktuálním sledovacím souřadnicovém systému.</string> <string name="spatial_model_checksum_error">Neshoda kontrolního součtu modelu ruky</string> <string name="spatial_opencv_load_error">OpenCV se nepodařilo načíst</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synchronizovat přes Syncthing</string> + <string name="sync_enable_hint">Jde o implementaci Syncthingu založenou na Syncthing-Fork, která umožňuje synchronizovat soubory v interním souborovém systému DroidDecku s dalšími instancemi Syncthingu. Týká se pouze souborů, které ukládáte v interním souborovém systému DroidDecku.</string> + <string name="sync_missing">Toto sestavení neobsahuje Syncthing.</string> + <string name="sync_starting">Spouští se Syncthing</string> + <string name="sync_status_starting">Spouští se</string> + <string name="sync_status_up_to_date">Aktuální</string> + <string name="sync_status_syncing">Synchronizuje se</string> + <string name="sync_status_paused">Pozastaveno</string> + <string name="sync_status_pausing">Pozastavuje se</string> + <string name="sync_status_resuming">Obnovuje se</string> + <string name="sync_status_attention">Vyžaduje pozornost</string> + <string name="sync_status_failed">Syncthing se zastavil</string> + <string name="sync_failed_retry">Zkusit znovu</string> + <string name="sync_paused_wifi">Pozastaveno do připojení k Wi-Fi</string> + <string name="sync_paused_game">Pozastaveno během hry</string> + <string name="sync_summary">Složky: %1$d · připojená zařízení: %2$d z %3$d</string> + <string name="sync_left">Zbývá %1$s</string> + <string name="sync_open_web_ui">Otevřít webové rozhraní</string> + <string name="sync_pause">Pozastavit</string> + <string name="sync_resume">Obnovit</string> + <string name="sync_running">Spuštěno</string> + <string name="sync_running_hint">Vypnutím Syncthing úplně zastavíte.</string> + <string name="sync_this_device">Toto zařízení</string> + <string name="sync_device_id">ID zařízení</string> + <string name="sync_show_qr">Zobrazit QR</string> + <string name="sync_advanced">Pokročilé</string> + <string name="sync_advanced_hint">Porty, kdy spouštět, obnovení</string> + <string name="sync_open">Otevřít</string> + <string name="sync_waiting">Čeká na vás</string> + <string name="sync_pending_device">%1$s se chce připojit</string> + <string name="sync_pending_folder">%1$s chce sdílet „%2$s“</string> + <string name="sync_pending_folder_hint">Po přijetí vyberete, kam se v DroidDecku uloží.</string> + <string name="sync_review">Zkontrolovat ve webovém rozhraní</string> + <string name="sync_folders">Složky</string> + <string name="sync_no_folders">Zatím žádné složky.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Aktuální</string> + <string name="sync_folder_syncing">Synchronizace %1$d %%</string> + <string name="sync_folder_scanning">Prohledává se</string> + <string name="sync_folder_paused">Pozastaveno</string> + <string name="sync_folder_out_of_sync">Nesynchronizováno</string> + <string name="sync_folder_errors">Nepodařilo se synchronizovat soubory: %1$d</string> + <string name="sync_folder_blocked">Zablokováno</string> + <string name="sync_folder_blocked_hint">Tato složka je mimo úložiště DroidDecku, proto ji DroidDeck pozastavil. Ke synchronizaci složek mimo DroidDeck použijte aplikaci Syncthing-Fork.</string> + <string name="sync_remove_folder">Odebrat ze Syncthingu</string> + <string name="sync_remove_folder_hint">Odebráním se žádné soubory nesmažou.</string> + <string name="sync_devices">Zařízení</string> + <string name="sync_no_devices">Zatím žádná zařízení.</string> + <string name="sync_connected">Připojeno</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Naposledy viděno %1$s</string> + <string name="sync_device_id_title">ID tohoto zařízení</string> + <string name="sync_device_id_hint">Na druhém zařízení přidejte v Syncthingu zařízení a naskenujte tento kód nebo vložte ID. Potom ho zde přijměte ve webovém rozhraní.</string> + <string name="sync_copy">Kopírovat</string> + <string name="sync_share">Sdílet</string> + <string name="sync_done">Hotovo</string> + <string name="sync_off_title">Vypnout Syncthing?</string> + <string name="sync_off_body">Syncthing se nyní zastaví a zůstane zastavený, dokud ho znovu nezapnete. Synchronizované soubory zůstanou, kde jsou.</string> + <string name="sync_off_forget">Smazat také konfiguraci Syncthingu</string> + <string name="sync_off_forget_hint">Odebere ID tohoto zařízení, složky a zařízení. Po opětovném zapnutí začne od začátku.</string> + <string name="sync_turn_off">Vypnout</string> + <string name="sync_ports">Porty</string> + <string name="sync_port_sync">Synchronizace</string> + <string name="sync_port_discovery">Místní vyhledávání</string> + <string name="sync_repick">Vybrat nové porty</string> + <string name="sync_repick_hint">Kontroluje se znovu při každém spuštění.</string> + <string name="sync_repick_button">Vybrat znovu</string> + <string name="sync_reset_group">Obnovení</string> + <string name="sync_api_key">Klíč API</string> + <string name="sync_regenerate">Vygenerovat znovu</string> + <string name="sync_reset">Obnovit Syncthing</string> + <string name="sync_reset_hint">Nové ID zařízení, složky a zařízení budou odebrány. Soubory v úložišti DroidDecku zůstanou zachovány.</string> + <string name="sync_reset_button">Obnovit</string> + <string name="sync_reset_confirm_title">Obnovit Syncthing?</string> + <string name="sync_running_group">Spouštění</string> + <string name="sync_run">Spouštět</string> + <string name="sync_run_open">Když je DroidDeck otevřený</string> + <string name="sync_run_background">Na pozadí</string> + <string name="sync_wifi_only">Pouze Wi-Fi</string> + <string name="sync_pause_games">Pozastavit během her</string> + <string name="sync_logs">Protokoly</string> + <string name="sync_logs_hint">Výstup Syncthingu pro tuto relaci</string> + <string name="sync_logs_share">Sdílet</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Nejprve nastavte běhové prostředí Linuxu.</string> + <string name="sync_accept">Přijmout</string> + <string name="sync_accept_title">Uložit „%1$s“ do</string> + <string name="sync_add_folder">Přidat složku</string> + <string name="sync_add_folder_hint">Synchronizovat složku v úložišti DroidDecku</string> + <string name="sync_choose">Vybrat</string> + <string name="sync_add">Přidat</string> + <string name="sync_add_failed">Složku se nepodařilo přidat.</string> + <string name="sync_share_with">Sdílet se</string> + <string name="sync_share_none">Zatím žádná zařízení. Tuto složku můžete sdílet později z webového rozhraní.</string> + <string name="sync_use_folder">Použít tuto složku</string> + <string name="sync_new_folder">Nová složka</string> + <string name="sync_location_home">Domovská složka kontejneru</string> + <string name="sync_location_sync">Složka Sync</string> + <string name="sync_location_shared">Sdílené úložiště DroidDecku</string> + <string name="sync_location_card">DroidDeck na %1$s</string> + <string name="sync_location_app">Data aplikace DroidDeck</string> + <string name="sync_web_path_locked">Nové složky se ukládají do složky Sync v DroidDecku. Chcete-li synchronizovat jinou složku DroidDecku, použijte Přidat složku na kartě Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Načíst znovu</string> + <string name="sync_not_running">Syncthing neběží.</string> + <string name="session_end_steam_sigill">Steam se zastavil na neplatné instrukci (SIGILL). Může jít o problém s kompatibilitou instrukcí CPU nebo o pád klienta. Sdílejte protokoly s údaji o zařízení.</string> + <string name="session_end_steam_try_x64">Můžete zkusit Nastavení Steamu → Klient Steam → x86-64 (experimentální). Vyžaduje další stahování a může běžet pomaleji.</string> + <string name="session_end_vulkan_device">Grafický ovladač Linuxu nenašel použitelné zařízení Vulkan. Zkontrolujte, zda vybraný ovladač GPU pro Linux toto GPU podporuje.</string> + <string name="session_end_gpu_unsupported">Tuto relaci nelze spustit, protože toto GPU nemá v aktuálním nastavení kompatibilní ovladač Vulkan pro Linux. Ovladače Adreno Turnip nemohou zapnout podporu GPU MediaTek/Mali.</string> <string name="setup_group_memory">Paměť</string> <string name="setup_clear_cached">Zavřít aplikace v mezipaměti před relací</string> <string name="setup_clear_cached_hint">Při spuštění relace DroidDeck zavře aplikace, které Android drží na pozadí, aby hra měla více paměti. Musí být zapnuté Bezdrátové ladění.</string> @@ -3193,6 +3538,12 @@ <string name="epic_client_open">Otevřít</string> <string name="epic_client_install">Instalovat</string> <string name="game_tab_about">O aplikaci</string> + <string name="game_resources_browser">Otevře se v prohlížeči</string> + <string name="game_resource_guides">Návody</string> + <string name="game_resource_protondb_detail">Hlášení o kompatibilitě Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Pro hry s uloženými pozicemi ve vašem účtu Steam</string> + <string name="game_resource_search">Hledat na webu</string> <string name="game_tab_install">Instalovat</string> <string name="game_install_location">Umístění</string> <string name="game_install_folder">Složka</string> @@ -3209,6 +3560,11 @@ <string name="stores_eyebrow_pass">dostupné s %1$s</string> <string name="stores_owned_in_library">Vlastněné hry v knihovně</string> <string name="library_filter_added">Přidané</string> + <string name="library_filter">Filtr</string> + <string name="library_filter_installed">Jen nainstalované</string> + <string name="library_filter_all_owned">Všechny vlastněné hry</string> + <string name="library_no_installed_matches">Těmto filtrům neodpovídají žádné nainstalované hry.</string> + <string name="library_browse_owned">Procházet vlastněné hry</string> <string name="game_tab_launch">Spuštění</string> <string name="game_tab_saves_cloud">Uložené hry a cloud</string> <string name="game_launch_shortcut">Zástupce ve Steamu</string> @@ -3226,6 +3582,40 @@ <string name="stores_itch_update_replaced">Vývojář nahradil tuto verzi souborem %1$s. Aktualizovat na ni?</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Nastavení cloudu</string> + <string name="integration_title">Integrace se Steamem</string> + <string name="integration_count">Zapnuto %1$d z %2$d</string> + <string name="integration_set_up">Nastavit</string> + <string name="integration_location">Poloha</string> + <string name="integration_app_info">Informace o aplikaci</string> + <string name="integration_wifi">Názvy Wi-Fi</string> + <string name="integration_brightness">Jas</string> + <string name="integration_home">DroidDeck jako domovská obrazovka</string> + <string name="integration_shortcuts">Systémové klávesy</string> + <string name="integration_wifi_hint">Zobrazit sítě ve Steamu · vyžaduje přístup k poloze, nikdy se nesleduje</string> + <string name="integration_wifi_on">Sítě se zobrazují ve Steamu</string> + <string name="integration_wifi_location_off">Poloha je vypnutá</string> + <string name="integration_wifi_denied">Poloha zamítnuta · povolte ji v Informacích o aplikaci</string> + <string name="integration_brightness_hint">Posuvník Steamu nastavuje jas obrazovky</string> + <string name="integration_home_hint">Tlačítko Domů v relaci otevře nabídku Steam</string> + <string name="integration_shortcuts_hint">Alt+Tab, klávesa Win a tlačítko Domů zůstanou v relaci</string> + <string name="integration_shortcuts_maybe_restricted">V Androidu zašedlé? Informace o aplikaci → ⋮ → Povolit omezená nastavení</string> + <string name="integration_shortcuts_restricted">Blokováno Androidem · Informace o aplikaci → ⋮ → Povolit omezená nastavení</string> + <string name="integration_shortcuts_service">Systémové klávesy DroidDeck</string> + <string name="integration_shortcuts_service_description">Ponechá Alt+Tab, klávesu Win a tlačítko Domů v aktivní relaci DroidDeck místo Androidu.</string> + <string name="integration_brightness_needed">Zapněte Jas v Příprava → Integrace se Steamem</string> + <string name="setup_gpu_bridge_off">Most Mali: vypnuto</string> + <string name="setup_gpu_bridge_on">Most Mali: zapnuto</string> + <string name="setup_gpu_bridge_detail">%1$s není Adreno. Experimentální most Vulkan je zapnutý: relace vykresluje přes vlastní ovladač telefonu. Počítejte s chybami; pošlete protokoly relace.</string> + <string name="setup_bridge_safe">Bezpečný režim</string> + <string name="setup_bridge_safe_on">Bezpečný režim: zapnuto</string> + <string name="setup_bridge_safe_off">Bezpečný režim: vypnuto</string> + <string name="setup_bridge_safe_on_detail">Nejvyšší kompatibilita. Doporučeno pro nové zařízení.</string> + <string name="setup_bridge_safe_off_detail">Rychlejší tam, kde tento GPU prošel kontrolami.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automaticky</string> + <string name="setup_bridge_dxvk_proton">DXVK: vlastní z Protonu</string> + <string name="setup_bridge_dxvk_auto_detail">Použije starší DXVK, pokud je Vulkan tohoto GPU pro DXVK z Protonu příliš starý.</string> + <string name="setup_bridge_dxvk_proton_detail">Každý Proton si ponechá vlastní DXVK, i když pro něj může být Vulkan tohoto GPU příliš starý.</string> <string name="apps_search_hint">Hledat aplikace</string> <string name="apps_no_match">Výrazu „%1$s“ neodpovídá žádná aplikace.</string> <string name="apps_add_widget">Přidat widget</string> @@ -3276,6 +3666,8 @@ <string name="desktop_restore_done_body">Aplikace, které jste přidali, jsou znovu nainstalovány.</string> <string name="desktop_restore_failed_title">Část softwaru se nepodařilo obnovit</string> <string name="desktop_restore_failed_body">Podívejte se do ~/.cache/droiddeck/apt-restore.log a pak zkuste sudo apt install v Konsoli.</string> + <string name="gog_full_files">Nativní optimalizace nejsou k dispozici. Stažení obsahuje kompletní náhradní soubory.</string> + <string name="gog_recover">Ověřit výsledek patche</string> <string name="slow_usb_title">Pomalé připojení USB</string> <string name="slow_usb_cable">%1$s je připojen přes %2$s (%3$s Mb/s, asi %4$d MB/s), takže hry na něm se budou načítat pomalu. Použijte kabel USB 3 s rychlostí 5 Gb/s nebo vyšší, zkuste otočit konektor USB-C nebo použijte rychlejší disk.</string> <string name="slow_usb_port">%1$s je připojen přes %2$s (%3$s Mb/s, asi %4$d MB/s). Port USB tohoto zařízení rychleji neumí, takže hry na něm se budou načítat pomalu. Interní úložiště nebo karta microSD může být rychlejší.</string> @@ -3286,4 +3678,52 @@ <string name="steam_import_names_more">%1$s a %2$d dalších</string> <string name="steam_import_now">Restartovat teď</string> <string name="steam_import_later">Později</string> + <string name="gog_maintenance">Spravovat instalaci GOG</string> + <string name="gog_check">Zkontrolovat aktualizace</string> + <string name="gog_repair">Ověřit/opravit</string> + <string name="gog_patches">Offline patche</string> + <string name="gog_refresh">Stáhnout úplný offline instalátor</string> + <string name="gog_update">Aktualizovat na %1$s</string> + <string name="gog_resume">Pokračovat v údržbě GOG</string> + <string name="gog_open_patch">Otevřít instalátor patche</string> + <string name="gog_patch_in_session">Dokončete nebo zrušte instalátor patche v relaci Linuxu.</string> + <string name="gog_patch_requirements">Vyberte patch pro nainstalovanou verzi a jazyk. Podporované zdrojové verze nemusí být uvedeny.</string> + <string name="gog_no_patches">GOG pro tuto hru nemá samostatné patche pro Windows.</string> + <string name="gog_managed_files">Upravené soubory hry mohou být nahrazeny.</string> + <string name="gog_patch_installer_note">Instalátor se otevře ve vaší relaci Linuxu.</string> + <string name="gog_download_label">Stažení</string> + <string name="gog_space_label">Místo navíc</string> + <string name="gog_space_estimate_label">Odhad místa</string> + <string name="gog_repair_action">Opravit soubory</string> + <string name="gog_refresh_action">Obnovit instalaci</string> + <string name="gog_select_patch">Vybrat</string> + <string name="stores_gamejolt_not_owned">Není ve vaší knihovně Game Jolt</string> + <string name="stores_gamejolt_no_build">Pro tuto hru není ke stažení verze pro Windows</string> + <string name="stores_gamejolt_no_exe">Ve stahování nebyla nalezena hra pro Windows</string> + <string name="stores_gamejolt_no_game">Tuto hru se na Game Jolt nepodařilo najít</string> + <string name="stores_gamejolt_browse_failed">Hry z Game Jolt se nepodařilo načíst</string> + <string name="stores_gamejolt_download_failed">Game Jolt odpovědělo HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Stahování z Game Jolt se nepodařilo načíst</string> + <string name="stores_gamejolt_build_open">Otevřít na Game Jolt</string> + <string name="stores_gamejolt_archive">Archivy %1$s nejsou podporovány</string> + <string name="stores_gamejolt_extract_failed">Stažený soubor nelze rozbalit (kód %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt není dostupný</string> + <string name="stores_gamejolt_download_no_link">Game Jolt neposkytl odkaz ke stažení</string> + <string name="stores_gamejolt_section_featured">Doporučené</string> + <string name="stores_gamejolt_section_hot">Populární</string> + <string name="stores_gamejolt_section_best">Nejlepší</string> + <string name="stores_gamejolt_section_new">Nové</string> + <string name="stores_gamejolt_price_under_30">30 $ nebo méně</string> + <string name="stores_gamejolt_os_other">Jiné</string> + <string name="stores_gamejolt_maturity_everyone">Pro všechny věkové skupiny</string> + <string name="stores_gamejolt_maturity_teen">Teenageři</string> + <string name="stores_gamejolt_maturity_adult">Pro dospělé</string> + <string name="stores_gamejolt_status_complete">Dokončeno</string> + <string name="stores_gamejolt_status_early">Předběžný přístup</string> + <string name="stores_gamejolt_partners">Hry partnerů</string> + <string name="stores_gamejolt_filter_browser">Prohlížeč</string> + <string name="stores_gamejolt_filter_maturity">Věkové hodnocení</string> + <string name="stores_gamejolt_filter_status">Stav</string> + <string name="stores_gamejolt_filter_partners">Partneři</string> + <string name="stores_gamejolt_followed">Sledované hry</string> </resources> diff --git a/app/src/main/res/values-da/gestures.xml b/app/src/main/res/values-da/gestures.xml index 1fd863e0d2..022f14b97a 100644 --- a/app/src/main/res/values-da/gestures.xml +++ b/app/src/main/res/values-da/gestures.xml @@ -71,7 +71,7 @@ <string name="gesture_key_backspace">Tilbage</string> <string name="gesture_key_enter">Enter</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">Mellemrum</string> <string name="gesture_key_delete">Delete</string> <string name="gesture_key_insert">Insert</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 0525020d22..05cf267e74 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-indstillinger for D3D12. nodxr deaktiverer ray tracing; brug kun til et spil, der har brug for det.</string> <string name="game_env_proton_log">Sæt til 1 for en diagnostisk Proton-log. Logning kan reducere ydelsen og bruge lagerplads.</string> <string name="game_env_wined3d">Sæt til 1 for at bruge OpenGL-baseret WineD3D i stedet for DXVK til D3D9–11-kompatibilitetstest.</string> + <string name="game_env_wined3d_renderer">Renderer til DirectDraw, Direct3D 1-7 og spil, der kører med WineD3D. Vulkan springer OpenGL-via-Zink-vejen over og er meget hurtigere til gamle DirectDraw- og Direct3D 7-spil på Adreno.</string> + <string name="game_env_dxvk_d3d8">Sæt til 1 for at køre Direct3D 8 via DXVK i stedet for WineD3D. Hurtigere i AIO Graphics Tests Direct3D 8-test på Adreno.</string> <string name="game_env_no_ntsync">Sæt til 1 for at holde dette spil væk fra ntsync (droiddeck-ntsync eller en kerneldriver); det bruger droiddeck-esync, hvor en pack findes, ellers droiddeck-fsync.</string> <string name="game_env_no_esync">Sæt til 1 for at slå droiddeck-esync fra for dette spil; det bruger droiddeck-fsync i stedet, eller droiddeck-ntsync hvis fsync også er fra.</string> <string name="game_env_no_fsync">Sæt til 1 for at holde dette spil væk fra droiddeck-fsync; det bruger droiddeck-esync, hvor en pack findes, ellers droiddeck-ntsync.</string> <string name="game_env_fsync_first">Sæt til 1 for at køre dette spil på droiddeck-fsync, eller 0 for at sætte droiddeck-esync først, hvor en pack passer til dets Proton.</string> <string name="game_env_xalia">Sæt til 0 for at deaktivere Protons gamepad-navigationshjælper for dette spil.</string> + <string name="game_env_anticheat_offline">Til som standard. Starter et Easy Anti-Cheat-spil uden dets anti-cheat, når spillet understøtter offlinespil. Slå fra for at starte via Easy Anti-Cheat som normalt. Onlinetilstande, der kræver Easy Anti-Cheat, forbliver utilgængelige.</string> <string name="game_env_hud">DXVK-overlay til D3D9–11. fps viser billedhastigheden; lad stå tomt for at skjule den.</string> <string name="game_env_dxvk_config">DXVK-indstillinger adskilt af semikolon. Nyere builds bruger dxvk.maxFrameRate til at begrænse billedhastigheden; foretræk sessionens billedgrænse til almindeligt spil.</string> + <string name="game_env_cores">CPU-kerner til dette spil, f.eks. 0-4 eller 0,2,4, i stedet for sessionens spilkerner. Færre kerner kører køligere.</string> <string name="game_env_vkd3d_limit">Grænse for D3D12-billedhastighed. 0 deaktiverer grænsen.</string> <string name="game_env_glthread">Mesa OpenGL-threading. true kan hjælpe CPU-begrænsede OpenGL-spil; test for hvert spil.</string> <string name="sync_backend_title">Wine-synkronisering</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX kører x86-Linux-programmer på denne ARM64-enhed. Auto bruger det, når programmet er bygget til x86.</string> <string name="app_fex_x86">%1$s via FEX</string> <string name="app_fex_not_ready">Dette program er bygget til %1$s-pc’er og køres via FEX, som ikke er sat op endnu. Åbn Steam én gang, mens du er logget ind: DroidDeck downloader så FEX og den Steam Linux Runtime, det kræver, hvorefter dette åbner.</string> + <string name="session_proot_missing">DroidDecks proot kunne ikke downloades. Tjek forbindelsen, og prøv igen. Sessionen blev ikke startet, fordi reserve-proot er for langsom at spille på.</string> + <string name="session_directaudio_missing">DirectAudio kunne ikke downloades, så spillyd bruger den langsommere vej i denne session.</string> <string name="session_end_program">Dette program</string> <string name="session_end_steam_download">Steam-klienten kunne ikke downloades. Dit netværk eller din VPN blokerer muligvis Steams servere; tjek forbindelsen, og prøv igen.</string> <string name="session_end_steam_setup">Steam-klienten kunne ikke konfigureres. Tjek forbindelsen og den ledige lagerplads, og prøv igen.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360-controller</string> <string name="mode_controller_note">Deck: Hurtig adgang-knap og gyro. Steam Controller: det samme, med gribefølsomme bagknapper. DualShock 4 og DualSense: gyro, og touchpaddene som deres touchpad. Xbox 360: åbn Hurtig adgang med Guide+A.</string> <string name="mode_back">Tilbage</string> + <string name="back_hold">Hold Tilbage for Steam-genveje</string> + <string name="back_hold_hint">Hold Tilbage for at åbne Hurtig adgang eller lave Steam-kombinationer med andre knapper. Slå fra for at ignorere holdt Tilbage; tryk og dobbelttryk virker stadig.</string> + <string name="back_native_qam_hint">Hold Tilbage i 700 ms, eller hold Tilbage og tryk på en anden knap for Steam-genveje.</string> + <string name="back_double_tap_window">Tidsrum for dobbelttryk</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Tillad styring af lysstyrke</string> + <string name="brightness_permission_text">Konfigurer styring af lysstyrke i DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Session</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Udskyder baggrundspause, mens Steam aktivt downloader.</string> <string name="mode_suspend_note">Auto sætter på pause i baggrunden og genoptager, når den vises. Manuel venter på Genoptag. Aldrig fortsætter med at køre.</string> <string name="mode_startup">Opstart</string> - <string name="mode_steam_startup">Start Steam med DroidDeck</string> - <string name="mode_steam_startup_hint">Åbner Steam-sessionen, når DroidDeck starter.</string> + <string name="mode_startup_session">Åbn ved start</string> + <string name="mode_startup_session_hint">Starter denne session, når DroidDeck startes.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Søger efter udgivelser…</string> <string name="mode_decky_ready">Klar til at installere %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Opdateret · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Installer nyeste</string> + <string name="decky_channel">Opdateringskanal</string> + <string name="decky_channel_hint">Hvilke Decky Loader-udgivelser der installeres. Deckys egen opdatering bruger samme kanal.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Forhåndsudgivelse</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Kunne ikke gemme Decky-opdateringskanalen</string> <string name="mode_decky_on">Starter med Steam. Mens den er til, kan andre apps på denne enhed muligvis styre Steam.</string> <string name="mode_decky_off">Fra. Steams fjerndebugport forbliver lukket.</string> <string name="mode_decky_remove_title">Afinstaller Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Klient</string> <string name="mode_mangoapp">Ydelsesoverlay</string> <string name="mode_mangoapp_hint">Slå fra, hvis spil går ned eller bliver sorte i Deck-tilstand. Gælder fra næste session.</string> + <string name="mode_return_after_game">Vend tilbage til DroidDeck efter et spil</string> + <string name="mode_return_after_game_hint">Når et spil, du startede fra DroidDeck eller en anden launcher, lukkes, afslutter Steam pænt (cloud-gemninger afsluttes først), og du vender tilbage dertil. Fra: bliv i Steam.</string> + <string name="mode_shader_precache">Shader-forhåndscaching</string> + <string name="mode_shader_precache_hint">Steam downloader forudbyggede shadere til dine spil og behandler dem i baggrunden, så spil hakker mindre. Fra sparer data, lagerplads og batteri; spil bygger i stedet shadere undervejs. Samme indstilling som Steams Downloads > Shader Pre-Caching. Gælder fra næste session.</string> <string name="mode_steam_repair">Reparer Steam-klienten</string> <string name="mode_steam_repair_hint">Downloader Steam-klienten igen, næste gang Steam starter. Brug det, hvis Steam bliver hængende på sin indlæsningsskærm. Spil, login og indstillinger bevares.</string> <string name="mode_steam_repair_queued">Steam-klienten downloades igen, næste gang Steam starter.</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">Går uden om PulseAudio for lavere forsinkelse.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Til voicechat.</string> + <string name="drawer_mic_hint">Slå mikrofonoptagelse til eller fra for denne session.</string> + <string name="drawer_mic_failed">Kunne ikke ændre mikrofonen. Prøv igen.</string> <string name="mode_network">Netværk</string> <string name="mode_wifi_discovery">Wi-Fi-søgning</string> <string name="mode_wifi_discovery_hint">Vis Wi-Fi-navne og netværk i nærheden i Steam.</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: realtids-GPU-kø</string> <string name="perf_gsrealtime_hint">Prioriterer compositorens GPU-arbejde. Kan give jævnere billedtiming på bekostning af spillene.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Hukommelse</string> + <string name="perf_cap_off">Fra</string> + <string name="perf_cap_auto">Driverstandard</string> + <string name="perf_zram_client">Komprimer Steam, mens et spil kører</string> + <string name="perf_zram_client_hint">20 s efter et spil starter, komprimeres Steam-klienten i zRAM for at give spillet mere hukommelse, og læses tilbage, når spillet lukkes. Slå fra, hvis sessionen lukker kort efter, at spil starter. En RAM-grænse ovenfor komprimerer stadig Steam, når sessionen overskrider den.</string> + <string name="perf_ram_cap">RAM-grænse</string> + <string name="perf_ram_cap_hint">Gælder, mens Steam-klienten kører, i Steam-tilstand eller fra skrivebordet. Når sessionen bruger mere end dette, komprimeres Steam og derefter sessionens andre understøttede processer i zRAM. En blød grænse: intet lukkes, men spil kan hakke, mens sider hentes tilbage.</string> + <string name="perf_ram_cap_unavailable">Kræver zRAM-swap, som denne enhed ikke har.</string> + <string name="perf_vram_cap">VRAM-grænse</string> + <string name="perf_vram_cap_hint">Den videohukommelse, DXVK rapporterer til Direct3D-spil, så de budgetterer teksturer til mindre. Et spils egne DXVK-indstillinger har forrang. Træder i kraft ved næste session.</string> <string name="perf_gpuclock">Hold GPU’en på dens højeste clock</string> <string name="perf_gpuclock_hint">Kun Adreno. Færre hak, mere batteribrug og varme.</string> <string name="perf_fixes">Sessionsrettelser</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">proot-hurtigvej</string> <string name="perf_fastpath_needs_seccomp">Kræver prootets seccomp-filter.</string> <string name="perf_fastpath_hint">Hurtigere filopslag og mindre hak. Slå fra, hvis et program ikke kan finde sine filer.</string> + <string name="perf_cursor_composite">Tegn markøren i gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope tegner selv markøren i stedet for at overlade den til Android. Slå til for en controllerstyret markør. Fra er hurtigere på en telefon. Gælder fra næste session.</string> <string name="perf_identity">Sessionsidentitet</string> <string name="perf_hostname">Værtsnavn</string> <string name="perf_hostname_hint">Navnet Steam ser for denne enhed. Tomt gendanner %1$s.</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">Dens filer fjernes fra appen.</string> <string name="driver_delete_in_use">Dens filer fjernes. Den er i brug, så standarden tager over.</string> <string name="drawer_page_display">Skærm</string> + <string name="drawer_frame_limit">Billedgrænse</string> + <string name="drawer_frame_limit_note">Begrænser dette spil. Skærmen skifter til en opdateringshastighed, som grænsen går lige op i, når den har en; andre grænser kan virke ujævne. Steam-spil bruger Steams Frame Limit i Hurtig adgang-menuen.</string> <string name="drawer_page_effects">Effekter</string> <string name="drawer_page_controls">Kontroller</string> <string name="drawer_page_components">Komponenter</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">Pille</string> <string name="hud_size_minimal">Minimal</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Bjælke</string> <string name="hud_locked">Lås fast</string> <string name="hud_locked_hint">Træk i HUD for at flytte det; et langt tryk låser eller frigør det. Mens det er låst, virker skærmknapperne under det stadig.</string> + <string name="hud_snap">Fastgør til siderne</string> + <string name="hud_snap_hint">Slip HUD\'en, så flytter den sig til skærmens nærmeste side. Et hurtigt stryg kaster den i den retning.</string> <string name="hud_group_look">Udseende</string> <string name="hud_scale">Størrelse på skærmen</string> <string name="hud_color_soft">Blød</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">HUD-rapporten kunne ikke gemmes.</string> <string name="hud_reset">Nulstil HUD-indstillinger</string> <string name="hud_reset_button">Nulstil</string> - <string name="hud_credit">FusionHUD af The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Skaleringstilstand</string> <string name="drawer_scaling_sharpness">Skaleringsskarphed</string> <string name="drawer_effects">Skærmeffekter</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Tastatur</string> <string name="drawer_latency">Forsinkelse</string> + <string name="drawer_low_latency">Lav forsinkelse</string> + <string name="drawer_low_latency_hint">Øger CPU- og batteriforbrug</string> <string name="drawer_low_latency_controller">Controller med lav forsinkelse</string> <string name="drawer_low_latency_controller_hint">Controlleren rapporterer ved 1000 Hz i stedet for 250 Hz. Lidt mere CPU.</string> <string name="drawer_low_latency_touch">Berøring med lav forsinkelse</string> <string name="drawer_low_latency_touch_hint">Berøringer springer billedsamling over; Steams berøringsstyring kører ved 1000 Hz. Lidt mere CPU.</string> <string name="drawer_evdev_mouse">Rå musekanal</string> + <string name="drawer_relative_mouse">Relativ mus</string> + <string name="drawer_relative_mouse_auto">Automatisk</string> + <string name="drawer_relative_mouse_on">Til</string> + <string name="drawer_relative_mouse_off">Fra</string> <string name="drawer_direct_cursor">Markør</string> <string name="drawer_pc_keyboard">PC-tastatur</string> <string name="drawer_android_keyboard">Android</string> @@ -791,6 +838,10 @@ <string name="setup_session">Session</string> <string name="setup_logs">Sessionslogs</string> <string name="setup_logs_hint">Gemt efter hver session</string> + <string name="setup_game_debug_logs">Fejlfindingslogs for spil</string> + <string name="setup_game_debug_logs_hint">Medtag Proton-, Wine- og grafikdiagnostik ved næste spilstart. Kan reducere ydelsen og bruge mere lagerplads.</string> + <string name="setup_game_debug_logs_restart">Genstart denne session for at gemme fejlfindingslogs for spil</string> + <string name="setup_logging_update_failed">Kunne ikke opdatere logning. Tjek kontakten, og prøv igen.</string> <string name="setup_agent_commands">Fejlfindingsværktøjer</string> <string name="setup_latest_logs">Seneste sessionslogs</string> <string name="setup_saved_logs">Gemte sessionslogs</string> @@ -822,20 +873,22 @@ <string name="setup_home">Brug som startskærm</string> <string name="setup_home_on">DroidDeck kan være Home-appen</string> <string name="setup_home_off">DroidDeck tilbydes aldrig som Home-app</string> + <string name="setup_home_game_space_first">I Tilføj spil skal du sætte DroidDeck til Medtag</string> <string name="setup_orientation">Retning</string> + <string name="setup_launcher_orientation">Launcherens retning</string> + <string name="setup_launcher_orientation_auto">Følg enhedens rotation</string> + <string name="setup_orientation_portrait">Stående</string> + <string name="setup_session_orientation">Sessionens retning</string> + <string name="setup_session_orientation_hint">Gælder Steam, spil, skrivebordet og controllereditoren. Opløsningsforudindstillinger roterer med sessionen; brugerdefineret bredde og højde forbliver som angivet.</string> <string name="setup_orientation_auto">Automatisk liggende</string> <string name="setup_orientation_landscape">Liggende</string> <string name="setup_orientation_reverse">Omvendt liggende</string> <string name="setup_fullscreen">Fuldskærm</string> <string name="setup_fullscreen_on">Skjuler Androids status- og navigationsbjælker</string> <string name="setup_fullscreen_off">Viser Androids status- og navigationsbjælker</string> - <string name="setup_dual_screen">Dobbeltskærm</string> - <string name="setup_dual_screen_hint">Automatisk bruger den anden skærm på håndholdte enheder med en indbygget ekstra skærm. Til bruger enhver anden skærm. Fra holder alt på én skærm.</string> <string name="setup_dual_screen_auto">Automatisk</string> <string name="setup_dual_screen_on">Til</string> <string name="setup_dual_screen_off">Fra</string> - <string name="setup_dual_screen_menu">Menu på nederste skærm</string> - <string name="setup_dual_screen_menu_hint">Flytter sektionerne og menuen i spillet til den anden skærm og skriver der, så den øverste skærm beholder hele visningen. L2 og R2 skifter sektion.</string> <string name="setup_dual_screen_controls">Kontroller på nederste skærm i spil</string> <string name="setup_dual_screen_controls_hint">Åbner pegefeltet og tastaturet på den anden skærm, når en session starter.</string> <string name="dual_typing_title">Skriver til den øverste skærm</string> @@ -987,6 +1040,14 @@ <string name="gate_step1">Åbn Indstillinger → Udviklerindstillinger → Trådløs fejlretning, og slå den til</string> <string name="gate_step2">Tryk på “Par enhed med parringskode”</string> <string name="gate_step3">Indtast koden i DroidDeck-notifikationen</string> + <string name="pairguide_build_number">Tryk 7 gange på Buildnummer under Om telefonen</string> + <string name="pairguide_wireless">Slå Trådløs fejlretning til</string> + <string name="pairguide_pair">Åbn Trådløs fejlretning, og tryk på “Par enhed med parringskode”</string> + <string name="pairguide_child_process">Slå “Deaktiver begrænsningerne for underprocesser” til</string> + <string name="pairguide_row_child_process">Deaktiver begrænsningerne for underprocesser</string> + <string name="pairguide_row_build_number">Buildnummer</string> + <string name="pairguide_row_wireless">Trådløs fejlretning</string> + <string name="pairguide_row_pair">Par enhed med parringskode</string> <string name="gate_waiting">Venter på parringsvinduet…</string> <string name="gate_code_needed">Vindue fundet. Indtast dets kode i notifikationen.</string> <string name="gate_status">Status</string> @@ -1125,7 +1186,6 @@ <string name="games_never_played">Aldrig spillet</string> <string name="games_runtime_busy_percent">Runtime optaget · %1$d%%</string> <string name="games_runtime_busy">Runtime optaget</string> - <string name="games_runtime_first_play">Runtime installeres ved første Spil</string> <string name="games_runtime_update">Runtimeopdatering tilgængelig</string> <string name="games_runtime_ready">● Runtime klar</string> <string name="games_internal">Internt lager</string> @@ -1142,6 +1202,9 @@ <string name="gpu_hide_other">Skjul drivere til andre GPU’er</string> <string name="gpu_show_other">Vis drivere til andre GPU’er</string> <string name="gpu_advanced">Avanceret</string> + <string name="gpu_ubwc_title">UBWC-kompatibilitet</string> + <string name="gpu_ubwc_hint">Prøv Til eller Fra, hvis Steam eller Android viser striber eller flimmer. Gælder begge drivere efter genstart af DroidDeck.</string> + <string name="gpu_ubwc_restart">Genstart DroidDeck for at anvende.</string> <string name="gpu_set_with_display">Angives sammen med skærmdriveren: %1$s dækker begge.</string> <string name="gpu_set_with_runtime">Angives sammen med runtimedriveren: %1$s dækker begge.</string> <string name="gpu_runtime_hint">Bruges af spil og skrivebordet.</string> @@ -1250,10 +1313,15 @@ <string name="pip_auto">Gå automatisk til billede i billede</string> <string name="unfolded_controls">Kontroller på den udfoldede skærm</string> <string name="unfolded_controls_hint">Når skærmen er foldet ud, ligger spillet over Steam Decks trackpads og grebsknapper. Når den er foldet sammen, fylder spillet hele skærmen.</string> + <string name="unfolded_controls_with_controller">Behold dem med en controller</string> + <string name="unfolded_controls_with_controller_hint">Vis også disse berøringskontroller, mens en controller er tilsluttet.</string> <string name="pip_suspended">Sat i bero</string> <string name="pip_not_ready">Billede i billede er tilgængeligt, når sessionen er klar.</string> <string name="pip_permission">Tillad billede i billede for DroidDeck i Android-indstillingerne.</string> <string name="pip_unavailable">Android kunne ikke åbne billede i billede.</string> + <string name="game_more">Mere</string> + <string name="game_edit_art">Rediger grafik</string> + <string name="stores_in_steam_label">I Steam</string> <string name="game_shortcut">Genvej</string> <string name="game_shortcut_add">Tilføj til hjemmeskærm</string> <string name="game_shortcut_choose">Vælg spil</string> @@ -1277,6 +1345,10 @@ <string name="main_wait_runtime">Vent til runtime-handlingen er færdig</string> <string name="main_wait_proton_install">Vent til installationen af kompatibilitetsværktøjet er færdig</string> + <string name="load_compat_title">Forbereder kompatibilitetsværktøjer</string> + <string name="load_compat_wait">Venter på, at kompatibilitetsopsætningen bliver færdig</string> + <string name="load_compat_hint">Din session starter, når opsætningen er færdig.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Vent til installationen af skrivebordsappen er færdig</string> <string name="main_wait_install_game">Vent til installationen er færdig, før du starter et spil</string> <string name="main_saves_close_session">Luk Steam-sessionen først, så spillet ikke overskriver importen</string> @@ -1313,6 +1385,9 @@ <string name="main_install_anyway">Installer alligevel</string> <string name="main_remove_runtime_title">Fjern Linux-runtime</string> <string name="main_remove_runtime_text">Dette sletter runtime\'en, Steam-klienten i den og alle spil installeret der.</string> + <string name="runtime_actions_title">Linux-runtime</string> + <string name="runtime_actions_text">Reparer geninstallerer runtimens systemfiler og bevarer Steam, dine spil og indstillinger. Ekstra komponenter som skrivebordet installeres igen, næste gang du bruger dem. Fjern sletter alt.</string> + <string name="runtime_repair">Reparer runtime</string> <string name="main_applied">Anvendt: %1$s</string> <string name="android_app_open_failed_primary">Kunne ikke åbne %1$s på den primære skærm</string> <string name="android_app_open_failed_on">Kunne ikke åbne %1$s på %2$s</string> @@ -1442,6 +1517,11 @@ <string name="session_runtime_catalog_unreachable">Kunne ikke nå runtime-kataloget. Kontroller forbindelsen, og tryk på Spil igen.</string> <string name="session_runtime_install_failed">Linux-runtime blev ikke installeret. Kontroller runtime i Opsætning, og tryk på Spil igen.</string> <string name="session_desktop_install_failed">Skrivebordet blev ikke installeret (%1$s). Kontroller forbindelsen, og tryk på Skrivebord igen.</string> + <string name="session_package_resume_failed">En afbrudt installation kunne ikke fuldføres (%1$s). Tjek forbindelsen og den ledige plads, og prøv igen.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux-runtimen er beskadiget: %1$d bibliotekslink peger på en manglende fil (%2$s), som regel efter en afbrudt installation. Reparer bevarer dine spil og indstillinger.</item> + <item quantity="other">Linux-runtimen er beskadiget: %1$d bibliotekslinks peger på manglende filer (%2$s og andre), som regel efter en afbrudt installation. Reparer bevarer dine spil og indstillinger.</item> + </plurals> <string name="session_ended_named">%1$s stoppede uventet. Del logs med en fejlrapport, eller prøv igen.</string> <string name="session_ended_program">Programmet stoppede uventet. Del logs med en fejlrapport, eller prøv igen.</string> <string name="session_ended_desktop">Skrivebordet stoppede uventet. Del logs med en fejlrapport, eller prøv igen.</string> @@ -1456,6 +1536,13 @@ <string name="mode_decky_plugins_hint">Installer en plugin-ZIP til den næste Steam-session.</string> <string name="mode_decky_plugin_downloading">Downloader…</string> <string name="mode_decky_plugin_install_zip">Installer fra ZIP</string> + <string name="decky_zip_warning_title">Installation af tredjeparts-plugin</string> + <string name="decky_zip_warning_text">Decky Loader-teamet har ikke gennemgået dette plugin. Det kan indeholde malware, f.eks. software, der stjæler din Steam-konto eller skader din enhed. Ved at installere dette plugin accepterer du, at du påtager dig al risiko for din enhed.</string> + <string name="decky_zip_warning_continue">Fortsæt</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Vent %1$d sekund</item> + <item quantity="other">Vent %1$d sekunder</item> + </plurals> <string name="store_cat_games">Spil</string> <string name="store_cat_audio_video">Lyd og video</string> <string name="store_cat_graphics">Grafik</string> @@ -1511,7 +1598,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">Mellemrum</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1617,6 +1704,8 @@ <string name="fm_accept">Accepter</string> <string name="fm_decline">Afvis</string> <string name="fm_drive_not_readable">%1$s er monteret, men kan ikke læses lige nu</string> + <string name="fm_drive_access_title">Giv adgang til %1$s</string> + <string name="fm_drive_access_text">Android lader DroidDeck se dette drev, men ikke læse det. Slå Adgang til alle filer til for DroidDeck, og kom så tilbage.</string> <string name="fm_list_view">Listevisning</string> <string name="fm_grid_view">Gittervisning</string> <string name="fm_search">Søg</string> @@ -1688,6 +1777,89 @@ <string name="second_mode_keyboard_trackpad">Tastatur + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck-greb + trackpads</string> + <string name="second_mode_dashboard">Dashboard</string> + <string name="bottom_dashboard_empty">Intet at vise her endnu.</string> + <string name="bottom_page_downloads">Downloads</string> + <string name="bottom_downloads_none">Ingen downloads i gang.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Downloader shader-cache</string> + <string name="bottom_downloads_paused">På pause</string> + <string name="bottom_downloads_queued">Venter på at starte</string> + <string name="bottom_page_notifications">Notifikationer</string> + <string name="bottom_notifications_listener">DroidDecks nederste skærm</string> + <string name="bottom_notifications_why">Vis beskeder og andre notifikationer her, mens du spiller. De bliver kun på denne skærm og gemmes ikke. Android spørger én gang: siden for notifikationsadgang åbnes på denne skærm; slå DroidDeck til der, så vender denne side selv tilbage.</string> + <string name="bottom_notifications_allow">Tillad notifikationsadgang</string> + <string name="bottom_notifications_none">Ingen notifikationer.</string> + <string name="bottom_notifications_count">%1$d notifikationer</string> + <string name="bottom_notifications_clear">Ryd</string> + <string name="bottom_page_screenshots">Skærmbilleder</string> + <string name="stats_fps_needs_hud">FPS kræver, at HUD er slået til</string> + <string name="stats_speed">Hastighed</string> + <string name="stats_pedals">Pedaler</string> + <string name="stats_gforce">G-kraft</string> + <string name="stats_timing">Tider</string> + <string name="stats_best_lap">Bedste omgang</string> + <string name="stats_tires">Dæk °C</string> + <string name="stats_trace">Speeder og bremse, seneste 10 s</string> + <string name="stats_speed_chart">Hastighed, %1$s</string> + <string name="stats_gear">Gear</string> + <string name="stats_steam_client_arm">Steam-klient ARM</string> + <string name="stats_steam_client_x86">Steam-klient x86</string> + <string name="stats_throttle">Speeder</string> + <string name="stats_brake">Bremse</string> + <string name="stats_lights">Kontrollamper</string> + <string name="stats_lamp_shift">Gearskift</string> + <string name="stats_lamp_handbrake">Håndbremse</string> + <string name="stats_lamp_pit">Pitbegrænser</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olie %1$s °C</string> + <string name="stats_power">Energifordeler</string> + <string name="stats_fuel_t">Brændstof, t</string> + <string name="stats_fuel_main">Hoved %1$s t</string> + <string name="stats_fuel_reserve">Reserve %1$s t</string> + <string name="bottom_telemetry_send_title">Send instrumentbrætdata</string> + <string name="bottom_telemetry_send_auto">Auto</string> + <string name="bottom_telemetry_send_auto_hint">Slår det til for alle spil på listen her, også spil, der findes senere. Spil, du slår fra, forbliver slået fra.</string> + <string name="bottom_telemetry_send_note">Dette ændrer spillets egen indstilling for dataoutput. Det træder i kraft, næste gang spillet starter; slås det fra, gendannes den gamle indstilling.</string> + <string name="bottom_telemetry_send_close">Luk %1$s for at ændre dette.</string> + <string name="bottom_telemetry_send_failed">Kunne ikke ændre indstillingerne for %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: slå %2$s til i spillets indstillinger med IP 127.0.0.1 og port %3$d.</string> + <string name="bottom_shots_where">Gemmes i Pictures/DroidDeck. Steam-skærmbilleder vises også her.</string> + <string name="bottom_shots_take">Tag skærmbillede</string> + <string name="bottom_shots_saved">Skærmbillede gemt.</string> + <string name="bottom_shots_failed">Kunne ikke tage et skærmbillede.</string> + <string name="bottom_shots_none">Ingen skærmbilleder endnu.</string> + <string name="bottom_page_chat">Chat og stemme</string> + <string name="bottom_chat_why">Læs og besvar Steam-chat her, mens spillet fortsætter på hovedskærmen. Den bruger den konto, Steam er logget ind med.</string> + <string name="bottom_chat_not_signed_in">Steam har endnu ikke et weblogin at dele, så log ind her én gang.</string> + <string name="bottom_chat_stopped">Android lukkede chatsiden, mens DroidDeck var i baggrunden. Den åbner igen, når du vender tilbage til DroidDeck.</string> + <string name="bottom_chat_open">Åbn Steam Chat</string> + <string name="bottom_chat_close">Luk chat</string> + <string name="bottom_chat_mic_on">Mikrofon til</string> + <string name="bottom_chat_mic_off">Mikrofon fra</string> + <string name="bottom_chat_mic_unavailable">Mikrofonen er slået fra for dette spil. For at tale skal du slå Mikrofon til i DroidDecks Steam-indstillinger (Lyd) og starte spillet igen.</string> + <string name="bottom_chat_volume">Lydstyrke %1$d%%</string> + <string name="bottom_page_telemetry">Statistik i spillet</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batteri</string> + <string name="bottom_telemetry_lap">Omgang</string> + <string name="bottom_telemetry_position">Placering</string> + <string name="bottom_telemetry_this_lap">Denne omgang</string> + <string name="bottom_telemetry_last_lap">Sidste omgang</string> + <string name="bottom_telemetry_fuel">Brændstof</string> + <string name="bottom_telemetry_cargo">Last</string> + <string name="bottom_telemetry_pips">Energi SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Juridisk status</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Port %1$d modtager data (%2$d pakker á %3$d bytes), men i et format, som denne side endnu ikke kan læse.</string> + <string name="bottom_telemetry_port_busy">Et andet program bruger allerede port %1$s, så det spil kan ikke vises her.</string> <string name="rtinst_removing">Fjerner Linux-runtime</string> <plurals name="rtinst_removing_entries"> @@ -1718,6 +1890,7 @@ <string name="flatpakmgr_not_ready">Opsæt Flatpak først</string> <string name="flatpakmgr_starting">Starter</string> <string name="flatpakmgr_exit_status">Flatpak afsluttede med status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s er bygget til %2$s, som DroidDeck ikke kan køre. Flatpak-apps her skal være bygget til ARM64 eller x86_64.</string> <string name="flatpakmgr_installing">Installerer %1$s</string> <string name="flatpakmgr_updating">Opdaterer %1$s</string> <string name="flatpakmgr_removing">Fjerner %1$s</string> @@ -1811,6 +1984,7 @@ <string name="adbpair_applying">Anvender indstillingen…</string> <string name="adbpair_command_failed">Kommando til Trådløs fejlretning mislykkedes</string> <string name="adbpair_channel_name">Opsætning af Trådløs fejlretning</string> + <string name="adbpair_progress_channel_name">Status for opsætning af trådløs fejlretning</string> <string name="adbpair_channel_description">Spørger efter parringskoden til Trådløs fejlretning, mens Indstillinger er åben</string> <string name="adbpair_title_pair">Par Trådløs fejlretning</string> <string name="adbpair_waiting_text">Tænd Trådløs fejlretning, og tryk derefter på „Par enhed med parringskode“.</string> @@ -1919,6 +2093,7 @@ <string name="gpuinfo_not_adreno">Ikke en Adreno-GPU</string> <string name="gpuinfo_supported">Understøttet</string> <string name="gpuinfo_experimental">Eksperimentel: dens drivere er testversioner</string> + <string name="gpuinfo_a850_experimental">Eksperimentel Adreno 850-understøttelse: kræver kompatible eksperimentelle skærm- og spildrivere; ikke bekræftet på denne enhed</string> <string name="gpuinfo_below_tested">Under testet hardware (Adreno 725 og nyere): kører muligvis ikke</string> <string name="gpuinfo_unsupported">Ikke understøttet: DroidDeck kræver en Adreno (Snapdragon) GPU</string> @@ -2015,6 +2190,7 @@ <string name="display_look_filter">%1$s Indstiller skalering til %2$s.</string> <string name="display_match_screen">Match skærm (%1$d×%2$d)</string> <string name="display_follow_screen">Følg skærm (ændrer størrelse ved fold/udfold)</string> + <string name="display_follow_screen_scaled">Skaleret %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Vis enhedsoplysninger</string> <string name="device_info_hide">Skjul enhedsoplysninger</string> @@ -2121,6 +2297,13 @@ <string name="stores_resume">Genoptag</string> <string name="stores_refresh">Opdater</string> <string name="stores_sort">Sortér</string> + <string name="setup_rail_labels">Sidepanelets etiketter</string> + <string name="setup_rail_labels_hint">Vis navne under ikonerne i sidepanelet. Slå fra for et smallere sidepanel.</string> + <string name="library_display">Visning</string> + <string name="library_display_larger">Større kort</string> + <string name="library_display_smaller">Mindre kort</string> + <string name="library_display_title">Vis titel</string> + <string name="library_display_size">Vis størrelse</string> <string name="stores_sort_last_played">Senest spillet</string> <string name="stores_sort_recently_installed">Senest installeret</string> <string name="stores_sort_title_asc">Titel A–Å</string> @@ -2247,6 +2430,9 @@ <string name="stores_download_manager">Downloadadministrator</string> <string name="stores_parallel">Downloads på samme tid</string> <string name="stores_install_where">Installer til</string> + <string name="stores_install_language">Spilsprog</string> + <string name="stores_install_language_hint">GOG og Epic installerer dette sprog. System følger appens sprog.</string> + <string name="stores_install_language_system">System</string> <string name="stores_install_title">Installer %1$s:</string> <string name="stores_target_internal">Intern</string> <string name="stores_target_free">%1$s fri</string> @@ -2285,6 +2471,9 @@ <string name="edit_target">Mål</string> <string name="edit_start_in">Start i</string> <string name="edit_launch_options">Startindstillinger</string> + <string name="edit_launch_options_steam_hint">Delt med Egenskaber i Steam: en ændring det ene sted vises begge steder.</string> + <string name="edit_launch_options_not_saved">Startindstillingerne kunne ikke gemmes i Steam. Prøv igen.</string> + <string name="edit_launch_options_desktop">Steam kan være åben i skrivebordssessionen. Skift startindstillingerne under dens Egenskaber, eller luk sessionen først.</string> <string name="edit_artwork">Grafik</string> <string name="edit_other_exe">Anden exe…</string> <string name="edit_remove">Fjern</string> @@ -2412,6 +2601,7 @@ <string name="setup_download_source_custom">Eget præfiks</string> <string name="setup_download_mirror">Websted</string> <string name="setup_download_prefix">Præfiks</string> + <string name="setup_download_proxy">HTTP-proxy</string> <string name="flathub_eyebrow">LINUX-APPS</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Desktopapps til Linux-desktoppen, åbnet fra Desktop.</string> @@ -2529,7 +2719,7 @@ <string name="glasses_game_on_hint">Vis kun spillet på brillen. Fra: telefonen viser det, og Android spejler telefonen.</string> <string name="glasses_display">Skærm</string> <string name="glasses_refresh">Opdateringshastighed</string> - <string name="glasses_3d">3D (side-by-side)</string> + <string name="glasses_3d">3D (side om side)</string> <string name="glasses_3d_hint">Skift smartbrillerne til side-om-side 3D. Hovedsporing styres separat.</string> <string name="glasses_3d_failed">3D-signalet blev ikke bekræftet. Prøv igen, når 2D-billedet er tilbage.</string> <string name="glasses_no_signal">Intet billede: brillen er i en tilstand, som telefonen ikke kan sende. Hold dens 2D/3D-knap inde, eller tag stikket ud og sæt det i igen.</string> @@ -2552,6 +2742,22 @@ <string name="glasses_tracking_flat_hint">Automatisk holder dette 2D-spil fast i synsfeltet. Vælg Virtuel skærm under Skærm for at bruge hovedsporing.</string> <string name="glasses_tracking_sbs_hint">Hovedsporing gælder for en virtuel skærm eller et kørende SteamVR-spil.</string> <string name="glasses_hardware">Enhed</string> + <string name="vr_controllers_tab">Controllere</string> + <string name="vr_controllers_group">SteamVR-controllere</string> + <string name="vr_controllers_emulate">Gamepad i VR</string> + <string name="vr_controllers_emulate_hint">De to VR-hænder, din controller fungerer som. Ændringer gælder med det samme, også mens SteamVR kører. Joy-Cons og sporede hænder overtager stadig deres side.</string> + <string name="vr_controllers_off">Almindelig gamepad</string> + <string name="vr_controllers_index">Valve Index-controllere</string> + <string name="vr_controllers_touch">Meta Quest 3-controllere</string> + <string name="vr_controllers_vive">HTC Vive-controllere</string> + <string name="vr_controllers_sticks">Pindene starter med</string> + <string name="vr_controllers_sticks_hint">Tryk begge pinde ind samtidig i VR for at skifte.</string> + <string name="vr_controllers_sticks_game">At flytte dig i spillet</string> + <string name="vr_controllers_sticks_hands">At flytte hænderne</string> + <string name="vr_controllers_buttons">Knapper</string> + <string name="vr_controllers_buttons_stick">Triggere er triggere, bumpere griber, A/B og X/Y er hver hånds frontknapper, pindeklik klikker på thumbsticks, Guide åbner SteamVR-menuen. D-pad op og ned flytter hænderne tættere på eller længere væk.</string> + <string name="vr_controllers_buttons_vive">Pindene er trackpads; A/X eller et pindeklik trykker på dem. Triggere er triggere, bumpere griber, Start og Select er menu, Guide åbner SteamVR-menuen.</string> + <string name="vr_controllers_buttons_off">Ingen VR-hænder. Spil, der understøtter en gamepad, og SteamVR-menuen får din controller som normalt.</string> <string name="glasses_brightness">Lysstyrke</string> <string name="glasses_volume">Lydstyrke</string> <string name="glasses_sunblock">Solafskærmning</string> @@ -2609,6 +2815,12 @@ <string name="hand_camera_placement">Kameraplacering</string> <string name="hand_camera_placement_hint">Tjek, at kameraet kan se dig, før du spiller.</string> <string name="hand_camera_check">Tjek</string> + <string name="tracking_pack_title">Download af håndsporing</string> + <string name="tracking_pack_hint">Håndsporing kræver en engangsdownload på %1$s.</string> + <string name="tracking_pack_download">Download</string> + <string name="tracking_pack_retry">Prøv igen</string> + <string name="tracking_pack_downloading">Downloader håndsporing… %1$d%%</string> + <string name="tracking_pack_failed">Håndsporing kunne ikke downloades. Tjek din forbindelse, og prøv igen.</string> <string name="hand_camera_check_title">Kameraplacering</string> <string name="hand_camera_how_rear">Stil enheden op 1,5 til 2 meter væk i cirka brysthøjde med bagkameraet vendt mod dig. Træd så ind i billedet med hænderne ude.</string> <string name="hand_camera_how_front">Stil enheden op 1,5 til 2 meter væk i cirka brysthøjde med skærmen vendt mod dig. Træd så ind i billedet med hænderne ude.</string> @@ -2680,6 +2892,21 @@ <string name="storage_safe_hint">Ubrugte kørselsmiljøer, rester, gamle logfiler</string> <string name="storage_clean_up">Rydder op…</string> <string name="storage_session_running">Stop sessionen for at rydde op eller slette noget. Størrelserne vises stadig.</string> + <string name="storage_default_group">Installationsplacering</string> + <string name="storage_default_title">Standardlager</string> + <string name="storage_default_hint">Nye butiksinstallationer går til den valgte placering. Eksisterende spil bliver, hvor de er. Steam-biblioteker har deres egen indstilling.</string> + <string name="storage_default_ask">Spørg hver gang</string> + <string name="storage_default_ask_detail">Vælg en placering for hver installation</string> + <string name="storage_default_internal">Internt lager</string> + <string name="storage_default_external">Eksternt lager</string> + <string name="storage_default_external_detail">%1$s · %2$s ledigt</string> + <string name="storage_default_external_missing">Ikke tilsluttet</string> + <string name="storage_default_folder">Mappe · %1$s</string> + <string name="storage_default_folder_free">%1$s ledigt</string> + <string name="storage_default_folder_missing">Ikke tilsluttet</string> + <string name="storage_default_choose_folder">Vælg mappe…</string> + <string name="storage_default_choose_folder_detail">Brug en hvilken som helst mappe på et SD-kort eller USB-drev</string> + <string name="storage_default_note">Spil placeres i en Games-mappe på den valgte placering. Eksisterende spil flyttes ikke.</string> <string name="storage_where">Hvor det ender</string> <string name="storage_games">Steam-spil</string> <string name="storage_game_data">Spildata</string> @@ -2801,6 +3028,9 @@ <string name="storage_data_installed">Installerede spil</string> <string name="storage_data_parts">Præfiks %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Ryd shaders</string> + <string name="storage_reset_prefix">Nulstil prefix</string> + <string name="storage_reset_prefix_title">Nulstil prefix for %1$s?</string> + <string name="storage_reset_prefix_confirm">Sletter dets Wine-prefix (%1$s) i %2$s og genopretter det ved næste start. Gemte spil, indstillinger og installerede redistributables i det går tabt; Steam Cloud-gemninger forbliver på din konto.</string> <string name="storage_data_leftovers">Slettede spil</string> <string name="storage_steam_app">Steam-app %1$d</string> <string name="storage_leftover_unsure_detail">Præfikset indeholder stadig filer, måske lokale gemte spil</string> @@ -3102,6 +3332,117 @@ <string name="spatial_saved_views_hint">Gemte visninger kan genberegnes. Start en ny kalibrering for at fange i det aktuelle sporingskoordinatsystem.</string> <string name="spatial_model_checksum_error">Håndmodel kontrolsum uoverensstemmelse</string> <string name="spatial_opencv_load_error">OpenCV kunne ikke indlæse</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synkroniser med Syncthing</string> + <string name="sync_enable_hint">Baseret på Syncthing-Fork er dette en Syncthing-implementering, der lader dig synkronisere filer i DroidDecks interne filsystem med andre Syncthing-instanser. Det gælder kun filer, du gemmer i DroidDecks interne filsystem.</string> + <string name="sync_missing">Denne build indeholder ikke Syncthing.</string> + <string name="sync_starting">Starter Syncthing</string> + <string name="sync_status_starting">Starter</string> + <string name="sync_status_up_to_date">Opdateret</string> + <string name="sync_status_syncing">Synkroniserer</string> + <string name="sync_status_paused">Sat på pause</string> + <string name="sync_status_pausing">Sætter på pause</string> + <string name="sync_status_resuming">Genoptager</string> + <string name="sync_status_attention">Kræver opmærksomhed</string> + <string name="sync_status_failed">Syncthing er stoppet</string> + <string name="sync_failed_retry">Prøv igen</string> + <string name="sync_paused_wifi">På pause indtil Wi-Fi</string> + <string name="sync_paused_game">På pause under spillet</string> + <string name="sync_summary">%1$d mapper · %2$d af %3$d enheder forbundet</string> + <string name="sync_left">%1$s tilbage</string> + <string name="sync_open_web_ui">Åbn webgrænsefladen</string> + <string name="sync_pause">Sæt på pause</string> + <string name="sync_resume">Genoptag</string> + <string name="sync_running">Kører</string> + <string name="sync_running_hint">Slå fra for at stoppe Syncthing helt.</string> + <string name="sync_this_device">Denne enhed</string> + <string name="sync_device_id">Enheds-ID</string> + <string name="sync_show_qr">Vis QR</string> + <string name="sync_advanced">Avanceret</string> + <string name="sync_advanced_hint">Porte, hvornår der køres, nulstilling</string> + <string name="sync_open">Åbn</string> + <string name="sync_waiting">Venter på dig</string> + <string name="sync_pending_device">%1$s vil gerne forbinde</string> + <string name="sync_pending_folder">%1$s vil gerne dele »%2$s«</string> + <string name="sync_pending_folder_hint">Accepter for at vælge, hvor den gemmes i DroidDeck.</string> + <string name="sync_review">Gennemse i webgrænsefladen</string> + <string name="sync_folders">Mapper</string> + <string name="sync_no_folders">Ingen mapper endnu.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Opdateret</string> + <string name="sync_folder_syncing">Synkroniserer %1$d%%</string> + <string name="sync_folder_scanning">Scanner</string> + <string name="sync_folder_paused">Sat på pause</string> + <string name="sync_folder_out_of_sync">Ikke synkroniseret</string> + <string name="sync_folder_errors">%1$d filer kunne ikke synkroniseres</string> + <string name="sync_folder_blocked">Blokeret</string> + <string name="sync_folder_blocked_hint">Denne mappe ligger uden for DroidDecks lager, så DroidDeck har sat den på pause. Brug appen Syncthing-Fork til at synkronisere mapper uden for DroidDeck.</string> + <string name="sync_remove_folder">Fjern fra Syncthing</string> + <string name="sync_remove_folder_hint">Fjernelse sletter ingen filer.</string> + <string name="sync_devices">Enheder</string> + <string name="sync_no_devices">Ingen enheder endnu.</string> + <string name="sync_connected">Forbundet</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Sidst set %1$s</string> + <string name="sync_device_id_title">Denne enheds ID</string> + <string name="sync_device_id_hint">Tilføj en enhed i Syncthing på din anden enhed, og scan denne kode, eller indsæt ID\'et. Accepter den derefter her i webgrænsefladen.</string> + <string name="sync_copy">Kopiér</string> + <string name="sync_share">Del</string> + <string name="sync_done">Færdig</string> + <string name="sync_off_title">Slå Syncthing fra?</string> + <string name="sync_off_body">Syncthing stopper nu og forbliver stoppet, indtil det slås til igen. Synkroniserede filer bliver, hvor de er.</string> + <string name="sync_off_forget">Slet også Syncthings konfiguration</string> + <string name="sync_off_forget_hint">Fjerner denne enheds ID, mapper og enheder. Når det slås til igen, starter det forfra.</string> + <string name="sync_turn_off">Slå fra</string> + <string name="sync_ports">Porte</string> + <string name="sync_port_sync">Synkronisering</string> + <string name="sync_port_discovery">Lokal opdagelse</string> + <string name="sync_repick">Vælg nye porte</string> + <string name="sync_repick_hint">Kontrolleres igen ved hver start.</string> + <string name="sync_repick_button">Vælg igen</string> + <string name="sync_reset_group">Nulstil</string> + <string name="sync_api_key">API-nøgle</string> + <string name="sync_regenerate">Generér ny</string> + <string name="sync_reset">Nulstil Syncthing</string> + <string name="sync_reset_hint">Nyt enheds-ID, mapper og enheder fjernes. Filer i DroidDecks lager bevares.</string> + <string name="sync_reset_button">Nulstil</string> + <string name="sync_reset_confirm_title">Nulstil Syncthing?</string> + <string name="sync_running_group">Kørsel</string> + <string name="sync_run">Kør</string> + <string name="sync_run_open">Mens DroidDeck er åben</string> + <string name="sync_run_background">I baggrunden</string> + <string name="sync_wifi_only">Kun Wi-Fi</string> + <string name="sync_pause_games">Sæt på pause under spil</string> + <string name="sync_logs">Logfiler</string> + <string name="sync_logs_hint">Syncthing-output for denne session</string> + <string name="sync_logs_share">Del</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Konfigurer Linux-runtimen først.</string> + <string name="sync_accept">Accepter</string> + <string name="sync_accept_title">Gem »%1$s« i</string> + <string name="sync_add_folder">Tilføj mappe</string> + <string name="sync_add_folder_hint">Synkroniser en mappe i DroidDecks lager</string> + <string name="sync_choose">Vælg</string> + <string name="sync_add">Tilføj</string> + <string name="sync_add_failed">Mappen kunne ikke tilføjes.</string> + <string name="sync_share_with">Del med</string> + <string name="sync_share_none">Ingen enheder endnu. Du kan dele mappen fra webgrænsefladen senere.</string> + <string name="sync_use_folder">Brug denne mappe</string> + <string name="sync_new_folder">Ny mappe</string> + <string name="sync_location_home">Containerens hjemmemappe</string> + <string name="sync_location_sync">Sync-mappe</string> + <string name="sync_location_shared">DroidDecks delte lager</string> + <string name="sync_location_card">DroidDeck på %1$s</string> + <string name="sync_location_app">DroidDecks appdata</string> + <string name="sync_web_path_locked">Nye mapper gemmes i DroidDecks Sync-mappe. Brug Tilføj mappe på fanen Syncthing for at synkronisere en anden DroidDeck-mappe.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Genindlæs</string> + <string name="sync_not_running">Syncthing kører ikke.</string> + <string name="session_end_steam_sigill">Steam stoppede med en ulovlig instruktion (SIGILL). Det kan være et kompatibilitetsproblem med CPU-instruktioner eller et klientnedbrud. Del logs med oplysninger om din enhed.</string> + <string name="session_end_steam_try_x64">Du kan prøve Steam-indstillinger → Steam-klient → x86-64 (eksperimentel). Det kræver en ekstra download og kan køre langsommere.</string> + <string name="session_end_vulkan_device">Linux-grafikdriveren kunne ikke finde en brugbar Vulkan-enhed. Tjek, at den valgte Linux-GPU-driver understøtter denne GPU.</string> + <string name="session_end_gpu_unsupported">Denne session kan ikke starte, fordi denne GPU ikke har nogen kompatibel Linux Vulkan-driver i den nuværende opsætning. Adreno Turnip-drivere kan ikke aktivere understøttelse af MediaTek/Mali-GPU’er.</string> <string name="setup_group_memory">Hukommelse</string> <string name="setup_clear_cached">Luk cachelagrede apps før en session</string> <string name="setup_clear_cached_hint">Når en session starter, lukker DroidDeck de apps, Android holder parkeret i baggrunden, så spillet får mere hukommelse. Trådløs fejlretning skal være slået til.</string> @@ -3125,6 +3466,12 @@ <string name="epic_client_open">Åbn</string> <string name="epic_client_install">Installer</string> <string name="game_tab_about">Om</string> + <string name="game_resources_browser">Åbnes i din browser</string> + <string name="game_resource_guides">Guider</string> + <string name="game_resource_protondb_detail">Linux/Proton-kompatibilitetsrapporter</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Til spil med gemte data på din Steam-konto</string> + <string name="game_resource_search">Websøgning</string> <string name="game_tab_install">Installer</string> <string name="game_install_location">Placering</string> <string name="game_install_folder">Mappe</string> @@ -3141,6 +3488,11 @@ <string name="stores_eyebrow_pass">tilgængelig med %1$s</string> <string name="stores_owned_in_library">Ejede spil i Bibliotek</string> <string name="library_filter_added">Tilføjet</string> + <string name="library_filter">Filter</string> + <string name="library_filter_installed">Kun installerede</string> + <string name="library_filter_all_owned">Alle ejede spil</string> + <string name="library_no_installed_matches">Ingen installerede spil matcher disse filtre.</string> + <string name="library_browse_owned">Gennemse ejede spil</string> <string name="game_tab_launch">Start</string> <string name="game_tab_saves_cloud">Gemte spil og sky</string> <string name="game_launch_shortcut">Steam-genvej</string> @@ -3158,6 +3510,40 @@ <string name="stores_itch_update_replaced">Udvikleren har erstattet denne version med %1$s. Opdater til den?</string> <string name="xbox_filter_cloud">Sky</string> <string name="stores_xbox_cloud_settings">Skyindstillinger</string> + <string name="integration_title">Steam-integration</string> + <string name="integration_count">%1$d af %2$d til</string> + <string name="integration_set_up">Konfigurer</string> + <string name="integration_location">Placering</string> + <string name="integration_app_info">Appinfo</string> + <string name="integration_wifi">Wi-Fi-navne</string> + <string name="integration_brightness">Lysstyrke</string> + <string name="integration_home">DroidDeck som startskærm</string> + <string name="integration_shortcuts">Systemtaster</string> + <string name="integration_wifi_hint">Vis netværk i Steam · kræver placeringsadgang, spores aldrig</string> + <string name="integration_wifi_on">Netværk vises i Steam</string> + <string name="integration_wifi_location_off">Placering er slået fra</string> + <string name="integration_wifi_denied">Placering afvist · tillad den i Appinfo</string> + <string name="integration_brightness_hint">Steams skyder indstiller skærmens lysstyrke</string> + <string name="integration_home_hint">Hjem åbner Steam-menuen i en session</string> + <string name="integration_shortcuts_hint">Alt+Tab, Win-tasten og Hjem-knappen bliver i sessionen</string> + <string name="integration_shortcuts_maybe_restricted">Nedtonet i Android? Appinfo → ⋮ → Tillad begrænsede indstillinger</string> + <string name="integration_shortcuts_restricted">Blokeret af Android · Appinfo → ⋮ → Tillad begrænsede indstillinger</string> + <string name="integration_shortcuts_service">DroidDeck-systemtaster</string> + <string name="integration_shortcuts_service_description">Holder Alt+Tab, Win-tasten og Hjem-knappen i en aktiv DroidDeck-session i stedet for Android.</string> + <string name="integration_brightness_needed">Slå Lysstyrke til under Opsætning → Steam-integration</string> + <string name="setup_gpu_bridge_off">Mali-bro: fra</string> + <string name="setup_gpu_bridge_on">Mali-bro: til</string> + <string name="setup_gpu_bridge_detail">%1$s er ikke en Adreno. Den eksperimentelle Vulkan-bro er slået til: sessionen tegner gennem telefonens egen driver. Forvent fejl; send sessionslogfilerne.</string> + <string name="setup_bridge_safe">Sikker tilstand</string> + <string name="setup_bridge_safe_on">Sikker tilstand: til</string> + <string name="setup_bridge_safe_off">Sikker tilstand: fra</string> + <string name="setup_bridge_safe_on_detail">Mest kompatibel. Anbefales til en ny enhed.</string> + <string name="setup_bridge_safe_off_detail">Hurtigere, hvor denne GPU har bestået sine tjek.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatisk</string> + <string name="setup_bridge_dxvk_proton">DXVK: Protons egen</string> + <string name="setup_bridge_dxvk_auto_detail">Bruger en ældre DXVK, hvor denne GPU\'s Vulkan er for gammel til Protons.</string> + <string name="setup_bridge_dxvk_proton_detail">Hver Proton beholder sin egen DXVK, også hvor denne GPU\'s Vulkan kan være for gammel til den.</string> <string name="apps_search_hint">Søg i apps</string> <string name="apps_no_match">Ingen apps matcher “%1$s”.</string> <string name="apps_add_widget">Tilføj widget</string> @@ -3206,6 +3592,8 @@ <string name="desktop_restore_done_body">De apps, du tilføjede, er installeret igen.</string> <string name="desktop_restore_failed_title">Noget software kunne ikke gendannes</string> <string name="desktop_restore_failed_body">Se ~/.cache/droiddeck/apt-restore.log, og prøv derefter sudo apt install i Konsole.</string> + <string name="gog_full_files">Native optimeringer er ikke tilgængelige. Downloaden indeholder komplette erstatningsfiler.</string> + <string name="gog_recover">Bekræft patch-resultat</string> <string name="slow_usb_title">Langsom USB-forbindelse</string> <string name="slow_usb_cable">%1$s er tilsluttet via %2$s (%3$s Mbps, ca. %4$d MB/s), så spil på den indlæses langsomt. Brug et USB 3-kabel til 5 Gbps eller mere, prøv at vende USB-C-stikket, eller brug et hurtigere drev.</string> <string name="slow_usb_port">%1$s er tilsluttet via %2$s (%3$s Mbps, ca. %4$d MB/s). Denne enheds USB-port kan ikke køre hurtigere, så spil på den indlæses langsomt. Intern lagerplads eller et microSD-kort kan være hurtigere.</string> @@ -3216,4 +3604,52 @@ <string name="steam_import_names_more">%1$s og %2$d mere</string> <string name="steam_import_now">Genstart nu</string> <string name="steam_import_later">Senere</string> + <string name="gog_maintenance">Administrer GOG-installation</string> + <string name="gog_check">Søg efter opdateringer</string> + <string name="gog_repair">Bekræft/reparer</string> + <string name="gog_patches">Offline-patches</string> + <string name="gog_refresh">Download fuldt offline-installationsprogram</string> + <string name="gog_update">Opdater til %1$s</string> + <string name="gog_resume">Genoptag GOG-vedligeholdelse</string> + <string name="gog_open_patch">Åbn patch-installationsprogram</string> + <string name="gog_patch_in_session">Afslut eller annuller patch-installationsprogrammet i Linux-sessionen.</string> + <string name="gog_patch_requirements">Vælg en patch til din installerede version og dit sprog. Understøttede kildeversioner er muligvis ikke vist.</string> + <string name="gog_no_patches">GOG har ingen separate Windows-patches til dette spil.</string> + <string name="gog_managed_files">Ændrede spilfiler kan blive erstattet.</string> + <string name="gog_patch_installer_note">Installationsprogrammet åbnes i din Linux-session.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Ekstra plads</string> + <string name="gog_space_estimate_label">Anslået plads</string> + <string name="gog_repair_action">Reparer filer</string> + <string name="gog_refresh_action">Opdater installationen</string> + <string name="gog_select_patch">Vælg</string> + <string name="stores_gamejolt_not_owned">Ikke i dit Game Jolt-bibliotek</string> + <string name="stores_gamejolt_no_build">Ingen Windows-download til dette spil</string> + <string name="stores_gamejolt_no_exe">Der blev ikke fundet et Windows-spil i downloaden</string> + <string name="stores_gamejolt_no_game">Kunne ikke finde dette spil på Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Kunne ikke hente spil fra Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt svarede HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Kunne ikke indlæse downloads fra Game Jolt</string> + <string name="stores_gamejolt_build_open">Åbn på Game Jolt</string> + <string name="stores_gamejolt_archive">%1$s-arkiver understøttes ikke</string> + <string name="stores_gamejolt_extract_failed">Downloaden kunne ikke udpakkes (kode %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Kunne ikke nå Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt gav ikke et downloadlink</string> + <string name="stores_gamejolt_section_featured">Fremhævede</string> + <string name="stores_gamejolt_section_hot">Populære</string> + <string name="stores_gamejolt_section_best">Bedste</string> + <string name="stores_gamejolt_section_new">Nye</string> + <string name="stores_gamejolt_price_under_30">$30 eller mindre</string> + <string name="stores_gamejolt_os_other">Andet</string> + <string name="stores_gamejolt_maturity_everyone">Alle aldre</string> + <string name="stores_gamejolt_maturity_teen">Teenagere</string> + <string name="stores_gamejolt_maturity_adult">Voksne</string> + <string name="stores_gamejolt_status_complete">Færdige</string> + <string name="stores_gamejolt_status_early">Early access</string> + <string name="stores_gamejolt_partners">Partnerspil</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Modenhed</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partnere</string> + <string name="stores_gamejolt_followed">Fulgte spil</string> </resources> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 59e33c3045..bf8236f70e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-Optionen für D3D12. nodxr deaktiviert Raytracing; nur bei Spielen verwenden, die das brauchen.</string> <string name="game_env_proton_log">Auf 1 setzen für ein Proton-Diagnoseprotokoll. Protokollieren kann die Leistung mindern und Speicherplatz belegen.</string> <string name="game_env_wined3d">Auf 1 setzen, um für D3D9–11-Kompatibilitätstests das OpenGL-basierte WineD3D statt DXVK zu verwenden.</string> + <string name="game_env_wined3d_renderer">Renderer für DirectDraw, Direct3D 1–7 und Spiele, die mit WineD3D laufen. Vulkan umgeht den Weg über OpenGL auf Zink und ist auf Adreno bei alten DirectDraw- und Direct3D-7-Spielen deutlich schneller.</string> + <string name="game_env_dxvk_d3d8">Auf 1 setzen, um Direct3D 8 über DXVK statt WineD3D auszuführen. Schneller im Direct3D-8-Test von AIO Graphics Test auf Adreno.</string> <string name="game_env_no_ntsync">Auf 1 setzen, um dieses Spiel von ntsync fernzuhalten (droiddeck-ntsync oder ein Kerneltreiber); es nutzt dann droiddeck-esync, wo ein Pack existiert, sonst droiddeck-fsync.</string> <string name="game_env_no_esync">Auf 1 setzen, um droiddeck-esync für dieses Spiel abzuschalten; es nutzt stattdessen droiddeck-fsync oder droiddeck-ntsync, wo auch fsync aus ist.</string> <string name="game_env_no_fsync">Auf 1 setzen, um dieses Spiel von droiddeck-fsync fernzuhalten; es nutzt dann droiddeck-esync, wo ein Pack existiert, sonst droiddeck-ntsync.</string> <string name="game_env_fsync_first">Auf 1 setzen, um dieses Spiel mit droiddeck-fsync auszuführen, oder auf 0, um droiddeck-esync vorzuziehen, wo ein Pack zu seinem Proton passt.</string> <string name="game_env_xalia">Auf 0 setzen, um Protons Gamepad-Navigationshilfe für dieses Spiel zu deaktivieren.</string> + <string name="game_env_anticheat_offline">Standardmäßig an. Startet ein Easy-Anti-Cheat-Spiel ohne seinen Anti-Cheat, wenn das Spiel Offline-Spielen unterstützt. Ausschalten, um wie gewohnt über Easy Anti-Cheat zu starten. Online-Modi, die Easy Anti-Cheat erfordern, bleiben nicht verfügbar.</string> <string name="game_env_hud">DXVK-Overlay für D3D9–11. fps zeigt die Bildrate an; ohne Wert wird es ausgeblendet.</string> <string name="game_env_dxvk_config">DXVK-Einstellungen, durch Semikolons getrennt. Neuere Builds nutzen dxvk.maxFrameRate zur Bildratenbegrenzung; fürs normale Spielen besser das Bildratenlimit der Sitzung verwenden.</string> + <string name="game_env_cores">CPU-Kerne für dieses Spiel, z. B. 0-4 oder 0,2,4, anstelle der Spielkerne der Sitzung. Weniger Kerne bleiben kühler.</string> <string name="game_env_vkd3d_limit">D3D12-Bildratenlimit. 0 hebt das Limit auf.</string> <string name="game_env_glthread">Mesa-OpenGL-Threading. true kann CPU-limitierten OpenGL-Spielen helfen; pro Spiel testen.</string> <string name="sync_backend_title">Wine-Sync</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX führt x86-Linux-Programme auf diesem ARM64-Gerät aus. Auto nutzt es, wenn das Programm für x86 gebaut ist.</string> <string name="app_fex_x86">%1$s über FEX</string> <string name="app_fex_not_ready">Dieses Programm ist für %1$s-PCs gebaut und läuft über FEX, das noch nicht eingerichtet ist. Öffne Steam einmal, während du angemeldet bist: DroidDeck lässt es FEX und die nötige Steam Linux Runtime herunterladen, danach lässt sich das Programm öffnen.</string> + <string name="session_proot_missing">DroidDecks proot konnte nicht heruntergeladen werden. Prüfe die Verbindung und versuch es erneut. Die Sitzung wurde nicht gestartet, da das Ersatz-proot zum Spielen zu langsam ist.</string> + <string name="session_directaudio_missing">DirectAudio konnte nicht heruntergeladen werden, daher nutzt der Spielton in dieser Sitzung den langsameren Weg.</string> <string name="session_end_program">Dieses Programm</string> <string name="session_end_steam_download">Der Steam-Client konnte nicht heruntergeladen werden. Dein Netzwerk oder VPN blockiert möglicherweise die Server von Steam; prüfe die Verbindung und versuche es erneut.</string> <string name="session_end_steam_setup">Der Steam-Client konnte nicht eingerichtet werden. Prüfe die Verbindung und den freien Speicher und versuche es erneut.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox-360-Controller</string> <string name="mode_controller_note">Deck: Schnellzugriffstaste und Gyro. Steam Controller: dasselbe, mit Griffsensor an den Rücktasten. DualShock 4 und DualSense: Gyro, die Trackpads dienen als deren Touchpad. Xbox 360: Schnellzugriff mit Guide+A öffnen.</string> <string name="mode_back">Zurück</string> + <string name="back_hold">Zurück halten für Steam-Kürzel</string> + <string name="back_hold_hint">Zurück halten öffnet den Schnellzugriff oder bildet mit anderen Tasten Steam-Kombinationen. Ausschalten, um gehaltenes Zurück zu ignorieren; Tippen und Doppeltippen funktionieren weiter.</string> + <string name="back_native_qam_hint">Halte Zurück 700 ms lang gedrückt oder halte Zurück und drücke eine weitere Taste für Steam-Tastenkürzel.</string> + <string name="back_double_tap_window">Zeitfenster für Doppeltippen</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Helligkeitssteuerung erlauben</string> + <string name="brightness_permission_text">Richte die Helligkeitssteuerung in DroidDeck ein.</string> <string name="back_menu_then_qam">Menü → QAM</string> <string name="back_qam_then_menu">QAM → Menü</string> <string name="mode_session">Sitzung</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Verzögert das Anhalten im Hintergrund, solange Steam aktiv herunterlädt.</string> <string name="mode_suspend_note">Auto pausiert im Hintergrund und setzt fort, sobald die App wieder sichtbar ist. Manuell wartet auf „Fortsetzen“. Nie lässt alles weiterlaufen.</string> <string name="mode_startup">Start</string> - <string name="mode_steam_startup">Steam mit DroidDeck starten</string> - <string name="mode_steam_startup_hint">Öffnet die Steam-Sitzung, wenn DroidDeck startet.</string> + <string name="mode_startup_session">Beim Start öffnen</string> + <string name="mode_startup_session_hint">Startet diese Sitzung, wenn DroidDeck startet.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Suche nach Releases…</string> <string name="mode_decky_ready">Bereit zur Installation von %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Aktuell · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Neueste Version installieren</string> + <string name="decky_channel">Update-Kanal</string> + <string name="decky_channel_hint">Welche Decky-Loader-Releases installiert werden. Deckys eigener Updater nutzt denselben Kanal.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Vorabversion</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Decky-Update-Kanal konnte nicht gespeichert werden</string> <string name="mode_decky_on">Startet mit Steam. Solange aktiv, können andere Apps auf diesem Gerät Steam möglicherweise steuern.</string> <string name="mode_decky_off">Aus. Der Remote-Debugging-Port von Steam bleibt geschlossen.</string> <string name="mode_decky_remove_title">Decky Loader deinstallieren?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Client</string> <string name="mode_mangoapp">Leistungs-Overlay</string> <string name="mode_mangoapp_hint">Deaktivieren, wenn Spiele im Deck-Modus abstürzen oder schwarz werden. Gilt ab der nächsten Sitzung.</string> + <string name="mode_return_after_game">Nach einem Spiel zu DroidDeck zurückkehren</string> + <string name="mode_return_after_game_hint">Wenn ein Spiel, das du über DroidDeck oder einen anderen Launcher gestartet hast, beendet wird, schließt Steam sauber (Cloud-Speicherstände werden zuerst fertig) und du kehrst dorthin zurück. Aus: in Steam bleiben.</string> + <string name="mode_shader_precache">Shader-Vorab-Caching</string> + <string name="mode_shader_precache_hint">Steam lädt für deine Spiele vorkompilierte Shader herunter und verarbeitet sie im Hintergrund, damit Spiele weniger ruckeln. Aus spart Daten, Speicher und Akku; Spiele erstellen Shader dann während des Spielens. Dieselbe Einstellung wie Steams Downloads > Shader-Vorab-Caching. Gilt ab der nächsten Sitzung.</string> <string name="mode_steam_repair">Steam-Client reparieren</string> <string name="mode_steam_repair_hint">Lädt den Steam-Client beim nächsten Start von Steam erneut herunter. Nutze dies, wenn Steam im Ladebildschirm hängen bleibt. Spiele, Anmeldung und Einstellungen bleiben erhalten.</string> <string name="mode_steam_repair_queued">Der Steam-Client wird beim nächsten Start von Steam erneut heruntergeladen.</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">Umgeht PulseAudio für geringere Latenz.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Für Sprachchat.</string> + <string name="drawer_mic_hint">Mikrofonaufnahme für diese Sitzung ein- oder ausschalten.</string> + <string name="drawer_mic_failed">Das Mikrofon konnte nicht umgeschaltet werden. Bitte versuch es erneut.</string> <string name="mode_network">Netzwerk</string> <string name="mode_wifi_discovery">Wi-Fi-Erkennung</string> <string name="mode_wifi_discovery_hint">Wi-Fi-Namen und Netzwerke in der Nähe in Steam anzeigen.</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: Echtzeit-GPU-Warteschlange</string> <string name="perf_gsrealtime_hint">Priorisiert die GPU-Arbeit des Compositors. Kann das Frame-Pacing glätten, kostet Spiele aber etwas Leistung.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Arbeitsspeicher</string> + <string name="perf_cap_off">Aus</string> + <string name="perf_cap_auto">Treiberstandard</string> + <string name="perf_zram_client">Steam komprimieren, während ein Spiel läuft</string> + <string name="perf_zram_client_hint">20 s nach dem Spielstart wird der Steam-Client in zRAM komprimiert, um dem Spiel mehr Speicher zu lassen, und beim Beenden des Spiels zurückgelesen. Schalte dies aus, wenn sich die Sitzung kurz nach dem Spielstart schließt. Ein RAM-Limit oben komprimiert Steam weiterhin, wenn die Sitzung es überschreitet.</string> + <string name="perf_ram_cap">RAM-Limit</string> + <string name="perf_ram_cap_hint">Gilt, solange der Steam-Client läuft, im Steam-Modus oder vom Desktop aus. Verbraucht die Sitzung mehr als diesen Wert, werden Steam und danach die übrigen unterstützten Prozesse der Sitzung in zRAM komprimiert. Ein weiches Limit: Nichts wird geschlossen, aber Spiele können ruckeln, während Seiten zurückgeladen werden.</string> + <string name="perf_ram_cap_unavailable">Benötigt zRAM-Swap, den dieses Gerät nicht hat.</string> + <string name="perf_vram_cap">VRAM-Limit</string> + <string name="perf_vram_cap_hint">Der Grafikspeicher, den DXVK an Direct3D-Spiele meldet, damit sie weniger für Texturen einplanen. Eigene DXVK-Einstellungen eines Spiels haben Vorrang. Gilt ab der nächsten Sitzung.</string> <string name="perf_gpuclock">GPU auf höchstem Takt halten</string> <string name="perf_gpuclock_hint">Nur Adreno. Weniger Ruckler, mehr Akkuverbrauch und Wärme.</string> <string name="perf_fixes">Sitzungskorrekturen</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">proot-Schnellpfad</string> <string name="perf_fastpath_needs_seccomp">Benötigt den seccomp-Filter von proot.</string> <string name="perf_fastpath_hint">Schnellere Dateisuche und weniger Ruckler. Deaktivieren, wenn ein Programm seine Dateien nicht findet.</string> + <string name="perf_cursor_composite">Zeiger in gamescope zeichnen</string> + <string name="perf_cursor_composite_hint">Gamescope zeichnet den Zeiger selbst, statt ihn an Android zu übergeben. Für einen per Controller gesteuerten Zeiger einschalten. Aus ist auf einem Smartphone schneller. Gilt ab der nächsten Sitzung.</string> <string name="perf_identity">Sitzungsidentität</string> <string name="perf_hostname">Hostname</string> <string name="perf_hostname_hint">Der Name, den Steam für dieses Gerät sieht. Leer lassen stellt %1$s wieder her.</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">Seine Dateien werden aus der App entfernt.</string> <string name="driver_delete_in_use">Seine Dateien werden entfernt. Er ist in Verwendung, daher übernimmt der Standard.</string> <string name="drawer_page_display">Anzeige</string> + <string name="drawer_frame_limit">Bildratenlimit</string> + <string name="drawer_frame_limit_note">Begrenzt dieses Spiel. Der Bildschirm wechselt zu einer Bildwiederholrate, die durch das Limit glatt teilbar ist, sofern vorhanden; andere Limits können ungleichmäßig wirken. Steam-Spiele nutzen das Bildratenlimit von Steam im Schnellzugriffsmenü.</string> <string name="drawer_page_effects">Effekte</string> <string name="drawer_page_controls">Steuerung</string> <string name="drawer_page_components">Komponenten</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">Kapsel</string> <string name="hud_size_minimal">Minimal</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Leiste</string> <string name="hud_locked">Position sperren</string> <string name="hud_locked_hint">Ziehe das HUD, um es zu verschieben; langes Drücken sperrt oder entsperrt es. Solange es gesperrt ist, funktionieren die Bildschirmsteuerungen darunter weiter.</string> + <string name="hud_snap">An Seiten einrasten</string> + <string name="hud_snap_hint">Lass das HUD los, und es springt an die nähere Bildschirmseite. Ein Wischen wirft es in diese Richtung.</string> <string name="hud_group_look">Aussehen</string> <string name="hud_scale">Größe auf dem Bildschirm</string> <string name="hud_color_soft">Dezent</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">Der HUD-Bericht konnte nicht gespeichert werden.</string> <string name="hud_reset">HUD-Einstellungen zurücksetzen</string> <string name="hud_reset_button">Zurücksetzen</string> - <string name="hud_credit">FusionHUD von The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Skalierungsmodus</string> <string name="drawer_scaling_sharpness">Skalierungsschärfe</string> <string name="drawer_effects">Bildschirmeffekte</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Tastatur</string> <string name="drawer_latency">Latenz</string> + <string name="drawer_low_latency">Modus mit geringer Latenz</string> + <string name="drawer_low_latency_hint">Erhöht CPU- und Akkuverbrauch</string> <string name="drawer_low_latency_controller">Controller mit geringer Latenz</string> <string name="drawer_low_latency_controller_hint">Der Controller meldet mit 1000 Hz statt 250 Hz. Die CPU-Last ist etwas höher.</string> <string name="drawer_low_latency_touch">Touch mit geringer Latenz</string> <string name="drawer_low_latency_touch_hint">Touch überspringt das Zusammenfassen von Frames, Steam-Touch meldet mit 1000 Hz. Die CPU-Last ist etwas höher.</string> <string name="drawer_evdev_mouse">Roher Mauskanal</string> + <string name="drawer_relative_mouse">Relative Maus</string> + <string name="drawer_relative_mouse_auto">Automatisch</string> + <string name="drawer_relative_mouse_on">An</string> + <string name="drawer_relative_mouse_off">Aus</string> <string name="drawer_direct_cursor">Zeiger</string> <string name="drawer_pc_keyboard">PC-Tastatur</string> <string name="drawer_android_keyboard">Android</string> @@ -791,6 +838,10 @@ <string name="setup_session">Sitzung</string> <string name="setup_logs">Sitzungslogs</string> <string name="setup_logs_hint">Nach jeder Sitzung gespeichert</string> + <string name="setup_game_debug_logs">Spiel-Debug-Logs</string> + <string name="setup_game_debug_logs_hint">Beim nächsten Spielstart Diagnosen von Proton, Wine und Grafik einschließen. Kann die Leistung mindern und mehr Speicher belegen.</string> + <string name="setup_game_debug_logs_restart">Starte diese Sitzung neu, um Spiel-Debug-Logs zu speichern</string> + <string name="setup_logging_update_failed">Protokollierung konnte nicht aktualisiert werden. Prüfe den Schalter und versuch es erneut.</string> <string name="setup_agent_commands">Debugging-Tools</string> <string name="setup_latest_logs">Neueste Sitzungslogs</string> <string name="setup_saved_logs">Gespeicherte Sitzungslogs</string> @@ -814,20 +865,22 @@ <string name="setup_home">Als Startbildschirm verwenden</string> <string name="setup_home_on">DroidDeck kann die Startbildschirm-App sein</string> <string name="setup_home_off">DroidDeck wird nie als Startbildschirm-App angeboten</string> + <string name="setup_home_game_space_first">Stelle DroidDeck unter „Spiele hinzufügen“ auf „Einschließen“</string> <string name="setup_orientation">Ausrichtung</string> + <string name="setup_launcher_orientation">Launcher-Ausrichtung</string> + <string name="setup_launcher_orientation_auto">Gerätedrehung folgen</string> + <string name="setup_orientation_portrait">Hochformat</string> + <string name="setup_session_orientation">Sitzungsausrichtung</string> + <string name="setup_session_orientation_hint">Gilt für Steam, Spiele, Desktop und den Controller-Editor. Auflösungsvoreinstellungen drehen sich mit der Sitzung; eigene Breite und Höhe bleiben wie eingegeben.</string> <string name="setup_orientation_auto">Automatisch Querformat</string> <string name="setup_orientation_landscape">Querformat</string> <string name="setup_orientation_reverse">Umgekehrtes Querformat</string> <string name="setup_fullscreen">Vollbild</string> <string name="setup_fullscreen_on">Blendet die Status- und Navigationsleiste von Android aus</string> <string name="setup_fullscreen_off">Zeigt die Status- und Navigationsleiste von Android an</string> - <string name="setup_dual_screen">Zwei Bildschirme</string> - <string name="setup_dual_screen_hint">Automatisch nutzt den zweiten Bildschirm auf Handhelds mit eingebautem Zweitbildschirm. Ein nutzt einen beliebigen zweiten Bildschirm. Aus lässt alles auf einem Bildschirm.</string> <string name="setup_dual_screen_auto">Automatisch</string> <string name="setup_dual_screen_on">Ein</string> <string name="setup_dual_screen_off">Aus</string> - <string name="setup_dual_screen_menu">Menü auf dem unteren Bildschirm</string> - <string name="setup_dual_screen_menu_hint">Verschiebt die Bereiche und das Menü im Spiel auf den zweiten Bildschirm und tippt dort, damit der obere Bildschirm die volle Ansicht behält. L2 und R2 wechseln den Bereich.</string> <string name="setup_dual_screen_controls">Steuerung auf dem unteren Bildschirm in Spielen</string> <string name="setup_dual_screen_controls_hint">Öffnet beim Start einer Sitzung Trackpad und Tastatur auf dem zweiten Bildschirm.</string> <string name="dual_typing_title">Eingabe für den oberen Bildschirm</string> @@ -979,6 +1032,14 @@ <string name="gate_step1">Öffne Einstellungen → Entwickleroptionen → Debugging über WLAN und aktiviere es</string> <string name="gate_step2">Tippe auf „Gerät über einen Kopplungscode koppeln“</string> <string name="gate_step3">Gib den Code in die DroidDeck-Benachrichtigung ein</string> + <string name="pairguide_build_number">Tippe unter „Über das Telefon“ 7-mal auf „Build-Nummer“</string> + <string name="pairguide_wireless">Aktiviere „Debugging über WLAN“</string> + <string name="pairguide_pair">Öffne „Debugging über WLAN“ und tippe dann auf „Gerät mit Kopplungscode koppeln“</string> + <string name="pairguide_child_process">Aktiviere „Beschränkungen für Unterprozesse deaktivieren“</string> + <string name="pairguide_row_child_process">Beschränkungen für Unterprozesse deaktivieren</string> + <string name="pairguide_row_build_number">Build-Nummer</string> + <string name="pairguide_row_wireless">Debugging über WLAN</string> + <string name="pairguide_row_pair">Gerät mit Kopplungscode koppeln</string> <string name="gate_waiting">Warte auf das Kopplungs-Pop-up…</string> <string name="gate_code_needed">Pop-up gefunden. Gib seinen Code in der Benachrichtigung ein.</string> <string name="gate_status">Status</string> @@ -1117,7 +1178,6 @@ <string name="games_never_played">Nie gespielt</string> <string name="games_runtime_busy_percent">Laufzeit beschäftigt · %1$d %%</string> <string name="games_runtime_busy">Laufzeit beschäftigt</string> - <string name="games_runtime_first_play">Laufzeit wird beim ersten „Spielen“ installiert</string> <string name="games_runtime_update">Laufzeit-Update verfügbar</string> <string name="games_runtime_ready">● Laufzeit bereit</string> <string name="games_internal">Interner Speicher</string> @@ -1134,6 +1194,9 @@ <string name="gpu_hide_other">Treiber für andere GPUs ausblenden</string> <string name="gpu_show_other">Treiber für andere GPUs anzeigen</string> <string name="gpu_advanced">Erweitert</string> + <string name="gpu_ubwc_title">UBWC-Kompatibilität</string> + <string name="gpu_ubwc_hint">Probiere An oder Aus, wenn Steam oder Android Streifen oder Flackern zeigt. Gilt für beide Treiber nach einem Neustart von DroidDeck.</string> + <string name="gpu_ubwc_restart">Starte DroidDeck neu, um dies anzuwenden.</string> <string name="gpu_set_with_display">Zusammen mit dem Anzeigetreiber festgelegt: %1$s enthält beide.</string> <string name="gpu_set_with_runtime">Zusammen mit dem Laufzeittreiber festgelegt: %1$s enthält beide.</string> <string name="gpu_runtime_hint">Wird von Spielen und dem Desktop genutzt.</string> @@ -1242,10 +1305,15 @@ <string name="pip_auto">Automatisch zu Bild im Bild wechseln</string> <string name="unfolded_controls">Steuerung auf dem aufgeklappten Bildschirm</string> <string name="unfolded_controls_hint">Aufgeklappt liegt das Spiel über den Steam Deck-Trackpads und den hinteren Griffen. Zugeklappt läuft es im Vollbild.</string> + <string name="unfolded_controls_with_controller">Mit Controller beibehalten</string> + <string name="unfolded_controls_with_controller_hint">Diese Touch-Steuerung auch anzeigen, während ein Controller verbunden ist.</string> <string name="pip_suspended">Angehalten</string> <string name="pip_not_ready">Bild im Bild ist verfügbar, sobald die Sitzung bereit ist.</string> <string name="pip_permission">Erlaube Bild im Bild für DroidDeck in den Android-Einstellungen.</string> <string name="pip_unavailable">Android konnte Bild im Bild nicht öffnen.</string> + <string name="game_more">Mehr</string> + <string name="game_edit_art">Grafiken bearbeiten</string> + <string name="stores_in_steam_label">In Steam</string> <string name="game_shortcut">Verknüpfung</string> <string name="game_shortcut_add">Zum Startbildschirm hinzufügen</string> <string name="game_shortcut_choose">Spiel auswählen</string> @@ -1269,6 +1337,10 @@ <string name="main_wait_runtime">Warte, bis der Vorgang an der Laufzeit abgeschlossen ist</string> <string name="main_wait_proton_install">Warte, bis die Installation des Kompatibilitätstools abgeschlossen ist</string> + <string name="load_compat_title">Kompatibilitätstools werden vorbereitet</string> + <string name="load_compat_wait">Warte auf Abschluss der Kompatibilitätseinrichtung</string> + <string name="load_compat_hint">Deine Sitzung startet, sobald die Einrichtung abgeschlossen ist.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Warte, bis die Installation der Desktop-App abgeschlossen ist</string> <string name="main_wait_install_game">Warte, bis die Installation abgeschlossen ist, bevor du ein Spiel startest</string> <string name="main_saves_close_session">Schließe zuerst die Steam-Sitzung, damit das Spiel den Import nicht überschreiben kann</string> @@ -1305,6 +1377,9 @@ <string name="main_install_anyway">Trotzdem installieren</string> <string name="main_remove_runtime_title">Linux-Laufzeit entfernen</string> <string name="main_remove_runtime_text">Dadurch werden die Laufzeit, der Steam-Client darin und alle dort installierten Spiele gelöscht.</string> + <string name="runtime_actions_title">Linux-Laufzeit</string> + <string name="runtime_actions_text">Reparieren installiert die Systemdateien der Laufzeit neu und behält Steam, deine Spiele und Einstellungen. Extras wie der Desktop werden bei der nächsten Nutzung erneut installiert. Entfernen löscht alles.</string> + <string name="runtime_repair">Laufzeit reparieren</string> <string name="main_applied">Angewendet: %1$s</string> <string name="android_app_open_failed_primary">%1$s konnte nicht auf dem Hauptbildschirm geöffnet werden</string> <string name="android_app_open_failed_on">%1$s konnte nicht auf %2$s geöffnet werden</string> @@ -1434,6 +1509,11 @@ <string name="session_runtime_catalog_unreachable">Der Katalog der Laufzeiten war nicht erreichbar. Prüfe die Verbindung und tippe erneut auf Spielen.</string> <string name="session_runtime_install_failed">Die Linux-Laufzeit wurde nicht installiert. Prüfe sie unter Einrichtung und tippe erneut auf Spielen.</string> <string name="session_desktop_install_failed">Der Desktop wurde nicht installiert (%1$s). Prüfe die Verbindung und tippe erneut auf Desktop.</string> + <string name="session_package_resume_failed">Eine unterbrochene Installation konnte nicht abgeschlossen werden (%1$s). Prüfe Verbindung und Speicherplatz und versuch es dann erneut.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Die Linux-Laufzeit ist beschädigt: %1$d Bibliotheksverknüpfung zeigt auf eine fehlende Datei (%2$s), meist nach einer unterbrochenen Installation. Reparieren behält deine Spiele und Einstellungen.</item> + <item quantity="other">Die Linux-Laufzeit ist beschädigt: %1$d Bibliotheksverknüpfungen zeigen auf fehlende Dateien (%2$s und weitere), meist nach einer unterbrochenen Installation. Reparieren behält deine Spiele und Einstellungen.</item> + </plurals> <string name="session_ended_named">%1$s wurde unerwartet beendet. Teile die Protokolle mit einem Fehlerbericht oder versuche es erneut.</string> <string name="session_ended_program">Das Programm wurde unerwartet beendet. Teile die Protokolle mit einem Fehlerbericht oder versuche es erneut.</string> <string name="session_ended_desktop">Der Desktop wurde unerwartet beendet. Teile die Protokolle mit einem Fehlerbericht oder versuche es erneut.</string> @@ -1448,6 +1528,13 @@ <string name="mode_decky_plugins_hint">Installiere eine Plugin-ZIP für die nächste Steam-Sitzung.</string> <string name="mode_decky_plugin_downloading">Wird heruntergeladen…</string> <string name="mode_decky_plugin_install_zip">Aus ZIP installieren</string> + <string name="decky_zip_warning_title">Installation eines Drittanbieter-Plugins</string> + <string name="decky_zip_warning_text">Das Decky-Loader-Team hat dieses Plugin nicht geprüft. Es kann Schadsoftware enthalten, etwa Software, die dein Steam-Konto stiehlt oder deinem Gerät schadet. Mit der Installation dieses Plugins erklärst du, dass du alle Risiken für dein Gerät trägst.</string> + <string name="decky_zip_warning_continue">Weiter</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Bitte %1$d Sekunde warten</item> + <item quantity="other">Bitte %1$d Sekunden warten</item> + </plurals> <string name="store_cat_games">Spiele</string> <string name="store_cat_audio_video">Audio & Video</string> <string name="store_cat_graphics">Grafik</string> @@ -1609,6 +1696,8 @@ <string name="fm_accept">Akzeptieren</string> <string name="fm_decline">Ablehnen</string> <string name="fm_drive_not_readable">%1$s ist eingebunden, aber derzeit nicht lesbar</string> + <string name="fm_drive_access_title">Zugriff auf %1$s erlauben</string> + <string name="fm_drive_access_text">Android lässt DroidDeck dieses Laufwerk sehen, aber nicht lesen. Aktiviere für DroidDeck den Zugriff auf alle Dateien und komm dann zurück.</string> <string name="fm_list_view">Listenansicht</string> <string name="fm_grid_view">Rasteransicht</string> <string name="fm_search">Suchen</string> @@ -1680,6 +1769,89 @@ <string name="second_mode_keyboard_trackpad">Tastatur + Trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck-Griffe + Trackpads</string> + <string name="second_mode_dashboard">Dashboard</string> + <string name="bottom_dashboard_empty">Hier gibt es noch nichts anzuzeigen.</string> + <string name="bottom_page_downloads">Downloads</string> + <string name="bottom_downloads_none">Keine laufenden Downloads.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Shader-Cache wird heruntergeladen</string> + <string name="bottom_downloads_paused">Pausiert</string> + <string name="bottom_downloads_queued">Wartet auf Start</string> + <string name="bottom_page_notifications">Benachrichtigungen</string> + <string name="bottom_notifications_listener">DroidDeck – unterer Bildschirm</string> + <string name="bottom_notifications_why">Zeigt Nachrichten und andere Benachrichtigungen hier an, während du spielst. Sie bleiben nur auf diesem Bildschirm und werden nicht gespeichert. Android fragt einmal: Die Seite für den Benachrichtigungszugriff öffnet sich auf diesem Bildschirm; aktiviere dort DroidDeck, dann kehrt diese Seite von selbst zurück.</string> + <string name="bottom_notifications_allow">Benachrichtigungszugriff erlauben</string> + <string name="bottom_notifications_none">Keine Benachrichtigungen.</string> + <string name="bottom_notifications_count">%1$d Benachrichtigungen</string> + <string name="bottom_notifications_clear">Löschen</string> + <string name="bottom_page_screenshots">Screenshots</string> + <string name="stats_fps_needs_hud">FPS benötigt das aktive HUD</string> + <string name="stats_speed">Geschwindigkeit</string> + <string name="stats_pedals">Pedale</string> + <string name="stats_gforce">G-Kraft</string> + <string name="stats_timing">Zeiten</string> + <string name="stats_best_lap">Beste Runde</string> + <string name="stats_tires">Reifen °C</string> + <string name="stats_trace">Gas und Bremse, letzte 10 s</string> + <string name="stats_speed_chart">Geschwindigkeit, %1$s</string> + <string name="stats_gear">Gang</string> + <string name="stats_steam_client_arm">Steam-Client ARM</string> + <string name="stats_steam_client_x86">Steam-Client x86</string> + <string name="stats_throttle">Gas</string> + <string name="stats_brake">Bremse</string> + <string name="stats_lights">Kontrollleuchten</string> + <string name="stats_lamp_shift">Schalten</string> + <string name="stats_lamp_handbrake">Handbremse</string> + <string name="stats_lamp_pit">Pit-Limiter</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Öl %1$s °C</string> + <string name="stats_power">Energieverteiler</string> + <string name="stats_fuel_t">Treibstoff, t</string> + <string name="stats_fuel_main">Haupttank %1$s t</string> + <string name="stats_fuel_reserve">Reserve %1$s t</string> + <string name="bottom_telemetry_send_title">Dashboard-Daten senden</string> + <string name="bottom_telemetry_send_auto">Automatisch</string> + <string name="bottom_telemetry_send_auto_hint">Schaltet es für jedes hier aufgeführte Spiel ein, auch für später gefundene Spiele. Spiele, die du ausschaltest, bleiben aus.</string> + <string name="bottom_telemetry_send_note">Dies ändert die eigene Datenausgabe-Einstellung des Spiels. Es wirkt beim nächsten Start des Spiels; beim Ausschalten wird die alte Einstellung wiederhergestellt.</string> + <string name="bottom_telemetry_send_close">Schließe %1$s, um dies zu ändern.</string> + <string name="bottom_telemetry_send_failed">Die Einstellungen von %1$s konnten nicht geändert werden.</string> + <string name="bottom_telemetry_send_menu">%1$s: Aktiviere %2$s in den Spieleinstellungen mit IP 127.0.0.1 und Port %3$d.</string> + <string name="bottom_shots_where">Gespeichert in Pictures/DroidDeck. Steam-Screenshots werden hier ebenfalls angezeigt.</string> + <string name="bottom_shots_take">Screenshot aufnehmen</string> + <string name="bottom_shots_saved">Screenshot gespeichert.</string> + <string name="bottom_shots_failed">Screenshot konnte nicht aufgenommen werden.</string> + <string name="bottom_shots_none">Noch keine Screenshots.</string> + <string name="bottom_page_chat">Chat & Sprache</string> + <string name="bottom_chat_why">Lies und beantworte hier den Steam-Chat, während das Spiel auf dem Hauptbildschirm weiterläuft. Es wird das Konto verwendet, mit dem Steam angemeldet ist.</string> + <string name="bottom_chat_not_signed_in">Steam hat noch keine Web-Anmeldung zum Teilen, melde dich also einmal hier an.</string> + <string name="bottom_chat_stopped">Android hat die Chat-Seite geschlossen, während DroidDeck im Hintergrund war. Sie öffnet sich wieder, wenn du zu DroidDeck zurückkehrst.</string> + <string name="bottom_chat_open">Steam Chat öffnen</string> + <string name="bottom_chat_close">Chat schließen</string> + <string name="bottom_chat_mic_on">Mikro an</string> + <string name="bottom_chat_mic_off">Mikro aus</string> + <string name="bottom_chat_mic_unavailable">Das Mikro ist für dieses Spiel aus. Um zu sprechen, aktiviere „Mikrofon“ in den Steam-Einstellungen von DroidDeck (Audio) und starte das Spiel neu.</string> + <string name="bottom_chat_volume">Lautstärke %1$d%%</string> + <string name="bottom_page_telemetry">Spielstatistiken</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Akku</string> + <string name="bottom_telemetry_lap">Runde</string> + <string name="bottom_telemetry_position">Position</string> + <string name="bottom_telemetry_this_lap">Aktuelle Runde</string> + <string name="bottom_telemetry_last_lap">Letzte Runde</string> + <string name="bottom_telemetry_fuel">Treibstoff</string> + <string name="bottom_telemetry_cargo">Fracht</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Rechtsstatus</string> + <string name="bottom_telemetry_balance">Guthaben</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Port %1$d empfängt Daten (%2$d Pakete mit %3$d Bytes), aber in einem Format, das diese Seite noch nicht lesen kann.</string> + <string name="bottom_telemetry_port_busy">Ein anderes Programm verwendet bereits Port %1$s, daher kann dieses Spiel hier nicht angezeigt werden.</string> <string name="rtinst_removing">Linux-Laufzeit wird entfernt</string> <plurals name="rtinst_removing_entries"> @@ -1710,6 +1882,7 @@ <string name="flatpakmgr_not_ready">Richte zuerst Flatpak ein</string> <string name="flatpakmgr_starting">Wird gestartet</string> <string name="flatpakmgr_exit_status">Flatpak wurde mit Status %1$d beendet</string> + <string name="flatpakmgr_wrong_arch">%1$s wurde für %2$s gebaut, das DroidDeck nicht ausführen kann. Flatpak-Apps brauchen hier eine ARM64- oder x86_64-Version.</string> <string name="flatpakmgr_installing">%1$s wird installiert</string> <string name="flatpakmgr_updating">%1$s wird aktualisiert</string> <string name="flatpakmgr_removing">%1$s wird entfernt</string> @@ -1803,6 +1976,7 @@ <string name="adbpair_applying">Einstellung wird angewendet…</string> <string name="adbpair_command_failed">Befehl für Debugging über WLAN fehlgeschlagen</string> <string name="adbpair_channel_name">Einrichtung von Debugging über WLAN</string> + <string name="adbpair_progress_channel_name">Fortschritt der Einrichtung von Debugging über WLAN</string> <string name="adbpair_channel_description">Fragt nach dem Kopplungscode für Debugging über WLAN, während die Einstellungen geöffnet sind</string> <string name="adbpair_title_pair">Debugging über WLAN koppeln</string> <string name="adbpair_waiting_text">Aktiviere Debugging über WLAN und tippe dann auf „Gerät mit Kopplungscode koppeln“.</string> @@ -1911,6 +2085,7 @@ <string name="gpuinfo_not_adreno">Keine Adreno-GPU</string> <string name="gpuinfo_supported">Unterstützt</string> <string name="gpuinfo_experimental">Experimentell: Die Treiber sind Test-Builds</string> + <string name="gpuinfo_a850_experimental">Experimentelle Adreno-850-Unterstützung: erfordert kompatible experimentelle Anzeige- und Spieltreiber; auf diesem Gerät nicht geprüft</string> <string name="gpuinfo_below_tested">Unter der getesteten Hardware (Adreno 725 und neuer): läuft eventuell nicht</string> <string name="gpuinfo_unsupported">Nicht unterstützt: DroidDeck braucht eine Adreno-GPU (Snapdragon)</string> @@ -2007,6 +2182,7 @@ <string name="display_look_filter">%1$s Stellt die Skalierung auf %2$s.</string> <string name="display_match_screen">An Bildschirm anpassen (%1$d×%2$d)</string> <string name="display_follow_screen">Bildschirm folgen (passt sich beim Auf- und Zuklappen an)</string> + <string name="display_follow_screen_scaled">Skaliert %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Gerätedetails anzeigen</string> <string name="device_info_hide">Gerätedetails ausblenden</string> @@ -2113,6 +2289,13 @@ <string name="stores_resume">Fortsetzen</string> <string name="stores_refresh">Aktualisieren</string> <string name="stores_sort">Sortieren</string> + <string name="setup_rail_labels">Seitenleisten-Beschriftungen</string> + <string name="setup_rail_labels_hint">Namen unter den Symbolen der Seitenleiste anzeigen. Ausschalten für eine schmalere Seitenleiste.</string> + <string name="library_display">Anzeige</string> + <string name="library_display_larger">Größere Karten</string> + <string name="library_display_smaller">Kleinere Karten</string> + <string name="library_display_title">Titel anzeigen</string> + <string name="library_display_size">Größe anzeigen</string> <string name="stores_sort_last_played">Zuletzt gespielt</string> <string name="stores_sort_recently_installed">Zuletzt installiert</string> <string name="stores_sort_title_asc">Titel A–Z</string> @@ -2239,6 +2422,9 @@ <string name="stores_download_manager">Download-Manager</string> <string name="stores_parallel">Gleichzeitige Downloads</string> <string name="stores_install_where">Installieren in</string> + <string name="stores_install_language">Spielsprache</string> + <string name="stores_install_language_hint">GOG und Epic installieren diese Sprache. System folgt der App-Sprache.</string> + <string name="stores_install_language_system">System</string> <string name="stores_install_title">%1$s installieren:</string> <string name="stores_target_internal">Intern</string> <string name="stores_target_free">%1$s frei</string> @@ -2274,6 +2460,9 @@ <string name="edit_target">Ziel</string> <string name="edit_start_in">Ausführen in</string> <string name="edit_launch_options">Startoptionen</string> + <string name="edit_launch_options_steam_hint">Gemeinsam mit den Eigenschaften in Steam: Eine Änderung an einer Stelle gilt für beide.</string> + <string name="edit_launch_options_not_saved">Die Startoptionen konnten nicht in Steam gespeichert werden. Versuche es erneut.</string> + <string name="edit_launch_options_desktop">Steam ist eventuell in der Desktop-Sitzung geöffnet. Ändere die Startoptionen dort in den Eigenschaften oder beende zuerst die Sitzung.</string> <string name="edit_artwork">Grafiken</string> <string name="edit_other_exe">Andere EXE…</string> <string name="edit_remove">Entfernen</string> @@ -2401,6 +2590,7 @@ <string name="setup_download_source_custom">Eigener Präfix</string> <string name="setup_download_mirror">Seite</string> <string name="setup_download_prefix">Präfix</string> + <string name="setup_download_proxy">HTTP-Proxy</string> <string name="flathub_eyebrow">LINUX-APPS</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Desktop-Apps für den Linux-Desktop, geöffnet über Desktop.</string> @@ -2541,6 +2731,22 @@ <string name="glasses_tracking_flat_hint">„Automatisch“ hält dieses 2D-Spiel fest im Blickfeld. Wähle unter „Anzeige“ die Option „Virtueller Bildschirm“, um Kopf-Tracking zu nutzen.</string> <string name="glasses_tracking_sbs_hint">Kopf-Tracking gilt für einen virtuellen Bildschirm oder ein laufendes SteamVR-Spiel.</string> <string name="glasses_hardware">Gerät</string> + <string name="vr_controllers_tab">Controller</string> + <string name="vr_controllers_group">SteamVR-Controller</string> + <string name="vr_controllers_emulate">Gamepad in VR</string> + <string name="vr_controllers_emulate_hint">Die beiden VR-Hände, als die dein Controller spielt. Änderungen gelten sofort, auch während SteamVR läuft. Joy-Cons und getrackte Hände übernehmen weiterhin ihre Seite.</string> + <string name="vr_controllers_off">Normales Gamepad</string> + <string name="vr_controllers_index">Valve-Index-Controller</string> + <string name="vr_controllers_touch">Meta-Quest-3-Controller</string> + <string name="vr_controllers_vive">HTC-Vive-Controller</string> + <string name="vr_controllers_sticks">Sticks starten mit</string> + <string name="vr_controllers_sticks_hint">Drücke in VR beide Sticks gleichzeitig, um umzuschalten.</string> + <string name="vr_controllers_sticks_game">Bewegung im Spiel</string> + <string name="vr_controllers_sticks_hands">Bewegung der Hände</string> + <string name="vr_controllers_buttons">Tasten</string> + <string name="vr_controllers_buttons_stick">Trigger sind Trigger, Schultertasten greifen, A/B und X/Y sind die Fronttasten der jeweiligen Hand, Stick-Klicks klicken die Thumbsticks, Guide öffnet das SteamVR-Menü. Steuerkreuz hoch und runter bewegt die Hände näher heran oder weiter weg.</string> + <string name="vr_controllers_buttons_vive">Die Sticks sind Trackpads; A/X oder ein Stick-Klick drückt sie. Trigger sind Trigger, Schultertasten greifen, Start und Select sind Menü, Guide öffnet das SteamVR-Menü.</string> + <string name="vr_controllers_buttons_off">Keine VR-Hände. Spiele mit Gamepad-Unterstützung und das SteamVR-Menü erhalten deinen Controller wie gewohnt.</string> <string name="glasses_brightness">Helligkeit</string> <string name="glasses_volume">Lautstärke</string> <string name="glasses_sunblock">Sonnenschutz</string> @@ -2598,6 +2804,12 @@ <string name="hand_camera_placement">Kameraplatzierung</string> <string name="hand_camera_placement_hint">Prüfe, ob die Kamera dich sehen kann, bevor du spielst.</string> <string name="hand_camera_check">Prüfen</string> + <string name="tracking_pack_title">Download für Hand-Tracking</string> + <string name="tracking_pack_hint">Hand-Tracking benötigt einen einmaligen Download von %1$s.</string> + <string name="tracking_pack_download">Herunterladen</string> + <string name="tracking_pack_retry">Erneut versuchen</string> + <string name="tracking_pack_downloading">Hand-Tracking wird heruntergeladen… %1$d%%</string> + <string name="tracking_pack_failed">Hand-Tracking konnte nicht heruntergeladen werden. Prüfe deine Verbindung und versuch es erneut.</string> <string name="hand_camera_check_title">Kameraplatzierung</string> <string name="hand_camera_how_rear">Stell das Gerät etwa 1,5 bis 2 Meter entfernt in Brusthöhe auf, mit der Rückkamera zu dir gerichtet. Tritt dann mit ausgestreckten Händen ins Bild.</string> <string name="hand_camera_how_front">Stell das Gerät etwa 1,5 bis 2 Meter entfernt in Brusthöhe auf, mit dem Bildschirm zu dir gerichtet. Tritt dann mit ausgestreckten Händen ins Bild.</string> @@ -2680,6 +2892,21 @@ <string name="storage_safe_hint">Ungenutzte Laufzeiten, Reste, alte Logs</string> <string name="storage_clean_up">Aufräumen…</string> <string name="storage_session_running">Beende die Sitzung, um aufzuräumen oder zu entfernen. Die Größen werden weiterhin angezeigt.</string> + <string name="storage_default_group">Installationsort</string> + <string name="storage_default_title">Standardspeicher</string> + <string name="storage_default_hint">Neue Store-Installationen landen am ausgewählten Ort. Vorhandene Spiele bleiben, wo sie sind. Steam-Bibliotheken behalten ihre eigene Einstellung.</string> + <string name="storage_default_ask">Jedes Mal fragen</string> + <string name="storage_default_ask_detail">Für jede Installation ein Ziel wählen</string> + <string name="storage_default_internal">Interner Speicher</string> + <string name="storage_default_external">Externer Speicher</string> + <string name="storage_default_external_detail">%1$s · %2$s frei</string> + <string name="storage_default_external_missing">Nicht verbunden</string> + <string name="storage_default_folder">Ordner · %1$s</string> + <string name="storage_default_folder_free">%1$s frei</string> + <string name="storage_default_folder_missing">Nicht verbunden</string> + <string name="storage_default_choose_folder">Ordner auswählen…</string> + <string name="storage_default_choose_folder_detail">Einen beliebigen Ordner auf einer SD-Karte oder einem USB-Laufwerk verwenden</string> + <string name="storage_default_note">Spiele kommen in einen Games-Ordner am ausgewählten Ort. Vorhandene Spiele werden nicht verschoben.</string> <string name="storage_where">Belegung</string> <string name="storage_games">Steam-Spiele</string> <string name="storage_game_data">Spieldaten</string> @@ -2801,6 +3028,9 @@ <string name="storage_data_installed">Installierte Spiele</string> <string name="storage_data_parts">Präfix %1$s · Shader %2$s · Workshop %3$s</string> <string name="storage_clear_shaders">Shader löschen</string> + <string name="storage_reset_prefix">Präfix zurücksetzen</string> + <string name="storage_reset_prefix_title">Präfix für %1$s zurücksetzen?</string> + <string name="storage_reset_prefix_confirm">Löscht sein Wine-Präfix (%1$s) in %2$s und erstellt es beim nächsten Start neu. Speicherstände, Einstellungen und darin installierte Redistributables gehen verloren; Steam-Cloud-Speicherstände bleiben in deinem Konto.</string> <string name="storage_data_leftovers">Deinstallierte Spiele</string> <string name="storage_steam_app">Steam-App %1$d</string> <string name="storage_leftover_unsure_detail">Das Präfix enthält noch Dateien, darunter möglicherweise lokale Speicherstände</string> @@ -3102,6 +3332,117 @@ <string name="spatial_saved_views_hint">Gespeicherte Ansichten können neu berechnet werden. Starten Sie eine neue Kalibrierung zur Erfassung im aktuellen Tracking-Koordinatensystem.</string> <string name="spatial_model_checksum_error">Die Prüfsumme des Handmodells stimmt nicht überein</string> <string name="spatial_opencv_load_error">OpenCV konnte nicht geladen werden</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Mit Syncthing synchronisieren</string> + <string name="sync_enable_hint">Basiert auf Syncthing-Fork: eine Syncthing-Implementierung, mit der du Dateien im internen Dateisystem von DroidDeck mit anderen Syncthing-Instanzen synchronisieren kannst. Gilt nur für Dateien, die du im internen Dateisystem von DroidDeck speicherst.</string> + <string name="sync_missing">Dieser Build enthält kein Syncthing.</string> + <string name="sync_starting">Syncthing wird gestartet</string> + <string name="sync_status_starting">Wird gestartet</string> + <string name="sync_status_up_to_date">Aktuell</string> + <string name="sync_status_syncing">Synchronisiert</string> + <string name="sync_status_paused">Pausiert</string> + <string name="sync_status_pausing">Wird pausiert</string> + <string name="sync_status_resuming">Wird fortgesetzt</string> + <string name="sync_status_attention">Benötigt Aufmerksamkeit</string> + <string name="sync_status_failed">Syncthing gestoppt</string> + <string name="sync_failed_retry">Erneut versuchen</string> + <string name="sync_paused_wifi">Pausiert, bis Wi-Fi verfügbar ist</string> + <string name="sync_paused_game">Während des Spiels pausiert</string> + <string name="sync_summary">%1$d Ordner · %2$d von %3$d Geräten verbunden</string> + <string name="sync_left">Noch %1$s</string> + <string name="sync_open_web_ui">Web-GUI öffnen</string> + <string name="sync_pause">Pausieren</string> + <string name="sync_resume">Fortsetzen</string> + <string name="sync_running">Aktiv</string> + <string name="sync_running_hint">Ausschalten, um Syncthing vollständig zu beenden.</string> + <string name="sync_this_device">Dieses Gerät</string> + <string name="sync_device_id">Geräte-ID</string> + <string name="sync_show_qr">QR-Code anzeigen</string> + <string name="sync_advanced">Erweitert</string> + <string name="sync_advanced_hint">Ports, Ausführung, Zurücksetzen</string> + <string name="sync_open">Öffnen</string> + <string name="sync_waiting">Wartet auf dich</string> + <string name="sync_pending_device">%1$s möchte sich verbinden</string> + <string name="sync_pending_folder">%1$s möchte „%2$s“ teilen</string> + <string name="sync_pending_folder_hint">Annehmen, um zu wählen, wo es in DroidDeck gespeichert wird.</string> + <string name="sync_review">In der Web-GUI prüfen</string> + <string name="sync_folders">Ordner</string> + <string name="sync_no_folders">Noch keine Ordner.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Aktuell</string> + <string name="sync_folder_syncing">Synchronisiere %1$d %%</string> + <string name="sync_folder_scanning">Scanne</string> + <string name="sync_folder_paused">Pausiert</string> + <string name="sync_folder_out_of_sync">Nicht synchron</string> + <string name="sync_folder_errors">%1$d Dateien konnten nicht synchronisiert werden</string> + <string name="sync_folder_blocked">Blockiert</string> + <string name="sync_folder_blocked_hint">Dieser Ordner liegt außerhalb des DroidDeck-Speichers, daher hat DroidDeck ihn pausiert. Um Ordner außerhalb von DroidDeck zu synchronisieren, nutze die App Syncthing-Fork.</string> + <string name="sync_remove_folder">Aus Syncthing entfernen</string> + <string name="sync_remove_folder_hint">Beim Entfernen werden keine Dateien gelöscht.</string> + <string name="sync_devices">Geräte</string> + <string name="sync_no_devices">Noch keine Geräte.</string> + <string name="sync_connected">Verbunden</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Zuletzt gesehen %1$s</string> + <string name="sync_device_id_title">ID dieses Geräts</string> + <string name="sync_device_id_hint">Füge auf deinem anderen Gerät in Syncthing ein Gerät hinzu und scanne diesen Code oder füge die ID ein. Nimm es dann hier in der Web-GUI an.</string> + <string name="sync_copy">Kopieren</string> + <string name="sync_share">Teilen</string> + <string name="sync_done">Fertig</string> + <string name="sync_off_title">Syncthing ausschalten?</string> + <string name="sync_off_body">Syncthing wird jetzt beendet und bleibt aus, bis du es wieder einschaltest. Synchronisierte Dateien bleiben, wo sie sind.</string> + <string name="sync_off_forget">Auch die Syncthing-Konfiguration löschen</string> + <string name="sync_off_forget_hint">Entfernt die ID dieses Geräts, Ordner und Geräte. Beim erneuten Einschalten beginnt alles von vorn.</string> + <string name="sync_turn_off">Ausschalten</string> + <string name="sync_ports">Ports</string> + <string name="sync_port_sync">Synchronisierung</string> + <string name="sync_port_discovery">Lokale Gerätesuche</string> + <string name="sync_repick">Neue Ports wählen</string> + <string name="sync_repick_hint">Wird bei jedem Start erneut geprüft.</string> + <string name="sync_repick_button">Neu wählen</string> + <string name="sync_reset_group">Zurücksetzen</string> + <string name="sync_api_key">API-Schlüssel</string> + <string name="sync_regenerate">Neu generieren</string> + <string name="sync_reset">Syncthing zurücksetzen</string> + <string name="sync_reset_hint">Neue Geräte-ID, Ordner und Geräte werden entfernt. Dateien im DroidDeck-Speicher bleiben erhalten.</string> + <string name="sync_reset_button">Zurücksetzen</string> + <string name="sync_reset_confirm_title">Syncthing zurücksetzen?</string> + <string name="sync_running_group">Ausführung</string> + <string name="sync_run">Ausführen</string> + <string name="sync_run_open">Während DroidDeck geöffnet ist</string> + <string name="sync_run_background">Im Hintergrund</string> + <string name="sync_wifi_only">Nur über Wi-Fi</string> + <string name="sync_pause_games">Während Spielen pausieren</string> + <string name="sync_logs">Logs</string> + <string name="sync_logs_hint">Syncthing-Ausgabe dieser Sitzung</string> + <string name="sync_logs_share">Teilen</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Richte zuerst die Linux-Laufzeit ein.</string> + <string name="sync_accept">Annehmen</string> + <string name="sync_accept_title">„%1$s“ speichern in</string> + <string name="sync_add_folder">Ordner hinzufügen</string> + <string name="sync_add_folder_hint">Einen Ordner im DroidDeck-Speicher synchronisieren</string> + <string name="sync_choose">Auswählen</string> + <string name="sync_add">Hinzufügen</string> + <string name="sync_add_failed">Der Ordner konnte nicht hinzugefügt werden.</string> + <string name="sync_share_with">Teilen mit</string> + <string name="sync_share_none">Noch keine Geräte. Du kannst diesen Ordner später über die Web-GUI teilen.</string> + <string name="sync_use_folder">Diesen Ordner verwenden</string> + <string name="sync_new_folder">Neuer Ordner</string> + <string name="sync_location_home">Home-Verzeichnis des Containers</string> + <string name="sync_location_sync">Sync-Ordner</string> + <string name="sync_location_shared">Gemeinsamer DroidDeck-Speicher</string> + <string name="sync_location_card">DroidDeck auf %1$s</string> + <string name="sync_location_app">DroidDeck-App-Daten</string> + <string name="sync_web_path_locked">Neue Ordner werden im Sync-Ordner von DroidDeck gespeichert. Um einen anderen DroidDeck-Ordner zu synchronisieren, nutze „Ordner hinzufügen“ im Tab „Syncthing“.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Neu laden</string> + <string name="sync_not_running">Syncthing läuft nicht.</string> + <string name="session_end_steam_sigill">Steam wurde mit einer ungültigen Anweisung (SIGILL) beendet. Das kann ein Kompatibilitätsproblem mit CPU-Befehlen oder ein Absturz des Clients sein. Teile die Logs zusammen mit den Details deines Geräts.</string> + <string name="session_end_steam_try_x64">Du kannst Steam-Einstellungen → Steam-Client → x86-64 (experimentell) ausprobieren. Das erfordert einen zusätzlichen Download und kann langsamer laufen.</string> + <string name="session_end_vulkan_device">Der Linux-Grafiktreiber hat kein nutzbares Vulkan-Gerät gefunden. Prüfe, ob der ausgewählte Linux-GPU-Treiber diese GPU unterstützt.</string> + <string name="session_end_gpu_unsupported">Diese Sitzung kann nicht starten, weil es für diese GPU in der aktuellen Konfiguration keinen kompatiblen Linux-Vulkan-Treiber gibt. Adreno-Turnip-Treiber können keine Unterstützung für MediaTek/Mali-GPUs aktivieren.</string> <string name="setup_group_memory">Arbeitsspeicher</string> <string name="setup_clear_cached">Apps im Cache vor einer Sitzung schließen</string> <string name="setup_clear_cached_hint">Beim Start einer Sitzung schließt DroidDeck die Apps, die Android im Hintergrund vorhält, damit das Spiel mehr Arbeitsspeicher hat. „Debugging über WLAN“ muss aktiviert sein.</string> @@ -3125,6 +3466,12 @@ <string name="epic_client_open">Öffnen</string> <string name="epic_client_install">Installieren</string> <string name="game_tab_about">Über</string> + <string name="game_resources_browser">Öffnet sich in deinem Browser</string> + <string name="game_resource_guides">Anleitungen</string> + <string name="game_resource_protondb_detail">Kompatibilitätsberichte zu Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Für Spiele mit Speicherständen in deinem Steam-Konto</string> + <string name="game_resource_search">Websuche</string> <string name="game_tab_install">Installieren</string> <string name="game_install_location">Speicherort</string> <string name="game_install_folder">Ordner</string> @@ -3141,6 +3488,11 @@ <string name="stores_eyebrow_pass">verfügbar mit %1$s</string> <string name="stores_owned_in_library">Eigene Spiele in der Bibliothek</string> <string name="library_filter_added">Hinzugefügt</string> + <string name="library_filter">Filter</string> + <string name="library_filter_installed">Nur installierte</string> + <string name="library_filter_all_owned">Alle eigenen Spiele</string> + <string name="library_no_installed_matches">Keine installierten Spiele entsprechen diesen Filtern.</string> + <string name="library_browse_owned">Eigene Spiele durchsuchen</string> <string name="game_tab_launch">Start</string> <string name="game_tab_saves_cloud">Spielstände & Cloud</string> <string name="game_launch_shortcut">Steam-Verknüpfung</string> @@ -3158,6 +3510,40 @@ <string name="stores_itch_update_replaced">Der Entwickler hat diesen Build durch %1$s ersetzt. Darauf aktualisieren?</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Cloud-Einstellungen</string> + <string name="integration_title">Steam-Integration</string> + <string name="integration_count">%1$d von %2$d an</string> + <string name="integration_set_up">Einrichten</string> + <string name="integration_location">Standort</string> + <string name="integration_app_info">App-Info</string> + <string name="integration_wifi">Wi-Fi-Namen</string> + <string name="integration_brightness">Helligkeit</string> + <string name="integration_home">DroidDeck als Startbildschirm</string> + <string name="integration_shortcuts">Systemtasten</string> + <string name="integration_wifi_hint">Netzwerke in Steam anzeigen · braucht Standortzugriff, kein Tracking</string> + <string name="integration_wifi_on">Netzwerke werden in Steam angezeigt</string> + <string name="integration_wifi_location_off">Standort ist aus</string> + <string name="integration_wifi_denied">Standort verweigert · erlaube ihn in App-Info</string> + <string name="integration_brightness_hint">Steams Regler stellt die Bildschirmhelligkeit ein</string> + <string name="integration_home_hint">Home öffnet in einer Sitzung das Steam-Menü</string> + <string name="integration_shortcuts_hint">Alt+Tab, Win-Taste und Home-Taste bleiben in der Sitzung</string> + <string name="integration_shortcuts_maybe_restricted">In Android ausgegraut? App-Info → ⋮ → Eingeschränkte Einstellungen zulassen</string> + <string name="integration_shortcuts_restricted">Von Android blockiert · App-Info → ⋮ → Eingeschränkte Einstellungen zulassen</string> + <string name="integration_shortcuts_service">DroidDeck-Systemtasten</string> + <string name="integration_shortcuts_service_description">Hält Alt+Tab, die Win-Taste und die Home-Taste in einer aktiven DroidDeck-Sitzung statt bei Android.</string> + <string name="integration_brightness_needed">Aktiviere Helligkeit unter Einrichtung → Steam-Integration</string> + <string name="setup_gpu_bridge_off">Mali-Brücke: aus</string> + <string name="setup_gpu_bridge_on">Mali-Brücke: an</string> + <string name="setup_gpu_bridge_detail">%1$s ist kein Adreno. Die experimentelle Vulkan-Brücke ist an: Die Sitzung zeichnet über den eigenen Treiber des Telefons. Rechne mit Fehlern und sende die Sitzungsprotokolle.</string> + <string name="setup_bridge_safe">Sicherer Modus</string> + <string name="setup_bridge_safe_on">Sicherer Modus: an</string> + <string name="setup_bridge_safe_off">Sicherer Modus: aus</string> + <string name="setup_bridge_safe_on_detail">Am kompatibelsten. Empfohlen für ein neues Gerät.</string> + <string name="setup_bridge_safe_off_detail">Schneller, wo diese GPU ihre Prüfungen bestanden hat.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatisch</string> + <string name="setup_bridge_dxvk_proton">DXVK: von Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Nutzt ein älteres DXVK, wenn das Vulkan dieser GPU für das von Proton zu alt ist.</string> + <string name="setup_bridge_dxvk_proton_detail">Jedes Proton behält sein eigenes DXVK, auch wenn das Vulkan dieser GPU dafür zu alt sein könnte.</string> <string name="apps_search_hint">Apps durchsuchen</string> <string name="apps_no_match">Keine Apps passen zu „%1$s“.</string> <string name="apps_add_widget">Widget hinzufügen</string> @@ -3206,6 +3592,8 @@ <string name="desktop_restore_done_body">Die Apps, die du hinzugefügt hast, sind wieder installiert.</string> <string name="desktop_restore_failed_title">Manche Software konnte nicht wiederhergestellt werden</string> <string name="desktop_restore_failed_body">Sieh in ~/.cache/droiddeck/apt-restore.log nach und versuche dann sudo apt install in Konsole.</string> + <string name="gog_full_files">Native Optimierungen sind nicht verfügbar. Der Download enthält vollständige Ersatzdateien.</string> + <string name="gog_recover">Patch-Ergebnis prüfen</string> <string name="slow_usb_title">Langsame USB-Verbindung</string> <string name="slow_usb_cable">%1$s ist über %2$s verbunden (%3$s Mbit/s, etwa %4$d MB/s), daher laden Spiele darauf langsam. Nutze ein USB-3-Kabel mit 5 Gbit/s oder mehr, dreh den USB-C-Stecker um oder verwende ein schnelleres Laufwerk.</string> <string name="slow_usb_port">%1$s ist über %2$s verbunden (%3$s Mbit/s, etwa %4$d MB/s). Der USB-Anschluss dieses Geräts kann nicht schneller, daher laden Spiele darauf langsam. Interner Speicher oder eine microSD-Karte können schneller sein.</string> @@ -3216,4 +3604,52 @@ <string name="steam_import_names_more">%1$s und %2$d weitere</string> <string name="steam_import_now">Jetzt neu starten</string> <string name="steam_import_later">Später</string> + <string name="gog_maintenance">GOG-Installation verwalten</string> + <string name="gog_check">Nach Updates suchen</string> + <string name="gog_repair">Prüfen/Reparieren</string> + <string name="gog_patches">Offline-Patches</string> + <string name="gog_refresh">Vollständigen Offline-Installer herunterladen</string> + <string name="gog_update">Auf %1$s aktualisieren</string> + <string name="gog_resume">GOG-Wartung fortsetzen</string> + <string name="gog_open_patch">Patch-Installer öffnen</string> + <string name="gog_patch_in_session">Schließe den Patch-Installer in der Linux-Sitzung ab oder brich ihn ab.</string> + <string name="gog_patch_requirements">Wähle einen Patch für deine installierte Version und Sprache. Unterstützte Ausgangsversionen sind eventuell nicht aufgeführt.</string> + <string name="gog_no_patches">GOG hat keine eigenständigen Windows-Patches für dieses Spiel.</string> + <string name="gog_managed_files">Geänderte Spieldateien werden möglicherweise ersetzt.</string> + <string name="gog_patch_installer_note">Der Installer öffnet sich in deiner Linux-Sitzung.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Zusätzlicher Speicher</string> + <string name="gog_space_estimate_label">Geschätzter Speicherbedarf</string> + <string name="gog_repair_action">Dateien reparieren</string> + <string name="gog_refresh_action">Installation erneuern</string> + <string name="gog_select_patch">Auswählen</string> + <string name="stores_gamejolt_not_owned">Nicht in deiner Game Jolt-Bibliothek</string> + <string name="stores_gamejolt_no_build">Kein Windows-Download für dieses Spiel</string> + <string name="stores_gamejolt_no_exe">Im Download wurde kein Windows-Spiel gefunden</string> + <string name="stores_gamejolt_no_game">Dieses Spiel wurde auf Game Jolt nicht gefunden</string> + <string name="stores_gamejolt_browse_failed">Spiele von Game Jolt konnten nicht geladen werden</string> + <string name="stores_gamejolt_download_failed">Game Jolt antwortete mit HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Die Downloads von Game Jolt konnten nicht geladen werden</string> + <string name="stores_gamejolt_build_open">Auf Game Jolt öffnen</string> + <string name="stores_gamejolt_archive">%1$s-Archive werden nicht unterstützt</string> + <string name="stores_gamejolt_extract_failed">Download konnte nicht entpackt werden (Code %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt ist nicht erreichbar</string> + <string name="stores_gamejolt_download_no_link">Game Jolt hat keinen Download-Link geliefert</string> + <string name="stores_gamejolt_section_featured">Empfohlen</string> + <string name="stores_gamejolt_section_hot">Angesagt</string> + <string name="stores_gamejolt_section_best">Beste</string> + <string name="stores_gamejolt_section_new">Neu</string> + <string name="stores_gamejolt_price_under_30">30 $ oder weniger</string> + <string name="stores_gamejolt_os_other">Andere</string> + <string name="stores_gamejolt_maturity_everyone">Alle Altersgruppen</string> + <string name="stores_gamejolt_maturity_teen">Jugendliche</string> + <string name="stores_gamejolt_maturity_adult">Erwachsene</string> + <string name="stores_gamejolt_status_complete">Fertig</string> + <string name="stores_gamejolt_status_early">Early Access</string> + <string name="stores_gamejolt_partners">Partnerspiele</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Altersfreigabe</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partner</string> + <string name="stores_gamejolt_followed">Gefolgte Spiele</string> </resources> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 2e788ac332..ad9263c98c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Επιλογές VKD3D για D3D12. Το nodxr απενεργοποιεί το ray tracing· χρησιμοποιήστε το μόνο για παιχνίδι που το χρειάζεται.</string> <string name="game_env_proton_log">Ορίστε σε 1 για διαγνωστικό αρχείο καταγραφής του Proton. Η καταγραφή μπορεί να μειώσει την απόδοση και να χρησιμοποιήσει χώρο αποθήκευσης.</string> <string name="game_env_wined3d">Ορίστε σε 1 για χρήση του WineD3D με βάση OpenGL αντί του DXVK, για δοκιμές συμβατότητας D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderer για DirectDraw, Direct3D 1-7 και παιχνίδια που εκτελούνται με WineD3D. Το Vulkan παρακάμπτει τη διαδρομή OpenGL μέσω Zink και είναι πολύ πιο γρήγορο για παλιά παιχνίδια DirectDraw και Direct3D 7 σε Adreno.</string> + <string name="game_env_dxvk_d3d8">Ορίστε σε 1 για εκτέλεση του Direct3D 8 μέσω DXVK αντί για WineD3D. Πιο γρήγορο στη δοκιμή Direct3D 8 του AIO Graphics Test σε Adreno.</string> <string name="game_env_no_ntsync">Ορίστε σε 1 για να κρατήσετε αυτό το παιχνίδι εκτός ntsync (droiddeck-ntsync ή οδηγός πυρήνα)· χρησιμοποιεί το droiddeck-esync όπου υπάρχει πακέτο, διαφορετικά το droiddeck-fsync.</string> <string name="game_env_no_esync">Ορίστε σε 1 για να απενεργοποιήσετε το droiddeck-esync για αυτό το παιχνίδι· χρησιμοποιεί αντ’ αυτού το droiddeck-fsync, ή το droiddeck-ntsync όταν είναι απενεργοποιημένο και το fsync.</string> <string name="game_env_no_fsync">Ορίστε σε 1 για να κρατήσετε αυτό το παιχνίδι εκτός droiddeck-fsync· χρησιμοποιεί το droiddeck-esync όπου υπάρχει πακέτο, διαφορετικά το droiddeck-ntsync.</string> <string name="game_env_fsync_first">Ορίστε σε 1 για εκτέλεση αυτού του παιχνιδιού με droiddeck-fsync, ή σε 0 για να προτάξετε το droiddeck-esync όπου ένα πακέτο ταιριάζει με το Proton του.</string> <string name="game_env_xalia">Ορίστε σε 0 για να απενεργοποιήσετε τον βοηθό πλοήγησης με χειριστήριο του Proton για αυτό το παιχνίδι.</string> + <string name="game_env_anticheat_offline">Ενεργό από προεπιλογή. Ξεκινά ένα παιχνίδι Easy Anti-Cheat χωρίς το anti-cheat του όταν το παιχνίδι υποστηρίζει παιχνίδι εκτός σύνδεσης. Απενεργοποιήστε το για εκκίνηση μέσω Easy Anti-Cheat ως συνήθως. Οι διαδικτυακές λειτουργίες που απαιτούν Easy Anti-Cheat παραμένουν μη διαθέσιμες.</string> <string name="game_env_hud">Επικάλυψη DXVK για D3D9–11. Το fps εμφανίζει τον ρυθμό καρέ· χωρίς ορισμό το αποκρύπτει.</string> <string name="game_env_dxvk_config">Ρυθμίσεις DXVK χωρισμένες με ερωτηματικά. Οι πρόσφατες εκδόσεις χρησιμοποιούν το dxvk.maxFrameRate για τον περιορισμό καρέ· προτιμήστε τον περιοριστή καρέ της συνεδρίας για συνήθη χρήση.</string> + <string name="game_env_cores">Πυρήνες CPU για αυτό το παιχνίδι, όπως 0-4 ή 0,2,4, αντί για τους πυρήνες παιχνιδιών της συνεδρίας. Λιγότεροι πυρήνες ζεσταίνονται λιγότερο.</string> <string name="game_env_vkd3d_limit">Όριο ρυθμού καρέ D3D12. Το 0 απενεργοποιεί το όριο.</string> <string name="game_env_glthread">Πολυνημάτωση OpenGL της Mesa. Το true μπορεί να βοηθήσει παιχνίδια OpenGL περιορισμένα από CPU· δοκιμάστε το ανά παιχνίδι.</string> <string name="sync_backend_title">Συγχρονισμός Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">Το FEX εκτελεί προγράμματα x86 Linux σε αυτή τη συσκευή ARM64. Το Αυτόματο το χρησιμοποιεί όταν το πρόγραμμα είναι χτισμένο για x86.</string> <string name="app_fex_x86">%1$s μέσω FEX</string> <string name="app_fex_not_ready">Αυτό το πρόγραμμα είναι χτισμένο για υπολογιστές %1$s και εκτελείται μέσω FEX, το οποίο δεν έχει ρυθμιστεί ακόμα. Ανοίξτε το Steam μία φορά ενώ είστε συνδεδεμένοι: το DroidDeck κάνει λήψη του FEX και του Steam Linux Runtime που χρειάζεται, και μετά αυτό ανοίγει.</string> + <string name="session_proot_missing">Δεν ήταν δυνατή η λήψη του proot του DroidDeck. Ελέγξτε τη σύνδεση και δοκιμάστε ξανά. Η συνεδρία δεν ξεκίνησε, επειδή το εναλλακτικό proot είναι πολύ αργό για παιχνίδι.</string> + <string name="session_directaudio_missing">Δεν ήταν δυνατή η λήψη του DirectAudio, οπότε ο ήχος των παιχνιδιών χρησιμοποιεί την πιο αργή διαδρομή σε αυτή τη συνεδρία.</string> <string name="session_end_program">Αυτό το πρόγραμμα</string> <string name="session_end_steam_download">Δεν ήταν δυνατή η λήψη του πελάτη Steam. Το δίκτυο ή το VPN σας ίσως αποκλείει τους διακομιστές του Steam· ελέγξτε τη σύνδεση και δοκιμάστε ξανά.</string> <string name="session_end_steam_setup">Δεν ήταν δυνατή η ρύθμιση του πελάτη Steam. Ελέγξτε τη σύνδεση και τον ελεύθερο χώρο αποθήκευσης και δοκιμάστε ξανά.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Χειριστήριο Xbox 360</string> <string name="mode_controller_note">Deck: κουμπί Quick Access και γυροσκόπιο. Steam Controller: το ίδιο, με αίσθηση λαβής στα πίσω κουμπιά. DualShock 4 και DualSense: γυροσκόπιο, και τα trackpad ως πινακίδα αφής τους. Xbox 360: ανοίξτε το Quick Access με Guide+A.</string> <string name="mode_back">Πίσω</string> + <string name="back_hold">Παρατεταμένο Πίσω για συντομεύσεις Steam</string> + <string name="back_hold_hint">Το παρατεταμένο Πίσω ανοίγει τη Γρήγορη πρόσβαση ή κάνει συνδυασμούς Steam με άλλα κουμπιά. Απενεργοποιήστε για να αγνοείται· το πάτημα και το διπλό πάτημα λειτουργούν.</string> + <string name="back_native_qam_hint">Κρατήστε πατημένο το Πίσω για 700 ms ή κρατήστε το Πίσω και πατήστε άλλο κουμπί για συντομεύσεις Steam.</string> + <string name="back_double_tap_window">Διάστημα διπλού πατήματος</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Να επιτρέπεται ο έλεγχος φωτεινότητας</string> + <string name="brightness_permission_text">Ρυθμίστε τον έλεγχο φωτεινότητας στο DroidDeck.</string> <string name="back_menu_then_qam">Μενού → QAM</string> <string name="back_qam_then_menu">QAM → Μενού</string> <string name="mode_session">Συνεδρία</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Καθυστερεί την αναστολή παρασκηνίου όσο το Steam κάνει ενεργά λήψη.</string> <string name="mode_suspend_note">Το Αυτόματο θέτει σε παύση στο παρασκήνιο και συνεχίζει όταν εμφανίζεται. Το Μη αυτόματο περιμένει το Συνέχιση. Το Ποτέ συνεχίζει να εκτελείται.</string> <string name="mode_startup">Εκκίνηση</string> - <string name="mode_steam_startup">Εκκίνηση του Steam με το DroidDeck</string> - <string name="mode_steam_startup_hint">Ανοίγει τη συνεδρία Steam όταν εκκινείται το DroidDeck.</string> + <string name="mode_startup_session">Άνοιγμα κατά την εκκίνηση</string> + <string name="mode_startup_session_hint">Ξεκινά αυτή τη συνεδρία όταν ανοίγει το DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Έλεγχος για εκδόσεις…</string> <string name="mode_decky_ready">Έτοιμο για εγκατάσταση %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Ενημερωμένο · %1$s</string> <string name="mode_decky_loader">Φορτωτής</string> <string name="mode_decky_install_latest">Εγκατάσταση τελευταίας έκδοσης</string> + <string name="decky_channel">Κανάλι ενημερώσεων</string> + <string name="decky_channel_hint">Ποιες εκδόσεις του Decky Loader θα εγκατασταθούν. Το πρόγραμμα ενημέρωσης του Decky χρησιμοποιεί το ίδιο κανάλι.</string> + <string name="decky_channel_stable">Σταθερό</string> + <string name="decky_channel_prerelease">Προέκδοση</string> + <string name="decky_channel_testing">Δοκιμαστικό</string> + <string name="decky_channel_failed">Δεν ήταν δυνατή η αποθήκευση του καναλιού ενημερώσεων του Decky</string> <string name="mode_decky_on">Ξεκινά με το Steam. Όσο είναι ενεργό, άλλες εφαρμογές σε αυτή τη συσκευή μπορεί να είναι σε θέση να ελέγξουν το Steam.</string> <string name="mode_decky_off">Ανενεργό. Η θύρα απομακρυσμένου εντοπισμού σφαλμάτων του Steam παραμένει κλειστή.</string> <string name="mode_decky_remove_title">Κατάργηση εγκατάστασης του Decky Loader;</string> @@ -323,6 +342,10 @@ <string name="mode_client">Πελάτης</string> <string name="mode_mangoapp">Επικάλυψη απόδοσης</string> <string name="mode_mangoapp_hint">Απενεργοποιήστε το αν τα παιχνίδια κολλάνε ή μαυρίζει η οθόνη σε λειτουργία Deck. Εφαρμόζεται στην επόμενη συνεδρία.</string> + <string name="mode_return_after_game">Επιστροφή στο DroidDeck μετά από παιχνίδι</string> + <string name="mode_return_after_game_hint">Όταν κλείνει ένα παιχνίδι που ξεκινήσατε από το DroidDeck ή άλλο launcher, το Steam τερματίζεται κανονικά (πρώτα ολοκληρώνονται οι αποθηκεύσεις στο cloud) και επιστρέφετε εκεί. Ανενεργό: παραμένετε στο Steam.</string> + <string name="mode_shader_precache">Προ-αποθήκευση shader</string> + <string name="mode_shader_precache_hint">Το Steam κατεβάζει έτοιμα shaders για τα παιχνίδια σας και τα επεξεργάζεται στο παρασκήνιο, ώστε τα παιχνίδια να κολλάνε λιγότερο. Η απενεργοποίηση εξοικονομεί δεδομένα, χώρο και μπαταρία· τα παιχνίδια δημιουργούν τα shaders κατά το παιχνίδι. Η ίδια ρύθμιση με το Λήψεις > Shader Pre-Caching του Steam. Εφαρμόζεται στην επόμενη συνεδρία.</string> <string name="mode_steam_repair">Επιδιόρθωση πελάτη Steam</string> <string name="mode_steam_repair_hint">Κάνει ξανά λήψη του πελάτη Steam την επόμενη φορά που θα ξεκινήσει το Steam. Χρησιμοποιήστε το αν το Steam παραμένει στην οθόνη φόρτωσης. Τα παιχνίδια, η σύνδεση και οι ρυθμίσεις διατηρούνται.</string> <string name="mode_steam_repair_queued">Ο πελάτης Steam θα ληφθεί ξανά την επόμενη φορά που θα ξεκινήσει το Steam.</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">Παρακάμπτει το PulseAudio για μικρότερη καθυστέρηση.</string> <string name="mode_mic">Μικρόφωνο</string> <string name="mode_mic_hint">Για φωνητική συνομιλία.</string> + <string name="drawer_mic_hint">Ενεργοποίηση ή απενεργοποίηση της λήψης μικροφώνου για αυτή τη συνεδρία.</string> + <string name="drawer_mic_failed">Δεν ήταν δυνατή η αλλαγή του μικροφώνου. Δοκιμάστε ξανά.</string> <string name="mode_network">Δίκτυο</string> <string name="mode_wifi_discovery">Εντοπισμός Wi-Fi</string> <string name="mode_wifi_discovery_hint">Εμφανίζει ονόματα Wi-Fi και κοντινά δίκτυα στο Steam.</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: ουρά GPU πραγματικού χρόνου</string> <string name="perf_gsrealtime_hint">Δίνει προτεραιότητα στην εργασία GPU του compositor. Μπορεί να εξομαλύνει τον ρυθμό καρέ με κάποιο κόστος για τα παιχνίδια.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Μνήμη</string> + <string name="perf_cap_off">Ανενεργό</string> + <string name="perf_cap_auto">Προεπιλογή προγράμματος οδήγησης</string> + <string name="perf_zram_client">Συμπίεση του Steam όσο τρέχει παιχνίδι</string> + <string name="perf_zram_client_hint">20 s μετά την εκκίνηση ενός παιχνιδιού, ο πελάτης Steam συμπιέζεται στη zRAM για να μείνει περισσότερη μνήμη στο παιχνίδι, και διαβάζεται πίσω όταν το παιχνίδι κλείσει. Απενεργοποιήστε το αν η συνεδρία κλείνει λίγο μετά την εκκίνηση παιχνιδιών. Ένα όριο RAM παραπάνω εξακολουθεί να συμπιέζει το Steam όταν η συνεδρία το ξεπεράσει.</string> + <string name="perf_ram_cap">Όριο RAM</string> + <string name="perf_ram_cap_hint">Ισχύει όσο τρέχει ο πελάτης Steam, σε λειτουργία Steam ή από την επιφάνεια εργασίας. Όταν η συνεδρία χρησιμοποιεί περισσότερη, το Steam και έπειτα οι άλλες υποστηριζόμενες διεργασίες της συνεδρίας συμπιέζονται στη zRAM. Ήπιο όριο: τίποτα δεν κλείνει, αλλά τα παιχνίδια μπορεί να κολλάνε όσο επιστρέφουν οι σελίδες.</string> + <string name="perf_ram_cap_unavailable">Απαιτεί zRAM swap, που δεν υπάρχει σε αυτή τη συσκευή.</string> + <string name="perf_vram_cap">Όριο VRAM</string> + <string name="perf_vram_cap_hint">Η μνήμη βίντεο που αναφέρει το DXVK στα παιχνίδια Direct3D, ώστε να προγραμματίζουν υφές για λιγότερη. Οι δικές ρυθμίσεις DXVK του παιχνιδιού υπερισχύουν. Εφαρμόζεται στην επόμενη συνεδρία.</string> <string name="perf_gpuclock">Διατήρηση της GPU στη μέγιστη συχνότητά της</string> <string name="perf_gpuclock_hint">Μόνο Adreno. Λιγότερα κολλήματα, μεγαλύτερη χρήση μπαταρίας και θερμότητα.</string> <string name="perf_fixes">Διορθώσεις συνεδρίας</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">Ταχεία διαδρομή proot</string> <string name="perf_fastpath_needs_seccomp">Απαιτεί το φίλτρο seccomp του proot.</string> <string name="perf_fastpath_hint">Ταχύτερη αναζήτηση αρχείων και λιγότερα κολλήματα. Απενεργοποιήστε το αν ένα πρόγραμμα δεν μπορεί να βρει τα αρχεία του.</string> + <string name="perf_cursor_composite">Σχεδίαση του δείκτη μέσα στο gamescope</string> + <string name="perf_cursor_composite_hint">Το Gamescope σχεδιάζει μόνο του τον δείκτη αντί να τον παραδίδει στο Android. Ενεργοποιήστε το για δείκτη που ελέγχεται από χειριστήριο. Το ανενεργό είναι πιο γρήγορο σε τηλέφωνο. Εφαρμόζεται στην επόμενη συνεδρία.</string> <string name="perf_identity">Ταυτότητα συνεδρίας</string> <string name="perf_hostname">Όνομα κεντρικού υπολογιστή</string> <string name="perf_hostname_hint">Το όνομα που βλέπει το Steam για αυτή τη συσκευή. Αν το αφήσετε κενό, επανέρχεται σε %1$s.</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">Τα αρχεία του αφαιρούνται από την εφαρμογή.</string> <string name="driver_delete_in_use">Τα αρχεία του αφαιρούνται. Είναι σε χρήση, οπότε το προεπιλεγμένο παίρνει τη θέση του.</string> <string name="drawer_page_display">Οθόνη</string> + <string name="drawer_frame_limit">Όριο καρέ</string> + <string name="drawer_frame_limit_note">Περιορίζει αυτό το παιχνίδι. Η οθόνη αλλάζει σε ρυθμό ανανέωσης που διαιρείται ακριβώς με το όριο, αν υπάρχει· άλλα όρια μπορεί να φαίνονται ανομοιόμορφα. Τα παιχνίδια Steam χρησιμοποιούν το Frame Limit του Steam στο μενού Quick Access.</string> <string name="drawer_page_effects">Εφέ</string> <string name="drawer_page_controls">Χειριστήρια</string> <string name="drawer_page_components">Στοιχεία</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">Κάψουλα</string> <string name="hud_size_minimal">Ελάχιστο</string> <string name="hud_size_mega">Μέγα</string> + <string name="hud_size_strip">Λωρίδα</string> <string name="hud_locked">Κλείδωμα θέσης</string> <string name="hud_locked_hint">Σύρετε το HUD για να το μετακινήσετε· ένα παρατεταμένο πάτημα το κλειδώνει ή το ξεκλειδώνει. Όσο είναι κλειδωμένο, τα χειριστήρια οθόνης από κάτω του εξακολουθούν να λειτουργούν.</string> + <string name="hud_snap">Προσκόλληση στα πλάγια</string> + <string name="hud_snap_hint">Αφήστε το HUD και μετακινείται στην πιο κοντινή πλευρά της οθόνης. Μια γρήγορη κίνηση το πετάει προς εκείνη την κατεύθυνση.</string> <string name="hud_group_look">Εμφάνιση</string> <string name="hud_scale">Μέγεθος στην οθόνη</string> <string name="hud_color_soft">Απαλό</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">Δεν ήταν δυνατή η αποθήκευση της αναφοράς HUD.</string> <string name="hud_reset">Επαναφορά ρυθμίσεων HUD</string> <string name="hud_reset_button">Επαναφορά</string> - <string name="hud_credit">FusionHUD από The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Λειτουργία κλιμάκωσης</string> <string name="drawer_scaling_sharpness">Οξύτητα κλιμάκωσης</string> <string name="drawer_effects">Εφέ οθόνης</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">Αυτόματο (%1$s)</string> <string name="drawer_keyboard">Πληκτρολόγιο</string> <string name="drawer_latency">Καθυστέρηση</string> + <string name="drawer_low_latency">Λειτουργία χαμηλής καθυστέρησης</string> + <string name="drawer_low_latency_hint">Αυξάνει τη χρήση CPU και μπαταρίας</string> <string name="drawer_low_latency_controller">Χειριστήριο χαμηλής καθυστέρησης</string> <string name="drawer_low_latency_controller_hint">Το χειριστήριο αναφέρει στα 1000 Hz αντί για 250 Hz. Λίγο περισσότερο CPU.</string> <string name="drawer_low_latency_touch">Αφή χαμηλής καθυστέρησης</string> <string name="drawer_low_latency_touch_hint">Οι αφές παρακάμπτουν την ομαδοποίηση καρέ, οπότε ο χειρισμός αφής του Steam τρέχει στα 1000 Hz. Λίγο περισσότερο CPU.</string> <string name="drawer_evdev_mouse">Ακατέργαστο κανάλι ποντικιού</string> + <string name="drawer_relative_mouse">Σχετικό ποντίκι</string> + <string name="drawer_relative_mouse_auto">Αυτόματα</string> + <string name="drawer_relative_mouse_on">Ενεργό</string> + <string name="drawer_relative_mouse_off">Ανενεργό</string> <string name="drawer_direct_cursor">Δείκτης</string> <string name="drawer_pc_keyboard">Πληκτρολόγιο PC</string> <string name="drawer_android_keyboard">Android</string> @@ -791,6 +838,10 @@ <string name="setup_session">Συνεδρία</string> <string name="setup_logs">Αρχεία καταγραφής συνεδρίας</string> <string name="setup_logs_hint">Αποθηκεύονται μετά από κάθε συνεδρία</string> + <string name="setup_game_debug_logs">Αρχεία καταγραφής εντοπισμού σφαλμάτων παιχνιδιών</string> + <string name="setup_game_debug_logs_hint">Συμπερίληψη διαγνωστικών Proton, Wine και γραφικών στην επόμενη εκκίνηση παιχνιδιού. Μπορεί να μειώσει την απόδοση και να χρησιμοποιήσει περισσότερο χώρο.</string> + <string name="setup_game_debug_logs_restart">Επανεκκινήστε αυτή τη συνεδρία για να αποθηκεύσετε αρχεία καταγραφής εντοπισμού σφαλμάτων παιχνιδιών</string> + <string name="setup_logging_update_failed">Δεν ήταν δυνατή η ενημέρωση της καταγραφής. Ελέγξτε τον διακόπτη και δοκιμάστε ξανά.</string> <string name="setup_agent_commands">Εργαλεία εντοπισμού σφαλμάτων</string> <string name="setup_latest_logs">Πιο πρόσφατα αρχεία καταγραφής συνεδρίας</string> <string name="setup_saved_logs">Αποθηκευμένα αρχεία καταγραφής συνεδρίας</string> @@ -822,20 +873,22 @@ <string name="setup_home">Χρήση ως αρχική οθόνη</string> <string name="setup_home_on">Το DroidDeck μπορεί να είναι η εφαρμογή αρχικής οθόνης</string> <string name="setup_home_off">Το DroidDeck δεν προτείνεται ποτέ ως εφαρμογή αρχικής οθόνης</string> + <string name="setup_home_game_space_first">Στην Προσθήκη παιχνιδιών, ορίστε το DroidDeck σε Συμπερίληψη</string> <string name="setup_orientation">Προσανατολισμός</string> + <string name="setup_launcher_orientation">Προσανατολισμός launcher</string> + <string name="setup_launcher_orientation_auto">Ακολουθεί την περιστροφή της συσκευής</string> + <string name="setup_orientation_portrait">Κατακόρυφος</string> + <string name="setup_session_orientation">Προσανατολισμός συνεδρίας</string> + <string name="setup_session_orientation_hint">Ισχύει για το Steam, τα παιχνίδια, την επιφάνεια εργασίας και τον επεξεργαστή χειριστηρίου. Οι προκαθορισμένες αναλύσεις περιστρέφονται με τη συνεδρία· το προσαρμοσμένο πλάτος και ύψος μένουν όπως καταχωρίστηκαν.</string> <string name="setup_orientation_auto">Αυτόματος οριζόντιος προσανατολισμός</string> <string name="setup_orientation_landscape">Οριζόντιος προσανατολισμός</string> <string name="setup_orientation_reverse">Αντίστροφος οριζόντιος προσανατολισμός</string> <string name="setup_fullscreen">Πλήρης οθόνη</string> <string name="setup_fullscreen_on">Αποκρύπτει τις γραμμές κατάστασης και πλοήγησης του Android</string> <string name="setup_fullscreen_off">Εμφανίζει τις γραμμές κατάστασης και πλοήγησης του Android</string> - <string name="setup_dual_screen">Διπλή οθόνη</string> - <string name="setup_dual_screen_hint">Το Αυτόματο χρησιμοποιεί τη δεύτερη οθόνη σε φορητές συσκευές με ενσωματωμένη. Το Ενεργό χρησιμοποιεί οποιαδήποτε δεύτερη οθόνη. Το Ανενεργό κρατά τα πάντα σε μία οθόνη.</string> <string name="setup_dual_screen_auto">Αυτόματο</string> <string name="setup_dual_screen_on">Ενεργό</string> <string name="setup_dual_screen_off">Ανενεργό</string> - <string name="setup_dual_screen_menu">Μενού κάτω οθόνης</string> - <string name="setup_dual_screen_menu_hint">Μεταφέρει τις ενότητες και το μενού του παιχνιδιού στη δεύτερη οθόνη και η πληκτρολόγηση γίνεται εκεί, ώστε η πάνω οθόνη να κρατά την πλήρη προβολή. Τα L2 και R2 αλλάζουν ενότητα.</string> <string name="setup_dual_screen_controls">Χειριστήρια κάτω οθόνης στα παιχνίδια</string> <string name="setup_dual_screen_controls_hint">Ανοίγει την επιφάνεια αφής και το πληκτρολόγιο στη δεύτερη οθόνη όταν ξεκινά μια συνεδρία.</string> <string name="dual_typing_title">Πληκτρολόγηση για την πάνω οθόνη</string> @@ -987,6 +1040,14 @@ <string name="gate_step1">Ανοίξτε Ρυθμίσεις → Επιλογές προγραμματιστή → Ασύρματος εντοπισμός σφαλμάτων και ενεργοποιήστε τον</string> <string name="gate_step2">Πατήστε «Σύζευξη συσκευής με κωδικό σύζευξης»</string> <string name="gate_step3">Πληκτρολογήστε τον κωδικό στην ειδοποίηση του DroidDeck</string> + <string name="pairguide_build_number">Στο Σχετικά με το τηλέφωνο, πατήστε 7 φορές τον Αριθμό έκδοσης</string> + <string name="pairguide_wireless">Ενεργοποιήστε τον Ασύρματο εντοπισμό σφαλμάτων</string> + <string name="pairguide_pair">Ανοίξτε τον Ασύρματο εντοπισμό σφαλμάτων και πατήστε «Σύζευξη συσκευής με κωδικό σύζευξης»</string> + <string name="pairguide_child_process">Ενεργοποιήστε την επιλογή «Απενεργοποίηση περιορισμών θυγατρικών διεργασιών»</string> + <string name="pairguide_row_child_process">Απενεργοποίηση περιορισμών θυγατρικών διεργασιών</string> + <string name="pairguide_row_build_number">Αριθμός έκδοσης</string> + <string name="pairguide_row_wireless">Ασύρματος εντοπισμός σφαλμάτων</string> + <string name="pairguide_row_pair">Σύζευξη συσκευής με κωδικό σύζευξης</string> <string name="gate_waiting">Αναμονή για το αναδυόμενο παράθυρο σύζευξης…</string> <string name="gate_code_needed">Βρέθηκε αναδυόμενο παράθυρο. Εισαγάγετε τον κωδικό του στην ειδοποίηση.</string> <string name="gate_status">Κατάσταση</string> @@ -1125,7 +1186,6 @@ <string name="games_never_played">Δεν έχει παιχτεί ποτέ</string> <string name="games_runtime_busy_percent">Το runtime είναι απασχολημένο · %1$d%%</string> <string name="games_runtime_busy">Το runtime είναι απασχολημένο</string> - <string name="games_runtime_first_play">Το runtime εγκαθίσταται στο πρώτο Play</string> <string name="games_runtime_update">Υπάρχει ενημέρωση runtime</string> <string name="games_runtime_ready">● Το runtime είναι έτοιμο</string> <string name="games_internal">Εσωτερική αποθήκευση</string> @@ -1142,6 +1202,9 @@ <string name="gpu_hide_other">Απόκρυψη προγραμμάτων οδήγησης για άλλες GPU</string> <string name="gpu_show_other">Εμφάνιση προγραμμάτων οδήγησης για άλλες GPU</string> <string name="gpu_advanced">Για προχωρημένους</string> + <string name="gpu_ubwc_title">Συμβατότητα UBWC</string> + <string name="gpu_ubwc_hint">Δοκιμάστε Ενεργό ή Ανενεργό αν το Steam ή το Android εμφανίζει γραμμές ή τρεμόπαιγμα. Ισχύει και για τα δύο προγράμματα οδήγησης μετά την επανεκκίνηση του DroidDeck.</string> + <string name="gpu_ubwc_restart">Κάντε επανεκκίνηση του DroidDeck για εφαρμογή.</string> <string name="gpu_set_with_display">Ορίζεται μαζί με το πρόγραμμα οδήγησης οθόνης: το %1$s φέρει και τα δύο.</string> <string name="gpu_set_with_runtime">Ορίζεται μαζί με το πρόγραμμα οδήγησης runtime: το %1$s φέρει και τα δύο.</string> <string name="gpu_runtime_hint">Χρησιμοποιείται από παιχνίδια και την επιφάνεια εργασίας.</string> @@ -1250,10 +1313,15 @@ <string name="pip_auto">Αυτόματη είσοδος σε λειτουργία εικόνας εντός εικόνας</string> <string name="unfolded_controls">Χειριστήρια στην ξεδιπλωμένη οθόνη</string> <string name="unfolded_controls_hint">Ξεδιπλωμένη, το παιχνίδι βρίσκεται πάνω από τις πινακίδες αφής και τις πίσω λαβές του Steam Deck. Διπλωμένη, το παιχνίδι καταλαμβάνει όλη την οθόνη.</string> + <string name="unfolded_controls_with_controller">Διατήρηση με χειριστήριο</string> + <string name="unfolded_controls_with_controller_hint">Εμφάνιση αυτών των χειριστηρίων αφής και όταν είναι συνδεδεμένο χειριστήριο.</string> <string name="pip_suspended">Σε αναστολή</string> <string name="pip_not_ready">Η λειτουργία εικόνας εντός εικόνας είναι διαθέσιμη μόλις η συνεδρία είναι έτοιμη.</string> <string name="pip_permission">Επιτρέψτε την εικόνα εντός εικόνας για το DroidDeck στις ρυθμίσεις Android.</string> <string name="pip_unavailable">Το Android δεν μπόρεσε να ανοίξει τη λειτουργία εικόνας εντός εικόνας.</string> + <string name="game_more">Περισσότερα</string> + <string name="game_edit_art">Επεξεργασία εικαστικών</string> + <string name="stores_in_steam_label">Στο Steam</string> <string name="game_shortcut">Συντόμευση</string> <string name="game_shortcut_add">Προσθήκη στην αρχική οθόνη</string> <string name="game_shortcut_choose">Επιλογή παιχνιδιού</string> @@ -1277,6 +1345,10 @@ <string name="main_wait_runtime">Περιμένετε να ολοκληρωθεί η λειτουργία του runtime</string> <string name="main_wait_proton_install">Περιμένετε να ολοκληρωθεί η εγκατάσταση του εργαλείου συμβατότητας</string> + <string name="load_compat_title">Προετοιμασία εργαλείων συμβατότητας</string> + <string name="load_compat_wait">Αναμονή για ολοκλήρωση της ρύθμισης συμβατότητας</string> + <string name="load_compat_hint">Η συνεδρία σας θα ξεκινήσει όταν ολοκληρωθεί η ρύθμιση.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Περιμένετε να ολοκληρωθεί η εγκατάσταση της εφαρμογής επιφάνειας εργασίας</string> <string name="main_wait_install_game">Περιμένετε να ολοκληρωθεί η εγκατάσταση πριν εκκινήσετε ένα παιχνίδι</string> <string name="main_saves_close_session">Κλείστε πρώτα τη συνεδρία Steam, ώστε το παιχνίδι να μην αποθηκεύσει πάνω από την εισαγωγή</string> @@ -1313,6 +1385,9 @@ <string name="main_install_anyway">Εγκατάσταση παρόλα αυτά</string> <string name="main_remove_runtime_title">Κατάργηση του Linux runtime</string> <string name="main_remove_runtime_text">Αυτό διαγράφει το runtime, τον πελάτη Steam μέσα σε αυτό και κάθε παιχνίδι που είναι εγκατεστημένο εκεί.</string> + <string name="runtime_actions_title">Runtime Linux</string> + <string name="runtime_actions_text">Η Επιδιόρθωση επανεγκαθιστά τα αρχεία συστήματος του runtime και διατηρεί το Steam, τα παιχνίδια και τις ρυθμίσεις σας. Πρόσθετα όπως η επιφάνεια εργασίας εγκαθίστανται ξανά όταν τα χρησιμοποιήσετε. Η Αφαίρεση διαγράφει τα πάντα.</string> + <string name="runtime_repair">Επιδιόρθωση runtime</string> <string name="main_applied">Εφαρμόστηκε: %1$s</string> <string name="android_app_open_failed_primary">Δεν ήταν δυνατό το άνοιγμα του %1$s στην κύρια οθόνη</string> <string name="android_app_open_failed_on">Δεν ήταν δυνατό το άνοιγμα του %1$s στο %2$s</string> @@ -1442,6 +1517,11 @@ <string name="session_runtime_catalog_unreachable">Δεν ήταν δυνατή η πρόσβαση στον κατάλογο runtime. Ελέγξτε τη σύνδεση και πατήστε ξανά Αναπαραγωγή.</string> <string name="session_runtime_install_failed">Το Linux runtime δεν εγκαταστάθηκε. Ελέγξτε το runtime στη Ρύθμιση και πατήστε ξανά Αναπαραγωγή.</string> <string name="session_desktop_install_failed">Η επιφάνεια εργασίας δεν εγκαταστάθηκε (%1$s). Ελέγξτε τη σύνδεση και πατήστε ξανά Επιφάνεια εργασίας.</string> + <string name="session_package_resume_failed">Δεν ήταν δυνατή η ολοκλήρωση μιας εγκατάστασης που διακόπηκε (%1$s). Ελέγξτε τη σύνδεση και τον χώρο και δοκιμάστε ξανά.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Το runtime Linux είναι κατεστραμμένο: %1$d σύνδεσμος βιβλιοθήκης δείχνει σε αρχείο που λείπει (%2$s), συνήθως μετά από διακοπή εγκατάστασης. Η Επιδιόρθωση διατηρεί τα παιχνίδια και τις ρυθμίσεις σας.</item> + <item quantity="other">Το runtime Linux είναι κατεστραμμένο: %1$d σύνδεσμοι βιβλιοθηκών δείχνουν σε αρχεία που λείπουν (%2$s και άλλα), συνήθως μετά από διακοπή εγκατάστασης. Η Επιδιόρθωση διατηρεί τα παιχνίδια και τις ρυθμίσεις σας.</item> + </plurals> <string name="session_ended_named">%1$s διακόπηκε αναπάντεχα. Κοινοποιήστε τα αρχεία καταγραφής με μια αναφορά σφάλματος, ή δοκιμάστε ξανά.</string> <string name="session_ended_program">Το πρόγραμμα διακόπηκε αναπάντεχα. Κοινοποιήστε τα αρχεία καταγραφής με μια αναφορά σφάλματος, ή δοκιμάστε ξανά.</string> <string name="session_ended_desktop">Η επιφάνεια εργασίας διακόπηκε αναπάντεχα. Κοινοποιήστε τα αρχεία καταγραφής με μια αναφορά σφάλματος, ή δοκιμάστε ξανά.</string> @@ -1456,6 +1536,13 @@ <string name="mode_decky_plugins_hint">Εγκαταστήστε ένα ZIP προσθέτου για την επόμενη συνεδρία Steam.</string> <string name="mode_decky_plugin_downloading">Γίνεται λήψη…</string> <string name="mode_decky_plugin_install_zip">Εγκατάσταση από ZIP</string> + <string name="decky_zip_warning_title">Εγκατάσταση plugin τρίτων</string> + <string name="decky_zip_warning_text">Η ομάδα του Decky Loader δεν έχει ελέγξει αυτό το plugin. Μπορεί να περιέχει κακόβουλο λογισμικό, όπως λογισμικό για υποκλοπή του λογαριασμού σας Steam ή βλάβη της συσκευής σας. Με την εγκατάσταση αυτού του plugin, αποδέχεστε ότι αναλαμβάνετε όλους τους κινδύνους για τη συσκευή σας.</string> + <string name="decky_zip_warning_continue">Συνέχεια</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Περιμένετε %1$d δευτερόλεπτο</item> + <item quantity="other">Περιμένετε %1$d δευτερόλεπτα</item> + </plurals> <string name="store_cat_games">Παιχνίδια</string> <string name="store_cat_audio_video">Ήχος & βίντεο</string> <string name="store_cat_graphics">Γραφικά</string> @@ -1617,6 +1704,8 @@ <string name="fm_accept">Αποδοχή</string> <string name="fm_decline">Απόρριψη</string> <string name="fm_drive_not_readable">Το %1$s είναι προσαρτημένο αλλά δεν είναι αναγνώσιμο αυτή τη στιγμή</string> + <string name="fm_drive_access_title">Να επιτραπεί η πρόσβαση στο %1$s</string> + <string name="fm_drive_access_text">Το Android επιτρέπει στο DroidDeck να βλέπει αυτόν τον δίσκο αλλά όχι να τον διαβάζει. Ενεργοποιήστε την Πρόσβαση σε όλα τα αρχεία για το DroidDeck και επιστρέψτε.</string> <string name="fm_list_view">Προβολή λίστας</string> <string name="fm_grid_view">Προβολή πλέγματος</string> <string name="fm_search">Αναζήτηση</string> @@ -1688,6 +1777,89 @@ <string name="second_mode_keyboard_trackpad">Πληκτρολόγιο + πινακίδα αφής</string> <string name="second_mode_terminal">Τερματικό</string> <string name="second_mode_deck_controls">Λαβές Deck + πινακίδες αφής</string> + <string name="second_mode_dashboard">Πίνακας ελέγχου</string> + <string name="bottom_dashboard_empty">Δεν υπάρχει τίποτα για εμφάνιση ακόμα.</string> + <string name="bottom_page_downloads">Λήψεις</string> + <string name="bottom_downloads_none">Δεν εκτελούνται λήψεις.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Λήψη cache shader</string> + <string name="bottom_downloads_paused">Σε παύση</string> + <string name="bottom_downloads_queued">Αναμονή για έναρξη</string> + <string name="bottom_page_notifications">Ειδοποιήσεις</string> + <string name="bottom_notifications_listener">DroidDeck – κάτω οθόνη</string> + <string name="bottom_notifications_why">Εμφάνιση μηνυμάτων και άλλων ειδοποιήσεων εδώ ενώ παίζετε. Παραμένουν μόνο σε αυτή την οθόνη και δεν αποθηκεύονται. Το Android ρωτά μία φορά: η σελίδα πρόσβασης ειδοποιήσεων ανοίγει σε αυτή την οθόνη· ενεργοποιήστε εκεί το DroidDeck και αυτή η σελίδα επιστρέφει μόνη της.</string> + <string name="bottom_notifications_allow">Αποδοχή πρόσβασης ειδοποιήσεων</string> + <string name="bottom_notifications_none">Δεν υπάρχουν ειδοποιήσεις.</string> + <string name="bottom_notifications_count">%1$d ειδοποιήσεις</string> + <string name="bottom_notifications_clear">Απαλοιφή</string> + <string name="bottom_page_screenshots">Στιγμιότυπα οθόνης</string> + <string name="stats_fps_needs_hud">Τα FPS απαιτούν ενεργό HUD</string> + <string name="stats_speed">Ταχύτητα</string> + <string name="stats_pedals">Πεντάλ</string> + <string name="stats_gforce">Δύναμη G</string> + <string name="stats_timing">Χρονομέτρηση</string> + <string name="stats_best_lap">Καλύτερος γύρος</string> + <string name="stats_tires">Ελαστικά °C</string> + <string name="stats_trace">Γκάζι και φρένο, τελευταία 10 s</string> + <string name="stats_speed_chart">Ταχύτητα, %1$s</string> + <string name="stats_gear">Σχέση</string> + <string name="stats_steam_client_arm">Πελάτης Steam ARM</string> + <string name="stats_steam_client_x86">Πελάτης Steam x86</string> + <string name="stats_throttle">Γκάζι</string> + <string name="stats_brake">Φρένο</string> + <string name="stats_lights">Ενδεικτικές λυχνίες</string> + <string name="stats_lamp_shift">Αλλαγή</string> + <string name="stats_lamp_handbrake">Χειρόφρενο</string> + <string name="stats_lamp_pit">Περιοριστής pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Κινητήρας %1$s °C</string> + <string name="stats_oil_temp">Λάδι %1$s °C</string> + <string name="stats_power">Διανομέας ισχύος</string> + <string name="stats_fuel_t">Καύσιμο, t</string> + <string name="stats_fuel_main">Κύριο %1$s t</string> + <string name="stats_fuel_reserve">Εφεδρικό %1$s t</string> + <string name="bottom_telemetry_send_title">Αποστολή δεδομένων πίνακα</string> + <string name="bottom_telemetry_send_auto">Αυτόματα</string> + <string name="bottom_telemetry_send_auto_hint">Το ενεργοποιεί για κάθε παιχνίδι της λίστας, μαζί και όσα βρεθούν αργότερα. Τα παιχνίδια που απενεργοποιείτε παραμένουν ανενεργά.</string> + <string name="bottom_telemetry_send_note">Αυτό αλλάζει τη ρύθμιση εξόδου δεδομένων του ίδιου του παιχνιδιού. Εφαρμόζεται την επόμενη φορά που ξεκινά το παιχνίδι· η απενεργοποίηση επαναφέρει την προηγούμενη ρύθμιση.</string> + <string name="bottom_telemetry_send_close">Κλείστε το %1$s για να το αλλάξετε.</string> + <string name="bottom_telemetry_send_failed">Δεν ήταν δυνατή η αλλαγή των ρυθμίσεων του %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: ενεργοποιήστε το %2$s στις ρυθμίσεις του παιχνιδιού με IP 127.0.0.1 και θύρα %3$d.</string> + <string name="bottom_shots_where">Αποθηκεύονται στο Pictures/DroidDeck. Εδώ εμφανίζονται και τα στιγμιότυπα του Steam.</string> + <string name="bottom_shots_take">Λήψη στιγμιότυπου</string> + <string name="bottom_shots_saved">Το στιγμιότυπο αποθηκεύτηκε.</string> + <string name="bottom_shots_failed">Δεν ήταν δυνατή η λήψη στιγμιότυπου.</string> + <string name="bottom_shots_none">Δεν υπάρχουν στιγμιότυπα ακόμα.</string> + <string name="bottom_page_chat">Συνομιλία & φωνή</string> + <string name="bottom_chat_why">Διαβάστε και απαντήστε στη συνομιλία του Steam εδώ ενώ το παιχνίδι συνεχίζει στην κύρια οθόνη. Χρησιμοποιεί τον λογαριασμό με τον οποίο είναι συνδεδεμένο το Steam.</string> + <string name="bottom_chat_not_signed_in">Το Steam δεν έχει ακόμα σύνδεση web για κοινή χρήση, οπότε συνδεθείτε εδώ μία φορά.</string> + <string name="bottom_chat_stopped">Το Android έκλεισε τη σελίδα συνομιλίας ενώ το DroidDeck ήταν στο παρασκήνιο. Ανοίγει ξανά όταν επιστρέψετε στο DroidDeck.</string> + <string name="bottom_chat_open">Άνοιγμα Steam Chat</string> + <string name="bottom_chat_close">Κλείσιμο συνομιλίας</string> + <string name="bottom_chat_mic_on">Μικρόφωνο ανοιχτό</string> + <string name="bottom_chat_mic_off">Μικρόφωνο κλειστό</string> + <string name="bottom_chat_mic_unavailable">Το μικρόφωνο είναι απενεργοποιημένο για αυτό το παιχνίδι. Για να μιλήσετε, ενεργοποιήστε το Μικρόφωνο στις ρυθμίσεις Steam του DroidDeck (Ήχος) και ξεκινήστε ξανά το παιχνίδι.</string> + <string name="bottom_chat_volume">Ένταση %1$d%%</string> + <string name="bottom_page_telemetry">Στατιστικά παιχνιδιού</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Μπαταρία</string> + <string name="bottom_telemetry_lap">Γύρος</string> + <string name="bottom_telemetry_position">Θέση</string> + <string name="bottom_telemetry_this_lap">Τρέχων γύρος</string> + <string name="bottom_telemetry_last_lap">Προηγούμενος γύρος</string> + <string name="bottom_telemetry_fuel">Καύσιμο</string> + <string name="bottom_telemetry_cargo">Φορτίο</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Νομική κατάσταση</string> + <string name="bottom_telemetry_balance">Υπόλοιπο</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Η θύρα %1$d λαμβάνει δεδομένα (%2$d πακέτα των %3$d byte), αλλά σε μορφή που αυτή η σελίδα δεν μπορεί ακόμα να διαβάσει.</string> + <string name="bottom_telemetry_port_busy">Ένα άλλο πρόγραμμα χρησιμοποιεί ήδη τη θύρα %1$s, οπότε αυτό το παιχνίδι δεν μπορεί να εμφανιστεί εδώ.</string> <string name="rtinst_removing">Κατάργηση του Linux runtime</string> <plurals name="rtinst_removing_entries"> @@ -1718,6 +1890,7 @@ <string name="flatpakmgr_not_ready">Ρυθμίστε πρώτα το Flatpak</string> <string name="flatpakmgr_starting">Γίνεται εκκίνηση</string> <string name="flatpakmgr_exit_status">Το Flatpak έκλεισε με κατάσταση %1$d</string> + <string name="flatpakmgr_wrong_arch">Το %1$s είναι φτιαγμένο για %2$s, που το DroidDeck δεν μπορεί να εκτελέσει. Οι εφαρμογές Flatpak εδώ χρειάζονται έκδοση για ARM64 ή x86_64.</string> <string name="flatpakmgr_installing">Εγκατάσταση %1$s</string> <string name="flatpakmgr_updating">Ενημέρωση %1$s</string> <string name="flatpakmgr_removing">Κατάργηση %1$s</string> @@ -1811,6 +1984,7 @@ <string name="adbpair_applying">Εφαρμογή της ρύθμισης…</string> <string name="adbpair_command_failed">Η εντολή ασύρματου εντοπισμού σφαλμάτων απέτυχε</string> <string name="adbpair_channel_name">Ρύθμιση ασύρματου εντοπισμού σφαλμάτων</string> + <string name="adbpair_progress_channel_name">Πρόοδος ρύθμισης ασύρματου εντοπισμού σφαλμάτων</string> <string name="adbpair_channel_description">Ζητά τον κωδικό σύζευξης ασύρματου εντοπισμού σφαλμάτων όσο οι Ρυθμίσεις είναι ανοιχτές</string> <string name="adbpair_title_pair">Σύζευξη ασύρματου εντοπισμού σφαλμάτων</string> <string name="adbpair_waiting_text">Ενεργοποιήστε τον ασύρματο εντοπισμό σφαλμάτων και πατήστε «Σύζευξη συσκευής με κωδικό σύζευξης».</string> @@ -1919,6 +2093,7 @@ <string name="gpuinfo_not_adreno">Δεν είναι GPU Adreno</string> <string name="gpuinfo_supported">Υποστηρίζεται</string> <string name="gpuinfo_experimental">Πειραματικό: τα προγράμματα οδήγησής του είναι δοκιμαστικές εκδόσεις</string> + <string name="gpuinfo_a850_experimental">Πειραματική υποστήριξη Adreno 850: απαιτεί συμβατά πειραματικά προγράμματα οδήγησης οθόνης και παιχνιδιών· δεν έχει επαληθευτεί σε αυτή τη συσκευή</string> <string name="gpuinfo_below_tested">Κάτω από το δοκιμασμένο υλικό (Adreno 725 και νεότερα): ίσως να μην εκτελεστεί</string> <string name="gpuinfo_unsupported">Δεν υποστηρίζεται: το DroidDeck χρειάζεται GPU Adreno (Snapdragon)</string> @@ -2015,6 +2190,7 @@ <string name="display_look_filter">%1$s Ορίζει την κλιμάκωση σε %2$s.</string> <string name="display_match_screen">Αντιστοίχιση οθόνης (%1$d×%2$d)</string> <string name="display_follow_screen">Ακολούθηση οθόνης (αλλάζει μέγεθος όταν διπλώνει ή ξεδιπλώνει)</string> + <string name="display_follow_screen_scaled">Κλιμάκωση %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Εμφάνιση στοιχείων συσκευής</string> <string name="device_info_hide">Απόκρυψη στοιχείων συσκευής</string> @@ -2104,7 +2280,7 @@ <string name="stores_itch_price_sale">Σε προσφορά</string> <string name="stores_itch_load_more">Φόρτωση περισσότερων</string> <string name="stores_itch_platform_any">Οποιαδήποτε πλατφόρμα</string> - <string name="stores_itch_platform_mobile_web">Mobile web</string> + <string name="stores_itch_platform_mobile_web">Web για κινητά</string> <string name="stores_itch_tag_add">Προσθήκη ετικέτας</string> <string name="stores_itch_tag_title">Φιλτράρισμα ανά ετικέτα</string> <string name="stores_itch_browse_failed">Δεν ήταν δυνατή η φόρτωση παιχνιδιών από το itch.io</string> @@ -2121,6 +2297,13 @@ <string name="stores_resume">Συνέχιση</string> <string name="stores_refresh">Ανανέωση</string> <string name="stores_sort">Ταξινόμηση</string> + <string name="setup_rail_labels">Ετικέτες πλαϊνής γραμμής</string> + <string name="setup_rail_labels_hint">Εμφάνιση ονομάτων κάτω από τα εικονίδια της πλαϊνής γραμμής. Απενεργοποιήστε για πιο λεπτή πλαϊνή γραμμή.</string> + <string name="library_display">Προβολή</string> + <string name="library_display_larger">Μεγαλύτερες κάρτες</string> + <string name="library_display_smaller">Μικρότερες κάρτες</string> + <string name="library_display_title">Εμφάνιση τίτλου</string> + <string name="library_display_size">Εμφάνιση μεγέθους</string> <string name="stores_sort_last_played">Παίχτηκαν πρόσφατα</string> <string name="stores_sort_recently_installed">Εγκαταστήθηκαν πρόσφατα</string> <string name="stores_sort_title_asc">Τίτλος Α–Ω</string> @@ -2247,6 +2430,9 @@ <string name="stores_download_manager">Διαχείριση λήψεων</string> <string name="stores_parallel">Ταυτόχρονες λήψεις</string> <string name="stores_install_where">Εγκατάσταση σε</string> + <string name="stores_install_language">Γλώσσα παιχνιδιού</string> + <string name="stores_install_language_hint">Τα GOG και Epic εγκαθιστούν αυτή τη γλώσσα. Το Σύστημα ακολουθεί τη γλώσσα της εφαρμογής.</string> + <string name="stores_install_language_system">Σύστημα</string> <string name="stores_install_title">Εγκατάσταση %1$s:</string> <string name="stores_target_internal">Εσωτερική</string> <string name="stores_target_free">%1$s ελεύθερα</string> @@ -2285,6 +2471,9 @@ <string name="edit_target">Προορισμός</string> <string name="edit_start_in">Εκκίνηση σε</string> <string name="edit_launch_options">Επιλογές εκκίνησης</string> + <string name="edit_launch_options_steam_hint">Κοινές με τις Ιδιότητες του Steam: μια αλλαγή στο ένα σημείο εμφανίζεται και στα δύο.</string> + <string name="edit_launch_options_not_saved">Δεν ήταν δυνατή η αποθήκευση των επιλογών εκκίνησης στο Steam. Δοκιμάστε ξανά.</string> + <string name="edit_launch_options_desktop">Το Steam μπορεί να είναι ανοιχτό στη συνεδρία επιφάνειας εργασίας. Αλλάξτε τις επιλογές εκκίνησης από τις Ιδιότητές του ή κλείστε πρώτα τη συνεδρία.</string> <string name="edit_artwork">Γραφικά</string> <string name="edit_other_exe">Άλλο exe…</string> <string name="edit_remove">Κατάργηση</string> @@ -2412,6 +2601,7 @@ <string name="setup_download_source_custom">Δικό σου prefix</string> <string name="setup_download_mirror">Ιστότοπος</string> <string name="setup_download_prefix">Πρόθεμα</string> + <string name="setup_download_proxy">Διακομιστής μεσολάβησης HTTP</string> <string name="flathub_eyebrow">ΕΦΑΡΜΟΓΕΣ LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Εφαρμογές επιφάνειας εργασίας για την επιφάνεια εργασίας Linux, ανοίγουν από την Επιφάνεια εργασίας.</string> @@ -2552,6 +2742,22 @@ <string name="glasses_tracking_flat_hint">Το «Αυτόματο» κρατά αυτό το παιχνίδι 2D σταθερό στο οπτικό πεδίο. Επιλέξτε «Εικονική οθόνη» στην ενότητα «Οθόνη» για να χρησιμοποιήσετε παρακολούθηση κεφαλιού.</string> <string name="glasses_tracking_sbs_hint">Η παρακολούθηση κεφαλιού ισχύει για εικονική οθόνη ή για παιχνίδι SteamVR που εκτελείται.</string> <string name="glasses_hardware">Συσκευή</string> + <string name="vr_controllers_tab">Χειριστήρια</string> + <string name="vr_controllers_group">Χειριστήρια SteamVR</string> + <string name="vr_controllers_emulate">Χειριστήριο στο VR</string> + <string name="vr_controllers_emulate_hint">Τα δύο χέρια VR που παίζει το χειριστήριό σας. Οι αλλαγές εφαρμόζονται αμέσως, και όσο τρέχει το SteamVR. Τα Joy-Con και τα χέρια με παρακολούθηση εξακολουθούν να αναλαμβάνουν τη δική τους πλευρά.</string> + <string name="vr_controllers_off">Κανονικό χειριστήριο</string> + <string name="vr_controllers_index">Χειριστήρια Valve Index</string> + <string name="vr_controllers_touch">Χειριστήρια Meta Quest 3</string> + <string name="vr_controllers_vive">Χειριστήρια HTC Vive</string> + <string name="vr_controllers_sticks">Τα αναλογικά ξεκινούν</string> + <string name="vr_controllers_sticks_hint">Πατήστε μαζί και τα δύο αναλογικά κατά το VR για εναλλαγή.</string> + <string name="vr_controllers_sticks_game">Μετακινώντας εσάς στο παιχνίδι</string> + <string name="vr_controllers_sticks_hands">Μετακινώντας τα χέρια</string> + <string name="vr_controllers_buttons">Κουμπιά</string> + <string name="vr_controllers_buttons_stick">Οι σκανδάλες είναι σκανδάλες, οι προφυλακτήρες πιάνουν, τα A/B και X/Y είναι τα πρόσθια κουμπιά κάθε χεριού, το πάτημα των αναλογικών πατά τα thumbsticks, το Guide ανοίγει το μενού SteamVR. Το D-pad πάνω και κάτω φέρνει τα χέρια πιο κοντά ή πιο μακριά.</string> + <string name="vr_controllers_buttons_vive">Τα αναλογικά είναι trackpads· το A/X ή το πάτημα του αναλογικού τα πατά. Οι σκανδάλες είναι σκανδάλες, οι προφυλακτήρες πιάνουν, τα Start και Select είναι μενού, το Guide ανοίγει το μενού SteamVR.</string> + <string name="vr_controllers_buttons_off">Χωρίς χέρια VR. Τα παιχνίδια που υποστηρίζουν χειριστήριο, καθώς και το μενού SteamVR, λαμβάνουν το χειριστήριό σας ως συνήθως.</string> <string name="glasses_brightness">Φωτεινότητα</string> <string name="glasses_volume">Ένταση ήχου</string> <string name="glasses_sunblock">Σκίαση</string> @@ -2609,6 +2815,12 @@ <string name="hand_camera_placement">Τοποθέτηση κάμερας</string> <string name="hand_camera_placement_hint">Βεβαιωθείτε ότι η κάμερα σάς βλέπει πριν παίξετε.</string> <string name="hand_camera_check">Έλεγχος</string> + <string name="tracking_pack_title">Λήψη παρακολούθησης χεριών</string> + <string name="tracking_pack_hint">Η παρακολούθηση χεριών χρειάζεται εφάπαξ λήψη %1$s.</string> + <string name="tracking_pack_download">Λήψη</string> + <string name="tracking_pack_retry">Επανάληψη</string> + <string name="tracking_pack_downloading">Λήψη παρακολούθησης χεριών… %1$d%%</string> + <string name="tracking_pack_failed">Δεν ήταν δυνατή η λήψη της παρακολούθησης χεριών. Ελέγξτε τη σύνδεσή σας και δοκιμάστε ξανά.</string> <string name="hand_camera_check_title">Τοποθέτηση κάμερας</string> <string name="hand_camera_how_rear">Στήστε τη συσκευή όρθια σε απόσταση 1,5 έως 2 μέτρων, περίπου στο ύψος του στήθους, με την πίσω κάμερα στραμμένη προς εσάς. Έπειτα μπείτε στο οπτικό πεδίο με τα χέρια τεντωμένα.</string> <string name="hand_camera_how_front">Στήστε τη συσκευή όρθια σε απόσταση 1,5 έως 2 μέτρων, περίπου στο ύψος του στήθους, με την οθόνη στραμμένη προς εσάς. Έπειτα μπείτε στο οπτικό πεδίο με τα χέρια τεντωμένα.</string> @@ -2680,6 +2892,21 @@ <string name="storage_safe_hint">Αχρησιμοποίητα περιβάλλοντα, υπολείμματα, παλιά αρχεία καταγραφής</string> <string name="storage_clean_up">Καθαρισμός…</string> <string name="storage_session_running">Σταμάτησε τη συνεδρία για να καθαρίσεις ή να διαγράψεις κάτι. Τα μεγέθη παραμένουν ορατά.</string> + <string name="storage_default_group">Τοποθεσία εγκατάστασης</string> + <string name="storage_default_title">Προεπιλεγμένος αποθηκευτικός χώρος</string> + <string name="storage_default_hint">Οι νέες εγκαταστάσεις από καταστήματα πηγαίνουν στην επιλεγμένη τοποθεσία. Τα υπάρχοντα παιχνίδια μένουν όπου είναι. Οι βιβλιοθήκες Steam διατηρούν τη δική τους ρύθμιση.</string> + <string name="storage_default_ask">Ερώτηση κάθε φορά</string> + <string name="storage_default_ask_detail">Επιλογή προορισμού για κάθε εγκατάσταση</string> + <string name="storage_default_internal">Εσωτερικός αποθηκευτικός χώρος</string> + <string name="storage_default_external">Εξωτερικός αποθηκευτικός χώρος</string> + <string name="storage_default_external_detail">%1$s · %2$s ελεύθερα</string> + <string name="storage_default_external_missing">Δεν είναι συνδεδεμένο</string> + <string name="storage_default_folder">Φάκελος · %1$s</string> + <string name="storage_default_folder_free">%1$s ελεύθερα</string> + <string name="storage_default_folder_missing">Δεν είναι συνδεδεμένο</string> + <string name="storage_default_choose_folder">Επιλογή φακέλου…</string> + <string name="storage_default_choose_folder_detail">Χρησιμοποιήστε οποιονδήποτε φάκελο σε κάρτα SD ή μονάδα USB</string> + <string name="storage_default_note">Τα παιχνίδια μπαίνουν σε φάκελο Games μέσα στην επιλεγμένη τοποθεσία. Τα υπάρχοντα παιχνίδια δεν μετακινούνται.</string> <string name="storage_where">Πού πηγαίνει</string> <string name="storage_games">Παιχνίδια Steam</string> <string name="storage_game_data">Δεδομένα παιχνιδιών</string> @@ -2801,6 +3028,9 @@ <string name="storage_data_installed">Εγκατεστημένα παιχνίδια</string> <string name="storage_data_parts">Πρόθεμα %1$s · σκιαστές %2$s · εργαστήριο %3$s</string> <string name="storage_clear_shaders">Εκκαθάριση shaders</string> + <string name="storage_reset_prefix">Επαναφορά prefix</string> + <string name="storage_reset_prefix_title">Επαναφορά prefix για %1$s;</string> + <string name="storage_reset_prefix_confirm">Διαγράφει το prefix Wine του (%1$s) στο %2$s και το δημιουργεί ξανά στην επόμενη εκκίνηση. Οι αποθηκεύσεις, οι ρυθμίσεις και τα εγκατεστημένα redistributables μέσα του χάνονται· οι αποθηκεύσεις Steam Cloud παραμένουν στον λογαριασμό σας.</string> <string name="storage_data_leftovers">Διαγραμμένα παιχνίδια</string> <string name="storage_steam_app">Εφαρμογή Steam %1$d</string> <string name="storage_leftover_unsure_detail">Το prefix περιέχει ακόμη αρχεία, ίσως τοπικές αποθηκεύσεις</string> @@ -3102,6 +3332,117 @@ <string name="spatial_saved_views_hint">Οι αποθηκευμένες προβολές μπορούν να υπολογιστούν εκ νέου. Ξεκινήστε μια νέα βαθμονόμηση για αποτύπωση στο τρέχον σύστημα συντεταγμένων παρακολούθησης.</string> <string name="spatial_model_checksum_error">Αναντιστοιχία αθροίσματος ελέγχου μοντέλου χεριού</string> <string name="spatial_opencv_load_error">Δεν ήταν δυνατή η φόρτωση του OpenCV</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Συγχρονισμός με Syncthing</string> + <string name="sync_enable_hint">Βασίζεται στο Syncthing-Fork: μια υλοποίηση του Syncthing που σας επιτρέπει να συγχρονίζετε αρχεία του εσωτερικού συστήματος αρχείων του DroidDeck με άλλες εγκαταστάσεις Syncthing. Αφορά μόνο αρχεία που αποθηκεύετε στο εσωτερικό σύστημα αρχείων του DroidDeck.</string> + <string name="sync_missing">Αυτή η έκδοση δεν περιλαμβάνει το Syncthing.</string> + <string name="sync_starting">Εκκίνηση του Syncthing</string> + <string name="sync_status_starting">Εκκίνηση</string> + <string name="sync_status_up_to_date">Ενημερωμένο</string> + <string name="sync_status_syncing">Συγχρονισμός</string> + <string name="sync_status_paused">Σε παύση</string> + <string name="sync_status_pausing">Γίνεται παύση</string> + <string name="sync_status_resuming">Γίνεται συνέχιση</string> + <string name="sync_status_attention">Χρειάζεται προσοχή</string> + <string name="sync_status_failed">Το Syncthing σταμάτησε</string> + <string name="sync_failed_retry">Δοκιμάστε ξανά</string> + <string name="sync_paused_wifi">Σε παύση έως ότου υπάρξει Wi-Fi</string> + <string name="sync_paused_game">Σε παύση κατά τη διάρκεια του παιχνιδιού</string> + <string name="sync_summary">%1$d φάκελοι · %2$d από %3$d συσκευές συνδεδεμένες</string> + <string name="sync_left">Απομένουν %1$s</string> + <string name="sync_open_web_ui">Άνοιγμα διεπαφής web</string> + <string name="sync_pause">Παύση</string> + <string name="sync_resume">Συνέχιση</string> + <string name="sync_running">Σε λειτουργία</string> + <string name="sync_running_hint">Απενεργοποιήστε το για να σταματήσει εντελώς το Syncthing.</string> + <string name="sync_this_device">Αυτή η συσκευή</string> + <string name="sync_device_id">Ταυτότητα συσκευής</string> + <string name="sync_show_qr">Εμφάνιση QR</string> + <string name="sync_advanced">Για προχωρημένους</string> + <string name="sync_advanced_hint">Θύρες, πότε εκτελείται, επαναφορά</string> + <string name="sync_open">Άνοιγμα</string> + <string name="sync_waiting">Σας περιμένει</string> + <string name="sync_pending_device">Η συσκευή %1$s θέλει να συνδεθεί</string> + <string name="sync_pending_folder">Η συσκευή %1$s θέλει να μοιραστεί τον φάκελο «%2$s»</string> + <string name="sync_pending_folder_hint">Αποδεχτείτε για να επιλέξετε πού θα αποθηκευτεί στο DroidDeck.</string> + <string name="sync_review">Έλεγχος στη διεπαφή web</string> + <string name="sync_folders">Φάκελοι</string> + <string name="sync_no_folders">Δεν υπάρχουν ακόμα φάκελοι.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Ενημερωμένος</string> + <string name="sync_folder_syncing">Συγχρονισμός %1$d%%</string> + <string name="sync_folder_scanning">Σάρωση</string> + <string name="sync_folder_paused">Σε παύση</string> + <string name="sync_folder_out_of_sync">Μη συγχρονισμένος</string> + <string name="sync_folder_errors">Δεν ήταν δυνατός ο συγχρονισμός %1$d αρχείων</string> + <string name="sync_folder_blocked">Αποκλεισμένος</string> + <string name="sync_folder_blocked_hint">Αυτός ο φάκελος βρίσκεται εκτός του αποθηκευτικού χώρου του DroidDeck, γι\' αυτό το DroidDeck τον έθεσε σε παύση. Για να συγχρονίσετε φακέλους εκτός DroidDeck, χρησιμοποιήστε την εφαρμογή Syncthing-Fork.</string> + <string name="sync_remove_folder">Αφαίρεση από το Syncthing</string> + <string name="sync_remove_folder_hint">Η αφαίρεση δεν διαγράφει κανένα αρχείο.</string> + <string name="sync_devices">Συσκευές</string> + <string name="sync_no_devices">Δεν υπάρχουν ακόμα συσκευές.</string> + <string name="sync_connected">Συνδεδεμένη</string> + <string name="sync_offline">Εκτός σύνδεσης</string> + <string name="sync_last_seen">Τελευταία εμφάνιση %1$s</string> + <string name="sync_device_id_title">Ταυτότητα αυτής της συσκευής</string> + <string name="sync_device_id_hint">Στην άλλη σας συσκευή, προσθέστε μια συσκευή στο Syncthing και σαρώστε αυτόν τον κωδικό ή επικολλήστε την ταυτότητα. Στη συνέχεια, αποδεχτείτε την εδώ στη διεπαφή web.</string> + <string name="sync_copy">Αντιγραφή</string> + <string name="sync_share">Κοινή χρήση</string> + <string name="sync_done">Έγινε</string> + <string name="sync_off_title">Απενεργοποίηση του Syncthing;</string> + <string name="sync_off_body">Το Syncthing σταματά τώρα και παραμένει σταματημένο μέχρι να το ενεργοποιήσετε ξανά. Τα συγχρονισμένα αρχεία παραμένουν εκεί που βρίσκονται.</string> + <string name="sync_off_forget">Διαγραφή και των ρυθμίσεων του Syncthing</string> + <string name="sync_off_forget_hint">Αφαιρεί την ταυτότητα αυτής της συσκευής, τους φακέλους και τις συσκευές. Με την επανενεργοποίηση ξεκινά από την αρχή.</string> + <string name="sync_turn_off">Απενεργοποίηση</string> + <string name="sync_ports">Θύρες</string> + <string name="sync_port_sync">Συγχρονισμός</string> + <string name="sync_port_discovery">Τοπική ανακάλυψη</string> + <string name="sync_repick">Επιλογή νέων θυρών</string> + <string name="sync_repick_hint">Ελέγχεται ξανά σε κάθε εκκίνηση.</string> + <string name="sync_repick_button">Νέα επιλογή</string> + <string name="sync_reset_group">Επαναφορά</string> + <string name="sync_api_key">Κλειδί API</string> + <string name="sync_regenerate">Αναδημιουργία</string> + <string name="sync_reset">Επαναφορά του Syncthing</string> + <string name="sync_reset_hint">Νέα ταυτότητα συσκευής, αφαίρεση φακέλων και συσκευών. Τα αρχεία στον αποθηκευτικό χώρο του DroidDeck διατηρούνται.</string> + <string name="sync_reset_button">Επαναφορά</string> + <string name="sync_reset_confirm_title">Επαναφορά του Syncthing;</string> + <string name="sync_running_group">Λειτουργία</string> + <string name="sync_run">Εκτέλεση</string> + <string name="sync_run_open">Όσο το DroidDeck είναι ανοιχτό</string> + <string name="sync_run_background">Στο παρασκήνιο</string> + <string name="sync_wifi_only">Μόνο μέσω Wi-Fi</string> + <string name="sync_pause_games">Παύση κατά τη διάρκεια παιχνιδιών</string> + <string name="sync_logs">Αρχεία καταγραφής</string> + <string name="sync_logs_hint">Έξοδος του Syncthing για αυτή τη συνεδρία</string> + <string name="sync_logs_share">Κοινή χρήση</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Ρυθμίστε πρώτα το runtime Linux.</string> + <string name="sync_accept">Αποδοχή</string> + <string name="sync_accept_title">Αποθήκευση του «%1$s» σε</string> + <string name="sync_add_folder">Προσθήκη φακέλου</string> + <string name="sync_add_folder_hint">Συγχρονισμός ενός φακέλου στον αποθηκευτικό χώρο του DroidDeck</string> + <string name="sync_choose">Επιλογή</string> + <string name="sync_add">Προσθήκη</string> + <string name="sync_add_failed">Δεν ήταν δυνατή η προσθήκη του φακέλου.</string> + <string name="sync_share_with">Κοινή χρήση με</string> + <string name="sync_share_none">Δεν υπάρχουν ακόμα συσκευές. Μπορείτε να μοιραστείτε αυτόν τον φάκελο αργότερα από τη διεπαφή web.</string> + <string name="sync_use_folder">Χρήση αυτού του φακέλου</string> + <string name="sync_new_folder">Νέος φάκελος</string> + <string name="sync_location_home">Αρχικός φάκελος του container</string> + <string name="sync_location_sync">Φάκελος συγχρονισμού</string> + <string name="sync_location_shared">Κοινόχρηστος χώρος DroidDeck</string> + <string name="sync_location_card">DroidDeck σε %1$s</string> + <string name="sync_location_app">Δεδομένα εφαρμογής DroidDeck</string> + <string name="sync_web_path_locked">Οι νέοι φάκελοι αποθηκεύονται στον φάκελο συγχρονισμού του DroidDeck. Για να συγχρονίσετε άλλον φάκελο του DroidDeck, χρησιμοποιήστε την Προσθήκη φακέλου στην καρτέλα Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Επαναφόρτωση</string> + <string name="sync_not_running">Το Syncthing δεν εκτελείται.</string> + <string name="session_end_steam_sigill">Το Steam σταμάτησε με μη έγκυρη εντολή (SIGILL). Μπορεί να είναι πρόβλημα συμβατότητας εντολών CPU ή κατάρρευση του πελάτη. Μοιραστείτε τα αρχεία καταγραφής με τα στοιχεία της συσκευής σας.</string> + <string name="session_end_steam_try_x64">Μπορείτε να δοκιμάσετε Ρυθμίσεις Steam → Πελάτης Steam → x86-64 (πειραματικό). Απαιτεί επιπλέον λήψη και μπορεί να είναι πιο αργό.</string> + <string name="session_end_vulkan_device">Το πρόγραμμα οδήγησης γραφικών Linux δεν βρήκε χρησιμοποιήσιμη συσκευή Vulkan. Ελέγξτε ότι το επιλεγμένο πρόγραμμα οδήγησης GPU Linux υποστηρίζει αυτή τη GPU.</string> + <string name="session_end_gpu_unsupported">Αυτή η συνεδρία δεν μπορεί να ξεκινήσει επειδή αυτή η GPU δεν έχει συμβατό πρόγραμμα οδήγησης Vulkan για Linux στην τρέχουσα ρύθμιση. Τα προγράμματα οδήγησης Adreno Turnip δεν μπορούν να ενεργοποιήσουν υποστήριξη για GPU MediaTek/Mali.</string> <string name="setup_group_memory">Μνήμη</string> <string name="setup_clear_cached">Κλείσιμο εφαρμογών στην προσωρινή μνήμη πριν από τη συνεδρία</string> <string name="setup_clear_cached_hint">Όταν ξεκινά μια συνεδρία, το DroidDeck κλείνει τις εφαρμογές που το Android κρατά στο παρασκήνιο, ώστε το παιχνίδι να έχει περισσότερη μνήμη. Ο Ασύρματος εντοπισμός σφαλμάτων πρέπει να είναι ενεργός.</string> @@ -3125,6 +3466,12 @@ <string name="epic_client_open">Άνοιγμα</string> <string name="epic_client_install">Εγκατάσταση</string> <string name="game_tab_about">Σχετικά</string> + <string name="game_resources_browser">Ανοίγει στο πρόγραμμα περιήγησης</string> + <string name="game_resource_guides">Οδηγοί</string> + <string name="game_resource_protondb_detail">Αναφορές συμβατότητας Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Για παιχνίδια με αποθηκεύσεις στον λογαριασμό σας Steam</string> + <string name="game_resource_search">Αναζήτηση στον ιστό</string> <string name="game_tab_install">Εγκατάσταση</string> <string name="game_install_location">Τοποθεσία</string> <string name="game_install_folder">Φάκελος</string> @@ -3141,6 +3488,11 @@ <string name="stores_eyebrow_pass">διαθέσιμο με %1$s</string> <string name="stores_owned_in_library">Παιχνίδια σας στη Βιβλιοθήκη</string> <string name="library_filter_added">Προστέθηκαν</string> + <string name="library_filter">Φίλτρο</string> + <string name="library_filter_installed">Μόνο εγκατεστημένα</string> + <string name="library_filter_all_owned">Όλα τα παιχνίδια που διαθέτετε</string> + <string name="library_no_installed_matches">Κανένα εγκατεστημένο παιχνίδι δεν ταιριάζει με αυτά τα φίλτρα.</string> + <string name="library_browse_owned">Περιήγηση στα παιχνίδια που διαθέτετε</string> <string name="game_tab_launch">Εκκίνηση</string> <string name="game_tab_saves_cloud">Αποθηκεύσεις και cloud</string> <string name="game_launch_shortcut">Συντόμευση Steam</string> @@ -3158,6 +3510,40 @@ <string name="stores_itch_update_replaced">Ο προγραμματιστής αντικατέστησε αυτήν την έκδοση με %1$s. Να γίνει ενημέρωση σε αυτήν;</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Ρυθμίσεις cloud</string> + <string name="integration_title">Ενσωμάτωση Steam</string> + <string name="integration_count">%1$d από %2$d ενεργά</string> + <string name="integration_set_up">Ρύθμιση</string> + <string name="integration_location">Τοποθεσία</string> + <string name="integration_app_info">Πληροφορίες εφαρμογής</string> + <string name="integration_wifi">Ονόματα Wi-Fi</string> + <string name="integration_brightness">Φωτεινότητα</string> + <string name="integration_home">DroidDeck ως Αρχική</string> + <string name="integration_shortcuts">Πλήκτρα συστήματος</string> + <string name="integration_wifi_hint">Εμφάνιση δικτύων στο Steam · χρειάζεται πρόσβαση στην Τοποθεσία, χωρίς ποτέ παρακολούθηση</string> + <string name="integration_wifi_on">Τα δίκτυα εμφανίζονται στο Steam</string> + <string name="integration_wifi_location_off">Η Τοποθεσία είναι απενεργοποιημένη</string> + <string name="integration_wifi_denied">Η Τοποθεσία απορρίφθηκε · επιτρέψτε την στις Πληροφορίες εφαρμογής</string> + <string name="integration_brightness_hint">Το ρυθμιστικό του Steam ορίζει τη φωτεινότητα οθόνης</string> + <string name="integration_home_hint">Η Αρχική ανοίγει το μενού Steam σε συνεδρία</string> + <string name="integration_shortcuts_hint">Τα Alt+Tab, Win και Αρχική μένουν στη συνεδρία</string> + <string name="integration_shortcuts_maybe_restricted">Γκρίζο στο Android; Πληροφορίες εφαρμογής → ⋮ → Να επιτρέπονται οι περιορισμένες ρυθμίσεις</string> + <string name="integration_shortcuts_restricted">Αποκλείεται από το Android · Πληροφορίες εφαρμογής → ⋮ → Να επιτρέπονται οι περιορισμένες ρυθμίσεις</string> + <string name="integration_shortcuts_service">Πλήκτρα συστήματος DroidDeck</string> + <string name="integration_shortcuts_service_description">Διατηρεί τα Alt+Tab, το πλήκτρο Win και το κουμπί Αρχικής στην ενεργή συνεδρία DroidDeck αντί για το Android.</string> + <string name="integration_brightness_needed">Ενεργοποιήστε τη Φωτεινότητα στη Ρύθμιση → Ενσωμάτωση Steam</string> + <string name="setup_gpu_bridge_off">Γέφυρα Mali: ανενεργή</string> + <string name="setup_gpu_bridge_on">Γέφυρα Mali: ενεργή</string> + <string name="setup_gpu_bridge_detail">Η %1$s δεν είναι Adreno. Η πειραματική γέφυρα Vulkan είναι ενεργή: η συνεδρία σχεδιάζει μέσω του προγράμματος οδήγησης του ίδιου του τηλεφώνου. Αναμένετε σφάλματα· στείλτε τα αρχεία καταγραφής της συνεδρίας.</string> + <string name="setup_bridge_safe">Ασφαλής λειτουργία</string> + <string name="setup_bridge_safe_on">Ασφαλής λειτουργία: ενεργή</string> + <string name="setup_bridge_safe_off">Ασφαλής λειτουργία: ανενεργή</string> + <string name="setup_bridge_safe_on_detail">Μέγιστη συμβατότητα. Συνιστάται για νέα συσκευή.</string> + <string name="setup_bridge_safe_off_detail">Ταχύτερη όπου αυτή η GPU πέρασε τους ελέγχους της.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: αυτόματο</string> + <string name="setup_bridge_dxvk_proton">DXVK: του Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Χρησιμοποιεί παλαιότερο DXVK όταν το Vulkan αυτής της GPU είναι πολύ παλιό για αυτό του Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Κάθε Proton κρατά το δικό του DXVK, ακόμη κι αν το Vulkan αυτής της GPU ίσως είναι πολύ παλιό για αυτό.</string> <string name="apps_search_hint">Αναζήτηση εφαρμογών</string> <string name="apps_no_match">Καμία εφαρμογή δεν ταιριάζει με «%1$s».</string> <string name="apps_add_widget">Προσθήκη γραφικού στοιχείου</string> @@ -3206,6 +3592,8 @@ <string name="desktop_restore_done_body">Οι εφαρμογές που προσθέσατε εγκαταστάθηκαν ξανά.</string> <string name="desktop_restore_failed_title">Δεν ήταν δυνατή η επαναφορά ορισμένου λογισμικού</string> <string name="desktop_restore_failed_body">Δείτε το ~/.cache/droiddeck/apt-restore.log και μετά δοκιμάστε sudo apt install στο Konsole.</string> + <string name="gog_full_files">Οι εγγενείς βελτιστοποιήσεις δεν είναι διαθέσιμες. Η λήψη περιλαμβάνει πλήρη αρχεία αντικατάστασης.</string> + <string name="gog_recover">Επαλήθευση αποτελέσματος ενημέρωσης</string> <string name="slow_usb_title">Αργή σύνδεση USB</string> <string name="slow_usb_cable">Η συσκευή %1$s συνδέεται μέσω %2$s (%3$s Mbps, περίπου %4$d MB/s), οπότε τα παιχνίδια θα φορτώνουν αργά. Χρησιμοποιήστε καλώδιο USB 3 των 5 Gbps ή περισσότερο, αναποδογυρίστε το βύσμα USB-C ή χρησιμοποιήστε ταχύτερο δίσκο.</string> <string name="slow_usb_port">Η συσκευή %1$s συνδέεται μέσω %2$s (%3$s Mbps, περίπου %4$d MB/s). Η θύρα USB αυτής της συσκευής δεν υποστηρίζει μεγαλύτερη ταχύτητα, οπότε τα παιχνίδια θα φορτώνουν αργά. Ο εσωτερικός χώρος ή μια κάρτα microSD μπορεί να είναι ταχύτερα.</string> @@ -3216,4 +3604,52 @@ <string name="steam_import_names_more">%1$s και %2$d ακόμη</string> <string name="steam_import_now">Επανεκκίνηση τώρα</string> <string name="steam_import_later">Αργότερα</string> + <string name="gog_maintenance">Διαχείριση εγκατάστασης GOG</string> + <string name="gog_check">Έλεγχος για ενημερώσεις</string> + <string name="gog_repair">Επαλήθευση/Επιδιόρθωση</string> + <string name="gog_patches">Ενημερώσεις κώδικα εκτός σύνδεσης</string> + <string name="gog_refresh">Λήψη πλήρους προγράμματος εγκατάστασης εκτός σύνδεσης</string> + <string name="gog_update">Ενημέρωση σε %1$s</string> + <string name="gog_resume">Συνέχιση συντήρησης GOG</string> + <string name="gog_open_patch">Άνοιγμα προγράμματος εγκατάστασης ενημέρωσης</string> + <string name="gog_patch_in_session">Ολοκληρώστε ή ακυρώστε το πρόγραμμα εγκατάστασης της ενημέρωσης στη συνεδρία Linux.</string> + <string name="gog_patch_requirements">Επιλέξτε ενημέρωση για την εγκατεστημένη έκδοση και γλώσσα. Οι υποστηριζόμενες εκδόσεις προέλευσης μπορεί να μην αναφέρονται.</string> + <string name="gog_no_patches">Το GOG δεν έχει αυτόνομες ενημερώσεις Windows για αυτό το παιχνίδι.</string> + <string name="gog_managed_files">Τα τροποποιημένα αρχεία του παιχνιδιού μπορεί να αντικατασταθούν.</string> + <string name="gog_patch_installer_note">Το πρόγραμμα εγκατάστασης ανοίγει στη συνεδρία Linux σας.</string> + <string name="gog_download_label">Λήψη</string> + <string name="gog_space_label">Επιπλέον χώρος</string> + <string name="gog_space_estimate_label">Εκτίμηση χώρου</string> + <string name="gog_repair_action">Επιδιόρθωση αρχείων</string> + <string name="gog_refresh_action">Ανανέωση εγκατάστασης</string> + <string name="gog_select_patch">Επιλογή</string> + <string name="stores_gamejolt_not_owned">Δεν είναι στη βιβλιοθήκη σας στο Game Jolt</string> + <string name="stores_gamejolt_no_build">Δεν υπάρχει λήψη για Windows για αυτό το παιχνίδι</string> + <string name="stores_gamejolt_no_exe">Δεν βρέθηκε παιχνίδι Windows στη λήψη</string> + <string name="stores_gamejolt_no_game">Δεν βρέθηκε αυτό το παιχνίδι στο Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Δεν ήταν δυνατή η φόρτωση παιχνιδιών από το Game Jolt</string> + <string name="stores_gamejolt_download_failed">Το Game Jolt απάντησε HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Δεν ήταν δυνατή η φόρτωση των λήψεων από το Game Jolt</string> + <string name="stores_gamejolt_build_open">Άνοιγμα στο Game Jolt</string> + <string name="stores_gamejolt_archive">Τα αρχεία %1$s δεν υποστηρίζονται</string> + <string name="stores_gamejolt_extract_failed">Δεν ήταν δυνατή η αποσυμπίεση της λήψης (κωδικός %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Δεν ήταν δυνατή η σύνδεση με το Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Το Game Jolt δεν έδωσε σύνδεσμο λήψης</string> + <string name="stores_gamejolt_section_featured">Προτεινόμενα</string> + <string name="stores_gamejolt_section_hot">Δημοφιλή</string> + <string name="stores_gamejolt_section_best">Καλύτερα</string> + <string name="stores_gamejolt_section_new">Νέα</string> + <string name="stores_gamejolt_price_under_30">30$ ή λιγότερο</string> + <string name="stores_gamejolt_os_other">Άλλα</string> + <string name="stores_gamejolt_maturity_everyone">Όλες οι ηλικίες</string> + <string name="stores_gamejolt_maturity_teen">Έφηβοι</string> + <string name="stores_gamejolt_maturity_adult">Ενήλικες</string> + <string name="stores_gamejolt_status_complete">Ολοκληρωμένα</string> + <string name="stores_gamejolt_status_early">Πρώιμη πρόσβαση</string> + <string name="stores_gamejolt_partners">Παιχνίδια συνεργατών</string> + <string name="stores_gamejolt_filter_browser">Πρόγραμμα περιήγησης</string> + <string name="stores_gamejolt_filter_maturity">Ωριμότητα</string> + <string name="stores_gamejolt_filter_status">Κατάσταση</string> + <string name="stores_gamejolt_filter_partners">Συνεργάτες</string> + <string name="stores_gamejolt_followed">Παιχνίδια που ακολουθείτε</string> </resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e691811dec..f7cc0570d3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opciones de VKD3D para D3D12. nodxr desactiva el trazado de rayos; úsalo solo en un juego que lo necesite.</string> <string name="game_env_proton_log">Pon 1 para obtener un registro de diagnóstico de Proton. El registro puede reducir el rendimiento y usar almacenamiento.</string> <string name="game_env_wined3d">Pon 1 para usar WineD3D basado en OpenGL en lugar de DXVK, para pruebas de compatibilidad con D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderizador para DirectDraw, Direct3D 1-7 y los juegos que se ejecutan con WineD3D. Vulkan evita la ruta de OpenGL sobre Zink y es mucho más rápido en juegos antiguos de DirectDraw y Direct3D 7 en Adreno.</string> + <string name="game_env_dxvk_d3d8">Pon 1 para ejecutar Direct3D 8 con DXVK en lugar de WineD3D. Más rápido en la prueba de Direct3D 8 de AIO Graphics Test en Adreno.</string> <string name="game_env_no_ntsync">Pon 1 para que este juego no use ntsync (droiddeck-ntsync o un controlador del kernel); usa droiddeck-esync si hay un paquete y, si no, droiddeck-fsync.</string> <string name="game_env_no_esync">Pon 1 para desactivar droiddeck-esync en este juego; usa droiddeck-fsync en su lugar, o droiddeck-ntsync si fsync también está desactivado.</string> <string name="game_env_no_fsync">Pon 1 para que este juego no use droiddeck-fsync; usa droiddeck-esync si hay un paquete y, si no, droiddeck-ntsync.</string> <string name="game_env_fsync_first">Pon 1 para que este juego use droiddeck-fsync, o 0 para dar prioridad a droiddeck-esync cuando haya un paquete para su Proton.</string> <string name="game_env_xalia">Pon 0 para desactivar el asistente de navegación con mando de Proton en este juego.</string> + <string name="game_env_anticheat_offline">Activado de forma predeterminada. Inicia un juego con Easy Anti-Cheat sin su antitrampas cuando el juego admite el modo sin conexión. Desactívalo para iniciarlo con Easy Anti-Cheat como siempre. Los modos en línea que requieren Easy Anti-Cheat siguen sin estar disponibles.</string> <string name="game_env_hud">Superposición de DXVK para D3D9–11. fps muestra la tasa de fotogramas; sin definir la oculta.</string> <string name="game_env_dxvk_config">Ajustes de DXVK separados por punto y coma. Las versiones recientes usan dxvk.maxFrameRate para limitar fotogramas; para el uso normal prefiere el límite de fotogramas de la sesión.</string> + <string name="game_env_cores">Núcleos de CPU para este juego, como 0-4 o 0,2,4, en lugar de los núcleos de juegos de la sesión. Con menos núcleos se calienta menos.</string> <string name="game_env_vkd3d_limit">Límite de fotogramas de D3D12. 0 desactiva el límite.</string> <string name="game_env_glthread">Subprocesos de OpenGL de Mesa. true puede ayudar a juegos OpenGL limitados por la CPU; pruébalo en cada juego.</string> <string name="sync_backend_title">Sincronización de Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX ejecuta programas Linux x86 en este dispositivo ARM64. Auto lo usa cuando el programa es para x86.</string> <string name="app_fex_x86">%1$s con FEX</string> <string name="app_fex_not_ready">Este programa está hecho para PC %1$s y se ejecuta con FEX, que aún no está listo. Abre Steam una vez con tu sesión iniciada: DroidDeck hará que descargue FEX y el Steam Linux Runtime que necesita, y después se abrirá.</string> + <string name="session_proot_missing">No se ha podido descargar el proot de DroidDeck. Comprueba la conexión y vuelve a intentarlo. La sesión no se ha iniciado porque el proot alternativo es demasiado lento para jugar.</string> + <string name="session_directaudio_missing">No se ha podido descargar DirectAudio, así que el audio de los juegos usa la ruta más lenta en esta sesión.</string> <string name="session_end_program">Este programa</string> <string name="session_end_steam_download">No se ha podido descargar el cliente de Steam. Puede que tu red o VPN esté bloqueando los servidores de Steam; comprueba la conexión y vuelve a intentarlo.</string> <string name="session_end_steam_setup">No se ha podido configurar el cliente de Steam. Comprueba la conexión y el espacio libre y vuelve a intentarlo.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Mando Xbox 360</string> <string name="mode_controller_note">Deck: botón de Quick Access y giroscopio. Steam Controller: lo mismo, con detección de agarre en los botones traseros. DualShock 4 y DualSense: giroscopio, y los trackpads como su panel táctil. Xbox 360: abre Quick Access con Guide+A.</string> <string name="mode_back">Atrás</string> + <string name="back_hold">Mantener Atrás para atajos de Steam</string> + <string name="back_hold_hint">Mantener Atrás abre Acceso rápido o crea combinaciones de Steam con otros botones. Desactívalo para ignorar Atrás mantenido; pulsar y pulsar dos veces siguen funcionando.</string> + <string name="back_native_qam_hint">Mantén Atrás 700 ms, o mantén Atrás y pulsa otro botón para los atajos de Steam.</string> + <string name="back_double_tap_window">Intervalo de doble toque</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Permitir el control del brillo</string> + <string name="brightness_permission_text">Configura el control del brillo en DroidDeck.</string> <string name="back_menu_then_qam">Menú → QAM</string> <string name="back_qam_then_menu">QAM → Menú</string> <string name="mode_session">Sesión</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Retrasa la suspensión en segundo plano mientras Steam esté descargando.</string> <string name="mode_suspend_note">Auto pausa en segundo plano y reanuda al mostrarse. Manual espera a Reanudar. Nunca sigue ejecutándose.</string> <string name="mode_startup">Inicio</string> - <string name="mode_steam_startup">Iniciar Steam con DroidDeck</string> - <string name="mode_steam_startup_hint">Abre la sesión de Steam al iniciar DroidDeck.</string> + <string name="mode_startup_session">Abrir al iniciar</string> + <string name="mode_startup_session_hint">Inicia esta sesión cuando se abre DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Buscando versiones…</string> <string name="mode_decky_ready">Listo para instalar %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Al día · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Instalar la última</string> + <string name="decky_channel">Canal de actualizaciones</string> + <string name="decky_channel_hint">Qué versiones de Decky Loader se instalan. El actualizador propio de Decky usa el mismo canal.</string> + <string name="decky_channel_stable">Estable</string> + <string name="decky_channel_prerelease">Preliminar</string> + <string name="decky_channel_testing">Pruebas</string> + <string name="decky_channel_failed">No se ha podido guardar el canal de actualizaciones de Decky</string> <string name="mode_decky_on">Se inicia con Steam. Mientras esté activado, otras apps de este dispositivo podrían controlar Steam.</string> <string name="mode_decky_off">Desactivado. El puerto de depuración remota de Steam permanece cerrado.</string> <string name="mode_decky_remove_title">¿Desinstalar Decky Loader?</string> @@ -325,6 +344,8 @@ <string name="mode_mangoapp_hint">Desactívalo si los juegos fallan o se quedan en negro en modo Deck. Se aplica en la próxima sesión.</string> <string name="mode_return_after_game">Volver a DroidDeck al cerrar un juego</string> <string name="mode_return_after_game_hint">Cuando se cierra un juego que iniciaste desde DroidDeck u otro lanzador, Steam se cierra correctamente (primero termina de sincronizar las partidas en la nube) y vuelves allí. Desactivado: te quedas en Steam.</string> + <string name="mode_shader_precache">Precarga de shaders</string> + <string name="mode_shader_precache_hint">Steam descarga shaders precompilados para tus juegos y los procesa en segundo plano, para que los juegos tengan menos tirones. Desactivado ahorra datos, almacenamiento y batería; los juegos compilan los shaders mientras juegas. Es el mismo ajuste que Descargas > Precarga de shaders en Steam. Se aplica en la próxima sesión.</string> <string name="mode_steam_repair">Reparar el cliente de Steam</string> <string name="mode_steam_repair_hint">Vuelve a descargar el cliente de Steam la próxima vez que se inicie Steam. Úsalo si Steam se queda en la pantalla de carga. Se conservan los juegos, la sesión iniciada y los ajustes.</string> <string name="mode_steam_repair_queued">El cliente de Steam se volverá a descargar la próxima vez que se inicie Steam.</string> @@ -393,6 +414,8 @@ <string name="mode_directaudio_hint">Evita PulseAudio para menor latencia.</string> <string name="mode_mic">Micrófono</string> <string name="mode_mic_hint">Para el chat de voz.</string> + <string name="drawer_mic_hint">Activa o desactiva la captura del micrófono en esta sesión.</string> + <string name="drawer_mic_failed">No se ha podido cambiar el micrófono. Inténtalo de nuevo.</string> <string name="mode_network">Red</string> <string name="mode_wifi_discovery">Detección de redes Wi-Fi</string> <string name="mode_wifi_discovery_hint">Muestra en Steam los nombres de Wi-Fi y las redes cercanas.</string> @@ -555,6 +578,16 @@ <string name="perf_gsrealtime">gamescope: cola de GPU en tiempo real</string> <string name="perf_gsrealtime_hint">Da prioridad al trabajo de GPU del compositor. Puede suavizar el ritmo de fotogramas a costa de algo de rendimiento en los juegos.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memoria</string> + <string name="perf_cap_off">Desactivado</string> + <string name="perf_cap_auto">Predeterminado del controlador</string> + <string name="perf_zram_client">Comprimir Steam mientras se ejecuta un juego</string> + <string name="perf_zram_client_hint">20 s después de que empiece un juego, el cliente de Steam se comprime en zRAM para dejarle más memoria al juego, y se vuelve a leer cuando el juego se cierra. Desactívalo si la sesión se cierra poco después de iniciar los juegos. Un límite de RAM definido arriba sigue comprimiendo Steam cuando la sesión lo supera.</string> + <string name="perf_ram_cap">Límite de RAM</string> + <string name="perf_ram_cap_hint">Se aplica mientras se ejecuta el cliente de Steam, en modo Steam o desde el escritorio. Cuando la sesión usa más de esto, Steam y luego los demás procesos compatibles de la sesión se comprimen en zRAM. Es un límite flexible: no se cierra nada, pero los juegos pueden tener tirones mientras se recuperan las páginas.</string> + <string name="perf_ram_cap_unavailable">Requiere swap de zRAM, y este dispositivo no lo tiene.</string> + <string name="perf_vram_cap">Límite de VRAM</string> + <string name="perf_vram_cap_hint">La memoria de vídeo que DXVK indica a los juegos Direct3D, para que calculen sus texturas con menos. Los ajustes de DXVK propios de un juego siguen teniendo prioridad. Se aplica en la próxima sesión.</string> <string name="perf_gpuclock">Mantener la GPU a su reloj máximo</string> <string name="perf_gpuclock_hint">Solo Adreno. Menos tirones, más consumo de batería y calor.</string> <string name="perf_fixes">Correcciones de sesión</string> @@ -573,6 +606,8 @@ <string name="perf_fastpath">Ruta rápida de proot</string> <string name="perf_fastpath_needs_seccomp">Requiere el filtro seccomp de proot.</string> <string name="perf_fastpath_hint">Búsquedas de archivos más rápidas y menos tirones. Desactívalo si un programa no encuentra sus archivos.</string> + <string name="perf_cursor_composite">Dibujar el cursor dentro de gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope dibuja el puntero por sí mismo en lugar de pasárselo a Android. Actívalo para un cursor manejado con el mando. Desactivado es más rápido en un móvil. Se aplica en la próxima sesión.</string> <string name="perf_identity">Identidad de la sesión</string> <string name="perf_hostname">Nombre del host</string> <string name="perf_hostname_hint">El nombre que Steam ve para este dispositivo. En blanco restaura %1$s.</string> @@ -587,6 +622,8 @@ <string name="driver_delete_plain">Sus archivos se eliminan de la app.</string> <string name="driver_delete_in_use">Sus archivos se eliminan. Está en uso, así que pasa a usarse el predeterminado.</string> <string name="drawer_page_display">Pantalla</string> + <string name="drawer_frame_limit">Límite de fotogramas</string> + <string name="drawer_frame_limit_note">Limita este juego. La pantalla cambia a una frecuencia de actualización que sea múltiplo exacto del límite cuando la hay; otros límites pueden verse irregulares. Los juegos de Steam usan el Límite de fotogramas de Steam en el menú Quick Access.</string> <string name="drawer_page_effects">Efectos</string> <string name="drawer_page_controls">Controles</string> <string name="drawer_page_components">Componentes</string> @@ -618,8 +655,11 @@ <string name="hud_size_pill">Píldora</string> <string name="hud_size_minimal">Mínimo</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Barra</string> <string name="hud_locked">Fijar posición</string> <string name="hud_locked_hint">Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando.</string> + <string name="hud_snap">Ajustar a los lados</string> + <string name="hud_snap_hint">Al soltar el HUD, se mueve al lado más cercano de la pantalla. Un gesto rápido lo lanza en esa dirección.</string> <string name="hud_group_look">Aspecto</string> <string name="hud_scale">Tamaño en pantalla</string> <string name="hud_color_soft">Suave</string> @@ -668,7 +708,6 @@ <string name="hud_export_failed">No se ha podido guardar el informe del HUD.</string> <string name="hud_reset">Restablecer ajustes del HUD</string> <string name="hud_reset_button">Restablecer</string> - <string name="hud_credit">FusionHUD de The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Modo de escalado</string> <string name="drawer_scaling_sharpness">Nitidez del escalado</string> <string name="drawer_effects">Efectos de pantalla</string> @@ -703,11 +742,17 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Teclado</string> <string name="drawer_latency">Latencia</string> + <string name="drawer_low_latency">Modo de baja latencia</string> + <string name="drawer_low_latency_hint">Aumenta el uso de CPU y batería</string> <string name="drawer_low_latency_controller">Mando de baja latencia</string> <string name="drawer_low_latency_controller_hint">El mando informa a 1000 Hz en lugar de 250 Hz. Usa algo más de CPU.</string> <string name="drawer_low_latency_touch">Táctil de baja latencia</string> <string name="drawer_low_latency_touch_hint">Los toques omiten la agrupación de fotogramas; los controles táctiles de Steam van a 1000 Hz. Usa algo más de CPU.</string> <string name="drawer_evdev_mouse">Canal de ratón sin procesar</string> + <string name="drawer_relative_mouse">Ratón relativo</string> + <string name="drawer_relative_mouse_auto">Automático</string> + <string name="drawer_relative_mouse_on">Activado</string> + <string name="drawer_relative_mouse_off">Desactivado</string> <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Teclado de PC</string> <string name="drawer_android_keyboard">Android</string> @@ -796,6 +841,10 @@ <string name="setup_session">Sesión</string> <string name="setup_logs">Registros de sesión</string> <string name="setup_logs_hint">Se guardan tras cada sesión</string> + <string name="setup_game_debug_logs">Registros de depuración de juegos</string> + <string name="setup_game_debug_logs_hint">Incluye diagnósticos de Proton, Wine y gráficos en el próximo inicio de un juego. Puede reducir el rendimiento y usar más almacenamiento.</string> + <string name="setup_game_debug_logs_restart">Reinicia esta sesión para guardar los registros de depuración de juegos</string> + <string name="setup_logging_update_failed">No se ha podido actualizar el registro. Comprueba el interruptor y vuelve a intentarlo.</string> <string name="setup_agent_commands">Herramientas de depuración</string> <string name="setup_latest_logs">Últimos registros de sesión</string> <string name="setup_saved_logs">Registros de sesión guardados</string> @@ -827,20 +876,22 @@ <string name="setup_home">Usar como pantalla de inicio</string> <string name="setup_home_on">DroidDeck puede ser la app de inicio</string> <string name="setup_home_off">DroidDeck nunca se ofrece como app de inicio</string> + <string name="setup_home_game_space_first">En Añadir juegos, pon DroidDeck en Incluir</string> <string name="setup_orientation">Orientación</string> + <string name="setup_launcher_orientation">Orientación del launcher</string> + <string name="setup_launcher_orientation_auto">Seguir la rotación del dispositivo</string> + <string name="setup_orientation_portrait">Vertical</string> + <string name="setup_session_orientation">Orientación de la sesión</string> + <string name="setup_session_orientation_hint">Se aplica a Steam, los juegos, el escritorio y el editor de mandos. Los ajustes predefinidos de resolución giran con la sesión; el ancho y el alto personalizados se mantienen como se introdujeron.</string> <string name="setup_orientation_auto">Horizontal automática</string> <string name="setup_orientation_landscape">Horizontal</string> <string name="setup_orientation_reverse">Horizontal invertida</string> <string name="setup_fullscreen">Pantalla completa</string> <string name="setup_fullscreen_on">Oculta las barras de estado y navegación de Android</string> <string name="setup_fullscreen_off">Muestra las barras de estado y navegación de Android</string> - <string name="setup_dual_screen">Pantalla doble</string> - <string name="setup_dual_screen_hint">Automático usa la segunda pantalla en consolas portátiles que la llevan integrada. Activado usa cualquier segunda pantalla. Desactivado lo mantiene todo en una pantalla.</string> <string name="setup_dual_screen_auto">Automático</string> <string name="setup_dual_screen_on">Activado</string> <string name="setup_dual_screen_off">Desactivado</string> - <string name="setup_dual_screen_menu">Menú en la pantalla inferior</string> - <string name="setup_dual_screen_menu_hint">Mueve las secciones y el menú del juego a la segunda pantalla y se escribe allí, para que la pantalla superior mantenga la vista completa. L2 y R2 cambian de sección.</string> <string name="setup_dual_screen_controls">Controles en la pantalla inferior en juegos</string> <string name="setup_dual_screen_controls_hint">Abre el trackpad y el teclado en la segunda pantalla al iniciar una sesión.</string> <string name="dual_typing_title">Escribiendo en la pantalla superior</string> @@ -995,6 +1046,14 @@ <string name="gate_step1">Abre Ajustes → Opciones de desarrollador → Depuración inalámbrica y actívala</string> <string name="gate_step2">Toca “Vincular dispositivo con código de vinculación”</string> <string name="gate_step3">Escribe el código en la notificación de DroidDeck</string> + <string name="pairguide_build_number">En Información del teléfono, toca Número de compilación 7 veces</string> + <string name="pairguide_wireless">Activa la Depuración inalámbrica</string> + <string name="pairguide_pair">Abre Depuración inalámbrica y toca “Vincular dispositivo con código de vinculación”</string> + <string name="pairguide_child_process">Activa “Inhabilitar restricciones de procesos secundarios”</string> + <string name="pairguide_row_child_process">Inhabilitar restricciones de procesos secundarios</string> + <string name="pairguide_row_build_number">Número de compilación</string> + <string name="pairguide_row_wireless">Depuración inalámbrica</string> + <string name="pairguide_row_pair">Vincular dispositivo con código de vinculación</string> <string name="gate_waiting">Esperando la ventana de vinculación…</string> <string name="gate_code_needed">Ventana encontrada. Introduce su código en la notificación.</string> <string name="gate_status">Estado</string> @@ -1133,7 +1192,6 @@ <string name="games_never_played">Nunca jugado</string> <string name="games_runtime_busy_percent">Runtime ocupado · %1$d%%</string> <string name="games_runtime_busy">Runtime ocupado</string> - <string name="games_runtime_first_play">El runtime se instala al jugar</string> <string name="games_runtime_update">Actualización del runtime disponible</string> <string name="games_runtime_ready">● Runtime listo</string> <string name="games_internal">Almacenamiento interno</string> @@ -1150,6 +1208,9 @@ <string name="gpu_hide_other">Ocultar controladores de otras GPU</string> <string name="gpu_show_other">Mostrar controladores de otras GPU</string> <string name="gpu_advanced">Avanzado</string> + <string name="gpu_ubwc_title">Compatibilidad con UBWC</string> + <string name="gpu_ubwc_hint">Prueba Activado o Desactivado si Steam o Android muestran franjas o parpadeos. Se aplica a ambos controladores después de reiniciar DroidDeck.</string> + <string name="gpu_ubwc_restart">Reinicia DroidDeck para aplicarlo.</string> <string name="gpu_set_with_display">Se define junto con el controlador de pantalla: %1$s incluye ambos.</string> <string name="gpu_set_with_runtime">Se define junto con el controlador de runtime: %1$s incluye ambos.</string> <string name="gpu_runtime_hint">Lo usan los juegos y el escritorio.</string> @@ -1258,10 +1319,15 @@ <string name="pip_auto">Entrar en PiP automáticamente</string> <string name="unfolded_controls">Controles con la pantalla desplegada</string> <string name="unfolded_controls_hint">Desplegado, el juego queda encima de los trackpads y los agarres traseros de Steam Deck. Plegado, el juego ocupa toda la pantalla.</string> + <string name="unfolded_controls_with_controller">Mantenerlos con un mando</string> + <string name="unfolded_controls_with_controller_hint">Muestra también estos controles táctiles mientras haya un mando conectado.</string> <string name="pip_suspended">Suspendida</string> <string name="pip_not_ready">Imagen en imagen estará disponible cuando la sesión esté lista.</string> <string name="pip_permission">Permite imagen en imagen para DroidDeck en los ajustes de Android.</string> <string name="pip_unavailable">Android no pudo abrir imagen en imagen.</string> + <string name="game_more">Más</string> + <string name="game_edit_art">Editar imágenes</string> + <string name="stores_in_steam_label">En Steam</string> <string name="game_shortcut">Acceso directo</string> <string name="game_shortcut_add">Añadir a la pantalla de inicio</string> <string name="game_shortcut_choose">Elegir juego</string> @@ -1285,6 +1351,10 @@ <string name="main_wait_runtime">Espera a que termine la operación del runtime</string> <string name="main_wait_proton_install">Espera a que termine la instalación de la herramienta de compatibilidad</string> + <string name="load_compat_title">Preparando las herramientas de compatibilidad</string> + <string name="load_compat_wait">Esperando a que termine la configuración de compatibilidad</string> + <string name="load_compat_hint">Tu sesión se iniciará cuando termine la configuración.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Espera a que termine la instalación de la app de escritorio</string> <string name="main_wait_install_game">Espera a que termine la instalación antes de iniciar un juego</string> <string name="main_saves_close_session">Cierra primero la sesión de Steam para que el juego no guarde encima de lo importado</string> @@ -1325,6 +1395,9 @@ <string name="main_install_anyway">Instalar de todos modos</string> <string name="main_remove_runtime_title">Eliminar el runtime de Linux</string> <string name="main_remove_runtime_text">Esto elimina el runtime, el cliente de Steam que contiene y todos los juegos instalados en él.</string> + <string name="runtime_actions_title">Runtime de Linux</string> + <string name="runtime_actions_text">Reparar reinstala los archivos del sistema del runtime y conserva Steam, tus juegos y tus ajustes. Los extras, como el escritorio, se vuelven a instalar la próxima vez que los uses. Eliminar borra todo.</string> + <string name="runtime_repair">Reparar el runtime</string> <string name="main_applied">Aplicado: %1$s</string> <string name="android_app_open_failed_primary">No se pudo abrir %1$s en la pantalla principal</string> <string name="android_app_open_failed_on">No se pudo abrir %1$s en %2$s</string> @@ -1457,6 +1530,12 @@ <string name="session_runtime_catalog_unreachable">No se pudo acceder al catálogo del runtime. Revisa la conexión y vuelve a pulsar Jugar.</string> <string name="session_runtime_install_failed">El runtime de Linux no se instaló. Revisa el runtime en Configuración y vuelve a pulsar Jugar.</string> <string name="session_desktop_install_failed">El escritorio no se instaló (%1$s). Revisa la conexión y pulsa Escritorio de nuevo.</string> + <string name="session_package_resume_failed">No se ha podido terminar una instalación interrumpida (%1$s). Comprueba la conexión y el espacio y vuelve a intentarlo.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">El runtime de Linux está dañado: %1$d enlace de biblioteca apunta a un archivo que falta (%2$s), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + <item quantity="many">El runtime de Linux está dañado: %1$d enlaces de biblioteca apuntan a archivos que faltan (%2$s y otros), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + <item quantity="other">El runtime de Linux está dañado: %1$d enlaces de biblioteca apuntan a archivos que faltan (%2$s y otros), normalmente tras interrumpirse una instalación. Reparar conserva tus juegos y ajustes.</item> + </plurals> <string name="session_ended_named">%1$s se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> <string name="session_ended_program">El programa se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> <string name="session_ended_desktop">El escritorio se detuvo inesperadamente. Comparte los registros en un informe de error o inténtalo de nuevo.</string> @@ -1472,6 +1551,14 @@ <string name="mode_decky_plugins_hint">Instala un ZIP de plugin para la próxima sesión de Steam.</string> <string name="mode_decky_plugin_downloading">Descargando…</string> <string name="mode_decky_plugin_install_zip">Instalar desde ZIP</string> + <string name="decky_zip_warning_title">Instalación de plugin de terceros</string> + <string name="decky_zip_warning_text">El equipo de Decky Loader no ha revisado este plugin. Puede contener malware, como software para robar tu cuenta de Steam o dañar tu dispositivo. Al instalar este plugin, aceptas que asumes todos los riesgos para tu dispositivo.</string> + <string name="decky_zip_warning_continue">Continuar</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Espera %1$d segundo</item> + <item quantity="many">Espera %1$d segundos</item> + <item quantity="other">Espera %1$d segundos</item> + </plurals> <string name="store_cat_games">Juegos</string> <string name="store_cat_audio_video">Audio y vídeo</string> <string name="store_cat_graphics">Gráficos</string> @@ -1638,6 +1725,8 @@ <string name="fm_accept">Aceptar</string> <string name="fm_decline">Rechazar</string> <string name="fm_drive_not_readable">%1$s está montado, pero ahora mismo no se puede leer</string> + <string name="fm_drive_access_title">Permitir acceso a %1$s</string> + <string name="fm_drive_access_text">Android deja que DroidDeck vea esta unidad, pero no que la lea. Activa Acceso a todos los archivos para DroidDeck y vuelve.</string> <string name="fm_list_view">Vista de lista</string> <string name="fm_grid_view">Vista de cuadrícula</string> <string name="fm_search">Buscar</string> @@ -1710,6 +1799,89 @@ <string name="second_mode_keyboard_trackpad">Teclado + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Agarres de Deck + trackpads</string> + <string name="second_mode_dashboard">Panel</string> + <string name="bottom_dashboard_empty">Todavía no hay nada que mostrar aquí.</string> + <string name="bottom_page_downloads">Descargas</string> + <string name="bottom_downloads_none">No hay descargas en curso.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Descargando caché de shaders</string> + <string name="bottom_downloads_paused">En pausa</string> + <string name="bottom_downloads_queued">Esperando para empezar</string> + <string name="bottom_page_notifications">Notificaciones</string> + <string name="bottom_notifications_listener">DroidDeck – pantalla inferior</string> + <string name="bottom_notifications_why">Muestra aquí los mensajes y otras notificaciones mientras juegas. Solo permanecen en esta pantalla y no se guardan. Android lo pregunta una vez: su página de acceso a notificaciones se abre en esta pantalla; activa DroidDeck ahí y esta página volverá sola.</string> + <string name="bottom_notifications_allow">Permitir acceso a notificaciones</string> + <string name="bottom_notifications_none">No hay notificaciones.</string> + <string name="bottom_notifications_count">%1$d notificaciones</string> + <string name="bottom_notifications_clear">Borrar</string> + <string name="bottom_page_screenshots">Capturas de pantalla</string> + <string name="stats_fps_needs_hud">Los FPS requieren el HUD activado</string> + <string name="stats_speed">Velocidad</string> + <string name="stats_pedals">Pedales</string> + <string name="stats_gforce">Fuerza G</string> + <string name="stats_timing">Tiempos</string> + <string name="stats_best_lap">Mejor vuelta</string> + <string name="stats_tires">Neumáticos °C</string> + <string name="stats_trace">Acelerador y freno, últimos 10 s</string> + <string name="stats_speed_chart">Velocidad, %1$s</string> + <string name="stats_gear">Marcha</string> + <string name="stats_steam_client_arm">Cliente de Steam ARM</string> + <string name="stats_steam_client_x86">Cliente de Steam x86</string> + <string name="stats_throttle">Acelerador</string> + <string name="stats_brake">Freno</string> + <string name="stats_lights">Testigos</string> + <string name="stats_lamp_shift">Cambio</string> + <string name="stats_lamp_handbrake">Freno de mano</string> + <string name="stats_lamp_pit">Limitador de pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Aceite %1$s °C</string> + <string name="stats_power">Distribuidor de energía</string> + <string name="stats_fuel_t">Combustible, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Reserva %1$s t</string> + <string name="bottom_telemetry_send_title">Enviar datos al panel</string> + <string name="bottom_telemetry_send_auto">Automático</string> + <string name="bottom_telemetry_send_auto_hint">Lo activa en todos los juegos de esta lista, incluidos los que se encuentren más adelante. Los juegos que desactives seguirán desactivados.</string> + <string name="bottom_telemetry_send_note">Esto cambia el ajuste de salida de datos del propio juego. Se aplica la próxima vez que se inicie el juego; al desactivarlo se restaura el ajuste anterior.</string> + <string name="bottom_telemetry_send_close">Cierra %1$s para cambiar esto.</string> + <string name="bottom_telemetry_send_failed">No se han podido cambiar los ajustes de %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: activa %2$s en los ajustes del juego con la IP 127.0.0.1 y el puerto %3$d.</string> + <string name="bottom_shots_where">Se guardan en Pictures/DroidDeck. Las capturas de Steam también aparecen aquí.</string> + <string name="bottom_shots_take">Hacer captura de pantalla</string> + <string name="bottom_shots_saved">Captura de pantalla guardada.</string> + <string name="bottom_shots_failed">No se ha podido hacer la captura de pantalla.</string> + <string name="bottom_shots_none">Todavía no hay capturas de pantalla.</string> + <string name="bottom_page_chat">Chat y voz</string> + <string name="bottom_chat_why">Lee y responde el chat de Steam aquí mientras el juego sigue en la pantalla principal. Usa la cuenta con la que se ha iniciado sesión en Steam.</string> + <string name="bottom_chat_not_signed_in">Steam todavía no tiene una sesión web que compartir, así que inicia sesión aquí una vez.</string> + <string name="bottom_chat_stopped">Android cerró la página del chat mientras DroidDeck estaba en segundo plano. Se volverá a abrir cuando regreses a DroidDeck.</string> + <string name="bottom_chat_open">Abrir Steam Chat</string> + <string name="bottom_chat_close">Cerrar chat</string> + <string name="bottom_chat_mic_on">Micro activado</string> + <string name="bottom_chat_mic_off">Micro desactivado</string> + <string name="bottom_chat_mic_unavailable">El micro está desactivado en este juego. Para hablar, activa Micrófono en los ajustes de Steam de DroidDeck (Audio) y vuelve a iniciar el juego.</string> + <string name="bottom_chat_volume">Volumen %1$d%%</string> + <string name="bottom_page_telemetry">Estadísticas del juego</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batería</string> + <string name="bottom_telemetry_lap">Vuelta</string> + <string name="bottom_telemetry_position">Posición</string> + <string name="bottom_telemetry_this_lap">Vuelta actual</string> + <string name="bottom_telemetry_last_lap">Última vuelta</string> + <string name="bottom_telemetry_fuel">Combustible</string> + <string name="bottom_telemetry_cargo">Carga</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Estado legal</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">El puerto %1$d recibe datos (%2$d paquetes de %3$d bytes), pero en un formato que esta página aún no puede leer.</string> + <string name="bottom_telemetry_port_busy">Otro programa ya usa el puerto %1$s, así que ese juego no se puede mostrar aquí.</string> <string name="rtinst_removing">Eliminando el runtime de Linux</string> <plurals name="rtinst_removing_entries"> @@ -1741,6 +1913,7 @@ <string name="flatpakmgr_not_ready">Configura Flatpak primero</string> <string name="flatpakmgr_starting">Iniciando</string> <string name="flatpakmgr_exit_status">Flatpak terminó con el código %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s está compilado para %2$s, que DroidDeck no puede ejecutar. Aquí las apps Flatpak necesitan una versión para ARM64 o x86_64.</string> <string name="flatpakmgr_installing">Instalando %1$s</string> <string name="flatpakmgr_updating">Actualizando %1$s</string> <string name="flatpakmgr_removing">Quitando %1$s</string> @@ -1834,6 +2007,7 @@ <string name="adbpair_applying">Aplicando el ajuste…</string> <string name="adbpair_command_failed">Falló el comando de la Depuración inalámbrica</string> <string name="adbpair_channel_name">Configuración de la Depuración inalámbrica</string> + <string name="adbpair_progress_channel_name">Progreso de la configuración de la Depuración inalámbrica</string> <string name="adbpair_channel_description">Pide el código de vinculación de la Depuración inalámbrica mientras Ajustes está abierto</string> <string name="adbpair_title_pair">Vincular Depuración inalámbrica</string> <string name="adbpair_waiting_text">Activa la Depuración inalámbrica y toca “Vincular dispositivo con código de vinculación”.</string> @@ -1942,6 +2116,7 @@ <string name="gpuinfo_not_adreno">La GPU no es Adreno</string> <string name="gpuinfo_supported">Compatible</string> <string name="gpuinfo_experimental">Experimental: sus controladores son versiones de prueba</string> + <string name="gpuinfo_a850_experimental">Compatibilidad experimental con Adreno 850: requiere controladores experimentales de pantalla y de juegos compatibles; no verificada en este dispositivo</string> <string name="gpuinfo_below_tested">Por debajo del hardware probado (Adreno 725 y posteriores): puede que no funcione</string> <string name="gpuinfo_unsupported">No compatible: DroidDeck necesita una GPU Adreno (Snapdragon)</string> @@ -2038,6 +2213,7 @@ <string name="display_look_filter">%1$s Cambia el escalado a %2$s.</string> <string name="display_match_screen">Igual a la pantalla (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir la pantalla (cambia de tamaño al plegar o desplegar)</string> + <string name="display_follow_screen_scaled">Escalado %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Mostrar detalles del dispositivo</string> <string name="device_info_hide">Ocultar detalles del dispositivo</string> @@ -2144,6 +2320,13 @@ <string name="stores_resume">Reanudar</string> <string name="stores_refresh">Actualizar</string> <string name="stores_sort">Ordenar</string> + <string name="setup_rail_labels">Etiquetas de la barra lateral</string> + <string name="setup_rail_labels_hint">Muestra los nombres debajo de los iconos de la barra lateral. Desactívalo para una barra lateral más estrecha.</string> + <string name="library_display">Vista</string> + <string name="library_display_larger">Tarjetas más grandes</string> + <string name="library_display_smaller">Tarjetas más pequeñas</string> + <string name="library_display_title">Mostrar título</string> + <string name="library_display_size">Mostrar tamaño</string> <string name="stores_sort_last_played">Jugados recientemente</string> <string name="stores_sort_recently_installed">Instalados recientemente</string> <string name="stores_sort_title_asc">Título A–Z</string> @@ -2270,6 +2453,9 @@ <string name="stores_download_manager">Gestor de descargas</string> <string name="stores_parallel">Descargas simultáneas</string> <string name="stores_install_where">Instalar en</string> + <string name="stores_install_language">Idioma del juego</string> + <string name="stores_install_language_hint">GOG y Epic instalan este idioma. Sistema sigue el idioma de la app.</string> + <string name="stores_install_language_system">Sistema</string> <string name="stores_install_title">Instalar %1$s:</string> <string name="stores_target_internal">Interno</string> <string name="stores_target_free">%1$s libres</string> @@ -2305,6 +2491,9 @@ <string name="edit_target">Destino</string> <string name="edit_start_in">Iniciar en</string> <string name="edit_launch_options">Opciones de lanzamiento</string> + <string name="edit_launch_options_steam_hint">Se comparten con las Propiedades de Steam: un cambio en cualquiera de los dos se ve en ambos.</string> + <string name="edit_launch_options_not_saved">No se pudieron guardar las opciones de lanzamiento en Steam. Inténtalo de nuevo.</string> + <string name="edit_launch_options_desktop">Puede que Steam esté abierto en la sesión de escritorio. Cambia las opciones de lanzamiento en sus Propiedades o cierra antes la sesión.</string> <string name="edit_artwork">Ilustraciones</string> <string name="edit_other_exe">Otro exe…</string> <string name="edit_remove">Quitar</string> @@ -2434,6 +2623,7 @@ <string name="setup_download_source_custom">Prefijo propio</string> <string name="setup_download_mirror">Sitio</string> <string name="setup_download_prefix">Prefijo</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APPS DE LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Apps para el escritorio de Linux, que se abren desde Escritorio.</string> @@ -2565,6 +2755,22 @@ <string name="glasses_tracking_flat_hint">Automático mantiene este juego 2D fijo en la vista. Elige Pantalla virtual en la sección Pantalla para usar el seguimiento de cabeza.</string> <string name="glasses_tracking_sbs_hint">El seguimiento de cabeza se aplica a una pantalla virtual o a un juego de SteamVR en marcha.</string> <string name="glasses_hardware">Dispositivo</string> + <string name="vr_controllers_tab">Mandos</string> + <string name="vr_controllers_group">Mandos de SteamVR</string> + <string name="vr_controllers_emulate">Mando en RV</string> + <string name="vr_controllers_emulate_hint">Las dos manos de RV que imita tu mando. Los cambios se aplican al instante, también mientras se ejecuta SteamVR. Los Joy-Con y las manos con seguimiento siguen controlando su lado.</string> + <string name="vr_controllers_off">Mando normal</string> + <string name="vr_controllers_index">Mandos de Valve Index</string> + <string name="vr_controllers_touch">Mandos de Meta Quest 3</string> + <string name="vr_controllers_vive">Mandos de HTC Vive</string> + <string name="vr_controllers_sticks">Al empezar, los sticks</string> + <string name="vr_controllers_sticks_hint">Pulsa ambos sticks a la vez durante la RV para cambiar.</string> + <string name="vr_controllers_sticks_game">Te mueven en el juego</string> + <string name="vr_controllers_sticks_hands">Mueven las manos</string> + <string name="vr_controllers_buttons">Botones</string> + <string name="vr_controllers_buttons_stick">Los gatillos son gatillos, los bumpers agarran, A/B y X/Y son los botones frontales de cada mano, al pulsar los sticks se pulsan los joysticks, Guide abre el menú de SteamVR. Arriba y abajo en la cruceta acercan o alejan las manos.</string> + <string name="vr_controllers_buttons_vive">Los sticks son trackpads; A/X o pulsar un stick los pulsa. Los gatillos son gatillos, los bumpers agarran, Start y Select son menú, Guide abre el menú de SteamVR.</string> + <string name="vr_controllers_buttons_off">Sin manos de RV. Los juegos compatibles con mando, y el menú de SteamVR, reciben tu mando como siempre.</string> <string name="glasses_brightness">Brillo</string> <string name="glasses_volume">Volumen</string> <string name="glasses_sunblock">Bloqueo solar</string> @@ -2622,6 +2828,12 @@ <string name="hand_camera_placement">Posición de la cámara</string> <string name="hand_camera_placement_hint">Comprueba que la cámara pueda verte antes de jugar.</string> <string name="hand_camera_check">Comprobar</string> + <string name="tracking_pack_title">Descarga del seguimiento de manos</string> + <string name="tracking_pack_hint">El seguimiento de manos necesita una descarga única de %1$s.</string> + <string name="tracking_pack_download">Descargar</string> + <string name="tracking_pack_retry">Reintentar</string> + <string name="tracking_pack_downloading">Descargando el seguimiento de manos… %1$d%%</string> + <string name="tracking_pack_failed">No se ha podido descargar el seguimiento de manos. Comprueba tu conexión y vuelve a intentarlo.</string> <string name="hand_camera_check_title">Posición de la cámara</string> <string name="hand_camera_how_rear">Coloca el dispositivo de pie a 1,5-2 metros de distancia, a la altura del pecho, con la cámara trasera hacia ti. Luego entra en el encuadre con las manos extendidas.</string> <string name="hand_camera_how_front">Coloca el dispositivo de pie a 1,5-2 metros de distancia, a la altura del pecho, con la pantalla hacia ti. Luego entra en el encuadre con las manos extendidas.</string> @@ -2707,6 +2919,21 @@ <string name="storage_safe_hint">Runtimes sin usar, restos, registros antiguos</string> <string name="storage_clean_up">Limpiar…</string> <string name="storage_session_running">Detén la sesión para limpiar o eliminar algo. Los tamaños se siguen mostrando.</string> + <string name="storage_default_group">Ubicación de instalación</string> + <string name="storage_default_title">Almacenamiento predeterminado</string> + <string name="storage_default_hint">Las nuevas instalaciones de las tiendas van a la ubicación seleccionada. Los juegos existentes se quedan donde están. Las bibliotecas de Steam conservan su propio ajuste.</string> + <string name="storage_default_ask">Preguntar siempre</string> + <string name="storage_default_ask_detail">Elige un destino para cada instalación</string> + <string name="storage_default_internal">Almacenamiento interno</string> + <string name="storage_default_external">Almacenamiento externo</string> + <string name="storage_default_external_detail">%1$s · %2$s libres</string> + <string name="storage_default_external_missing">No conectado</string> + <string name="storage_default_folder">Carpeta · %1$s</string> + <string name="storage_default_folder_free">%1$s libres</string> + <string name="storage_default_folder_missing">No conectada</string> + <string name="storage_default_choose_folder">Elegir carpeta…</string> + <string name="storage_default_choose_folder_detail">Usa cualquier carpeta de una tarjeta SD o unidad USB</string> + <string name="storage_default_note">Los juegos se guardan en una carpeta Games dentro de la ubicación seleccionada. Los juegos existentes no se mueven.</string> <string name="storage_where">Dónde va</string> <string name="storage_games">Juegos de Steam</string> <string name="storage_game_data">Datos de juegos</string> @@ -2835,6 +3062,9 @@ <string name="storage_data_installed">Juegos instalados</string> <string name="storage_data_parts">Prefijo %1$s · shaders %2$s · taller %3$s</string> <string name="storage_clear_shaders">Borrar shaders</string> + <string name="storage_reset_prefix">Restablecer prefijo</string> + <string name="storage_reset_prefix_title">¿Restablecer el prefijo de %1$s?</string> + <string name="storage_reset_prefix_confirm">Borra su prefijo de Wine (%1$s) en %2$s y lo vuelve a crear en el próximo inicio. Se pierden las partidas, los ajustes y los redistribuibles instalados dentro; las partidas de Steam Cloud se conservan en tu cuenta.</string> <string name="storage_data_leftovers">Juegos desinstalados</string> <string name="storage_steam_app">App de Steam %1$d</string> <string name="storage_leftover_unsure_detail">Su prefijo aún contiene archivos, que pueden incluir partidas guardadas locales</string> @@ -3138,6 +3368,117 @@ <string name="spatial_saved_views_hint">Las vistas guardadas se pueden recalcular. Inicie una nueva calibración para capturar en el sistema de coordenadas de seguimiento actual.</string> <string name="spatial_model_checksum_error">La suma de comprobación del modelo de mano no coincide</string> <string name="spatial_opencv_load_error">OpenCV no se pudo cargar</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizar con Syncthing</string> + <string name="sync_enable_hint">Basada en Syncthing-Fork, es una implementación de Syncthing que te permite sincronizar archivos del sistema de archivos interno de DroidDeck con otras instancias de Syncthing. Solo sirve para los archivos que guardas en el sistema de archivos interno de DroidDeck.</string> + <string name="sync_missing">Esta compilación no incluye Syncthing.</string> + <string name="sync_starting">Iniciando Syncthing</string> + <string name="sync_status_starting">Iniciando</string> + <string name="sync_status_up_to_date">Actualizado</string> + <string name="sync_status_syncing">Sincronizando</string> + <string name="sync_status_paused">En pausa</string> + <string name="sync_status_pausing">Pausando</string> + <string name="sync_status_resuming">Reanudando</string> + <string name="sync_status_attention">Requiere atención</string> + <string name="sync_status_failed">Syncthing se detuvo</string> + <string name="sync_failed_retry">Reintentar</string> + <string name="sync_paused_wifi">En pausa hasta tener Wi-Fi</string> + <string name="sync_paused_game">En pausa durante el juego</string> + <string name="sync_summary">%1$d carpetas · %2$d de %3$d dispositivos conectados</string> + <string name="sync_left">Faltan %1$s</string> + <string name="sync_open_web_ui">Abrir la interfaz web</string> + <string name="sync_pause">Pausar</string> + <string name="sync_resume">Reanudar</string> + <string name="sync_running">En ejecución</string> + <string name="sync_running_hint">Desactívalo para detener Syncthing por completo.</string> + <string name="sync_this_device">Este dispositivo</string> + <string name="sync_device_id">ID del dispositivo</string> + <string name="sync_show_qr">Mostrar QR</string> + <string name="sync_advanced">Avanzado</string> + <string name="sync_advanced_hint">Puertos, cuándo se ejecuta, restablecer</string> + <string name="sync_open">Abrir</string> + <string name="sync_waiting">Esperando tu respuesta</string> + <string name="sync_pending_device">%1$s quiere conectarse</string> + <string name="sync_pending_folder">%1$s quiere compartir “%2$s”</string> + <string name="sync_pending_folder_hint">Acepta para elegir dónde se guarda en DroidDeck.</string> + <string name="sync_review">Revisar en la interfaz web</string> + <string name="sync_folders">Carpetas</string> + <string name="sync_no_folders">Aún no hay carpetas.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Actualizada</string> + <string name="sync_folder_syncing">Sincronizando %1$d%%</string> + <string name="sync_folder_scanning">Escaneando</string> + <string name="sync_folder_paused">En pausa</string> + <string name="sync_folder_out_of_sync">No sincronizada</string> + <string name="sync_folder_errors">No se pudieron sincronizar %1$d archivos</string> + <string name="sync_folder_blocked">Bloqueada</string> + <string name="sync_folder_blocked_hint">Esta carpeta está fuera del almacenamiento de DroidDeck, así que DroidDeck la puso en pausa. Para sincronizar carpetas fuera de DroidDeck, usa la app Syncthing-Fork.</string> + <string name="sync_remove_folder">Quitar de Syncthing</string> + <string name="sync_remove_folder_hint">Quitarla no borra ningún archivo.</string> + <string name="sync_devices">Dispositivos</string> + <string name="sync_no_devices">Aún no hay dispositivos.</string> + <string name="sync_connected">Conectado</string> + <string name="sync_offline">Sin conexión</string> + <string name="sync_last_seen">Visto por última vez %1$s</string> + <string name="sync_device_id_title">ID de este dispositivo</string> + <string name="sync_device_id_hint">En tu otro dispositivo, añade un dispositivo en Syncthing y escanea este código o pega el ID. Después, acéptalo aquí en la interfaz web.</string> + <string name="sync_copy">Copiar</string> + <string name="sync_share">Compartir</string> + <string name="sync_done">Hecho</string> + <string name="sync_off_title">¿Desactivar Syncthing?</string> + <string name="sync_off_body">Syncthing se detiene ahora y seguirá detenido hasta que vuelvas a activarlo. Los archivos sincronizados se quedan donde están.</string> + <string name="sync_off_forget">Borrar también la configuración de Syncthing</string> + <string name="sync_off_forget_hint">Quita el ID de este dispositivo, las carpetas y los dispositivos. Al volver a activarlo, empieza desde cero.</string> + <string name="sync_turn_off">Desactivar</string> + <string name="sync_ports">Puertos</string> + <string name="sync_port_sync">Sincronización</string> + <string name="sync_port_discovery">Descubrimiento local</string> + <string name="sync_repick">Elegir puertos nuevos</string> + <string name="sync_repick_hint">Se vuelve a comprobar en cada inicio.</string> + <string name="sync_repick_button">Volver a elegir</string> + <string name="sync_reset_group">Restablecer</string> + <string name="sync_api_key">Clave API</string> + <string name="sync_regenerate">Regenerar</string> + <string name="sync_reset">Restablecer Syncthing</string> + <string name="sync_reset_hint">ID de dispositivo nuevo; se quitan las carpetas y los dispositivos. Los archivos del almacenamiento de DroidDeck se conservan.</string> + <string name="sync_reset_button">Restablecer</string> + <string name="sync_reset_confirm_title">¿Restablecer Syncthing?</string> + <string name="sync_running_group">Ejecución</string> + <string name="sync_run">Ejecutar</string> + <string name="sync_run_open">Mientras DroidDeck está abierto</string> + <string name="sync_run_background">En segundo plano</string> + <string name="sync_wifi_only">Solo con Wi-Fi</string> + <string name="sync_pause_games">Pausar durante los juegos</string> + <string name="sync_logs">Registros</string> + <string name="sync_logs_hint">Salida de Syncthing de esta sesión</string> + <string name="sync_logs_share">Compartir</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Configura primero el runtime de Linux.</string> + <string name="sync_accept">Aceptar</string> + <string name="sync_accept_title">Guardar “%1$s” en</string> + <string name="sync_add_folder">Añadir carpeta</string> + <string name="sync_add_folder_hint">Sincroniza una carpeta del almacenamiento de DroidDeck</string> + <string name="sync_choose">Elegir</string> + <string name="sync_add">Añadir</string> + <string name="sync_add_failed">No se pudo añadir la carpeta.</string> + <string name="sync_share_with">Compartir con</string> + <string name="sync_share_none">Aún no hay dispositivos. Puedes compartir esta carpeta más tarde desde la interfaz web.</string> + <string name="sync_use_folder">Usar esta carpeta</string> + <string name="sync_new_folder">Carpeta nueva</string> + <string name="sync_location_home">Carpeta personal del contenedor</string> + <string name="sync_location_sync">Carpeta Sync</string> + <string name="sync_location_shared">Almacenamiento compartido de DroidDeck</string> + <string name="sync_location_card">DroidDeck en %1$s</string> + <string name="sync_location_app">Datos de la app DroidDeck</string> + <string name="sync_web_path_locked">Las carpetas nuevas se guardan en la carpeta Sync de DroidDeck. Para sincronizar otra carpeta de DroidDeck, usa Añadir carpeta en la pestaña Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Recargar</string> + <string name="sync_not_running">Syncthing no se está ejecutando.</string> + <string name="session_end_steam_sigill">Steam se detuvo por una instrucción ilegal (SIGILL). Puede ser un problema de compatibilidad con instrucciones de la CPU o un fallo del cliente. Comparte los registros con los datos de tu dispositivo.</string> + <string name="session_end_steam_try_x64">Puedes probar Ajustes de Steam → Cliente de Steam → x86-64 (experimental). Requiere una descarga adicional y puede ir más lento.</string> + <string name="session_end_vulkan_device">El controlador gráfico de Linux no ha encontrado un dispositivo Vulkan utilizable. Comprueba que el controlador de GPU de Linux seleccionado sea compatible con esta GPU.</string> + <string name="session_end_gpu_unsupported">Esta sesión no puede iniciarse porque esta GPU no tiene un controlador Vulkan de Linux compatible en la configuración actual. Los controladores Turnip de Adreno no pueden habilitar la compatibilidad con GPU MediaTek/Mali.</string> <string name="setup_group_memory">Memoria</string> <string name="setup_clear_cached">Cerrar apps en caché antes de una sesión</string> <string name="setup_clear_cached_hint">Al empezar una sesión, cierra las apps que Android mantiene en segundo plano para que el juego tenga más memoria. La depuración inalámbrica debe estar activada.</string> @@ -3161,6 +3502,12 @@ <string name="epic_client_open">Abrir</string> <string name="epic_client_install">Instalar</string> <string name="game_tab_about">Acerca de</string> + <string name="game_resources_browser">Se abre en tu navegador</string> + <string name="game_resource_guides">Guías</string> + <string name="game_resource_protondb_detail">Informes de compatibilidad de Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Para juegos con partidas guardadas en tu cuenta de Steam</string> + <string name="game_resource_search">Búsqueda web</string> <string name="game_tab_install">Instalar</string> <string name="game_install_location">Ubicación</string> <string name="game_install_folder">Carpeta</string> @@ -3177,6 +3524,11 @@ <string name="stores_eyebrow_pass">disponible con %1$s</string> <string name="stores_owned_in_library">Juegos comprados en la Biblioteca</string> <string name="library_filter_added">Añadidos</string> + <string name="library_filter">Filtro</string> + <string name="library_filter_installed">Solo instalados</string> + <string name="library_filter_all_owned">Todos los juegos que tienes</string> + <string name="library_no_installed_matches">Ningún juego instalado coincide con estos filtros.</string> + <string name="library_browse_owned">Explorar los juegos que tienes</string> <string name="game_tab_launch">Inicio</string> <string name="game_tab_saves_cloud">Partidas y nube</string> <string name="game_launch_shortcut">Acceso directo de Steam</string> @@ -3194,6 +3546,40 @@ <string name="stores_itch_update_replaced">El desarrollador reemplazó esta versión por %1$s. ¿Actualizar a ella?</string> <string name="xbox_filter_cloud">Nube</string> <string name="stores_xbox_cloud_settings">Ajustes de nube</string> + <string name="integration_title">Integración con Steam</string> + <string name="integration_count">%1$d de %2$d activadas</string> + <string name="integration_set_up">Configurar</string> + <string name="integration_location">Ubicación</string> + <string name="integration_app_info">Información de la aplicación</string> + <string name="integration_wifi">Nombres de Wi-Fi</string> + <string name="integration_brightness">Brillo</string> + <string name="integration_home">DroidDeck como inicio</string> + <string name="integration_shortcuts">Teclas del sistema</string> + <string name="integration_wifi_hint">Muestra las redes en Steam · requiere acceso a la ubicación, nunca se rastrea</string> + <string name="integration_wifi_on">Las redes se muestran en Steam</string> + <string name="integration_wifi_location_off">La ubicación está desactivada</string> + <string name="integration_wifi_denied">Ubicación denegada · permítela en Información de la aplicación</string> + <string name="integration_brightness_hint">El control deslizante de Steam ajusta el brillo de la pantalla</string> + <string name="integration_home_hint">Inicio abre el menú de Steam en una sesión</string> + <string name="integration_shortcuts_hint">Alt+Tab, la tecla Win y el botón Inicio se quedan en la sesión</string> + <string name="integration_shortcuts_maybe_restricted">¿Aparece en gris en Android? Información de la aplicación → ⋮ → Permitir ajustes restringidos</string> + <string name="integration_shortcuts_restricted">Bloqueado por Android · Información de la aplicación → ⋮ → Permitir ajustes restringidos</string> + <string name="integration_shortcuts_service">Teclas del sistema de DroidDeck</string> + <string name="integration_shortcuts_service_description">Mantiene Alt+Tab, la tecla Win y el botón Inicio en una sesión activa de DroidDeck en lugar de Android.</string> + <string name="integration_brightness_needed">Activa Brillo en Configuración → Integración con Steam</string> + <string name="setup_gpu_bridge_off">Puente Mali: desactivado</string> + <string name="setup_gpu_bridge_on">Puente Mali: activado</string> + <string name="setup_gpu_bridge_detail">%1$s no es una Adreno. El puente Vulkan experimental está activado: la sesión dibuja a través del propio controlador del teléfono. Espera errores; envía los registros de la sesión.</string> + <string name="setup_bridge_safe">Modo seguro</string> + <string name="setup_bridge_safe_on">Modo seguro: activado</string> + <string name="setup_bridge_safe_off">Modo seguro: desactivado</string> + <string name="setup_bridge_safe_on_detail">El más compatible. Recomendado para un dispositivo nuevo.</string> + <string name="setup_bridge_safe_off_detail">Más rápido donde esta GPU superó sus comprobaciones.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automático</string> + <string name="setup_bridge_dxvk_proton">DXVK: el de Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Usa un DXVK más antiguo cuando el Vulkan de esta GPU es demasiado antiguo para el de Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Cada Proton conserva su propio DXVK, aunque el Vulkan de esta GPU pueda ser demasiado antiguo para él.</string> <string name="apps_search_hint">Buscar aplicaciones</string> <string name="apps_no_match">Ninguna aplicación coincide con «%1$s».</string> <string name="apps_add_widget">Añadir widget</string> @@ -3243,6 +3629,8 @@ <string name="desktop_restore_done_body">Las apps que añadiste vuelven a estar instaladas.</string> <string name="desktop_restore_failed_title">No se ha podido restaurar parte del software</string> <string name="desktop_restore_failed_body">Consulta ~/.cache/droiddeck/apt-restore.log y después prueba sudo apt install en Konsole.</string> + <string name="gog_full_files">Las optimizaciones nativas no están disponibles. La descarga incluye archivos de reemplazo completos.</string> + <string name="gog_recover">Verificar el resultado del parche</string> <string name="slow_usb_title">Conexión USB lenta</string> <string name="slow_usb_cable">%1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s), así que los juegos cargarán despacio. Usa un cable USB 3 de 5 Gbps o más, prueba a girar el conector USB-C o usa una unidad más rápida.</string> <string name="slow_usb_port">%1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s). El puerto USB de este dispositivo no va más rápido, así que los juegos cargarán despacio. El almacenamiento interno o una microSD pueden ser más rápidos.</string> @@ -3253,4 +3641,52 @@ <string name="steam_import_names_more">%1$s y %2$d más</string> <string name="steam_import_now">Reiniciar ahora</string> <string name="steam_import_later">Más tarde</string> + <string name="gog_maintenance">Administrar la instalación de GOG</string> + <string name="gog_check">Buscar actualizaciones</string> + <string name="gog_repair">Verificar/Reparar</string> + <string name="gog_patches">Parches sin conexión</string> + <string name="gog_refresh">Descargar el instalador sin conexión completo</string> + <string name="gog_update">Actualizar a %1$s</string> + <string name="gog_resume">Reanudar el mantenimiento de GOG</string> + <string name="gog_open_patch">Abrir el instalador del parche</string> + <string name="gog_patch_in_session">Termina o cancela el instalador del parche en la sesión de Linux.</string> + <string name="gog_patch_requirements">Elige un parche para tu versión instalada y tu idioma. Puede que no aparezcan todas las versiones de origen compatibles.</string> + <string name="gog_no_patches">GOG no tiene parches independientes de Windows para este juego.</string> + <string name="gog_managed_files">Los archivos del juego modificados pueden reemplazarse.</string> + <string name="gog_patch_installer_note">El instalador se abre en tu sesión de Linux.</string> + <string name="gog_download_label">Descarga</string> + <string name="gog_space_label">Espacio adicional</string> + <string name="gog_space_estimate_label">Espacio estimado</string> + <string name="gog_repair_action">Reparar archivos</string> + <string name="gog_refresh_action">Renovar la instalación</string> + <string name="gog_select_patch">Seleccionar</string> + <string name="stores_gamejolt_not_owned">No está en tu biblioteca de Game Jolt</string> + <string name="stores_gamejolt_no_build">No hay descarga para Windows de este juego</string> + <string name="stores_gamejolt_no_exe">No se ha encontrado un juego de Windows en la descarga</string> + <string name="stores_gamejolt_no_game">No se ha encontrado este juego en Game Jolt</string> + <string name="stores_gamejolt_browse_failed">No se pudieron cargar los juegos de Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt respondió HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">No se pudieron cargar las descargas de Game Jolt</string> + <string name="stores_gamejolt_build_open">Abrir en Game Jolt</string> + <string name="stores_gamejolt_archive">Los archivos %1$s no son compatibles</string> + <string name="stores_gamejolt_extract_failed">No se ha podido extraer la descarga (código %1$d)</string> + <string name="stores_gamejolt_download_unreachable">No se pudo conectar con Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt no proporcionó un enlace de descarga</string> + <string name="stores_gamejolt_section_featured">Destacados</string> + <string name="stores_gamejolt_section_hot">Populares</string> + <string name="stores_gamejolt_section_best">Mejores</string> + <string name="stores_gamejolt_section_new">Nuevos</string> + <string name="stores_gamejolt_price_under_30">30 $ o menos</string> + <string name="stores_gamejolt_os_other">Otros</string> + <string name="stores_gamejolt_maturity_everyone">Todas las edades</string> + <string name="stores_gamejolt_maturity_teen">Adolescentes</string> + <string name="stores_gamejolt_maturity_adult">Adultos</string> + <string name="stores_gamejolt_status_complete">Completo</string> + <string name="stores_gamejolt_status_early">Acceso anticipado</string> + <string name="stores_gamejolt_partners">Juegos de socios</string> + <string name="stores_gamejolt_filter_browser">Navegador</string> + <string name="stores_gamejolt_filter_maturity">Clasificación</string> + <string name="stores_gamejolt_filter_status">Estado</string> + <string name="stores_gamejolt_filter_partners">Socios</string> + <string name="stores_gamejolt_followed">Juegos seguidos</string> </resources> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b1d4adf9f8..921ab377cf 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-asetukset D3D12:lle. nodxr poistaa säteenseurannan käytöstä; käytä vain peleissä, jotka sitä tarvitsevat.</string> <string name="game_env_proton_log">Aseta arvoon 1 Proton-diagnostiikkalokia varten. Lokitus voi heikentää suorituskykyä ja käyttää tallennustilaa.</string> <string name="game_env_wined3d">Aseta arvoon 1 käyttääksesi OpenGL-pohjaista WineD3D:tä DXVK:n sijaan D3D9–11-yhteensopivuuden testaamiseen.</string> + <string name="game_env_wined3d_renderer">Renderöijä DirectDraw-, Direct3D 1-7- ja WineD3D:llä ajettaville peleille. Vulkan ohittaa OpenGL-Zink-reitin ja on paljon nopeampi vanhoissa DirectDraw- ja Direct3D 7 -peleissä Adrenolla.</string> + <string name="game_env_dxvk_d3d8">Aseta arvoon 1 ajaaksesi Direct3D 8:n DXVK:n kautta WineD3D:n sijaan. Nopeampi AIO Graphics Testin Direct3D 8 -testissä Adrenolla.</string> <string name="game_env_no_ntsync">Aseta arvoon 1 pitääksesi tämän pelin poissa ntsyncistä (droiddeck-ntsync tai ydinajuri); se käyttää droiddeck-esynciä, jos paketti on olemassa, muuten droiddeck-fsynciä.</string> <string name="game_env_no_esync">Aseta arvoon 1 poistaaksesi droiddeck-esyncin käytöstä tälle pelille; se käyttää sen sijaan droiddeck-fsynciä, tai droiddeck-ntsynciä, jos fsync on myös pois käytöstä.</string> <string name="game_env_no_fsync">Aseta arvoon 1 pitääksesi tämän pelin poissa droiddeck-fsyncistä; se käyttää droiddeck-esynciä, jos paketti on olemassa, muuten droiddeck-ntsynciä.</string> <string name="game_env_fsync_first">Aseta arvoon 1 ajaaksesi tämän pelin droiddeck-fsyncillä, tai 0 asettaaksesi droiddeck-esyncin etusijalle, jos paketti sopii sen Protoniin.</string> <string name="game_env_xalia">Aseta arvoon 0 poistaaksesi käytöstä Protonin ohjaimen navigointiavustimen tälle pelille.</string> + <string name="game_env_anticheat_offline">Oletuksena päällä. Käynnistää Easy Anti-Cheat -pelin ilman huijauksenestoa, kun peli tukee offline-pelaamista. Poista käytöstä käynnistääksesi Easy Anti-Cheatin kautta tavalliseen tapaan. Easy Anti-Cheatia vaativat verkkotilat eivät ole käytettävissä.</string> <string name="game_env_hud">DXVK-peittokuva D3D9–11:lle. fps näyttää ruudunpäivitysnopeuden; tyhjänä piilottaa sen.</string> <string name="game_env_dxvk_config">DXVK-asetukset erotettuna puolipisteillä. Uudemmat versiot käyttävät dxvk.maxFrameRate-asetusta kuvanopeuden rajoittamiseen; käytä tavallisessa pelaamisessa ennemmin istunnon kuvanopeusrajoitinta.</string> + <string name="game_env_cores">Tämän pelin CPU-ytimet, esimerkiksi 0-4 tai 0,2,4, istunnon peliytimien sijaan. Vähemmän ytimiä pysyy viileämpänä.</string> <string name="game_env_vkd3d_limit">D3D12-kuvanopeusraja. 0 poistaa rajan käytöstä.</string> <string name="game_env_glthread">Mesan OpenGL-säikeistys. true voi auttaa CPU-rajoitteisissa OpenGL-peleissä; testaa pelikohtaisesti.</string> <string name="sync_backend_title">Wine-synkronointi</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX suorittaa x86-Linux-ohjelmia tällä ARM64-laitteella. Automaattinen käyttää sitä, kun ohjelma on tehty x86:lle.</string> <string name="app_fex_x86">%1$s FEXin kautta</string> <string name="app_fex_not_ready">Tämä ohjelma on tehty %1$s-tietokoneille ja käynnistyy FEXin kautta, jota ei ole vielä määritetty. Avaa Steam kerran kirjautuneena: DroidDeck lataa sen myötä FEXin ja tarvittavan Steam Linux Runtimen, jonka jälkeen tämä avautuu.</string> + <string name="session_proot_missing">DroidDeckin proota ei voitu ladata. Tarkista yhteys ja yritä uudelleen. Istuntoa ei käynnistetty, koska varaproot on liian hidas pelaamiseen.</string> + <string name="session_directaudio_missing">DirectAudiota ei voitu ladata, joten pelin ääni käyttää tässä istunnossa hitaampaa reittiä.</string> <string name="session_end_program">Tämä ohjelma</string> <string name="session_end_steam_download">Steam-asiakasohjelmaa ei voitu ladata. Verkkosi tai VPN saattaa estää Steamin palvelimet; tarkista yhteys ja yritä uudelleen.</string> <string name="session_end_steam_setup">Steam-asiakasohjelmaa ei voitu ottaa käyttöön. Tarkista yhteys ja vapaa tallennustila ja yritä uudelleen.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 -ohjain</string> <string name="mode_controller_note">Deck: pikavalikkopainike ja gyroskooppi. Steam Controller: samat, ja takapainikkeissa puristustunnistus. DualShock 4 ja DualSense: gyroskooppi, ja kosketuslevyt toimivat kosketuslevynä. Xbox 360: avaa pikavalikko Guide+A:lla.</string> <string name="mode_back">Back</string> + <string name="back_hold">Pidä Takaisin pohjassa Steam-pikanäppäimille</string> + <string name="back_hold_hint">Takaisin pohjassa pitäminen avaa pikavalikon tai tekee Steam-yhdistelmiä muiden painikkeiden kanssa. Poista käytöstä ohittaaksesi pitkän painalluksen; napautus ja kaksoisnapautus toimivat yhä.</string> + <string name="back_native_qam_hint">Pidä Back-painiketta 700 ms, tai pidä Back-painiketta ja paina toista painiketta Steam-pikanäppäimiä varten.</string> + <string name="back_double_tap_window">Kaksoisnapautuksen aikaikkuna</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Salli kirkkauden säätö</string> + <string name="brightness_permission_text">Ota kirkkauden säätö käyttöön DroidDeckissä.</string> <string name="back_menu_then_qam">Valikko → QAM</string> <string name="back_qam_then_menu">QAM → Valikko</string> <string name="mode_session">Istunto</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Viivästytä taustakeskeytystä, kun Steam lataa aktiivisesti.</string> <string name="mode_suspend_note">Automaattinen keskeyttää taustalla ja jatkaa, kun sovellus tulee näkyviin. Manuaalinen odottaa Jatka-painiketta. Ei koskaan pitää sovelluksen aina käynnissä.</string> <string name="mode_startup">Käynnistys</string> - <string name="mode_steam_startup">Käynnistä Steam DroidDeckin kanssa</string> - <string name="mode_steam_startup_hint">Avaa Steam-istunnon, kun DroidDeck käynnistyy.</string> + <string name="mode_startup_session">Avaa käynnistyksessä</string> + <string name="mode_startup_session_hint">Käynnistää tämän istunnon, kun DroidDeck avataan.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Tarkistetaan julkaisuja…</string> <string name="mode_decky_ready">Valmiina asentamaan %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Ajan tasalla · %1$s</string> <string name="mode_decky_loader">Lataaja</string> <string name="mode_decky_install_latest">Asenna uusin</string> + <string name="decky_channel">Päivityskanava</string> + <string name="decky_channel_hint">Mitkä Decky Loader -julkaisut asennetaan. Deckyn oma päivitysohjelma käyttää samaa kanavaa.</string> + <string name="decky_channel_stable">Vakaa</string> + <string name="decky_channel_prerelease">Esijulkaisu</string> + <string name="decky_channel_testing">Testaus</string> + <string name="decky_channel_failed">Deckyn päivityskanavaa ei voitu tallentaa</string> <string name="mode_decky_on">Käynnistyy Steamin kanssa. Päällä ollessaan muut tämän laitteen sovellukset voivat pystyä ohjaamaan Steamia.</string> <string name="mode_decky_off">Pois. Steamin etävianmääritysportti pysyy suljettuna.</string> <string name="mode_decky_remove_title">Poistetaanko Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Asiakasohjelma</string> <string name="mode_mangoapp">Suorituskyvyn peittokuva</string> <string name="mode_mangoapp_hint">Poista käytöstä, jos pelit kaatuvat tai näyttö mustuu Deck-tilassa. Tulee voimaan seuraavassa istunnossa.</string> + <string name="mode_return_after_game">Palaa DroidDeckiin pelin jälkeen</string> + <string name="mode_return_after_game_hint">Kun DroidDeckistä tai muusta käynnistimestä aloittamasi peli sulkeutuu, Steam sulkeutuu hallitusti (pilvitallennukset valmistuvat ensin) ja palaat sinne. Pois: pysy Steamissa.</string> + <string name="mode_shader_precache">Sävyttimien esivälimuistitus</string> + <string name="mode_shader_precache_hint">Steam lataa peleillesi valmiiksi käännetyt sävyttimet ja käsittelee ne taustalla, joten pelit nykivät vähemmän. Pois päältä säästää dataa, tallennustilaa ja akkua; pelit kääntävät sävyttimet pelatessa. Sama asetus kuin Steamin Lataukset > Shader Pre-Caching. Tulee voimaan seuraavassa istunnossa.</string> <string name="mode_steam_repair">Korjaa Steam-asiakasohjelma</string> <string name="mode_steam_repair_hint">Lataa Steam-asiakasohjelman uudelleen, kun Steam käynnistyy seuraavan kerran. Käytä tätä, jos Steam jää lataus­näytölle. Pelit, kirjautuminen ja asetukset säilyvät.</string> <string name="mode_steam_repair_queued">Steam-asiakasohjelma ladataan uudelleen, kun Steam käynnistyy seuraavan kerran.</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">Ohittaa PulseAudion pienempää viivettä varten.</string> <string name="mode_mic">Mikrofoni</string> <string name="mode_mic_hint">Äänichattia varten.</string> + <string name="drawer_mic_hint">Kytke mikrofonin äänitys päälle tai pois tässä istunnossa.</string> + <string name="drawer_mic_failed">Mikrofonia ei voitu muuttaa. Yritä uudelleen.</string> <string name="mode_network">Verkko</string> <string name="mode_wifi_discovery">Wi-Fi-haku</string> <string name="mode_wifi_discovery_hint">Näytä Wi-Fi-nimet ja lähellä olevat verkot Steamissa.</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: reaaliaikainen GPU-jono</string> <string name="perf_gsrealtime_hint">Priorisoi kompositorin GPU-työtä. Voi tasoittaa kuvanopeuden tahditusta pelien kustannuksella.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Muisti</string> + <string name="perf_cap_off">Pois</string> + <string name="perf_cap_auto">Ajurin oletus</string> + <string name="perf_zram_client">Pakkaa Steam pelin ollessa käynnissä</string> + <string name="perf_zram_client_hint">20 s pelin käynnistymisen jälkeen Steam-asiakasohjelma pakataan zRAMiin, jotta pelille jää enemmän muistia, ja luetaan takaisin, kun peli sulkeutuu. Poista tämä käytöstä, jos istunto sulkeutuu pian pelien käynnistymisen jälkeen. Yllä oleva RAM-raja pakkaa silti Steamin, kun istunto ylittää sen.</string> + <string name="perf_ram_cap">RAM-raja</string> + <string name="perf_ram_cap_hint">Koskee aikaa, jolloin Steam-asiakasohjelma on käynnissä, Steam-tilassa tai työpöydältä. Kun istunto käyttää tätä enemmän, Steam ja sen jälkeen istunnon muut tuetut prosessit pakataan zRAMiin. Pehmeä raja: mitään ei suljeta, mutta pelit voivat nykiä, kun sivuja luetaan takaisin.</string> + <string name="perf_ram_cap_unavailable">Vaatii zRAM-swapin, jota tässä laitteessa ei ole.</string> + <string name="perf_vram_cap">VRAM-raja</string> + <string name="perf_vram_cap_hint">Videomuisti, jonka DXVK ilmoittaa Direct3D-peleille, jotta ne mitoittavat tekstuurit pienemmälle. Pelin omat DXVK-asetukset menevät edelle. Tulee voimaan seuraavassa istunnossa.</string> <string name="perf_gpuclock">Pidä GPU huippukellotaajuudessaan</string> <string name="perf_gpuclock_hint">Vain Adreno. Vähemmän nykäyksiä, enemmän akun kulutusta ja lämpöä.</string> <string name="perf_fixes">Istunnon korjaukset</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">proot-pikareitti</string> <string name="perf_fastpath_needs_seccomp">Vaatii prootin seccomp-suodattimen.</string> <string name="perf_fastpath_hint">Nopeampi tiedostojen hakeminen ja vähemmän nykimistä. Poista käytöstä, jos ohjelma ei löydä tiedostojaan.</string> + <string name="perf_cursor_composite">Piirrä osoitin gamescopessa</string> + <string name="perf_cursor_composite_hint">Gamescope piirtää osoittimen itse sen sijaan, että antaisi sen Androidille. Ota käyttöön ohjaimella ohjattavaa osoitinta varten. Pois päältä on nopeampi puhelimessa. Tulee voimaan seuraavassa istunnossa.</string> <string name="perf_identity">Istunnon identiteetti</string> <string name="perf_hostname">Isäntänimi</string> <string name="perf_hostname_hint">Nimi, jonka Steam näkee tälle laitteelle. Tyhjä palauttaa arvon %1$s.</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">Sen tiedostot poistetaan sovelluksesta.</string> <string name="driver_delete_in_use">Sen tiedostot poistetaan. Se on käytössä, joten oletus ottaa sen paikan.</string> <string name="drawer_page_display">Näyttö</string> + <string name="drawer_frame_limit">Kuvanopeusraja</string> + <string name="drawer_frame_limit_note">Rajoittaa tätä peliä. Näyttö vaihtaa virkistystaajuuteen, joka on rajan tasakerrannainen, jos sellainen on; muut rajat voivat näyttää epätasaisilta. Steam-pelit käyttävät Steamin Frame Limit -asetusta Pikavalikossa.</string> <string name="drawer_page_effects">Tehosteet</string> <string name="drawer_page_controls">Ohjaimet</string> <string name="drawer_page_components">Komponentit</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">Kapseli</string> <string name="hud_size_minimal">Minimaalinen</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Palkki</string> <string name="hud_locked">Lukitse paikalleen</string> <string name="hud_locked_hint">Siirrä HUD:ia vetämällä; pitkä painallus lukitsee tai vapauttaa sen. Lukittuna sen alla olevat näytön ohjaimet toimivat edelleen.</string> + <string name="hud_snap">Kiinnitä sivuille</string> + <string name="hud_snap_hint">Kun päästät HUDista irti, se siirtyy näytön lähempään reunaan. Nopea pyyhkäisy heittää sen siihen suuntaan.</string> <string name="hud_group_look">Ulkoasu</string> <string name="hud_scale">Koko näytöllä</string> <string name="hud_color_soft">Pehmeä</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">HUD-raporttia ei voitu tallentaa.</string> <string name="hud_reset">Palauta HUD-asetukset</string> <string name="hud_reset_button">Palauta</string> - <string name="hud_credit">FusionHUD, tekijä The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Skaalaustila</string> <string name="drawer_scaling_sharpness">Skaalauksen terävyys</string> <string name="drawer_effects">Näyttötehosteet</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">Automaattinen (%1$s)</string> <string name="drawer_keyboard">Näppäimistö</string> <string name="drawer_latency">Viive</string> + <string name="drawer_low_latency">Matalan viiveen tila</string> + <string name="drawer_low_latency_hint">Lisää CPU:n ja akun käyttöä</string> <string name="drawer_low_latency_controller">Matalan viiveen ohjain</string> <string name="drawer_low_latency_controller_hint">Ohjain raportoi 1000 Hz:n taajuudella 250 Hz:n sijaan. Hieman enemmän CPU:ta.</string> <string name="drawer_low_latency_touch">Matalan viiveen kosketus</string> <string name="drawer_low_latency_touch_hint">Kosketukset ohittavat ruutujen niputuksen, joten Steamin kosketusohjaus toimii 1000 Hz:llä. Hieman enemmän CPU:ta.</string> <string name="drawer_evdev_mouse">Raaka hiirikanava</string> + <string name="drawer_relative_mouse">Suhteellinen hiiri</string> + <string name="drawer_relative_mouse_auto">Automaattinen</string> + <string name="drawer_relative_mouse_on">Päällä</string> + <string name="drawer_relative_mouse_off">Pois</string> <string name="drawer_direct_cursor">Osoitin</string> <string name="drawer_pc_keyboard">PC-näppäimistö</string> <string name="drawer_android_keyboard">Android</string> @@ -791,6 +838,10 @@ <string name="setup_session">Istunto</string> <string name="setup_logs">Istunnon lokit</string> <string name="setup_logs_hint">Tallennetaan joka istunnon jälkeen</string> + <string name="setup_game_debug_logs">Pelien vianmäärityslokit</string> + <string name="setup_game_debug_logs_hint">Sisällytä Protonin, Winen ja grafiikan diagnostiikka seuraavaan pelin käynnistykseen. Voi heikentää suorituskykyä ja käyttää enemmän tallennustilaa.</string> + <string name="setup_game_debug_logs_restart">Käynnistä tämä istunto uudelleen tallentaaksesi pelien vianmäärityslokit</string> + <string name="setup_logging_update_failed">Lokitusta ei voitu päivittää. Tarkista kytkin ja yritä uudelleen.</string> <string name="setup_agent_commands">Vianmääritystyökalut</string> <string name="setup_latest_logs">Viimeisimmät istunnon lokit</string> <string name="setup_saved_logs">Tallennetut istunnon lokit</string> @@ -822,20 +873,22 @@ <string name="setup_home">Käytä Aloitusnäyttönä</string> <string name="setup_home_on">DroidDeck voi olla kotisovellus</string> <string name="setup_home_off">DroidDeckiä ei koskaan tarjota kotisovellukseksi</string> + <string name="setup_home_game_space_first">Aseta Lisää pelejä -kohdassa DroidDeck tilaan Sisällytä</string> <string name="setup_orientation">Suunta</string> + <string name="setup_launcher_orientation">Käynnistimen suunta</string> + <string name="setup_launcher_orientation_auto">Seuraa laitteen kiertoa</string> + <string name="setup_orientation_portrait">Pystysuunta</string> + <string name="setup_session_orientation">Istunnon suunta</string> + <string name="setup_session_orientation_hint">Koskee Steamia, pelejä, työpöytää ja ohjainmuokkainta. Resoluution esiasetukset kääntyvät istunnon mukana; mukautettu leveys ja korkeus pysyvät syötetyn mukaisina.</string> <string name="setup_orientation_auto">Automaattinen vaakasuunta</string> <string name="setup_orientation_landscape">Vaakasuunta</string> <string name="setup_orientation_reverse">Käänteinen vaakasuunta</string> <string name="setup_fullscreen">Koko näyttö</string> <string name="setup_fullscreen_on">Piilottaa Androidin tila- ja navigointipalkit</string> <string name="setup_fullscreen_off">Näyttää Androidin tila- ja navigointipalkit</string> - <string name="setup_dual_screen">Kaksi näyttöä</string> - <string name="setup_dual_screen_hint">Automaattinen käyttää toista näyttöä kämmenlaitteissa, joissa sellainen on sisäänrakennettuna. Päällä käyttää mitä tahansa toista näyttöä. Pois pitää kaiken yhdellä näytöllä.</string> <string name="setup_dual_screen_auto">Automaattinen</string> <string name="setup_dual_screen_on">Päällä</string> <string name="setup_dual_screen_off">Pois</string> - <string name="setup_dual_screen_menu">Alanäytön valikko</string> - <string name="setup_dual_screen_menu_hint">Siirtää osiot ja pelin aikaisen valikon toiselle näytölle ja kirjoitus tehdään siellä, joten yläruutu säilyttää koko näkymän. L2 ja R2 vaihtavat osiota.</string> <string name="setup_dual_screen_controls">Alanäytön ohjaimet peleissä</string> <string name="setup_dual_screen_controls_hint">Avaa kosketuslevyn ja näppäimistön toiselle näytölle, kun istunto alkaa.</string> <string name="dual_typing_title">Kirjoitus yläruudulle</string> @@ -987,6 +1040,14 @@ <string name="gate_step1">Avaa Asetukset → Kehittäjäasetukset → Langaton virheenkorjaus ja kytke se päälle</string> <string name="gate_step2">Napauta ”Pariuta laite pariutuskoodilla”</string> <string name="gate_step3">Kirjoita koodi DroidDeckin ilmoitukseen</string> + <string name="pairguide_build_number">Napauta Tietoa puhelimesta -kohdassa Koontiversiota 7 kertaa</string> + <string name="pairguide_wireless">Ota Langaton virheenkorjaus käyttöön</string> + <string name="pairguide_pair">Avaa Langaton virheenkorjaus ja napauta ”Muodosta laitepari laiteparikoodilla”</string> + <string name="pairguide_child_process">Ota käyttöön ”Poista käytöstä alatason prosessirajoitukset”</string> + <string name="pairguide_row_child_process">Poista käytöstä alatason prosessirajoitukset</string> + <string name="pairguide_row_build_number">Koontiversio</string> + <string name="pairguide_row_wireless">Langaton virheenkorjaus</string> + <string name="pairguide_row_pair">Muodosta laitepari laiteparikoodilla</string> <string name="gate_waiting">Odotetaan pariutuksen ponnahdusikkunaa…</string> <string name="gate_code_needed">Ponnahdusikkuna löytyi. Syötä sen koodi ilmoitukseen.</string> <string name="gate_status">Tila</string> @@ -1125,7 +1186,6 @@ <string name="games_never_played">Ei pelattu koskaan</string> <string name="games_runtime_busy_percent">Ajoympäristö varattu · %1$d %%</string> <string name="games_runtime_busy">Ajoympäristö varattu</string> - <string name="games_runtime_first_play">Ajoympäristö asentuu ensimmäisellä Pelaa-painalluksella</string> <string name="games_runtime_update">Ajoympäristön päivitys saatavilla</string> <string name="games_runtime_ready">● Ajoympäristö valmis</string> <string name="games_internal">Sisäinen tallennustila</string> @@ -1142,6 +1202,9 @@ <string name="gpu_hide_other">Piilota muiden GPU:iden ajurit</string> <string name="gpu_show_other">Näytä muiden GPU:iden ajurit</string> <string name="gpu_advanced">Lisäasetukset</string> + <string name="gpu_ubwc_title">UBWC-yhteensopivuus</string> + <string name="gpu_ubwc_hint">Kokeile Päällä tai Pois, jos Steamissa tai Androidissa näkyy raitoja tai välkyntää. Koskee molempia ajureita DroidDeckin uudelleenkäynnistyksen jälkeen.</string> + <string name="gpu_ubwc_restart">Käynnistä DroidDeck uudelleen, jotta muutos tulee voimaan.</string> <string name="gpu_set_with_display">Asetetaan yhdessä näyttöajurin kanssa: %1$s kattaa molemmat.</string> <string name="gpu_set_with_runtime">Asetetaan yhdessä ajoympäristöajurin kanssa: %1$s kattaa molemmat.</string> <string name="gpu_runtime_hint">Käytetään peleissä ja työpöydällä.</string> @@ -1250,10 +1313,15 @@ <string name="pip_auto">Siirry automaattisesti kuva kuvassa -tilaan</string> <string name="unfolded_controls">Ohjaimet avattuna näytöllä</string> <string name="unfolded_controls_hint">Avattuna peli sijaitsee Steam Deckin kosketuslevyjen ja takakahvojen yläpuolella. Taitettuna peli on koko näytön kokoinen.</string> + <string name="unfolded_controls_with_controller">Pidä ne ohjaimen kanssa</string> + <string name="unfolded_controls_with_controller_hint">Näytä nämä kosketusohjaimet myös, kun ohjain on kytketty.</string> <string name="pip_suspended">Keskeytetty</string> <string name="pip_not_ready">Kuva kuvassa -tila on käytettävissä, kun istunto on valmis.</string> <string name="pip_permission">Salli kuva kuvassa -tila DroidDeckille Android-asetuksissa.</string> <string name="pip_unavailable">Android ei pystynyt avaamaan kuva kuvassa -tilaa.</string> + <string name="game_more">Lisää</string> + <string name="game_edit_art">Muokkaa kuvitusta</string> + <string name="stores_in_steam_label">Steamissa</string> <string name="game_shortcut">Pikakuvake</string> <string name="game_shortcut_add">Lisää aloitusnäytölle</string> <string name="game_shortcut_choose">Valitse peli</string> @@ -1277,6 +1345,10 @@ <string name="main_wait_runtime">Odota, että ajoympäristötoiminto päättyy</string> <string name="main_wait_proton_install">Odota, että yhteensopivuustyökalun asennus päättyy</string> + <string name="load_compat_title">Valmistellaan yhteensopivuustyökaluja</string> + <string name="load_compat_wait">Odotetaan yhteensopivuusasetusten valmistumista</string> + <string name="load_compat_hint">Istuntosi alkaa, kun asennus valmistuu.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Odota, että työpöytäsovelluksen asennus päättyy</string> <string name="main_wait_install_game">Odota, että asennus päättyy ennen pelin käynnistämistä</string> <string name="main_saves_close_session">Sulje Steam-istunto ensin, jotta peli ei voi tallentaa tuonnin päälle</string> @@ -1313,6 +1385,9 @@ <string name="main_install_anyway">Asenna silti</string> <string name="main_remove_runtime_title">Poista Linux-ajoympäristö</string> <string name="main_remove_runtime_text">Tämä poistaa ajoympäristön, siihen asennetun Steam-asiakasohjelman ja kaikki sinne asennetut pelit.</string> + <string name="runtime_actions_title">Linux-ajoympäristö</string> + <string name="runtime_actions_text">Korjaa asentaa ajoympäristön järjestelmätiedostot uudelleen ja säilyttää Steamin, pelisi ja asetuksesi. Lisäosat, kuten työpöytä, asennetaan uudelleen, kun seuraavan kerran käytät niitä. Poista poistaa kaiken.</string> + <string name="runtime_repair">Korjaa ajoympäristö</string> <string name="main_applied">Otettu käyttöön: %1$s</string> <string name="android_app_open_failed_primary">Sovelluksen %1$s avaaminen ensisijaisella näytöllä epäonnistui</string> <string name="android_app_open_failed_on">Sovelluksen %1$s avaaminen näytöllä %2$s epäonnistui</string> @@ -1442,6 +1517,11 @@ <string name="session_runtime_catalog_unreachable">Ajoympäristöluetteloon ei saatu yhteyttä. Tarkista yhteys ja paina Play uudelleen.</string> <string name="session_runtime_install_failed">Linux-ajoympäristö ei asentunut. Tarkista ajoympäristö Asetuksissa ja paina Play uudelleen.</string> <string name="session_desktop_install_failed">Työpöytä ei asentunut (%1$s). Tarkista yhteys ja paina Työpöytä uudelleen.</string> + <string name="session_package_resume_failed">Keskeytynyttä asennusta ei voitu viimeistellä (%1$s). Tarkista yhteys ja vapaa tila ja yritä uudelleen.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux-ajoympäristö on vaurioitunut: %1$d kirjastolinkki osoittaa puuttuvaan tiedostoon (%2$s), yleensä keskeytyneen asennuksen jälkeen. Korjaus säilyttää pelisi ja asetuksesi.</item> + <item quantity="other">Linux-ajoympäristö on vaurioitunut: %1$d kirjastolinkkiä osoittaa puuttuviin tiedostoihin (%2$s ja muita), yleensä keskeytyneen asennuksen jälkeen. Korjaus säilyttää pelisi ja asetuksesi.</item> + </plurals> <string name="session_ended_named">%1$s pysähtyi odottamatta. Jaa lokit virheraportin mukana, tai yritä uudelleen.</string> <string name="session_ended_program">Ohjelma pysähtyi odottamatta. Jaa lokit virheraportin mukana, tai yritä uudelleen.</string> <string name="session_ended_desktop">Työpöytä pysähtyi odottamatta. Jaa lokit virheraportin mukana, tai yritä uudelleen.</string> @@ -1456,6 +1536,13 @@ <string name="mode_decky_plugins_hint">Asenna laajennuksen ZIP-tiedosto seuraavaa Steam-istuntoa varten.</string> <string name="mode_decky_plugin_downloading">Latautuu…</string> <string name="mode_decky_plugin_install_zip">Asenna ZIP-tiedostosta</string> + <string name="decky_zip_warning_title">Kolmannen osapuolen laajennuksen asennus</string> + <string name="decky_zip_warning_text">Decky Loader -tiimi ei ole tarkistanut tätä laajennusta. Se voi sisältää haittaohjelmia, kuten ohjelmia, jotka varastavat Steam-tilisi tai vahingoittavat laitettasi. Asentamalla tämän laajennuksen hyväksyt, että otat kaikki laitteeseesi kohdistuvat riskit.</string> + <string name="decky_zip_warning_continue">Jatka</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Odota %1$d sekunti</item> + <item quantity="other">Odota %1$d sekuntia</item> + </plurals> <string name="store_cat_games">Pelit</string> <string name="store_cat_audio_video">Ääni ja video</string> <string name="store_cat_graphics">Grafiikka</string> @@ -1617,6 +1704,8 @@ <string name="fm_accept">Hyväksy</string> <string name="fm_decline">Hylkää</string> <string name="fm_drive_not_readable">%1$s on liitetty, mutta ei ole luettavissa juuri nyt</string> + <string name="fm_drive_access_title">Salli pääsy kohteeseen %1$s</string> + <string name="fm_drive_access_text">Android antaa DroidDeckin nähdä tämän aseman mutta ei lukea sitä. Ota DroidDeckille käyttöön Pääsy kaikkiin tiedostoihin ja palaa sitten takaisin.</string> <string name="fm_list_view">Luettelonäkymä</string> <string name="fm_grid_view">Ruudukkonäkymä</string> <string name="fm_search">Hae</string> @@ -1688,6 +1777,89 @@ <string name="second_mode_keyboard_trackpad">Näppäimistö + kosketuslevy</string> <string name="second_mode_terminal">Pääte</string> <string name="second_mode_deck_controls">Deck-kahvat + kosketuslevyt</string> + <string name="second_mode_dashboard">Kojelauta</string> + <string name="bottom_dashboard_empty">Täällä ei ole vielä mitään näytettävää.</string> + <string name="bottom_page_downloads">Lataukset</string> + <string name="bottom_downloads_none">Latauksia ei ole käynnissä.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Ladataan sävytinvälimuistia</string> + <string name="bottom_downloads_paused">Keskeytetty</string> + <string name="bottom_downloads_queued">Odottaa alkamista</string> + <string name="bottom_page_notifications">Ilmoitukset</string> + <string name="bottom_notifications_listener">DroidDeckin alanäyttö</string> + <string name="bottom_notifications_why">Näytä viestit ja muut ilmoitukset täällä pelatessasi. Ne näkyvät vain tällä näytöllä, eikä niitä tallenneta. Android kysyy kerran: sen ilmoitusten käyttöoikeussivu avautuu tälle näytölle; kytke DroidDeck siellä päälle, niin tämä sivu palaa itsestään.</string> + <string name="bottom_notifications_allow">Salli ilmoitusten käyttö</string> + <string name="bottom_notifications_none">Ei ilmoituksia.</string> + <string name="bottom_notifications_count">Ilmoituksia: %1$d</string> + <string name="bottom_notifications_clear">Tyhjennä</string> + <string name="bottom_page_screenshots">Kuvakaappaukset</string> + <string name="stats_fps_needs_hud">FPS vaatii HUD:n päälle</string> + <string name="stats_speed">Nopeus</string> + <string name="stats_pedals">Polkimet</string> + <string name="stats_gforce">G-voima</string> + <string name="stats_timing">Ajanotto</string> + <string name="stats_best_lap">Paras kierros</string> + <string name="stats_tires">Renkaat °C</string> + <string name="stats_trace">Kaasu ja jarru, viimeiset 10 s</string> + <string name="stats_speed_chart">Nopeus, %1$s</string> + <string name="stats_gear">Vaihde</string> + <string name="stats_steam_client_arm">Steam-asiakasohjelma ARM</string> + <string name="stats_steam_client_x86">Steam-asiakasohjelma x86</string> + <string name="stats_throttle">Kaasu</string> + <string name="stats_brake">Jarru</string> + <string name="stats_lights">Kojelauta</string> + <string name="stats_lamp_shift">Vaihto</string> + <string name="stats_lamp_handbrake">Käsijarru</string> + <string name="stats_lamp_pit">Varikkorajoitin</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Moottori %1$s °C</string> + <string name="stats_oil_temp">Öljy %1$s °C</string> + <string name="stats_power">Tehonjakaja</string> + <string name="stats_fuel_t">Polttoaine, t</string> + <string name="stats_fuel_main">Päätankki %1$s t</string> + <string name="stats_fuel_reserve">Varatankki %1$s t</string> + <string name="bottom_telemetry_send_title">Lähetä kojelaudan tiedot</string> + <string name="bottom_telemetry_send_auto">Automaattinen</string> + <string name="bottom_telemetry_send_auto_hint">Kytkee sen päälle jokaiselle tässä luetellulle pelille, myös myöhemmin löytyville. Pois kytkemäsi pelit pysyvät pois päältä.</string> + <string name="bottom_telemetry_send_note">Tämä muuttaa pelin omaa datan ulostulon asetusta. Muutos tulee voimaan, kun peli käynnistetään seuraavan kerran; pois kytkeminen palauttaa vanhan asetuksen.</string> + <string name="bottom_telemetry_send_close">Sulje %1$s muuttaaksesi tätä.</string> + <string name="bottom_telemetry_send_failed">Pelin %1$s asetuksia ei voitu muuttaa.</string> + <string name="bottom_telemetry_send_menu">%1$s: kytke pelin asetuksista päälle %2$s IP-osoitteella 127.0.0.1 ja portilla %3$d.</string> + <string name="bottom_shots_where">Tallennetaan kansioon Pictures/DroidDeck. Myös Steamin kuvakaappaukset näkyvät täällä.</string> + <string name="bottom_shots_take">Ota kuvakaappaus</string> + <string name="bottom_shots_saved">Kuvakaappaus tallennettu.</string> + <string name="bottom_shots_failed">Kuvakaappausta ei voitu ottaa.</string> + <string name="bottom_shots_none">Ei vielä kuvakaappauksia.</string> + <string name="bottom_page_chat">Chat & ääni</string> + <string name="bottom_chat_why">Lue Steam-chattia ja vastaa siihen täällä, kun peli jatkuu päänäytöllä. Se käyttää tiliä, jolla Steamiin on kirjauduttu.</string> + <string name="bottom_chat_not_signed_in">Steamilla ei ole vielä jaettavaa verkkokirjautumista, joten kirjaudu tässä kerran.</string> + <string name="bottom_chat_stopped">Android sulki chat-sivun, kun DroidDeck oli taustalla. Se avautuu uudelleen, kun palaat DroidDeckiin.</string> + <string name="bottom_chat_open">Avaa Steam Chat</string> + <string name="bottom_chat_close">Sulje chat</string> + <string name="bottom_chat_mic_on">Mikrofoni päällä</string> + <string name="bottom_chat_mic_off">Mikrofoni pois</string> + <string name="bottom_chat_mic_unavailable">Mikrofoni on pois päältä tässä pelissä. Jos haluat puhua, kytke Mikrofoni päälle DroidDeckin Steam-asetuksissa (Ääni) ja käynnistä peli uudelleen.</string> + <string name="bottom_chat_volume">Äänenvoimakkuus %1$d %%</string> + <string name="bottom_page_telemetry">Pelinsisäiset tilastot</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Akku</string> + <string name="bottom_telemetry_lap">Kierros</string> + <string name="bottom_telemetry_position">Sijoitus</string> + <string name="bottom_telemetry_this_lap">Tämä kierros</string> + <string name="bottom_telemetry_last_lap">Edellinen kierros</string> + <string name="bottom_telemetry_fuel">Polttoaine</string> + <string name="bottom_telemetry_cargo">Lasti</string> + <string name="bottom_telemetry_pips">Tehopisteet SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Oikeudellinen asema</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Portti %1$d vastaanottaa dataa (%2$d pakettia, kukin %3$d tavua), mutta muodossa, jota tämä sivu ei vielä osaa lukea.</string> + <string name="bottom_telemetry_port_busy">Toinen ohjelma käyttää jo porttia %1$s, joten peliä ei voida näyttää täällä.</string> <string name="rtinst_removing">Poistetaan Linux-ajoympäristöä</string> <plurals name="rtinst_removing_entries"> @@ -1718,6 +1890,7 @@ <string name="flatpakmgr_not_ready">Asenna Flatpak ensin</string> <string name="flatpakmgr_starting">Käynnistetään</string> <string name="flatpakmgr_exit_status">Flatpak sulkeutui tilakoodilla %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s on tehty alustalle %2$s, jota DroidDeck ei pysty ajamaan. Flatpak-sovelluksista tarvitaan täällä ARM64- tai x86_64-versio.</string> <string name="flatpakmgr_installing">Asennetaan %1$s</string> <string name="flatpakmgr_updating">Päivitetään %1$s</string> <string name="flatpakmgr_removing">Poistetaan %1$s</string> @@ -1811,6 +1984,7 @@ <string name="adbpair_applying">Otetaan asetusta käyttöön…</string> <string name="adbpair_command_failed">Langattoman virheenkorjauksen komento epäonnistui</string> <string name="adbpair_channel_name">Langattoman virheenkorjauksen käyttöönotto</string> + <string name="adbpair_progress_channel_name">Langattoman virheenkorjauksen käyttöönoton edistyminen</string> <string name="adbpair_channel_description">Kysyy langattoman virheenkorjauksen parituskoodia Asetusten ollessa auki</string> <string name="adbpair_title_pair">Paritä langaton virheenkorjaus</string> <string name="adbpair_waiting_text">Ota langaton virheenkorjaus käyttöön ja napauta ”Yhdistä laite paritunnuksella”.</string> @@ -1919,6 +2093,7 @@ <string name="gpuinfo_not_adreno">Ei Adreno-grafiikkapiiri</string> <string name="gpuinfo_supported">Tuettu</string> <string name="gpuinfo_experimental">Kokeellinen: sen ajurit ovat testiversioita</string> + <string name="gpuinfo_a850_experimental">Kokeellinen Adreno 850 -tuki: vaatii yhteensopivat kokeelliset näyttö- ja peliajurit; ei vahvistettu tällä laitteella</string> <string name="gpuinfo_below_tested">Testatun laitteiston alapuolella (Adreno 725 ja uudemmat): ei välttämättä toimi</string> <string name="gpuinfo_unsupported">Ei tuettu: DroidDeck vaatii Adreno (Snapdragon) -grafiikkapiirin</string> @@ -2015,6 +2190,7 @@ <string name="display_look_filter">%1$s Asettaa skaalauksen tilaan %2$s.</string> <string name="display_match_screen">Sovita näyttöön (%1$d×%2$d)</string> <string name="display_follow_screen">Seuraa näyttöä (koko muuttuu taitettuna tai avattuna)</string> + <string name="display_follow_screen_scaled">Skaalattu %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Näytä laitteen tiedot</string> <string name="device_info_hide">Piilota laitteen tiedot</string> @@ -2121,6 +2297,13 @@ <string name="stores_resume">Jatka</string> <string name="stores_refresh">Päivitä</string> <string name="stores_sort">Järjestä</string> + <string name="setup_rail_labels">Sivupalkin nimikkeet</string> + <string name="setup_rail_labels_hint">Näytä nimet sivupalkin kuvakkeiden alla. Poista käytöstä kapeampaa sivupalkkia varten.</string> + <string name="library_display">Näkymä</string> + <string name="library_display_larger">Suuremmat kortit</string> + <string name="library_display_smaller">Pienemmät kortit</string> + <string name="library_display_title">Näytä nimi</string> + <string name="library_display_size">Näytä koko</string> <string name="stores_sort_last_played">Viimeksi pelatut</string> <string name="stores_sort_recently_installed">Viimeksi asennetut</string> <string name="stores_sort_title_asc">Nimi A–Ö</string> @@ -2247,6 +2430,9 @@ <string name="stores_download_manager">Latausten hallinta</string> <string name="stores_parallel">Samanaikaisia latauksia</string> <string name="stores_install_where">Asenna kohteeseen</string> + <string name="stores_install_language">Pelin kieli</string> + <string name="stores_install_language_hint">GOG ja Epic asentavat tämän kielen. Järjestelmä seuraa sovelluksen kieltä.</string> + <string name="stores_install_language_system">Järjestelmä</string> <string name="stores_install_title">Asenna %1$s:</string> <string name="stores_target_internal">Sisäinen</string> <string name="stores_target_free">%1$s vapaana</string> @@ -2285,6 +2471,9 @@ <string name="edit_target">Kohde</string> <string name="edit_start_in">Käynnistyskansio</string> <string name="edit_launch_options">Käynnistysasetukset</string> + <string name="edit_launch_options_steam_hint">Jaettu Steamin Ominaisuuksien kanssa: muutos jommassakummassa näkyy molemmissa.</string> + <string name="edit_launch_options_not_saved">Käynnistysasetuksia ei voitu tallentaa Steamiin. Yritä uudelleen.</string> + <string name="edit_launch_options_desktop">Steam voi olla auki työpöytäistunnossa. Muuta käynnistysasetuksia sen Ominaisuuksista tai sulje istunto ensin.</string> <string name="edit_artwork">Kuvitus</string> <string name="edit_other_exe">Toinen exe…</string> <string name="edit_remove">Poista</string> @@ -2412,6 +2601,7 @@ <string name="setup_download_source_custom">Oma etuliite</string> <string name="setup_download_mirror">Sivusto</string> <string name="setup_download_prefix">Etuliite</string> + <string name="setup_download_proxy">HTTP-välityspalvelin</string> <string name="flathub_eyebrow">LINUX-SOVELLUKSET</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Työpöytäsovelluksia Linux-työpöydälle, avataan Työpöydältä.</string> @@ -2552,6 +2742,22 @@ <string name="glasses_tracking_flat_hint">Automaattinen pitää tämän 2D-pelin paikallaan näkymässä. Valitse Näyttö-kohdasta Virtuaalinen näyttö, jos haluat käyttää pään seurantaa.</string> <string name="glasses_tracking_sbs_hint">Pään seuranta koskee virtuaalista näyttöä tai käynnissä olevaa SteamVR-peliä.</string> <string name="glasses_hardware">Laite</string> + <string name="vr_controllers_tab">Ohjaimet</string> + <string name="vr_controllers_group">SteamVR-ohjaimet</string> + <string name="vr_controllers_emulate">Peliohjain VR:ssä</string> + <string name="vr_controllers_emulate_hint">Kaksi VR-kättä, joina ohjaimesi toimii. Muutokset tulevat voimaan heti, myös SteamVR:n ollessa käynnissä. Joy-Conit ja seuratut kädet ottavat silti oman puolensa hallintaan.</string> + <string name="vr_controllers_off">Tavallinen peliohjain</string> + <string name="vr_controllers_index">Valve Index -ohjaimet</string> + <string name="vr_controllers_touch">Meta Quest 3 -ohjaimet</string> + <string name="vr_controllers_vive">HTC Vive -ohjaimet</string> + <string name="vr_controllers_sticks">Tikut aloittavat</string> + <string name="vr_controllers_sticks_hint">Vaihda painamalla molemmat tikut yhtä aikaa pohjaan VR:n aikana.</string> + <string name="vr_controllers_sticks_game">Liikuttamalla sinua pelissä</string> + <string name="vr_controllers_sticks_hands">Liikuttamalla käsiä</string> + <string name="vr_controllers_buttons">Painikkeet</string> + <string name="vr_controllers_buttons_stick">Liipaisimet ovat liipaisimia, olkapainikkeet tarttuvat, A/B ja X/Y ovat kummankin käden etupainikkeet, tikkujen painallus painaa peukalotikkuja, Guide avaa SteamVR-valikon. Ristiohjaimen ylös ja alas siirtää käsiä lähemmäs tai kauemmas.</string> + <string name="vr_controllers_buttons_vive">Tikut ovat kosketuslevyjä; A/X tai tikun painallus painaa niitä. Liipaisimet ovat liipaisimia, olkapainikkeet tarttuvat, Start ja Select ovat valikko, Guide avaa SteamVR-valikon.</string> + <string name="vr_controllers_buttons_off">Ei VR-käsiä. Peliohjainta tukevat pelit ja SteamVR-valikko saavat ohjaimesi tavalliseen tapaan.</string> <string name="glasses_brightness">Kirkkaus</string> <string name="glasses_volume">Äänenvoimakkuus</string> <string name="glasses_sunblock">Tummennus</string> @@ -2609,6 +2815,12 @@ <string name="hand_camera_placement">Kameran sijoitus</string> <string name="hand_camera_placement_hint">Tarkista, että kamera näkee sinut ennen pelaamista.</string> <string name="hand_camera_check">Tarkista</string> + <string name="tracking_pack_title">Käsienseurannan lataus</string> + <string name="tracking_pack_hint">Käsienseuranta vaatii kertaluonteisen %1$s:n latauksen.</string> + <string name="tracking_pack_download">Lataa</string> + <string name="tracking_pack_retry">Yritä uudelleen</string> + <string name="tracking_pack_downloading">Ladataan käsienseurantaa… %1$d%%</string> + <string name="tracking_pack_failed">Käsienseurantaa ei voitu ladata. Tarkista yhteys ja yritä uudelleen.</string> <string name="hand_camera_check_title">Kameran sijoitus</string> <string name="hand_camera_how_rear">Aseta laite pystyyn noin rinnan korkeudelle 1,5–2 metrin päähän niin, että takakamera on sinua kohti. Astu sitten näkyviin kädet ojennettuina.</string> <string name="hand_camera_how_front">Aseta laite pystyyn noin rinnan korkeudelle 1,5–2 metrin päähän niin, että näyttö on sinua kohti. Astu sitten näkyviin kädet ojennettuina.</string> @@ -2680,6 +2892,21 @@ <string name="storage_safe_hint">Käyttämättömät ajonaikaympäristöt, jäänteet, vanhat lokit</string> <string name="storage_clean_up">Siivotaan…</string> <string name="storage_session_running">Pysäytä istunto, jos haluat siivota tai poistaa jotain. Koot näkyvät silti.</string> + <string name="storage_default_group">Asennussijainti</string> + <string name="storage_default_title">Oletustallennustila</string> + <string name="storage_default_hint">Uudet kauppa-asennukset menevät valittuun sijaintiin. Nykyiset pelit pysyvät paikoillaan. Steam-kirjastoilla on oma asetuksensa.</string> + <string name="storage_default_ask">Kysy aina</string> + <string name="storage_default_ask_detail">Valitse kohde jokaiselle asennukselle</string> + <string name="storage_default_internal">Sisäinen tallennustila</string> + <string name="storage_default_external">Ulkoinen tallennustila</string> + <string name="storage_default_external_detail">%1$s · %2$s vapaana</string> + <string name="storage_default_external_missing">Ei yhdistetty</string> + <string name="storage_default_folder">Kansio · %1$s</string> + <string name="storage_default_folder_free">%1$s vapaana</string> + <string name="storage_default_folder_missing">Ei yhdistetty</string> + <string name="storage_default_choose_folder">Valitse kansio…</string> + <string name="storage_default_choose_folder_detail">Käytä mitä tahansa kansiota SD-kortilla tai USB-asemalla</string> + <string name="storage_default_note">Pelit tallennetaan valitun sijainnin Games-kansioon. Nykyisiä pelejä ei siirretä.</string> <string name="storage_where">Mihin se menee</string> <string name="storage_games">Steam-pelit</string> <string name="storage_game_data">Pelidata</string> @@ -2801,6 +3028,9 @@ <string name="storage_data_installed">Asennetut pelit</string> <string name="storage_data_parts">Etuliite %1$s · shaderit %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Tyhjennä shaderit</string> + <string name="storage_reset_prefix">Nollaa prefix</string> + <string name="storage_reset_prefix_title">Nollataanko pelin %1$s prefix?</string> + <string name="storage_reset_prefix_confirm">Poistaa sen Wine-prefixin (%1$s) sijainnista %2$s ja luo sen uudelleen seuraavalla käynnistyskerralla. Sen sisällä olevat tallennukset, asetukset ja asennetut uudelleenjaettavat paketit menetetään; Steam Cloud -tallennukset säilyvät tililläsi.</string> <string name="storage_data_leftovers">Poistetut pelit</string> <string name="storage_steam_app">Steam-sovellus %1$d</string> <string name="storage_leftover_unsure_detail">Etuliite sisältää yhä tiedostoja, mahdollisesti paikallisia tallennuksia</string> @@ -3102,6 +3332,117 @@ <string name="spatial_saved_views_hint">Tallennetut näkymät voidaan laskea uudelleen. Aloita uusi kalibrointi kaapataksesi nykyiseen seurantakoordinaattijärjestelmään.</string> <string name="spatial_model_checksum_error">Käsimallin tarkistussumman epäsuhta</string> <string name="spatial_opencv_load_error">OpenCV:tä ei voitu ladata</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synkronoi Syncthingillä</string> + <string name="sync_enable_hint">Tämä Syncthing-Forkiin perustuva Syncthing-toteutus synkronoi DroidDeckin sisäisen tiedostojärjestelmän tiedostoja muiden Syncthing-instanssien kanssa. Se koskee vain tiedostoja, joita säilytät DroidDeckin sisäisessä tiedostojärjestelmässä.</string> + <string name="sync_missing">Tämä versio ei sisällä Syncthingiä.</string> + <string name="sync_starting">Käynnistetään Syncthingiä</string> + <string name="sync_status_starting">Käynnistyy</string> + <string name="sync_status_up_to_date">Ajan tasalla</string> + <string name="sync_status_syncing">Synkronoidaan</string> + <string name="sync_status_paused">Keskeytetty</string> + <string name="sync_status_pausing">Keskeytetään</string> + <string name="sync_status_resuming">Jatketaan</string> + <string name="sync_status_attention">Vaatii huomiota</string> + <string name="sync_status_failed">Syncthing pysähtyi</string> + <string name="sync_failed_retry">Yritä uudelleen</string> + <string name="sync_paused_wifi">Keskeytetty, kunnes Wi-Fi on käytettävissä</string> + <string name="sync_paused_game">Keskeytetty pelin ajaksi</string> + <string name="sync_summary">Kansioita %1$d · %2$d/%3$d laitetta yhdistetty</string> + <string name="sync_left">%1$s jäljellä</string> + <string name="sync_open_web_ui">Avaa web-käyttöliittymä</string> + <string name="sync_pause">Keskeytä</string> + <string name="sync_resume">Jatka</string> + <string name="sync_running">Käynnissä</string> + <string name="sync_running_hint">Poista käytöstä pysäyttääksesi Syncthingin kokonaan.</string> + <string name="sync_this_device">Tämä laite</string> + <string name="sync_device_id">Laitteen tunniste</string> + <string name="sync_show_qr">Näytä QR-koodi</string> + <string name="sync_advanced">Lisäasetukset</string> + <string name="sync_advanced_hint">Portit, milloin ajetaan, nollaus</string> + <string name="sync_open">Avaa</string> + <string name="sync_waiting">Odottaa sinua</string> + <string name="sync_pending_device">%1$s haluaa muodostaa yhteyden</string> + <string name="sync_pending_folder">%1$s haluaa jakaa kansion “%2$s”</string> + <string name="sync_pending_folder_hint">Hyväksy ja valitse, mihin se tallennetaan DroidDeckissä.</string> + <string name="sync_review">Tarkista web-käyttöliittymässä</string> + <string name="sync_folders">Kansiot</string> + <string name="sync_no_folders">Ei vielä kansioita.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Ajan tasalla</string> + <string name="sync_folder_syncing">Synkronoidaan %1$d %%</string> + <string name="sync_folder_scanning">Skannataan</string> + <string name="sync_folder_paused">Keskeytetty</string> + <string name="sync_folder_out_of_sync">Ei synkronoitu</string> + <string name="sync_folder_errors">%1$d tiedostoa ei voitu synkronoida</string> + <string name="sync_folder_blocked">Estetty</string> + <string name="sync_folder_blocked_hint">Tämä kansio on DroidDeckin tallennustilan ulkopuolella, joten DroidDeck keskeytti sen. Käytä Syncthing-Fork-sovellusta DroidDeckin ulkopuolisten kansioiden synkronointiin.</string> + <string name="sync_remove_folder">Poista Syncthingistä</string> + <string name="sync_remove_folder_hint">Poistaminen ei poista yhtään tiedostoa.</string> + <string name="sync_devices">Laitteet</string> + <string name="sync_no_devices">Ei vielä laitteita.</string> + <string name="sync_connected">Yhdistetty</string> + <string name="sync_offline">Offline-tilassa</string> + <string name="sync_last_seen">Viimeksi nähty %1$s</string> + <string name="sync_device_id_title">Tämän laitteen tunniste</string> + <string name="sync_device_id_hint">Lisää toisella laitteellasi laite Syncthingissä ja skannaa tämä koodi tai liitä tunniste. Hyväksy se sitten täällä web-käyttöliittymässä.</string> + <string name="sync_copy">Kopioi</string> + <string name="sync_share">Jaa</string> + <string name="sync_done">Valmis</string> + <string name="sync_off_title">Poistetaanko Syncthing käytöstä?</string> + <string name="sync_off_body">Syncthing pysähtyy nyt ja pysyy pysäytettynä, kunnes otat sen uudelleen käyttöön. Synkronoidut tiedostot pysyvät paikoillaan.</string> + <string name="sync_off_forget">Poista myös Syncthingin asetukset</string> + <string name="sync_off_forget_hint">Poistaa tämän laitteen tunnisteen, kansiot ja laitteet. Kun otat sen uudelleen käyttöön, se aloittaa alusta.</string> + <string name="sync_turn_off">Poista käytöstä</string> + <string name="sync_ports">Portit</string> + <string name="sync_port_sync">Synkronointi</string> + <string name="sync_port_discovery">Paikallinen etsintä</string> + <string name="sync_repick">Valitse uudet portit</string> + <string name="sync_repick_hint">Tarkistetaan uudelleen joka käynnistyksessä.</string> + <string name="sync_repick_button">Valitse uudelleen</string> + <string name="sync_reset_group">Nollaus</string> + <string name="sync_api_key">API-avain</string> + <string name="sync_regenerate">Luo uudelleen</string> + <string name="sync_reset">Nollaa Syncthing</string> + <string name="sync_reset_hint">Uusi laitteen tunniste, kansiot ja laitteet poistetaan. DroidDeckin tallennustilan tiedostot säilytetään.</string> + <string name="sync_reset_button">Nollaa</string> + <string name="sync_reset_confirm_title">Nollataanko Syncthing?</string> + <string name="sync_running_group">Suoritus</string> + <string name="sync_run">Käynnissä</string> + <string name="sync_run_open">Kun DroidDeck on auki</string> + <string name="sync_run_background">Taustalla</string> + <string name="sync_wifi_only">Vain Wi-Fi</string> + <string name="sync_pause_games">Keskeytä pelien ajaksi</string> + <string name="sync_logs">Lokit</string> + <string name="sync_logs_hint">Syncthingin tuloste tältä istunnolta</string> + <string name="sync_logs_share">Jaa</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Asenna Linux-ajoympäristö ensin.</string> + <string name="sync_accept">Hyväksy</string> + <string name="sync_accept_title">Tallenna “%1$s” kohteeseen</string> + <string name="sync_add_folder">Lisää kansio</string> + <string name="sync_add_folder_hint">Synkronoi kansio DroidDeckin tallennustilasta</string> + <string name="sync_choose">Valitse</string> + <string name="sync_add">Lisää</string> + <string name="sync_add_failed">Kansiota ei voitu lisätä.</string> + <string name="sync_share_with">Jaa laitteille</string> + <string name="sync_share_none">Ei vielä laitteita. Voit jakaa tämän kansion myöhemmin web-käyttöliittymästä.</string> + <string name="sync_use_folder">Käytä tätä kansiota</string> + <string name="sync_new_folder">Uusi kansio</string> + <string name="sync_location_home">Kontin kotikansio</string> + <string name="sync_location_sync">Sync-kansio</string> + <string name="sync_location_shared">DroidDeckin jaettu tallennustila</string> + <string name="sync_location_card">DroidDeck kohteessa %1$s</string> + <string name="sync_location_app">DroidDeckin sovellustiedot</string> + <string name="sync_web_path_locked">Uudet kansiot tallennetaan DroidDeckin Sync-kansioon. Jos haluat synkronoida toisen DroidDeck-kansion, käytä Syncthing-välilehden Lisää kansio -toimintoa.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Lataa uudelleen</string> + <string name="sync_not_running">Syncthing ei ole käynnissä.</string> + <string name="session_end_steam_sigill">Steam pysähtyi virheelliseen käskyyn (SIGILL). Syynä voi olla CPU-käskyjen yhteensopivuusongelma tai asiakasohjelman kaatuminen. Jaa lokit ja laitteesi tiedot.</string> + <string name="session_end_steam_try_x64">Voit kokeilla Steam-asetukset → Steam-asiakasohjelma → x86-64 (kokeellinen). Se vaatii lisälatauksen ja voi toimia hitaammin.</string> + <string name="session_end_vulkan_device">Linux-grafiikka-ajuri ei löytänyt käyttökelpoista Vulkan-laitetta. Tarkista, että valittu Linux-GPU-ajuri tukee tätä GPU:ta.</string> + <string name="session_end_gpu_unsupported">Tätä istuntoa ei voi käynnistää, koska tälle GPU:lle ei ole yhteensopivaa Linux Vulkan -ajuria nykyisissä asetuksissa. Adreno Turnip -ajurit eivät voi tuoda tukea MediaTek/Mali-GPU:ille.</string> <string name="setup_group_memory">Muisti</string> <string name="setup_clear_cached">Sulje välimuistissa olevat sovellukset ennen istuntoa</string> <string name="setup_clear_cached_hint">Kun istunto alkaa, DroidDeck sulkee sovellukset, joita Android pitää taustalla, jotta pelillä on enemmän muistia. Langattoman virheenkorjauksen on oltava päällä.</string> @@ -3125,6 +3466,12 @@ <string name="epic_client_open">Avaa</string> <string name="epic_client_install">Asenna</string> <string name="game_tab_about">Tietoja</string> + <string name="game_resources_browser">Avautuu selaimessa</string> + <string name="game_resource_guides">Oppaat</string> + <string name="game_resource_protondb_detail">Linux / Proton -yhteensopivuusraportit</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Peleille, joiden tallennukset ovat Steam-tililläsi</string> + <string name="game_resource_search">Verkkohaku</string> <string name="game_tab_install">Asenna</string> <string name="game_install_location">Sijainti</string> <string name="game_install_folder">Kansio</string> @@ -3141,6 +3488,11 @@ <string name="stores_eyebrow_pass">saatavilla palvelussa %1$s</string> <string name="stores_owned_in_library">Omistetut pelit kirjastossa</string> <string name="library_filter_added">Lisätyt</string> + <string name="library_filter">Suodatin</string> + <string name="library_filter_installed">Vain asennetut</string> + <string name="library_filter_all_owned">Kaikki omistetut pelit</string> + <string name="library_no_installed_matches">Mikään asennettu peli ei vastaa näitä suodattimia.</string> + <string name="library_browse_owned">Selaa omistettuja pelejä</string> <string name="game_tab_launch">Käynnistys</string> <string name="game_tab_saves_cloud">Tallennukset ja pilvi</string> <string name="game_launch_shortcut">Steam-pikakuvake</string> @@ -3158,6 +3510,40 @@ <string name="stores_itch_update_replaced">Kehittäjä korvasi tämän version tiedostolla %1$s. Päivitetäänkö siihen?</string> <string name="xbox_filter_cloud">Pilvi</string> <string name="stores_xbox_cloud_settings">Pilviasetukset</string> + <string name="integration_title">Steam-integraatio</string> + <string name="integration_count">%1$d/%2$d päällä</string> + <string name="integration_set_up">Määritä</string> + <string name="integration_location">Sijainti</string> + <string name="integration_app_info">Sovelluksen tiedot</string> + <string name="integration_wifi">Wi-Fi-nimet</string> + <string name="integration_brightness">Kirkkaus</string> + <string name="integration_home">DroidDeck aloitusnäyttönä</string> + <string name="integration_shortcuts">Järjestelmänäppäimet</string> + <string name="integration_wifi_hint">Näytä verkot Steamissa · vaatii sijaintiluvan, ei koskaan seurata</string> + <string name="integration_wifi_on">Verkot näkyvät Steamissa</string> + <string name="integration_wifi_location_off">Sijainti on pois päältä</string> + <string name="integration_wifi_denied">Sijainti estetty · salli se Sovelluksen tiedoissa</string> + <string name="integration_brightness_hint">Steamin liukusäädin säätää näytön kirkkautta</string> + <string name="integration_home_hint">Koti avaa Steam-valikon istunnossa</string> + <string name="integration_shortcuts_hint">Alt+Tab, Win-näppäin ja Koti-painike pysyvät istunnossa</string> + <string name="integration_shortcuts_maybe_restricted">Harmaana Androidissa? Sovelluksen tiedot → ⋮ → Salli rajoitetut asetukset</string> + <string name="integration_shortcuts_restricted">Androidin estämä · Sovelluksen tiedot → ⋮ → Salli rajoitetut asetukset</string> + <string name="integration_shortcuts_service">DroidDeckin järjestelmänäppäimet</string> + <string name="integration_shortcuts_service_description">Pitää Alt+Tabin, Win-näppäimen ja Koti-painikkeen aktiivisessa DroidDeck-istunnossa Androidin sijaan.</string> + <string name="integration_brightness_needed">Ota Kirkkaus käyttöön kohdassa Käyttöönotto → Steam-integraatio</string> + <string name="setup_gpu_bridge_off">Mali-silta: pois</string> + <string name="setup_gpu_bridge_on">Mali-silta: päällä</string> + <string name="setup_gpu_bridge_detail">%1$s ei ole Adreno. Kokeellinen Vulkan-silta on päällä: istunto piirtää puhelimen oman ajurin kautta. Odota virheitä; lähetä istunnon lokit.</string> + <string name="setup_bridge_safe">Turvatila</string> + <string name="setup_bridge_safe_on">Turvatila: päällä</string> + <string name="setup_bridge_safe_off">Turvatila: pois</string> + <string name="setup_bridge_safe_on_detail">Yhteensopivin. Suositellaan uudelle laitteelle.</string> + <string name="setup_bridge_safe_off_detail">Nopeampi siellä, missä tämä GPU läpäisi tarkistuksensa.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automaattinen</string> + <string name="setup_bridge_dxvk_proton">DXVK: Protonin oma</string> + <string name="setup_bridge_dxvk_auto_detail">Käyttää vanhempaa DXVK:ta, kun tämän GPU:n Vulkan on liian vanha Protonin omalle.</string> + <string name="setup_bridge_dxvk_proton_detail">Jokainen Proton pitää oman DXVK:nsa, vaikka tämän GPU:n Vulkan voi olla sille liian vanha.</string> <string name="apps_search_hint">Hae sovelluksia</string> <string name="apps_no_match">Mikään sovellus ei vastaa hakua ”%1$s”.</string> <string name="apps_add_widget">Lisää widget</string> @@ -3206,6 +3592,8 @@ <string name="desktop_restore_done_body">Lisäämäsi sovellukset on asennettu uudelleen.</string> <string name="desktop_restore_failed_title">Joitakin ohjelmistoja ei voitu palauttaa</string> <string name="desktop_restore_failed_body">Katso ~/.cache/droiddeck/apt-restore.log ja kokeile sitten sudo apt install Konsolessa.</string> + <string name="gog_full_files">Natiivit optimoinnit eivät ole käytettävissä. Lataus sisältää kokonaiset korvaavat tiedostot.</string> + <string name="gog_recover">Tarkista päivityksen tulos</string> <string name="slow_usb_title">Hidas USB-yhteys</string> <string name="slow_usb_cable">%1$s on yhdistetty %2$s-yhteydellä (%3$s Mbps, noin %4$d Mt/s), joten pelit latautuvat hitaasti. Käytä vähintään 5 Gbps:n USB 3 -kaapelia, kokeile kääntää USB-C-liitin tai käytä nopeampaa asemaa.</string> <string name="slow_usb_port">%1$s on yhdistetty %2$s-yhteydellä (%3$s Mbps, noin %4$d Mt/s). Tämän laitteen USB-portti ei ole nopeampi, joten pelit latautuvat hitaasti. Sisäinen tallennustila tai microSD-kortti voi olla nopeampi.</string> @@ -3216,4 +3604,52 @@ <string name="steam_import_names_more">%1$s ja %2$d muuta</string> <string name="steam_import_now">Käynnistä uudelleen nyt</string> <string name="steam_import_later">Myöhemmin</string> + <string name="gog_maintenance">Hallitse GOG-asennusta</string> + <string name="gog_check">Tarkista päivitykset</string> + <string name="gog_repair">Tarkista/korjaa</string> + <string name="gog_patches">Offline-korjauspäivitykset</string> + <string name="gog_refresh">Lataa täysi offline-asennusohjelma</string> + <string name="gog_update">Päivitä versioon %1$s</string> + <string name="gog_resume">Jatka GOG-ylläpitoa</string> + <string name="gog_open_patch">Avaa päivityksen asennusohjelma</string> + <string name="gog_patch_in_session">Viimeistele tai peruuta päivityksen asennusohjelma Linux-istunnossa.</string> + <string name="gog_patch_requirements">Valitse päivitys asennetulle versiollesi ja kielellesi. Tuettuja lähdeversioita ei välttämättä ole lueteltu.</string> + <string name="gog_no_patches">GOG:lla ei ole tälle pelille erillisiä Windows-päivityksiä.</string> + <string name="gog_managed_files">Muokatut pelitiedostot voidaan korvata.</string> + <string name="gog_patch_installer_note">Asennusohjelma avautuu Linux-istunnossasi.</string> + <string name="gog_download_label">Lataus</string> + <string name="gog_space_label">Lisätila</string> + <string name="gog_space_estimate_label">Tila-arvio</string> + <string name="gog_repair_action">Korjaa tiedostot</string> + <string name="gog_refresh_action">Päivitä asennus</string> + <string name="gog_select_patch">Valitse</string> + <string name="stores_gamejolt_not_owned">Ei Game Jolt-kirjastossasi</string> + <string name="stores_gamejolt_no_build">Ei Windows-latausta tälle pelille</string> + <string name="stores_gamejolt_no_exe">Latauksesta ei löytynyt Windows-peliä</string> + <string name="stores_gamejolt_no_game">Peliä ei löytynyt Game Joltista</string> + <string name="stores_gamejolt_browse_failed">Pelien lataaminen Game Joltista epäonnistui</string> + <string name="stores_gamejolt_download_failed">Game Jolt vastasi HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Latausten haku Game Joltista epäonnistui</string> + <string name="stores_gamejolt_build_open">Avaa Game Joltissa</string> + <string name="stores_gamejolt_archive">%1$s-arkistot eivät ole tuettuja</string> + <string name="stores_gamejolt_extract_failed">Latausta ei voitu purkaa (koodi %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Joltiin ei saatu yhteyttä</string> + <string name="stores_gamejolt_download_no_link">Game Jolt ei antanut latauslinkkiä</string> + <string name="stores_gamejolt_section_featured">Esittelyssä</string> + <string name="stores_gamejolt_section_hot">Kuumat</string> + <string name="stores_gamejolt_section_best">Parhaat</string> + <string name="stores_gamejolt_section_new">Uudet</string> + <string name="stores_gamejolt_price_under_30">30 $ tai alle</string> + <string name="stores_gamejolt_os_other">Muu</string> + <string name="stores_gamejolt_maturity_everyone">Kaikenikäisille</string> + <string name="stores_gamejolt_maturity_teen">Nuoret</string> + <string name="stores_gamejolt_maturity_adult">Aikuiset</string> + <string name="stores_gamejolt_status_complete">Valmis</string> + <string name="stores_gamejolt_status_early">Ennakkojulkaisu</string> + <string name="stores_gamejolt_partners">Kumppanien pelit</string> + <string name="stores_gamejolt_filter_browser">Selain</string> + <string name="stores_gamejolt_filter_maturity">Ikärajat</string> + <string name="stores_gamejolt_filter_status">Tila</string> + <string name="stores_gamejolt_filter_partners">Kumppanit</string> + <string name="stores_gamejolt_followed">Seuratut pelit</string> </resources> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f1f2f9ea74..3c3a65ebf9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Options VKD3D pour D3D12. nodxr désactive le ray tracing ; à utiliser uniquement si le jeu le nécessite.</string> <string name="game_env_proton_log">Définir sur 1 pour générer un journal de diagnostic Proton. La journalisation peut réduire les performances et consommer de l\'espace de stockage.</string> <string name="game_env_wined3d">Définir sur 1 pour utiliser WineD3D (basé sur OpenGL) au lieu de DXVK, pour tester la compatibilité D3D9–11.</string> + <string name="game_env_wined3d_renderer">Moteur de rendu pour DirectDraw, Direct3D 1-7 et les jeux exécutés avec WineD3D. Vulkan évite le chemin OpenGL-sur-Zink et est bien plus rapide pour les anciens jeux DirectDraw et Direct3D 7 sur Adreno.</string> + <string name="game_env_dxvk_d3d8">Définir sur 1 pour exécuter Direct3D 8 via DXVK au lieu de WineD3D. Plus rapide dans le test Direct3D 8 d\'AIO Graphics Test sur Adreno.</string> <string name="game_env_no_ntsync">Définir sur 1 pour que ce jeu n\'utilise pas ntsync (droiddeck-ntsync ou un pilote du noyau) ; il utilise droiddeck-esync si un pack existe, sinon droiddeck-fsync.</string> <string name="game_env_no_esync">Définir sur 1 pour désactiver droiddeck-esync pour ce jeu ; il utilise alors droiddeck-fsync, ou droiddeck-ntsync si fsync est aussi désactivé.</string> <string name="game_env_no_fsync">Définir sur 1 pour que ce jeu n\'utilise pas droiddeck-fsync ; il utilise droiddeck-esync si un pack existe, sinon droiddeck-ntsync.</string> <string name="game_env_fsync_first">Définir sur 1 pour exécuter ce jeu avec droiddeck-fsync, ou sur 0 pour donner la priorité à droiddeck-esync si un pack correspond à son Proton.</string> <string name="game_env_xalia">Définir sur 0 pour désactiver l\'assistant de navigation à la manette de Proton pour ce jeu.</string> + <string name="game_env_anticheat_offline">Activé par défaut. Démarre un jeu Easy Anti-Cheat sans son anti-triche lorsque le jeu permet de jouer hors ligne. Désactivez pour lancer via Easy Anti-Cheat comme d\'habitude. Les modes en ligne qui exigent Easy Anti-Cheat restent indisponibles.</string> <string name="game_env_hud">Superposition DXVK pour D3D9–11. fps affiche le taux de rafraîchissement ; annuler la définition masque la superposition.</string> <string name="game_env_dxvk_config">Paramètres DXVK séparés par des points-virgules. Les versions récentes utilisent dxvk.maxFrameRate pour limiter le taux de rafraîchissement ; pour un jeu quotidien, il est recommandé d\'utiliser le limiteur de taux de rafraîchissement de session.</string> + <string name="game_env_cores">Cœurs CPU pour ce jeu, par exemple 0-4 ou 0,2,4, à la place des cœurs de jeu de la session. Moins de cœurs, moins de chaleur.</string> <string name="game_env_vkd3d_limit">Limite de taux de rafraîchissement D3D12. 0 désactive la limite.</string> <string name="game_env_glthread">Mesa OpenGL multithread. Pour les jeux OpenGL limités par le CPU, true peut aider ; à tester jeu par jeu.</string> <string name="sync_backend_title">Synchronisation Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX exécute des programmes Linux x86 sur cet appareil ARM64. En mode Auto, il est utilisé lorsque le programme est conçu pour x86.</string> <string name="app_fex_x86">%1$s via FEX</string> <string name="app_fex_not_ready">Ce programme est conçu pour les PC %1$s et s\'exécute via FEX, qui n\'est pas encore configuré. Ouvrez Steam une fois en étant connecté : DroidDeck lui fait télécharger FEX et le Steam Linux Runtime nécessaires, puis ce programme s\'ouvre.</string> + <string name="session_proot_missing">Impossible de télécharger le proot de DroidDeck. Vérifiez la connexion et réessayez. La session n\'a pas été démarrée, car le proot de secours est trop lent pour jouer.</string> + <string name="session_directaudio_missing">Impossible de télécharger DirectAudio ; l\'audio des jeux utilise le chemin plus lent pour cette session.</string> <string name="session_end_program">Ce programme</string> <string name="session_end_steam_download">Impossible de télécharger le client Steam. Votre réseau ou votre VPN bloque peut-être les serveurs de Steam ; vérifiez la connexion et réessayez.</string> <string name="session_end_steam_setup">Impossible de configurer le client Steam. Vérifiez la connexion et l\'espace libre, puis réessayez.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Manette Xbox 360</string> <string name="mode_controller_note">Deck : bouton d\'accès rapide et gyroscope. Steam Controller : idem, avec détection de la prise en main sur les boutons arrière. DualShock 4 et DualSense : gyroscope, et les trackpads servent de pavé tactile. Xbox 360 : utilisez Guide+A pour ouvrir l\'accès rapide.</string> <string name="mode_back">Retour</string> + <string name="back_hold">Maintenir Retour pour les raccourcis Steam</string> + <string name="back_hold_hint">Maintenir Retour ouvre l’accès rapide ou crée des combinaisons Steam avec d’autres boutons. Désactivez pour ignorer l’appui long ; l’appui simple et double fonctionnent toujours.</string> + <string name="back_native_qam_hint">Maintenez Retour pendant 700 ms, ou maintenez Retour et appuyez sur un autre bouton pour les raccourcis Steam.</string> + <string name="back_double_tap_window">Délai du double appui</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Autoriser le contrôle de la luminosité</string> + <string name="brightness_permission_text">Configurez le contrôle de la luminosité dans DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Session</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Retarde la mise en pause en arrière-plan tant que Steam télécharge.</string> <string name="mode_suspend_note">Le mode automatique met en pause en arrière-plan et reprend à l\'affichage. Le mode manuel nécessite d\'appuyer sur « Reprendre ». Ne reste jamais en cours d\'exécution.</string> <string name="mode_startup">Démarrage</string> - <string name="mode_steam_startup">Lancer Steam à l\'ouverture de DroidDeck</string> - <string name="mode_steam_startup_hint">Ouvre une session Steam au démarrage de DroidDeck.</string> + <string name="mode_startup_session">Ouvrir au démarrage</string> + <string name="mode_startup_session_hint">Lance cette session au démarrage de DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Vérification des versions…</string> <string name="mode_decky_ready">Prêt à installer %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">À jour · %1$s</string> <string name="mode_decky_loader">Chargeur</string> <string name="mode_decky_install_latest">Installer la dernière version</string> + <string name="decky_channel">Canal de mise à jour</string> + <string name="decky_channel_hint">Les versions de Decky Loader à installer. Le programme de mise à jour de Decky utilise le même canal.</string> + <string name="decky_channel_stable">Stable</string> + <string name="decky_channel_prerelease">Préversion</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Impossible d\'enregistrer le canal de mise à jour de Decky</string> <string name="mode_decky_on">Démarre avec Steam. Une fois activé, d\'autres applications sur cet appareil peuvent contrôler Steam.</string> <string name="mode_decky_off">Désactivé. Le port de débogage distant de Steam reste fermé.</string> <string name="mode_decky_remove_title">Désinstaller Decky Loader ?</string> @@ -325,6 +344,8 @@ <string name="mode_mangoapp_hint">Désactivez cette option si les jeux plantent ou affichent un écran noir en mode Deck. Prendra effet à la prochaine session.</string> <string name="mode_return_after_game">Revenir à DroidDeck après un jeu</string> <string name="mode_return_after_game_hint">Quand un jeu lancé depuis DroidDeck ou un autre lanceur se ferme, Steam se ferme proprement (après la synchronisation des sauvegardes cloud) et vous y revenez. Désactivé : vous restez dans Steam.</string> + <string name="mode_shader_precache">Pré-mise en cache des shaders</string> + <string name="mode_shader_precache_hint">Steam télécharge des shaders précompilés pour vos jeux et les traite en arrière-plan, pour moins de saccades. Désactivé, vous économisez données, stockage et batterie ; les jeux compilent alors leurs shaders en cours de partie. Même paramètre que Téléchargements > Pré-mise en cache des shaders dans Steam. Prendra effet à la prochaine session.</string> <string name="mode_steam_repair">Réparer le client Steam</string> <string name="mode_steam_repair_hint">Retélécharge le client Steam au prochain démarrage de Steam. Utile si Steam reste bloqué sur son écran de chargement. Les jeux, la connexion et les paramètres sont conservés.</string> <string name="mode_steam_repair_queued">Le client Steam sera retéléchargé au prochain démarrage de Steam.</string> @@ -393,6 +414,8 @@ <string name="mode_directaudio_hint">Contourne PulseAudio pour réduire la latence.</string> <string name="mode_mic">Microphone</string> <string name="mode_mic_hint">Utilisé pour le chat vocal.</string> + <string name="drawer_mic_hint">Activer ou désactiver la capture du microphone pour cette session.</string> + <string name="drawer_mic_failed">Impossible de modifier le microphone. Veuillez réessayer.</string> <string name="mode_network">Réseau</string> <string name="mode_wifi_discovery">Découverte Wi-Fi</string> <string name="mode_wifi_discovery_hint">Affiche les noms Wi-Fi et les réseaux à proximité dans Steam.</string> @@ -555,6 +578,16 @@ <string name="perf_gsrealtime">gamescope : file d\'attente GPU temps réel</string> <string name="perf_gsrealtime_hint">Augmente la priorité du travail GPU du compositeur. Peut améliorer la stabilité du temps de frame, mais consomme une partie des performances du jeu.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Mémoire</string> + <string name="perf_cap_off">Désactivé</string> + <string name="perf_cap_auto">Valeur par défaut du pilote</string> + <string name="perf_zram_client">Compresser Steam pendant un jeu</string> + <string name="perf_zram_client_hint">20 s après le démarrage d\'un jeu, le client Steam est compressé dans zRAM pour laisser plus de mémoire au jeu, puis relu à la fermeture du jeu. Désactivez cette option si la session se ferme peu après le démarrage des jeux. Une limite de RAM ci-dessus compresse toujours Steam lorsque la session la dépasse.</string> + <string name="perf_ram_cap">Limite de RAM</string> + <string name="perf_ram_cap_hint">S\'applique tant que le client Steam fonctionne, en mode Steam ou depuis le bureau. Lorsque la session dépasse cette valeur, Steam puis les autres processus pris en charge de la session sont compressés dans zRAM. Limite souple : rien n\'est fermé, mais les jeux peuvent saccader pendant le rechargement des pages.</string> + <string name="perf_ram_cap_unavailable">Nécessite un swap zRAM, dont cet appareil ne dispose pas.</string> + <string name="perf_vram_cap">Limite de VRAM</string> + <string name="perf_vram_cap_hint">La mémoire vidéo que DXVK signale aux jeux Direct3D, pour qu\'ils prévoient moins de textures. Les paramètres DXVK propres à un jeu restent prioritaires. Prendra effet à la prochaine session.</string> <string name="perf_gpuclock">Maintenir le GPU à sa fréquence maximale</string> <string name="perf_gpuclock_hint">Uniquement pour Adreno. Moins de saccades, mais plus de consommation d\'énergie et de chaleur.</string> <string name="perf_fixes">Correctifs de session</string> @@ -573,6 +606,8 @@ <string name="perf_fastpath">Chemin rapide proot</string> <string name="perf_fastpath_needs_seccomp">Nécessite le filtre seccomp de proot.</string> <string name="perf_fastpath_hint">Recherche de fichiers plus rapide, moins de saccades. Désactivez cette option si un programme ne trouve pas ses fichiers.</string> + <string name="perf_cursor_composite">Dessiner le curseur dans gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope dessine lui-même le pointeur au lieu de le confier à Android. Activez pour un curseur piloté à la manette. Désactivé, c\'est plus rapide sur un téléphone. Prendra effet à la prochaine session.</string> <string name="perf_identity">Identité de la session</string> <string name="perf_hostname">Nom d\'hôte</string> <string name="perf_hostname_hint">Le nom sous lequel Steam voit cet appareil. Laisser vide pour restaurer %1$s.</string> @@ -587,6 +622,8 @@ <string name="driver_delete_plain">Ses fichiers seront supprimés de l\'application.</string> <string name="driver_delete_in_use">Ses fichiers seront supprimés. Comme il est en cours d\'utilisation, le pilote par défaut sera utilisé à la place.</string> <string name="drawer_page_display">Affichage</string> + <string name="drawer_frame_limit">Limite d\'images</string> + <string name="drawer_frame_limit_note">Limite ce jeu. L\'écran passe à une fréquence de rafraîchissement multiple de la limite lorsqu\'il en propose une ; les autres limites peuvent paraître irrégulières. Les jeux Steam utilisent la limite d\'images de Steam dans le menu d\'accès rapide.</string> <string name="drawer_page_effects">Effets</string> <string name="drawer_page_controls">Contrôles</string> <string name="drawer_page_components">Composants</string> @@ -618,8 +655,11 @@ <string name="hud_size_pill">Pilule</string> <string name="hud_size_minimal">Minimal</string> <string name="hud_size_mega">Méga</string> + <string name="hud_size_strip">Bandeau</string> <string name="hud_locked">Verrouiller la position</string> <string name="hud_locked_hint">Faites glisser le HUD pour le déplacer ; un appui long le verrouille ou le déverrouille. Tant qu\'il est verrouillé, les commandes à l\'écran situées dessous restent utilisables.</string> + <string name="hud_snap">Aimanter sur les côtés</string> + <string name="hud_snap_hint">Relâchez le HUD et il rejoint le côté de l’écran le plus proche. Un geste rapide le lance dans cette direction.</string> <string name="hud_group_look">Apparence</string> <string name="hud_scale">Taille à l\'écran</string> <string name="hud_color_soft">Douce</string> @@ -668,7 +708,6 @@ <string name="hud_export_failed">Impossible d\'enregistrer le rapport du HUD.</string> <string name="hud_reset">Réinitialiser les paramètres du HUD</string> <string name="hud_reset_button">Réinitialiser</string> - <string name="hud_credit">FusionHUD par The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Mode de mise à l\'échelle</string> <string name="drawer_scaling_sharpness">Netteté de la mise à l\'échelle</string> <string name="drawer_effects">Effets d\'écran</string> @@ -703,11 +742,17 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Clavier</string> <string name="drawer_latency">Latence</string> + <string name="drawer_low_latency">Mode faible latence</string> + <string name="drawer_low_latency_hint">Augmente l\'utilisation du CPU et de la batterie</string> <string name="drawer_low_latency_controller">Manette à faible latence</string> <string name="drawer_low_latency_controller_hint">La manette émet à 1000 Hz au lieu de 250 Hz. Un peu plus de CPU.</string> <string name="drawer_low_latency_touch">Tactile à faible latence</string> <string name="drawer_low_latency_touch_hint">Les touchers ignorent le regroupement d\'images ; les commandes tactiles Steam passent à 1000 Hz. Un peu plus de CPU.</string> <string name="drawer_evdev_mouse">Canal souris brut</string> + <string name="drawer_relative_mouse">Souris relative</string> + <string name="drawer_relative_mouse_auto">Automatique</string> + <string name="drawer_relative_mouse_on">Activé</string> + <string name="drawer_relative_mouse_off">Désactivé</string> <string name="drawer_direct_cursor">Curseur</string> <string name="drawer_pc_keyboard">Clavier PC</string> <string name="drawer_android_keyboard">Android</string> @@ -796,6 +841,10 @@ <string name="setup_session">Session</string> <string name="setup_logs">Journaux de session</string> <string name="setup_logs_hint">Enregistré après chaque fin de session</string> + <string name="setup_game_debug_logs">Journaux de débogage des jeux</string> + <string name="setup_game_debug_logs_hint">Inclure les diagnostics Proton, Wine et graphiques au prochain lancement d\'un jeu. Peut réduire les performances et utiliser plus de stockage.</string> + <string name="setup_game_debug_logs_restart">Redémarrez cette session pour enregistrer les journaux de débogage des jeux</string> + <string name="setup_logging_update_failed">Impossible de modifier la journalisation. Vérifiez l\'interrupteur et réessayez.</string> <string name="setup_agent_commands">Outils de débogage</string> <string name="setup_latest_logs">Derniers journaux de session</string> <string name="setup_saved_logs">Journaux de session enregistrés</string> @@ -827,20 +876,22 @@ <string name="setup_home">Utiliser comme écran d\'accueil</string> <string name="setup_home_on">DroidDeck peut être utilisé comme application d\'écran d\'accueil</string> <string name="setup_home_off">DroidDeck ne sera pas proposé comme application d\'écran d\'accueil</string> + <string name="setup_home_game_space_first">Dans Ajouter des jeux, réglez DroidDeck sur Inclure</string> <string name="setup_orientation">Orientation</string> + <string name="setup_launcher_orientation">Orientation du lanceur</string> + <string name="setup_launcher_orientation_auto">Suivre la rotation de l\'appareil</string> + <string name="setup_orientation_portrait">Portrait</string> + <string name="setup_session_orientation">Orientation de la session</string> + <string name="setup_session_orientation_hint">S\'applique à Steam, aux jeux, au bureau et à l\'éditeur de manette. Les préréglages de résolution pivotent avec la session ; la largeur et la hauteur personnalisées restent telles que saisies.</string> <string name="setup_orientation_auto">Paysage automatique</string> <string name="setup_orientation_landscape">Paysage</string> <string name="setup_orientation_reverse">Paysage inversé</string> <string name="setup_fullscreen">Plein écran</string> <string name="setup_fullscreen_on">Masquer la barre d\'état et la barre de navigation Android</string> <string name="setup_fullscreen_off">Afficher la barre d\'état et la barre de navigation Android</string> - <string name="setup_dual_screen">Double écran</string> - <string name="setup_dual_screen_hint">Automatique utilise le second écran sur les consoles portables qui en ont un intégré. Activé utilise n\'importe quel second écran. Désactivé garde tout sur un seul écran.</string> <string name="setup_dual_screen_auto">Automatique</string> <string name="setup_dual_screen_on">Activé</string> <string name="setup_dual_screen_off">Désactivé</string> - <string name="setup_dual_screen_menu">Menu sur l\'écran du bas</string> - <string name="setup_dual_screen_menu_hint">Déplace les sections et le menu en jeu sur le second écran et la saisie s\'y fait, pour que l\'écran du haut garde toute la vue. L2 et R2 changent de section.</string> <string name="setup_dual_screen_controls">Commandes sur l\'écran du bas en jeu</string> <string name="setup_dual_screen_controls_hint">Ouvre le pavé tactile et le clavier sur le second écran au démarrage d\'une session.</string> <string name="dual_typing_title">Saisie pour l\'écran du haut</string> @@ -995,6 +1046,14 @@ <string name="gate_step1">Ouvrez Paramètres → Options pour les développeurs → Débogage sans fil, et activez-le</string> <string name="gate_step2">Appuyez sur « Associer l\'appareil avec un code d\'appairage »</string> <string name="gate_step3">Saisissez le code d\'appairage dans la notification DroidDeck</string> + <string name="pairguide_build_number">Dans À propos du téléphone, appuyez 7 fois sur Numéro de build</string> + <string name="pairguide_wireless">Activez Débogage sans fil</string> + <string name="pairguide_pair">Ouvrez Débogage sans fil, puis appuyez sur « Associer l\'appareil avec un code d\'appairage »</string> + <string name="pairguide_child_process">Activez « Désactiver les limites pour les processus enfant »</string> + <string name="pairguide_row_child_process">Désactiver les limites pour les processus enfant</string> + <string name="pairguide_row_build_number">Numéro de build</string> + <string name="pairguide_row_wireless">Débogage sans fil</string> + <string name="pairguide_row_pair">Associer l\'appareil avec un code d\'appairage</string> <string name="gate_waiting">En attente de la fenêtre d\'appairage…</string> <string name="gate_code_needed">Fenêtre trouvée. Veuillez saisir le code d\'appairage affiché dans la notification.</string> <string name="gate_status">État</string> @@ -1133,7 +1192,6 @@ <string name="games_never_played">Jamais lancé</string> <string name="games_runtime_busy_percent">Environnement d\'exécution occupé · %1$d%%</string> <string name="games_runtime_busy">Environnement d\'exécution occupé</string> - <string name="games_runtime_first_play">Installation de l\'environnement d\'exécution lors du premier lancement du jeu</string> <string name="games_runtime_update">Mise à jour de l\'environnement d\'exécution disponible</string> <string name="games_runtime_ready">● Environnement d\'exécution prêt</string> <string name="games_internal">Stockage interne</string> @@ -1150,6 +1208,9 @@ <string name="gpu_hide_other">Masquer les pilotes des autres GPU</string> <string name="gpu_show_other">Afficher les pilotes des autres GPU</string> <string name="gpu_advanced">Avancé</string> + <string name="gpu_ubwc_title">Compatibilité UBWC</string> + <string name="gpu_ubwc_hint">Essayez Activé ou Désactivé si Steam ou Android affiche des bandes ou des scintillements. S\'applique aux deux pilotes après le redémarrage de DroidDeck.</string> + <string name="gpu_ubwc_restart">Redémarrez DroidDeck pour appliquer.</string> <string name="gpu_set_with_display">Configuré avec le pilote d\'affichage : %1$s inclut les deux.</string> <string name="gpu_set_with_runtime">Configuré avec le pilote d\'exécution : %1$s inclut les deux.</string> <string name="gpu_runtime_hint">Utilisé par les jeux et le bureau.</string> @@ -1258,10 +1319,15 @@ <string name="pip_auto">Passer automatiquement en PiP</string> <string name="unfolded_controls">Commandes sur l\'écran déplié</string> <string name="unfolded_controls_hint">Déplié, le jeu s\'affiche au-dessus des pavés tactiles et des poignées arrière du Steam Deck. Plié, le jeu est en plein écran.</string> + <string name="unfolded_controls_with_controller">Les garder avec une manette</string> + <string name="unfolded_controls_with_controller_hint">Afficher aussi ces commandes tactiles lorsqu\'une manette est connectée.</string> <string name="pip_suspended">En pause</string> <string name="pip_not_ready">Le mode PiP sera disponible une fois la session prête.</string> <string name="pip_permission">Veuillez autoriser DroidDeck à utiliser le mode PiP dans les paramètres Android.</string> <string name="pip_unavailable">Android ne peut pas ouvrir le mode PiP.</string> + <string name="game_more">Plus</string> + <string name="game_edit_art">Modifier les illustrations</string> + <string name="stores_in_steam_label">Dans Steam</string> <string name="game_shortcut">Raccourci</string> <string name="game_shortcut_add">Ajouter à l\'écran d\'accueil</string> <string name="game_shortcut_choose">Choisir un jeu</string> @@ -1285,6 +1351,10 @@ <string name="main_wait_runtime">Attendez la fin de l\'opération sur l\'environnement d\'exécution</string> <string name="main_wait_proton_install">Attendez la fin de l\'installation de l\'outil de compatibilité</string> + <string name="load_compat_title">Préparation des outils de compatibilité</string> + <string name="load_compat_wait">En attente de la fin de la configuration de compatibilité</string> + <string name="load_compat_hint">Votre session démarrera une fois la configuration terminée.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Attendez la fin de l\'installation de l\'application de bureau</string> <string name="main_wait_install_game">Attendez la fin de l\'installation avant de lancer un jeu</string> <string name="main_saves_close_session">Fermez d\'abord la session Steam, pour que le jeu ne puisse pas écraser l\'importation</string> @@ -1325,6 +1395,9 @@ <string name="main_install_anyway">Installer quand même</string> <string name="main_remove_runtime_title">Supprimer l\'environnement d\'exécution Linux</string> <string name="main_remove_runtime_text">Cela supprime l\'environnement d\'exécution, le client Steam qu\'il contient et tous les jeux qui y sont installés.</string> + <string name="runtime_actions_title">Environnement d\'exécution Linux</string> + <string name="runtime_actions_text">Réparer réinstalle les fichiers système de l\'environnement d\'exécution et conserve Steam, vos jeux et vos paramètres. Les extras comme le bureau se réinstallent à leur prochaine utilisation. Supprimer efface tout.</string> + <string name="runtime_repair">Réparer l\'environnement d\'exécution</string> <string name="main_applied">Appliqué : %1$s</string> <string name="android_app_open_failed_primary">Impossible d\'ouvrir %1$s sur l\'écran principal</string> <string name="android_app_open_failed_on">Impossible d\'ouvrir %1$s sur %2$s</string> @@ -1457,6 +1530,12 @@ <string name="session_runtime_catalog_unreachable">Impossible d\'accéder au catalogue des environnements d\'exécution. Vérifiez la connexion et appuyez à nouveau sur Play.</string> <string name="session_runtime_install_failed">L\'environnement d\'exécution Linux ne s\'est pas installé. Vérifiez-le dans « Paramètres » et appuyez à nouveau sur Play.</string> <string name="session_desktop_install_failed">Le bureau ne s\'est pas installé (%1$s). Vérifiez la connexion et appuyez à nouveau sur Bureau.</string> + <string name="session_package_resume_failed">Une installation interrompue n\'a pas pu être terminée (%1$s). Vérifiez la connexion et l\'espace libre, puis réessayez.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">L\'environnement d\'exécution Linux est endommagé : %1$d lien de bibliothèque pointe vers un fichier manquant (%2$s), généralement après une installation interrompue. Réparer conserve vos jeux et vos paramètres.</item> + <item quantity="many">L\'environnement d\'exécution Linux est endommagé : %1$d liens de bibliothèque pointent vers des fichiers manquants (%2$s et d\'autres), généralement après une installation interrompue. Réparer conserve vos jeux et vos paramètres.</item> + <item quantity="other">L\'environnement d\'exécution Linux est endommagé : %1$d liens de bibliothèque pointent vers des fichiers manquants (%2$s et d\'autres), généralement après une installation interrompue. Réparer conserve vos jeux et vos paramètres.</item> + </plurals> <string name="session_ended_named">%1$s s\'est arrêté de manière inattendue. Partagez les journaux dans un rapport de bug, ou réessayez.</string> <string name="session_ended_program">Le programme s\'est arrêté de manière inattendue. Partagez les journaux dans un rapport de bug, ou réessayez.</string> <string name="session_ended_desktop">Le bureau s\'est arrêté de manière inattendue. Partagez les journaux dans un rapport de bug, ou réessayez.</string> @@ -1472,6 +1551,14 @@ <string name="mode_decky_plugins_hint">Installez un ZIP de plugin pour la prochaine session Steam.</string> <string name="mode_decky_plugin_downloading">Téléchargement…</string> <string name="mode_decky_plugin_install_zip">Installer depuis un ZIP</string> + <string name="decky_zip_warning_title">Installation d\'un plugin tiers</string> + <string name="decky_zip_warning_text">L\'équipe de Decky Loader n\'a pas examiné ce plugin. Il peut contenir des logiciels malveillants, par exemple pour voler votre compte Steam ou endommager votre appareil. En installant ce plugin, vous acceptez d\'assumer tous les risques pour votre appareil.</string> + <string name="decky_zip_warning_continue">Continuer</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Veuillez patienter %1$d seconde</item> + <item quantity="many">Veuillez patienter %1$d secondes</item> + <item quantity="other">Veuillez patienter %1$d secondes</item> + </plurals> <string name="store_cat_games">Jeux</string> <string name="store_cat_audio_video">Audio et vidéo</string> <string name="store_cat_graphics">Graphisme</string> @@ -1638,6 +1725,8 @@ <string name="fm_accept">Accepter</string> <string name="fm_decline">Refuser</string> <string name="fm_drive_not_readable">%1$s est monté, mais illisible pour le moment</string> + <string name="fm_drive_access_title">Autoriser l\'accès à %1$s</string> + <string name="fm_drive_access_text">Android permet à DroidDeck de voir ce lecteur, mais pas de le lire. Activez l\'accès à tous les fichiers pour DroidDeck, puis revenez.</string> <string name="fm_list_view">Vue en liste</string> <string name="fm_grid_view">Vue en grille</string> <string name="fm_search">Rechercher</string> @@ -1710,6 +1799,89 @@ <string name="second_mode_keyboard_trackpad">Clavier + pavé tactile</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Poignées Deck + pavés tactiles</string> + <string name="second_mode_dashboard">Tableau de bord</string> + <string name="bottom_dashboard_empty">Rien à afficher pour l\'instant.</string> + <string name="bottom_page_downloads">Téléchargements</string> + <string name="bottom_downloads_none">Aucun téléchargement en cours.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Téléchargement du cache de shaders</string> + <string name="bottom_downloads_paused">En pause</string> + <string name="bottom_downloads_queued">En attente de démarrage</string> + <string name="bottom_page_notifications">Notifications</string> + <string name="bottom_notifications_listener">Écran inférieur DroidDeck</string> + <string name="bottom_notifications_why">Affichez ici les messages et autres notifications pendant que vous jouez. Ils restent uniquement sur cet écran et ne sont pas enregistrés. Android ne le demande qu\'une fois : sa page d\'accès aux notifications s\'ouvre sur cet écran ; activez-y DroidDeck et cette page reviendra d\'elle-même.</string> + <string name="bottom_notifications_allow">Autoriser l\'accès aux notifications</string> + <string name="bottom_notifications_none">Aucune notification.</string> + <string name="bottom_notifications_count">%1$d notifications</string> + <string name="bottom_notifications_clear">Effacer</string> + <string name="bottom_page_screenshots">Captures d\'écran</string> + <string name="stats_fps_needs_hud">Les FPS nécessitent d\'activer le HUD</string> + <string name="stats_speed">Vitesse</string> + <string name="stats_pedals">Pédales</string> + <string name="stats_gforce">Force G</string> + <string name="stats_timing">Chronométrage</string> + <string name="stats_best_lap">Meilleur tour</string> + <string name="stats_tires">Pneus °C</string> + <string name="stats_trace">Accélérateur et frein, 10 dernières s</string> + <string name="stats_speed_chart">Vitesse, %1$s</string> + <string name="stats_gear">Rapport</string> + <string name="stats_steam_client_arm">Client Steam ARM</string> + <string name="stats_steam_client_x86">Client Steam x86</string> + <string name="stats_throttle">Accélérateur</string> + <string name="stats_brake">Frein</string> + <string name="stats_lights">Tableau de bord</string> + <string name="stats_lamp_shift">Passage de rapport</string> + <string name="stats_lamp_handbrake">Frein à main</string> + <string name="stats_lamp_pit">Limiteur des stands</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Moteur %1$s °C</string> + <string name="stats_oil_temp">Huile %1$s °C</string> + <string name="stats_power">Répartiteur d\'énergie</string> + <string name="stats_fuel_t">Carburant, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Réserve %1$s t</string> + <string name="bottom_telemetry_send_title">Envoyer les données du tableau de bord</string> + <string name="bottom_telemetry_send_auto">Automatique</string> + <string name="bottom_telemetry_send_auto_hint">L\'active pour chaque jeu listé ici, y compris les jeux trouvés plus tard. Les jeux que vous désactivez restent désactivés.</string> + <string name="bottom_telemetry_send_note">Cela modifie le paramètre de sortie de données propre au jeu. Le changement prend effet au prochain lancement du jeu ; le désactiver rétablit l\'ancien paramètre.</string> + <string name="bottom_telemetry_send_close">Fermez %1$s pour modifier ce réglage.</string> + <string name="bottom_telemetry_send_failed">Impossible de modifier les paramètres de %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s : activez %2$s dans les paramètres du jeu avec l\'IP 127.0.0.1 et le port %3$d.</string> + <string name="bottom_shots_where">Enregistrées dans Pictures/DroidDeck. Les captures d\'écran Steam s\'affichent aussi ici.</string> + <string name="bottom_shots_take">Prendre une capture d\'écran</string> + <string name="bottom_shots_saved">Capture d\'écran enregistrée.</string> + <string name="bottom_shots_failed">Impossible de prendre une capture d\'écran.</string> + <string name="bottom_shots_none">Aucune capture d\'écran pour l\'instant.</string> + <string name="bottom_page_chat">Chat et voix</string> + <string name="bottom_chat_why">Lisez le chat Steam et répondez-y ici pendant que le jeu continue de tourner sur l\'écran principal. Le compte connecté à Steam est utilisé.</string> + <string name="bottom_chat_not_signed_in">Steam n\'a pas encore de connexion web à partager, connectez-vous donc ici une fois.</string> + <string name="bottom_chat_stopped">Android a fermé la page de chat pendant que DroidDeck était en arrière-plan. Elle se rouvre lorsque vous revenez sur DroidDeck.</string> + <string name="bottom_chat_open">Ouvrir Steam Chat</string> + <string name="bottom_chat_close">Fermer le chat</string> + <string name="bottom_chat_mic_on">Micro activé</string> + <string name="bottom_chat_mic_off">Micro désactivé</string> + <string name="bottom_chat_mic_unavailable">Le micro est désactivé pour ce jeu. Pour parler, activez Microphone dans les paramètres Steam de DroidDeck (Audio), puis relancez le jeu.</string> + <string name="bottom_chat_volume">Volume %1$d %%</string> + <string name="bottom_page_telemetry">Statistiques en jeu</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batterie</string> + <string name="bottom_telemetry_lap">Tour</string> + <string name="bottom_telemetry_position">Position</string> + <string name="bottom_telemetry_this_lap">Tour actuel</string> + <string name="bottom_telemetry_last_lap">Dernier tour</string> + <string name="bottom_telemetry_fuel">Carburant</string> + <string name="bottom_telemetry_cargo">Cargaison</string> + <string name="bottom_telemetry_pips">Points SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Statut légal</string> + <string name="bottom_telemetry_balance">Solde</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Le port %1$d reçoit des données (%2$d paquets de %3$d octets), mais dans un format que cette page ne sait pas encore lire.</string> + <string name="bottom_telemetry_port_busy">Un autre programme utilise déjà le port %1$s ; ce jeu ne peut donc pas s\'afficher ici.</string> <string name="rtinst_removing">Suppression de l\'environnement d\'exécution Linux</string> <plurals name="rtinst_removing_entries"> @@ -1741,6 +1913,7 @@ <string name="flatpakmgr_not_ready">Configurez d\'abord Flatpak</string> <string name="flatpakmgr_starting">Démarrage</string> <string name="flatpakmgr_exit_status">Flatpak s\'est arrêté avec le code %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s est compilée pour %2$s, que DroidDeck ne peut pas exécuter. Ici, les applis Flatpak doivent exister en version ARM64 ou x86_64.</string> <string name="flatpakmgr_installing">Installation : %1$s</string> <string name="flatpakmgr_updating">Mise à jour : %1$s</string> <string name="flatpakmgr_removing">Suppression : %1$s</string> @@ -1834,6 +2007,7 @@ <string name="adbpair_applying">Application du paramètre…</string> <string name="adbpair_command_failed">Échec de la commande de débogage sans fil</string> <string name="adbpair_channel_name">Configuration du débogage sans fil</string> + <string name="adbpair_progress_channel_name">Progression de la configuration du débogage sans fil</string> <string name="adbpair_channel_description">Demande le code d\'appairage du débogage sans fil pendant que les paramètres sont ouverts</string> <string name="adbpair_title_pair">Appairer le débogage sans fil</string> <string name="adbpair_waiting_text">Activez le débogage sans fil, puis appuyez sur « Associer l\'appareil avec un code d\'appairage ».</string> @@ -1942,6 +2116,7 @@ <string name="gpuinfo_not_adreno">GPU non Adreno</string> <string name="gpuinfo_supported">Pris en charge</string> <string name="gpuinfo_experimental">Expérimental : ses pilotes sont des versions de test</string> + <string name="gpuinfo_a850_experimental">Prise en charge expérimentale de l\'Adreno 850 : nécessite des pilotes d\'affichage et de jeu expérimentaux compatibles ; non vérifiée sur cet appareil</string> <string name="gpuinfo_below_tested">En dessous du matériel testé (Adreno 725 et plus récent) : risque de ne pas fonctionner</string> <string name="gpuinfo_unsupported">Non pris en charge : DroidDeck nécessite un GPU Adreno (Snapdragon)</string> @@ -2038,6 +2213,7 @@ <string name="display_look_filter">%1$s Règle la mise à l\'échelle sur %2$s.</string> <string name="display_match_screen">Adapter à l\'écran (%1$d×%2$d)</string> <string name="display_follow_screen">Suivre l\'écran (s\'adapte au pliage et au dépliage)</string> + <string name="display_follow_screen_scaled">Mis à l\'échelle %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Afficher les détails de l\'appareil</string> <string name="device_info_hide">Masquer les détails de l\'appareil</string> @@ -2144,6 +2320,13 @@ <string name="stores_resume">Reprendre</string> <string name="stores_refresh">Actualiser</string> <string name="stores_sort">Trier</string> + <string name="setup_rail_labels">Libellés de la barre latérale</string> + <string name="setup_rail_labels_hint">Afficher les noms sous les icônes de la barre latérale. Désactivez pour une barre latérale plus fine.</string> + <string name="library_display">Affichage</string> + <string name="library_display_larger">Cartes plus grandes</string> + <string name="library_display_smaller">Cartes plus petites</string> + <string name="library_display_title">Afficher le titre</string> + <string name="library_display_size">Afficher la taille</string> <string name="stores_sort_last_played">Joués récemment</string> <string name="stores_sort_recently_installed">Installés récemment</string> <string name="stores_sort_title_asc">Titre A–Z</string> @@ -2270,6 +2453,9 @@ <string name="stores_download_manager">Gestionnaire de téléchargements</string> <string name="stores_parallel">Téléchargements simultanés</string> <string name="stores_install_where">Installer dans</string> + <string name="stores_install_language">Langue du jeu</string> + <string name="stores_install_language_hint">GOG et Epic installent cette langue. Système suit la langue de l\'application.</string> + <string name="stores_install_language_system">Système</string> <string name="stores_install_title">Installer %1$s :</string> <string name="stores_target_internal">Interne</string> <string name="stores_target_free">%1$s libres</string> @@ -2305,6 +2491,9 @@ <string name="edit_target">Cible</string> <string name="edit_start_in">Démarrer dans</string> <string name="edit_launch_options">Options de lancement</string> + <string name="edit_launch_options_steam_hint">Partagées avec les Propriétés de Steam : une modification d’un côté apparaît des deux.</string> + <string name="edit_launch_options_not_saved">Impossible d’enregistrer les options de lancement dans Steam. Réessayez.</string> + <string name="edit_launch_options_desktop">Steam est peut-être ouvert dans la session Bureau. Modifiez les options de lancement dans ses Propriétés, ou fermez d’abord la session.</string> <string name="edit_artwork">Illustrations</string> <string name="edit_other_exe">Autre exe…</string> <string name="edit_remove">Retirer</string> @@ -2434,6 +2623,7 @@ <string name="setup_download_source_custom">Préfixe personnalisé</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Préfixe</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APPLICATIONS LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Applications pour le bureau Linux, à ouvrir depuis l\'onglet Bureau.</string> @@ -2576,6 +2766,22 @@ <string name="glasses_tracking_flat_hint">Automatique garde ce jeu 2D fixe dans la vue. Choisissez Écran virtuel dans Affichage pour utiliser le suivi de la tête.</string> <string name="glasses_tracking_sbs_hint">Le suivi de la tête s\'applique à un écran virtuel ou à un jeu SteamVR en cours.</string> <string name="glasses_hardware">Appareil</string> + <string name="vr_controllers_tab">Manettes</string> + <string name="vr_controllers_group">Manettes SteamVR</string> + <string name="vr_controllers_emulate">Manette en VR</string> + <string name="vr_controllers_emulate_hint">Les deux mains VR que votre manette incarne. Les changements s\'appliquent immédiatement, même pendant que SteamVR tourne. Les Joy-Con et les mains suivies reprennent toujours la main de leur côté.</string> + <string name="vr_controllers_off">Manette classique</string> + <string name="vr_controllers_index">Manettes Valve Index</string> + <string name="vr_controllers_touch">Manettes Meta Quest 3</string> + <string name="vr_controllers_vive">Manettes HTC Vive</string> + <string name="vr_controllers_sticks">Au départ, les sticks</string> + <string name="vr_controllers_sticks_hint">Enfoncez les deux sticks en même temps pendant la VR pour basculer.</string> + <string name="vr_controllers_sticks_game">Vous déplacent dans le jeu</string> + <string name="vr_controllers_sticks_hands">Déplacent les mains</string> + <string name="vr_controllers_buttons">Boutons</string> + <string name="vr_controllers_buttons_stick">Les gâchettes restent des gâchettes, les boutons latéraux servent à saisir, A/B et X/Y sont les boutons frontaux de chaque main, un clic de stick clique le joystick, Guide ouvre le menu SteamVR. Haut et bas sur la croix rapprochent ou éloignent les mains.</string> + <string name="vr_controllers_buttons_vive">Les sticks servent de pavés tactiles ; A/X ou un clic de stick les enfonce. Les gâchettes restent des gâchettes, les boutons latéraux servent à saisir, Start et Select font office de menu, Guide ouvre le menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Pas de mains VR. Les jeux compatibles manette, ainsi que le menu SteamVR, reçoivent votre manette normalement.</string> <string name="glasses_brightness">Luminosité</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Pare-soleil</string> @@ -2633,6 +2839,12 @@ <string name="hand_camera_placement">Positionnement de la caméra</string> <string name="hand_camera_placement_hint">Vérifiez que la caméra peut vous voir avant de jouer.</string> <string name="hand_camera_check">Vérifier</string> + <string name="tracking_pack_title">Téléchargement du suivi des mains</string> + <string name="tracking_pack_hint">Le suivi des mains nécessite un téléchargement unique de %1$s.</string> + <string name="tracking_pack_download">Télécharger</string> + <string name="tracking_pack_retry">Réessayer</string> + <string name="tracking_pack_downloading">Téléchargement du suivi des mains… %1$d%%</string> + <string name="tracking_pack_failed">Impossible de télécharger le suivi des mains. Vérifiez votre connexion et réessayez.</string> <string name="hand_camera_check_title">Positionnement de la caméra</string> <string name="hand_camera_how_rear">Installez l\'appareil debout, entre 1,5 et 2 mètres de vous, à hauteur de poitrine, caméra arrière tournée vers vous. Puis entrez dans le champ, les mains tendues.</string> <string name="hand_camera_how_front">Installez l\'appareil debout, entre 1,5 et 2 mètres de vous, à hauteur de poitrine, écran tourné vers vous. Puis entrez dans le champ, les mains tendues.</string> @@ -2707,6 +2919,21 @@ <string name="storage_safe_hint">Environnements d\'exécution inutilisés, résidus, anciens journaux</string> <string name="storage_clean_up">Nettoyer…</string> <string name="storage_session_running">Arrêtez la session pour nettoyer ou supprimer quoi que ce soit. Les tailles restent affichées.</string> + <string name="storage_default_group">Emplacement d\'installation</string> + <string name="storage_default_title">Stockage par défaut</string> + <string name="storage_default_hint">Les nouvelles installations depuis les boutiques vont à l\'emplacement sélectionné. Les jeux existants restent où ils sont. Les bibliothèques Steam gardent leur propre réglage.</string> + <string name="storage_default_ask">Toujours demander</string> + <string name="storage_default_ask_detail">Choisir une destination pour chaque installation</string> + <string name="storage_default_internal">Stockage interne</string> + <string name="storage_default_external">Stockage externe</string> + <string name="storage_default_external_detail">%1$s · %2$s libres</string> + <string name="storage_default_external_missing">Non connecté</string> + <string name="storage_default_folder">Dossier · %1$s</string> + <string name="storage_default_folder_free">%1$s libres</string> + <string name="storage_default_folder_missing">Non connecté</string> + <string name="storage_default_choose_folder">Choisir un dossier…</string> + <string name="storage_default_choose_folder_detail">Utiliser n\'importe quel dossier sur une carte SD ou une clé USB</string> + <string name="storage_default_note">Les jeux sont placés dans un dossier Games à l\'emplacement sélectionné. Les jeux existants ne sont pas déplacés.</string> <string name="storage_where">Où ça va</string> <string name="storage_games">Jeux Steam</string> <string name="storage_game_data">Données de jeu</string> @@ -2835,6 +3062,9 @@ <string name="storage_data_installed">Jeux installés</string> <string name="storage_data_parts">Préfixe %1$s · shaders %2$s · atelier %3$s</string> <string name="storage_clear_shaders">Effacer les shaders</string> + <string name="storage_reset_prefix">Réinitialiser le préfixe</string> + <string name="storage_reset_prefix_title">Réinitialiser le préfixe de %1$s ?</string> + <string name="storage_reset_prefix_confirm">Supprime son préfixe Wine (%1$s) dans %2$s et le recrée au prochain lancement. Les sauvegardes, paramètres et composants redistribuables installés à l\'intérieur sont perdus ; les sauvegardes Steam Cloud restent dans votre compte.</string> <string name="storage_data_leftovers">Jeux désinstallés</string> <string name="storage_steam_app">Application Steam %1$d</string> <string name="storage_leftover_unsure_detail">Son préfixe contient encore des fichiers, dont d\'éventuelles sauvegardes locales</string> @@ -3138,6 +3368,117 @@ <string name="spatial_saved_views_hint">Les vues enregistrées peuvent être recalculées. Démarrez un nouvel étalonnage pour capturer dans le système de coordonnées de suivi actuel.</string> <string name="spatial_model_checksum_error">Incohérence de la somme de contrôle du modèle manuel</string> <string name="spatial_opencv_load_error">OpenCV n\'a pas pu charger</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synchroniser avec Syncthing</string> + <string name="sync_enable_hint">Basée sur Syncthing-Fork, cette implémentation de Syncthing vous permet de synchroniser les fichiers du système de fichiers interne de DroidDeck avec d\'autres instances Syncthing. Elle ne concerne que les fichiers que vous stockez dans le système de fichiers interne de DroidDeck.</string> + <string name="sync_missing">Cette version n\'inclut pas Syncthing.</string> + <string name="sync_starting">Démarrage de Syncthing</string> + <string name="sync_status_starting">Démarrage</string> + <string name="sync_status_up_to_date">À jour</string> + <string name="sync_status_syncing">Synchronisation</string> + <string name="sync_status_paused">En pause</string> + <string name="sync_status_pausing">Mise en pause</string> + <string name="sync_status_resuming">Reprise</string> + <string name="sync_status_attention">Intervention requise</string> + <string name="sync_status_failed">Syncthing s\'est arrêté</string> + <string name="sync_failed_retry">Réessayer</string> + <string name="sync_paused_wifi">En pause jusqu\'à la connexion Wi-Fi</string> + <string name="sync_paused_game">En pause pendant le jeu</string> + <string name="sync_summary">%1$d dossiers · %2$d appareils connectés sur %3$d</string> + <string name="sync_left">%1$s restants</string> + <string name="sync_open_web_ui">Ouvrir l\'interface web</string> + <string name="sync_pause">Pause</string> + <string name="sync_resume">Reprendre</string> + <string name="sync_running">En cours d\'exécution</string> + <string name="sync_running_hint">Désactivez pour arrêter complètement Syncthing.</string> + <string name="sync_this_device">Cet appareil</string> + <string name="sync_device_id">ID de l\'appareil</string> + <string name="sync_show_qr">Afficher le QR code</string> + <string name="sync_advanced">Avancé</string> + <string name="sync_advanced_hint">Ports, moment d\'exécution, réinitialisation</string> + <string name="sync_open">Ouvrir</string> + <string name="sync_waiting">En attente de votre réponse</string> + <string name="sync_pending_device">%1$s souhaite se connecter</string> + <string name="sync_pending_folder">%1$s souhaite partager « %2$s »</string> + <string name="sync_pending_folder_hint">Acceptez pour choisir où l\'enregistrer dans DroidDeck.</string> + <string name="sync_review">Vérifier dans l\'interface web</string> + <string name="sync_folders">Dossiers</string> + <string name="sync_no_folders">Aucun dossier pour l\'instant.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">À jour</string> + <string name="sync_folder_syncing">Synchronisation %1$d %%</string> + <string name="sync_folder_scanning">Analyse</string> + <string name="sync_folder_paused">En pause</string> + <string name="sync_folder_out_of_sync">Non synchronisé</string> + <string name="sync_folder_errors">Échec de la synchronisation de %1$d fichiers</string> + <string name="sync_folder_blocked">Bloqué</string> + <string name="sync_folder_blocked_hint">Ce dossier se trouve en dehors du stockage de DroidDeck, DroidDeck l\'a donc mis en pause. Pour synchroniser des dossiers en dehors de DroidDeck, utilisez l\'application Syncthing-Fork.</string> + <string name="sync_remove_folder">Retirer de Syncthing</string> + <string name="sync_remove_folder_hint">Le retirer ne supprime aucun fichier.</string> + <string name="sync_devices">Appareils</string> + <string name="sync_no_devices">Aucun appareil pour l\'instant.</string> + <string name="sync_connected">Connecté</string> + <string name="sync_offline">Hors ligne</string> + <string name="sync_last_seen">Vu pour la dernière fois : %1$s</string> + <string name="sync_device_id_title">ID de cet appareil</string> + <string name="sync_device_id_hint">Sur votre autre appareil, ajoutez un appareil dans Syncthing et scannez ce code ou collez l\'ID. Acceptez-le ensuite ici dans l\'interface web.</string> + <string name="sync_copy">Copier</string> + <string name="sync_share">Partager</string> + <string name="sync_done">Terminé</string> + <string name="sync_off_title">Désactiver Syncthing ?</string> + <string name="sync_off_body">Syncthing s\'arrête maintenant et reste arrêté jusqu\'à ce que vous le réactiviez. Les fichiers synchronisés restent à leur place.</string> + <string name="sync_off_forget">Supprimer aussi la configuration de Syncthing</string> + <string name="sync_off_forget_hint">Supprime l\'ID de cet appareil, les dossiers et les appareils. À la réactivation, tout repart de zéro.</string> + <string name="sync_turn_off">Désactiver</string> + <string name="sync_ports">Ports</string> + <string name="sync_port_sync">Synchronisation</string> + <string name="sync_port_discovery">Découverte locale</string> + <string name="sync_repick">Choisir de nouveaux ports</string> + <string name="sync_repick_hint">Vérifié de nouveau à chaque démarrage.</string> + <string name="sync_repick_button">Choisir à nouveau</string> + <string name="sync_reset_group">Réinitialisation</string> + <string name="sync_api_key">Clé d\'API</string> + <string name="sync_regenerate">Régénérer</string> + <string name="sync_reset">Réinitialiser Syncthing</string> + <string name="sync_reset_hint">Nouvel ID d\'appareil, dossiers et appareils supprimés. Les fichiers du stockage de DroidDeck sont conservés.</string> + <string name="sync_reset_button">Réinitialiser</string> + <string name="sync_reset_confirm_title">Réinitialiser Syncthing ?</string> + <string name="sync_running_group">Exécution</string> + <string name="sync_run">Exécuter</string> + <string name="sync_run_open">Quand DroidDeck est ouvert</string> + <string name="sync_run_background">En arrière-plan</string> + <string name="sync_wifi_only">Wi-Fi uniquement</string> + <string name="sync_pause_games">Mettre en pause pendant les jeux</string> + <string name="sync_logs">Journaux</string> + <string name="sync_logs_hint">Sortie de Syncthing pour cette session</string> + <string name="sync_logs_share">Partager</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Veuillez d\'abord installer l\'environnement d\'exécution Linux.</string> + <string name="sync_accept">Accepter</string> + <string name="sync_accept_title">Enregistrer « %1$s » dans</string> + <string name="sync_add_folder">Ajouter un dossier</string> + <string name="sync_add_folder_hint">Synchroniser un dossier du stockage de DroidDeck</string> + <string name="sync_choose">Choisir</string> + <string name="sync_add">Ajouter</string> + <string name="sync_add_failed">Impossible d\'ajouter le dossier.</string> + <string name="sync_share_with">Partager avec</string> + <string name="sync_share_none">Aucun appareil pour l\'instant. Vous pourrez partager ce dossier plus tard depuis l\'interface web.</string> + <string name="sync_use_folder">Utiliser ce dossier</string> + <string name="sync_new_folder">Nouveau dossier</string> + <string name="sync_location_home">Dossier personnel du conteneur</string> + <string name="sync_location_sync">Dossier Sync</string> + <string name="sync_location_shared">Stockage partagé de DroidDeck</string> + <string name="sync_location_card">DroidDeck sur %1$s</string> + <string name="sync_location_app">Données de l\'application DroidDeck</string> + <string name="sync_web_path_locked">Les nouveaux dossiers sont enregistrés dans le dossier Sync de DroidDeck. Pour synchroniser un autre dossier de DroidDeck, utilisez « Ajouter un dossier » dans l\'onglet Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Recharger</string> + <string name="sync_not_running">Syncthing n\'est pas en cours d\'exécution.</string> + <string name="session_end_steam_sigill">Steam s\'est arrêté sur une instruction illégale (SIGILL). Il peut s\'agir d\'un problème de compatibilité des instructions CPU ou d\'un plantage du client. Partagez les journaux avec les détails de votre appareil.</string> + <string name="session_end_steam_try_x64">Vous pouvez essayer Paramètres Steam → Client Steam → x86-64 (expérimental). Cela nécessite un téléchargement supplémentaire et peut être plus lent.</string> + <string name="session_end_vulkan_device">Le pilote graphique Linux n\'a trouvé aucun périphérique Vulkan utilisable. Vérifiez que le pilote GPU Linux sélectionné prend en charge ce GPU.</string> + <string name="session_end_gpu_unsupported">Cette session ne peut pas démarrer, car ce GPU n\'a aucun pilote Vulkan Linux compatible dans la configuration actuelle. Les pilotes Adreno Turnip ne peuvent pas prendre en charge les GPU MediaTek/Mali.</string> <string name="setup_group_memory">Mémoire</string> <string name="setup_clear_cached">Fermer les applis en cache avant une session</string> <string name="setup_clear_cached_hint">Au début d\'une session, ferme les applis qu\'Android garde en arrière-plan, pour laisser plus de mémoire au jeu. Le débogage sans fil doit être activé.</string> @@ -3161,6 +3502,12 @@ <string name="epic_client_open">Ouvrir</string> <string name="epic_client_install">Installer</string> <string name="game_tab_about">À propos</string> + <string name="game_resources_browser">S\'ouvre dans votre navigateur</string> + <string name="game_resource_guides">Guides</string> + <string name="game_resource_protondb_detail">Rapports de compatibilité Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Pour les jeux dont les sauvegardes sont sur votre compte Steam</string> + <string name="game_resource_search">Recherche web</string> <string name="game_tab_install">Installer</string> <string name="game_install_location">Emplacement</string> <string name="game_install_folder">Dossier</string> @@ -3177,6 +3524,11 @@ <string name="stores_eyebrow_pass">disponible avec %1$s</string> <string name="stores_owned_in_library">Jeux possédés dans la Bibliothèque</string> <string name="library_filter_added">Ajoutés</string> + <string name="library_filter">Filtrer</string> + <string name="library_filter_installed">Installés uniquement</string> + <string name="library_filter_all_owned">Tous les jeux possédés</string> + <string name="library_no_installed_matches">Aucun jeu installé ne correspond à ces filtres.</string> + <string name="library_browse_owned">Parcourir les jeux possédés</string> <string name="game_tab_launch">Lancement</string> <string name="game_tab_saves_cloud">Sauvegardes et cloud</string> <string name="game_launch_shortcut">Raccourci Steam</string> @@ -3194,6 +3546,40 @@ <string name="stores_itch_update_replaced">Le développeur a remplacé cette version par %1$s. Mettre à jour vers celle-ci ?</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Paramètres cloud</string> + <string name="integration_title">Intégration Steam</string> + <string name="integration_count">%1$d sur %2$d activés</string> + <string name="integration_set_up">Configurer</string> + <string name="integration_location">Position</string> + <string name="integration_app_info">Infos sur l\'appli</string> + <string name="integration_wifi">Noms des réseaux Wi-Fi</string> + <string name="integration_brightness">Luminosité</string> + <string name="integration_home">DroidDeck comme écran d\'accueil</string> + <string name="integration_shortcuts">Touches système</string> + <string name="integration_wifi_hint">Afficher les réseaux dans Steam · nécessite l\'accès à la position, jamais suivie</string> + <string name="integration_wifi_on">Les réseaux s\'affichent dans Steam</string> + <string name="integration_wifi_location_off">La localisation est désactivée</string> + <string name="integration_wifi_denied">Position refusée · autorisez-la dans Infos sur l\'appli</string> + <string name="integration_brightness_hint">Le curseur de Steam règle la luminosité de l\'écran</string> + <string name="integration_home_hint">Accueil ouvre le menu Steam pendant une session</string> + <string name="integration_shortcuts_hint">Alt+Tab, la touche Win et le bouton Accueil restent dans la session</string> + <string name="integration_shortcuts_maybe_restricted">Grisé dans Android ? Infos sur l\'appli → ⋮ → Autoriser les paramètres restreints</string> + <string name="integration_shortcuts_restricted">Bloqué par Android · Infos sur l\'appli → ⋮ → Autoriser les paramètres restreints</string> + <string name="integration_shortcuts_service">Touches système DroidDeck</string> + <string name="integration_shortcuts_service_description">Garde Alt+Tab, la touche Win et le bouton Accueil dans une session DroidDeck active plutôt que dans Android.</string> + <string name="integration_brightness_needed">Activez Luminosité dans Paramètres → Intégration Steam</string> + <string name="setup_gpu_bridge_off">Pont Mali : désactivé</string> + <string name="setup_gpu_bridge_on">Pont Mali : activé</string> + <string name="setup_gpu_bridge_detail">%1$s n\'est pas un Adreno. Le pont Vulkan expérimental est activé : la session dessine via le pilote du téléphone lui-même. Attendez-vous à des bugs ; envoyez les journaux de session.</string> + <string name="setup_bridge_safe">Mode sans échec</string> + <string name="setup_bridge_safe_on">Mode sans échec : activé</string> + <string name="setup_bridge_safe_off">Mode sans échec : désactivé</string> + <string name="setup_bridge_safe_on_detail">Le plus compatible. Recommandé pour un nouvel appareil.</string> + <string name="setup_bridge_safe_off_detail">Plus rapide là où ce GPU a réussi ses vérifications.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK : automatique</string> + <string name="setup_bridge_dxvk_proton">DXVK : celui de Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Utilise un DXVK plus ancien quand le Vulkan de ce GPU est trop ancien pour celui de Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Chaque Proton garde son propre DXVK, même quand le Vulkan de ce GPU risque d\'être trop ancien pour lui.</string> <string name="apps_search_hint">Rechercher des applications</string> <string name="apps_no_match">Aucune application ne correspond à « %1$s ».</string> <string name="apps_add_widget">Ajouter un widget</string> @@ -3243,6 +3629,8 @@ <string name="desktop_restore_done_body">Les applis que vous avez ajoutées sont de nouveau installées.</string> <string name="desktop_restore_failed_title">Certains logiciels n\'ont pas pu être restaurés</string> <string name="desktop_restore_failed_body">Consultez ~/.cache/droiddeck/apt-restore.log, puis essayez sudo apt install dans Konsole.</string> + <string name="gog_full_files">Les optimisations natives ne sont pas disponibles. Le téléchargement inclut des fichiers de remplacement complets.</string> + <string name="gog_recover">Vérifier le résultat du correctif</string> <string name="slow_usb_title">Connexion USB lente</string> <string name="slow_usb_cable">%1$s est connecté en %2$s (%3$s Mbit/s, environ %4$d Mo/s), les jeux qu\'il contient se chargeront donc lentement. Utilisez un câble USB 3 de 5 Gbit/s ou plus, retournez la prise USB-C ou utilisez un disque plus rapide.</string> <string name="slow_usb_port">%1$s est connecté en %2$s (%3$s Mbit/s, environ %4$d Mo/s). Le port USB de cet appareil ne va pas plus vite, les jeux se chargeront donc lentement. Le stockage interne ou une carte microSD peut être plus rapide.</string> @@ -3253,4 +3641,52 @@ <string name="steam_import_names_more">%1$s et %2$d de plus</string> <string name="steam_import_now">Redémarrer maintenant</string> <string name="steam_import_later">Plus tard</string> + <string name="gog_maintenance">Gérer l\'installation GOG</string> + <string name="gog_check">Rechercher des mises à jour</string> + <string name="gog_repair">Vérifier/Réparer</string> + <string name="gog_patches">Correctifs hors ligne</string> + <string name="gog_refresh">Télécharger l\'installateur hors ligne complet</string> + <string name="gog_update">Mettre à jour vers %1$s</string> + <string name="gog_resume">Reprendre la maintenance GOG</string> + <string name="gog_open_patch">Ouvrir l\'installateur du correctif</string> + <string name="gog_patch_in_session">Terminez ou annulez l\'installateur du correctif dans la session Linux.</string> + <string name="gog_patch_requirements">Choisissez un correctif adapté à votre version installée et à votre langue. Les versions sources prises en charge peuvent ne pas être indiquées.</string> + <string name="gog_no_patches">GOG ne propose aucun correctif Windows autonome pour ce jeu.</string> + <string name="gog_managed_files">Les fichiers de jeu modifiés peuvent être remplacés.</string> + <string name="gog_patch_installer_note">L\'installateur s\'ouvre dans votre session Linux.</string> + <string name="gog_download_label">Téléchargement</string> + <string name="gog_space_label">Espace supplémentaire</string> + <string name="gog_space_estimate_label">Espace estimé</string> + <string name="gog_repair_action">Réparer les fichiers</string> + <string name="gog_refresh_action">Actualiser l\'installation</string> + <string name="gog_select_patch">Sélectionner</string> + <string name="stores_gamejolt_not_owned">Absent de votre bibliothèque Game Jolt</string> + <string name="stores_gamejolt_no_build">Pas de téléchargement Windows pour ce jeu</string> + <string name="stores_gamejolt_no_exe">Aucun jeu Windows trouvé dans le téléchargement</string> + <string name="stores_gamejolt_no_game">Ce jeu est introuvable sur Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Impossible de charger les jeux de Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt a répondu HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Impossible de charger les téléchargements depuis Game Jolt</string> + <string name="stores_gamejolt_build_open">Ouvrir sur Game Jolt</string> + <string name="stores_gamejolt_archive">Les archives %1$s ne sont pas prises en charge</string> + <string name="stores_gamejolt_extract_failed">Impossible d\'extraire le téléchargement (code %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Impossible de joindre Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt n\'a pas fourni de lien de téléchargement</string> + <string name="stores_gamejolt_section_featured">À la une</string> + <string name="stores_gamejolt_section_hot">Tendances</string> + <string name="stores_gamejolt_section_best">Meilleurs</string> + <string name="stores_gamejolt_section_new">Nouveaux</string> + <string name="stores_gamejolt_price_under_30">30 $ ou moins</string> + <string name="stores_gamejolt_os_other">Autre</string> + <string name="stores_gamejolt_maturity_everyone">Tous publics</string> + <string name="stores_gamejolt_maturity_teen">Adolescents</string> + <string name="stores_gamejolt_maturity_adult">Adultes</string> + <string name="stores_gamejolt_status_complete">Terminé</string> + <string name="stores_gamejolt_status_early">Accès anticipé</string> + <string name="stores_gamejolt_partners">Jeux partenaires</string> + <string name="stores_gamejolt_filter_browser">Navigateur</string> + <string name="stores_gamejolt_filter_maturity">Classification</string> + <string name="stores_gamejolt_filter_status">Statut</string> + <string name="stores_gamejolt_filter_partners">Partenaires</string> + <string name="stores_gamejolt_followed">Jeux suivis</string> </resources> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index b31438a954..68fe010453 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12 के लिए VKD3D विकल्प। nodxr रे ट्रेसिंग बंद करता है; इसका उपयोग सिर्फ़ उन गेम के लिए करें जिन्हें इसकी ज़रूरत हो।</string> <string name="game_env_proton_log">Proton डायग्नोस्टिक लॉग के लिए 1 सेट करें। लॉगिंग से परफ़ॉर्मेंस घट सकता है और स्टोरेज लगता है।</string> <string name="game_env_wined3d">D3D9–11 संगतता जांच के लिए DXVK के बजाय OpenGL-आधारित WineD3D इस्तेमाल करने के लिए 1 सेट करें।</string> + <string name="game_env_wined3d_renderer">DirectDraw, Direct3D 1-7 और WineD3D से चलने वाले गेम के लिए रेंडरर। Vulkan, OpenGL-on-Zink पाथ को छोड़ देता है और Adreno पर पुराने DirectDraw और Direct3D 7 गेम के लिए काफ़ी तेज़ है।</string> + <string name="game_env_dxvk_d3d8">Direct3D 8 को WineD3D के बजाय DXVK से चलाने के लिए 1 सेट करें। Adreno पर AIO Graphics Test के Direct3D 8 टेस्ट में ज़्यादा तेज़।</string> <string name="game_env_no_ntsync">इस गेम को ntsync (droiddeck-ntsync या कर्नेल ड्राइवर) से दूर रखने के लिए 1 सेट करें; जहां पैक मौजूद है वहां यह droiddeck-esync इस्तेमाल करता है, वरना droiddeck-fsync।</string> <string name="game_env_no_esync">इस गेम के लिए droiddeck-esync बंद करने के लिए 1 सेट करें; इसके बदले यह droiddeck-fsync इस्तेमाल करता है, या जहां fsync भी बंद है वहां droiddeck-ntsync।</string> <string name="game_env_no_fsync">इस गेम को droiddeck-fsync से दूर रखने के लिए 1 सेट करें; जहां पैक मौजूद है वहां यह droiddeck-esync इस्तेमाल करता है, वरना droiddeck-ntsync।</string> <string name="game_env_fsync_first">इस गेम को droiddeck-fsync पर चलाने के लिए 1 सेट करें, या droiddeck-esync को पहले रखने के लिए 0 — जहां कोई पैक इसके Proton से मेल खाता हो।</string> <string name="game_env_xalia">इस गेम के लिए Proton के गेमपैड-नेविगेशन हेल्पर को बंद करने के लिए 0 सेट करें।</string> + <string name="game_env_anticheat_offline">डिफ़ॉल्ट रूप से चालू। जब गेम ऑफ़लाइन खेलने का समर्थन करता है, तो Easy Anti-Cheat गेम को उसके एंटी-चीट के बिना शुरू करता है। हमेशा की तरह Easy Anti-Cheat से लॉन्च करने के लिए बंद करें। Easy Anti-Cheat की ज़रूरत वाले ऑनलाइन मोड उपलब्ध नहीं रहते।</string> <string name="game_env_hud">D3D9–11 के लिए DXVK ओवरले। fps फ़्रेम रेट दिखाता है; अनसेट करने पर यह छिप जाता है।</string> <string name="game_env_dxvk_config">सेमीकोलन से अलग की गई DXVK सेटिंग। नए बिल्ड फ़्रेम सीमित करने के लिए dxvk.maxFrameRate इस्तेमाल करते हैं; सामान्य खेल के लिए सेशन का फ़्रेम लिमिटर इस्तेमाल करना बेहतर है।</string> + <string name="game_env_cores">सेशन के गेम कोर की जगह इस गेम के लिए CPU कोर, जैसे 0-4 या 0,2,4। कम कोर ठंडे चलते हैं।</string> <string name="game_env_vkd3d_limit">D3D12 फ़्रेम-रेट सीमा। 0 सीमा को बंद कर देता है।</string> <string name="game_env_glthread">Mesa OpenGL थ्रेडिंग। true, CPU-सीमित OpenGL गेम में मदद कर सकता है; हर गेम पर जांच लें।</string> <string name="sync_backend_title">Wine सिंक</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX इस ARM64 डिवाइस पर x86 Linux प्रोग्राम चलाता है। प्रोग्राम x86 के लिए बना होने पर ऑटो इसे इस्तेमाल करता है।</string> <string name="app_fex_x86">FEX के ज़रिए %1$s</string> <string name="app_fex_not_ready">यह प्रोग्राम %1$s पीसी के लिए बना है और FEX के ज़रिए चलता है, जो अभी सेट नहीं है। साइन इन रहते हुए Steam एक बार खोलें: DroidDeck इससे FEX और ज़रूरी Steam Linux Runtime डाउनलोड करवा लेगा, फिर यह खुल जाएगा।</string> + <string name="session_proot_missing">DroidDeck का proot डाउनलोड नहीं हो सका। कनेक्शन जांचें और फिर कोशिश करें। सेशन शुरू नहीं किया गया, क्योंकि बैकअप proot खेलने के लिए बहुत धीमा है।</string> + <string name="session_directaudio_missing">DirectAudio डाउनलोड नहीं हो सका, इसलिए इस सेशन में गेम ऑडियो धीमा पाथ इस्तेमाल करता है।</string> <string name="session_end_program">यह प्रोग्राम</string> <string name="session_end_steam_download">Steam क्लाइंट डाउनलोड नहीं हो सका। हो सकता है आपका नेटवर्क या VPN Steam के सर्वर ब्लॉक कर रहा हो; कनेक्शन जांचें और फिर से कोशिश करें।</string> <string name="session_end_steam_setup">Steam क्लाइंट सेट अप नहीं हो सका। कनेक्शन और खाली स्टोरेज जांचें, फिर से कोशिश करें।</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 कंट्रोलर</string> <string name="mode_controller_note">Deck: Quick Access बटन और gyro। Steam Controller: वही, साथ में पीछे के बटन पर ग्रिप सेंस। DualShock 4 और DualSense: gyro, और ट्रैकपैड उनके टचपैड के तौर पर। Xbox 360: Guide+A से Quick Access खोलें।</string> <string name="mode_back">बैक</string> + <string name="back_hold">Steam शॉर्टकट के लिए बैक दबाकर रखें</string> + <string name="back_hold_hint">बैक दबाकर रखने से क्विक एक्सेस खुलता है या दूसरे बटनों के साथ Steam कॉम्बो बनते हैं। दबाकर रखने को अनदेखा करने के लिए बंद करें; टैप और डबल-टैप काम करते रहेंगे।</string> + <string name="back_native_qam_hint">Steam शॉर्टकट के लिए Back को 700 ms तक दबाए रखें, या Back दबाए रखकर कोई दूसरा बटन दबाएं।</string> + <string name="back_double_tap_window">डबल-टैप विंडो</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">ब्राइटनेस कंट्रोल की अनुमति दें</string> + <string name="brightness_permission_text">DroidDeck में ब्राइटनेस कंट्रोल सेट अप करें।</string> <string name="back_menu_then_qam">मेनू → QAM</string> <string name="back_qam_then_menu">QAM → मेनू</string> <string name="mode_session">सेशन</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam के सक्रिय रूप से डाउनलोड करते समय बैकग्राउंड सस्पेंशन को टालें।</string> <string name="mode_suspend_note">ऑटो बैकग्राउंड में रुकता है और दिखने पर फिर से शुरू होता है। मैनुअल फिर से शुरू करें का इंतज़ार करता है। कभी नहीं वाला चलता रहता है।</string> <string name="mode_startup">स्टार्टअप</string> - <string name="mode_steam_startup">DroidDeck के साथ Steam शुरू करें</string> - <string name="mode_steam_startup_hint">DroidDeck लॉन्च होने पर Steam सेशन खोलता है।</string> + <string name="mode_startup_session">लॉन्च पर खोलें</string> + <string name="mode_startup_session_hint">DroidDeck खुलने पर यह सेशन शुरू करता है।</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">रिलीज़ देखी जा रही हैं…</string> <string name="mode_decky_ready">%1$s इंस्टॉल करने के लिए तैयार।</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">नवीनतम · %1$s</string> <string name="mode_decky_loader">लोडर</string> <string name="mode_decky_install_latest">नवीनतम इंस्टॉल करें</string> + <string name="decky_channel">अपडेट चैनल</string> + <string name="decky_channel_hint">कौन-सी Decky Loader रिलीज़ इंस्टॉल करनी हैं। Decky का अपना अपडेटर भी यही चैनल इस्तेमाल करता है।</string> + <string name="decky_channel_stable">स्टेबल</string> + <string name="decky_channel_prerelease">प्री-रिलीज़</string> + <string name="decky_channel_testing">टेस्टिंग</string> + <string name="decky_channel_failed">Decky अपडेट चैनल सेव नहीं हो सका</string> <string name="mode_decky_on">Steam के साथ शुरू होता है। चालू रहते हुए, इस डिवाइस के दूसरे ऐप Steam को नियंत्रित कर सकते हैं।</string> <string name="mode_decky_off">बंद। Steam का रिमोट डिबगिंग पोर्ट बंद रहता है।</string> <string name="mode_decky_remove_title">Decky Loader अनइंस्टॉल करें?</string> @@ -323,6 +342,10 @@ <string name="mode_client">क्लाइंट</string> <string name="mode_mangoapp">परफ़ॉर्मेंस ओवरले</string> <string name="mode_mangoapp_hint">Deck मोड में गेम क्रैश होने या काली स्क्रीन होने पर इसे बंद करें। अगले सेशन से लागू होता है।</string> + <string name="mode_return_after_game">गेम के बाद DroidDeck पर लौटें</string> + <string name="mode_return_after_game_hint">जब DroidDeck या किसी दूसरे लॉन्चर से शुरू किया गेम बंद होता है, तो Steam ठीक से बंद होता है (क्लाउड सेव पहले पूरे होते हैं) और आप वहीं लौट जाते हैं। बंद: Steam में ही रहें।</string> + <string name="mode_shader_precache">शेडर प्री-कैशिंग</string> + <string name="mode_shader_precache_hint">Steam आपके गेम के लिए पहले से बने शेडर डाउनलोड करता है और उन्हें बैकग्राउंड में प्रोसेस करता है, ताकि गेम कम अटकें। बंद करने पर डेटा, स्टोरेज और बैटरी बचती है; गेम खेलते समय ही शेडर बनाते हैं। यह Steam की Downloads > Shader Pre-Caching वाली ही सेटिंग है। अगले सेशन से लागू होता है।</string> <string name="mode_steam_repair">Steam क्लाइंट रिपेयर करें</string> <string name="mode_steam_repair_hint">अगली बार Steam शुरू होने पर Steam क्लाइंट फिर से डाउनलोड होता है। इसे इस्तेमाल करें जब Steam अपनी लोडिंग स्क्रीन पर अटका रह जाए। गेम, साइन-इन और सेटिंग बनी रहती हैं।</string> <string name="mode_steam_repair_queued">अगली बार Steam शुरू होने पर Steam क्लाइंट फिर से डाउनलोड होगा।</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">कम लेटेंसी के लिए PulseAudio को बायपास करता है।</string> <string name="mode_mic">माइक्रोफ़ोन</string> <string name="mode_mic_hint">वॉइस चैट के लिए।</string> + <string name="drawer_mic_hint">इस सेशन के लिए माइक्रोफ़ोन कैप्चर चालू या बंद करें।</string> + <string name="drawer_mic_failed">माइक्रोफ़ोन बदला नहीं जा सका। कृपया फिर कोशिश करें।</string> <string name="mode_network">नेटवर्क</string> <string name="mode_wifi_discovery">Wi-Fi खोज</string> <string name="mode_wifi_discovery_hint">Steam में Wi-Fi नाम और आस-पास के नेटवर्क दिखाएं।</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: रीयलटाइम GPU क्यू</string> <string name="perf_gsrealtime_hint">कम्पोज़िटर के GPU काम को प्राथमिकता देता है। गेम की कुछ कीमत पर फ़्रेम पेसिंग को स्मूथ कर सकता है।</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">मेमोरी</string> + <string name="perf_cap_off">बंद</string> + <string name="perf_cap_auto">ड्राइवर डिफ़ॉल्ट</string> + <string name="perf_zram_client">गेम चलते समय Steam को कंप्रेस करें</string> + <string name="perf_zram_client_hint">गेम शुरू होने के 20 s बाद, Steam क्लाइंट को zRAM में कंप्रेस किया जाता है ताकि गेम को ज़्यादा मेमोरी मिले, और गेम बंद होने पर वापस पढ़ा जाता है। अगर गेम शुरू होने के कुछ देर बाद सेशन बंद हो जाता है तो इसे बंद करें। ऊपर दी गई RAM सीमा पार होने पर भी Steam कंप्रेस होता है।</string> + <string name="perf_ram_cap">RAM सीमा</string> + <string name="perf_ram_cap_hint">Steam क्लाइंट चलते समय लागू होती है, Steam मोड में या डेस्कटॉप से। जब सेशन इससे ज़्यादा इस्तेमाल करता है, तो Steam और फिर सेशन की दूसरी समर्थित प्रोसेस zRAM में कंप्रेस होती हैं। यह सॉफ़्ट सीमा है: कुछ बंद नहीं होता, लेकिन पेज वापस आते समय गेम अटक सकते हैं।</string> + <string name="perf_ram_cap_unavailable">zRAM स्वैप चाहिए, जो इस डिवाइस में नहीं है।</string> + <string name="perf_vram_cap">VRAM सीमा</string> + <string name="perf_vram_cap_hint">वह वीडियो मेमोरी जो DXVK, Direct3D गेम को बताता है, ताकि वे टेक्सचर के लिए कम बजट रखें। गेम की अपनी DXVK सेटिंग को प्राथमिकता मिलती है। अगले सेशन से लागू होता है।</string> <string name="perf_gpuclock">GPU को उसकी टॉप क्लॉक पर बनाए रखें</string> <string name="perf_gpuclock_hint">सिर्फ़ Adreno के लिए। कम हिचकोले, लेकिन ज़्यादा बैटरी खर्च और गर्मी।</string> <string name="perf_fixes">सेशन फ़िक्स</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">proot फ़ास्ट पाथ</string> <string name="perf_fastpath_needs_seccomp">proot के seccomp फ़िल्टर की ज़रूरत है।</string> <string name="perf_fastpath_hint">तेज़ फ़ाइल लुकअप और कम अटकाव। अगर कोई प्रोग्राम अपनी फ़ाइलें न खोज पाए तो इसे बंद करें।</string> + <string name="perf_cursor_composite">gamescope के अंदर कर्सर बनाएं</string> + <string name="perf_cursor_composite_hint">Gamescope पॉइंटर को Android को देने के बजाय खुद बनाता है। कंट्रोलर से चलने वाले कर्सर के लिए चालू करें। फ़ोन पर बंद रखना तेज़ है। अगले सेशन से लागू होता है।</string> <string name="perf_identity">सेशन पहचान</string> <string name="perf_hostname">होस्ट नाम</string> <string name="perf_hostname_hint">वह नाम जो Steam इस डिवाइस के लिए देखता है। खाली छोड़ने पर %1$s वापस आ जाता है।</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">इसकी फ़ाइलें ऐप से हटा दी जाती हैं।</string> <string name="driver_delete_in_use">इसकी फ़ाइलें हटा दी जाती हैं। यह उपयोग में है, इसलिए डिफ़ॉल्ट इसकी जगह ले लेता है।</string> <string name="drawer_page_display">डिस्प्ले</string> + <string name="drawer_frame_limit">फ़्रेम सीमा</string> + <string name="drawer_frame_limit_note">इस गेम को सीमित करता है। अगर डिस्प्ले में ऐसा रिफ़्रेश रेट है जिसे सीमा बराबर भाग देती है, तो वह उस पर चला जाता है; दूसरी सीमाएं असमान लग सकती हैं। Steam गेम, Quick Access मेनू में Steam की Frame Limit इस्तेमाल करते हैं।</string> <string name="drawer_page_effects">इफ़ेक्ट</string> <string name="drawer_page_controls">कंट्रोल</string> <string name="drawer_page_components">कॉम्पोनेंट</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">पिल</string> <string name="hud_size_minimal">मिनिमल</string> <string name="hud_size_mega">मेगा</string> + <string name="hud_size_strip">पट्टी</string> <string name="hud_locked">जगह पर लॉक करें</string> <string name="hud_locked_hint">HUD को खिसकाने के लिए उसे ड्रैग करें; देर तक दबाने से वह लॉक या अनलॉक होता है। लॉक रहने पर भी उसके नीचे के ऑन-स्क्रीन कंट्रोल काम करते रहते हैं।</string> + <string name="hud_snap">किनारों पर चिपकाएँ</string> + <string name="hud_snap_hint">HUD छोड़ने पर यह स्क्रीन की पास वाली ओर चला जाता है। तेज़ी से झटकने पर यह उसी दिशा में जाता है।</string> <string name="hud_group_look">लुक</string> <string name="hud_scale">स्क्रीन पर आकार</string> <string name="hud_color_soft">हल्का</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">HUD रिपोर्ट सेव नहीं हो सकी।</string> <string name="hud_reset">HUD सेटिंग रीसेट करें</string> <string name="hud_reset_button">रीसेट करें</string> - <string name="hud_credit">The412Banner का FusionHUD, github.com/The412Banner/FusionHUD (GPL-3.0)।</string> <string name="drawer_scaling">स्केलिंग मोड</string> <string name="drawer_scaling_sharpness">स्केलिंग शार्पनेस</string> <string name="drawer_effects">स्क्रीन इफ़ेक्ट</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">ऑटो (%1$s)</string> <string name="drawer_keyboard">कीबोर्ड</string> <string name="drawer_latency">लेटेंसी</string> + <string name="drawer_low_latency">लो लेटेंसी मोड</string> + <string name="drawer_low_latency_hint">CPU और बैटरी का इस्तेमाल बढ़ाता है</string> <string name="drawer_low_latency_controller">कम लेटेंसी कंट्रोलर</string> <string name="drawer_low_latency_controller_hint">कंट्रोलर 250 Hz के बजाय 1000 Hz पर रिपोर्ट करता है। थोड़ा ज़्यादा CPU।</string> <string name="drawer_low_latency_touch">कम लेटेंसी टच</string> <string name="drawer_low_latency_touch_hint">टच फ़्रेम बैचिंग छोड़ देते हैं, इसलिए Steam का टच कंट्रोल 1000 Hz पर चलता है। थोड़ा ज़्यादा CPU।</string> <string name="drawer_evdev_mouse">रॉ माउस चैनल</string> + <string name="drawer_relative_mouse">सापेक्ष माउस</string> + <string name="drawer_relative_mouse_auto">स्वचालित</string> + <string name="drawer_relative_mouse_on">चालू</string> + <string name="drawer_relative_mouse_off">बंद</string> <string name="drawer_direct_cursor">कर्सर</string> <string name="drawer_pc_keyboard">पीसी कीबोर्ड</string> <string name="drawer_android_keyboard">Android</string> @@ -791,6 +838,10 @@ <string name="setup_session">सेशन</string> <string name="setup_logs">सेशन लॉग</string> <string name="setup_logs_hint">हर सेशन के बाद सेव होता है</string> + <string name="setup_game_debug_logs">गेम डीबग लॉग</string> + <string name="setup_game_debug_logs_hint">अगली बार गेम लॉन्च होने पर Proton, Wine और ग्राफ़िक्स डायग्नोस्टिक्स शामिल करें। परफ़ॉर्मेंस घटा सकता है और ज़्यादा स्टोरेज ले सकता है।</string> + <string name="setup_game_debug_logs_restart">गेम डीबग लॉग सेव करने के लिए यह सेशन रीस्टार्ट करें</string> + <string name="setup_logging_update_failed">लॉगिंग अपडेट नहीं हो सकी। स्विच जांचें और फिर कोशिश करें।</string> <string name="setup_agent_commands">डिबगिंग टूल</string> <string name="setup_latest_logs">नवीनतम सेशन लॉग</string> <string name="setup_saved_logs">सेव किए सेशन लॉग</string> @@ -822,20 +873,22 @@ <string name="setup_home">होम स्क्रीन के तौर पर इस्तेमाल करें</string> <string name="setup_home_on">DroidDeck होम ऐप हो सकता है</string> <string name="setup_home_off">DroidDeck को होम ऐप के तौर पर कभी नहीं दिखाया जाता</string> + <string name="setup_home_game_space_first">गेम जोड़ें में DroidDeck को शामिल करें पर सेट करें</string> <string name="setup_orientation">ओरिएंटेशन</string> + <string name="setup_launcher_orientation">लॉन्चर ओरिएंटेशन</string> + <string name="setup_launcher_orientation_auto">डिवाइस रोटेशन के अनुसार</string> + <string name="setup_orientation_portrait">पोर्ट्रेट</string> + <string name="setup_session_orientation">सेशन ओरिएंटेशन</string> + <string name="setup_session_orientation_hint">Steam, गेम, डेस्कटॉप और कंट्रोलर एडिटर पर लागू होता है। रिज़ॉल्यूशन प्रीसेट सेशन के साथ घूमते हैं; कस्टम चौड़ाई और ऊंचाई जैसी डाली गई वैसी ही रहती हैं।</string> <string name="setup_orientation_auto">ऑटोमैटिक लैंडस्केप</string> <string name="setup_orientation_landscape">लैंडस्केप</string> <string name="setup_orientation_reverse">उलटा लैंडस्केप</string> <string name="setup_fullscreen">फ़ुलस्क्रीन</string> <string name="setup_fullscreen_on">Android स्टेटस और नेविगेशन बार छिपाता है</string> <string name="setup_fullscreen_off">Android स्टेटस और नेविगेशन बार दिखाता है</string> - <string name="setup_dual_screen">डुअल स्क्रीन</string> - <string name="setup_dual_screen_hint">ऑटोमैटिक, बिल्ट-इन दूसरी स्क्रीन वाले हैंडहेल्ड पर दूसरी स्क्रीन इस्तेमाल करता है। चालू किसी भी दूसरे डिस्प्ले का इस्तेमाल करता है। बंद सब कुछ एक स्क्रीन पर रखता है।</string> <string name="setup_dual_screen_auto">ऑटोमैटिक</string> <string name="setup_dual_screen_on">चालू</string> <string name="setup_dual_screen_off">बंद</string> - <string name="setup_dual_screen_menu">नीचे की स्क्रीन पर मेनू</string> - <string name="setup_dual_screen_menu_hint">सेक्शन और गेम के दौरान का मेनू दूसरी स्क्रीन पर ले जाता है और टाइपिंग वहीं होती है, ताकि ऊपर की स्क्रीन पूरा दृश्य दिखाए। L2 और R2 सेक्शन बदलते हैं।</string> <string name="setup_dual_screen_controls">गेम में नीचे की स्क्रीन के कंट्रोल</string> <string name="setup_dual_screen_controls_hint">सेशन शुरू होने पर दूसरी स्क्रीन पर ट्रैकपैड और कीबोर्ड खोलता है।</string> <string name="dual_typing_title">ऊपर की स्क्रीन के लिए टाइपिंग</string> @@ -987,6 +1040,14 @@ <string name="gate_step1">Settings → डेवलपर विकल्प → वायरलेस डीबगिंग खोलें और उसे चालू करें</string> <string name="gate_step2">“Pair device with pairing code” पर टैप करें</string> <string name="gate_step3">DroidDeck नोटिफ़िकेशन में कोड टाइप करें</string> + <string name="pairguide_build_number">फ़ोन के बारे में में, बिल्ड नंबर पर 7 बार टैप करें</string> + <string name="pairguide_wireless">वायरलेस डीबगिंग चालू करें</string> + <string name="pairguide_pair">वायरलेस डीबगिंग खोलें, फिर “पेयरिंग कोड से डिवाइस को पेयर करें” पर टैप करें</string> + <string name="pairguide_child_process">“चाइल्ड प्रोसेस से जुड़ी पाबंदियां हटाएं” चालू करें</string> + <string name="pairguide_row_child_process">चाइल्ड प्रोसेस से जुड़ी पाबंदियां हटाएं</string> + <string name="pairguide_row_build_number">बिल्ड नंबर</string> + <string name="pairguide_row_wireless">वायरलेस डीबगिंग</string> + <string name="pairguide_row_pair">पेयरिंग कोड से डिवाइस को पेयर करें</string> <string name="gate_waiting">पेयरिंग पॉप-अप का इंतज़ार हो रहा है…</string> <string name="gate_code_needed">पॉप-अप मिल गया। इसका कोड नोटिफ़िकेशन में डालें।</string> <string name="gate_status">स्थिति</string> @@ -1125,7 +1186,6 @@ <string name="games_never_played">कभी नहीं खेला</string> <string name="games_runtime_busy_percent">रनटाइम व्यस्त · %1$d%%</string> <string name="games_runtime_busy">रनटाइम व्यस्त</string> - <string name="games_runtime_first_play">पहली बार Play पर रनटाइम इंस्टॉल होता है</string> <string name="games_runtime_update">रनटाइम अपडेट उपलब्ध</string> <string name="games_runtime_ready">● रनटाइम तैयार</string> <string name="games_internal">इंटरनल स्टोरेज</string> @@ -1142,6 +1202,9 @@ <string name="gpu_hide_other">दूसरे GPU के ड्राइवर छिपाएं</string> <string name="gpu_show_other">दूसरे GPU के ड्राइवर दिखाएं</string> <string name="gpu_advanced">एडवांस्ड</string> + <string name="gpu_ubwc_title">UBWC कम्पैटिबिलिटी</string> + <string name="gpu_ubwc_hint">अगर Steam या Android में धारियां या झिलमिलाहट दिखे तो चालू या बंद आज़माएं। DroidDeck रीस्टार्ट करने के बाद दोनों ड्राइवर पर लागू होता है।</string> + <string name="gpu_ubwc_restart">लागू करने के लिए DroidDeck रीस्टार्ट करें।</string> <string name="gpu_set_with_display">डिस्प्ले ड्राइवर के साथ सेट: %1$s दोनों साथ लाता है।</string> <string name="gpu_set_with_runtime">रनटाइम ड्राइवर के साथ सेट: %1$s दोनों साथ लाता है।</string> <string name="gpu_runtime_hint">गेम और डेस्कटॉप में उपयोग होता है।</string> @@ -1250,10 +1313,15 @@ <string name="pip_auto">अपने आप PiP में जाएं</string> <string name="unfolded_controls">खुली हुई स्क्रीन पर कंट्रोल</string> <string name="unfolded_controls_hint">खुली होने पर, गेम Steam Deck के ट्रैकपैड और पीछे की ग्रिप के ऊपर दिखता है। बंद होने पर, गेम फ़ुल स्क्रीन में रहता है।</string> + <string name="unfolded_controls_with_controller">कंट्रोलर के साथ भी रखें</string> + <string name="unfolded_controls_with_controller_hint">कंट्रोलर कनेक्ट होने पर भी ये टच कंट्रोल दिखाएं।</string> <string name="pip_suspended">सस्पेंडेड</string> <string name="pip_not_ready">सेशन तैयार होने पर पिक्चर इन पिक्चर उपलब्ध होता है।</string> <string name="pip_permission">Android सेटिंग में DroidDeck के लिए पिक्चर इन पिक्चर की अनुमति दें।</string> <string name="pip_unavailable">Android पिक्चर इन पिक्चर नहीं खोल सका।</string> + <string name="game_more">और</string> + <string name="game_edit_art">आर्ट एडिट करें</string> + <string name="stores_in_steam_label">Steam में</string> <string name="game_shortcut">शॉर्टकट</string> <string name="game_shortcut_add">होम स्क्रीन पर जोड़ें</string> <string name="game_shortcut_choose">गेम चुनें</string> @@ -1277,6 +1345,10 @@ <string name="main_wait_runtime">रनटाइम ऑपरेशन खत्म होने का इंतज़ार करें</string> <string name="main_wait_proton_install">कम्पैटिबिलिटी टूल इंस्टॉल खत्म होने का इंतज़ार करें</string> + <string name="load_compat_title">कम्पैटिबिलिटी टूल तैयार हो रहे हैं</string> + <string name="load_compat_wait">कम्पैटिबिलिटी सेटअप पूरा होने का इंतज़ार</string> + <string name="load_compat_hint">सेटअप पूरा होते ही आपका सेशन शुरू होगा।</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">डेस्कटॉप ऐप इंस्टॉल खत्म होने का इंतज़ार करें</string> <string name="main_wait_install_game">गेम लॉन्च करने से पहले इंस्टॉल खत्म होने का इंतज़ार करें</string> <string name="main_saves_close_session">पहले Steam सेशन बंद करें, ताकि गेम इंपोर्ट के ऊपर सेव न कर सके</string> @@ -1313,6 +1385,9 @@ <string name="main_install_anyway">फिर भी इंस्टॉल करें</string> <string name="main_remove_runtime_title">Linux रनटाइम हटाएं</string> <string name="main_remove_runtime_text">यह रनटाइम, इसके भीतर का Steam क्लाइंट, और वहां इंस्टॉल हर गेम हटा देता है।</string> + <string name="runtime_actions_title">Linux रनटाइम</string> + <string name="runtime_actions_text">रिपेयर रनटाइम की सिस्टम फ़ाइलें फिर से इंस्टॉल करता है और Steam, आपके गेम और सेटिंग रखता है। डेस्कटॉप जैसी अतिरिक्त चीज़ें अगली बार इस्तेमाल करने पर फिर से इंस्टॉल होती हैं। हटाएं सब कुछ डिलीट करता है।</string> + <string name="runtime_repair">रनटाइम रिपेयर करें</string> <string name="main_applied">लागू हुआ: %1$s</string> <string name="android_app_open_failed_primary">%1$s प्राइमरी स्क्रीन पर नहीं खुल सका</string> <string name="android_app_open_failed_on">%1$s %2$s पर नहीं खुल सका</string> @@ -1442,6 +1517,11 @@ <string name="session_runtime_catalog_unreachable">रनटाइम कैटलॉग तक नहीं पहुंचा जा सका। कनेक्शन जांचें और फिर से Play दबाएं।</string> <string name="session_runtime_install_failed">Linux रनटाइम इंस्टॉल नहीं हुआ। सेटअप में रनटाइम जांचें और फिर से Play दबाएं।</string> <string name="session_desktop_install_failed">डेस्कटॉप इंस्टॉल नहीं हुआ (%1$s)। कनेक्शन जांचें और फिर से Desktop दबाएं।</string> + <string name="session_package_resume_failed">बीच में रुका एक इंस्टॉल पूरा नहीं हो सका (%1$s)। कनेक्शन और जगह जांचें, फिर कोशिश करें।</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux रनटाइम खराब है: %1$d लाइब्रेरी लिंक एक गायब फ़ाइल (%2$s) की ओर इशारा करता है, आमतौर पर इंस्टॉल बीच में रुकने के बाद। रिपेयर आपके गेम और सेटिंग रखता है।</item> + <item quantity="other">Linux रनटाइम खराब है: %1$d लाइब्रेरी लिंक गायब फ़ाइलों (%2$s और अन्य) की ओर इशारा करते हैं, आमतौर पर इंस्टॉल बीच में रुकने के बाद। रिपेयर आपके गेम और सेटिंग रखता है।</item> + </plurals> <string name="session_ended_named">%1$s अचानक बंद हो गया। बग रिपोर्ट के साथ लॉग शेयर करें, या फिर कोशिश करें।</string> <string name="session_ended_program">प्रोग्राम अचानक बंद हो गया। बग रिपोर्ट के साथ लॉग शेयर करें, या फिर कोशिश करें।</string> <string name="session_ended_desktop">डेस्कटॉप अचानक बंद हो गया। बग रिपोर्ट के साथ लॉग शेयर करें, या फिर कोशिश करें।</string> @@ -1456,6 +1536,13 @@ <string name="mode_decky_plugins_hint">अगले Steam सेशन के लिए एक प्लगइन ZIP इंस्टॉल करें।</string> <string name="mode_decky_plugin_downloading">डाउनलोड हो रहा है…</string> <string name="mode_decky_plugin_install_zip">ZIP से इंस्टॉल करें</string> + <string name="decky_zip_warning_title">थर्ड-पार्टी प्लगइन इंस्टॉलेशन</string> + <string name="decky_zip_warning_text">Decky Loader टीम ने इस प्लगइन की समीक्षा नहीं की है। इसमें मैलवेयर हो सकता है, जैसे आपका Steam अकाउंट चुराने या आपके डिवाइस को नुकसान पहुंचाने वाला सॉफ़्टवेयर। इस प्लगइन को इंस्टॉल करके, आप सहमत होते हैं कि आपने अपने डिवाइस के सभी जोखिम स्वीकार किए हैं।</string> + <string name="decky_zip_warning_continue">जारी रखें</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">कृपया %1$d सेकंड रुकें</item> + <item quantity="other">कृपया %1$d सेकंड रुकें</item> + </plurals> <string name="store_cat_games">गेम</string> <string name="store_cat_audio_video">ऑडियो और वीडियो</string> <string name="store_cat_graphics">ग्राफ़िक्स</string> @@ -1536,7 +1623,7 @@ <string name="fm_copy">कॉपी करें</string> <string name="fm_cut">कट करें</string> <string name="fm_actions">एक्शन</string> - <string name="fm_favorites">Favorites</string> + <string name="fm_favorites">पसंदीदा</string> <string name="fm_pin_current">मौजूदा फ़ोल्डर पिन करें</string> <string name="fm_no_favorites">अभी कोई favorite नहीं है - किसी फ़ोल्डर को उसके ⋮ मेनू से पिन करें ताकि यहां जल्दी वापस आ सकें।</string> <string name="fm_unpin_favorite">favorites से हटाएं</string> @@ -1552,7 +1639,7 @@ <string name="fm_read_only">रीड-ओनली</string> <string name="fm_read_only_hint">गेम (और Wine) को इस फ़ाइल को ओवरराइट या डिलीट करने से रोकता है।</string> <string name="fm_read_only_failed">रीड-ओनली नहीं बदला जा सका</string> - <string name="fm_hidden">Hidden</string> + <string name="fm_hidden">छिपी हुई</string> <string name="fm_hidden_unsupported">यह स्टोरेज hidden फ़्लैग सेव नहीं कर सकता।</string> <string name="fm_hidden_hint">फ़ाइल को Windows में hidden के तौर पर चिह्नित करता है (Wine का hidden एट्रिब्यूट)।</string> <string name="fm_hidden_failed">इस स्टोरेज पर Hidden नहीं बदला जा सका</string> @@ -1617,6 +1704,8 @@ <string name="fm_accept">स्वीकार करें</string> <string name="fm_decline">अस्वीकार करें</string> <string name="fm_drive_not_readable">%1$s माउंट है लेकिन अभी पढ़ा नहीं जा सकता</string> + <string name="fm_drive_access_title">%1$s तक पहुँच दें</string> + <string name="fm_drive_access_text">Android, DroidDeck को यह ड्राइव दिखाता है पर पढ़ने नहीं देता। DroidDeck के लिए सभी फ़ाइलों का ऐक्सेस चालू करें, फिर वापस आएँ।</string> <string name="fm_list_view">लिस्ट व्यू</string> <string name="fm_grid_view">ग्रिड व्यू</string> <string name="fm_search">सर्च</string> @@ -1644,7 +1733,7 @@ <string name="fm_rail_title">फ़ाइलें</string> <string name="fm_rail_storage">स्टोरेज</string> <string name="fm_rail_quick">क्विक</string> - <string name="fm_rail_favorites">FAVORITES</string> + <string name="fm_rail_favorites">पसंदीदा</string> <string name="fm_rail_downloads">डाउनलोड</string> <string name="fm_rail_downloads_short">डाउनलोड</string> <string name="fm_rail_roms">ROM</string> @@ -1680,7 +1769,7 @@ <string name="ctrl_target_down">D-pad नीचे</string> <string name="ctrl_target_left">D-pad बायां</string> <string name="ctrl_target_right">D-pad दायां</string> - <string name="ctrl_target_hidden">Hidden</string> + <string name="ctrl_target_hidden">छिपा हुआ</string> <string name="ctrl_editor_drag">ले जाने के लिए ड्रैग करें</string> <string name="ctrl_editor_snap">स्नैप</string> <string name="ctrl_editor_save">सेव करें</string> @@ -1688,6 +1777,89 @@ <string name="second_mode_keyboard_trackpad">कीबोर्ड + ट्रैकपैड</string> <string name="second_mode_terminal">टर्मिनल</string> <string name="second_mode_deck_controls">Deck ग्रिप + ट्रैकपैड</string> + <string name="second_mode_dashboard">डैशबोर्ड</string> + <string name="bottom_dashboard_empty">यहां दिखाने के लिए अभी कुछ नहीं है।</string> + <string name="bottom_page_downloads">डाउनलोड</string> + <string name="bottom_downloads_none">कोई डाउनलोड नहीं चल रहा है।</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">शेडर कैश डाउनलोड हो रहा है</string> + <string name="bottom_downloads_paused">रुका हुआ</string> + <string name="bottom_downloads_queued">शुरू होने का इंतज़ार</string> + <string name="bottom_page_notifications">नोटिफ़िकेशन</string> + <string name="bottom_notifications_listener">DroidDeck नीचे की स्क्रीन</string> + <string name="bottom_notifications_why">खेलते समय मैसेज और अन्य नोटिफ़िकेशन यहां दिखाएं। वे सिर्फ़ इसी स्क्रीन पर रहते हैं और सेव नहीं होते। Android एक बार पूछता है: उसका नोटिफ़िकेशन ऐक्सेस पेज इसी स्क्रीन पर खुलता है; वहां DroidDeck चालू करें और यह पेज अपने-आप वापस आ जाएगा।</string> + <string name="bottom_notifications_allow">नोटिफ़िकेशन ऐक्सेस की अनुमति दें</string> + <string name="bottom_notifications_none">कोई नोटिफ़िकेशन नहीं।</string> + <string name="bottom_notifications_count">%1$d नोटिफ़िकेशन</string> + <string name="bottom_notifications_clear">साफ़ करें</string> + <string name="bottom_page_screenshots">स्क्रीनशॉट</string> + <string name="stats_fps_needs_hud">FPS के लिए HUD चालू होना चाहिए</string> + <string name="stats_speed">स्पीड</string> + <string name="stats_pedals">पैडल</string> + <string name="stats_gforce">G-फ़ोर्स</string> + <string name="stats_timing">टाइमिंग</string> + <string name="stats_best_lap">सबसे अच्छा लैप</string> + <string name="stats_tires">टायर °C</string> + <string name="stats_trace">थ्रॉटल और ब्रेक, पिछले 10 s</string> + <string name="stats_speed_chart">स्पीड, %1$s</string> + <string name="stats_gear">गियर</string> + <string name="stats_steam_client_arm">Steam क्लाइंट ARM</string> + <string name="stats_steam_client_x86">Steam क्लाइंट x86</string> + <string name="stats_throttle">थ्रॉटल</string> + <string name="stats_brake">ब्रेक</string> + <string name="stats_lights">डैशबोर्ड</string> + <string name="stats_lamp_shift">शिफ़्ट</string> + <string name="stats_lamp_handbrake">हैंडब्रेक</string> + <string name="stats_lamp_pit">पिट लिमिटर</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">टर्बो %1$s bar</string> + <string name="stats_engine_temp">इंजन %1$s °C</string> + <string name="stats_oil_temp">ऑयल %1$s °C</string> + <string name="stats_power">पावर डिस्ट्रीब्यूटर</string> + <string name="stats_fuel_t">फ़्यूल, t</string> + <string name="stats_fuel_main">मुख्य %1$s t</string> + <string name="stats_fuel_reserve">रिज़र्व %1$s t</string> + <string name="bottom_telemetry_send_title">डैशबोर्ड डेटा भेजें</string> + <string name="bottom_telemetry_send_auto">ऑटोमैटिक</string> + <string name="bottom_telemetry_send_auto_hint">यहां दिए हर गेम के लिए इसे चालू करता है, बाद में मिलने वाले गेम भी शामिल हैं। जिन गेम को आप बंद करते हैं, वे बंद ही रहते हैं।</string> + <string name="bottom_telemetry_send_note">यह गेम की अपनी डेटा आउटपुट सेटिंग बदलता है। यह अगली बार गेम शुरू होने पर लागू होता है; इसे बंद करने पर पुरानी सेटिंग वापस आ जाती है।</string> + <string name="bottom_telemetry_send_close">इसे बदलने के लिए %1$s बंद करें।</string> + <string name="bottom_telemetry_send_failed">%1$s की सेटिंग बदली नहीं जा सकीं।</string> + <string name="bottom_telemetry_send_menu">%1$s: गेम की सेटिंग में IP 127.0.0.1 और पोर्ट %3$d के साथ %2$s चालू करें।</string> + <string name="bottom_shots_where">Pictures/DroidDeck में सेव होते हैं। Steam स्क्रीनशॉट भी यहां दिखते हैं।</string> + <string name="bottom_shots_take">स्क्रीनशॉट लें</string> + <string name="bottom_shots_saved">स्क्रीनशॉट सेव हो गया।</string> + <string name="bottom_shots_failed">स्क्रीनशॉट नहीं लिया जा सका।</string> + <string name="bottom_shots_none">अभी कोई स्क्रीनशॉट नहीं।</string> + <string name="bottom_page_chat">चैट और वॉइस</string> + <string name="bottom_chat_why">मुख्य स्क्रीन पर गेम चलते हुए यहां Steam चैट पढ़ें और जवाब दें। यह उसी अकाउंट का इस्तेमाल करता है जिससे Steam में साइन इन है।</string> + <string name="bottom_chat_not_signed_in">Steam के पास अभी शेयर करने के लिए कोई वेब साइन-इन नहीं है, इसलिए यहां एक बार साइन इन करें।</string> + <string name="bottom_chat_stopped">DroidDeck बैकग्राउंड में था, तब Android ने चैट पेज बंद कर दिया। DroidDeck पर वापस आने पर यह फिर से खुल जाता है।</string> + <string name="bottom_chat_open">Steam Chat खोलें</string> + <string name="bottom_chat_close">चैट बंद करें</string> + <string name="bottom_chat_mic_on">माइक चालू</string> + <string name="bottom_chat_mic_off">माइक बंद</string> + <string name="bottom_chat_mic_unavailable">इस गेम के लिए माइक बंद है। बात करने के लिए DroidDeck की Steam सेटिंग (ऑडियो) में माइक्रोफ़ोन चालू करें और गेम फिर से शुरू करें।</string> + <string name="bottom_chat_volume">वॉल्यूम %1$d%%</string> + <string name="bottom_page_telemetry">इन-गेम आंकड़े</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">बैटरी</string> + <string name="bottom_telemetry_lap">लैप</string> + <string name="bottom_telemetry_position">पोज़िशन</string> + <string name="bottom_telemetry_this_lap">यह लैप</string> + <string name="bottom_telemetry_last_lap">पिछला लैप</string> + <string name="bottom_telemetry_fuel">फ़्यूल</string> + <string name="bottom_telemetry_cargo">कार्गो</string> + <string name="bottom_telemetry_pips">पिप्स SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">कानूनी स्थिति</string> + <string name="bottom_telemetry_balance">बैलेंस</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">पोर्ट %1$d पर डेटा आ रहा है (%3$d बाइट के %2$d पैकेट), लेकिन ऐसे फ़ॉर्मैट में जिसे यह पेज अभी पढ़ नहीं सकता।</string> + <string name="bottom_telemetry_port_busy">पोर्ट %1$s को कोई दूसरा प्रोग्राम पहले से इस्तेमाल कर रहा है, इसलिए वह गेम यहां नहीं दिख सकता।</string> <string name="rtinst_removing">Linux रनटाइम हटाया जा रहा है</string> <plurals name="rtinst_removing_entries"> @@ -1718,6 +1890,7 @@ <string name="flatpakmgr_not_ready">पहले Flatpak सेट करें</string> <string name="flatpakmgr_starting">शुरू हो रहा है</string> <string name="flatpakmgr_exit_status">Flatpak status %1$d के साथ बंद हुआ</string> + <string name="flatpakmgr_wrong_arch">%1$s %2$s के लिए बना है, जिसे DroidDeck नहीं चला सकता। यहाँ Flatpak ऐप ARM64 या x86_64 के लिए बने होने चाहिए।</string> <string name="flatpakmgr_installing">%1$s इंस्टॉल हो रहा है</string> <string name="flatpakmgr_updating">%1$s अपडेट हो रहा है</string> <string name="flatpakmgr_removing">%1$s हटाया जा रहा है</string> @@ -1811,6 +1984,7 @@ <string name="adbpair_applying">सेटिंग लागू की जा रही है…</string> <string name="adbpair_command_failed">वायरलेस डीबगिंग कमांड विफल रहा</string> <string name="adbpair_channel_name">वायरलेस डीबगिंग सेटअप</string> + <string name="adbpair_progress_channel_name">वायरलेस डीबगिंग सेटअप की प्रगति</string> <string name="adbpair_channel_description">Settings खुली रहते हुए वायरलेस डीबगिंग का पेयरिंग कोड मांगता है</string> <string name="adbpair_title_pair">वायरलेस डीबगिंग पेयर करें</string> <string name="adbpair_waiting_text">वायरलेस डीबगिंग चालू करें, फिर “Pair device with pairing code” पर टैप करें।</string> @@ -1919,6 +2093,7 @@ <string name="gpuinfo_not_adreno">Adreno GPU नहीं है</string> <string name="gpuinfo_supported">समर्थित</string> <string name="gpuinfo_experimental">एक्सपेरिमेंटल: इसके ड्राइवर टेस्ट बिल्ड हैं</string> + <string name="gpuinfo_a850_experimental">प्रयोगात्मक Adreno 850 समर्थन: कम्पैटिबल प्रयोगात्मक डिस्प्ले और गेम ड्राइवर चाहिए; इस डिवाइस पर जांचा नहीं गया</string> <string name="gpuinfo_below_tested">जांचे गए हार्डवेयर से नीचे (Adreno 725 और नए): यह शायद न चले</string> <string name="gpuinfo_unsupported">समर्थित नहीं: DroidDeck को Adreno (Snapdragon) GPU चाहिए</string> @@ -2015,6 +2190,7 @@ <string name="display_look_filter">%1$s स्केलिंग को %2$s पर सेट करता है।</string> <string name="display_match_screen">स्क्रीन से मिलाएँ (%1$d×%2$d)</string> <string name="display_follow_screen">Follow screen (खुलने या बंद होने पर आकार बदलता है)</string> + <string name="display_follow_screen_scaled">स्केल %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">डिवाइस जानकारी दिखाएं</string> <string name="device_info_hide">डिवाइस जानकारी छिपाएं</string> @@ -2062,7 +2238,7 @@ <string name="stores_shelf_deals">डील</string> <string name="stores_shelf_free">फ़्री गेम</string> <string name="stores_shelf_trending">ट्रेंडिंग</string> - <string name="stores_play">Play</string> + <string name="stores_play">खेलें</string> <string name="stores_install">इंस्टॉल करें</string> <string name="bnet_open">Battle.net खोलें</string> <string name="bnet_dl_starting">Blizzard का डाउनलोडर शुरू हो रहा है…</string> @@ -2121,6 +2297,13 @@ <string name="stores_resume">फिर से शुरू करें</string> <string name="stores_refresh">रीफ़्रेश करें</string> <string name="stores_sort">क्रमबद्ध करें</string> + <string name="setup_rail_labels">साइडबार लेबल</string> + <string name="setup_rail_labels_hint">साइडबार आइकन के नीचे नाम दिखाएं। पतले साइडबार के लिए बंद करें।</string> + <string name="library_display">डिस्प्ले</string> + <string name="library_display_larger">बड़े कार्ड</string> + <string name="library_display_smaller">छोटे कार्ड</string> + <string name="library_display_title">टाइटल दिखाएं</string> + <string name="library_display_size">साइज़ दिखाएं</string> <string name="stores_sort_last_played">हाल में खेले गए</string> <string name="stores_sort_recently_installed">हाल में इंस्टॉल किए गए</string> <string name="stores_sort_title_asc">शीर्षक A–Z</string> @@ -2247,6 +2430,9 @@ <string name="stores_download_manager">डाउनलोड मैनेजर</string> <string name="stores_parallel">एक साथ डाउनलोड</string> <string name="stores_install_where">कहां इंस्टॉल करें</string> + <string name="stores_install_language">गेम की भाषा</string> + <string name="stores_install_language_hint">GOG और Epic यह भाषा इंस्टॉल करते हैं। सिस्टम, ऐप की भाषा के अनुसार चलता है।</string> + <string name="stores_install_language_system">सिस्टम</string> <string name="stores_install_title">%1$s इंस्टॉल करें:</string> <string name="stores_target_internal">इंटरनल</string> <string name="stores_target_free">%1$s खाली</string> @@ -2285,6 +2471,9 @@ <string name="edit_target">टार्गेट</string> <string name="edit_start_in">यहां शुरू करें</string> <string name="edit_launch_options">लॉन्च विकल्प</string> + <string name="edit_launch_options_steam_hint">Steam की Properties के साथ साझा: किसी एक जगह किया गया बदलाव दोनों में दिखता है।</string> + <string name="edit_launch_options_not_saved">लॉन्च विकल्प Steam में सहेजे नहीं जा सके। फिर से कोशिश करें।</string> + <string name="edit_launch_options_desktop">Steam डेस्कटॉप सेशन में खुला हो सकता है। लॉन्च विकल्प उसकी Properties में बदलें, या पहले सेशन बंद करें।</string> <string name="edit_artwork">आर्टवर्क</string> <string name="edit_other_exe">दूसरा exe…</string> <string name="edit_remove">हटाएं</string> @@ -2412,6 +2601,7 @@ <string name="setup_download_source_custom">अपना प्रीफ़िक्स</string> <string name="setup_download_mirror">साइट</string> <string name="setup_download_prefix">प्रीफ़िक्स</string> + <string name="setup_download_proxy">HTTP प्रॉक्सी</string> <string name="flathub_eyebrow">LINUX ऐप</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Linux डेस्कटॉप के लिए डेस्कटॉप ऐप, डेस्कटॉप से खोले जाते हैं।</string> @@ -2552,6 +2742,22 @@ <string name="glasses_tracking_flat_hint">ऑटोमैटिक इस 2D गेम को व्यू में एक जगह टिकाए रखता है। हेड ट्रैकिंग इस्तेमाल करने के लिए डिस्प्ले में वर्चुअल स्क्रीन चुनें।</string> <string name="glasses_tracking_sbs_hint">हेड ट्रैकिंग वर्चुअल स्क्रीन या चल रहे SteamVR गेम पर लागू होती है।</string> <string name="glasses_hardware">डिवाइस</string> + <string name="vr_controllers_tab">कंट्रोलर</string> + <string name="vr_controllers_group">SteamVR कंट्रोलर</string> + <string name="vr_controllers_emulate">VR में गेम पैड</string> + <string name="vr_controllers_emulate_hint">वे दो VR हाथ जिनके रूप में आपका कंट्रोलर खेलता है। बदलाव तुरंत लागू होते हैं, SteamVR चलते समय भी। Joy-Con और ट्रैक किए गए हाथ अब भी अपनी तरफ़ का नियंत्रण ले लेते हैं।</string> + <string name="vr_controllers_off">सामान्य गेम पैड</string> + <string name="vr_controllers_index">Valve Index कंट्रोलर</string> + <string name="vr_controllers_touch">Meta Quest 3 कंट्रोलर</string> + <string name="vr_controllers_vive">HTC Vive वैंड</string> + <string name="vr_controllers_sticks">स्टिक शुरू में</string> + <string name="vr_controllers_sticks_hint">बदलने के लिए VR के दौरान दोनों स्टिक एक साथ दबाएं।</string> + <string name="vr_controllers_sticks_game">आपको गेम में चलाती हैं</string> + <string name="vr_controllers_sticks_hands">हाथों को हिलाती हैं</string> + <string name="vr_controllers_buttons">बटन</string> + <string name="vr_controllers_buttons_stick">ट्रिगर ट्रिगर ही हैं, बंपर ग्रिप हैं, A/B और X/Y हर हाथ के फ़ेस बटन हैं, स्टिक क्लिक थंबस्टिक क्लिक करते हैं, Guide SteamVR मेनू खोलता है। D-pad ऊपर और नीचे हाथों को पास या दूर ले जाते हैं।</string> + <string name="vr_controllers_buttons_vive">स्टिक ट्रैकपैड हैं; A/X या स्टिक क्लिक उन्हें दबाता है। ट्रिगर ट्रिगर ही हैं, बंपर ग्रिप हैं, Start और Select मेनू हैं, Guide SteamVR मेनू खोलता है।</string> + <string name="vr_controllers_buttons_off">कोई VR हाथ नहीं। गेम पैड का समर्थन करने वाले गेम और SteamVR मेनू को आपका कंट्रोलर हमेशा की तरह मिलता है।</string> <string name="glasses_brightness">ब्राइटनेस</string> <string name="glasses_volume">वॉल्यूम</string> <string name="glasses_sunblock">सनब्लॉक</string> @@ -2609,6 +2815,12 @@ <string name="hand_camera_placement">कैमरे की स्थिति</string> <string name="hand_camera_placement_hint">खेलने से पहले जांच लें कि कैमरा आपको देख पा रहा है।</string> <string name="hand_camera_check">जांचें</string> + <string name="tracking_pack_title">हैंड ट्रैकिंग डाउनलोड</string> + <string name="tracking_pack_hint">हैंड ट्रैकिंग के लिए एक बार %1$s डाउनलोड करना होगा।</string> + <string name="tracking_pack_download">डाउनलोड करें</string> + <string name="tracking_pack_retry">फिर कोशिश करें</string> + <string name="tracking_pack_downloading">हैंड ट्रैकिंग डाउनलोड हो रही है… %1$d%%</string> + <string name="tracking_pack_failed">हैंड ट्रैकिंग डाउनलोड नहीं हो सकी। अपना कनेक्शन जांचें और फिर कोशिश करें।</string> <string name="hand_camera_check_title">कैमरे की स्थिति</string> <string name="hand_camera_how_rear">डिवाइस को करीब सीने की ऊंचाई पर, 1.5 से 2 मीटर दूर खड़ा करें, जिसमें रियर कैमरा आपकी ओर हो। फिर हाथ फैलाकर नज़र के दायरे में आएं।</string> <string name="hand_camera_how_front">डिवाइस को करीब सीने की ऊंचाई पर, 1.5 से 2 मीटर दूर खड़ा करें, जिसमें स्क्रीन आपकी ओर हो। फिर हाथ फैलाकर नज़र के दायरे में आएं।</string> @@ -2680,6 +2892,21 @@ <string name="storage_safe_hint">अप्रयुक्त रनटाइम, बचे अवशेष, पुराने लॉग</string> <string name="storage_clean_up">साफ़ कर रहे हैं…</string> <string name="storage_session_running">साफ़ करने या कुछ हटाने के लिए सेशन रोकें। आकार दिखते रहेंगे।</string> + <string name="storage_default_group">इंस्टॉल की जगह</string> + <string name="storage_default_title">डिफ़ॉल्ट स्टोरेज</string> + <string name="storage_default_hint">स्टोर से नए इंस्टॉल चुनी गई जगह पर जाते हैं। मौजूदा गेम जहां हैं वहीं रहते हैं। Steam लाइब्रेरी अपनी सेटिंग रखती हैं।</string> + <string name="storage_default_ask">हर बार पूछें</string> + <string name="storage_default_ask_detail">हर इंस्टॉल के लिए जगह चुनें</string> + <string name="storage_default_internal">इंटरनल स्टोरेज</string> + <string name="storage_default_external">एक्सटर्नल स्टोरेज</string> + <string name="storage_default_external_detail">%1$s · %2$s खाली</string> + <string name="storage_default_external_missing">कनेक्ट नहीं है</string> + <string name="storage_default_folder">फ़ोल्डर · %1$s</string> + <string name="storage_default_folder_free">%1$s खाली</string> + <string name="storage_default_folder_missing">कनेक्ट नहीं है</string> + <string name="storage_default_choose_folder">फ़ोल्डर चुनें…</string> + <string name="storage_default_choose_folder_detail">SD कार्ड या USB ड्राइव पर कोई भी फ़ोल्डर इस्तेमाल करें</string> + <string name="storage_default_note">गेम चुनी गई जगह के अंदर एक Games फ़ोल्डर में जाते हैं। मौजूदा गेम मूव नहीं किए जाते।</string> <string name="storage_where">कहाँ जाता है</string> <string name="storage_games">Steam गेम</string> <string name="storage_game_data">गेम डेटा</string> @@ -2801,6 +3028,9 @@ <string name="storage_data_installed">इंस्टॉल किए गेम</string> <string name="storage_data_parts">प्रीफ़िक्स %1$s · शेडर %2$s · वर्कशॉप %3$s</string> <string name="storage_clear_shaders">शेडर साफ़ करें</string> + <string name="storage_reset_prefix">प्रीफ़िक्स रीसेट करें</string> + <string name="storage_reset_prefix_title">%1$s का प्रीफ़िक्स रीसेट करें?</string> + <string name="storage_reset_prefix_confirm">%2$s में इसका Wine प्रीफ़िक्स (%1$s) डिलीट करता है और अगले लॉन्च पर इसे फिर से बनाता है। इसके अंदर के सेव, सेटिंग और इंस्टॉल किए रीडिस्ट्रीब्यूटेबल खो जाते हैं; Steam Cloud सेव आपके अकाउंट में रहते हैं।</string> <string name="storage_data_leftovers">हटाए गए गेम</string> <string name="storage_steam_app">Steam ऐप %1$d</string> <string name="storage_leftover_unsure_detail">प्रीफ़िक्स में अब भी फ़ाइलें हैं, शायद लोकल सेव</string> @@ -3102,6 +3332,117 @@ <string name="spatial_saved_views_hint">सहेजे गए दृश्यों की पुनर्गणना की जा सकती है। वर्तमान ट्रैकिंग समन्वय प्रणाली में कैप्चर करने के लिए एक नया अंशांकन प्रारंभ करें।</string> <string name="spatial_model_checksum_error">हैंड मॉडल चेकसम बेमेल</string> <string name="spatial_opencv_load_error">OpenCV लोड नहीं हो सका</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Syncthing से सिंक करें</string> + <string name="sync_enable_hint">Syncthing-Fork पर आधारित यह Syncthing इम्प्लीमेंटेशन आपको DroidDeck के इंटरनल फ़ाइल सिस्टम की फ़ाइलें दूसरे Syncthing इंस्टेंस के साथ सिंक करने देता है। यह सिर्फ़ उन फ़ाइलों के लिए है जिन्हें आप DroidDeck के इंटरनल फ़ाइल सिस्टम में रखते हैं।</string> + <string name="sync_missing">इस बिल्ड में Syncthing शामिल नहीं है।</string> + <string name="sync_starting">Syncthing शुरू हो रहा है</string> + <string name="sync_status_starting">शुरू हो रहा है</string> + <string name="sync_status_up_to_date">अप टू डेट</string> + <string name="sync_status_syncing">सिंक हो रहा है</string> + <string name="sync_status_paused">रोका गया</string> + <string name="sync_status_pausing">रोका जा रहा है</string> + <string name="sync_status_resuming">फिर से शुरू हो रहा है</string> + <string name="sync_status_attention">ध्यान देने की ज़रूरत है</string> + <string name="sync_status_failed">Syncthing बंद हो गया</string> + <string name="sync_failed_retry">फिर से कोशिश करें</string> + <string name="sync_paused_wifi">Wi-Fi मिलने तक रोका गया</string> + <string name="sync_paused_game">गेम के दौरान रोका गया</string> + <string name="sync_summary">%1$d फ़ोल्डर · %3$d में से %2$d डिवाइस कनेक्टेड</string> + <string name="sync_left">%1$s बाकी</string> + <string name="sync_open_web_ui">वेब UI खोलें</string> + <string name="sync_pause">रोकें</string> + <string name="sync_resume">फिर से शुरू करें</string> + <string name="sync_running">चल रहा है</string> + <string name="sync_running_hint">Syncthing को पूरी तरह रोकने के लिए बंद करें।</string> + <string name="sync_this_device">यह डिवाइस</string> + <string name="sync_device_id">डिवाइस ID</string> + <string name="sync_show_qr">QR दिखाएं</string> + <string name="sync_advanced">एडवांस्ड</string> + <string name="sync_advanced_hint">पोर्ट, कब चलाना है, रीसेट</string> + <string name="sync_open">खोलें</string> + <string name="sync_waiting">आपका इंतज़ार है</string> + <string name="sync_pending_device">%1$s कनेक्ट करना चाहता है</string> + <string name="sync_pending_folder">%1$s “%2$s” शेयर करना चाहता है</string> + <string name="sync_pending_folder_hint">DroidDeck में इसे कहां सेव करना है, यह चुनने के लिए स्वीकार करें।</string> + <string name="sync_review">वेब UI में देखें</string> + <string name="sync_folders">फ़ोल्डर</string> + <string name="sync_no_folders">अभी कोई फ़ोल्डर नहीं।</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">अप टू डेट</string> + <string name="sync_folder_syncing">सिंक हो रहा है %1$d%%</string> + <string name="sync_folder_scanning">स्कैन हो रहा है</string> + <string name="sync_folder_paused">रोका गया</string> + <string name="sync_folder_out_of_sync">सिंक नहीं है</string> + <string name="sync_folder_errors">%1$d फ़ाइलें सिंक नहीं हो सकीं</string> + <string name="sync_folder_blocked">ब्लॉक किया गया</string> + <string name="sync_folder_blocked_hint">यह फ़ोल्डर DroidDeck के स्टोरेज से बाहर है, इसलिए DroidDeck ने इसे रोक दिया। DroidDeck से बाहर के फ़ोल्डर सिंक करने के लिए Syncthing-Fork ऐप इस्तेमाल करें।</string> + <string name="sync_remove_folder">Syncthing से हटाएं</string> + <string name="sync_remove_folder_hint">इसे हटाने से कोई फ़ाइल डिलीट नहीं होती।</string> + <string name="sync_devices">डिवाइस</string> + <string name="sync_no_devices">अभी कोई डिवाइस नहीं।</string> + <string name="sync_connected">कनेक्टेड</string> + <string name="sync_offline">ऑफ़लाइन</string> + <string name="sync_last_seen">आख़िरी बार देखा गया: %1$s</string> + <string name="sync_device_id_title">इस डिवाइस की ID</string> + <string name="sync_device_id_hint">अपने दूसरे डिवाइस पर Syncthing में एक डिवाइस जोड़ें और यह कोड स्कैन करें या ID पेस्ट करें। फिर यहां वेब UI में उसे स्वीकार करें।</string> + <string name="sync_copy">कॉपी करें</string> + <string name="sync_share">शेयर करें</string> + <string name="sync_done">पूरा हुआ</string> + <string name="sync_off_title">Syncthing बंद करें?</string> + <string name="sync_off_body">Syncthing अभी रुक जाएगा और दोबारा चालू करने तक बंद रहेगा। सिंक की गई फ़ाइलें जहां हैं वहीं रहेंगी।</string> + <string name="sync_off_forget">Syncthing का कॉन्फ़िग भी डिलीट करें</string> + <string name="sync_off_forget_hint">इस डिवाइस की ID, फ़ोल्डर और डिवाइस हटा देता है। दोबारा चालू करने पर सब नए सिरे से शुरू होगा।</string> + <string name="sync_turn_off">बंद करें</string> + <string name="sync_ports">पोर्ट</string> + <string name="sync_port_sync">सिंक</string> + <string name="sync_port_discovery">लोकल डिस्कवरी</string> + <string name="sync_repick">नए पोर्ट चुनें</string> + <string name="sync_repick_hint">हर बार शुरू होने पर फिर से जांचा जाता है।</string> + <string name="sync_repick_button">फिर से चुनें</string> + <string name="sync_reset_group">रीसेट</string> + <string name="sync_api_key">API कुंजी</string> + <string name="sync_regenerate">फिर से बनाएं</string> + <string name="sync_reset">Syncthing रीसेट करें</string> + <string name="sync_reset_hint">नई डिवाइस ID, फ़ोल्डर और डिवाइस हटा दिए जाते हैं। DroidDeck के स्टोरेज की फ़ाइलें रखी जाती हैं।</string> + <string name="sync_reset_button">रीसेट करें</string> + <string name="sync_reset_confirm_title">Syncthing रीसेट करें?</string> + <string name="sync_running_group">चलना</string> + <string name="sync_run">चलाएं</string> + <string name="sync_run_open">जब DroidDeck खुला हो</string> + <string name="sync_run_background">बैकग्राउंड में</string> + <string name="sync_wifi_only">सिर्फ़ Wi-Fi</string> + <string name="sync_pause_games">गेम के दौरान रोकें</string> + <string name="sync_logs">लॉग</string> + <string name="sync_logs_hint">इस सेशन का Syncthing आउटपुट</string> + <string name="sync_logs_share">शेयर करें</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">पहले Linux रनटाइम सेट अप करें।</string> + <string name="sync_accept">स्वीकार करें</string> + <string name="sync_accept_title">“%1$s” यहां सेव करें</string> + <string name="sync_add_folder">फ़ोल्डर जोड़ें</string> + <string name="sync_add_folder_hint">DroidDeck के स्टोरेज का कोई फ़ोल्डर सिंक करें</string> + <string name="sync_choose">चुनें</string> + <string name="sync_add">जोड़ें</string> + <string name="sync_add_failed">फ़ोल्डर नहीं जोड़ा जा सका।</string> + <string name="sync_share_with">इनके साथ शेयर करें</string> + <string name="sync_share_none">अभी कोई डिवाइस नहीं। आप बाद में वेब UI से यह फ़ोल्डर शेयर कर सकते हैं।</string> + <string name="sync_use_folder">यह फ़ोल्डर इस्तेमाल करें</string> + <string name="sync_new_folder">नया फ़ोल्डर</string> + <string name="sync_location_home">कंटेनर होम</string> + <string name="sync_location_sync">Sync फ़ोल्डर</string> + <string name="sync_location_shared">DroidDeck शेयर्ड स्टोरेज</string> + <string name="sync_location_card">%1$s पर DroidDeck</string> + <string name="sync_location_app">DroidDeck ऐप डेटा</string> + <string name="sync_web_path_locked">नए फ़ोल्डर DroidDeck के Sync फ़ोल्डर में सेव होते हैं। DroidDeck का कोई दूसरा फ़ोल्डर सिंक करने के लिए Syncthing टैब पर फ़ोल्डर जोड़ें इस्तेमाल करें।</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">रीलोड करें</string> + <string name="sync_not_running">Syncthing नहीं चल रहा है।</string> + <string name="session_end_steam_sigill">Steam एक अवैध निर्देश (SIGILL) के साथ रुक गया। यह CPU निर्देश कम्पैटिबिलिटी की समस्या या क्लाइंट क्रैश हो सकता है। अपने डिवाइस की जानकारी के साथ लॉग शेयर करें।</string> + <string name="session_end_steam_try_x64">आप Steam सेटिंग → Steam क्लाइंट → x86-64 (प्रयोगात्मक) आज़मा सकते हैं। इसके लिए अतिरिक्त डाउनलोड चाहिए और यह धीमा चल सकता है।</string> + <string name="session_end_vulkan_device">Linux ग्राफ़िक्स ड्राइवर को इस्तेमाल लायक Vulkan डिवाइस नहीं मिला। जांचें कि चुना गया Linux GPU ड्राइवर इस GPU का समर्थन करता है।</string> + <string name="session_end_gpu_unsupported">यह सेशन शुरू नहीं हो सकता क्योंकि मौजूदा सेटअप में इस GPU के लिए कोई कम्पैटिबल Linux Vulkan ड्राइवर नहीं है। Adreno Turnip ड्राइवर MediaTek/Mali GPU का समर्थन चालू नहीं कर सकते।</string> <string name="setup_group_memory">मेमोरी</string> <string name="setup_clear_cached">सेशन से पहले कैश्ड ऐप बंद करें</string> <string name="setup_clear_cached_hint">सेशन शुरू होने पर DroidDeck उन ऐप को बंद कर देता है जिन्हें Android बैकग्राउंड में रखता है, ताकि गेम को ज़्यादा मेमोरी मिले। वायरलेस डीबगिंग चालू होनी चाहिए।</string> @@ -3125,6 +3466,12 @@ <string name="epic_client_open">खोलें</string> <string name="epic_client_install">इंस्टॉल करें</string> <string name="game_tab_about">परिचय</string> + <string name="game_resources_browser">आपके ब्राउज़र में खुलता है</string> + <string name="game_resource_guides">गाइड</string> + <string name="game_resource_protondb_detail">Linux / Proton कम्पैटिबिलिटी रिपोर्ट</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">उन गेम के लिए जिनके सेव आपके Steam अकाउंट पर हैं</string> + <string name="game_resource_search">वेब सर्च</string> <string name="game_tab_install">इंस्टॉल करें</string> <string name="game_install_location">जगह</string> <string name="game_install_folder">फ़ोल्डर</string> @@ -3141,6 +3488,11 @@ <string name="stores_eyebrow_pass">%1$s के साथ उपलब्ध</string> <string name="stores_owned_in_library">लाइब्रेरी में आपके गेम</string> <string name="library_filter_added">जोड़े गए</string> + <string name="library_filter">फ़िल्टर</string> + <string name="library_filter_installed">सिर्फ़ इंस्टॉल किए</string> + <string name="library_filter_all_owned">आपके सभी गेम</string> + <string name="library_no_installed_matches">इन फ़िल्टर से कोई इंस्टॉल किया गेम मेल नहीं खाता।</string> + <string name="library_browse_owned">आपके गेम देखें</string> <string name="game_tab_launch">लॉन्च</string> <string name="game_tab_saves_cloud">सेव और क्लाउड</string> <string name="game_launch_shortcut">Steam शॉर्टकट</string> @@ -3158,6 +3510,40 @@ <string name="stores_itch_update_replaced">डेवलपर ने इस बिल्ड को %1$s से बदल दिया है। क्या उस पर अपडेट करें?</string> <string name="xbox_filter_cloud">क्लाउड</string> <string name="stores_xbox_cloud_settings">क्लाउड सेटिंग्स</string> + <string name="integration_title">Steam इंटीग्रेशन</string> + <string name="integration_count">%2$d में से %1$d चालू</string> + <string name="integration_set_up">सेट अप करें</string> + <string name="integration_location">लोकेशन</string> + <string name="integration_app_info">ऐप्लिकेशन की जानकारी</string> + <string name="integration_wifi">Wi-Fi नाम</string> + <string name="integration_brightness">ब्राइटनेस</string> + <string name="integration_home">DroidDeck होम के रूप में</string> + <string name="integration_shortcuts">सिस्टम कुंजियाँ</string> + <string name="integration_wifi_hint">Steam में नेटवर्क दिखाएं · लोकेशन ऐक्सेस चाहिए, कभी ट्रैक नहीं किया जाता</string> + <string name="integration_wifi_on">नेटवर्क Steam में दिखते हैं</string> + <string name="integration_wifi_location_off">लोकेशन बंद है</string> + <string name="integration_wifi_denied">लोकेशन अस्वीकार · ऐप्लिकेशन की जानकारी में इसकी अनुमति दें</string> + <string name="integration_brightness_hint">Steam का स्लाइडर स्क्रीन ब्राइटनेस सेट करता है</string> + <string name="integration_home_hint">सेशन में होम, Steam मेनू खोलता है</string> + <string name="integration_shortcuts_hint">Alt+Tab, Win कुंजी और होम बटन सत्र में ही रहते हैं</string> + <string name="integration_shortcuts_maybe_restricted">Android में धूसर है? ऐप्लिकेशन की जानकारी → ⋮ → प्रतिबंधित सेटिंग की अनुमति दें</string> + <string name="integration_shortcuts_restricted">Android ने ब्लॉक किया · ऐप्लिकेशन की जानकारी → ⋮ → प्रतिबंधित सेटिंग की अनुमति दें</string> + <string name="integration_shortcuts_service">DroidDeck सिस्टम कुंजियाँ</string> + <string name="integration_shortcuts_service_description">Alt+Tab, Win कुंजी और होम बटन को Android के बजाय सक्रिय DroidDeck सत्र में रखता है।</string> + <string name="integration_brightness_needed">Setup → Steam इंटीग्रेशन में ब्राइटनेस चालू करें</string> + <string name="setup_gpu_bridge_off">Mali ब्रिज: बंद</string> + <string name="setup_gpu_bridge_on">Mali ब्रिज: चालू</string> + <string name="setup_gpu_bridge_detail">%1$s Adreno नहीं है। प्रायोगिक Vulkan ब्रिज चालू है: सत्र फ़ोन के अपने ड्राइवर से ड्रॉ करता है। बग की उम्मीद रखें; सत्र लॉग भेजें।</string> + <string name="setup_bridge_safe">सुरक्षित मोड</string> + <string name="setup_bridge_safe_on">सुरक्षित मोड: चालू</string> + <string name="setup_bridge_safe_off">सुरक्षित मोड: बंद</string> + <string name="setup_bridge_safe_on_detail">सबसे अधिक संगत। नए डिवाइस के लिए अनुशंसित।</string> + <string name="setup_bridge_safe_off_detail">जहाँ इस GPU ने अपनी जाँचें पास कीं, वहाँ तेज़।</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: स्वचालित</string> + <string name="setup_bridge_dxvk_proton">DXVK: Proton का अपना</string> + <string name="setup_bridge_dxvk_auto_detail">जहाँ इस GPU का Vulkan Proton के DXVK के लिए बहुत पुराना है, वहाँ पुराना DXVK इस्तेमाल करता है।</string> + <string name="setup_bridge_dxvk_proton_detail">हर Proton अपना DXVK रखता है, भले ही इस GPU का Vulkan उसके लिए बहुत पुराना हो।</string> <string name="apps_search_hint">ऐप खोजें</string> <string name="apps_no_match">“%1$s” से कोई ऐप मेल नहीं खाता।</string> <string name="apps_add_widget">विजेट जोड़ें</string> @@ -3206,6 +3592,8 @@ <string name="desktop_restore_done_body">आपके जोड़े गए ऐप्स फिर से इंस्टॉल हो गए हैं।</string> <string name="desktop_restore_failed_title">कुछ सॉफ़्टवेयर वापस नहीं लाया जा सका</string> <string name="desktop_restore_failed_body">~/.cache/droiddeck/apt-restore.log देखें, फिर Konsole में sudo apt install आज़माएँ।</string> + <string name="gog_full_files">नेटिव ऑप्टिमाइज़ेशन उपलब्ध नहीं हैं। डाउनलोड में पूरी बदली जाने वाली फ़ाइलें शामिल हैं।</string> + <string name="gog_recover">पैच का नतीजा जांचें</string> <string name="slow_usb_title">धीमा USB कनेक्शन</string> <string name="slow_usb_cable">%1$s %2$s (%3$s Mbps, लगभग %4$d MB/s) से जुड़ा है, इसलिए इस पर गेम धीरे लोड होंगे। 5 Gbps या तेज़ USB 3 केबल इस्तेमाल करें, USB-C प्लग पलटकर देखें, या तेज़ ड्राइव इस्तेमाल करें।</string> <string name="slow_usb_port">%1$s %2$s (%3$s Mbps, लगभग %4$d MB/s) से जुड़ा है। इस डिवाइस का USB पोर्ट इससे तेज़ नहीं चलता, इसलिए गेम धीरे लोड होंगे। आंतरिक स्टोरेज या microSD कार्ड तेज़ हो सकता है।</string> @@ -3216,4 +3604,52 @@ <string name="steam_import_names_more">%1$s और %2$d और</string> <string name="steam_import_now">अभी फिर से शुरू करें</string> <string name="steam_import_later">बाद में</string> + <string name="gog_maintenance">GOG इंस्टॉलेशन मैनेज करें</string> + <string name="gog_check">अपडेट जांचें</string> + <string name="gog_repair">जांचें/रिपेयर करें</string> + <string name="gog_patches">ऑफ़लाइन पैच</string> + <string name="gog_refresh">पूरा ऑफ़लाइन इंस्टॉलर डाउनलोड करें</string> + <string name="gog_update">%1$s पर अपडेट करें</string> + <string name="gog_resume">GOG मेंटेनेंस फिर से शुरू करें</string> + <string name="gog_open_patch">पैच इंस्टॉलर खोलें</string> + <string name="gog_patch_in_session">Linux सेशन में पैच इंस्टॉलर पूरा या रद्द करें।</string> + <string name="gog_patch_requirements">अपने इंस्टॉल किए वर्शन और भाषा के लिए पैच चुनें। समर्थित सोर्स वर्शन शायद सूची में न हों।</string> + <string name="gog_no_patches">इस गेम के लिए GOG के पास कोई अलग Windows पैच नहीं है।</string> + <string name="gog_managed_files">संशोधित गेम फ़ाइलें बदली जा सकती हैं।</string> + <string name="gog_patch_installer_note">इंस्टॉलर आपके Linux सेशन में खुलता है।</string> + <string name="gog_download_label">डाउनलोड</string> + <string name="gog_space_label">अतिरिक्त जगह</string> + <string name="gog_space_estimate_label">अनुमानित जगह</string> + <string name="gog_repair_action">फ़ाइलें रिपेयर करें</string> + <string name="gog_refresh_action">इंस्टॉलेशन रिफ़्रेश करें</string> + <string name="gog_select_patch">चुनें</string> + <string name="stores_gamejolt_not_owned">आपकी Game Jolt लाइब्रेरी में नहीं</string> + <string name="stores_gamejolt_no_build">इस गेम के लिए Windows डाउनलोड नहीं है</string> + <string name="stores_gamejolt_no_exe">डाउनलोड में कोई Windows गेम नहीं मिला</string> + <string name="stores_gamejolt_no_game">यह गेम Game Jolt पर नहीं मिला</string> + <string name="stores_gamejolt_browse_failed">Game Jolt से गेम लोड नहीं हो सके</string> + <string name="stores_gamejolt_download_failed">Game Jolt ने HTTP %1$d लौटाया</string> + <string name="stores_gamejolt_pick_failed">Game Jolt से डाउनलोड लोड नहीं हो सके</string> + <string name="stores_gamejolt_build_open">Game Jolt पर खोलें</string> + <string name="stores_gamejolt_archive">%1$s आर्काइव समर्थित नहीं हैं</string> + <string name="stores_gamejolt_extract_failed">डाउनलोड एक्सट्रैक्ट नहीं हो सका (कोड %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt तक नहीं पहुँचा जा सका</string> + <string name="stores_gamejolt_download_no_link">Game Jolt ने डाउनलोड लिंक नहीं दिया</string> + <string name="stores_gamejolt_section_featured">फ़ीचर्ड</string> + <string name="stores_gamejolt_section_hot">लोकप्रिय</string> + <string name="stores_gamejolt_section_best">सर्वश्रेष्ठ</string> + <string name="stores_gamejolt_section_new">नए</string> + <string name="stores_gamejolt_price_under_30">$30 या उससे कम</string> + <string name="stores_gamejolt_os_other">अन्य</string> + <string name="stores_gamejolt_maturity_everyone">सभी उम्र</string> + <string name="stores_gamejolt_maturity_teen">किशोर</string> + <string name="stores_gamejolt_maturity_adult">वयस्क</string> + <string name="stores_gamejolt_status_complete">पूर्ण</string> + <string name="stores_gamejolt_status_early">अर्ली एक्सेस</string> + <string name="stores_gamejolt_partners">पार्टनर गेम</string> + <string name="stores_gamejolt_filter_browser">ब्राउज़र</string> + <string name="stores_gamejolt_filter_maturity">आयु वर्ग</string> + <string name="stores_gamejolt_filter_status">स्थिति</string> + <string name="stores_gamejolt_filter_partners">पार्टनर</string> + <string name="stores_gamejolt_followed">फ़ॉलो किए गए गेम</string> </resources> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index adfa213d52..cc32a257af 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-beállítások D3D12-höz. A nodxr kikapcsolja a sugárkövetést; csak olyan játéknál használja, amelynek szüksége van rá.</string> <string name="game_env_proton_log">Állítsa 1-re a Proton diagnosztikai napló bekapcsolásához. A naplózás csökkentheti a teljesítményt, és tárhelyet használ.</string> <string name="game_env_wined3d">Állítsa 1-re, hogy a DXVK helyett az OpenGL-alapú WineD3D-t használja D3D9–11 kompatibilitási teszteléshez.</string> + <string name="game_env_wined3d_renderer">Renderelő DirectDraw, Direct3D 1-7 és WineD3D-vel futó játékokhoz. A Vulkan kihagyja az OpenGL-Zinken útvonalat, és Adrenón sokkal gyorsabb a régi DirectDraw és Direct3D 7 játékoknál.</string> + <string name="game_env_dxvk_d3d8">Állítsa 1-re, hogy a Direct3D 8 a WineD3D helyett DXVK-n keresztül fusson. Gyorsabb az AIO Graphics Test Direct3D 8 tesztjében Adrenón.</string> <string name="game_env_no_ntsync">Állítsa 1-re, hogy ez a játék ne használja az ntsyncet (droiddeck-ntsync vagy kernelillesztőprogram); ekkor a droiddeck-esynct használja, ha van csomag, egyébként a droiddeck-fsynct.</string> <string name="game_env_no_esync">Állítsa 1-re a droiddeck-esync kikapcsolásához ennél a játéknál; helyette a droiddeck-fsynct használja, vagy a droiddeck-ntsynct, ha az fsync is ki van kapcsolva.</string> <string name="game_env_no_fsync">Állítsa 1-re, hogy ez a játék ne használja a droiddeck-fsynct; ekkor a droiddeck-esynct használja, ha van csomag, egyébként a droiddeck-ntsynct.</string> <string name="game_env_fsync_first">Állítsa 1-re, hogy ez a játék a droiddeck-fsyncen fusson, vagy 0-ra, hogy a droiddeck-esync kerüljön előre, ha van csomag a Protonjához.</string> <string name="game_env_xalia">Állítsa 0-ra a Proton kontroller-navigációs segédjének kikapcsolásához ennél a játéknál.</string> + <string name="game_env_anticheat_offline">Alapértelmezetten be. Az Easy Anti-Cheat-játékot csalásvédelem nélkül indítja, ha a játék támogatja az offline játékot. Kapcsolja ki, hogy a szokásos módon az Easy Anti-Cheaten keresztül induljon. Az Easy Anti-Cheatet igénylő online módok továbbra sem érhetők el.</string> <string name="game_env_hud">DXVK overlay D3D9–11-hez. Az fps megjeleníti a képkockasebességet; beállítás nélkül elrejti.</string> <string name="game_env_dxvk_config">Pontosvesszővel elválasztott DXVK-beállítások. A legújabb buildek a dxvk.maxFrameRate beállítást használják a képkocka-korlátozáshoz; szokásos játékhoz a munkamenet képkocka-korlátozóját érdemes használni.</string> + <string name="game_env_cores">CPU-magok ehhez a játékhoz, például 0-4 vagy 0,2,4, a munkamenet játékmagjai helyett. Kevesebb mag hűvösebben fut.</string> <string name="game_env_vkd3d_limit">D3D12 képkockasebesség-korlát. A 0 kikapcsolja a korlátot.</string> <string name="game_env_glthread">Mesa OpenGL szálkezelés. A true érték segíthet a CPU-korlátozott OpenGL-játékoknál; tesztelje játékonként.</string> <string name="sync_backend_title">Wine-szinkronizálás</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">A FEX x86-os Linux-programokat futtat ezen az ARM64-es eszközön. Az Automatikus akkor használja, ha a program x86-ra készült.</string> <string name="app_fex_x86">%1$s a FEX-en keresztül</string> <string name="app_fex_not_ready">Ez a program %1$s PC-khez készült, és a FEX-en keresztül fut, amely még nincs beállítva. Nyissa meg egyszer a Steamet bejelentkezve: a DroidDeck ekkor letölti a FEX-et és a szükséges Steam Linux Runtime-ot, majd ez megnyílik.</string> + <string name="session_proot_missing">A DroidDeck proot nem tölthető le. Ellenőrizze a kapcsolatot, és próbálja újra. A munkamenet nem indult el, mert a tartalék proot túl lassú a játékhoz.</string> + <string name="session_directaudio_missing">A DirectAudio nem tölthető le, ezért a játékhang ebben a munkamenetben a lassabb útvonalat használja.</string> <string name="session_end_program">Ez a program</string> <string name="session_end_steam_download">A Steam-klienst nem sikerült letölteni. Lehet, hogy a hálózat vagy a VPN blokkolja a Steam szervereit; ellenőrizd a kapcsolatot, és próbáld újra.</string> <string name="session_end_steam_setup">A Steam-klienst nem sikerült beállítani. Ellenőrizd a kapcsolatot és a szabad tárhelyet, majd próbáld újra.</string> @@ -271,7 +277,7 @@ <string name="screen_key_size">Méret</string> <string name="screen_key_opacity">Átlátszatlanság</string> <string name="screen_key_type_button">Gomb</string> - <string name="screen_key_shape_trigger">Trigger</string> + <string name="screen_key_shape_trigger">Ravasz</string> <string name="screen_key_toggle">Váltás</string> <string name="screen_key_layout_export">Exportálás</string> <string name="screen_key_shape_pill">Kapszula</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 kontroller</string> <string name="mode_controller_note">Deck: Gyors hozzáférés gomb és gyroszkóp. Steam Controller: ugyanez, a hátsó gombok fogásérzékelésével. DualShock 4 és DualSense: gyroszkóp, és az érintőpadok mint touchpad. Xbox 360: a Gyors hozzáférés megnyitása Guide+A-val.</string> <string name="mode_back">Vissza gomb</string> + <string name="back_hold">Vissza nyomva tartása Steam parancsokhoz</string> + <string name="back_hold_hint">A Vissza nyomva tartása megnyitja a Gyors elérést, vagy más gombokkal Steam kombinációkat ad. Kapcsold ki, hogy a nyomva tartást figyelmen kívül hagyja; a koppintás és dupla koppintás továbbra is működik.</string> + <string name="back_native_qam_hint">Tartsa lenyomva a Vissza gombot 700 ms-ig, vagy tartsa lenyomva a Vissza gombot és nyomjon meg egy másik gombot a Steam-parancsikonokhoz.</string> + <string name="back_double_tap_window">Dupla koppintás időablaka</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Fényerő-szabályozás engedélyezése</string> + <string name="brightness_permission_text">Fényerő-szabályozás beállítása a DroidDeckben.</string> <string name="back_menu_then_qam">Menü → QAM</string> <string name="back_qam_then_menu">QAM → Menü</string> <string name="mode_session">Munkamenet</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Elhalasztja a háttérbeli felfüggesztést, amíg a Steam aktívan letölt.</string> <string name="mode_suspend_note">Az Automatikus szüneteltet a háttérben, és megjelenéskor folytatja. A Manuális megvárja a Folytatást. A Soha mindig futva tartja.</string> <string name="mode_startup">Indítás</string> - <string name="mode_steam_startup">Steam indítása a DroidDeckkel</string> - <string name="mode_steam_startup_hint">Megnyitja a Steam-munkamenetet a DroidDeck indulásakor.</string> + <string name="mode_startup_session">Megnyitás indításkor</string> + <string name="mode_startup_session_hint">A DroidDeck indulásakor elindítja ezt a munkamenetet.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Kiadások keresése…</string> <string name="mode_decky_ready">Készen áll a %1$s telepítésére.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Naprakész · %1$s</string> <string name="mode_decky_loader">Betöltő</string> <string name="mode_decky_install_latest">Legújabb telepítése</string> + <string name="decky_channel">Frissítési csatorna</string> + <string name="decky_channel_hint">Mely Decky Loader-kiadások települjenek. A Decky saját frissítője ugyanezt a csatornát használja.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Előzetes kiadás</string> + <string name="decky_channel_testing">Tesztelés</string> + <string name="decky_channel_failed">Nem sikerült menteni a Decky frissítési csatornáját</string> <string name="mode_decky_on">A Steammel együtt indul. Amíg be van kapcsolva, az eszközön lévő más alkalmazások is irányíthatják a Steamet.</string> <string name="mode_decky_off">Ki. A Steam távoli hibakeresési portja zárva marad.</string> <string name="mode_decky_remove_title">Eltávolítja a Decky Loadert?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Kliens</string> <string name="mode_mangoapp">Teljesítmény-overlay</string> <string name="mode_mangoapp_hint">Kapcsolja ki, ha a játékok összeomlanak vagy elfeketednek Deck módban. A következő munkamenettől érvényes.</string> + <string name="mode_return_after_game">Visszatérés a DroidDeckbe játék után</string> + <string name="mode_return_after_game_hint">Amikor egy a DroidDeckből vagy más indítóból elindított játék bezárul, a Steam szabályosan kilép (előbb befejeződnek a felhőmentések), és oda tér vissza. Ki: a Steamben marad.</string> + <string name="mode_shader_precache">Shader-előgyorsítótárazás</string> + <string name="mode_shader_precache_hint">A Steam előre lefordított shadereket tölt le a játékaihoz, és a háttérben feldolgozza őket, így a játékok kevésbé akadnak. Kikapcsolva adatforgalmat, tárhelyet és akkumulátort takarít meg; a játékok ehelyett játék közben fordítják a shadereket. Ugyanaz a beállítás, mint a Steam Letöltések > Shader-előgyorsítótárazás opciója. A következő munkamenettől érvényes.</string> <string name="mode_steam_repair">Steam-kliens javítása</string> <string name="mode_steam_repair_hint">A Steam kliens újbóli letöltése a Steam következő indításakor. Használja, ha a Steam a betöltő képernyőn ragad. A játékok, a bejelentkezés és a beállítások megmaradnak.</string> <string name="mode_steam_repair_queued">A Steam kliens újra letöltődik a Steam következő indításakor.</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">Megkerüli a PulseAudiót a kisebb késleltetés érdekében.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Hangos csevegéshez.</string> + <string name="drawer_mic_hint">A mikrofonrögzítés be- vagy kikapcsolása ebben a munkamenetben.</string> + <string name="drawer_mic_failed">Nem sikerült módosítani a mikrofont. Próbálja újra.</string> <string name="mode_network">Hálózat</string> <string name="mode_wifi_discovery">Wi-Fi felderítés</string> <string name="mode_wifi_discovery_hint">Wi-Fi nevek és közeli hálózatok megjelenítése a Steamben.</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: valós idejű GPU-sor</string> <string name="perf_gsrealtime_hint">Előnyben részesíti a kompozitor GPU-munkáját. Egyenletesebbé teheti a képkocka-ütemezést, kisebb költséggel a játékoknak.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memória</string> + <string name="perf_cap_off">Ki</string> + <string name="perf_cap_auto">Illesztőprogram alapértéke</string> + <string name="perf_zram_client">A Steam tömörítése játék közben</string> + <string name="perf_zram_client_hint">20 mp-cel a játék indulása után a Steam-kliens a zRAM-ba tömörül, hogy több memória maradjon a játéknak, és a játék bezárásakor visszaolvasódik. Kapcsolja ki, ha a munkamenet röviddel a játékok indulása után bezárul. A fenti RAM-korlát akkor is tömöríti a Steamet, ha a munkamenet túllépi.</string> + <string name="perf_ram_cap">RAM-korlát</string> + <string name="perf_ram_cap_hint">Akkor érvényes, amikor a Steam-kliens fut, Steam módban vagy az asztalról. Ha a munkamenet ennél többet használ, a Steam, majd a munkamenet többi támogatott folyamata a zRAM-ba tömörül. Puha korlát: semmi sem zárul be, de a játékok akadhatnak, amíg a lapok visszatöltődnek.</string> + <string name="perf_ram_cap_unavailable">zRAM swap szükséges, amely ezen az eszközön nincs.</string> + <string name="perf_vram_cap">VRAM-korlát</string> + <string name="perf_vram_cap_hint">A DXVK által a Direct3D-játékoknak jelentett videomemória, így azok kevesebbel számolnak a textúráknál. A játék saját DXVK-beállításai elsőbbséget élveznek. A következő munkamenettől érvényes.</string> <string name="perf_gpuclock">A GPU legmagasabb órajelen tartása</string> <string name="perf_gpuclock_hint">Csak Adreno. Kevesebb akadás, nagyobb akkumulátorhasználat és hőtermelés.</string> <string name="perf_fixes">Munkamenet-javítások</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">proot gyors útvonal</string> <string name="perf_fastpath_needs_seccomp">A proot seccomp-szűrőjét igényli.</string> <string name="perf_fastpath_hint">Gyorsabb fájlkeresés és kevesebb akadás. Kapcsolja ki, ha egy program nem találja a fájljait.</string> + <string name="perf_cursor_composite">A kurzor rajzolása a gamescope-on belül</string> + <string name="perf_cursor_composite_hint">A Gamescope maga rajzolja a mutatót ahelyett, hogy átadná az Androidnak. Kapcsolja be kontrollerrel vezérelt kurzorhoz. Telefonon kikapcsolva gyorsabb. A következő munkamenettől érvényes.</string> <string name="perf_identity">Munkamenet-azonosítás</string> <string name="perf_hostname">Hosztnév</string> <string name="perf_hostname_hint">A név, amelyet a Steam ehhez az eszközhöz lát. Üresen hagyva visszaállítja: %1$s.</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">A fájljai eltávolításra kerülnek az alkalmazásból.</string> <string name="driver_delete_in_use">A fájljai eltávolításra kerülnek. Használatban van, ezért az alapértelmezett veszi át a szerepét.</string> <string name="drawer_page_display">Kijelző</string> + <string name="drawer_frame_limit">Képkockakorlát</string> + <string name="drawer_frame_limit_note">Korlátozza ezt a játékot. A kijelző olyan frissítési frekvenciára vált, amelyet a korlát egyenletesen oszt, ha van ilyen; más korlátok egyenetlennek tűnhetnek. A Steam-játékok a Steam képkockakorlátját használják a Gyors hozzáférés menüben.</string> <string name="drawer_page_effects">Effektek</string> <string name="drawer_page_controls">Vezérlők</string> <string name="drawer_page_components">Összetevők</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">Kapszula</string> <string name="hud_size_minimal">Minimális</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Sáv</string> <string name="hud_locked">Rögzítés a helyén</string> <string name="hud_locked_hint">Húzd a HUD-ot az áthelyezéshez; hosszú nyomással rögzítheted vagy feloldhatod. Rögzítve is működnek az alatta lévő képernyős vezérlők.</string> + <string name="hud_snap">Igazítás az oldalakhoz</string> + <string name="hud_snap_hint">Engedd el a HUD-ot, és a képernyő közelebbi oldalára ugrik. Egy gyors pöccintés abba az irányba dobja.</string> <string name="hud_group_look">Megjelenés</string> <string name="hud_scale">Méret a képernyőn</string> <string name="hud_color_soft">Lágy</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">Nem sikerült menteni a HUD-jelentést.</string> <string name="hud_reset">HUD-beállítások visszaállítása</string> <string name="hud_reset_button">Visszaállítás</string> - <string name="hud_credit">FusionHUD, készítette: The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Méretezési mód</string> <string name="drawer_scaling_sharpness">Méretezési élesség</string> <string name="drawer_effects">Képernyőeffektek</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">Automatikus (%1$s)</string> <string name="drawer_keyboard">Billentyűzet</string> <string name="drawer_latency">Késleltetés</string> + <string name="drawer_low_latency">Alacsony késleltetésű mód</string> + <string name="drawer_low_latency_hint">Növeli a CPU- és akkumulátorhasználatot</string> <string name="drawer_low_latency_controller">Alacsony késleltetésű kontroller</string> <string name="drawer_low_latency_controller_hint">A kontroller 250 Hz helyett 1000 Hz-en jelent. Kicsit több CPU.</string> <string name="drawer_low_latency_touch">Alacsony késleltetésű érintés</string> <string name="drawer_low_latency_touch_hint">Az érintések kihagyják a képkockák kötegelését, így a Steam érintésvezérlése 1000 Hz-en fut. Kicsit több CPU.</string> <string name="drawer_evdev_mouse">Nyers egércsatorna</string> + <string name="drawer_relative_mouse">Relatív egér</string> + <string name="drawer_relative_mouse_auto">Automatikus</string> + <string name="drawer_relative_mouse_on">Be</string> + <string name="drawer_relative_mouse_off">Ki</string> <string name="drawer_direct_cursor">Kurzor</string> <string name="drawer_pc_keyboard">PC-billentyűzet</string> <string name="drawer_android_keyboard">Android</string> @@ -791,6 +838,10 @@ <string name="setup_session">Munkamenet</string> <string name="setup_logs">Munkamenet-naplók</string> <string name="setup_logs_hint">Minden munkamenet után mentve</string> + <string name="setup_game_debug_logs">Játék-hibakeresési naplók</string> + <string name="setup_game_debug_logs_hint">Proton-, Wine- és grafikai diagnosztika a következő játékindításkor. Csökkentheti a teljesítményt, és több tárhelyet használ.</string> + <string name="setup_game_debug_logs_restart">Indítsa újra ezt a munkamenetet a játék-hibakeresési naplók mentéséhez</string> + <string name="setup_logging_update_failed">Nem sikerült frissíteni a naplózást. Ellenőrizze a kapcsolót, és próbálja újra.</string> <string name="setup_agent_commands">Hibakeresési eszközök</string> <string name="setup_latest_logs">Legutóbbi munkamenet-naplók</string> <string name="setup_saved_logs">Mentett munkamenet-naplók</string> @@ -822,20 +873,22 @@ <string name="setup_home">Használat kezdőképernyőként</string> <string name="setup_home_on">A DroidDeck lehet a kezdőképernyő alkalmazás</string> <string name="setup_home_off">A DroidDeck soha nem jelenik meg kezdőképernyő alkalmazásként</string> + <string name="setup_home_game_space_first">A Játékok hozzáadása részben állítsd a DroidDecket Belefoglalásra</string> <string name="setup_orientation">Tájolás</string> + <string name="setup_launcher_orientation">Az indító tájolása</string> + <string name="setup_launcher_orientation_auto">Az eszköz elforgatásának követése</string> + <string name="setup_orientation_portrait">Álló</string> + <string name="setup_session_orientation">Munkamenet tájolása</string> + <string name="setup_session_orientation_hint">A Steamre, a játékokra, az asztalra és a kontrollerszerkesztőre vonatkozik. A felbontás-előbeállítások a munkamenettel együtt forognak; az egyéni szélesség és magasság a megadott módon marad.</string> <string name="setup_orientation_auto">Automatikus fekvő</string> <string name="setup_orientation_landscape">Fekvő</string> <string name="setup_orientation_reverse">Fordított fekvő</string> <string name="setup_fullscreen">Teljes képernyő</string> <string name="setup_fullscreen_on">Elrejti az Android állapot- és navigációs sávokat</string> <string name="setup_fullscreen_off">Megjeleníti az Android állapot- és navigációs sávokat</string> - <string name="setup_dual_screen">Két képernyő</string> - <string name="setup_dual_screen_hint">Az Automatikus a beépített második képernyővel rendelkező kézikonzolokon használja a második képernyőt. A Be bármilyen második kijelzőt használ. A Ki mindent egy képernyőn tart.</string> <string name="setup_dual_screen_auto">Automatikus</string> <string name="setup_dual_screen_on">Be</string> <string name="setup_dual_screen_off">Ki</string> - <string name="setup_dual_screen_menu">Menü az alsó képernyőn</string> - <string name="setup_dual_screen_menu_hint">A szakaszokat és a játék közbeni menüt a második képernyőre helyezi, és ott történik a gépelés, így a felső képernyő teljes nézetet kap. Az L2 és R2 vált szakaszt.</string> <string name="setup_dual_screen_controls">Alsó képernyős vezérlők játékokban</string> <string name="setup_dual_screen_controls_hint">Munkamenet indításakor megnyitja az érintőpadot és a billentyűzetet a második képernyőn.</string> <string name="dual_typing_title">Gépelés a felső képernyőre</string> @@ -987,6 +1040,14 @@ <string name="gate_step1">Nyissa meg: Beállítások → Fejlesztői beállítások → Vezeték nélküli hibakeresés, és kapcsolja be</string> <string name="gate_step2">Koppintson az „Eszköz párosítása párosítási kóddal” lehetőségre</string> <string name="gate_step3">Írja be a kódot a DroidDeck értesítésébe</string> + <string name="pairguide_build_number">A Telefon névjegye menüben koppintson hétszer a Buildszámra</string> + <string name="pairguide_wireless">Kapcsolja be a Vezeték nélküli hibakeresést</string> + <string name="pairguide_pair">Nyissa meg a Vezeték nélküli hibakeresést, majd koppintson az „Eszköz párosítása párosítási kóddal” lehetőségre</string> + <string name="pairguide_child_process">Kapcsolja be az „Alárendelt folyamatok korlátozásának kikapcsolása” lehetőséget</string> + <string name="pairguide_row_child_process">Alárendelt folyamatok korlátozásának kikapcsolása</string> + <string name="pairguide_row_build_number">Buildszám</string> + <string name="pairguide_row_wireless">Vezeték nélküli hibakeresés</string> + <string name="pairguide_row_pair">Eszköz párosítása párosítási kóddal</string> <string name="gate_waiting">Várakozás a párosítási felugró ablakra…</string> <string name="gate_code_needed">Felugró ablak megtalálva. Írja be a kódját az értesítésbe.</string> <string name="gate_status">Állapot</string> @@ -1125,7 +1186,6 @@ <string name="games_never_played">Még nem játszott</string> <string name="games_runtime_busy_percent">Futtatókörnyezet dolgozik · %1$d%%</string> <string name="games_runtime_busy">Futtatókörnyezet dolgozik</string> - <string name="games_runtime_first_play">A futtatókörnyezet az első Játék gombnyomáskor települ</string> <string name="games_runtime_update">Elérhető futtatókörnyezet-frissítés</string> <string name="games_runtime_ready">● A futtatókörnyezet kész</string> <string name="games_internal">Belső tárhely</string> @@ -1142,6 +1202,9 @@ <string name="gpu_hide_other">Más GPU-k illesztőprogramjainak elrejtése</string> <string name="gpu_show_other">Más GPU-k illesztőprogramjainak megjelenítése</string> <string name="gpu_advanced">Speciális</string> + <string name="gpu_ubwc_title">UBWC-kompatibilitás</string> + <string name="gpu_ubwc_hint">Próbálja a Be vagy Ki beállítást, ha a Steam vagy az Android csíkokat vagy villódzást mutat. A DroidDeck újraindítása után mindkét illesztőprogramra érvényes.</string> + <string name="gpu_ubwc_restart">Indítsa újra a DroidDecket az alkalmazáshoz.</string> <string name="gpu_set_with_display">A megjelenítő-illesztőprogrammal együtt beállítva: a %1$s mindkettőt tartalmazza.</string> <string name="gpu_set_with_runtime">A futtatókörnyezet-illesztőprogrammal együtt beállítva: a %1$s mindkettőt tartalmazza.</string> <string name="gpu_runtime_hint">A játékok és az asztal használja.</string> @@ -1250,10 +1313,15 @@ <string name="pip_auto">Automatikus belépés a kép a képben módba</string> <string name="unfolded_controls">Vezérlők a kinyitott képernyőn</string> <string name="unfolded_controls_hint">Kinyitva a játék a Steam Deck érintőpadjai és hátsó fogói fölött jelenik meg. Összecsukva a játék teljes képernyős.</string> + <string name="unfolded_controls_with_controller">Megtartás kontrollerrel is</string> + <string name="unfolded_controls_with_controller_hint">Ezeket az érintéses vezérlőket akkor is megjeleníti, ha kontroller van csatlakoztatva.</string> <string name="pip_suspended">Felfüggesztve</string> <string name="pip_not_ready">A kép a képben mód csak a munkamenet elkészülése után érhető el.</string> <string name="pip_permission">Engedélyezze a kép a képben módot a DroidDeck számára az Android beállításaiban.</string> <string name="pip_unavailable">Az Android nem tudta megnyitni a kép a képben módot.</string> + <string name="game_more">Továbbiak</string> + <string name="game_edit_art">Illusztrációk szerkesztése</string> + <string name="stores_in_steam_label">A Steamben</string> <string name="game_shortcut">Parancsikon</string> <string name="game_shortcut_add">Hozzáadás a kezdőképernyőhöz</string> <string name="game_shortcut_choose">Játék kiválasztása</string> @@ -1277,6 +1345,10 @@ <string name="main_wait_runtime">Várja meg a futtatókörnyezet-művelet befejezését</string> <string name="main_wait_proton_install">Várja meg a kompatibilitási eszköz telepítésének befejezését</string> + <string name="load_compat_title">Kompatibilitási eszközök előkészítése</string> + <string name="load_compat_wait">Várakozás a kompatibilitási beállítás befejezésére</string> + <string name="load_compat_hint">A munkamenet a beállítás befejezése után indul.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Várja meg az asztali alkalmazás telepítésének befejezését</string> <string name="main_wait_install_game">Várja meg a telepítés befejezését, mielőtt elindít egy játékot</string> <string name="main_saves_close_session">Előbb zárja be a Steam-munkamenetet, hogy a játék ne írhassa felül az importált mentést</string> @@ -1313,6 +1385,9 @@ <string name="main_install_anyway">Telepítés mindenképpen</string> <string name="main_remove_runtime_title">Linux futtatókörnyezet eltávolítása</string> <string name="main_remove_runtime_text">Ez törli a futtatókörnyezetet, a benne lévő Steam-klienst és az összes ott telepített játékot.</string> + <string name="runtime_actions_title">Linux futtatókörnyezet</string> + <string name="runtime_actions_text">A javítás újratelepíti a futtatókörnyezet rendszerfájljait, a Steam, a játékok és a beállítások megmaradnak. Az extrák, például az asztal, a következő használatkor újra települnek. Az eltávolítás mindent töröl.</string> + <string name="runtime_repair">Futtatókörnyezet javítása</string> <string name="main_applied">Alkalmazva: %1$s</string> <string name="android_app_open_failed_primary">Nem sikerült megnyitni a %1$s alkalmazást az elsődleges képernyőn</string> <string name="android_app_open_failed_on">Nem sikerült megnyitni a %1$s alkalmazást itt: %2$s</string> @@ -1442,6 +1517,11 @@ <string name="session_runtime_catalog_unreachable">Nem sikerült elérni a futtatókörnyezet-katalógust. Ellenőrizze a kapcsolatot, és nyomja meg újra a Játék gombot.</string> <string name="session_runtime_install_failed">A Linux futtatókörnyezet telepítése sikertelen. Ellenőrizze a futtatókörnyezetet a Beállításban, és nyomja meg újra a Játék gombot.</string> <string name="session_desktop_install_failed">Az asztal telepítése sikertelen (%1$s). Ellenőrizze a kapcsolatot, és nyomja meg újra az Asztal gombot.</string> + <string name="session_package_resume_failed">Egy megszakadt telepítést nem sikerült befejezni (%1$s). Ellenőrizze a kapcsolatot és a tárhelyet, majd próbálja újra.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">A Linux futtatókörnyezet sérült: %1$d könyvtárhivatkozás hiányzó fájlra mutat (%2$s), általában egy megszakadt telepítés után. A javítás megtartja a játékokat és a beállításokat.</item> + <item quantity="other">A Linux futtatókörnyezet sérült: %1$d könyvtárhivatkozás hiányzó fájlokra mutat (%2$s és mások), általában egy megszakadt telepítés után. A javítás megtartja a játékokat és a beállításokat.</item> + </plurals> <string name="session_ended_named">%1$s váratlanul leállt. Ossza meg a naplókat egy hibajelentésben, vagy próbálja újra.</string> <string name="session_ended_program">A program váratlanul leállt. Ossza meg a naplókat egy hibajelentésben, vagy próbálja újra.</string> <string name="session_ended_desktop">Az asztal váratlanul leállt. Ossza meg a naplókat egy hibajelentésben, vagy próbálja újra.</string> @@ -1456,6 +1536,13 @@ <string name="mode_decky_plugins_hint">Telepítsen egy bővítmény ZIP-et a következő Steam-munkamenethez.</string> <string name="mode_decky_plugin_downloading">Letöltés…</string> <string name="mode_decky_plugin_install_zip">Telepítés ZIP-ből</string> + <string name="decky_zip_warning_title">Harmadik féltől származó bővítmény telepítése</string> + <string name="decky_zip_warning_text">A Decky Loader csapata nem vizsgálta meg ezt a bővítményt. Kártevőt tartalmazhat, például olyan szoftvert, amely ellopja a Steam-fiókját vagy kárt tesz az eszközében. A bővítmény telepítésével elfogadja, hogy az eszközét érintő minden kockázatot Ön vállal.</string> + <string name="decky_zip_warning_continue">Folytatás</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Várjon %1$d másodpercet</item> + <item quantity="other">Várjon %1$d másodpercet</item> + </plurals> <string name="store_cat_games">Játékok</string> <string name="store_cat_audio_video">Hang és videó</string> <string name="store_cat_graphics">Grafika</string> @@ -1617,6 +1704,8 @@ <string name="fm_accept">Elfogadom</string> <string name="fm_decline">Elutasítom</string> <string name="fm_drive_not_readable">A %1$s csatolva van, de jelenleg nem olvasható</string> + <string name="fm_drive_access_title">Hozzáférés engedélyezése: %1$s</string> + <string name="fm_drive_access_text">Az Android látni engedi a DroidDecknek ezt a meghajtót, de olvasni nem. Kapcsold be a DroidDecknél az Összes fájlhoz való hozzáférést, majd gyere vissza.</string> <string name="fm_list_view">Listanézet</string> <string name="fm_grid_view">Rácsnézet</string> <string name="fm_search">Keresés</string> @@ -1688,6 +1777,89 @@ <string name="second_mode_keyboard_trackpad">Billentyűzet + érintőpad</string> <string name="second_mode_terminal">Terminál</string> <string name="second_mode_deck_controls">Deck fogók + érintőpadok</string> + <string name="second_mode_dashboard">Irányítópult</string> + <string name="bottom_dashboard_empty">Itt még nincs mit megjeleníteni.</string> + <string name="bottom_page_downloads">Letöltések</string> + <string name="bottom_downloads_none">Nincs folyamatban lévő letöltés.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Shader-gyorsítótár letöltése</string> + <string name="bottom_downloads_paused">Szüneteltetve</string> + <string name="bottom_downloads_queued">Indításra vár</string> + <string name="bottom_page_notifications">Értesítések</string> + <string name="bottom_notifications_listener">DroidDeck alsó képernyő</string> + <string name="bottom_notifications_why">Itt jelenítheti meg az üzeneteket és más értesítéseket játék közben. Csak ezen a képernyőn láthatók, és nem kerülnek mentésre. Az Android egyszer kérdez rá: az értesítési hozzáférés oldala ezen a képernyőn nyílik meg; kapcsolja be ott a DroidDecket, és ez az oldal magától visszatér.</string> + <string name="bottom_notifications_allow">Értesítési hozzáférés engedélyezése</string> + <string name="bottom_notifications_none">Nincsenek értesítések.</string> + <string name="bottom_notifications_count">%1$d értesítés</string> + <string name="bottom_notifications_clear">Törlés</string> + <string name="bottom_page_screenshots">Képernyőképek</string> + <string name="stats_fps_needs_hud">Az FPS-hez be kell kapcsolni a HUD-ot</string> + <string name="stats_speed">Sebesség</string> + <string name="stats_pedals">Pedálok</string> + <string name="stats_gforce">G-erő</string> + <string name="stats_timing">Időmérés</string> + <string name="stats_best_lap">Legjobb kör</string> + <string name="stats_tires">Gumik °C</string> + <string name="stats_trace">Gáz és fék, utolsó 10 s</string> + <string name="stats_speed_chart">Sebesség, %1$s</string> + <string name="stats_gear">Fokozat</string> + <string name="stats_steam_client_arm">Steam-kliens ARM</string> + <string name="stats_steam_client_x86">Steam-kliens x86</string> + <string name="stats_throttle">Gáz</string> + <string name="stats_brake">Fék</string> + <string name="stats_lights">Műszerfal</string> + <string name="stats_lamp_shift">Váltás</string> + <string name="stats_lamp_handbrake">Kézifék</string> + <string name="stats_lamp_pit">Bokszutcai limiter</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbó %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olaj %1$s °C</string> + <string name="stats_power">Energiaelosztó</string> + <string name="stats_fuel_t">Üzemanyag, t</string> + <string name="stats_fuel_main">Fő %1$s t</string> + <string name="stats_fuel_reserve">Tartalék %1$s t</string> + <string name="bottom_telemetry_send_title">Műszerfal-adatok küldése</string> + <string name="bottom_telemetry_send_auto">Automatikus</string> + <string name="bottom_telemetry_send_auto_hint">Bekapcsolja az itt felsorolt összes játéknál, a később talált játékokat is beleértve. A kikapcsolt játékok kikapcsolva maradnak.</string> + <string name="bottom_telemetry_send_note">Ez a játék saját adatkimeneti beállítását módosítja. A játék következő indításakor lép érvénybe; kikapcsoláskor visszaáll a régi beállítás.</string> + <string name="bottom_telemetry_send_close">A módosításhoz zárja be ezt: %1$s.</string> + <string name="bottom_telemetry_send_failed">Nem sikerült módosítani a következő beállításait: %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: kapcsolja be a(z) %2$s opciót a játék beállításaiban, 127.0.0.1 IP-címmel és %3$d porttal.</string> + <string name="bottom_shots_where">Mentés helye: Pictures/DroidDeck. A Steam-képernyőképek is itt jelennek meg.</string> + <string name="bottom_shots_take">Képernyőkép készítése</string> + <string name="bottom_shots_saved">Képernyőkép mentve.</string> + <string name="bottom_shots_failed">Nem sikerült képernyőképet készíteni.</string> + <string name="bottom_shots_none">Még nincsenek képernyőképek.</string> + <string name="bottom_page_chat">Csevegés és hang</string> + <string name="bottom_chat_why">Itt olvashatja a Steam-csevegést és válaszolhat rá, miközben a játék tovább fut a fő képernyőn. Azt a fiókot használja, amellyel a Steambe bejelentkezett.</string> + <string name="bottom_chat_not_signed_in">A Steam még nem rendelkezik megosztható webes bejelentkezéssel, ezért egyszer jelentkezzen be itt.</string> + <string name="bottom_chat_stopped">Az Android bezárta a csevegőoldalt, amíg a DroidDeck a háttérben volt. Újra megnyílik, amikor visszatér a DroidDeckhez.</string> + <string name="bottom_chat_open">Steam Chat megnyitása</string> + <string name="bottom_chat_close">Csevegés bezárása</string> + <string name="bottom_chat_mic_on">Mikrofon be</string> + <string name="bottom_chat_mic_off">Mikrofon ki</string> + <string name="bottom_chat_mic_unavailable">A mikrofon ki van kapcsolva ennél a játéknál. A beszédhez kapcsolja be a Mikrofon opciót a DroidDeck Steam-beállításaiban (Hang), majd indítsa újra a játékot.</string> + <string name="bottom_chat_volume">Hangerő %1$d%%</string> + <string name="bottom_page_telemetry">Játékon belüli statisztikák</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Akkumulátor</string> + <string name="bottom_telemetry_lap">Kör</string> + <string name="bottom_telemetry_position">Helyezés</string> + <string name="bottom_telemetry_this_lap">Aktuális kör</string> + <string name="bottom_telemetry_last_lap">Előző kör</string> + <string name="bottom_telemetry_fuel">Üzemanyag</string> + <string name="bottom_telemetry_cargo">Rakomány</string> + <string name="bottom_telemetry_pips">Pontok SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Jogi státusz</string> + <string name="bottom_telemetry_balance">Egyenleg</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">A(z) %1$d port adatokat fogad (%2$d csomag, egyenként %3$d bájt), de olyan formátumban, amelyet ez az oldal még nem tud olvasni.</string> + <string name="bottom_telemetry_port_busy">A(z) %1$s portot már egy másik program használja, ezért az a játék itt nem jeleníthető meg.</string> <string name="rtinst_removing">Linux futtatókörnyezet eltávolítása</string> <plurals name="rtinst_removing_entries"> @@ -1718,6 +1890,7 @@ <string name="flatpakmgr_not_ready">Előbb állítsa be a Flatpakot</string> <string name="flatpakmgr_starting">Indítás</string> <string name="flatpakmgr_exit_status">A Flatpak %1$d állapotkóddal lépett ki</string> + <string name="flatpakmgr_wrong_arch">A(z) %1$s %2$s rendszerre készült, ezt a DroidDeck nem tudja futtatni. Az itteni Flatpak-alkalmazásoknak ARM64- vagy x86_64-változat kell.</string> <string name="flatpakmgr_installing">%1$s telepítése</string> <string name="flatpakmgr_updating">%1$s frissítése</string> <string name="flatpakmgr_removing">%1$s eltávolítása</string> @@ -1811,6 +1984,7 @@ <string name="adbpair_applying">A beállítás alkalmazása…</string> <string name="adbpair_command_failed">A vezeték nélküli hibakeresés parancsa sikertelen</string> <string name="adbpair_channel_name">Vezeték nélküli hibakeresés beállítása</string> + <string name="adbpair_progress_channel_name">Vezeték nélküli hibakeresés beállításának állapota</string> <string name="adbpair_channel_description">A vezeték nélküli hibakeresés párosítási kódját kéri, amíg a Beállítások meg van nyitva</string> <string name="adbpair_title_pair">Vezeték nélküli hibakeresés párosítása</string> <string name="adbpair_waiting_text">Kapcsolja be a vezeték nélküli hibakeresést, majd koppintson az „Eszköz párosítása párosítási kóddal” lehetőségre.</string> @@ -1919,6 +2093,7 @@ <string name="gpuinfo_not_adreno">Nem Adreno GPU</string> <string name="gpuinfo_supported">Támogatott</string> <string name="gpuinfo_experimental">Kísérleti: az illesztőprogramjai teszt buildek</string> + <string name="gpuinfo_a850_experimental">Kísérleti Adreno 850-támogatás: kompatibilis kísérleti kijelző- és játék-illesztőprogramokat igényel; ezen az eszközön nincs ellenőrizve</string> <string name="gpuinfo_below_tested">A tesztelt hardver alatt (Adreno 725 és újabb): lehet, hogy nem fut</string> <string name="gpuinfo_unsupported">Nem támogatott: a DroidDecknek Adreno (Snapdragon) GPU szükséges</string> @@ -2015,6 +2190,7 @@ <string name="display_look_filter">%1$s A méretezést erre állítja: %2$s.</string> <string name="display_match_screen">Képernyőhöz illesztés (%1$d×%2$d)</string> <string name="display_follow_screen">Képernyő követése (átméreteződik össze- vagy kinyitáskor)</string> + <string name="display_follow_screen_scaled">Skálázva %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Eszközrészletek megjelenítése</string> <string name="device_info_hide">Eszközrészletek elrejtése</string> @@ -2121,6 +2297,13 @@ <string name="stores_resume">Folytatás</string> <string name="stores_refresh">Frissítés</string> <string name="stores_sort">Rendezés</string> + <string name="setup_rail_labels">Oldalsáv-feliratok</string> + <string name="setup_rail_labels_hint">Nevek megjelenítése az oldalsáv ikonjai alatt. Kapcsolja ki a keskenyebb oldalsávhoz.</string> + <string name="library_display">Megjelenítés</string> + <string name="library_display_larger">Nagyobb kártyák</string> + <string name="library_display_smaller">Kisebb kártyák</string> + <string name="library_display_title">Cím megjelenítése</string> + <string name="library_display_size">Méret megjelenítése</string> <string name="stores_sort_last_played">Nemrég játszott</string> <string name="stores_sort_recently_installed">Nemrég telepített</string> <string name="stores_sort_title_asc">Cím A–Z</string> @@ -2247,6 +2430,9 @@ <string name="stores_download_manager">Letöltéskezelő</string> <string name="stores_parallel">Egyszerre futó letöltések</string> <string name="stores_install_where">Telepítés ide</string> + <string name="stores_install_language">Játék nyelve</string> + <string name="stores_install_language_hint">A GOG és az Epic ezen a nyelven telepít. A Rendszer az alkalmazás nyelvét követi.</string> + <string name="stores_install_language_system">Rendszer</string> <string name="stores_install_title">%1$s telepítése:</string> <string name="stores_target_internal">Belső</string> <string name="stores_target_free">%1$s szabad</string> @@ -2285,6 +2471,9 @@ <string name="edit_target">Cél</string> <string name="edit_start_in">Indítás innen</string> <string name="edit_launch_options">Indítási beállítások</string> + <string name="edit_launch_options_steam_hint">Közös a Steam Tulajdonságaival: az egyik helyen végzett módosítás mindkettőben megjelenik.</string> + <string name="edit_launch_options_not_saved">Az indítási beállításokat nem sikerült menteni a Steambe. Próbáld újra.</string> + <string name="edit_launch_options_desktop">Lehet, hogy a Steam nyitva van az asztali munkamenetben. Módosítsd az indítási beállításokat a Tulajdonságaiban, vagy előbb zárd be a munkamenetet.</string> <string name="edit_artwork">Illusztráció</string> <string name="edit_other_exe">Másik exe…</string> <string name="edit_remove">Eltávolítás</string> @@ -2412,6 +2601,7 @@ <string name="setup_download_source_custom">Saját prefix</string> <string name="setup_download_mirror">Webhely</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">HTTP-proxy</string> <string name="flathub_eyebrow">LINUX-ALKALMAZÁSOK</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Asztali alkalmazások a Linux-asztalhoz, az Asztalról megnyitva.</string> @@ -2552,6 +2742,22 @@ <string name="glasses_tracking_flat_hint">Az Automatikus mód rögzítve tartja ezt a 2D-s játékot a látótérben. A fejkövetéshez válassza a Kijelző részben a Virtuális képernyő lehetőséget.</string> <string name="glasses_tracking_sbs_hint">A fejkövetés virtuális képernyőre vagy futó SteamVR-játékra vonatkozik.</string> <string name="glasses_hardware">Eszköz</string> + <string name="vr_controllers_tab">Kontrollerek</string> + <string name="vr_controllers_group">SteamVR-kontrollerek</string> + <string name="vr_controllers_emulate">Gamepad VR-ben</string> + <string name="vr_controllers_emulate_hint">A két VR-kéz, amelyként a kontrollere működik. A módosítások azonnal érvényesek, akkor is, ha a SteamVR fut. A Joy-Conok és a követett kezek továbbra is átveszik a saját oldalukat.</string> + <string name="vr_controllers_off">Normál gamepad</string> + <string name="vr_controllers_index">Valve Index kontrollerek</string> + <string name="vr_controllers_touch">Meta Quest 3 kontrollerek</string> + <string name="vr_controllers_vive">HTC Vive pálcák</string> + <string name="vr_controllers_sticks">A karok kezdetben</string> + <string name="vr_controllers_sticks_hint">VR közben nyomja be egyszerre mindkét kart a váltáshoz.</string> + <string name="vr_controllers_sticks_game">Önt mozgatják a játékban</string> + <string name="vr_controllers_sticks_hands">A kezeket mozgatják</string> + <string name="vr_controllers_buttons">Gombok</string> + <string name="vr_controllers_buttons_stick">A ravaszok ravaszok, a vállgombok fognak, az A/B és X/Y az egyes kezek előlapi gombjai, a karok benyomása a hüvelykujjkarokat nyomja be, a Guide megnyitja a SteamVR menüt. A D-pad fel és le közelebb vagy távolabb viszi a kezeket.</string> + <string name="vr_controllers_buttons_vive">A karok érintőpadok; az A/X vagy egy kar benyomása nyomja meg őket. A ravaszok ravaszok, a vállgombok fognak, a Start és a Select a menü, a Guide megnyitja a SteamVR menüt.</string> + <string name="vr_controllers_buttons_off">Nincsenek VR-kezek. A gamepadet támogató játékok és a SteamVR menü a szokásos módon kapják meg a kontrollert.</string> <string name="glasses_brightness">Fényerő</string> <string name="glasses_volume">Hangerő</string> <string name="glasses_sunblock">Elsötétítés</string> @@ -2609,6 +2815,12 @@ <string name="hand_camera_placement">Kamera elhelyezése</string> <string name="hand_camera_placement_hint">Játék előtt ellenőrizze, hogy a kamera látja-e Önt.</string> <string name="hand_camera_check">Ellenőrzés</string> + <string name="tracking_pack_title">Kézkövetés letöltése</string> + <string name="tracking_pack_hint">A kézkövetéshez egyszeri, %1$s méretű letöltés szükséges.</string> + <string name="tracking_pack_download">Letöltés</string> + <string name="tracking_pack_retry">Újra</string> + <string name="tracking_pack_downloading">Kézkövetés letöltése… %1$d%%</string> + <string name="tracking_pack_failed">Nem sikerült letölteni a kézkövetést. Ellenőrizze a kapcsolatot, és próbálja újra.</string> <string name="hand_camera_check_title">Kamera elhelyezése</string> <string name="hand_camera_how_rear">Állítsa az eszközt függőlegesen 1,5–2 méter távolságra, nagyjából mellkasmagasságban úgy, hogy a hátlapi kamera Ön felé nézzen. Ezután lépjen a látótérbe kinyújtott kezekkel.</string> <string name="hand_camera_how_front">Állítsa az eszközt függőlegesen 1,5–2 méter távolságra, nagyjából mellkasmagasságban úgy, hogy a képernyő Ön felé nézzen. Ezután lépjen a látótérbe kinyújtott kezekkel.</string> @@ -2680,6 +2892,21 @@ <string name="storage_safe_hint">Nem használt futtatókörnyezetek, maradványok, régi naplók</string> <string name="storage_clean_up">Takarítás…</string> <string name="storage_session_running">A takarításhoz vagy törléshez állítsd le a munkamenetet. A méretek láthatók maradnak.</string> + <string name="storage_default_group">Telepítési hely</string> + <string name="storage_default_title">Alapértelmezett tárhely</string> + <string name="storage_default_hint">Az új áruházi telepítések a kiválasztott helyre kerülnek. A meglévő játékok a helyükön maradnak. A Steam-könyvtárak megtartják saját beállításukat.</string> + <string name="storage_default_ask">Kérdezzen rá minden alkalommal</string> + <string name="storage_default_ask_detail">Célhely választása minden telepítésnél</string> + <string name="storage_default_internal">Belső tárhely</string> + <string name="storage_default_external">Külső tárhely</string> + <string name="storage_default_external_detail">%1$s · %2$s szabad</string> + <string name="storage_default_external_missing">Nincs csatlakoztatva</string> + <string name="storage_default_folder">Mappa · %1$s</string> + <string name="storage_default_folder_free">%1$s szabad</string> + <string name="storage_default_folder_missing">Nincs csatlakoztatva</string> + <string name="storage_default_choose_folder">Mappa kiválasztása…</string> + <string name="storage_default_choose_folder_detail">Bármely mappa használata SD-kártyán vagy USB-meghajtón</string> + <string name="storage_default_note">A játékok a kiválasztott helyen belüli Games mappába kerülnek. A meglévő játékok nem kerülnek áthelyezésre.</string> <string name="storage_where">Hova kerül</string> <string name="storage_games">Steam-játékok</string> <string name="storage_game_data">Játékadatok</string> @@ -2801,6 +3028,9 @@ <string name="storage_data_installed">Telepített játékok</string> <string name="storage_data_parts">Prefix %1$s · shaderek %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Shaderek törlése</string> + <string name="storage_reset_prefix">Prefix visszaállítása</string> + <string name="storage_reset_prefix_title">Visszaállítja a(z) %1$s prefixét?</string> + <string name="storage_reset_prefix_confirm">Törli a Wine-prefixet (%1$s) itt: %2$s, és a következő indításkor újra létrehozza. A benne lévő mentések, beállítások és telepített újraterjeszthető csomagok elvesznek; a Steam Cloud-mentések a fiókjában maradnak.</string> <string name="storage_data_leftovers">Törölt játékok</string> <string name="storage_steam_app">Steam-alkalmazás %1$d</string> <string name="storage_leftover_unsure_detail">A prefix még tartalmaz fájlokat, talán helyi mentéseket</string> @@ -3100,6 +3330,117 @@ <string name="spatial_saved_views_hint">Az elmentett nézetek újraszámíthatók. Indítson el egy új kalibrálást, hogy rögzítse az aktuális követési koordináta-rendszerben.</string> <string name="spatial_model_checksum_error">A kézi modell ellenőrzőösszegének eltérése</string> <string name="spatial_opencv_load_error">Az OpenCV betöltése nem sikerült</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Szinkronizálás Syncthinggel</string> + <string name="sync_enable_hint">Ez a Syncthing-Forkon alapuló Syncthing-megvalósítás lehetővé teszi, hogy a DroidDeck belső fájlrendszerében lévő fájlokat más Syncthing-példányokkal szinkronizálja. Csak a DroidDeck belső fájlrendszerében tárolt fájlokra vonatkozik.</string> + <string name="sync_missing">Ez a kiadás nem tartalmazza a Syncthinget.</string> + <string name="sync_starting">A Syncthing indítása</string> + <string name="sync_status_starting">Indítás</string> + <string name="sync_status_up_to_date">Naprakész</string> + <string name="sync_status_syncing">Szinkronizálás</string> + <string name="sync_status_paused">Szüneteltetve</string> + <string name="sync_status_pausing">Szüneteltetés</string> + <string name="sync_status_resuming">Folytatás</string> + <string name="sync_status_attention">Beavatkozást igényel</string> + <string name="sync_status_failed">A Syncthing leállt</string> + <string name="sync_failed_retry">Újrapróbálás</string> + <string name="sync_paused_wifi">Szüneteltetve Wi-Fi-kapcsolatig</string> + <string name="sync_paused_game">Szüneteltetve a játék alatt</string> + <string name="sync_summary">%1$d mappa · %2$d/%3$d eszköz csatlakoztatva</string> + <string name="sync_left">Még %1$s</string> + <string name="sync_open_web_ui">Webes felület megnyitása</string> + <string name="sync_pause">Szüneteltetés</string> + <string name="sync_resume">Folytatás</string> + <string name="sync_running">Fut</string> + <string name="sync_running_hint">Kapcsolja ki a Syncthing teljes leállításához.</string> + <string name="sync_this_device">Ez az eszköz</string> + <string name="sync_device_id">Eszközazonosító</string> + <string name="sync_show_qr">QR-kód megjelenítése</string> + <string name="sync_advanced">Speciális</string> + <string name="sync_advanced_hint">Portok, futtatás ideje, visszaállítás</string> + <string name="sync_open">Megnyitás</string> + <string name="sync_waiting">Önre vár</string> + <string name="sync_pending_device">%1$s csatlakozni szeretne</string> + <string name="sync_pending_folder">%1$s meg szeretné osztani ezt: „%2$s”</string> + <string name="sync_pending_folder_hint">Fogadja el, hogy kiválaszthassa, hová mentse a DroidDeckben.</string> + <string name="sync_review">Áttekintés a webes felületen</string> + <string name="sync_folders">Mappák</string> + <string name="sync_no_folders">Még nincsenek mappák.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Naprakész</string> + <string name="sync_folder_syncing">Szinkronizálás: %1$d%%</string> + <string name="sync_folder_scanning">Vizsgálat</string> + <string name="sync_folder_paused">Szüneteltetve</string> + <string name="sync_folder_out_of_sync">Nincs szinkronban</string> + <string name="sync_folder_errors">%1$d fájlt nem sikerült szinkronizálni</string> + <string name="sync_folder_blocked">Letiltva</string> + <string name="sync_folder_blocked_hint">Ez a mappa a DroidDeck tárhelyén kívül van, ezért a DroidDeck szüneteltette. A DroidDecken kívüli mappák szinkronizálásához használja a Syncthing-Fork alkalmazást.</string> + <string name="sync_remove_folder">Eltávolítás a Syncthingből</string> + <string name="sync_remove_folder_hint">Az eltávolítás nem töröl fájlokat.</string> + <string name="sync_devices">Eszközök</string> + <string name="sync_no_devices">Még nincsenek eszközök.</string> + <string name="sync_connected">Csatlakoztatva</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Utoljára látva: %1$s</string> + <string name="sync_device_id_title">Az eszköz azonosítója</string> + <string name="sync_device_id_hint">A másik eszközén adjon hozzá egy eszközt a Syncthingben, és olvassa be ezt a kódot, vagy illessze be az azonosítót. Ezután fogadja el itt, a webes felületen.</string> + <string name="sync_copy">Másolás</string> + <string name="sync_share">Megosztás</string> + <string name="sync_done">Kész</string> + <string name="sync_off_title">Kikapcsolja a Syncthinget?</string> + <string name="sync_off_body">A Syncthing most leáll, és leállítva marad, amíg újra be nem kapcsolja. A szinkronizált fájlok a helyükön maradnak.</string> + <string name="sync_off_forget">A Syncthing konfigurációjának törlése is</string> + <string name="sync_off_forget_hint">Eltávolítja az eszköz azonosítóját, a mappákat és az eszközöket. Újbóli bekapcsoláskor elölről kezdi.</string> + <string name="sync_turn_off">Kikapcsolás</string> + <string name="sync_ports">Portok</string> + <string name="sync_port_sync">Szinkronizálás</string> + <string name="sync_port_discovery">Helyi felfedezés</string> + <string name="sync_repick">Új portok választása</string> + <string name="sync_repick_hint">Minden indításkor újra ellenőrizve.</string> + <string name="sync_repick_button">Újraválasztás</string> + <string name="sync_reset_group">Visszaállítás</string> + <string name="sync_api_key">API-kulcs</string> + <string name="sync_regenerate">Újragenerálás</string> + <string name="sync_reset">A Syncthing visszaállítása</string> + <string name="sync_reset_hint">Új eszközazonosító, a mappák és eszközök eltávolítva. A DroidDeck tárhelyén lévő fájlok megmaradnak.</string> + <string name="sync_reset_button">Visszaállítás</string> + <string name="sync_reset_confirm_title">Visszaállítja a Syncthinget?</string> + <string name="sync_running_group">Futtatás</string> + <string name="sync_run">Futtatás</string> + <string name="sync_run_open">Amíg a DroidDeck nyitva van</string> + <string name="sync_run_background">A háttérben</string> + <string name="sync_wifi_only">Csak Wi-Fi</string> + <string name="sync_pause_games">Szüneteltetés játék közben</string> + <string name="sync_logs">Naplók</string> + <string name="sync_logs_hint">A Syncthing kimenete ebben a munkamenetben</string> + <string name="sync_logs_share">Megosztás</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Előbb állítsa be a Linux futtatókörnyezetet.</string> + <string name="sync_accept">Elfogadás</string> + <string name="sync_accept_title">„%1$s” mentése ide:</string> + <string name="sync_add_folder">Mappa hozzáadása</string> + <string name="sync_add_folder_hint">Egy mappa szinkronizálása a DroidDeck tárhelyén</string> + <string name="sync_choose">Kiválasztás</string> + <string name="sync_add">Hozzáadás</string> + <string name="sync_add_failed">Nem sikerült hozzáadni a mappát.</string> + <string name="sync_share_with">Megosztás ezekkel:</string> + <string name="sync_share_none">Még nincsenek eszközök. Ezt a mappát később a webes felületről is megoszthatja.</string> + <string name="sync_use_folder">Ennek a mappának a használata</string> + <string name="sync_new_folder">Új mappa</string> + <string name="sync_location_home">Konténer saját mappája</string> + <string name="sync_location_sync">Sync mappa</string> + <string name="sync_location_shared">DroidDeck megosztott tárhely</string> + <string name="sync_location_card">DroidDeck itt: %1$s</string> + <string name="sync_location_app">DroidDeck alkalmazásadatok</string> + <string name="sync_web_path_locked">Az új mappák a DroidDeck Sync mappájába kerülnek. Másik DroidDeck-mappa szinkronizálásához használja a Mappa hozzáadása lehetőséget a Syncthing lapon.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Újratöltés</string> + <string name="sync_not_running">A Syncthing nem fut.</string> + <string name="session_end_steam_sigill">A Steam érvénytelen utasítással leállt (SIGILL). Ez CPU-utasítás-kompatibilitási probléma vagy a kliens összeomlása lehet. Ossza meg a naplókat az eszköz adataival együtt.</string> + <string name="session_end_steam_try_x64">Kipróbálhatja a Steam-beállítások → Steam-kliens → x86-64 (kísérleti) lehetőséget. További letöltést igényel, és lassabban futhat.</string> + <string name="session_end_vulkan_device">A Linux grafikus illesztőprogram nem talált használható Vulkan-eszközt. Ellenőrizze, hogy a kiválasztott Linux GPU-illesztőprogram támogatja-e ezt a GPU-t.</string> + <string name="session_end_gpu_unsupported">Ez a munkamenet nem indulhat el, mert ehhez a GPU-hoz nincs kompatibilis Linux Vulkan-illesztőprogram a jelenlegi beállításban. Az Adreno Turnip illesztőprogramok nem tudják engedélyezni a MediaTek/Mali GPU-k támogatását.</string> <string name="setup_group_memory">Memória</string> <string name="setup_clear_cached">Gyorsítótárazott alkalmazások bezárása munkamenet előtt</string> <string name="setup_clear_cached_hint">Munkamenet indításakor a DroidDeck bezárja azokat az alkalmazásokat, amelyeket az Android a háttérben tart, így a játéknak több memória jut. A vezeték nélküli hibakeresésnek bekapcsolva kell lennie.</string> @@ -3125,6 +3466,12 @@ <string name="epic_client_open">Megnyitás</string> <string name="epic_client_install">Telepítés</string> <string name="game_tab_about">Névjegy</string> + <string name="game_resources_browser">A böngészőben nyílik meg</string> + <string name="game_resource_guides">Útmutatók</string> + <string name="game_resource_protondb_detail">Linux / Proton kompatibilitási jelentések</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">A Steam-fiókjában mentéseket tároló játékokhoz</string> + <string name="game_resource_search">Webes keresés</string> <string name="game_tab_install">Telepítés</string> <string name="game_install_location">Hely</string> <string name="game_install_folder">Mappa</string> @@ -3141,6 +3488,11 @@ <string name="stores_eyebrow_pass">elérhető ezzel: %1$s</string> <string name="stores_owned_in_library">Saját játékok a könyvtárban</string> <string name="library_filter_added">Hozzáadott</string> + <string name="library_filter">Szűrő</string> + <string name="library_filter_installed">Csak telepítettek</string> + <string name="library_filter_all_owned">Összes birtokolt játék</string> + <string name="library_no_installed_matches">Egyetlen telepített játék sem felel meg ezeknek a szűrőknek.</string> + <string name="library_browse_owned">Birtokolt játékok böngészése</string> <string name="game_tab_launch">Indítás</string> <string name="game_tab_saves_cloud">Mentések és felhő</string> <string name="game_launch_shortcut">Steam-parancsikon</string> @@ -3158,6 +3510,40 @@ <string name="stores_itch_update_replaced">A fejlesztő lecserélte ezt a buildet erre: %1$s. Frissít rá?</string> <string name="xbox_filter_cloud">Felhő</string> <string name="stores_xbox_cloud_settings">Felhőbeállítások</string> + <string name="integration_title">Steam-integráció</string> + <string name="integration_count">%1$d / %2$d bekapcsolva</string> + <string name="integration_set_up">Beállítás</string> + <string name="integration_location">Hely</string> + <string name="integration_app_info">Alkalmazásinformáció</string> + <string name="integration_wifi">Wi-Fi-nevek</string> + <string name="integration_brightness">Fényerő</string> + <string name="integration_home">DroidDeck kezdőképernyőként</string> + <string name="integration_shortcuts">Rendszerbillentyűk</string> + <string name="integration_wifi_hint">Hálózatok megjelenítése a Steamben · helyhozzáférést igényel, követés nélkül</string> + <string name="integration_wifi_on">A hálózatok megjelennek a Steamben</string> + <string name="integration_wifi_location_off">A hely ki van kapcsolva</string> + <string name="integration_wifi_denied">Hely megtagadva · engedélyezze az Alkalmazásinformációban</string> + <string name="integration_brightness_hint">A Steam csúszkája állítja a képernyő fényerejét</string> + <string name="integration_home_hint">A Kezdőképernyő gomb megnyitja a Steam menüt egy munkamenetben</string> + <string name="integration_shortcuts_hint">Az Alt+Tab, a Win billentyű és a Kezdőlap gomb a munkamenetben marad</string> + <string name="integration_shortcuts_maybe_restricted">Szürke az Androidban? Alkalmazásinformáció → ⋮ → Korlátozott beállítások engedélyezése</string> + <string name="integration_shortcuts_restricted">Az Android letiltotta · Alkalmazásinformáció → ⋮ → Korlátozott beállítások engedélyezése</string> + <string name="integration_shortcuts_service">DroidDeck rendszerbillentyűk</string> + <string name="integration_shortcuts_service_description">Az Alt+Tab, a Win billentyű és a Kezdőlap gomb az aktív DroidDeck-munkamenetben marad az Android helyett.</string> + <string name="integration_brightness_needed">Kapcsolja be a Fényerőt itt: Beállítás → Steam-integráció</string> + <string name="setup_gpu_bridge_off">Mali híd: ki</string> + <string name="setup_gpu_bridge_on">Mali híd: be</string> + <string name="setup_gpu_bridge_detail">A(z) %1$s nem Adreno. A kísérleti Vulkan híd be van kapcsolva: a munkamenet a telefon saját illesztőprogramján keresztül rajzol. Hibákra számíts; küldd el a munkamenet naplóit.</string> + <string name="setup_bridge_safe">Biztonságos mód</string> + <string name="setup_bridge_safe_on">Biztonságos mód: be</string> + <string name="setup_bridge_safe_off">Biztonságos mód: ki</string> + <string name="setup_bridge_safe_on_detail">A legjobb kompatibilitás. Új eszközhöz ajánlott.</string> + <string name="setup_bridge_safe_off_detail">Gyorsabb ott, ahol ez a GPU átment az ellenőrzéseken.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatikus</string> + <string name="setup_bridge_dxvk_proton">DXVK: a Protoné</string> + <string name="setup_bridge_dxvk_auto_detail">Régebbi DXVK-t használ, ha ennek a GPU-nak a Vulkanja túl régi a Proton sajátjához.</string> + <string name="setup_bridge_dxvk_proton_detail">Minden Proton megtartja a saját DXVK-ját, akkor is, ha ennek a GPU-nak a Vulkanja túl régi lehet hozzá.</string> <string name="apps_search_hint">Alkalmazások keresése</string> <string name="apps_no_match">Egy alkalmazás sem felel meg ennek: „%1$s”.</string> <string name="apps_add_widget">Modul hozzáadása</string> @@ -3206,6 +3592,8 @@ <string name="desktop_restore_done_body">A hozzáadott alkalmazások újra telepítve vannak.</string> <string name="desktop_restore_failed_title">Néhány szoftvert nem sikerült visszaállítani</string> <string name="desktop_restore_failed_body">Nézd meg a ~/.cache/droiddeck/apt-restore.log fájlt, majd próbáld a sudo apt install parancsot a Konsole-ban.</string> + <string name="gog_full_files">A natív optimalizálások nem érhetők el. A letöltés teljes csere-fájlokat tartalmaz.</string> + <string name="gog_recover">Javítócsomag eredményének ellenőrzése</string> <string name="slow_usb_title">Lassú USB-kapcsolat</string> <string name="slow_usb_cable">A(z) %1$s %2$s kapcsolaton csatlakozik (%3$s Mbps, kb. %4$d MB/s), ezért a rajta lévő játékok lassan töltődnek be. Használj legalább 5 Gbps-os USB 3 kábelt, fordítsd meg az USB-C csatlakozót, vagy használj gyorsabb meghajtót.</string> <string name="slow_usb_port">A(z) %1$s %2$s kapcsolaton csatlakozik (%3$s Mbps, kb. %4$d MB/s). Az eszköz USB-portja nem tud gyorsabb lenni, ezért a játékok lassan töltődnek be. A belső tárhely vagy egy microSD-kártya gyorsabb lehet.</string> @@ -3216,4 +3604,52 @@ <string name="steam_import_names_more">%1$s és még %2$d</string> <string name="steam_import_now">Újraindítás most</string> <string name="steam_import_later">Később</string> + <string name="gog_maintenance">GOG-telepítés kezelése</string> + <string name="gog_check">Frissítések keresése</string> + <string name="gog_repair">Ellenőrzés/javítás</string> + <string name="gog_patches">Offline javítócsomagok</string> + <string name="gog_refresh">Teljes offline telepítő letöltése</string> + <string name="gog_update">Frissítés erre: %1$s</string> + <string name="gog_resume">GOG-karbantartás folytatása</string> + <string name="gog_open_patch">Javítócsomag-telepítő megnyitása</string> + <string name="gog_patch_in_session">Fejezze be vagy szakítsa meg a javítócsomag telepítését a Linux-munkamenetben.</string> + <string name="gog_patch_requirements">Válasszon javítócsomagot a telepített verzióhoz és nyelvhez. Előfordulhat, hogy a támogatott kiinduló verziók nem szerepelnek a listában.</string> + <string name="gog_no_patches">A GOG-nál nincs önálló Windows-javítócsomag ehhez a játékhoz.</string> + <string name="gog_managed_files">A módosított játékfájlok felülíródhatnak.</string> + <string name="gog_patch_installer_note">A telepítő a Linux-munkamenetben nyílik meg.</string> + <string name="gog_download_label">Letöltés</string> + <string name="gog_space_label">Extra tárhely</string> + <string name="gog_space_estimate_label">Becsült tárhely</string> + <string name="gog_repair_action">Fájlok javítása</string> + <string name="gog_refresh_action">Telepítés frissítése</string> + <string name="gog_select_patch">Kiválasztás</string> + <string name="stores_gamejolt_not_owned">Nincs a Game Jolt-könyvtáradban</string> + <string name="stores_gamejolt_no_build">Ehhez a játékhoz nincs Windows-letöltés</string> + <string name="stores_gamejolt_no_exe">A letöltésben nem található Windows-játék</string> + <string name="stores_gamejolt_no_game">A játék nem található a Game Jolt-on</string> + <string name="stores_gamejolt_browse_failed">Nem sikerült betölteni a játékokat a Game Jolt-ról</string> + <string name="stores_gamejolt_download_failed">A Game Jolt HTTP %1$d választ adott</string> + <string name="stores_gamejolt_pick_failed">A letöltések betöltése a Game Jolt-ról nem sikerült</string> + <string name="stores_gamejolt_build_open">Megnyitás a Game Jolt-on</string> + <string name="stores_gamejolt_archive">A(z) %1$s archívumok nem támogatottak</string> + <string name="stores_gamejolt_extract_failed">A letöltés nem bontható ki (kód: %1$d)</string> + <string name="stores_gamejolt_download_unreachable">A Game Jolt nem érhető el</string> + <string name="stores_gamejolt_download_no_link">A Game Jolt nem adott letöltési hivatkozást</string> + <string name="stores_gamejolt_section_featured">Kiemelt</string> + <string name="stores_gamejolt_section_hot">Népszerű</string> + <string name="stores_gamejolt_section_best">Legjobb</string> + <string name="stores_gamejolt_section_new">Új</string> + <string name="stores_gamejolt_price_under_30">30 $ vagy kevesebb</string> + <string name="stores_gamejolt_os_other">Egyéb</string> + <string name="stores_gamejolt_maturity_everyone">Minden korosztály</string> + <string name="stores_gamejolt_maturity_teen">Tinédzserek</string> + <string name="stores_gamejolt_maturity_adult">Felnőtt</string> + <string name="stores_gamejolt_status_complete">Kész</string> + <string name="stores_gamejolt_status_early">Korai hozzáférés</string> + <string name="stores_gamejolt_partners">Partnerjátékok</string> + <string name="stores_gamejolt_filter_browser">Böngésző</string> + <string name="stores_gamejolt_filter_maturity">Korhatár</string> + <string name="stores_gamejolt_filter_status">Állapot</string> + <string name="stores_gamejolt_filter_partners">Partnerek</string> + <string name="stores_gamejolt_followed">Követett játékok</string> </resources> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 51e82b7368..1ef496df4b 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opsi VKD3D untuk D3D12. nodxr menonaktifkan ray tracing; gunakan hanya untuk gim yang membutuhkannya.</string> <string name="game_env_proton_log">Atur ke 1 untuk log diagnostik Proton. Pencatatan log dapat mengurangi performa dan menggunakan penyimpanan.</string> <string name="game_env_wined3d">Atur ke 1 untuk menggunakan WineD3D berbasis OpenGL sebagai pengganti DXVK untuk pengujian kompatibilitas D3D9–11.</string> + <string name="game_env_wined3d_renderer">Perender untuk DirectDraw, Direct3D 1-7, dan gim yang berjalan dengan WineD3D. Vulkan melewati jalur OpenGL-di-Zink dan jauh lebih cepat untuk gim DirectDraw dan Direct3D 7 lama di Adreno.</string> + <string name="game_env_dxvk_d3d8">Atur ke 1 untuk menjalankan Direct3D 8 melalui DXVK sebagai pengganti WineD3D. Lebih cepat dalam uji Direct3D 8 milik AIO Graphics Test di Adreno.</string> <string name="game_env_no_ntsync">Atur ke 1 untuk menjaga gim ini di luar ntsync (droiddeck-ntsync atau driver kernel); gim ini menggunakan droiddeck-esync jika ada paket yang tersedia, jika tidak droiddeck-fsync.</string> <string name="game_env_no_esync">Atur ke 1 untuk menonaktifkan droiddeck-esync bagi gim ini; gim ini menggunakan droiddeck-fsync, atau droiddeck-ntsync jika fsync juga nonaktif.</string> <string name="game_env_no_fsync">Atur ke 1 untuk menjaga gim ini di luar droiddeck-fsync; gim ini menggunakan droiddeck-esync jika ada paket yang tersedia, jika tidak droiddeck-ntsync.</string> <string name="game_env_fsync_first">Atur ke 1 untuk menjalankan gim ini pada droiddeck-fsync, atau 0 untuk mengutamakan droiddeck-esync jika ada paket yang cocok dengan Proton-nya.</string> <string name="game_env_xalia">Atur ke 0 untuk menonaktifkan fitur bantu navigasi gamepad milik Proton untuk gim ini.</string> + <string name="game_env_anticheat_offline">Aktif secara default. Memulai gim Easy Anti-Cheat tanpa anti-cheat-nya jika gim mendukung permainan offline. Nonaktifkan untuk meluncurkan melalui Easy Anti-Cheat seperti biasa. Mode online yang memerlukan Easy Anti-Cheat tetap tidak tersedia.</string> <string name="game_env_hud">Overlay DXVK untuk D3D9–11. fps menampilkan frame rate; kosongkan untuk menyembunyikannya.</string> <string name="game_env_dxvk_config">Setelan DXVK dipisahkan dengan titik koma. Versi terbaru menggunakan dxvk.maxFrameRate untuk membatasi frame rate; gunakan pembatas frame rate sesi untuk permainan biasa.</string> + <string name="game_env_cores">Core CPU untuk gim ini, seperti 0-4 atau 0,2,4, sebagai pengganti core gim sesi. Lebih sedikit core berarti lebih dingin.</string> <string name="game_env_vkd3d_limit">Batas frame rate D3D12. 0 menonaktifkan batas.</string> <string name="game_env_glthread">Threading OpenGL Mesa. true dapat membantu gim OpenGL yang terbatas CPU; uji per gim.</string> <string name="sync_backend_title">Sinkronisasi Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX menjalankan program Linux x86 di perangkat ARM64 ini. Otomatis menggunakannya saat program dibuat untuk x86.</string> <string name="app_fex_x86">%1$s melalui FEX</string> <string name="app_fex_not_ready">Program ini dibuat untuk PC %1$s dan berjalan melalui FEX, yang belum disiapkan. Buka Steam sekali saat masuk: DroidDeck akan mengunduh FEX dan Steam Linux Runtime yang diperlukan, lalu ini akan terbuka.</string> + <string name="session_proot_missing">proot DroidDeck tidak dapat diunduh. Periksa koneksi lalu coba lagi. Sesi tidak dimulai karena proot cadangan terlalu lambat untuk bermain.</string> + <string name="session_directaudio_missing">DirectAudio tidak dapat diunduh, jadi audio gim menggunakan jalur yang lebih lambat di sesi ini.</string> <string name="session_end_program">Program ini</string> <string name="session_end_steam_download">Tidak dapat mengunduh klien Steam. Jaringan atau VPN Anda mungkin memblokir server Steam; periksa koneksi lalu coba lagi.</string> <string name="session_end_steam_setup">Tidak dapat menyiapkan klien Steam. Periksa koneksi dan ruang penyimpanan kosong, lalu coba lagi.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Pengontrol Xbox 360</string> <string name="mode_controller_note">Deck: tombol Quick Access dan giroskop. Steam Controller: sama, dengan grip sense pada tombol belakang. DualShock 4 dan DualSense: giroskop, dan trackpad sebagai touchpad-nya. Xbox 360: buka Quick Access dengan Guide+A.</string> <string name="mode_back">Kembali</string> + <string name="back_hold">Tahan Kembali untuk pintasan Steam</string> + <string name="back_hold_hint">Menahan Kembali membuka Akses Cepat atau membuat kombinasi Steam dengan tombol lain. Matikan untuk mengabaikan Kembali yang ditahan; ketuk dan ketuk dua kali tetap berfungsi.</string> + <string name="back_native_qam_hint">Tahan Back selama 700 ms, atau tahan Back dan tekan tombol lain untuk pintasan Steam.</string> + <string name="back_double_tap_window">Jeda ketuk dua kali</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Izinkan kontrol kecerahan</string> + <string name="brightness_permission_text">Siapkan kontrol kecerahan di DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sesi</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Menunda penjedaan latar belakang saat Steam sedang aktif mengunduh.</string> <string name="mode_suspend_note">Otomatis menjeda di latar belakang dan melanjutkan saat ditampilkan. Manual menunggu Lanjutkan. Tidak pernah terus berjalan.</string> <string name="mode_startup">Mulai</string> - <string name="mode_steam_startup">Mulai Steam bersama DroidDeck</string> - <string name="mode_steam_startup_hint">Membuka sesi Steam saat DroidDeck diluncurkan.</string> + <string name="mode_startup_session">Buka saat peluncuran</string> + <string name="mode_startup_session_hint">Memulai sesi ini saat DroidDeck diluncurkan.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Memeriksa rilis…</string> <string name="mode_decky_ready">Siap menginstal %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Terbaru · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Instal versi terbaru</string> + <string name="decky_channel">Saluran Pembaruan</string> + <string name="decky_channel_hint">Rilis Decky Loader mana yang akan diinstal. Pembaru bawaan Decky menggunakan saluran yang sama.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Prarilis</string> + <string name="decky_channel_testing">Pengujian</string> + <string name="decky_channel_failed">Tidak dapat menyimpan saluran pembaruan Decky</string> <string name="mode_decky_on">Dimulai bersama Steam. Saat aktif, aplikasi lain di perangkat ini mungkin dapat mengendalikan Steam.</string> <string name="mode_decky_off">Nonaktif. Port debugging jarak jauh Steam tetap tertutup.</string> <string name="mode_decky_remove_title">Hapus instalasi Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Klien</string> <string name="mode_mangoapp">Overlay performa</string> <string name="mode_mangoapp_hint">Nonaktifkan jika gim crash atau layar menjadi hitam di mode Deck. Berlaku pada sesi berikutnya.</string> + <string name="mode_return_after_game">Kembali ke DroidDeck setelah bermain</string> + <string name="mode_return_after_game_hint">Saat gim yang Anda mulai dari DroidDeck atau peluncur lain ditutup, Steam keluar dengan rapi (save cloud selesai lebih dulu) dan Anda kembali ke sana. Nonaktif: tetap di Steam.</string> + <string name="mode_shader_precache">Pra-cache shader</string> + <string name="mode_shader_precache_hint">Steam mengunduh shader siap pakai untuk gim Anda dan memprosesnya di latar belakang, sehingga gim lebih jarang tersendat. Menonaktifkannya menghemat data, penyimpanan, dan baterai; gim membuat shader sambil dimainkan. Sama dengan setelan Downloads > Shader Pre-Caching di Steam. Berlaku pada sesi berikutnya.</string> <string name="mode_steam_repair">Perbaiki klien Steam</string> <string name="mode_steam_repair_hint">Mengunduh ulang klien Steam saat Steam dimulai lagi. Gunakan ini jika Steam tetap berada di layar pemuatannya. Gim, status masuk, dan setelan tetap disimpan.</string> <string name="mode_steam_repair_queued">Klien Steam akan diunduh ulang saat Steam dimulai lagi.</string> @@ -389,6 +412,8 @@ <string name="mode_directaudio_hint">Melewati PulseAudio untuk latensi yang lebih rendah.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Untuk obrolan suara.</string> + <string name="drawer_mic_hint">Aktifkan atau nonaktifkan perekaman mikrofon untuk sesi ini.</string> + <string name="drawer_mic_failed">Tidak dapat mengubah mikrofon. Coba lagi.</string> <string name="mode_network">Jaringan</string> <string name="mode_wifi_discovery">Pencarian Wi-Fi</string> <string name="mode_wifi_discovery_hint">Menampilkan nama Wi-Fi dan jaringan di sekitar di Steam.</string> @@ -549,6 +574,16 @@ <string name="perf_gsrealtime">gamescope: antrean GPU realtime</string> <string name="perf_gsrealtime_hint">Memprioritaskan kerja GPU compositor. Dapat menghaluskan pacing frame dengan sedikit mengorbankan gim.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memori</string> + <string name="perf_cap_off">Nonaktif</string> + <string name="perf_cap_auto">Default driver</string> + <string name="perf_zram_client">Kompres Steam saat gim berjalan</string> + <string name="perf_zram_client_hint">20 detik setelah gim dimulai, klien Steam dikompres ke zRAM agar gim mendapat lebih banyak memori, lalu dibaca kembali saat gim ditutup. Nonaktifkan jika sesi tertutup sesaat setelah gim dimulai. Batas RAM di atas tetap mengompres Steam saat sesi melampauinya.</string> + <string name="perf_ram_cap">Batas RAM</string> + <string name="perf_ram_cap_hint">Berlaku saat klien Steam berjalan, di mode Steam atau dari desktop. Saat sesi menggunakan lebih dari ini, Steam lalu proses lain yang didukung dalam sesi dikompres ke zRAM. Batas lunak: tidak ada yang ditutup, tetapi gim dapat tersendat saat halaman dimuat kembali.</string> + <string name="perf_ram_cap_unavailable">Memerlukan swap zRAM, yang tidak dimiliki perangkat ini.</string> + <string name="perf_vram_cap">Batas VRAM</string> + <string name="perf_vram_cap_hint">Memori video yang dilaporkan DXVK ke gim Direct3D, sehingga gim menganggarkan tekstur lebih sedikit. Setelan DXVK milik gim tetap diutamakan. Berlaku pada sesi berikutnya.</string> <string name="perf_gpuclock">Pertahankan GPU pada clock tertingginya</string> <string name="perf_gpuclock_hint">Hanya Adreno. Lebih sedikit tersendat, lebih banyak penggunaan baterai dan panas.</string> <string name="perf_fixes">Perbaikan sesi</string> @@ -567,6 +602,8 @@ <string name="perf_fastpath">Jalur cepat proot</string> <string name="perf_fastpath_needs_seccomp">Memerlukan filter seccomp milik proot.</string> <string name="perf_fastpath_hint">Pencarian file lebih cepat dan lebih sedikit tersendat. Nonaktifkan jika program tidak dapat menemukan filenya.</string> + <string name="perf_cursor_composite">Gambar kursor di dalam gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope menggambar penunjuk sendiri alih-alih menyerahkannya ke Android. Aktifkan untuk kursor yang dikendalikan pengontrol. Nonaktif lebih cepat di ponsel. Berlaku pada sesi berikutnya.</string> <string name="perf_identity">Identitas sesi</string> <string name="perf_hostname">Nama host</string> <string name="perf_hostname_hint">Nama yang dilihat Steam untuk perangkat ini. Kosongkan untuk memulihkan %1$s.</string> @@ -581,6 +618,8 @@ <string name="driver_delete_plain">Filenya dihapus dari aplikasi.</string> <string name="driver_delete_in_use">Filenya dihapus. Driver ini sedang digunakan, jadi default akan mengambil alih.</string> <string name="drawer_page_display">Tampilan</string> + <string name="drawer_frame_limit">Batas frame</string> + <string name="drawer_frame_limit_note">Membatasi gim ini. Layar beralih ke refresh rate yang habis dibagi batas tersebut jika ada; batas lain bisa terlihat tidak rata. Gim Steam menggunakan Frame Limit milik Steam di menu Quick Access.</string> <string name="drawer_page_effects">Efek</string> <string name="drawer_page_controls">Kontrol</string> <string name="drawer_page_components">Komponen</string> @@ -612,8 +651,11 @@ <string name="hud_size_pill">Pil</string> <string name="hud_size_minimal">Minimal</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Bilah</string> <string name="hud_locked">Kunci posisi</string> <string name="hud_locked_hint">Seret HUD untuk memindahkannya; tekan lama untuk mengunci atau membuka kuncinya. Saat terkunci, kontrol layar di bawahnya tetap berfungsi.</string> + <string name="hud_snap">Tempel ke sisi</string> + <string name="hud_snap_hint">Lepaskan HUD dan HUD akan pindah ke sisi layar yang lebih dekat. Jentikan cepat melemparnya ke arah itu.</string> <string name="hud_group_look">Tampilan</string> <string name="hud_scale">Ukuran di layar</string> <string name="hud_color_soft">Lembut</string> @@ -662,7 +704,6 @@ <string name="hud_export_failed">Tidak dapat menyimpan laporan HUD.</string> <string name="hud_reset">Setel ulang setelan HUD</string> <string name="hud_reset_button">Setel ulang</string> - <string name="hud_credit">FusionHUD oleh The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Mode penskalaan</string> <string name="drawer_scaling_sharpness">Ketajaman penskalaan</string> <string name="drawer_effects">Efek layar</string> @@ -697,11 +738,17 @@ <string name="drawer_touch_auto">Otomatis (%1$s)</string> <string name="drawer_keyboard">Keyboard</string> <string name="drawer_latency">Latensi</string> + <string name="drawer_low_latency">Mode latensi rendah</string> + <string name="drawer_low_latency_hint">Meningkatkan penggunaan CPU dan baterai</string> <string name="drawer_low_latency_controller">Pengontrol latensi rendah</string> <string name="drawer_low_latency_controller_hint">Pengontrol melapor pada 1000 Hz, bukan 250 Hz. Sedikit lebih banyak CPU.</string> <string name="drawer_low_latency_touch">Sentuh latensi rendah</string> <string name="drawer_low_latency_touch_hint">Sentuhan melewati pengelompokan frame, jadi kontrol sentuh Steam berjalan pada 1000 Hz. Sedikit lebih banyak CPU.</string> <string name="drawer_evdev_mouse">Kanal mouse mentah</string> + <string name="drawer_relative_mouse">Mouse relatif</string> + <string name="drawer_relative_mouse_auto">Otomatis</string> + <string name="drawer_relative_mouse_on">Aktif</string> + <string name="drawer_relative_mouse_off">Nonaktif</string> <string name="drawer_direct_cursor">Kursor</string> <string name="drawer_pc_keyboard">Keyboard PC</string> <string name="drawer_android_keyboard">Android</string> @@ -788,6 +835,10 @@ <string name="setup_session">Sesi</string> <string name="setup_logs">Log sesi</string> <string name="setup_logs_hint">Disimpan setelah setiap sesi</string> + <string name="setup_game_debug_logs">Log debug gim</string> + <string name="setup_game_debug_logs_hint">Sertakan diagnostik Proton, Wine, dan grafis pada peluncuran gim berikutnya. Dapat mengurangi performa dan memakai lebih banyak penyimpanan.</string> + <string name="setup_game_debug_logs_restart">Mulai ulang sesi ini untuk menyimpan log debug gim</string> + <string name="setup_logging_update_failed">Tidak dapat memperbarui pencatatan log. Periksa tombolnya lalu coba lagi.</string> <string name="setup_agent_commands">Alat debug</string> <string name="setup_latest_logs">Log sesi terbaru</string> <string name="setup_saved_logs">Log sesi tersimpan</string> @@ -819,20 +870,22 @@ <string name="setup_home">Gunakan sebagai Layar Utama</string> <string name="setup_home_on">DroidDeck dapat menjadi aplikasi Utama</string> <string name="setup_home_off">DroidDeck tidak pernah ditawarkan sebagai aplikasi Utama</string> + <string name="setup_home_game_space_first">Di Tambahkan Game, setel DroidDeck ke Sertakan</string> <string name="setup_orientation">Orientasi</string> + <string name="setup_launcher_orientation">Orientasi peluncur</string> + <string name="setup_launcher_orientation_auto">Ikuti rotasi perangkat</string> + <string name="setup_orientation_portrait">Potret</string> + <string name="setup_session_orientation">Orientasi sesi</string> + <string name="setup_session_orientation_hint">Berlaku untuk Steam, gim, desktop, dan editor pengontrol. Preset resolusi ikut berputar dengan sesi; lebar dan tinggi kustom tetap seperti yang dimasukkan.</string> <string name="setup_orientation_auto">Lanskap otomatis</string> <string name="setup_orientation_landscape">Lanskap</string> <string name="setup_orientation_reverse">Lanskap terbalik</string> <string name="setup_fullscreen">Layar penuh</string> <string name="setup_fullscreen_on">Menyembunyikan bilah status dan navigasi Android</string> <string name="setup_fullscreen_off">Menampilkan bilah status dan navigasi Android</string> - <string name="setup_dual_screen">Layar ganda</string> - <string name="setup_dual_screen_hint">Otomatis memakai layar kedua pada perangkat genggam yang memiliki layar bawaan. Aktif memakai layar kedua apa pun. Nonaktif membuat semuanya tetap di satu layar.</string> <string name="setup_dual_screen_auto">Otomatis</string> <string name="setup_dual_screen_on">Aktif</string> <string name="setup_dual_screen_off">Nonaktif</string> - <string name="setup_dual_screen_menu">Menu layar bawah</string> - <string name="setup_dual_screen_menu_hint">Memindahkan bagian dan menu dalam game ke layar kedua dan mengetik di sana, agar layar atas tetap menampilkan tampilan penuh. L2 dan R2 berpindah bagian.</string> <string name="setup_dual_screen_controls">Kontrol layar bawah dalam game</string> <string name="setup_dual_screen_controls_hint">Membuka trackpad dan keyboard di layar kedua saat sesi dimulai.</string> <string name="dual_typing_title">Mengetik untuk layar atas</string> @@ -981,6 +1034,14 @@ <string name="gate_step1">Buka Setelan → Opsi pengembang → Debugging nirkabel dan aktifkan</string> <string name="gate_step2">Ketuk “Pasangkan perangkat dengan kode pemasangan”</string> <string name="gate_step3">Masukkan kode ke notifikasi DroidDeck</string> + <string name="pairguide_build_number">Di Tentang ponsel, ketuk Nomor build 7 kali</string> + <string name="pairguide_wireless">Aktifkan Proses debug nirkabel</string> + <string name="pairguide_pair">Buka Proses debug nirkabel, lalu ketuk “Sambungkan perangkat dengan kode penyambungan”</string> + <string name="pairguide_child_process">Aktifkan “Nonaktifkan pembatasan proses turunan”</string> + <string name="pairguide_row_child_process">Nonaktifkan pembatasan proses turunan</string> + <string name="pairguide_row_build_number">Nomor build</string> + <string name="pairguide_row_wireless">Proses debug nirkabel</string> + <string name="pairguide_row_pair">Sambungkan perangkat dengan kode penyambungan</string> <string name="gate_waiting">Menunggu jendela pemasangan…</string> <string name="gate_code_needed">Jendela ditemukan. Masukkan kodenya di notifikasi.</string> <string name="gate_status">Status</string> @@ -1119,7 +1180,6 @@ <string name="games_never_played">Belum pernah dimainkan</string> <string name="games_runtime_busy_percent">Runtime sibuk · %1$d%%</string> <string name="games_runtime_busy">Runtime sibuk</string> - <string name="games_runtime_first_play">Runtime terinstal saat Main pertama kali</string> <string name="games_runtime_update">Pembaruan runtime tersedia</string> <string name="games_runtime_ready">● Runtime siap</string> <string name="games_internal">Penyimpanan internal</string> @@ -1136,6 +1196,9 @@ <string name="gpu_hide_other">Sembunyikan driver untuk GPU lain</string> <string name="gpu_show_other">Tampilkan driver untuk GPU lain</string> <string name="gpu_advanced">Lanjutan</string> + <string name="gpu_ubwc_title">Kompatibilitas UBWC</string> + <string name="gpu_ubwc_hint">Coba Aktif atau Nonaktif jika Steam atau Android menampilkan garis-garis atau berkedip. Berlaku untuk kedua driver setelah DroidDeck dimulai ulang.</string> + <string name="gpu_ubwc_restart">Mulai ulang DroidDeck untuk menerapkan.</string> <string name="gpu_set_with_display">Diatur bersama driver tampilan: %1$s membawa keduanya.</string> <string name="gpu_set_with_runtime">Diatur bersama driver runtime: %1$s membawa keduanya.</string> <string name="gpu_runtime_hint">Digunakan oleh gim dan desktop.</string> @@ -1244,10 +1307,15 @@ <string name="pip_auto">Otomatis masuk ke mode PiP</string> <string name="unfolded_controls">Kontrol di layar saat dibuka</string> <string name="unfolded_controls_hint">Saat dibuka, game berada di atas trackpad dan grip belakang Steam Deck. Saat dilipat, game tampil layar penuh.</string> + <string name="unfolded_controls_with_controller">Tetap tampil dengan pengontrol</string> + <string name="unfolded_controls_with_controller_hint">Tetap tampilkan kontrol sentuh ini saat pengontrol terhubung.</string> <string name="pip_suspended">Ditangguhkan</string> <string name="pip_not_ready">Gambar dalam gambar tersedia setelah sesi siap.</string> <string name="pip_permission">Izinkan gambar dalam gambar untuk DroidDeck di setelan Android.</string> <string name="pip_unavailable">Android tidak dapat membuka gambar dalam gambar.</string> + <string name="game_more">Lainnya</string> + <string name="game_edit_art">Edit gambar</string> + <string name="stores_in_steam_label">Di Steam</string> <string name="game_shortcut">Pintasan</string> <string name="game_shortcut_add">Tambahkan ke layar utama</string> <string name="game_shortcut_choose">Pilih game</string> @@ -1271,6 +1339,10 @@ <string name="main_wait_runtime">Tunggu operasi runtime selesai</string> <string name="main_wait_proton_install">Tunggu instalasi alat kompatibilitas selesai</string> + <string name="load_compat_title">Menyiapkan alat kompatibilitas</string> + <string name="load_compat_wait">Menunggu penyiapan kompatibilitas selesai</string> + <string name="load_compat_hint">Sesi Anda akan dimulai setelah penyiapan selesai.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Tunggu instalasi aplikasi desktop selesai</string> <string name="main_wait_install_game">Tunggu instalasi selesai sebelum meluncurkan game</string> <string name="main_saves_close_session">Tutup sesi Steam dulu, agar game tidak menyimpan dan menimpa hasil impor</string> @@ -1303,6 +1375,9 @@ <string name="main_install_anyway">Tetap instal</string> <string name="main_remove_runtime_title">Hapus runtime Linux</string> <string name="main_remove_runtime_text">Ini menghapus runtime, klien Steam di dalamnya, dan setiap game yang terinstal di sana.</string> + <string name="runtime_actions_title">Runtime Linux</string> + <string name="runtime_actions_text">Perbaiki menginstal ulang file sistem runtime dan mempertahankan Steam, gim, serta setelan Anda. Tambahan seperti desktop diinstal lagi saat Anda menggunakannya berikutnya. Hapus menghapus semuanya.</string> + <string name="runtime_repair">Perbaiki runtime</string> <string name="main_applied">Diterapkan: %1$s</string> <string name="android_app_open_failed_primary">Tidak dapat membuka %1$s di layar utama</string> <string name="android_app_open_failed_on">Tidak dapat membuka %1$s di %2$s</string> @@ -1429,6 +1504,10 @@ <string name="session_runtime_catalog_unreachable">Tidak dapat menghubungi katalog runtime. Periksa koneksi dan tekan Mainkan lagi.</string> <string name="session_runtime_install_failed">Runtime Linux tidak terinstal. Periksa runtime di Penyiapan dan tekan Mainkan lagi.</string> <string name="session_desktop_install_failed">Desktop tidak terinstal (%1$s). Periksa koneksi dan tekan Desktop lagi.</string> + <string name="session_package_resume_failed">Instalasi yang terputus tidak dapat diselesaikan (%1$s). Periksa koneksi dan ruang penyimpanan, lalu coba lagi.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Runtime Linux rusak: %1$d tautan pustaka mengarah ke file yang hilang (%2$s dan lainnya), biasanya setelah instalasi terputus. Perbaiki tetap mempertahankan gim dan setelan Anda.</item> + </plurals> <string name="session_ended_named">%1$s berhenti secara tak terduga. Bagikan log bersama laporan bug, atau coba lagi.</string> <string name="session_ended_program">Program berhenti secara tak terduga. Bagikan log bersama laporan bug, atau coba lagi.</string> <string name="session_ended_desktop">Desktop berhenti secara tak terduga. Bagikan log bersama laporan bug, atau coba lagi.</string> @@ -1442,6 +1521,12 @@ <string name="mode_decky_plugins_hint">Instal file ZIP plugin untuk sesi Steam berikutnya.</string> <string name="mode_decky_plugin_downloading">Mengunduh…</string> <string name="mode_decky_plugin_install_zip">Instal dari ZIP</string> + <string name="decky_zip_warning_title">Instalasi Plugin Pihak Ketiga</string> + <string name="decky_zip_warning_text">Tim Decky Loader belum meninjau plugin ini. Plugin ini mungkin berisi malware, seperti perangkat lunak untuk mencuri akun Steam Anda atau merusak perangkat Anda. Dengan menginstal plugin ini, Anda setuju menanggung semua risiko terhadap perangkat Anda.</string> + <string name="decky_zip_warning_continue">Lanjutkan</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">Harap tunggu %1$d detik</item> + </plurals> <string name="store_cat_games">Gim</string> <string name="store_cat_audio_video">Audio & Video</string> <string name="store_cat_graphics">Grafis</string> @@ -1598,6 +1683,8 @@ <string name="fm_accept">Terima</string> <string name="fm_decline">Tolak</string> <string name="fm_drive_not_readable">%1$s terpasang tetapi tidak dapat dibaca saat ini</string> + <string name="fm_drive_access_title">Izinkan akses ke %1$s</string> + <string name="fm_drive_access_text">Android mengizinkan DroidDeck melihat drive ini tetapi tidak membacanya. Aktifkan Akses semua file untuk DroidDeck, lalu kembali.</string> <string name="fm_list_view">Tampilan daftar</string> <string name="fm_grid_view">Tampilan kisi</string> <string name="fm_search">Cari</string> @@ -1668,6 +1755,89 @@ <string name="second_mode_keyboard_trackpad">Keyboard + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Pegangan Deck + trackpad</string> + <string name="second_mode_dashboard">Dasbor</string> + <string name="bottom_dashboard_empty">Belum ada yang bisa ditampilkan di sini.</string> + <string name="bottom_page_downloads">Unduhan</string> + <string name="bottom_downloads_none">Tidak ada unduhan yang berjalan.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Mengunduh cache shader</string> + <string name="bottom_downloads_paused">Dijeda</string> + <string name="bottom_downloads_queued">Menunggu dimulai</string> + <string name="bottom_page_notifications">Notifikasi</string> + <string name="bottom_notifications_listener">Layar bawah DroidDeck</string> + <string name="bottom_notifications_why">Tampilkan pesan dan notifikasi lain di sini saat Anda bermain. Notifikasi hanya muncul di layar ini dan tidak disimpan. Android hanya meminta sekali: halaman akses notifikasinya terbuka di layar ini; aktifkan DroidDeck di sana dan halaman ini akan kembali dengan sendirinya.</string> + <string name="bottom_notifications_allow">Izinkan akses notifikasi</string> + <string name="bottom_notifications_none">Tidak ada notifikasi.</string> + <string name="bottom_notifications_count">%1$d notifikasi</string> + <string name="bottom_notifications_clear">Hapus</string> + <string name="bottom_page_screenshots">Tangkapan layar</string> + <string name="stats_fps_needs_hud">FPS memerlukan HUD aktif</string> + <string name="stats_speed">Kecepatan</string> + <string name="stats_pedals">Pedal</string> + <string name="stats_gforce">Gaya G</string> + <string name="stats_timing">Waktu</string> + <string name="stats_best_lap">Lap terbaik</string> + <string name="stats_tires">Ban °C</string> + <string name="stats_trace">Gas dan rem, 10 s terakhir</string> + <string name="stats_speed_chart">Kecepatan, %1$s</string> + <string name="stats_gear">Gigi</string> + <string name="stats_steam_client_arm">Klien Steam ARM</string> + <string name="stats_steam_client_x86">Klien Steam x86</string> + <string name="stats_throttle">Gas</string> + <string name="stats_brake">Rem</string> + <string name="stats_lights">Lampu indikator</string> + <string name="stats_lamp_shift">Pindah gigi</string> + <string name="stats_lamp_handbrake">Rem tangan</string> + <string name="stats_lamp_pit">Pembatas pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Mesin %1$s °C</string> + <string name="stats_oil_temp">Oli %1$s °C</string> + <string name="stats_power">Distributor daya</string> + <string name="stats_fuel_t">Bahan bakar, t</string> + <string name="stats_fuel_main">Utama %1$s t</string> + <string name="stats_fuel_reserve">Cadangan %1$s t</string> + <string name="bottom_telemetry_send_title">Kirim data dasbor</string> + <string name="bottom_telemetry_send_auto">Otomatis</string> + <string name="bottom_telemetry_send_auto_hint">Mengaktifkannya untuk setiap gim yang tercantum di sini, termasuk gim yang ditemukan nanti. Gim yang Anda matikan tetap mati.</string> + <string name="bottom_telemetry_send_note">Ini mengubah setelan keluaran data milik gim itu sendiri. Perubahan berlaku saat gim dimulai berikutnya; mematikannya mengembalikan setelan lama.</string> + <string name="bottom_telemetry_send_close">Tutup %1$s untuk mengubah ini.</string> + <string name="bottom_telemetry_send_failed">Tidak dapat mengubah setelan %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: aktifkan %2$s di setelan gim dengan IP 127.0.0.1 dan port %3$d.</string> + <string name="bottom_shots_where">Disimpan ke Pictures/DroidDeck. Tangkapan layar Steam juga muncul di sini.</string> + <string name="bottom_shots_take">Ambil tangkapan layar</string> + <string name="bottom_shots_saved">Tangkapan layar disimpan.</string> + <string name="bottom_shots_failed">Tidak dapat mengambil tangkapan layar.</string> + <string name="bottom_shots_none">Belum ada tangkapan layar.</string> + <string name="bottom_page_chat">Obrolan & suara</string> + <string name="bottom_chat_why">Baca dan balas obrolan Steam di sini sementara gim tetap berjalan di layar utama. Fitur ini menggunakan akun yang dipakai untuk masuk ke Steam.</string> + <string name="bottom_chat_not_signed_in">Steam belum memiliki info masuk web untuk dibagikan, jadi masuklah di sini sekali.</string> + <string name="bottom_chat_stopped">Android menutup halaman obrolan saat DroidDeck berada di latar belakang. Halaman akan terbuka lagi saat Anda kembali ke DroidDeck.</string> + <string name="bottom_chat_open">Buka Steam Chat</string> + <string name="bottom_chat_close">Tutup obrolan</string> + <string name="bottom_chat_mic_on">Mik aktif</string> + <string name="bottom_chat_mic_off">Mik mati</string> + <string name="bottom_chat_mic_unavailable">Mik mati untuk gim ini. Untuk berbicara, aktifkan Mikrofon di setelan Steam DroidDeck (Audio) lalu mulai gim lagi.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">Statistik dalam gim</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Baterai</string> + <string name="bottom_telemetry_lap">Lap</string> + <string name="bottom_telemetry_position">Posisi</string> + <string name="bottom_telemetry_this_lap">Lap ini</string> + <string name="bottom_telemetry_last_lap">Lap terakhir</string> + <string name="bottom_telemetry_fuel">Bahan bakar</string> + <string name="bottom_telemetry_cargo">Kargo</string> + <string name="bottom_telemetry_pips">Pip SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Status hukum</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Port %1$d menerima data (%2$d paket berukuran %3$d byte), tetapi dalam format yang belum dapat dibaca halaman ini.</string> + <string name="bottom_telemetry_port_busy">Program lain sudah menggunakan port %1$s, jadi gim tersebut tidak dapat ditampilkan di sini.</string> <string name="rtinst_removing">Menghapus runtime Linux</string> <plurals name="rtinst_removing_entries"> @@ -1697,6 +1867,7 @@ <string name="flatpakmgr_not_ready">Siapkan Flatpak terlebih dahulu</string> <string name="flatpakmgr_starting">Memulai</string> <string name="flatpakmgr_exit_status">Flatpak keluar dengan status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s dibuat untuk %2$s, yang tidak dapat dijalankan DroidDeck. Aplikasi Flatpak di sini memerlukan versi ARM64 atau x86_64.</string> <string name="flatpakmgr_installing">Menginstal %1$s</string> <string name="flatpakmgr_updating">Memperbarui %1$s</string> <string name="flatpakmgr_removing">Menghapus %1$s</string> @@ -1790,6 +1961,7 @@ <string name="adbpair_applying">Menerapkan setelan…</string> <string name="adbpair_command_failed">Perintah Debugging nirkabel gagal</string> <string name="adbpair_channel_name">Penyiapan Debugging nirkabel</string> + <string name="adbpair_progress_channel_name">Progres penyiapan proses debug nirkabel</string> <string name="adbpair_channel_description">Meminta kode pemasangan Debugging nirkabel saat Setelan terbuka</string> <string name="adbpair_title_pair">Pasangkan Debugging nirkabel</string> <string name="adbpair_waiting_text">Aktifkan Debugging nirkabel, lalu ketuk “Pasangkan perangkat dengan kode pemasangan”.</string> @@ -1898,6 +2070,7 @@ <string name="gpuinfo_not_adreno">Bukan GPU Adreno</string> <string name="gpuinfo_supported">Didukung</string> <string name="gpuinfo_experimental">Eksperimental: drivernya adalah build uji</string> + <string name="gpuinfo_a850_experimental">Dukungan eksperimental Adreno 850: memerlukan driver tampilan dan driver gim eksperimental yang kompatibel; belum diverifikasi di perangkat ini</string> <string name="gpuinfo_below_tested">Di bawah perangkat keras yang diuji (Adreno 725 dan lebih baru): mungkin tidak dapat berjalan</string> <string name="gpuinfo_unsupported">Tidak didukung: DroidDeck memerlukan GPU Adreno (Snapdragon)</string> @@ -1994,6 +2167,7 @@ <string name="display_look_filter">%1$s Mengatur skala ke %2$s.</string> <string name="display_match_screen">Sesuaikan layar (%1$d×%2$d)</string> <string name="display_follow_screen">Ikuti layar (ukuran berubah saat dilipat atau dibuka)</string> + <string name="display_follow_screen_scaled">Diskalakan %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Tampilkan detail perangkat</string> <string name="device_info_hide">Sembunyikan detail perangkat</string> @@ -2100,6 +2274,13 @@ <string name="stores_resume">Lanjutkan</string> <string name="stores_refresh">Segarkan</string> <string name="stores_sort">Urutkan</string> + <string name="setup_rail_labels">Label bilah samping</string> + <string name="setup_rail_labels_hint">Tampilkan nama di bawah ikon bilah samping. Nonaktifkan untuk bilah samping yang lebih ramping.</string> + <string name="library_display">Tampilan</string> + <string name="library_display_larger">Kartu lebih besar</string> + <string name="library_display_smaller">Kartu lebih kecil</string> + <string name="library_display_title">Tampilkan judul</string> + <string name="library_display_size">Tampilkan ukuran</string> <string name="stores_sort_last_played">Baru dimainkan</string> <string name="stores_sort_recently_installed">Baru dipasang</string> <string name="stores_sort_title_asc">Judul A–Z</string> @@ -2226,6 +2407,9 @@ <string name="stores_download_manager">Manajer unduhan</string> <string name="stores_parallel">Unduhan sekaligus</string> <string name="stores_install_where">Instal ke</string> + <string name="stores_install_language">Bahasa gim</string> + <string name="stores_install_language_hint">GOG dan Epic menginstal bahasa ini. Sistem mengikuti bahasa aplikasi.</string> + <string name="stores_install_language_system">Sistem</string> <string name="stores_install_title">Instal %1$s:</string> <string name="stores_target_internal">Internal</string> <string name="stores_target_free">%1$s tersedia</string> @@ -2264,6 +2448,9 @@ <string name="edit_target">Target</string> <string name="edit_start_in">Mulai di</string> <string name="edit_launch_options">Opsi peluncuran</string> + <string name="edit_launch_options_steam_hint">Dibagikan dengan Properti Steam: perubahan di salah satunya muncul di keduanya.</string> + <string name="edit_launch_options_not_saved">Tidak dapat menyimpan opsi peluncuran ke Steam. Coba lagi.</string> + <string name="edit_launch_options_desktop">Steam mungkin terbuka di sesi desktop. Ubah opsi peluncuran di Properti Steam, atau tutup sesinya terlebih dahulu.</string> <string name="edit_artwork">Artwork</string> <string name="edit_other_exe">Exe lain…</string> <string name="edit_remove">Hapus</string> @@ -2389,6 +2576,7 @@ <string name="setup_download_source_custom">Prefix sendiri</string> <string name="setup_download_mirror">Situs</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APLIKASI LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Aplikasi desktop untuk desktop Linux, dibuka dari Desktop.</string> @@ -2503,7 +2691,7 @@ <string name="glasses_game_on">Game di kacamata</string> <string name="glasses_game_on_hint">Tampilkan game hanya di kacamata. Nonaktif: ponsel menampilkannya dan Android mencerminkan layar ponsel.</string> <string name="glasses_display">Tampilan</string> - <string name="glasses_refresh">Refresh rate</string> + <string name="glasses_refresh">Kecepatan refresh</string> <string name="glasses_3d">3D (berdampingan)</string> <string name="glasses_3d_hint">Alihkan kacamata pintar ke 3D berdampingan. Pelacakan kepala dikontrol secara terpisah.</string> <string name="glasses_3d_failed">Sinyal 3D belum terkonfirmasi. Coba lagi setelah gambar 2D kembali.</string> @@ -2527,6 +2715,22 @@ <string name="glasses_tracking_flat_hint">Otomatis menjaga game 2D ini tetap diam dalam pandangan. Pilih Layar virtual di Tampilan untuk menggunakan pelacakan kepala.</string> <string name="glasses_tracking_sbs_hint">Pelacakan kepala berlaku untuk layar virtual atau game SteamVR yang sedang berjalan.</string> <string name="glasses_hardware">Perangkat</string> + <string name="vr_controllers_tab">Pengontrol</string> + <string name="vr_controllers_group">Pengontrol SteamVR</string> + <string name="vr_controllers_emulate">Gamepad di VR</string> + <string name="vr_controllers_emulate_hint">Dua tangan VR yang diperankan pengontrol Anda. Perubahan langsung berlaku, juga saat SteamVR berjalan. Joy-Con dan tangan yang dilacak tetap mengambil alih sisinya.</string> + <string name="vr_controllers_off">Gamepad biasa</string> + <string name="vr_controllers_index">Pengontrol Valve Index</string> + <string name="vr_controllers_touch">Pengontrol Meta Quest 3</string> + <string name="vr_controllers_vive">Tongkat HTC Vive</string> + <string name="vr_controllers_sticks">Stik awalnya untuk</string> + <string name="vr_controllers_sticks_hint">Tekan kedua stik bersamaan saat di VR untuk beralih.</string> + <string name="vr_controllers_sticks_game">Menggerakkan Anda di gim</string> + <string name="vr_controllers_sticks_hands">Menggerakkan tangan</string> + <string name="vr_controllers_buttons">Tombol</string> + <string name="vr_controllers_buttons_stick">Trigger menjadi trigger, bumper menjadi grip, A/B dan X/Y adalah tombol muka tiap tangan, klik stik mengeklik thumbstick, Guide membuka menu SteamVR. D-pad atas dan bawah mendekatkan atau menjauhkan tangan.</string> + <string name="vr_controllers_buttons_vive">Stik menjadi trackpad; A/X atau klik stik menekannya. Trigger menjadi trigger, bumper menjadi grip, Start dan Select menjadi menu, Guide membuka menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Tanpa tangan VR. Gim yang mendukung gamepad, serta menu SteamVR, menerima pengontrol Anda seperti biasa.</string> <string name="glasses_brightness">Kecerahan</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Peredup lensa</string> @@ -2584,6 +2788,12 @@ <string name="hand_camera_placement">Posisi kamera</string> <string name="hand_camera_placement_hint">Pastikan kamera bisa melihat Anda sebelum bermain.</string> <string name="hand_camera_check">Periksa</string> + <string name="tracking_pack_title">Unduhan pelacakan tangan</string> + <string name="tracking_pack_hint">Pelacakan tangan memerlukan unduhan %1$s satu kali.</string> + <string name="tracking_pack_download">Unduh</string> + <string name="tracking_pack_retry">Coba lagi</string> + <string name="tracking_pack_downloading">Mengunduh pelacakan tangan… %1$d%%</string> + <string name="tracking_pack_failed">Pelacakan tangan tidak dapat diunduh. Periksa koneksi Anda lalu coba lagi.</string> <string name="hand_camera_check_title">Posisi kamera</string> <string name="hand_camera_how_rear">Dirikan perangkat sejauh 1,5 hingga 2 meter kira-kira setinggi dada, dengan kamera belakang menghadap Anda. Lalu masuk ke bidang pandang dengan tangan terentang.</string> <string name="hand_camera_how_front">Dirikan perangkat sejauh 1,5 hingga 2 meter kira-kira setinggi dada, dengan layar menghadap Anda. Lalu masuk ke bidang pandang dengan tangan terentang.</string> @@ -2791,6 +3001,9 @@ <string name="storage_data_installed">Gim terpasang</string> <string name="storage_data_parts">Prefix %1$s · shader %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Bersihkan shader</string> + <string name="storage_reset_prefix">Reset prefix</string> + <string name="storage_reset_prefix_title">Reset prefix untuk %1$s?</string> + <string name="storage_reset_prefix_confirm">Menghapus prefix Wine (%1$s) di %2$s dan membuatnya ulang saat peluncuran berikutnya. Save, setelan, dan redistributable yang terinstal di dalamnya akan hilang; save Steam Cloud tetap di akun Anda.</string> <string name="storage_data_leftovers">Gim yang dihapus</string> <string name="storage_steam_app">Aplikasi Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefix masih berisi berkas, mungkin save lokal</string> @@ -3092,6 +3305,117 @@ <string name="spatial_saved_views_hint">Tampilan yang disimpan dapat dihitung ulang. Mulai kalibrasi baru untuk menangkap sistem koordinat pelacakan saat ini.</string> <string name="spatial_model_checksum_error">Ketidakcocokan checksum model tangan</string> <string name="spatial_opencv_load_error">OpenCV tidak dapat memuat</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sinkronkan dengan Syncthing</string> + <string name="sync_enable_hint">Berbasis Syncthing-Fork, ini adalah implementasi Syncthing yang memungkinkan Anda menyinkronkan file di sistem file internal DroidDeck dengan instans Syncthing lain. Ini hanya untuk file yang Anda simpan di dalam sistem file internal DroidDeck.</string> + <string name="sync_missing">Build ini tidak menyertakan Syncthing.</string> + <string name="sync_starting">Memulai Syncthing</string> + <string name="sync_status_starting">Memulai</string> + <string name="sync_status_up_to_date">Terbaru</string> + <string name="sync_status_syncing">Menyinkronkan</string> + <string name="sync_status_paused">Dijeda</string> + <string name="sync_status_pausing">Menjeda</string> + <string name="sync_status_resuming">Melanjutkan</string> + <string name="sync_status_attention">Perlu perhatian</string> + <string name="sync_status_failed">Syncthing berhenti</string> + <string name="sync_failed_retry">Coba lagi</string> + <string name="sync_paused_wifi">Dijeda hingga ada Wi-Fi</string> + <string name="sync_paused_game">Dijeda selama gim berjalan</string> + <string name="sync_summary">%1$d folder · %2$d dari %3$d perangkat terhubung</string> + <string name="sync_left">%1$s lagi</string> + <string name="sync_open_web_ui">Buka UI web</string> + <string name="sync_pause">Jeda</string> + <string name="sync_resume">Lanjutkan</string> + <string name="sync_running">Berjalan</string> + <string name="sync_running_hint">Matikan untuk menghentikan Syncthing sepenuhnya.</string> + <string name="sync_this_device">Perangkat ini</string> + <string name="sync_device_id">ID Perangkat</string> + <string name="sync_show_qr">Tampilkan QR</string> + <string name="sync_advanced">Lanjutan</string> + <string name="sync_advanced_hint">Port, kapan berjalan, atur ulang</string> + <string name="sync_open">Buka</string> + <string name="sync_waiting">Menunggu Anda</string> + <string name="sync_pending_device">%1$s ingin terhubung</string> + <string name="sync_pending_folder">%1$s ingin berbagi “%2$s”</string> + <string name="sync_pending_folder_hint">Terima untuk memilih lokasi penyimpanannya di DroidDeck.</string> + <string name="sync_review">Tinjau di UI web</string> + <string name="sync_folders">Folder</string> + <string name="sync_no_folders">Belum ada folder.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Terbaru</string> + <string name="sync_folder_syncing">Menyinkronkan %1$d%%</string> + <string name="sync_folder_scanning">Memindai</string> + <string name="sync_folder_paused">Dijeda</string> + <string name="sync_folder_out_of_sync">Tidak sinkron</string> + <string name="sync_folder_errors">%1$d file tidak dapat disinkronkan</string> + <string name="sync_folder_blocked">Diblokir</string> + <string name="sync_folder_blocked_hint">Folder ini berada di luar penyimpanan DroidDeck, jadi DroidDeck menjedanya. Untuk menyinkronkan folder di luar DroidDeck, gunakan aplikasi Syncthing-Fork.</string> + <string name="sync_remove_folder">Hapus dari Syncthing</string> + <string name="sync_remove_folder_hint">Menghapusnya tidak akan menghapus file apa pun.</string> + <string name="sync_devices">Perangkat</string> + <string name="sync_no_devices">Belum ada perangkat.</string> + <string name="sync_connected">Terhubung</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Terakhir terlihat %1$s</string> + <string name="sync_device_id_title">ID perangkat ini</string> + <string name="sync_device_id_hint">Di perangkat Anda yang lain, tambahkan perangkat di Syncthing lalu pindai kode ini atau tempel ID-nya. Kemudian terima di sini melalui UI web.</string> + <string name="sync_copy">Salin</string> + <string name="sync_share">Bagikan</string> + <string name="sync_done">Selesai</string> + <string name="sync_off_title">Matikan Syncthing?</string> + <string name="sync_off_body">Syncthing berhenti sekarang dan tetap berhenti hingga dinyalakan kembali. File yang telah disinkronkan tetap di tempatnya.</string> + <string name="sync_off_forget">Hapus juga konfigurasi Syncthing</string> + <string name="sync_off_forget_hint">Menghapus ID, folder, dan perangkat milik perangkat ini. Menyalakannya lagi akan memulai dari awal.</string> + <string name="sync_turn_off">Matikan</string> + <string name="sync_ports">Port</string> + <string name="sync_port_sync">Sinkronisasi</string> + <string name="sync_port_discovery">Penemuan lokal</string> + <string name="sync_repick">Pilih port baru</string> + <string name="sync_repick_hint">Diperiksa lagi setiap kali dimulai.</string> + <string name="sync_repick_button">Pilih ulang</string> + <string name="sync_reset_group">Atur ulang</string> + <string name="sync_api_key">Kunci API</string> + <string name="sync_regenerate">Buat ulang</string> + <string name="sync_reset">Atur ulang Syncthing</string> + <string name="sync_reset_hint">ID perangkat baru, folder dan perangkat dihapus. File di penyimpanan DroidDeck tetap disimpan.</string> + <string name="sync_reset_button">Atur ulang</string> + <string name="sync_reset_confirm_title">Atur ulang Syncthing?</string> + <string name="sync_running_group">Berjalan</string> + <string name="sync_run">Jalankan</string> + <string name="sync_run_open">Saat DroidDeck terbuka</string> + <string name="sync_run_background">Di latar belakang</string> + <string name="sync_wifi_only">Hanya Wi-Fi</string> + <string name="sync_pause_games">Jeda selama bermain gim</string> + <string name="sync_logs">Log</string> + <string name="sync_logs_hint">Output Syncthing untuk sesi ini</string> + <string name="sync_logs_share">Bagikan</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Siapkan runtime Linux terlebih dahulu.</string> + <string name="sync_accept">Terima</string> + <string name="sync_accept_title">Simpan “%1$s” ke</string> + <string name="sync_add_folder">Tambah folder</string> + <string name="sync_add_folder_hint">Sinkronkan folder di penyimpanan DroidDeck</string> + <string name="sync_choose">Pilih</string> + <string name="sync_add">Tambah</string> + <string name="sync_add_failed">Folder tidak dapat ditambahkan.</string> + <string name="sync_share_with">Bagikan dengan</string> + <string name="sync_share_none">Belum ada perangkat. Anda dapat membagikan folder ini dari UI web nanti.</string> + <string name="sync_use_folder">Gunakan folder ini</string> + <string name="sync_new_folder">Folder baru</string> + <string name="sync_location_home">Folder home kontainer</string> + <string name="sync_location_sync">Folder Sync</string> + <string name="sync_location_shared">Penyimpanan bersama DroidDeck</string> + <string name="sync_location_card">DroidDeck di %1$s</string> + <string name="sync_location_app">Data aplikasi DroidDeck</string> + <string name="sync_web_path_locked">Folder baru disimpan di folder Sync DroidDeck. Untuk menyinkronkan folder DroidDeck lain, gunakan Tambah folder di tab Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Muat ulang</string> + <string name="sync_not_running">Syncthing tidak berjalan.</string> + <string name="session_end_steam_sigill">Steam berhenti karena instruksi ilegal (SIGILL). Ini bisa berupa masalah kompatibilitas instruksi CPU atau klien mengalami crash. Bagikan log beserta detail perangkat Anda.</string> + <string name="session_end_steam_try_x64">Anda dapat mencoba Setelan Steam → Klien Steam → x86-64 (eksperimental). Ini memerlukan unduhan tambahan dan mungkin berjalan lebih lambat.</string> + <string name="session_end_vulkan_device">Driver grafis Linux tidak dapat menemukan perangkat Vulkan yang dapat digunakan. Pastikan driver GPU Linux yang dipilih mendukung GPU ini.</string> + <string name="session_end_gpu_unsupported">Sesi ini tidak dapat dimulai karena GPU ini tidak memiliki driver Vulkan Linux yang kompatibel dalam konfigurasi saat ini. Driver Adreno Turnip tidak dapat mengaktifkan dukungan untuk GPU MediaTek/Mali.</string> <string name="setup_group_memory">Memori</string> <string name="setup_clear_cached">Tutup aplikasi dalam cache sebelum sesi</string> <string name="setup_clear_cached_hint">Saat sesi dimulai, DroidDeck menutup aplikasi yang disimpan Android di latar belakang agar gim mendapat lebih banyak memori. Debugging nirkabel harus aktif.</string> @@ -3115,6 +3439,12 @@ <string name="epic_client_open">Buka</string> <string name="epic_client_install">Pasang</string> <string name="game_tab_about">Tentang</string> + <string name="game_resources_browser">Terbuka di browser Anda</string> + <string name="game_resource_guides">Panduan</string> + <string name="game_resource_protondb_detail">Laporan kompatibilitas Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Untuk gim dengan save di akun Steam Anda</string> + <string name="game_resource_search">Penelusuran web</string> <string name="game_tab_install">Pasang</string> <string name="game_install_location">Lokasi</string> <string name="game_install_folder">Folder</string> @@ -3131,6 +3461,11 @@ <string name="stores_eyebrow_pass">tersedia dengan %1$s</string> <string name="stores_owned_in_library">Game yang dimiliki di Pustaka</string> <string name="library_filter_added">Ditambahkan</string> + <string name="library_filter">Filter</string> + <string name="library_filter_installed">Hanya yang terinstal</string> + <string name="library_filter_all_owned">Semua gim yang dimiliki</string> + <string name="library_no_installed_matches">Tidak ada gim terinstal yang cocok dengan filter ini.</string> + <string name="library_browse_owned">Telusuri gim yang dimiliki</string> <string name="game_tab_launch">Peluncuran</string> <string name="game_tab_saves_cloud">Simpanan & cloud</string> <string name="game_launch_shortcut">Pintasan Steam</string> @@ -3148,6 +3483,40 @@ <string name="stores_itch_update_replaced">Pengembang mengganti build ini dengan %1$s. Perbarui ke build itu?</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Pengaturan cloud</string> + <string name="integration_title">Integrasi Steam</string> + <string name="integration_count">%1$d dari %2$d aktif</string> + <string name="integration_set_up">Siapkan</string> + <string name="integration_location">Lokasi</string> + <string name="integration_app_info">Info aplikasi</string> + <string name="integration_wifi">Nama Wi-Fi</string> + <string name="integration_brightness">Kecerahan</string> + <string name="integration_home">DroidDeck sebagai Beranda</string> + <string name="integration_shortcuts">Tombol sistem</string> + <string name="integration_wifi_hint">Tampilkan jaringan di Steam · memerlukan akses Lokasi, tidak pernah dilacak</string> + <string name="integration_wifi_on">Jaringan tampil di Steam</string> + <string name="integration_wifi_location_off">Lokasi nonaktif</string> + <string name="integration_wifi_denied">Lokasi ditolak · izinkan di Info aplikasi</string> + <string name="integration_brightness_hint">Penggeser Steam mengatur kecerahan layar</string> + <string name="integration_home_hint">Home membuka menu Steam dalam sesi</string> + <string name="integration_shortcuts_hint">Alt+Tab, tombol Win, dan tombol Beranda tetap di sesi</string> + <string name="integration_shortcuts_maybe_restricted">Berwarna abu-abu di Android? Info aplikasi → ⋮ → Izinkan setelan terbatas</string> + <string name="integration_shortcuts_restricted">Diblokir oleh Android · Info aplikasi → ⋮ → Izinkan setelan terbatas</string> + <string name="integration_shortcuts_service">Tombol sistem DroidDeck</string> + <string name="integration_shortcuts_service_description">Menjaga Alt+Tab, tombol Win, dan tombol Beranda tetap di sesi DroidDeck yang aktif, bukan di Android.</string> + <string name="integration_brightness_needed">Aktifkan Kecerahan di Penyiapan → Integrasi Steam</string> + <string name="setup_gpu_bridge_off">Jembatan Mali: mati</string> + <string name="setup_gpu_bridge_on">Jembatan Mali: nyala</string> + <string name="setup_gpu_bridge_detail">%1$s bukan Adreno. Jembatan Vulkan eksperimental menyala: sesi menggambar melalui driver ponsel itu sendiri. Bersiaplah menemui bug; kirim log sesi.</string> + <string name="setup_bridge_safe">Mode aman</string> + <string name="setup_bridge_safe_on">Mode aman: nyala</string> + <string name="setup_bridge_safe_off">Mode aman: mati</string> + <string name="setup_bridge_safe_on_detail">Paling kompatibel. Disarankan untuk perangkat baru.</string> + <string name="setup_bridge_safe_off_detail">Lebih cepat di bagian yang lolos pemeriksaan GPU ini.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: otomatis</string> + <string name="setup_bridge_dxvk_proton">DXVK: bawaan Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Memakai DXVK lebih lama jika Vulkan GPU ini terlalu lama untuk DXVK bawaan Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Setiap Proton tetap memakai DXVK bawaannya, meski Vulkan GPU ini mungkin terlalu lama untuknya.</string> <string name="apps_search_hint">Cari aplikasi</string> <string name="apps_no_match">Tidak ada aplikasi yang cocok dengan “%1$s”.</string> <string name="apps_add_widget">Tambahkan widget</string> @@ -3195,6 +3564,8 @@ <string name="desktop_restore_done_body">Aplikasi yang Anda tambahkan sudah terinstal lagi.</string> <string name="desktop_restore_failed_title">Beberapa perangkat lunak tidak dapat dipulihkan</string> <string name="desktop_restore_failed_body">Lihat ~/.cache/droiddeck/apt-restore.log, lalu coba sudo apt install di Konsole.</string> + <string name="gog_full_files">Optimasi native tidak tersedia. Unduhan mencakup file pengganti lengkap.</string> + <string name="gog_recover">Verifikasi hasil patch</string> <string name="slow_usb_title">Koneksi USB lambat</string> <string name="slow_usb_cable">%1$s terhubung melalui %2$s (%3$s Mbps, sekitar %4$d MB/s), jadi game di dalamnya akan dimuat lambat. Gunakan kabel USB 3 berkecepatan 5 Gbps atau lebih, coba balik colokan USB-C, atau gunakan drive yang lebih cepat.</string> <string name="slow_usb_port">%1$s terhubung melalui %2$s (%3$s Mbps, sekitar %4$d MB/s). Port USB perangkat ini tidak bisa lebih cepat, jadi game akan dimuat lambat. Penyimpanan internal atau kartu microSD mungkin lebih cepat.</string> @@ -3205,4 +3576,52 @@ <string name="steam_import_names_more">%1$s dan %2$d lainnya</string> <string name="steam_import_now">Mulai ulang sekarang</string> <string name="steam_import_later">Nanti</string> + <string name="gog_maintenance">Kelola instalasi GOG</string> + <string name="gog_check">Periksa pembaruan</string> + <string name="gog_repair">Verifikasi/Perbaiki</string> + <string name="gog_patches">Patch offline</string> + <string name="gog_refresh">Unduh penginstal offline lengkap</string> + <string name="gog_update">Perbarui ke %1$s</string> + <string name="gog_resume">Lanjutkan pemeliharaan GOG</string> + <string name="gog_open_patch">Buka penginstal patch</string> + <string name="gog_patch_in_session">Selesaikan atau batalkan penginstal patch di sesi Linux.</string> + <string name="gog_patch_requirements">Pilih patch untuk versi dan bahasa yang Anda instal. Versi sumber yang didukung mungkin tidak tercantum.</string> + <string name="gog_no_patches">GOG tidak memiliki patch Windows mandiri untuk gim ini.</string> + <string name="gog_managed_files">File gim yang diubah dapat diganti.</string> + <string name="gog_patch_installer_note">Penginstal terbuka di sesi Linux Anda.</string> + <string name="gog_download_label">Unduhan</string> + <string name="gog_space_label">Ruang tambahan</string> + <string name="gog_space_estimate_label">Perkiraan ruang</string> + <string name="gog_repair_action">Perbaiki file</string> + <string name="gog_refresh_action">Segarkan instalasi</string> + <string name="gog_select_patch">Pilih</string> + <string name="stores_gamejolt_not_owned">Tidak ada di pustaka Game Jolt Anda</string> + <string name="stores_gamejolt_no_build">Tidak ada unduhan Windows untuk game ini</string> + <string name="stores_gamejolt_no_exe">Tidak ada game Windows di unduhan</string> + <string name="stores_gamejolt_no_game">Game ini tidak ditemukan di Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Tidak dapat memuat game dari Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt menjawab HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Tidak dapat memuat unduhan dari Game Jolt</string> + <string name="stores_gamejolt_build_open">Buka di Game Jolt</string> + <string name="stores_gamejolt_archive">Arsip %1$s tidak didukung</string> + <string name="stores_gamejolt_extract_failed">Tidak dapat mengekstrak unduhan (kode %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Tidak dapat menghubungi Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt tidak memberikan tautan unduhan</string> + <string name="stores_gamejolt_section_featured">Unggulan</string> + <string name="stores_gamejolt_section_hot">Sedang tren</string> + <string name="stores_gamejolt_section_best">Terbaik</string> + <string name="stores_gamejolt_section_new">Baru</string> + <string name="stores_gamejolt_price_under_30">$30 atau kurang</string> + <string name="stores_gamejolt_os_other">Lainnya</string> + <string name="stores_gamejolt_maturity_everyone">Semua umur</string> + <string name="stores_gamejolt_maturity_teen">Remaja</string> + <string name="stores_gamejolt_maturity_adult">Dewasa</string> + <string name="stores_gamejolt_status_complete">Selesai</string> + <string name="stores_gamejolt_status_early">Akses awal</string> + <string name="stores_gamejolt_partners">Game mitra</string> + <string name="stores_gamejolt_filter_browser">Peramban</string> + <string name="stores_gamejolt_filter_maturity">Klasifikasi usia</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Mitra</string> + <string name="stores_gamejolt_followed">Game yang diikuti</string> </resources> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index df58eaf0bb..a1419b704c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opzioni VKD3D per D3D12. nodxr disattiva il ray tracing; usalo solo per un gioco che lo richiede.</string> <string name="game_env_proton_log">Imposta 1 per un log diagnostico di Proton. Il log può ridurre le prestazioni e occupare spazio.</string> <string name="game_env_wined3d">Imposta 1 per usare WineD3D basato su OpenGL invece di DXVK, per test di compatibilità D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderer per DirectDraw, Direct3D 1-7 e i giochi eseguiti con WineD3D. Vulkan salta il percorso OpenGL-su-Zink ed è molto più veloce per i vecchi giochi DirectDraw e Direct3D 7 su Adreno.</string> + <string name="game_env_dxvk_d3d8">Imposta 1 per eseguire Direct3D 8 tramite DXVK invece di WineD3D. Più veloce nel test Direct3D 8 di AIO Graphics Test su Adreno.</string> <string name="game_env_no_ntsync">Imposta 1 per non usare ntsync (droiddeck-ntsync o un driver del kernel) in questo gioco; userà droiddeck-esync se esiste un pacchetto, altrimenti droiddeck-fsync.</string> <string name="game_env_no_esync">Imposta 1 per disattivare droiddeck-esync in questo gioco; userà invece droiddeck-fsync, o droiddeck-ntsync se anche fsync è disattivato.</string> <string name="game_env_no_fsync">Imposta 1 per non usare droiddeck-fsync in questo gioco; userà droiddeck-esync se esiste un pacchetto, altrimenti droiddeck-ntsync.</string> <string name="game_env_fsync_first">Imposta 1 per eseguire questo gioco con droiddeck-fsync, o 0 per dare priorità a droiddeck-esync se c\'è un pacchetto adatto al suo Proton.</string> <string name="game_env_xalia">Imposta 0 per disattivare l\'assistente di navigazione con gamepad di Proton in questo gioco.</string> + <string name="game_env_anticheat_offline">Attivo per impostazione predefinita. Avvia un gioco con Easy Anti-Cheat senza il suo anti-cheat quando il gioco supporta il gioco offline. Disattivalo per avviarlo tramite Easy Anti-Cheat come al solito. Le modalità online che richiedono Easy Anti-Cheat restano non disponibili.</string> <string name="game_env_hud">Overlay DXVK per D3D9–11. fps mostra il frame rate; se vuota, l\'overlay è nascosto.</string> <string name="game_env_dxvk_config">Impostazioni DXVK separate da punto e virgola. Le build recenti usano dxvk.maxFrameRate per limitare i frame; per giocare normalmente è meglio il limitatore di frame della sessione.</string> + <string name="game_env_cores">Core della CPU per questo gioco, ad esempio 0-4 o 0,2,4, al posto dei core dei giochi della sessione. Meno core scaldano meno.</string> <string name="game_env_vkd3d_limit">Limite di frame rate D3D12. 0 disattiva il limite.</string> <string name="game_env_glthread">Threading OpenGL di Mesa. true può aiutare i giochi OpenGL limitati dalla CPU; provalo gioco per gioco.</string> <string name="sync_backend_title">Sincronizzazione Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX esegue programmi Linux x86 su questo dispositivo ARM64. Auto lo usa quando il programma è compilato per x86.</string> <string name="app_fex_x86">%1$s tramite FEX</string> <string name="app_fex_not_ready">Questo programma è compilato per PC %1$s e viene eseguito tramite FEX, che non è ancora configurato. Apri Steam una volta dopo aver eseguito l\'accesso: DroidDeck gli farà scaricare FEX e lo Steam Linux Runtime necessario, poi il programma si aprirà.</string> + <string name="session_proot_missing">Impossibile scaricare il proot di DroidDeck. Controlla la connessione e riprova. La sessione non è stata avviata perché il proot di riserva è troppo lento per giocare.</string> + <string name="session_directaudio_missing">Impossibile scaricare DirectAudio, quindi l\'audio dei giochi usa il percorso più lento in questa sessione.</string> <string name="session_end_program">Questo programma</string> <string name="session_end_steam_download">Impossibile scaricare il client Steam. La rete o la VPN potrebbe bloccare i server di Steam; controlla la connessione e riprova.</string> <string name="session_end_steam_setup">Impossibile configurare il client Steam. Controlla la connessione e lo spazio libero, poi riprova.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Controller Xbox 360</string> <string name="mode_controller_note">Deck: tasto Accesso rapido e giroscopio. Steam Controller: lo stesso, con il rilevamento della presa sui tasti posteriori. DualShock 4 e DualSense: giroscopio, con i trackpad usati come touchpad. Xbox 360: apri Accesso rapido con Guide+A.</string> <string name="mode_back">Indietro</string> + <string name="back_hold">Tieni premuto Indietro per le scorciatoie Steam</string> + <string name="back_hold_hint">Tenere premuto Indietro apre l’Accesso rapido o crea combinazioni Steam con altri tasti. Disattiva per ignorare la pressione prolungata; tocco e doppio tocco funzionano ancora.</string> + <string name="back_native_qam_hint">Tieni premuto Indietro per 700 ms, oppure tieni premuto Indietro e premi un altro tasto per le scorciatoie di Steam.</string> + <string name="back_double_tap_window">Intervallo doppio tocco</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Consenti il controllo della luminosità</string> + <string name="brightness_permission_text">Configura il controllo della luminosità in DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sessione</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Ritarda la sospensione in background mentre Steam sta scaricando.</string> <string name="mode_suspend_note">Auto mette in pausa in background e riprende quando l\'app torna visibile. Manuale attende Riprendi. Mai lascia tutto in esecuzione.</string> <string name="mode_startup">Avvio</string> - <string name="mode_steam_startup">Avvia Steam con DroidDeck</string> - <string name="mode_steam_startup_hint">Apre la sessione Steam all\'avvio di DroidDeck.</string> + <string name="mode_startup_session">Apri all\'avvio</string> + <string name="mode_startup_session_hint">Avvia questa sessione all\'avvio di DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Ricerca di release…</string> <string name="mode_decky_ready">Pronto per installare %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Ultima versione · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Installa l\'ultima versione</string> + <string name="decky_channel">Canale di aggiornamento</string> + <string name="decky_channel_hint">Quali release di Decky Loader installare. Anche l\'aggiornamento integrato di Decky usa lo stesso canale.</string> + <string name="decky_channel_stable">Stabile</string> + <string name="decky_channel_prerelease">Pre-release</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Impossibile salvare il canale di aggiornamento di Decky</string> <string name="mode_decky_on">Si avvia con Steam. Quando è attivo, altre app su questo dispositivo potrebbero controllare Steam.</string> <string name="mode_decky_off">Disattivato. La porta di debug remoto di Steam resta chiusa.</string> <string name="mode_decky_remove_title">Disinstallare Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Client</string> <string name="mode_mangoapp">Overlay prestazioni</string> <string name="mode_mangoapp_hint">Disattivalo se i giochi vanno in crash o diventano neri in modalità Deck. Si applica dalla prossima sessione.</string> + <string name="mode_return_after_game">Torna a DroidDeck dopo un gioco</string> + <string name="mode_return_after_game_hint">Quando si chiude un gioco avviato da DroidDeck o da un altro launcher, Steam esce in modo pulito (prima termina il salvataggio nel cloud) e torni lì. Disattivo: resti in Steam.</string> + <string name="mode_shader_precache">Pre-caching degli shader</string> + <string name="mode_shader_precache_hint">Steam scarica shader precompilati per i tuoi giochi e li elabora in background, così i giochi scattano meno. Disattivato risparmia dati, spazio e batteria; i giochi compilano gli shader mentre giochi. È la stessa impostazione di Download > Pre-caching degli shader in Steam. Si applica dalla prossima sessione.</string> <string name="mode_steam_repair">Ripara il client Steam</string> <string name="mode_steam_repair_hint">Scarica di nuovo il client Steam al prossimo avvio di Steam. Usalo se Steam resta sulla schermata di caricamento. Giochi, accesso e impostazioni vengono mantenuti.</string> <string name="mode_steam_repair_queued">Il client Steam verrà scaricato di nuovo al prossimo avvio di Steam.</string> @@ -391,6 +414,8 @@ <string name="mode_directaudio_hint">Bypassa PulseAudio per ridurre la latenza.</string> <string name="mode_mic">Microfono</string> <string name="mode_mic_hint">Per la chat vocale.</string> + <string name="drawer_mic_hint">Attiva o disattiva l\'acquisizione del microfono per questa sessione.</string> + <string name="drawer_mic_failed">Impossibile cambiare il microfono. Riprova.</string> <string name="mode_network">Rete</string> <string name="mode_wifi_discovery">Rilevamento Wi-Fi</string> <string name="mode_wifi_discovery_hint">Mostra in Steam i nomi delle reti Wi-Fi e le reti vicine.</string> @@ -553,6 +578,16 @@ <string name="perf_gsrealtime">gamescope: coda GPU in tempo reale</string> <string name="perf_gsrealtime_hint">Dà priorità al lavoro GPU del compositor. Può rendere più regolare il frame pacing, a scapito dei giochi.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memoria</string> + <string name="perf_cap_off">Disattivo</string> + <string name="perf_cap_auto">Predefinito del driver</string> + <string name="perf_zram_client">Comprimi Steam durante il gioco</string> + <string name="perf_zram_client_hint">20 s dopo l\'avvio di un gioco, il client Steam viene compresso in zRAM per lasciare più memoria al gioco e viene riletto quando il gioco si chiude. Disattivalo se la sessione si chiude poco dopo l\'avvio dei giochi. Un limite di RAM impostato sopra comprime comunque Steam quando la sessione lo supera.</string> + <string name="perf_ram_cap">Limite RAM</string> + <string name="perf_ram_cap_hint">Si applica mentre il client Steam è in esecuzione, in modalità Steam o dal desktop. Quando la sessione usa più di questo valore, Steam e poi gli altri processi supportati della sessione vengono compressi in zRAM. È un limite morbido: non viene chiuso nulla, ma i giochi possono scattare mentre le pagine vengono recuperate.</string> + <string name="perf_ram_cap_unavailable">Richiede lo swap zRAM, che questo dispositivo non ha.</string> + <string name="perf_vram_cap">Limite VRAM</string> + <string name="perf_vram_cap_hint">La memoria video che DXVK comunica ai giochi Direct3D, così usano meno texture. Le impostazioni DXVK del gioco hanno comunque la priorità. Si applica dalla prossima sessione.</string> <string name="perf_gpuclock">Mantieni la GPU alla frequenza massima</string> <string name="perf_gpuclock_hint">Solo Adreno. Meno scatti, più consumo di batteria e più calore.</string> <string name="perf_fixes">Correzioni della sessione</string> @@ -571,6 +606,8 @@ <string name="perf_fastpath">Percorso veloce di proot</string> <string name="perf_fastpath_needs_seccomp">Richiede il filtro seccomp di proot.</string> <string name="perf_fastpath_hint">Ricerca dei file più veloce e meno scatti. Disattivalo se un programma non trova i suoi file.</string> + <string name="perf_cursor_composite">Disegna il cursore in gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope disegna il puntatore da sé invece di passarlo ad Android. Attivalo per un cursore controllato dal controller. Disattivo è più veloce su un telefono. Si applica dalla prossima sessione.</string> <string name="perf_identity">Identità della sessione</string> <string name="perf_hostname">Nome host</string> <string name="perf_hostname_hint">Il nome con cui Steam vede questo dispositivo. Se vuoto, torna a %1$s.</string> @@ -585,6 +622,8 @@ <string name="driver_delete_plain">I suoi file vengono rimossi dall\'app.</string> <string name="driver_delete_in_use">I suoi file vengono rimossi. È in uso, quindi subentra quello predefinito.</string> <string name="drawer_page_display">Schermo</string> + <string name="drawer_frame_limit">Limite frame</string> + <string name="drawer_frame_limit_note">Limita questo gioco. Lo schermo passa a una frequenza di aggiornamento divisibile per il limite, se disponibile; altri limiti possono risultare irregolari. I giochi Steam usano il Limite frame di Steam nel menu di accesso rapido.</string> <string name="drawer_page_effects">Effetti</string> <string name="drawer_page_controls">Controlli</string> <string name="drawer_page_components">Componenti</string> @@ -616,8 +655,11 @@ <string name="hud_size_pill">Pillola</string> <string name="hud_size_minimal">Minimo</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Barra</string> <string name="hud_locked">Blocca in posizione</string> <string name="hud_locked_hint">Trascina l\'HUD per spostarlo; una pressione prolungata lo blocca o lo sblocca. Mentre è bloccato, i controlli su schermo sotto di esso continuano a funzionare.</string> + <string name="hud_snap">Aggancia ai lati</string> + <string name="hud_snap_hint">Rilascia l\'HUD e si sposta sul lato più vicino dello schermo. Un gesto rapido lo lancia in quella direzione.</string> <string name="hud_group_look">Aspetto</string> <string name="hud_scale">Dimensione sullo schermo</string> <string name="hud_color_soft">Tenue</string> @@ -666,7 +708,6 @@ <string name="hud_export_failed">Impossibile salvare il rapporto dell\'HUD.</string> <string name="hud_reset">Ripristina impostazioni HUD</string> <string name="hud_reset_button">Ripristina</string> - <string name="hud_credit">FusionHUD di The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Modalità di ridimensionamento</string> <string name="drawer_scaling_sharpness">Nitidezza del ridimensionamento</string> <string name="drawer_effects">Effetti schermo</string> @@ -701,11 +742,17 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Tastiera</string> <string name="drawer_latency">Latenza</string> + <string name="drawer_low_latency">Modalità bassa latenza</string> + <string name="drawer_low_latency_hint">Aumenta l\'uso di CPU e batteria</string> <string name="drawer_low_latency_controller">Controller a bassa latenza</string> <string name="drawer_low_latency_controller_hint">Il controller invia dati a 1000 Hz invece di 250 Hz. Un po\' più di CPU.</string> <string name="drawer_low_latency_touch">Touch a bassa latenza</string> <string name="drawer_low_latency_touch_hint">I tocchi saltano il raggruppamento dei frame; i controlli touch di Steam passano a 1000 Hz. Un po\' più di CPU.</string> <string name="drawer_evdev_mouse">Canale mouse grezzo</string> + <string name="drawer_relative_mouse">Mouse relativo</string> + <string name="drawer_relative_mouse_auto">Automatico</string> + <string name="drawer_relative_mouse_on">Attivo</string> + <string name="drawer_relative_mouse_off">Disattivato</string> <string name="drawer_direct_cursor">Cursore</string> <string name="drawer_pc_keyboard">Tastiera PC</string> <string name="drawer_android_keyboard">Android</string> @@ -794,6 +841,10 @@ <string name="setup_session">Sessione</string> <string name="setup_logs">Log della sessione</string> <string name="setup_logs_hint">Salvati dopo ogni sessione</string> + <string name="setup_game_debug_logs">Log di debug dei giochi</string> + <string name="setup_game_debug_logs_hint">Includi la diagnostica di Proton, Wine e grafica al prossimo avvio di un gioco. Può ridurre le prestazioni e occupare più spazio.</string> + <string name="setup_game_debug_logs_restart">Riavvia questa sessione per salvare i log di debug dei giochi</string> + <string name="setup_logging_update_failed">Impossibile aggiornare i log. Controlla l\'interruttore e riprova.</string> <string name="setup_agent_commands">Strumenti di debug</string> <string name="setup_latest_logs">Log dell\'ultima sessione</string> <string name="setup_saved_logs">Log delle sessioni salvati</string> @@ -817,20 +868,22 @@ <string name="setup_home">Usa come schermata Home</string> <string name="setup_home_on">DroidDeck può essere l\'app Home</string> <string name="setup_home_off">DroidDeck non viene mai proposta come app Home</string> + <string name="setup_home_game_space_first">In Aggiungi giochi, imposta DroidDeck su Includi</string> <string name="setup_orientation">Orientamento</string> + <string name="setup_launcher_orientation">Orientamento del launcher</string> + <string name="setup_launcher_orientation_auto">Segui la rotazione del dispositivo</string> + <string name="setup_orientation_portrait">Verticale</string> + <string name="setup_session_orientation">Orientamento della sessione</string> + <string name="setup_session_orientation_hint">Si applica a Steam, ai giochi, al desktop e all\'editor del controller. I preset di risoluzione ruotano con la sessione; larghezza e altezza personalizzate restano come inserite.</string> <string name="setup_orientation_auto">Orizzontale automatico</string> <string name="setup_orientation_landscape">Orizzontale</string> <string name="setup_orientation_reverse">Orizzontale invertito</string> <string name="setup_fullscreen">Schermo intero</string> <string name="setup_fullscreen_on">Nasconde la barra di stato e la barra di navigazione di Android</string> <string name="setup_fullscreen_off">Mostra la barra di stato e la barra di navigazione di Android</string> - <string name="setup_dual_screen">Doppio schermo</string> - <string name="setup_dual_screen_hint">Automatico usa il secondo schermo sulle console portatili che ne hanno uno integrato. Attivo usa qualsiasi secondo schermo. Disattivo tiene tutto su un solo schermo.</string> <string name="setup_dual_screen_auto">Automatico</string> <string name="setup_dual_screen_on">Attivo</string> <string name="setup_dual_screen_off">Disattivo</string> - <string name="setup_dual_screen_menu">Menu sullo schermo inferiore</string> - <string name="setup_dual_screen_menu_hint">Sposta le sezioni e il menu di gioco sul secondo schermo e si digita lì, così lo schermo superiore mantiene la vista completa. L2 e R2 cambiano sezione.</string> <string name="setup_dual_screen_controls">Controlli sullo schermo inferiore nei giochi</string> <string name="setup_dual_screen_controls_hint">Apre il trackpad e la tastiera sul secondo schermo all\'avvio di una sessione.</string> <string name="dual_typing_title">Digitazione per lo schermo superiore</string> @@ -985,6 +1038,14 @@ <string name="gate_step1">Apri Impostazioni → Opzioni sviluppatore → Debug wireless e attivalo</string> <string name="gate_step2">Tocca “Accoppia dispositivo con codice di accoppiamento”</string> <string name="gate_step3">Digita il codice nella notifica di DroidDeck</string> + <string name="pairguide_build_number">In Informazioni sul telefono, tocca 7 volte Numero build</string> + <string name="pairguide_wireless">Attiva Debug wireless</string> + <string name="pairguide_pair">Apri Debug wireless, poi tocca “Accoppia dispositivo con codice di accoppiamento”</string> + <string name="pairguide_child_process">Attiva “Disattiva limitazioni per i processi secondari”</string> + <string name="pairguide_row_child_process">Disattiva limitazioni per i processi secondari</string> + <string name="pairguide_row_build_number">Numero build</string> + <string name="pairguide_row_wireless">Debug wireless</string> + <string name="pairguide_row_pair">Accoppia dispositivo con codice di accoppiamento</string> <string name="gate_waiting">In attesa del popup di accoppiamento…</string> <string name="gate_code_needed">Popup trovato. Inserisci il codice nella notifica.</string> <string name="gate_status">Stato</string> @@ -1123,7 +1184,6 @@ <string name="games_never_played">Mai giocato</string> <string name="games_runtime_busy_percent">Runtime occupato · %1$d%%</string> <string name="games_runtime_busy">Runtime occupato</string> - <string name="games_runtime_first_play">Il runtime si installa al primo Gioca</string> <string name="games_runtime_update">Aggiornamento del runtime disponibile</string> <string name="games_runtime_ready">● Runtime pronto</string> <string name="games_internal">Memoria interna</string> @@ -1140,6 +1200,9 @@ <string name="gpu_hide_other">Nascondi i driver per altre GPU</string> <string name="gpu_show_other">Mostra i driver per altre GPU</string> <string name="gpu_advanced">Avanzate</string> + <string name="gpu_ubwc_title">Compatibilità UBWC</string> + <string name="gpu_ubwc_hint">Prova Attivo o Disattivo se Steam o Android mostrano strisce o sfarfallii. Si applica a entrambi i driver dopo il riavvio di DroidDeck.</string> + <string name="gpu_ubwc_restart">Riavvia DroidDeck per applicare.</string> <string name="gpu_set_with_display">Impostato insieme al driver video: %1$s include entrambi.</string> <string name="gpu_set_with_runtime">Impostato insieme al driver del runtime: %1$s include entrambi.</string> <string name="gpu_runtime_hint">Usato dai giochi e dal desktop.</string> @@ -1248,10 +1311,15 @@ <string name="pip_auto">Passa automaticamente in PiP</string> <string name="unfolded_controls">Controlli sullo schermo aperto</string> <string name="unfolded_controls_hint">Da aperto, il gioco sta sopra i trackpad e le impugnature posteriori di Steam Deck. Da chiuso, il gioco è a schermo intero.</string> + <string name="unfolded_controls_with_controller">Mantienili con un controller</string> + <string name="unfolded_controls_with_controller_hint">Mostra questi controlli touch anche quando è collegato un controller.</string> <string name="pip_suspended">Sospeso</string> <string name="pip_not_ready">Il picture in picture è disponibile quando la sessione è pronta.</string> <string name="pip_permission">Consenti il picture in picture per DroidDeck nelle impostazioni di Android.</string> <string name="pip_unavailable">Android non è riuscito ad aprire il picture in picture.</string> + <string name="game_more">Altro</string> + <string name="game_edit_art">Modifica grafica</string> + <string name="stores_in_steam_label">In Steam</string> <string name="game_shortcut">Scorciatoia</string> <string name="game_shortcut_add">Aggiungi alla schermata Home</string> <string name="game_shortcut_choose">Scegli gioco</string> @@ -1275,6 +1343,10 @@ <string name="main_wait_runtime">Attendi la fine dell\'operazione sul runtime</string> <string name="main_wait_proton_install">Attendi la fine dell\'installazione dello strumento di compatibilità</string> + <string name="load_compat_title">Preparazione degli strumenti di compatibilità</string> + <string name="load_compat_wait">In attesa del completamento della configurazione di compatibilità</string> + <string name="load_compat_hint">La sessione si avvierà al termine della configurazione.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Attendi la fine dell\'installazione dell\'app desktop</string> <string name="main_wait_install_game">Attendi la fine dell\'installazione prima di avviare un gioco</string> <string name="main_saves_close_session">Chiudi prima la sessione Steam, così il gioco non potrà sovrascrivere i dati importati</string> @@ -1315,6 +1387,9 @@ <string name="main_install_anyway">Installa comunque</string> <string name="main_remove_runtime_title">Rimuovi runtime Linux</string> <string name="main_remove_runtime_text">Verranno eliminati il runtime, il client Steam al suo interno e tutti i giochi installati lì.</string> + <string name="runtime_actions_title">Runtime Linux</string> + <string name="runtime_actions_text">Ripara reinstalla i file di sistema del runtime e mantiene Steam, i tuoi giochi e le impostazioni. Gli extra come il desktop si reinstallano al prossimo utilizzo. Rimuovi elimina tutto.</string> + <string name="runtime_repair">Ripara runtime</string> <string name="main_applied">Applicato: %1$s</string> <string name="android_app_open_failed_primary">Impossibile aprire %1$s sullo schermo principale</string> <string name="android_app_open_failed_on">Impossibile aprire %1$s su %2$s</string> @@ -1447,6 +1522,12 @@ <string name="session_runtime_catalog_unreachable">Impossibile raggiungere il catalogo dei runtime. Controlla la connessione e premi di nuovo Gioca.</string> <string name="session_runtime_install_failed">Il runtime Linux non è stato installato. Controlla il runtime in Configurazione e premi di nuovo Gioca.</string> <string name="session_desktop_install_failed">Il desktop non è stato installato (%1$s). Controlla la connessione e premi di nuovo Desktop.</string> + <string name="session_package_resume_failed">Impossibile completare un\'installazione interrotta (%1$s). Controlla la connessione e lo spazio, poi riprova.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Il runtime Linux è danneggiato: %1$d collegamento di libreria punta a un file mancante (%2$s), di solito dopo un\'installazione interrotta. Ripara mantiene i tuoi giochi e le impostazioni.</item> + <item quantity="many">Il runtime Linux è danneggiato: %1$d collegamenti di libreria puntano a file mancanti (%2$s e altri), di solito dopo un\'installazione interrotta. Ripara mantiene i tuoi giochi e le impostazioni.</item> + <item quantity="other">Il runtime Linux è danneggiato: %1$d collegamenti di libreria puntano a file mancanti (%2$s e altri), di solito dopo un\'installazione interrotta. Ripara mantiene i tuoi giochi e le impostazioni.</item> + </plurals> <string name="session_ended_named">%1$s si è interrotto in modo imprevisto. Condividi i log in una segnalazione di bug o riprova.</string> <string name="session_ended_program">Il programma si è interrotto in modo imprevisto. Condividi i log in una segnalazione di bug o riprova.</string> <string name="session_ended_desktop">Il desktop si è interrotto in modo imprevisto. Condividi i log in una segnalazione di bug o riprova.</string> @@ -1462,6 +1543,14 @@ <string name="mode_decky_plugins_hint">Installa uno ZIP di plugin per la prossima sessione Steam.</string> <string name="mode_decky_plugin_downloading">Download…</string> <string name="mode_decky_plugin_install_zip">Installa da ZIP</string> + <string name="decky_zip_warning_title">Installazione di plugin di terze parti</string> + <string name="decky_zip_warning_text">Il team di Decky Loader non ha esaminato questo plugin. Potrebbe contenere malware, ad esempio software per rubare il tuo account Steam o danneggiare il dispositivo. Installando questo plugin, accetti di assumerti tutti i rischi per il tuo dispositivo.</string> + <string name="decky_zip_warning_continue">Continua</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Attendi %1$d secondo</item> + <item quantity="many">Attendi %1$d secondi</item> + <item quantity="other">Attendi %1$d secondi</item> + </plurals> <string name="store_cat_games">Giochi</string> <string name="store_cat_audio_video">Audio e video</string> <string name="store_cat_graphics">Grafica</string> @@ -1628,6 +1717,8 @@ <string name="fm_accept">Accetta</string> <string name="fm_decline">Rifiuta</string> <string name="fm_drive_not_readable">%1$s: montata ma al momento non leggibile</string> + <string name="fm_drive_access_title">Consenti l\'accesso a %1$s</string> + <string name="fm_drive_access_text">Android permette a DroidDeck di vedere questa unità ma non di leggerla. Attiva Accesso a tutti i file per DroidDeck, poi torna qui.</string> <string name="fm_list_view">Visualizzazione elenco</string> <string name="fm_grid_view">Visualizzazione griglia</string> <string name="fm_search">Cerca</string> @@ -1700,6 +1791,89 @@ <string name="second_mode_keyboard_trackpad">Tastiera + trackpad</string> <string name="second_mode_terminal">Terminale</string> <string name="second_mode_deck_controls">Impugnature Deck + trackpad</string> + <string name="second_mode_dashboard">Dashboard</string> + <string name="bottom_dashboard_empty">Ancora niente da mostrare qui.</string> + <string name="bottom_page_downloads">Download</string> + <string name="bottom_downloads_none">Nessun download in corso.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Download della cache degli shader</string> + <string name="bottom_downloads_paused">In pausa</string> + <string name="bottom_downloads_queued">In attesa di avvio</string> + <string name="bottom_page_notifications">Notifiche</string> + <string name="bottom_notifications_listener">Schermo inferiore DroidDeck</string> + <string name="bottom_notifications_why">Mostra qui messaggi e altre notifiche mentre giochi. Restano solo su questo schermo e non vengono salvate. Android lo chiede una sola volta: la sua pagina di accesso alle notifiche si apre su questo schermo; attiva DroidDeck lì e questa pagina torna da sola.</string> + <string name="bottom_notifications_allow">Consenti accesso alle notifiche</string> + <string name="bottom_notifications_none">Nessuna notifica.</string> + <string name="bottom_notifications_count">%1$d notifiche</string> + <string name="bottom_notifications_clear">Cancella</string> + <string name="bottom_page_screenshots">Screenshot</string> + <string name="stats_fps_needs_hud">Gli FPS richiedono l\'HUD attivo</string> + <string name="stats_speed">Velocità</string> + <string name="stats_pedals">Pedali</string> + <string name="stats_gforce">Forza G</string> + <string name="stats_timing">Tempi</string> + <string name="stats_best_lap">Giro migliore</string> + <string name="stats_tires">Pneumatici °C</string> + <string name="stats_trace">Acceleratore e freno, ultimi 10 s</string> + <string name="stats_speed_chart">Velocità, %1$s</string> + <string name="stats_gear">Marcia</string> + <string name="stats_steam_client_arm">Client Steam ARM</string> + <string name="stats_steam_client_x86">Client Steam x86</string> + <string name="stats_throttle">Acceleratore</string> + <string name="stats_brake">Freno</string> + <string name="stats_lights">Spie</string> + <string name="stats_lamp_shift">Cambio marcia</string> + <string name="stats_lamp_handbrake">Freno a mano</string> + <string name="stats_lamp_pit">Limitatore pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motore %1$s °C</string> + <string name="stats_oil_temp">Olio %1$s °C</string> + <string name="stats_power">Distribuzione energia</string> + <string name="stats_fuel_t">Carburante, t</string> + <string name="stats_fuel_main">Principale %1$s t</string> + <string name="stats_fuel_reserve">Riserva %1$s t</string> + <string name="bottom_telemetry_send_title">Invia dati al cruscotto</string> + <string name="bottom_telemetry_send_auto">Automatico</string> + <string name="bottom_telemetry_send_auto_hint">Lo attiva per ogni gioco elencato qui, compresi i giochi trovati in seguito. I giochi che disattivi restano disattivati.</string> + <string name="bottom_telemetry_send_note">Modifica l\'impostazione di output dati del gioco stesso. Ha effetto al prossimo avvio del gioco; disattivandola viene ripristinata l\'impostazione precedente.</string> + <string name="bottom_telemetry_send_close">Chiudi %1$s per modificarlo.</string> + <string name="bottom_telemetry_send_failed">Impossibile modificare le impostazioni di %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: attiva %2$s nelle impostazioni del gioco con IP 127.0.0.1 e porta %3$d.</string> + <string name="bottom_shots_where">Salvati in Pictures/DroidDeck. Qui compaiono anche gli screenshot di Steam.</string> + <string name="bottom_shots_take">Acquisisci screenshot</string> + <string name="bottom_shots_saved">Screenshot salvato.</string> + <string name="bottom_shots_failed">Impossibile acquisire uno screenshot.</string> + <string name="bottom_shots_none">Ancora nessuno screenshot.</string> + <string name="bottom_page_chat">Chat & voce</string> + <string name="bottom_chat_why">Leggi e rispondi alla chat di Steam qui mentre il gioco continua sullo schermo principale. Usa l\'account con cui è stato effettuato l\'accesso a Steam.</string> + <string name="bottom_chat_not_signed_in">Steam non ha ancora un accesso web da condividere, quindi accedi qui una volta.</string> + <string name="bottom_chat_stopped">Android ha chiuso la pagina della chat mentre DroidDeck era in background. Si riapre quando torni su DroidDeck.</string> + <string name="bottom_chat_open">Apri Steam Chat</string> + <string name="bottom_chat_close">Chiudi chat</string> + <string name="bottom_chat_mic_on">Microfono attivo</string> + <string name="bottom_chat_mic_off">Microfono disattivato</string> + <string name="bottom_chat_mic_unavailable">Il microfono è disattivato per questo gioco. Per parlare, attiva Microfono nelle impostazioni Steam di DroidDeck (Audio) e riavvia il gioco.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">Statistiche di gioco</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batteria</string> + <string name="bottom_telemetry_lap">Giro</string> + <string name="bottom_telemetry_position">Posizione</string> + <string name="bottom_telemetry_this_lap">Giro attuale</string> + <string name="bottom_telemetry_last_lap">Ultimo giro</string> + <string name="bottom_telemetry_fuel">Carburante</string> + <string name="bottom_telemetry_cargo">Carico</string> + <string name="bottom_telemetry_pips">Pip SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Stato legale</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">La porta %1$d riceve dati (%2$d pacchetti da %3$d byte), ma in un formato che questa pagina non sa ancora leggere.</string> + <string name="bottom_telemetry_port_busy">Un altro programma usa già la porta %1$s, quindi quel gioco non può essere mostrato qui.</string> <string name="rtinst_removing">Rimozione del runtime Linux</string> <plurals name="rtinst_removing_entries"> @@ -1731,6 +1905,7 @@ <string name="flatpakmgr_not_ready">Configura prima Flatpak</string> <string name="flatpakmgr_starting">Avvio</string> <string name="flatpakmgr_exit_status">Flatpak è terminato con stato %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s è compilata per %2$s, che DroidDeck non può eseguire. Qui le app Flatpak richiedono una versione per ARM64 o x86_64.</string> <string name="flatpakmgr_installing">Installazione di %1$s</string> <string name="flatpakmgr_updating">Aggiornamento di %1$s</string> <string name="flatpakmgr_removing">Rimozione di %1$s</string> @@ -1824,6 +1999,7 @@ <string name="adbpair_applying">Applicazione dell\'impostazione…</string> <string name="adbpair_command_failed">Comando di debug wireless non riuscito</string> <string name="adbpair_channel_name">Configurazione del debug wireless</string> + <string name="adbpair_progress_channel_name">Avanzamento della configurazione del Debug wireless</string> <string name="adbpair_channel_description">Chiede il codice di accoppiamento del debug wireless mentre Impostazioni è aperto</string> <string name="adbpair_title_pair">Accoppia il debug wireless</string> <string name="adbpair_waiting_text">Attiva Debug wireless, poi tocca “Accoppia dispositivo con codice di accoppiamento”.</string> @@ -1932,6 +2108,7 @@ <string name="gpuinfo_not_adreno">Non è una GPU Adreno</string> <string name="gpuinfo_supported">Supportata</string> <string name="gpuinfo_experimental">Sperimentale: i suoi driver sono build di test</string> + <string name="gpuinfo_a850_experimental">Supporto sperimentale per Adreno 850: richiede driver di visualizzazione e di gioco sperimentali compatibili; non verificato su questo dispositivo</string> <string name="gpuinfo_below_tested">Inferiore all\'hardware testato (Adreno 725 e successive): potrebbe non funzionare</string> <string name="gpuinfo_unsupported">Non supportata: DroidDeck richiede una GPU Adreno (Snapdragon)</string> @@ -2028,6 +2205,7 @@ <string name="display_look_filter">%1$s Imposta il ridimensionamento su %2$s.</string> <string name="display_match_screen">Adatta allo schermo (%1$d×%2$d)</string> <string name="display_follow_screen">Segui lo schermo (si ridimensiona quando lo pieghi o lo apri)</string> + <string name="display_follow_screen_scaled">Scalato %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Mostra dettagli dispositivo</string> <string name="device_info_hide">Nascondi dettagli dispositivo</string> @@ -2134,6 +2312,13 @@ <string name="stores_resume">Riprendi</string> <string name="stores_refresh">Aggiorna</string> <string name="stores_sort">Ordina</string> + <string name="setup_rail_labels">Etichette della barra laterale</string> + <string name="setup_rail_labels_hint">Mostra i nomi sotto le icone della barra laterale. Disattivalo per una barra laterale più sottile.</string> + <string name="library_display">Visualizzazione</string> + <string name="library_display_larger">Schede più grandi</string> + <string name="library_display_smaller">Schede più piccole</string> + <string name="library_display_title">Mostra titolo</string> + <string name="library_display_size">Mostra dimensione</string> <string name="stores_sort_last_played">Giocate di recente</string> <string name="stores_sort_recently_installed">Installate di recente</string> <string name="stores_sort_title_asc">Titolo A–Z</string> @@ -2260,6 +2445,9 @@ <string name="stores_download_manager">Gestione download</string> <string name="stores_parallel">Download simultanei</string> <string name="stores_install_where">Installa in</string> + <string name="stores_install_language">Lingua del gioco</string> + <string name="stores_install_language_hint">GOG ed Epic installano questa lingua. Sistema segue la lingua dell\'app.</string> + <string name="stores_install_language_system">Sistema</string> <string name="stores_install_title">Installa %1$s:</string> <string name="stores_target_internal">Interna</string> <string name="stores_target_free">%1$s liberi</string> @@ -2295,6 +2483,9 @@ <string name="edit_target">Destinazione</string> <string name="edit_start_in">Avvia in</string> <string name="edit_launch_options">Opzioni di avvio</string> + <string name="edit_launch_options_steam_hint">Condivise con le Proprietà di Steam: una modifica in uno dei due punti compare in entrambi.</string> + <string name="edit_launch_options_not_saved">Impossibile salvare le opzioni di avvio in Steam. Riprova.</string> + <string name="edit_launch_options_desktop">Steam potrebbe essere aperto nella sessione desktop. Cambia le opzioni di avvio nelle sue Proprietà o chiudi prima la sessione.</string> <string name="edit_artwork">Illustrazioni</string> <string name="edit_other_exe">Altro exe…</string> <string name="edit_remove">Rimuovi</string> @@ -2424,6 +2615,7 @@ <string name="setup_download_source_custom">Prefisso personalizzato</string> <string name="setup_download_mirror">Sito</string> <string name="setup_download_prefix">Prefisso</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APP LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">App per il desktop Linux, da aprire in Desktop.</string> @@ -2566,6 +2758,22 @@ <string name="glasses_tracking_flat_hint">Con Automatico questo gioco 2D resta fisso nella vista. Scegli Schermo virtuale nella sezione Schermo per usare il tracciamento della testa.</string> <string name="glasses_tracking_sbs_hint">Il tracciamento della testa si applica a uno schermo virtuale o a un gioco SteamVR in esecuzione.</string> <string name="glasses_hardware">Dispositivo</string> + <string name="vr_controllers_tab">Controller</string> + <string name="vr_controllers_group">Controller SteamVR</string> + <string name="vr_controllers_emulate">Gamepad in VR</string> + <string name="vr_controllers_emulate_hint">Le due mani VR che il tuo controller impersona. Le modifiche si applicano subito, anche mentre SteamVR è in esecuzione. I Joy-Con e le mani tracciate prendono comunque il controllo del loro lato.</string> + <string name="vr_controllers_off">Gamepad normale</string> + <string name="vr_controllers_index">Controller Valve Index</string> + <string name="vr_controllers_touch">Controller Meta Quest 3</string> + <string name="vr_controllers_vive">Controller HTC Vive</string> + <string name="vr_controllers_sticks">All\'inizio le levette</string> + <string name="vr_controllers_sticks_hint">Premi entrambe le levette insieme durante la VR per cambiare.</string> + <string name="vr_controllers_sticks_game">Ti muovono nel gioco</string> + <string name="vr_controllers_sticks_hands">Muovono le mani</string> + <string name="vr_controllers_buttons">Tasti</string> + <string name="vr_controllers_buttons_stick">I grilletti sono grilletti, i dorsali afferrano, A/B e X/Y sono i tasti frontali di ciascuna mano, il clic delle levette clicca le levette VR, Guide apre il menu SteamVR. Su e giù sulla croce direzionale avvicinano o allontanano le mani.</string> + <string name="vr_controllers_buttons_vive">Le levette fanno da trackpad; A/X o il clic di una levetta li preme. I grilletti sono grilletti, i dorsali afferrano, Start e Select fanno da menu, Guide apre il menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Nessuna mano VR. I giochi che supportano un gamepad, e il menu SteamVR, ricevono il controller come al solito.</string> <string name="glasses_brightness">Luminosità</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Oscuramento</string> @@ -2623,6 +2831,12 @@ <string name="hand_camera_placement">Posizione della fotocamera</string> <string name="hand_camera_placement_hint">Controlla che la fotocamera possa vederti prima di giocare.</string> <string name="hand_camera_check">Controlla</string> + <string name="tracking_pack_title">Download del tracciamento delle mani</string> + <string name="tracking_pack_hint">Il tracciamento delle mani richiede un download una tantum di %1$s.</string> + <string name="tracking_pack_download">Scarica</string> + <string name="tracking_pack_retry">Riprova</string> + <string name="tracking_pack_downloading">Download del tracciamento delle mani… %1$d%%</string> + <string name="tracking_pack_failed">Impossibile scaricare il tracciamento delle mani. Controlla la connessione e riprova.</string> <string name="hand_camera_check_title">Posizione della fotocamera</string> <string name="hand_camera_how_rear">Metti il dispositivo in piedi a una distanza di 1,5-2 metri, all\'altezza del petto, con la fotocamera posteriore rivolta verso di te. Poi entra nell\'inquadratura con le mani tese.</string> <string name="hand_camera_how_front">Metti il dispositivo in piedi a una distanza di 1,5-2 metri, all\'altezza del petto, con lo schermo rivolto verso di te. Poi entra nell\'inquadratura con le mani tese.</string> @@ -2705,6 +2919,21 @@ <string name="storage_safe_hint">Runtime inutilizzati, residui, vecchi log</string> <string name="storage_clean_up">Pulisci…</string> <string name="storage_session_running">Interrompi la sessione per pulire o rimuovere qualcosa. Le dimensioni restano visibili.</string> + <string name="storage_default_group">Posizione di installazione</string> + <string name="storage_default_title">Archiviazione predefinita</string> + <string name="storage_default_hint">Le nuove installazioni dai negozi vanno nella posizione selezionata. I giochi esistenti restano dove sono. Le librerie di Steam mantengono la propria impostazione.</string> + <string name="storage_default_ask">Chiedi ogni volta</string> + <string name="storage_default_ask_detail">Scegli una destinazione per ogni installazione</string> + <string name="storage_default_internal">Memoria interna</string> + <string name="storage_default_external">Memoria esterna</string> + <string name="storage_default_external_detail">%1$s · %2$s liberi</string> + <string name="storage_default_external_missing">Non collegata</string> + <string name="storage_default_folder">Cartella · %1$s</string> + <string name="storage_default_folder_free">%1$s liberi</string> + <string name="storage_default_folder_missing">Non collegata</string> + <string name="storage_default_choose_folder">Scegli cartella…</string> + <string name="storage_default_choose_folder_detail">Usa qualsiasi cartella su una scheda SD o un\'unità USB</string> + <string name="storage_default_note">I giochi vanno in una cartella Games all\'interno della posizione selezionata. I giochi esistenti non vengono spostati.</string> <string name="storage_where">Dove finisce</string> <string name="storage_games">Giochi Steam</string> <string name="storage_game_data">Dati dei giochi</string> @@ -2833,6 +3062,9 @@ <string name="storage_data_installed">Giochi installati</string> <string name="storage_data_parts">Prefisso %1$s · shader %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Elimina shader</string> + <string name="storage_reset_prefix">Reimposta prefisso</string> + <string name="storage_reset_prefix_title">Reimpostare il prefisso di %1$s?</string> + <string name="storage_reset_prefix_confirm">Elimina il suo prefisso Wine (%1$s) in %2$s e lo ricrea al prossimo avvio. Salvataggi, impostazioni e redistribuibili installati al suo interno vanno persi; i salvataggi di Steam Cloud restano nel tuo account.</string> <string name="storage_data_leftovers">Giochi disinstallati</string> <string name="storage_steam_app">App Steam %1$d</string> <string name="storage_leftover_unsure_detail">Il suo prefisso contiene ancora file, che possono includere salvataggi locali</string> @@ -3134,6 +3366,117 @@ <string name="spatial_saved_views_hint">Le visualizzazioni salvate possono essere ricalcolate. Avvia una nuova calibrazione per acquisire il sistema di coordinate di tracciamento corrente.</string> <string name="spatial_model_checksum_error">Mancata corrispondenza del checksum del modello di mano</string> <string name="spatial_opencv_load_error">Impossibile caricare OpenCV</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizza con Syncthing</string> + <string name="sync_enable_hint">Basata su Syncthing-Fork, è un\'implementazione di Syncthing che ti permette di sincronizzare i file del file system interno di DroidDeck con altre istanze di Syncthing. Vale solo per i file che conservi all\'interno del file system interno di DroidDeck.</string> + <string name="sync_missing">Questa build non include Syncthing.</string> + <string name="sync_starting">Avvio di Syncthing</string> + <string name="sync_status_starting">Avvio in corso</string> + <string name="sync_status_up_to_date">Aggiornato</string> + <string name="sync_status_syncing">Sincronizzazione</string> + <string name="sync_status_paused">In pausa</string> + <string name="sync_status_pausing">Messa in pausa</string> + <string name="sync_status_resuming">Ripresa in corso</string> + <string name="sync_status_attention">Richiede attenzione</string> + <string name="sync_status_failed">Syncthing si è fermato</string> + <string name="sync_failed_retry">Riprova</string> + <string name="sync_paused_wifi">In pausa fino al Wi-Fi</string> + <string name="sync_paused_game">In pausa durante il gioco</string> + <string name="sync_summary">%1$d cartelle · %2$d di %3$d dispositivi connessi</string> + <string name="sync_left">%1$s rimanenti</string> + <string name="sync_open_web_ui">Apri l\'interfaccia web</string> + <string name="sync_pause">Pausa</string> + <string name="sync_resume">Riprendi</string> + <string name="sync_running">In esecuzione</string> + <string name="sync_running_hint">Disattiva per fermare completamente Syncthing.</string> + <string name="sync_this_device">Questo dispositivo</string> + <string name="sync_device_id">ID dispositivo</string> + <string name="sync_show_qr">Mostra QR</string> + <string name="sync_advanced">Avanzate</string> + <string name="sync_advanced_hint">Porte, quando eseguire, ripristino</string> + <string name="sync_open">Apri</string> + <string name="sync_waiting">In attesa di te</string> + <string name="sync_pending_device">%1$s vuole connettersi</string> + <string name="sync_pending_folder">%1$s vuole condividere “%2$s”</string> + <string name="sync_pending_folder_hint">Accetta per scegliere dove salvarla in DroidDeck.</string> + <string name="sync_review">Controlla nell\'interfaccia web</string> + <string name="sync_folders">Cartelle</string> + <string name="sync_no_folders">Ancora nessuna cartella.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Aggiornata</string> + <string name="sync_folder_syncing">Sincronizzazione %1$d%%</string> + <string name="sync_folder_scanning">Scansione</string> + <string name="sync_folder_paused">In pausa</string> + <string name="sync_folder_out_of_sync">Non sincronizzata</string> + <string name="sync_folder_errors">Impossibile sincronizzare %1$d file</string> + <string name="sync_folder_blocked">Bloccata</string> + <string name="sync_folder_blocked_hint">Questa cartella è fuori dall\'archiviazione di DroidDeck, quindi DroidDeck l\'ha messa in pausa. Per sincronizzare cartelle fuori da DroidDeck, usa l\'app Syncthing-Fork.</string> + <string name="sync_remove_folder">Rimuovi da Syncthing</string> + <string name="sync_remove_folder_hint">La rimozione non elimina alcun file.</string> + <string name="sync_devices">Dispositivi</string> + <string name="sync_no_devices">Ancora nessun dispositivo.</string> + <string name="sync_connected">Connesso</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Ultima connessione %1$s</string> + <string name="sync_device_id_title">ID di questo dispositivo</string> + <string name="sync_device_id_hint">Sull\'altro dispositivo, aggiungi un dispositivo in Syncthing e scansiona questo codice o incolla l\'ID. Poi accettalo qui nell\'interfaccia web.</string> + <string name="sync_copy">Copia</string> + <string name="sync_share">Condividi</string> + <string name="sync_done">Fatto</string> + <string name="sync_off_title">Disattivare Syncthing?</string> + <string name="sync_off_body">Syncthing si ferma ora e resta fermo finché non lo riattivi. I file sincronizzati restano dove sono.</string> + <string name="sync_off_forget">Elimina anche la configurazione di Syncthing</string> + <string name="sync_off_forget_hint">Rimuove l\'ID, le cartelle e i dispositivi di questo dispositivo. Riattivandolo si riparte da zero.</string> + <string name="sync_turn_off">Disattiva</string> + <string name="sync_ports">Porte</string> + <string name="sync_port_sync">Sincronizzazione</string> + <string name="sync_port_discovery">Rilevamento locale</string> + <string name="sync_repick">Scegli nuove porte</string> + <string name="sync_repick_hint">Ricontrollate a ogni avvio.</string> + <string name="sync_repick_button">Riscegli</string> + <string name="sync_reset_group">Ripristino</string> + <string name="sync_api_key">Chiave API</string> + <string name="sync_regenerate">Rigenera</string> + <string name="sync_reset">Ripristina Syncthing</string> + <string name="sync_reset_hint">Nuovo ID dispositivo, cartelle e dispositivi rimossi. I file nell\'archiviazione di DroidDeck vengono mantenuti.</string> + <string name="sync_reset_button">Ripristina</string> + <string name="sync_reset_confirm_title">Ripristinare Syncthing?</string> + <string name="sync_running_group">Esecuzione</string> + <string name="sync_run">Esegui</string> + <string name="sync_run_open">Mentre DroidDeck è aperto</string> + <string name="sync_run_background">In background</string> + <string name="sync_wifi_only">Solo Wi-Fi</string> + <string name="sync_pause_games">Pausa durante i giochi</string> + <string name="sync_logs">Log</string> + <string name="sync_logs_hint">Output di Syncthing per questa sessione</string> + <string name="sync_logs_share">Condividi</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Configura prima il runtime Linux.</string> + <string name="sync_accept">Accetta</string> + <string name="sync_accept_title">Salva “%1$s” in</string> + <string name="sync_add_folder">Aggiungi cartella</string> + <string name="sync_add_folder_hint">Sincronizza una cartella nell\'archiviazione di DroidDeck</string> + <string name="sync_choose">Scegli</string> + <string name="sync_add">Aggiungi</string> + <string name="sync_add_failed">Impossibile aggiungere la cartella.</string> + <string name="sync_share_with">Condividi con</string> + <string name="sync_share_none">Ancora nessun dispositivo. Potrai condividere questa cartella dall\'interfaccia web in seguito.</string> + <string name="sync_use_folder">Usa questa cartella</string> + <string name="sync_new_folder">Nuova cartella</string> + <string name="sync_location_home">Home del container</string> + <string name="sync_location_sync">Cartella Sync</string> + <string name="sync_location_shared">Archiviazione condivisa di DroidDeck</string> + <string name="sync_location_card">DroidDeck su %1$s</string> + <string name="sync_location_app">Dati dell\'app DroidDeck</string> + <string name="sync_web_path_locked">Le nuove cartelle vengono salvate nella cartella Sync di DroidDeck. Per sincronizzare un\'altra cartella di DroidDeck, usa Aggiungi cartella nella scheda Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Ricarica</string> + <string name="sync_not_running">Syncthing non è in esecuzione.</string> + <string name="session_end_steam_sigill">Steam si è arrestato con un\'istruzione non valida (SIGILL). Può trattarsi di un problema di compatibilità delle istruzioni della CPU o di un crash del client. Condividi i log con i dettagli del tuo dispositivo.</string> + <string name="session_end_steam_try_x64">Puoi provare Impostazioni di Steam → Client Steam → x86-64 (sperimentale). Richiede un download aggiuntivo e potrebbe essere più lento.</string> + <string name="session_end_vulkan_device">Il driver grafico Linux non ha trovato un dispositivo Vulkan utilizzabile. Verifica che il driver GPU Linux selezionato supporti questa GPU.</string> + <string name="session_end_gpu_unsupported">Questa sessione non può avviarsi perché questa GPU non ha un driver Vulkan Linux compatibile nella configurazione attuale. I driver Adreno Turnip non possono abilitare il supporto per le GPU MediaTek/Mali.</string> <string name="setup_group_memory">Memoria</string> <string name="setup_clear_cached">Chiudi le app in cache prima di una sessione</string> <string name="setup_clear_cached_hint">All\'avvio di una sessione, DroidDeck chiude le app che Android tiene parcheggiate in background, così il gioco ha più memoria. Il Debug wireless deve essere attivo.</string> @@ -3159,6 +3502,12 @@ <string name="epic_client_open">Apri</string> <string name="epic_client_install">Installa</string> <string name="game_tab_about">Informazioni</string> + <string name="game_resources_browser">Si apre nel browser</string> + <string name="game_resource_guides">Guide</string> + <string name="game_resource_protondb_detail">Rapporti di compatibilità Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Per i giochi con salvataggi nel tuo account Steam</string> + <string name="game_resource_search">Ricerca web</string> <string name="game_tab_install">Installa</string> <string name="game_install_location">Posizione</string> <string name="game_install_folder">Cartella</string> @@ -3175,6 +3524,11 @@ <string name="stores_eyebrow_pass">disponibile con %1$s</string> <string name="stores_owned_in_library">Giochi posseduti nella Libreria</string> <string name="library_filter_added">Aggiunti</string> + <string name="library_filter">Filtro</string> + <string name="library_filter_installed">Solo installati</string> + <string name="library_filter_all_owned">Tutti i giochi posseduti</string> + <string name="library_no_installed_matches">Nessun gioco installato corrisponde a questi filtri.</string> + <string name="library_browse_owned">Sfoglia i giochi posseduti</string> <string name="game_tab_launch">Avvio</string> <string name="game_tab_saves_cloud">Salvataggi e cloud</string> <string name="game_launch_shortcut">Collegamento Steam</string> @@ -3192,6 +3546,40 @@ <string name="stores_itch_update_replaced">Lo sviluppatore ha sostituito questa build con %1$s. Aggiornare a quella?</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Impostazioni cloud</string> + <string name="integration_title">Integrazione con Steam</string> + <string name="integration_count">%1$d di %2$d attive</string> + <string name="integration_set_up">Configura</string> + <string name="integration_location">Posizione</string> + <string name="integration_app_info">Informazioni app</string> + <string name="integration_wifi">Nomi Wi-Fi</string> + <string name="integration_brightness">Luminosità</string> + <string name="integration_home">DroidDeck come Home</string> + <string name="integration_shortcuts">Tasti di sistema</string> + <string name="integration_wifi_hint">Mostra le reti in Steam · richiede l\'accesso alla posizione, mai tracciata</string> + <string name="integration_wifi_on">Le reti sono visibili in Steam</string> + <string name="integration_wifi_location_off">La posizione è disattivata</string> + <string name="integration_wifi_denied">Posizione negata · consentila in Informazioni app</string> + <string name="integration_brightness_hint">Il cursore di Steam regola la luminosità dello schermo</string> + <string name="integration_home_hint">Home apre il menu di Steam durante una sessione</string> + <string name="integration_shortcuts_hint">Alt+Tab, tasto Win e tasto Home restano nella sessione</string> + <string name="integration_shortcuts_maybe_restricted">Disattivato in grigio su Android? Informazioni app → ⋮ → Consenti impostazioni con limitazioni</string> + <string name="integration_shortcuts_restricted">Bloccato da Android · Informazioni app → ⋮ → Consenti impostazioni con limitazioni</string> + <string name="integration_shortcuts_service">Tasti di sistema DroidDeck</string> + <string name="integration_shortcuts_service_description">Mantiene Alt+Tab, il tasto Win e il tasto Home in una sessione DroidDeck attiva anziché in Android.</string> + <string name="integration_brightness_needed">Attiva Luminosità in Configurazione → Integrazione con Steam</string> + <string name="setup_gpu_bridge_off">Ponte Mali: disattivato</string> + <string name="setup_gpu_bridge_on">Ponte Mali: attivo</string> + <string name="setup_gpu_bridge_detail">%1$s non è una Adreno. Il ponte Vulkan sperimentale è attivo: la sessione disegna tramite il driver del telefono. Aspettati bug; invia i log della sessione.</string> + <string name="setup_bridge_safe">Modalità sicura</string> + <string name="setup_bridge_safe_on">Modalità sicura: attiva</string> + <string name="setup_bridge_safe_off">Modalità sicura: disattivata</string> + <string name="setup_bridge_safe_on_detail">La più compatibile. Consigliata per un nuovo dispositivo.</string> + <string name="setup_bridge_safe_off_detail">Più veloce dove questa GPU ha superato i controlli.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatico</string> + <string name="setup_bridge_dxvk_proton">DXVK: quello di Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Usa un DXVK più vecchio se il Vulkan di questa GPU è troppo vecchio per quello di Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Ogni Proton mantiene il proprio DXVK, anche se il Vulkan di questa GPU potrebbe essere troppo vecchio.</string> <string name="apps_search_hint">Cerca app</string> <string name="apps_no_match">Nessuna app corrisponde a «%1$s».</string> <string name="apps_add_widget">Aggiungi widget</string> @@ -3241,6 +3629,8 @@ <string name="desktop_restore_done_body">Le app che hai aggiunto sono di nuovo installate.</string> <string name="desktop_restore_failed_title">Non è stato possibile ripristinare alcuni software</string> <string name="desktop_restore_failed_body">Controlla ~/.cache/droiddeck/apt-restore.log, poi prova sudo apt install in Konsole.</string> + <string name="gog_full_files">Le ottimizzazioni native non sono disponibili. Il download include file sostitutivi completi.</string> + <string name="gog_recover">Verifica il risultato della patch</string> <string name="slow_usb_title">Connessione USB lenta</string> <string name="slow_usb_cable">%1$s è collegato tramite %2$s (%3$s Mbps, circa %4$d MB/s), quindi i giochi si caricheranno lentamente. Usa un cavo USB 3 da 5 Gbps o più, prova a girare il connettore USB-C o usa un\'unità più veloce.</string> <string name="slow_usb_port">%1$s è collegato tramite %2$s (%3$s Mbps, circa %4$d MB/s). La porta USB di questo dispositivo non va più veloce, quindi i giochi si caricheranno lentamente. La memoria interna o una microSD potrebbero essere più veloci.</string> @@ -3251,4 +3641,52 @@ <string name="steam_import_names_more">%1$s e altri %2$d</string> <string name="steam_import_now">Riavvia ora</string> <string name="steam_import_later">Più tardi</string> + <string name="gog_maintenance">Gestisci installazione GOG</string> + <string name="gog_check">Cerca aggiornamenti</string> + <string name="gog_repair">Verifica/Ripara</string> + <string name="gog_patches">Patch offline</string> + <string name="gog_refresh">Scarica il programma di installazione offline completo</string> + <string name="gog_update">Aggiorna a %1$s</string> + <string name="gog_resume">Riprendi la manutenzione GOG</string> + <string name="gog_open_patch">Apri il programma di installazione della patch</string> + <string name="gog_patch_in_session">Completa o annulla l\'installazione della patch nella sessione Linux.</string> + <string name="gog_patch_requirements">Scegli una patch per la versione installata e la lingua. Le versioni di partenza supportate potrebbero non essere elencate.</string> + <string name="gog_no_patches">GOG non ha patch Windows autonome per questo gioco.</string> + <string name="gog_managed_files">I file di gioco modificati potrebbero essere sostituiti.</string> + <string name="gog_patch_installer_note">Il programma di installazione si apre nella sessione Linux.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Spazio aggiuntivo</string> + <string name="gog_space_estimate_label">Spazio stimato</string> + <string name="gog_repair_action">Ripara file</string> + <string name="gog_refresh_action">Aggiorna installazione</string> + <string name="gog_select_patch">Seleziona</string> + <string name="stores_gamejolt_not_owned">Non è nella tua libreria Game Jolt</string> + <string name="stores_gamejolt_no_build">Nessun download per Windows di questo gioco</string> + <string name="stores_gamejolt_no_exe">Nessun gioco Windows trovato nel download</string> + <string name="stores_gamejolt_no_game">Gioco non trovato su Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Impossibile caricare i giochi da Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt ha risposto HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Impossibile caricare i download da Game Jolt</string> + <string name="stores_gamejolt_build_open">Apri su Game Jolt</string> + <string name="stores_gamejolt_archive">Gli archivi %1$s non sono supportati</string> + <string name="stores_gamejolt_extract_failed">Impossibile estrarre il download (codice %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Impossibile raggiungere Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt non ha fornito un link di download</string> + <string name="stores_gamejolt_section_featured">In evidenza</string> + <string name="stores_gamejolt_section_hot">Di tendenza</string> + <string name="stores_gamejolt_section_best">Migliori</string> + <string name="stores_gamejolt_section_new">Nuovi</string> + <string name="stores_gamejolt_price_under_30">30 $ o meno</string> + <string name="stores_gamejolt_os_other">Altro</string> + <string name="stores_gamejolt_maturity_everyone">Per tutti</string> + <string name="stores_gamejolt_maturity_teen">Adolescenti</string> + <string name="stores_gamejolt_maturity_adult">Adulti</string> + <string name="stores_gamejolt_status_complete">Completo</string> + <string name="stores_gamejolt_status_early">Accesso anticipato</string> + <string name="stores_gamejolt_partners">Giochi dei partner</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Classificazione</string> + <string name="stores_gamejolt_filter_status">Stato</string> + <string name="stores_gamejolt_filter_partners">Partner</string> + <string name="stores_gamejolt_followed">Giochi seguiti</string> </resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0ebd814dfc..b5a2fc424c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12のVKD3Dオプション。nodxrはレイトレーシングを無効にします。ゲームが必要とする場合のみ使用してください。</string> <string name="game_env_proton_log">1に設定するとProtonの診断ログを生成します。ログ記録はパフォーマンスを低下させ、ストレージを消費する可能性があります。</string> <string name="game_env_wined3d">1に設定すると、D3D9~11の互換性テストのためにDXVKの代わりにOpenGLベースのWineD3Dを使用します。</string> + <string name="game_env_wined3d_renderer">DirectDraw、Direct3D 1~7、およびWineD3Dで実行するゲームのレンダラー。VulkanはOpenGL-on-Zinkの経路を使わないため、Adrenoでは古いDirectDrawやDirect3D 7のゲームが大幅に高速になります。</string> + <string name="game_env_dxvk_d3d8">1に設定すると、Direct3D 8をWineD3Dの代わりにDXVKで実行します。AdrenoではAIO Graphics TestのDirect3D 8テストで高速です。</string> <string name="game_env_no_ntsync">1に設定すると、このゲームでntsync(droiddeck-ntsyncまたはカーネルドライバー)を使用しません。パックがある場合はdroiddeck-esync、ない場合はdroiddeck-fsyncを使用します。</string> <string name="game_env_no_esync">1に設定すると、このゲームでdroiddeck-esyncをオフにします。代わりにdroiddeck-fsyncを使用し、fsyncもオフの場合はdroiddeck-ntsyncを使用します。</string> <string name="game_env_no_fsync">1に設定すると、このゲームでdroiddeck-fsyncを使用しません。パックがある場合はdroiddeck-esync、ない場合はdroiddeck-ntsyncを使用します。</string> <string name="game_env_fsync_first">1に設定するとこのゲームをdroiddeck-fsyncで実行します。0に設定すると、Protonに合うパックがある場合はdroiddeck-esyncを優先します。</string> <string name="game_env_xalia">0に設定すると、このゲームのProtonコントローラーナビゲーション補助を無効にします。</string> + <string name="game_env_anticheat_offline">デフォルトでオンです。ゲームがオフラインプレイに対応している場合、Easy Anti-Cheatのゲームをアンチチートなしで起動します。オフにすると、通常どおりEasy Anti-Cheat経由で起動します。Easy Anti-Cheatが必要なオンラインモードは引き続き利用できません。</string> <string name="game_env_hud">D3D9~11のDXVKオーバーレイ。fpsはフレームレートを表示します。設定を解除するとオーバーレイが非表示になります。</string> <string name="game_env_dxvk_config">セミコロンで区切られたDXVK設定。最近のバージョンではdxvk.maxFrameRateでフレームレートを制限します。通常のプレイにはセッションフレームレートリミッターを推奨します。</string> + <string name="game_env_cores">このゲームで使用するCPUコア(例:0-4、0,2,4)。セッションのゲームコアの代わりに使用されます。コアが少ないほど発熱が抑えられます。</string> <string name="game_env_vkd3d_limit">D3D12のフレームレート制限。0で制限を無効にします。</string> <string name="game_env_glthread">Mesa OpenGLマルチスレッド。CPUに制限のあるOpenGLゲームではtrueが有効な場合があります。ゲームごとにテストしてください。</string> <string name="sync_backend_title">Wine同期</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEXはx86 LinuxプログラムをこのARM64デバイスで実行します。自動では、x86向けにビルドされたプログラムでFEXを使用します。</string> <string name="app_fex_x86">%1$s(FEX経由)</string> <string name="app_fex_not_ready">このプログラムは%1$s PC向けにビルドされており、FEX経由で実行されますが、FEXはまだセットアップされていません。ログインした状態で一度Steamを開いてください。DroidDeckがFEXと必要なSteam Linux Runtimeをダウンロードした後、このプログラムが開きます。</string> + <string name="session_proot_missing">DroidDeckのprootをダウンロードできませんでした。接続を確認して、もう一度お試しください。代替のprootではプレイするには遅すぎるため、セッションは開始されませんでした。</string> + <string name="session_directaudio_missing">DirectAudioをダウンロードできなかったため、このセッションではゲーム音声に低速な経路を使用します。</string> <string name="session_end_program">このプログラム</string> <string name="session_end_steam_download">Steamクライアントをダウンロードできませんでした。ネットワークまたはVPNがSteamのサーバーをブロックしている可能性があります。接続を確認して、もう一度お試しください。</string> <string name="session_end_steam_setup">Steamクライアントをセットアップできませんでした。接続と空き容量を確認して、もう一度お試しください。</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360コントローラー</string> <string name="mode_controller_note">Deck:クイックアクセスボタンとジャイロを提供します。Xbox 360:Guide+Aでクイックアクセスを開きます。</string> <string name="mode_back">戻る</string> + <string name="back_hold">戻る長押しでSteamショートカット</string> + <string name="back_hold_hint">戻るを長押しするとクイックアクセスを開くか、他のボタンとSteamの同時押しになります。オフにすると長押しを無視します。タップとダブルタップは引き続き使えます。</string> + <string name="back_native_qam_hint">戻るを700ミリ秒長押しするか、戻るを押したまま別のボタンを押すとSteamのショートカットを使用できます。</string> + <string name="back_double_tap_window">ダブルタップの間隔</string> + <string name="back_tap_ms">%1$dミリ秒</string> + <string name="brightness_permission_title">明るさの調整を許可</string> + <string name="brightness_permission_text">DroidDeckで明るさの調整を設定します。</string> <string name="back_menu_then_qam">メニュー → QAM</string> <string name="back_qam_then_menu">QAM → メニュー</string> <string name="mode_session">セッション</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Steamがダウンロード中は、バックグラウンドでの一時停止を遅らせます。</string> <string name="mode_suspend_note">自動ではバックグラウンドで一時停止し、表示すると再開します。手動では「再開」をタップするまで待機します。「しない」では実行し続けます。</string> <string name="mode_startup">起動</string> - <string name="mode_steam_startup">DroidDeck起動時にSteamを起動</string> - <string name="mode_steam_startup_hint">DroidDeckの起動時にSteamセッションを開きます。</string> + <string name="mode_startup_session">起動時に開く</string> + <string name="mode_startup_session_hint">DroidDeck の起動時にこのセッションを開始します。</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">リリースを確認中…</string> <string name="mode_decky_ready">%1$sをインストールする準備ができました。</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">最新です · %1$s</string> <string name="mode_decky_loader">ローダー</string> <string name="mode_decky_install_latest">最新バージョンをインストール</string> + <string name="decky_channel">アップデートチャンネル</string> + <string name="decky_channel_hint">インストールするDecky Loaderのリリースです。Decky自身のアップデーターも同じチャンネルを使用します。</string> + <string name="decky_channel_stable">安定版</string> + <string name="decky_channel_prerelease">プレリリース版</string> + <string name="decky_channel_testing">テスト版</string> + <string name="decky_channel_failed">Deckyのアップデートチャンネルを保存できませんでした</string> <string name="mode_decky_on">Steamと共に起動します。有効にすると、このデバイス上の他のアプリがSteamを制御できる場合があります。</string> <string name="mode_decky_off">オフ。Steamのリモートデバッグポートは閉じたままになります。</string> <string name="mode_decky_remove_title">Decky Loaderをアンインストールしますか?</string> @@ -325,6 +344,8 @@ <string name="mode_mangoapp_hint">Deckモードでゲームがクラッシュしたり画面が真っ暗になる場合は、これをオフにしてください。次回のセッションで有効になります。</string> <string name="mode_return_after_game">ゲーム終了後にDroidDeckへ戻る</string> <string name="mode_return_after_game_hint">DroidDeckや他のランチャーから起動したゲームを閉じると、Steamが正しく終了し(クラウドセーブの同期を先に完了)、起動元に戻ります。オフ:Steamに留まります。</string> + <string name="mode_shader_precache">シェーダーの事前キャッシュ</string> + <string name="mode_shader_precache_hint">Steamがゲーム用にビルド済みのシェーダーをダウンロードしてバックグラウンドで処理するため、ゲームのカクつきが減ります。オフにするとデータ通信量、ストレージ、バッテリーを節約できますが、ゲームはプレイ中にシェーダーをビルドします。Steamの「ダウンロード」>「シェーダーの事前キャッシュ」と同じ設定です。次回のセッションから適用されます。</string> <string name="mode_steam_repair">Steamクライアントを修復</string> <string name="mode_steam_repair_hint">次回Steamの起動時にSteamクライアントを再ダウンロードします。Steamが読み込み画面のまま進まない場合に使用してください。ゲーム、ログイン情報、設定は保持されます。</string> <string name="mode_steam_repair_queued">次回Steamの起動時にSteamクライアントを再ダウンロードします。</string> @@ -391,6 +412,8 @@ <string name="mode_directaudio_hint">PulseAudioをバイパスして遅延を減らします。</string> <string name="mode_mic">マイク</string> <string name="mode_mic_hint">ボイスチャットに使用します。</string> + <string name="drawer_mic_hint">このセッションのマイク入力をオンまたはオフにします。</string> + <string name="drawer_mic_failed">マイクを変更できませんでした。もう一度お試しください。</string> <string name="mode_network">ネットワーク</string> <string name="mode_wifi_discovery">Wi-Fi検出</string> <string name="mode_wifi_discovery_hint">SteamにWi-Fi名と付近のネットワークを表示します。</string> @@ -551,6 +574,16 @@ <string name="perf_gsrealtime">gamescope:リアルタイムGPUキュー</string> <string name="perf_gsrealtime_hint">コンポジタのGPU作業の優先度を上げます。フレームタイムの安定性が向上する場合がありますが、ゲームのパフォーマンスの一部を消費します。</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">メモリ</string> + <string name="perf_cap_off">オフ</string> + <string name="perf_cap_auto">ドライバーのデフォルト</string> + <string name="perf_zram_client">ゲーム実行中はSteamを圧縮</string> + <string name="perf_zram_client_hint">ゲーム開始の20秒後、SteamクライアントをzRAMに圧縮してゲームに使えるメモリを増やし、ゲーム終了時に読み戻します。ゲーム開始直後にセッションが終了する場合はオフにしてください。上のRAM上限を設定している場合は、セッションが上限を超えるとSteamは引き続き圧縮されます。</string> + <string name="perf_ram_cap">RAM上限</string> + <string name="perf_ram_cap_hint">Steamモードでもデスクトップからでも、Steamクライアントの実行中に適用されます。セッションの使用量がこの値を超えると、Steam、次にセッション内の対応する他のプロセスがzRAMに圧縮されます。ソフトな上限のため何も終了されませんが、ページの読み戻し中にゲームがカクつくことがあります。</string> + <string name="perf_ram_cap_unavailable">zRAMスワップが必要ですが、このデバイスにはありません。</string> + <string name="perf_vram_cap">VRAM上限</string> + <string name="perf_vram_cap_hint">DXVKがDirect3Dゲームに報告するビデオメモリ量です。ゲームはこれに合わせてテクスチャ量を抑えます。ゲーム独自のDXVK設定が優先されます。次回のセッションから有効になります。</string> <string name="perf_gpuclock">GPUを最高クロックに保つ</string> <string name="perf_gpuclock_hint">Adrenoのみ。スタッターは減りますが、消費電力と発熱が増えます。</string> <string name="perf_fixes">セッション修正</string> @@ -569,6 +602,8 @@ <string name="perf_fastpath">prootファストパス</string> <string name="perf_fastpath_needs_seccomp">prootのseccompフィルターが必要です。</string> <string name="perf_fastpath_hint">ファイル検索が速くなり、スタッターが減ります。プログラムがファイルを見つけられない場合は、これをオフにしてください。</string> + <string name="perf_cursor_composite">gamescope内でカーソルを描画</string> + <string name="perf_cursor_composite_hint">ポインターをAndroidに任せず、Gamescope自身が描画します。コントローラーで操作するカーソルにはオンにしてください。スマートフォンではオフの方が高速です。次回のセッションから適用されます。</string> <string name="perf_identity">セッションの識別情報</string> <string name="perf_hostname">ホスト名</string> <string name="perf_hostname_hint">Steamがこのデバイスを認識する名前。空にすると%1$sに戻ります。</string> @@ -583,6 +618,8 @@ <string name="driver_delete_plain">ファイルがアプリから削除されます。</string> <string name="driver_delete_in_use">ファイルが削除されます。使用中のため、デフォルトのドライバーに切り替わります。</string> <string name="drawer_page_display">表示</string> + <string name="drawer_frame_limit">フレームレート制限</string> + <string name="drawer_frame_limit_note">このゲームのフレームレートを制限します。上限で割り切れるリフレッシュレートがあれば画面はそれに切り替わり、それ以外の上限では表示が不均一になることがあります。SteamゲームではクイックアクセスメニューにあるSteamのフレームレート制限を使用します。</string> <string name="drawer_page_effects">エフェクト</string> <string name="drawer_page_controls">コントロール</string> <string name="drawer_page_components">コンポーネント</string> @@ -614,8 +651,11 @@ <string name="hud_size_pill">カプセル</string> <string name="hud_size_minimal">ミニマル</string> <string name="hud_size_mega">メガ</string> + <string name="hud_size_strip">バー</string> <string name="hud_locked">位置を固定</string> <string name="hud_locked_hint">HUDはドラッグで移動できます。長押しで固定または解除します。固定中も、下にある画面上のコントロールは使えます。</string> + <string name="hud_snap">左右に吸着</string> + <string name="hud_snap_hint">HUD を離すと、画面の近い方の端に移動します。はじくとその方向へ飛びます。</string> <string name="hud_group_look">外観</string> <string name="hud_scale">画面上のサイズ</string> <string name="hud_color_soft">ソフト</string> @@ -664,7 +704,6 @@ <string name="hud_export_failed">HUDレポートを保存できませんでした。</string> <string name="hud_reset">HUD設定をリセット</string> <string name="hud_reset_button">リセット</string> - <string name="hud_credit">FusionHUD 作者:The412Banner、github.com/The412Banner/FusionHUD (GPL-3.0)。</string> <string name="drawer_scaling">スケーリングモード</string> <string name="drawer_scaling_sharpness">スケーリングのシャープネス</string> <string name="drawer_effects">画面エフェクト</string> @@ -699,11 +738,17 @@ <string name="drawer_touch_auto">自動(%1$s)</string> <string name="drawer_keyboard">キーボード</string> <string name="drawer_latency">遅延</string> + <string name="drawer_low_latency">低遅延モード</string> + <string name="drawer_low_latency_hint">CPUとバッテリーの使用量が増えます</string> <string name="drawer_low_latency_controller">低遅延コントローラー</string> <string name="drawer_low_latency_controller_hint">コントローラーが 250 Hz ではなく 1000 Hz で報告されます。CPU 使用率がわずかに上がります。</string> <string name="drawer_low_latency_touch">低遅延タッチ</string> <string name="drawer_low_latency_touch_hint">タッチはフレームの結合を省略し、Steam のタッチは 1000 Hz で報告されます。CPU 使用率がわずかに上がります。</string> <string name="drawer_evdev_mouse">生のマウス経路</string> + <string name="drawer_relative_mouse">相対マウス</string> + <string name="drawer_relative_mouse_auto">自動</string> + <string name="drawer_relative_mouse_on">オン</string> + <string name="drawer_relative_mouse_off">オフ</string> <string name="drawer_direct_cursor">カーソル</string> <string name="drawer_pc_keyboard">PCキーボード</string> <string name="drawer_android_keyboard">Android</string> @@ -790,6 +835,10 @@ <string name="setup_session">セッション</string> <string name="setup_logs">セッションログ</string> <string name="setup_logs_hint">各セッション終了後に保存</string> + <string name="setup_game_debug_logs">ゲームのデバッグログ</string> + <string name="setup_game_debug_logs_hint">次回のゲーム起動時にProton、Wine、グラフィックスの診断情報を含めます。パフォーマンスが低下し、ストレージを多く使用する場合があります。</string> + <string name="setup_game_debug_logs_restart">ゲームのデバッグログを保存するにはこのセッションを再起動してください</string> + <string name="setup_logging_update_failed">ログ設定を更新できませんでした。スイッチを確認して、もう一度お試しください。</string> <string name="setup_agent_commands">デバッグツール</string> <string name="setup_latest_logs">最新のセッションログ</string> <string name="setup_saved_logs">保存されたセッションログ</string> @@ -821,20 +870,22 @@ <string name="setup_home">ホーム画面として使用</string> <string name="setup_home_on">DroidDeckをホームアプリとして使用できます</string> <string name="setup_home_off">DroidDeckはホームアプリとして提供されません</string> + <string name="setup_home_game_space_first">「ゲームを追加」で DroidDeck を「含める」に設定してください</string> <string name="setup_orientation">画面の向き</string> + <string name="setup_launcher_orientation">ランチャーの向き</string> + <string name="setup_launcher_orientation_auto">デバイスの回転に合わせる</string> + <string name="setup_orientation_portrait">縦向き</string> + <string name="setup_session_orientation">セッションの向き</string> + <string name="setup_session_orientation_hint">Steam、ゲーム、デスクトップ、コントローラーエディターに適用されます。解像度プリセットはセッションに合わせて回転し、カスタムの幅と高さは入力したとおりになります。</string> <string name="setup_orientation_auto">横向き(自動回転)</string> <string name="setup_orientation_landscape">横向き</string> <string name="setup_orientation_reverse">横向き(反転)</string> <string name="setup_fullscreen">全画面</string> <string name="setup_fullscreen_on">Androidのステータスバーとナビゲーションバーを非表示</string> <string name="setup_fullscreen_off">Androidのステータスバーとナビゲーションバーを表示</string> - <string name="setup_dual_screen">デュアル画面</string> - <string name="setup_dual_screen_hint">自動では、2画面目を内蔵した携帯機でその画面を使います。オンではどの2画面目でも使います。オフではすべてを1画面に表示します。</string> <string name="setup_dual_screen_auto">自動</string> <string name="setup_dual_screen_on">オン</string> <string name="setup_dual_screen_off">オフ</string> - <string name="setup_dual_screen_menu">下画面メニュー</string> - <string name="setup_dual_screen_menu_hint">セクションとゲーム中のメニューを2画面目に移し、入力もそこで行うため、上画面は全体表示のままになります。L2とR2でセクションを切り替えます。</string> <string name="setup_dual_screen_controls">ゲーム中の下画面コントロール</string> <string name="setup_dual_screen_controls_hint">セッション開始時に2画面目にトラックパッドとキーボードを開きます。</string> <string name="dual_typing_title">上画面に入力中</string> @@ -983,6 +1034,14 @@ <string name="gate_step1">設定 → 開発者向けオプション → ワイヤレスデバッグを開き、オンにする</string> <string name="gate_step2">「ペアリングコードでデバイスをペア設定」をタップ</string> <string name="gate_step3">DroidDeckの通知にペアリングコードを入力</string> + <string name="pairguide_build_number">「デバイス情報」で「ビルド番号」を7回タップします</string> + <string name="pairguide_wireless">「ワイヤレス デバッグ」をオンにします</string> + <string name="pairguide_pair">「ワイヤレス デバッグ」を開き、「ペア設定コードによるデバイスのペア設定」をタップします</string> + <string name="pairguide_child_process">「子プロセスの制限を無効にする」をオンにします</string> + <string name="pairguide_row_child_process">子プロセスの制限を無効にする</string> + <string name="pairguide_row_build_number">ビルド番号</string> + <string name="pairguide_row_wireless">ワイヤレス デバッグ</string> + <string name="pairguide_row_pair">ペア設定コードによるデバイスのペア設定</string> <string name="gate_waiting">ペアリングのポップアップを待機中…</string> <string name="gate_code_needed">ポップアップが見つかりました。表示されたペアリングコードを通知に入力してください。</string> <string name="gate_status">ステータス</string> @@ -1121,7 +1180,6 @@ <string name="games_never_played">未プレイ</string> <string name="games_runtime_busy_percent">実行環境は使用中 · %1$d%%</string> <string name="games_runtime_busy">実行環境は使用中</string> - <string name="games_runtime_first_play">初回実行時に実行環境を導入</string> <string name="games_runtime_update">実行環境にアップデートがあります</string> <string name="games_runtime_ready">● 実行環境の準備完了</string> <string name="games_internal">内部ストレージ</string> @@ -1138,6 +1196,9 @@ <string name="gpu_hide_other">他のGPUのドライバーを非表示</string> <string name="gpu_show_other">他のGPUのドライバーを表示</string> <string name="gpu_advanced">詳細設定</string> + <string name="gpu_ubwc_title">UBWC互換性</string> + <string name="gpu_ubwc_hint">SteamやAndroidで縞模様やちらつきが出る場合は、オンまたはオフを試してください。DroidDeckの再起動後、両方のドライバーに適用されます。</string> + <string name="gpu_ubwc_restart">適用するにはDroidDeckを再起動してください。</string> <string name="gpu_set_with_display">ディスプレイドライバーと一緒に設定:%1$s は両方を含みます。</string> <string name="gpu_set_with_runtime">ランタイムドライバーと一緒に設定:%1$s は両方を含みます。</string> <string name="gpu_runtime_hint">ゲームとデスクトップで使用されます。</string> @@ -1246,10 +1307,15 @@ <string name="pip_auto">自動でピクチャーインピクチャー</string> <string name="unfolded_controls">開いた状態の画面のコントロール</string> <string name="unfolded_controls_hint">開いた状態では、ゲームがSteam Deckのトラックパッドと背面グリップの上に表示されます。折りたたんだ状態では、ゲームが全画面で表示されます。</string> + <string name="unfolded_controls_with_controller">コントローラー接続時も表示</string> + <string name="unfolded_controls_with_controller_hint">コントローラーが接続されている間も、これらのタッチ操作を表示します。</string> <string name="pip_suspended">一時停止中</string> <string name="pip_not_ready">セッションの準備ができたらピクチャーインピクチャーを使用できます。</string> <string name="pip_permission">Android設定でDroidDeckのピクチャーインピクチャーを許可してください。</string> <string name="pip_unavailable">Androidがピクチャーインピクチャーを開けませんでした。</string> + <string name="game_more">その他</string> + <string name="game_edit_art">アートを編集</string> + <string name="stores_in_steam_label">Steamに追加済み</string> <string name="game_shortcut">ショートカット</string> <string name="game_shortcut_add">ホーム画面に追加</string> <string name="game_shortcut_choose">ゲームを選択</string> @@ -1273,6 +1339,10 @@ <string name="main_wait_runtime">実行環境の処理が完了するまでお待ちください</string> <string name="main_wait_proton_install">互換性ツールのインストールが完了するまでお待ちください</string> + <string name="load_compat_title">互換性ツールを準備しています</string> + <string name="load_compat_wait">互換性のセットアップが完了するのを待っています</string> + <string name="load_compat_hint">セットアップが完了するとセッションが開始します。</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">デスクトップアプリのインストールが完了するまでお待ちください</string> <string name="main_wait_install_game">インストールが完了してからゲームを起動してください</string> <string name="main_saves_close_session">インポートしたデータがゲームに上書き保存されないよう、先にSteamセッションを終了してください</string> @@ -1305,6 +1375,9 @@ <string name="main_install_anyway">インストールする</string> <string name="main_remove_runtime_title">Linux実行環境を削除</string> <string name="main_remove_runtime_text">実行環境、その中のSteamクライアント、そこにインストールされたすべてのゲームが削除されます。</string> + <string name="runtime_actions_title">Linux実行環境</string> + <string name="runtime_actions_text">「修復」は実行環境のシステムファイルを再インストールし、Steam、ゲーム、設定は保持します。デスクトップなどの追加機能は、次に使用するときに再度インストールされます。「削除」はすべてを消去します。</string> + <string name="runtime_repair">実行環境を修復</string> <string name="main_applied">適用しました:%1$s</string> <string name="android_app_open_failed_primary">メイン画面で%1$sを開けませんでした</string> <string name="android_app_open_failed_on">%2$sで%1$sを開けませんでした</string> @@ -1431,6 +1504,10 @@ <string name="session_runtime_catalog_unreachable">実行環境のカタログに接続できませんでした。接続を確認して、もう一度Playをタップしてください。</string> <string name="session_runtime_install_failed">Linux実行環境をインストールできませんでした。「設定」で実行環境を確認して、もう一度Playをタップしてください。</string> <string name="session_desktop_install_failed">デスクトップをインストールできませんでした(%1$s)。接続を確認して、もう一度「デスクトップ」をタップしてください。</string> + <string name="session_package_resume_failed">中断されたインストールを完了できませんでした(%1$s)。接続と空き容量を確認して、もう一度お試しください。</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Linux実行環境が破損しています。%1$d個のライブラリリンクが存在しないファイルを指しています(%2$sなど)。通常はインストールが中断された後に発生します。修復してもゲームと設定は保持されます。</item> + </plurals> <string name="session_ended_named">%1$sが予期せず停止しました。バグレポートにログを添付して共有するか、もう一度お試しください。</string> <string name="session_ended_program">プログラムが予期せず停止しました。バグレポートにログを添付して共有するか、もう一度お試しください。</string> <string name="session_ended_desktop">デスクトップが予期せず停止しました。バグレポートにログを添付して共有するか、もう一度お試しください。</string> @@ -1444,6 +1521,12 @@ <string name="mode_decky_plugins_hint">次回のSteamセッション用にプラグインのzipをインストールします。</string> <string name="mode_decky_plugin_downloading">ダウンロード中…</string> <string name="mode_decky_plugin_install_zip">zipからインストール</string> + <string name="decky_zip_warning_title">サードパーティ製プラグインのインストール</string> + <string name="decky_zip_warning_text">このプラグインはDecky Loaderチームによる審査を受けていません。Steamアカウントを盗んだりデバイスに害を与えたりするソフトウェアなど、マルウェアが含まれている可能性があります。このプラグインをインストールすることで、デバイスに関するすべてのリスクを負うことに同意したものとみなされます。</string> + <string name="decky_zip_warning_continue">続行</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">%1$d秒お待ちください</item> + </plurals> <string name="store_cat_games">ゲーム</string> <string name="store_cat_audio_video">オーディオ・ビデオ</string> <string name="store_cat_graphics">グラフィック</string> @@ -1600,6 +1683,8 @@ <string name="fm_accept">承諾</string> <string name="fm_decline">拒否</string> <string name="fm_drive_not_readable">%1$sはマウントされていますが、現在読み取れません</string> + <string name="fm_drive_access_title">%1$sへのアクセスを許可</string> + <string name="fm_drive_access_text">Android では DroidDeck がこのドライブを表示できますが、読み取れません。DroidDeck の「全ファイルへのアクセス」をオンにしてから戻ってください。</string> <string name="fm_list_view">リスト表示</string> <string name="fm_grid_view">グリッド表示</string> <string name="fm_search">検索</string> @@ -1670,6 +1755,89 @@ <string name="second_mode_keyboard_trackpad">キーボード + トラックパッド</string> <string name="second_mode_terminal">ターミナル</string> <string name="second_mode_deck_controls">Deckグリップ + トラックパッド</string> + <string name="second_mode_dashboard">ダッシュボード</string> + <string name="bottom_dashboard_empty">まだ表示するものはありません。</string> + <string name="bottom_page_downloads">ダウンロード</string> + <string name="bottom_downloads_none">実行中のダウンロードはありません。</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">シェーダーキャッシュをダウンロード中</string> + <string name="bottom_downloads_paused">一時停止中</string> + <string name="bottom_downloads_queued">開始待ち</string> + <string name="bottom_page_notifications">通知</string> + <string name="bottom_notifications_listener">DroidDeck下部画面</string> + <string name="bottom_notifications_why">プレイ中、メッセージなどの通知をここに表示します。通知はこの画面にのみ表示され、保存されません。Androidによる確認は一度だけです。この画面に通知へのアクセスのページが開くので、そこでDroidDeckをオンにすると、このページに自動的に戻ります。</string> + <string name="bottom_notifications_allow">通知へのアクセスを許可</string> + <string name="bottom_notifications_none">通知はありません。</string> + <string name="bottom_notifications_count">%1$d件の通知</string> + <string name="bottom_notifications_clear">クリア</string> + <string name="bottom_page_screenshots">スクリーンショット</string> + <string name="stats_fps_needs_hud">FPSの表示にはHUDをオンにする必要があります</string> + <string name="stats_speed">速度</string> + <string name="stats_pedals">ペダル</string> + <string name="stats_gforce">Gフォース</string> + <string name="stats_timing">タイム</string> + <string name="stats_best_lap">ベストラップ</string> + <string name="stats_tires">タイヤ °C</string> + <string name="stats_trace">スロットルとブレーキ(直近10 s)</string> + <string name="stats_speed_chart">速度(%1$s)</string> + <string name="stats_gear">ギア</string> + <string name="stats_steam_client_arm">Steamクライアント ARM</string> + <string name="stats_steam_client_x86">Steamクライアント x86</string> + <string name="stats_throttle">スロットル</string> + <string name="stats_brake">ブレーキ</string> + <string name="stats_lights">インジケーター</string> + <string name="stats_lamp_shift">シフト</string> + <string name="stats_lamp_handbrake">サイドブレーキ</string> + <string name="stats_lamp_pit">ピットリミッター</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">ターボ %1$s bar</string> + <string name="stats_engine_temp">エンジン %1$s °C</string> + <string name="stats_oil_temp">油温 %1$s °C</string> + <string name="stats_power">パワーディストリビューター</string> + <string name="stats_fuel_t">燃料(t)</string> + <string name="stats_fuel_main">メイン %1$s t</string> + <string name="stats_fuel_reserve">予備 %1$s t</string> + <string name="bottom_telemetry_send_title">ダッシュボード用データを送信</string> + <string name="bottom_telemetry_send_auto">自動</string> + <string name="bottom_telemetry_send_auto_hint">ここに表示されているすべてのゲーム(後から見つかったゲームを含む)でオンにします。オフにしたゲームはオフのままです。</string> + <string name="bottom_telemetry_send_note">ゲーム自体のデータ出力設定を変更します。次回ゲームを起動したときに反映されます。オフにすると元の設定に戻ります。</string> + <string name="bottom_telemetry_send_close">変更するには%1$sを終了してください。</string> + <string name="bottom_telemetry_send_failed">%1$sの設定を変更できませんでした。</string> + <string name="bottom_telemetry_send_menu">%1$s:ゲームの設定で%2$sをオンにし、IP 127.0.0.1、ポート%3$dを指定してください。</string> + <string name="bottom_shots_where">Pictures/DroidDeckに保存されます。Steamのスクリーンショットもここに表示されます。</string> + <string name="bottom_shots_take">スクリーンショットを撮る</string> + <string name="bottom_shots_saved">スクリーンショットを保存しました。</string> + <string name="bottom_shots_failed">スクリーンショットを撮れませんでした。</string> + <string name="bottom_shots_none">スクリーンショットはまだありません。</string> + <string name="bottom_page_chat">チャット&ボイス</string> + <string name="bottom_chat_why">ゲームをメイン画面で実行したまま、ここでSteamチャットを読んで返信できます。Steamにサインインしているアカウントを使用します。</string> + <string name="bottom_chat_not_signed_in">Steamにはまだ共有できるWebサインインがないため、ここで一度サインインしてください。</string> + <string name="bottom_chat_stopped">DroidDeckがバックグラウンドにある間に、Androidがチャットページを閉じました。DroidDeckに戻ると再度開きます。</string> + <string name="bottom_chat_open">Steamチャットを開く</string> + <string name="bottom_chat_close">チャットを閉じる</string> + <string name="bottom_chat_mic_on">マイク オン</string> + <string name="bottom_chat_mic_off">マイク オフ</string> + <string name="bottom_chat_mic_unavailable">このゲームではマイクがオフです。話すには、DroidDeckのSteam設定(オーディオ)でマイクをオンにして、ゲームを再起動してください。</string> + <string name="bottom_chat_volume">音量 %1$d%%</string> + <string name="bottom_page_telemetry">ゲーム内統計</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">バッテリー</string> + <string name="bottom_telemetry_lap">ラップ</string> + <string name="bottom_telemetry_position">順位</string> + <string name="bottom_telemetry_this_lap">現在のラップ</string> + <string name="bottom_telemetry_last_lap">前回のラップ</string> + <string name="bottom_telemetry_fuel">燃料</string> + <string name="bottom_telemetry_cargo">積荷</string> + <string name="bottom_telemetry_pips">電力配分 SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">法的状態</string> + <string name="bottom_telemetry_balance">残高</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">ポート%1$dでデータを受信していますが(%3$dバイトのパケット%2$d個)、このページではまだ読み取れない形式です。</string> + <string name="bottom_telemetry_port_busy">別のプログラムがすでにポート%1$sを使用しているため、そのゲームはここに表示できません。</string> <string name="rtinst_removing">Linux実行環境を削除中</string> <plurals name="rtinst_removing_entries"> @@ -1699,6 +1867,7 @@ <string name="flatpakmgr_not_ready">先にFlatpakをセットアップしてください</string> <string name="flatpakmgr_starting">開始中</string> <string name="flatpakmgr_exit_status">Flatpakがステータス%1$dで終了しました</string> + <string name="flatpakmgr_wrong_arch">%1$s は DroidDeck で実行できない %2$s 向けにビルドされています。ここでは Flatpak アプリに ARM64 または x86_64 版が必要です。</string> <string name="flatpakmgr_installing">%1$sをインストール中</string> <string name="flatpakmgr_updating">%1$sを更新中</string> <string name="flatpakmgr_removing">%1$sを削除中</string> @@ -1792,6 +1961,7 @@ <string name="adbpair_applying">設定を適用中…</string> <string name="adbpair_command_failed">ワイヤレスデバッグのコマンドに失敗しました</string> <string name="adbpair_channel_name">ワイヤレスデバッグのセットアップ</string> + <string name="adbpair_progress_channel_name">ワイヤレスデバッグのセットアップ状況</string> <string name="adbpair_channel_description">設定を開いている間、ワイヤレスデバッグのペアリングコードを入力するよう求めます</string> <string name="adbpair_title_pair">ワイヤレスデバッグのペアリング</string> <string name="adbpair_waiting_text">ワイヤレスデバッグをオンにして、「ペアリングコードでデバイスをペア設定」をタップしてください。</string> @@ -1900,6 +2070,7 @@ <string name="gpuinfo_not_adreno">Adreno GPUではありません</string> <string name="gpuinfo_supported">サポート対象</string> <string name="gpuinfo_experimental">実験的:ドライバーはテストビルドです</string> + <string name="gpuinfo_a850_experimental">Adreno 850の実験的サポート:互換性のある実験版のディスプレイドライバーとゲームドライバーが必要です。このデバイスでは未検証です</string> <string name="gpuinfo_below_tested">テスト済みハードウェア(Adreno 725以降)未満:動作しない可能性があります</string> <string name="gpuinfo_unsupported">サポート対象外:DroidDeckにはAdreno(Snapdragon)GPUが必要です</string> @@ -1996,6 +2167,7 @@ <string name="display_look_filter">%1$s スケーリングを%2$sに設定します。</string> <string name="display_match_screen">画面に合わせる(%1$d×%2$d)</string> <string name="display_follow_screen">画面に追従(開閉時にサイズを変更)</string> + <string name="display_follow_screen_scaled">スケール %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">デバイスの詳細を表示</string> <string name="device_info_hide">デバイスの詳細を非表示</string> @@ -2102,6 +2274,13 @@ <string name="stores_resume">再開</string> <string name="stores_refresh">更新</string> <string name="stores_sort">並べ替え</string> + <string name="setup_rail_labels">サイドバーのラベル</string> + <string name="setup_rail_labels_hint">サイドバーのアイコンの下に名前を表示します。オフにするとサイドバーが細くなります。</string> + <string name="library_display">表示</string> + <string name="library_display_larger">大きいカード</string> + <string name="library_display_smaller">小さいカード</string> + <string name="library_display_title">タイトルを表示</string> + <string name="library_display_size">サイズを表示</string> <string name="stores_sort_last_played">最近プレイ</string> <string name="stores_sort_recently_installed">最近インストール</string> <string name="stores_sort_title_asc">タイトル A–Z</string> @@ -2228,6 +2407,9 @@ <string name="stores_download_manager">ダウンロードマネージャー</string> <string name="stores_parallel">同時ダウンロード数</string> <string name="stores_install_where">インストール先</string> + <string name="stores_install_language">ゲームの言語</string> + <string name="stores_install_language_hint">GOGとEpicはこの言語でインストールします。「システム」はアプリの言語に従います。</string> + <string name="stores_install_language_system">システム</string> <string name="stores_install_title">%1$sをインストール:</string> <string name="stores_target_internal">内部ストレージ</string> <string name="stores_target_free">空き %1$s</string> @@ -2266,6 +2448,9 @@ <string name="edit_target">ターゲット</string> <string name="edit_start_in">開始フォルダ</string> <string name="edit_launch_options">起動オプション</string> + <string name="edit_launch_options_steam_hint">Steam のプロパティと共通です。どちらかで変更すると両方に反映されます。</string> + <string name="edit_launch_options_not_saved">起動オプションを Steam に保存できませんでした。もう一度お試しください。</string> + <string name="edit_launch_options_desktop">デスクトップのセッションで Steam が開いている可能性があります。Steam のプロパティで起動オプションを変更するか、先にセッションを終了してください。</string> <string name="edit_artwork">アートワーク</string> <string name="edit_other_exe">別の exe…</string> <string name="edit_remove">削除</string> @@ -2391,6 +2576,7 @@ <string name="setup_download_source_custom">カスタムプレフィックス</string> <string name="setup_download_mirror">サイト</string> <string name="setup_download_prefix">プレフィックス</string> + <string name="setup_download_proxy">HTTPプロキシ</string> <string name="flathub_eyebrow">Linuxアプリ</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Linuxデスクトップ用のアプリ。「デスクトップ」から開きます。</string> @@ -2529,6 +2715,22 @@ <string name="glasses_tracking_flat_hint">「自動」では、この 2D ゲームは視界の中で固定されます。ヘッドトラッキングを使うには、「表示」で「仮想スクリーン」を選んでください。</string> <string name="glasses_tracking_sbs_hint">ヘッドトラッキングは、仮想スクリーンまたは実行中の SteamVR ゲームに適用されます。</string> <string name="glasses_hardware">デバイス</string> + <string name="vr_controllers_tab">コントローラー</string> + <string name="vr_controllers_group">SteamVRコントローラー</string> + <string name="vr_controllers_emulate">VRでのゲームパッド</string> + <string name="vr_controllers_emulate_hint">コントローラーが担当する2つのVRの手です。変更はSteamVRの実行中でもすぐに反映されます。Joy-Conやトラッキングされた手は、引き続きそれぞれの側を優先して操作します。</string> + <string name="vr_controllers_off">通常のゲームパッド</string> + <string name="vr_controllers_index">Valve Indexコントローラー</string> + <string name="vr_controllers_touch">Meta Quest 3コントローラー</string> + <string name="vr_controllers_vive">HTC Viveワンド</string> + <string name="vr_controllers_sticks">スティックの初期動作</string> + <string name="vr_controllers_sticks_hint">VR中に両方のスティックを同時に押し込むと切り替わります。</string> + <string name="vr_controllers_sticks_game">ゲーム内で移動</string> + <string name="vr_controllers_sticks_hands">手を動かす</string> + <string name="vr_controllers_buttons">ボタン</string> + <string name="vr_controllers_buttons_stick">トリガーはトリガー、バンパーはグリップ、A/BとX/Yはそれぞれの手のフェイスボタン、スティック押し込みはサムスティックのクリック、ガイドボタンはSteamVRメニューを開きます。十字キーの上下で手を近づけたり遠ざけたりします。</string> + <string name="vr_controllers_buttons_vive">スティックはトラックパッドとして動作し、A/Xまたはスティック押し込みで押します。トリガーはトリガー、バンパーはグリップ、StartとSelectはメニュー、ガイドボタンはSteamVRメニューを開きます。</string> + <string name="vr_controllers_buttons_off">VRの手はありません。ゲームパッドに対応したゲームとSteamVRメニューでは、通常どおりコントローラーを使用できます。</string> <string name="glasses_brightness">明るさ</string> <string name="glasses_volume">音量</string> <string name="glasses_sunblock">サンブロック</string> @@ -2586,6 +2788,12 @@ <string name="hand_camera_placement">カメラの位置</string> <string name="hand_camera_placement_hint">プレイ前に、カメラにあなたが映っているか確認してください。</string> <string name="hand_camera_check">確認</string> + <string name="tracking_pack_title">ハンドトラッキングのダウンロード</string> + <string name="tracking_pack_hint">ハンドトラッキングには%1$sの1回限りのダウンロードが必要です。</string> + <string name="tracking_pack_download">ダウンロード</string> + <string name="tracking_pack_retry">再試行</string> + <string name="tracking_pack_downloading">ハンドトラッキングをダウンロード中… %1$d%%</string> + <string name="tracking_pack_failed">ハンドトラッキングをダウンロードできませんでした。接続を確認して、もう一度お試しください。</string> <string name="hand_camera_check_title">カメラの位置</string> <string name="hand_camera_how_rear">デバイスを胸の高さくらいで1.5〜2m離れたところに立て、背面カメラがあなたの方を向くようにしてください。そのあと、手を広げて画面内に入ってください。</string> <string name="hand_camera_how_front">デバイスを胸の高さくらいで1.5〜2m離れたところに立て、画面があなたの方を向くようにしてください。そのあと、手を広げて画面内に入ってください。</string> @@ -2657,6 +2865,21 @@ <string name="storage_safe_hint">未使用のランタイム、残留、古いログ</string> <string name="storage_clean_up">クリーンアップ…</string> <string name="storage_session_running">セッションを停止するとクリーンアップや削除ができます。容量は引き続き表示されます。</string> + <string name="storage_default_group">インストール先</string> + <string name="storage_default_title">デフォルトのストレージ</string> + <string name="storage_default_hint">ストアからの新しいインストールは選択した場所に保存されます。既存のゲームはそのままです。Steamライブラリは独自の設定を使用します。</string> + <string name="storage_default_ask">毎回確認する</string> + <string name="storage_default_ask_detail">インストールごとに保存先を選択します</string> + <string name="storage_default_internal">内部ストレージ</string> + <string name="storage_default_external">外部ストレージ</string> + <string name="storage_default_external_detail">%1$s · 空き %2$s</string> + <string name="storage_default_external_missing">未接続</string> + <string name="storage_default_folder">フォルダー · %1$s</string> + <string name="storage_default_folder_free">空き %1$s</string> + <string name="storage_default_folder_missing">未接続</string> + <string name="storage_default_choose_folder">フォルダーを選択…</string> + <string name="storage_default_choose_folder_detail">SDカードやUSBドライブの任意のフォルダーを使用します</string> + <string name="storage_default_note">ゲームは選択した場所の中のGamesフォルダーに保存されます。既存のゲームは移動されません。</string> <string name="storage_where">使用内訳</string> <string name="storage_games">Steam ゲーム</string> <string name="storage_game_data">ゲームデータ</string> @@ -2778,6 +3001,9 @@ <string name="storage_data_installed">インストール済みゲーム</string> <string name="storage_data_parts">プレフィックス %1$s · シェーダー %2$s · ワークショップ %3$s</string> <string name="storage_clear_shaders">シェーダーを削除</string> + <string name="storage_reset_prefix">プレフィックスをリセット</string> + <string name="storage_reset_prefix_title">%1$sのプレフィックスをリセットしますか?</string> + <string name="storage_reset_prefix_confirm">%2$s内のWineプレフィックス(%1$s)を削除し、次回の起動時に再作成します。その中のセーブデータ、設定、インストール済みの再頒布可能パッケージは失われます。Steam Cloudのセーブデータはアカウントに残ります。</string> <string name="storage_data_leftovers">アンインストールしたゲーム</string> <string name="storage_steam_app">Steam アプリ %1$d</string> <string name="storage_leftover_unsure_detail">プレフィックスにファイルが残っており、ローカルのセーブデータが含まれる可能性があります</string> @@ -3077,6 +3303,117 @@ <string name="spatial_saved_views_hint">保存されたビューは再計算できます。新しいキャリブレーションを開始して、現在のトラッキング座標系でキャプチャします。</string> <string name="spatial_model_checksum_error">ハンドモデルのチェックサムの不一致</string> <string name="spatial_opencv_load_error">OpenCVをロードできませんでした</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Syncthingで同期</string> + <string name="sync_enable_hint">Syncthing-ForkをベースにしたSyncthingの実装で、DroidDeckの内部ファイルシステム内のファイルを他のSyncthingインスタンスと同期できます。DroidDeckの内部ファイルシステム内に保存しているファイル専用です。</string> + <string name="sync_missing">このビルドにはSyncthingが含まれていません。</string> + <string name="sync_starting">Syncthingを起動中</string> + <string name="sync_status_starting">起動中</string> + <string name="sync_status_up_to_date">最新</string> + <string name="sync_status_syncing">同期中</string> + <string name="sync_status_paused">一時停止中</string> + <string name="sync_status_pausing">一時停止しています</string> + <string name="sync_status_resuming">再開しています</string> + <string name="sync_status_attention">要確認</string> + <string name="sync_status_failed">Syncthingが停止しました</string> + <string name="sync_failed_retry">再試行</string> + <string name="sync_paused_wifi">Wi-Fi接続まで一時停止中</string> + <string name="sync_paused_game">ゲーム中は一時停止中</string> + <string name="sync_summary">%1$d個のフォルダ · %3$d台中%2$d台のデバイスが接続中</string> + <string name="sync_left">残り%1$s</string> + <string name="sync_open_web_ui">Web UIを開く</string> + <string name="sync_pause">一時停止</string> + <string name="sync_resume">再開</string> + <string name="sync_running">実行中</string> + <string name="sync_running_hint">オフにするとSyncthingを完全に停止します。</string> + <string name="sync_this_device">このデバイス</string> + <string name="sync_device_id">デバイスID</string> + <string name="sync_show_qr">QRコードを表示</string> + <string name="sync_advanced">詳細設定</string> + <string name="sync_advanced_hint">ポート、実行タイミング、リセット</string> + <string name="sync_open">開く</string> + <string name="sync_waiting">確認待ち</string> + <string name="sync_pending_device">%1$sが接続を求めています</string> + <string name="sync_pending_folder">%1$sが「%2$s」を共有しようとしています</string> + <string name="sync_pending_folder_hint">承認すると、DroidDeck内の保存先を選択できます。</string> + <string name="sync_review">Web UIで確認</string> + <string name="sync_folders">フォルダ</string> + <string name="sync_no_folders">フォルダはまだありません。</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">最新</string> + <string name="sync_folder_syncing">同期中 %1$d%%</string> + <string name="sync_folder_scanning">スキャン中</string> + <string name="sync_folder_paused">一時停止中</string> + <string name="sync_folder_out_of_sync">未同期</string> + <string name="sync_folder_errors">%1$d個のファイルを同期できませんでした</string> + <string name="sync_folder_blocked">ブロック済み</string> + <string name="sync_folder_blocked_hint">このフォルダはDroidDeckのストレージ外にあるため、DroidDeckが一時停止しました。DroidDeck外のフォルダを同期するには、Syncthing-Forkアプリを使用してください。</string> + <string name="sync_remove_folder">Syncthingから削除</string> + <string name="sync_remove_folder_hint">削除してもファイルは消去されません。</string> + <string name="sync_devices">デバイス</string> + <string name="sync_no_devices">デバイスはまだありません。</string> + <string name="sync_connected">接続中</string> + <string name="sync_offline">オフライン</string> + <string name="sync_last_seen">最終接続:%1$s</string> + <string name="sync_device_id_title">このデバイスのID</string> + <string name="sync_device_id_hint">もう一方のデバイスのSyncthingでデバイスを追加し、このコードをスキャンするかIDを貼り付けてください。その後、ここのWeb UIで承認してください。</string> + <string name="sync_copy">コピー</string> + <string name="sync_share">共有</string> + <string name="sync_done">完了</string> + <string name="sync_off_title">Syncthingをオフにしますか?</string> + <string name="sync_off_body">Syncthingはすぐに停止し、再びオンにするまで停止したままになります。同期済みのファイルはそのまま残ります。</string> + <string name="sync_off_forget">Syncthingの設定も削除</string> + <string name="sync_off_forget_hint">このデバイスのID、フォルダ、デバイスを削除します。再びオンにすると最初からやり直しになります。</string> + <string name="sync_turn_off">オフにする</string> + <string name="sync_ports">ポート</string> + <string name="sync_port_sync">同期</string> + <string name="sync_port_discovery">ローカル探索</string> + <string name="sync_repick">新しいポートを選択</string> + <string name="sync_repick_hint">起動のたびに再確認されます。</string> + <string name="sync_repick_button">選び直す</string> + <string name="sync_reset_group">リセット</string> + <string name="sync_api_key">APIキー</string> + <string name="sync_regenerate">再生成</string> + <string name="sync_reset">Syncthingをリセット</string> + <string name="sync_reset_hint">デバイスIDが新しくなり、フォルダとデバイスは削除されます。DroidDeckのストレージ内のファイルは保持されます。</string> + <string name="sync_reset_button">リセット</string> + <string name="sync_reset_confirm_title">Syncthingをリセットしますか?</string> + <string name="sync_running_group">実行</string> + <string name="sync_run">実行タイミング</string> + <string name="sync_run_open">DroidDeckを開いている間</string> + <string name="sync_run_background">バックグラウンドで</string> + <string name="sync_wifi_only">Wi-Fiのみ</string> + <string name="sync_pause_games">ゲーム中は一時停止</string> + <string name="sync_logs">ログ</string> + <string name="sync_logs_hint">このセッションのSyncthing出力</string> + <string name="sync_logs_share">共有</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">先にLinux実行環境をセットアップしてください。</string> + <string name="sync_accept">承認</string> + <string name="sync_accept_title">「%1$s」の保存先</string> + <string name="sync_add_folder">フォルダを追加</string> + <string name="sync_add_folder_hint">DroidDeckのストレージ内のフォルダを同期</string> + <string name="sync_choose">選択</string> + <string name="sync_add">追加</string> + <string name="sync_add_failed">フォルダを追加できませんでした。</string> + <string name="sync_share_with">共有先</string> + <string name="sync_share_none">デバイスはまだありません。このフォルダは後でWeb UIから共有できます。</string> + <string name="sync_use_folder">このフォルダを使用</string> + <string name="sync_new_folder">新しいフォルダ</string> + <string name="sync_location_home">コンテナのホーム</string> + <string name="sync_location_sync">Syncフォルダ</string> + <string name="sync_location_shared">DroidDeckの共有ストレージ</string> + <string name="sync_location_card">%1$s上のDroidDeck</string> + <string name="sync_location_app">DroidDeckのアプリデータ</string> + <string name="sync_web_path_locked">新しいフォルダはDroidDeckのSyncフォルダに保存されます。DroidDeckの別のフォルダを同期するには、「Syncthing」タブの「フォルダを追加」を使用してください。</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">再読み込み</string> + <string name="sync_not_running">Syncthingは実行されていません。</string> + <string name="session_end_steam_sigill">Steamが不正な命令(SIGILL)で停止しました。CPU命令の互換性の問題か、クライアントのクラッシュの可能性があります。デバイスの詳細とあわせてログを共有してください。</string> + <string name="session_end_steam_try_x64">Steamの設定 → Steamクライアント → x86-64(試験運用)を試すことができます。追加のダウンロードが必要で、動作が遅くなる場合があります。</string> + <string name="session_end_vulkan_device">Linuxグラフィックスドライバーが使用可能なVulkanデバイスを見つけられませんでした。選択したLinux GPUドライバーがこのGPUに対応しているか確認してください。</string> + <string name="session_end_gpu_unsupported">現在の構成ではこのGPUに対応するLinux Vulkanドライバーがないため、このセッションを開始できません。Adreno TurnipドライバーではMediaTek/Mali GPUに対応させることはできません。</string> <string name="tracking_recovery_look">明るい部屋でゆっくりと周囲を見回してください。\nトラッキングカメラを遮るものがないように、家具などの見えるものに顔を向けてください。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> <string name="setup_group_memory">メモリ</string> @@ -3102,6 +3439,12 @@ <string name="epic_client_open">開く</string> <string name="epic_client_install">インストール</string> <string name="game_tab_about">概要</string> + <string name="game_resources_browser">ブラウザで開きます</string> + <string name="game_resource_guides">ガイド</string> + <string name="game_resource_protondb_detail">Linux / Protonの互換性レポート</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Steamアカウントにセーブデータがあるゲーム向け</string> + <string name="game_resource_search">ウェブ検索</string> <string name="game_tab_install">インストール</string> <string name="game_install_location">場所</string> <string name="game_install_folder">フォルダ</string> @@ -3118,6 +3461,11 @@ <string name="stores_eyebrow_pass">%1$s で利用可能</string> <string name="stores_owned_in_library">ライブラリの所有ゲーム</string> <string name="library_filter_added">追加したゲーム</string> + <string name="library_filter">フィルター</string> + <string name="library_filter_installed">インストール済みのみ</string> + <string name="library_filter_all_owned">所有するすべてのゲーム</string> + <string name="library_no_installed_matches">フィルターに一致するインストール済みのゲームはありません。</string> + <string name="library_browse_owned">所有するゲームを見る</string> <string name="game_tab_launch">起動</string> <string name="game_tab_saves_cloud">セーブとクラウド</string> <string name="game_launch_shortcut">Steam ショートカット</string> @@ -3135,6 +3483,40 @@ <string name="stores_itch_update_replaced">開発者がこのビルドを %1$s に置き換えました。更新しますか?</string> <string name="xbox_filter_cloud">クラウド</string> <string name="stores_xbox_cloud_settings">クラウド設定</string> + <string name="integration_title">Steam連携</string> + <string name="integration_count">%2$d件中%1$d件がオン</string> + <string name="integration_set_up">セットアップ</string> + <string name="integration_location">位置情報</string> + <string name="integration_app_info">アプリ情報</string> + <string name="integration_wifi">Wi-Fi名</string> + <string name="integration_brightness">明るさ</string> + <string name="integration_home">DroidDeckをホームに設定</string> + <string name="integration_shortcuts">システムキー</string> + <string name="integration_wifi_hint">Steamにネットワークを表示 · 位置情報へのアクセスが必要ですが、追跡はしません</string> + <string name="integration_wifi_on">Steamにネットワークが表示されます</string> + <string name="integration_wifi_location_off">位置情報がオフです</string> + <string name="integration_wifi_denied">位置情報が拒否されています · アプリ情報で許可してください</string> + <string name="integration_brightness_hint">Steamのスライダーで画面の明るさを調整します</string> + <string name="integration_home_hint">セッション中はホームでSteamメニューを開きます</string> + <string name="integration_shortcuts_hint">Alt+Tab、Win キー、ホームボタンをセッション内で使えます</string> + <string name="integration_shortcuts_maybe_restricted">Androidでグレー表示されていますか?アプリ情報 → ⋮ → 制限付き設定を許可</string> + <string name="integration_shortcuts_restricted">Androidによってブロックされています · アプリ情報 → ⋮ → 制限付き設定を許可</string> + <string name="integration_shortcuts_service">DroidDeck システムキー</string> + <string name="integration_shortcuts_service_description">Alt+Tab、Win キー、ホームボタンを Android ではなく操作中の DroidDeck セッションで使えるようにします。</string> + <string name="integration_brightness_needed">「セットアップ」→「Steam連携」で明るさをオンにしてください</string> + <string name="setup_gpu_bridge_off">Mali ブリッジ: オフ</string> + <string name="setup_gpu_bridge_on">Mali ブリッジ: オン</string> + <string name="setup_gpu_bridge_detail">%1$s は Adreno ではありません。試験的な Vulkan ブリッジがオンです。セッションはスマートフォン本体のドライバーで描画します。不具合が出る可能性があります。セッションログを送ってください。</string> + <string name="setup_bridge_safe">セーフモード</string> + <string name="setup_bridge_safe_on">セーフモード: オン</string> + <string name="setup_bridge_safe_off">セーフモード: オフ</string> + <string name="setup_bridge_safe_on_detail">最も互換性が高い設定です。新しいデバイスにおすすめです。</string> + <string name="setup_bridge_safe_off_detail">この GPU がチェックに合格した部分で高速になります。</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: 自動</string> + <string name="setup_bridge_dxvk_proton">DXVK: Proton 付属</string> + <string name="setup_bridge_dxvk_auto_detail">この GPU の Vulkan が Proton 付属の DXVK には古すぎる場合、古い DXVK を使います。</string> + <string name="setup_bridge_dxvk_proton_detail">この GPU の Vulkan が古すぎる場合でも、各 Proton は付属の DXVK を使い続けます。</string> <string name="apps_search_hint">アプリを検索</string> <string name="apps_no_match">「%1$s」に一致するアプリはありません。</string> <string name="apps_add_widget">ウィジェットを追加</string> @@ -3182,6 +3564,8 @@ <string name="desktop_restore_done_body">追加したアプリが再びインストールされました。</string> <string name="desktop_restore_failed_title">一部のソフトウェアを復元できませんでした</string> <string name="desktop_restore_failed_body">~/.cache/droiddeck/apt-restore.log を確認してから、Konsole で sudo apt install を試してください。</string> + <string name="gog_full_files">ネイティブの最適化は利用できません。ダウンロードには置き換え用の完全なファイルが含まれます。</string> + <string name="gog_recover">パッチの結果を検証</string> <string name="slow_usb_title">USB 接続が低速です</string> <string name="slow_usb_cable">%1$s は %2$s(%3$s Mbps、約 %4$d MB/s)で接続されているため、ゲームの読み込みが遅くなります。5 Gbps 以上の USB 3 ケーブルを使うか、USB-C プラグを裏返すか、より高速なドライブを使ってください。</string> <string name="slow_usb_port">%1$s は %2$s(%3$s Mbps、約 %4$d MB/s)で接続されています。この端末の USB ポートはこれ以上速くならないため、ゲームの読み込みが遅くなります。内部ストレージや microSD カードの方が速い場合があります。</string> @@ -3192,4 +3576,52 @@ <string name="steam_import_names_more">%1$s ほか %2$d 件</string> <string name="steam_import_now">今すぐ再起動</string> <string name="steam_import_later">後で</string> + <string name="gog_maintenance">GOGのインストールを管理</string> + <string name="gog_check">アップデートを確認</string> + <string name="gog_repair">検証/修復</string> + <string name="gog_patches">オフラインパッチ</string> + <string name="gog_refresh">完全なオフラインインストーラーをダウンロード</string> + <string name="gog_update">%1$sにアップデート</string> + <string name="gog_resume">GOGのメンテナンスを再開</string> + <string name="gog_open_patch">パッチインストーラーを開く</string> + <string name="gog_patch_in_session">Linuxセッションでパッチインストーラーを完了するかキャンセルしてください。</string> + <string name="gog_patch_requirements">インストール済みのバージョンと言語に合うパッチを選択してください。対応する適用元バージョンが表示されない場合があります。</string> + <string name="gog_no_patches">GOGにはこのゲーム用の単体Windowsパッチがありません。</string> + <string name="gog_managed_files">変更したゲームファイルは置き換えられる場合があります。</string> + <string name="gog_patch_installer_note">インストーラーはLinuxセッションで開きます。</string> + <string name="gog_download_label">ダウンロード</string> + <string name="gog_space_label">追加の容量</string> + <string name="gog_space_estimate_label">容量の見積もり</string> + <string name="gog_repair_action">ファイルを修復</string> + <string name="gog_refresh_action">インストールを更新</string> + <string name="gog_select_patch">選択</string> + <string name="stores_gamejolt_not_owned">Game Jolt ライブラリにありません</string> + <string name="stores_gamejolt_no_build">このゲームには Windows 版のダウンロードがありません</string> + <string name="stores_gamejolt_no_exe">ダウンロードに Windows 版のゲームが見つかりません</string> + <string name="stores_gamejolt_no_game">Game Jolt でこのゲームが見つかりませんでした</string> + <string name="stores_gamejolt_browse_failed">Game Jolt のゲームを読み込めませんでした</string> + <string name="stores_gamejolt_download_failed">Game Jolt が HTTP %1$d を返しました</string> + <string name="stores_gamejolt_pick_failed">Game Jolt からダウンロードを読み込めませんでした</string> + <string name="stores_gamejolt_build_open">Game Jolt で開く</string> + <string name="stores_gamejolt_archive">%1$s 形式のアーカイブには対応していません</string> + <string name="stores_gamejolt_extract_failed">ダウンロードを展開できませんでした (終了コード %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt に接続できませんでした</string> + <string name="stores_gamejolt_download_no_link">Game Jolt がダウンロードリンクを提供しませんでした</string> + <string name="stores_gamejolt_section_featured">注目</string> + <string name="stores_gamejolt_section_hot">人気急上昇</string> + <string name="stores_gamejolt_section_best">ベスト</string> + <string name="stores_gamejolt_section_new">新着</string> + <string name="stores_gamejolt_price_under_30">30ドル以下</string> + <string name="stores_gamejolt_os_other">その他</string> + <string name="stores_gamejolt_maturity_everyone">全年齢</string> + <string name="stores_gamejolt_maturity_teen">ティーン</string> + <string name="stores_gamejolt_maturity_adult">成人向け</string> + <string name="stores_gamejolt_status_complete">完成</string> + <string name="stores_gamejolt_status_early">アーリーアクセス</string> + <string name="stores_gamejolt_partners">パートナーのゲーム</string> + <string name="stores_gamejolt_filter_browser">ブラウザ</string> + <string name="stores_gamejolt_filter_maturity">対象年齢</string> + <string name="stores_gamejolt_filter_status">ステータス</string> + <string name="stores_gamejolt_filter_partners">パートナー</string> + <string name="stores_gamejolt_followed">フォロー中のゲーム</string> </resources> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index a1c13d54b2..4ede4632a3 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12의 VKD3D 옵션. nodxr은 레이 트레이싱을 비활성화합니다. 게임에서 필요할 때만 사용하세요.</string> <string name="game_env_proton_log">1로 설정하면 Proton 진단 로그를 생성합니다. 로깅은 성능을 저하시키고 저장 공간을 차지할 수 있습니다.</string> <string name="game_env_wined3d">1로 설정하면 D3D9–11 호환성 테스트를 위해 DXVK 대신 OpenGL 기반 WineD3D를 사용합니다.</string> + <string name="game_env_wined3d_renderer">DirectDraw, Direct3D 1-7 및 WineD3D로 실행되는 게임의 렌더러입니다. Vulkan은 OpenGL-on-Zink 경로를 건너뛰므로 Adreno에서 오래된 DirectDraw 및 Direct3D 7 게임이 훨씬 빠릅니다.</string> + <string name="game_env_dxvk_d3d8">1로 설정하면 Direct3D 8을 WineD3D 대신 DXVK로 실행합니다. Adreno에서 AIO Graphics Test의 Direct3D 8 테스트가 더 빠릅니다.</string> <string name="game_env_no_ntsync">1로 설정하면 이 게임에서 ntsync(droiddeck-ntsync 또는 커널 드라이버)를 사용하지 않습니다. 팩이 있으면 droiddeck-esync를, 없으면 droiddeck-fsync를 사용합니다.</string> <string name="game_env_no_esync">1로 설정하면 이 게임에서 droiddeck-esync를 끕니다. 대신 droiddeck-fsync를 사용하며, fsync도 꺼져 있으면 droiddeck-ntsync를 사용합니다.</string> <string name="game_env_no_fsync">1로 설정하면 이 게임에서 droiddeck-fsync를 사용하지 않습니다. 팩이 있으면 droiddeck-esync를, 없으면 droiddeck-ntsync를 사용합니다.</string> <string name="game_env_fsync_first">1로 설정하면 이 게임을 droiddeck-fsync로 실행합니다. 0으로 설정하면 해당 Proton에 맞는 팩이 있을 때 droiddeck-esync를 우선 사용합니다.</string> <string name="game_env_xalia">0으로 설정하면 이 게임에 대해 Proton의 컨트롤러 탐색 도우미를 비활성화합니다.</string> + <string name="game_env_anticheat_offline">기본적으로 켜져 있습니다. 게임이 오프라인 플레이를 지원하면 Easy Anti-Cheat 게임을 안티치트 없이 시작합니다. 끄면 평소처럼 Easy Anti-Cheat를 통해 실행합니다. Easy Anti-Cheat가 필요한 온라인 모드는 계속 사용할 수 없습니다.</string> <string name="game_env_hud">D3D9–11의 DXVK 오버레이. fps는 프레임 속도를 표시합니다. 설정을 해제하면 오버레이가 숨겨집니다.</string> <string name="game_env_dxvk_config">세미콜론으로 구분된 DXVK 설정. 최신 버전은 dxvk.maxFrameRate를 사용하여 프레임 속도를 제한합니다. 일상적인 플레이에는 세션 프레임 속도 제한기를 사용하는 것이 좋습니다.</string> + <string name="game_env_cores">이 게임에 사용할 CPU 코어(예: 0-4 또는 0,2,4)로, 세션의 게임 코어 대신 사용됩니다. 코어가 적을수록 발열이 줄어듭니다.</string> <string name="game_env_vkd3d_limit">D3D12 프레임 속도 제한. 0은 제한을 비활성화합니다.</string> <string name="game_env_glthread">Mesa OpenGL 멀티스레딩. CPU에 제한된 OpenGL 게임에서 true가 도움이 될 수 있습니다. 게임별로 테스트하세요.</string> <string name="sync_backend_title">Wine 동기화</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX는 이 ARM64 기기에서 x86 Linux 프로그램을 실행합니다. 자동으로 설정하면 x86용으로 빌드된 프로그램에 FEX를 사용합니다.</string> <string name="app_fex_x86">FEX로 실행되는 %1$s</string> <string name="app_fex_not_ready">이 프로그램은 %1$s PC용으로 빌드되어 FEX를 통해 실행되지만, FEX가 아직 설정되지 않았습니다. 로그인한 상태로 Steam을 한 번 열면 DroidDeck이 FEX와 필요한 Steam Linux Runtime을 다운로드한 후 이 프로그램을 엽니다.</string> + <string name="session_proot_missing">DroidDeck의 proot를 다운로드할 수 없습니다. 연결을 확인하고 다시 시도하세요. 대체 proot는 플레이하기에 너무 느리므로 세션을 시작하지 않았습니다.</string> + <string name="session_directaudio_missing">DirectAudio를 다운로드할 수 없어 이번 세션에서는 게임 오디오가 더 느린 경로를 사용합니다.</string> <string name="session_end_program">이 프로그램</string> <string name="session_end_steam_download">Steam 클라이언트를 다운로드할 수 없습니다. 네트워크나 VPN이 Steam 서버를 차단하고 있을 수 있습니다. 연결을 확인하고 다시 시도하세요.</string> <string name="session_end_steam_setup">Steam 클라이언트를 설정할 수 없습니다. 연결과 남은 저장 공간을 확인한 뒤 다시 시도하세요.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 컨트롤러</string> <string name="mode_controller_note">Deck: 빠른 액세스 버튼과 자이로스코프를 제공합니다. Xbox 360: Guide+A로 빠른 액세스를 엽니다.</string> <string name="mode_back">뒤로</string> + <string name="back_hold">뒤로 길게 눌러 Steam 단축키</string> + <string name="back_hold_hint">뒤로를 길게 누르면 빠른 실행이 열리거나 다른 버튼과 Steam 조합이 됩니다. 끄면 길게 누르기를 무시합니다. 탭과 두 번 탭은 계속 작동합니다.</string> + <string name="back_native_qam_hint">뒤로 버튼을 700ms 동안 누르거나, 뒤로 버튼을 누른 채 다른 버튼을 누르면 Steam 단축키를 사용할 수 있습니다.</string> + <string name="back_double_tap_window">두 번 탭 간격</string> + <string name="back_tap_ms">%1$dms</string> + <string name="brightness_permission_title">밝기 제어 허용</string> + <string name="brightness_permission_text">DroidDeck에서 밝기 제어를 설정하세요.</string> <string name="back_menu_then_qam">메뉴 → QAM</string> <string name="back_qam_then_menu">QAM → 메뉴</string> <string name="mode_session">세션</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam이 다운로드 중일 때는 백그라운드 일시 중지를 미룹니다.</string> <string name="mode_suspend_note">자동: 백그라운드에서 일시 중지되고 다시 표시되면 재개됩니다. 수동: \"재개\"를 탭할 때까지 기다립니다. 안 함: 계속 실행됩니다.</string> <string name="mode_startup">시작</string> - <string name="mode_steam_startup">DroidDeck을 열 때 Steam 시작</string> - <string name="mode_steam_startup_hint">DroidDeck이 시작될 때 Steam 세션을 엽니다.</string> + <string name="mode_startup_session">실행 시 열기</string> + <string name="mode_startup_session_hint">DroidDeck을 실행할 때 이 세션을 시작합니다.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">릴리스 확인 중…</string> <string name="mode_decky_ready">%1$s을(를) 설치할 준비가 되었습니다.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">최신 버전 · %1$s</string> <string name="mode_decky_loader">로더</string> <string name="mode_decky_install_latest">최신 버전 설치</string> + <string name="decky_channel">업데이트 채널</string> + <string name="decky_channel_hint">설치할 Decky Loader 릴리스입니다. Decky 자체 업데이터도 같은 채널을 사용합니다.</string> + <string name="decky_channel_stable">안정판</string> + <string name="decky_channel_prerelease">사전 출시판</string> + <string name="decky_channel_testing">테스트판</string> + <string name="decky_channel_failed">Decky 업데이트 채널을 저장할 수 없습니다</string> <string name="mode_decky_on">Steam과 함께 시작됩니다. 활성화하면 이 기기의 다른 앱이 Steam을 제어할 수 있습니다.</string> <string name="mode_decky_off">끔. Steam의 원격 디버깅 포트가 닫힌 상태로 유지됩니다.</string> <string name="mode_decky_remove_title">Decky Loader를 제거하시겠습니까?</string> @@ -325,6 +344,8 @@ <string name="mode_mangoapp_hint">Deck 모드에서 게임이 충돌하거나 화면이 검게 변하면 이 옵션을 끄세요. 다음 세션에 적용됩니다.</string> <string name="mode_return_after_game">게임 종료 후 DroidDeck으로 돌아가기</string> <string name="mode_return_after_game_hint">DroidDeck 또는 다른 런처에서 실행한 게임을 닫으면 Steam이 정상적으로 종료되고(클라우드 저장 동기화를 먼저 완료) 실행한 곳으로 돌아갑니다. 끄면 Steam에 머무릅니다.</string> + <string name="mode_shader_precache">셰이더 사전 캐싱</string> + <string name="mode_shader_precache_hint">Steam이 게임용으로 미리 빌드된 셰이더를 다운로드해 백그라운드에서 처리하므로 게임 끊김이 줄어듭니다. 끄면 데이터, 저장 공간, 배터리를 절약하지만 게임이 플레이 중에 셰이더를 빌드합니다. Steam의 다운로드 > 셰이더 사전 캐싱과 같은 설정입니다. 다음 세션에 적용됩니다.</string> <string name="mode_steam_repair">Steam 클라이언트 복구</string> <string name="mode_steam_repair_hint">다음에 Steam을 시작할 때 Steam 클라이언트를 다시 다운로드합니다. Steam이 로딩 화면에서 넘어가지 않을 때 사용하세요. 게임, 로그인 정보 및 설정은 유지됩니다.</string> <string name="mode_steam_repair_queued">다음에 Steam을 시작할 때 Steam 클라이언트를 다시 다운로드합니다.</string> @@ -391,6 +412,8 @@ <string name="mode_directaudio_hint">PulseAudio를 우회하여 지연 시간을 줄입니다.</string> <string name="mode_mic">마이크</string> <string name="mode_mic_hint">음성 채팅에 사용됩니다.</string> + <string name="drawer_mic_hint">이 세션의 마이크 캡처를 켜거나 끕니다.</string> + <string name="drawer_mic_failed">마이크를 변경할 수 없습니다. 다시 시도하세요.</string> <string name="mode_network">네트워크</string> <string name="mode_wifi_discovery">Wi-Fi 검색</string> <string name="mode_wifi_discovery_hint">Steam에 Wi-Fi 이름과 주변 네트워크를 표시합니다.</string> @@ -551,6 +574,16 @@ <string name="perf_gsrealtime">gamescope: 실시간 GPU 큐</string> <string name="perf_gsrealtime_hint">컴포지터 GPU 작업의 우선순위를 높입니다. 프레임 타임 안정성을 개선할 수 있지만 게임 성능의 일부를 소모합니다.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">메모리</string> + <string name="perf_cap_off">끄기</string> + <string name="perf_cap_auto">드라이버 기본값</string> + <string name="perf_zram_client">게임 실행 중 Steam 압축</string> + <string name="perf_zram_client_hint">게임이 시작되고 20초 후 Steam 클라이언트를 zRAM으로 압축해 게임에 더 많은 메모리를 남기고, 게임이 종료되면 다시 읽어 들입니다. 게임 시작 직후 세션이 종료되면 이 옵션을 끄세요. 위의 RAM 제한을 설정하면 세션이 이를 초과할 때 여전히 Steam을 압축합니다.</string> + <string name="perf_ram_cap">RAM 제한</string> + <string name="perf_ram_cap_hint">Steam 모드나 데스크톱에서 Steam 클라이언트가 실행되는 동안 적용됩니다. 세션이 이 값보다 많이 사용하면 Steam과 세션의 다른 지원 프로세스를 차례로 zRAM으로 압축합니다. 소프트 제한이므로 종료되는 것은 없지만, 페이지를 다시 읽어 들이는 동안 게임이 끊길 수 있습니다.</string> + <string name="perf_ram_cap_unavailable">zRAM 스왑이 필요하지만 이 기기에는 없습니다.</string> + <string name="perf_vram_cap">VRAM 제한</string> + <string name="perf_vram_cap_hint">DXVK가 Direct3D 게임에 보고하는 비디오 메모리로, 게임이 더 적은 양에 맞춰 텍스처를 할당합니다. 게임 자체의 DXVK 설정이 우선합니다. 다음 세션에 적용됩니다.</string> <string name="perf_gpuclock">GPU를 최고 클럭으로 유지</string> <string name="perf_gpuclock_hint">Adreno에만 해당됩니다. 끊김이 줄어들지만 전력 소모와 발열이 증가합니다.</string> <string name="perf_fixes">세션 수정</string> @@ -569,6 +602,8 @@ <string name="perf_fastpath">proot 빠른 경로</string> <string name="perf_fastpath_needs_seccomp">proot의 seccomp 필터가 필요합니다.</string> <string name="perf_fastpath_hint">파일 검색이 빨라지고 끊김이 줄어듭니다. 프로그램이 파일을 찾지 못하면 이 옵션을 끄세요.</string> + <string name="perf_cursor_composite">gamescope 안에서 커서 그리기</string> + <string name="perf_cursor_composite_hint">Gamescope가 포인터를 Android에 넘기지 않고 직접 그립니다. 컨트롤러로 조작하는 커서에는 켜세요. 휴대전화에서는 끄는 것이 더 빠릅니다. 다음 세션에 적용됩니다.</string> <string name="perf_identity">세션 ID</string> <string name="perf_hostname">호스트 이름</string> <string name="perf_hostname_hint">Steam이 이 기기를 인식하는 이름입니다. 비워 두면 %1$s(으)로 복원됩니다.</string> @@ -583,6 +618,8 @@ <string name="driver_delete_plain">파일이 앱에서 제거됩니다.</string> <string name="driver_delete_in_use">파일이 제거됩니다. 사용 중이므로 기본 드라이버로 전환됩니다.</string> <string name="drawer_page_display">디스플레이</string> + <string name="drawer_frame_limit">프레임 제한</string> + <string name="drawer_frame_limit_note">이 게임의 프레임을 제한합니다. 제한값으로 나누어떨어지는 주사율이 있으면 디스플레이가 그 주사율로 전환되며, 그 밖의 제한값은 고르지 않게 보일 수 있습니다. Steam 게임은 빠른 액세스 메뉴의 Steam 프레임 제한을 사용합니다.</string> <string name="drawer_page_effects">효과</string> <string name="drawer_page_controls">컨트롤</string> <string name="drawer_page_components">구성 요소</string> @@ -614,8 +651,11 @@ <string name="hud_size_pill">캡슐</string> <string name="hud_size_minimal">미니멀</string> <string name="hud_size_mega">메가</string> + <string name="hud_size_strip">바</string> <string name="hud_locked">위치 고정</string> <string name="hud_locked_hint">HUD를 드래그하여 이동하고, 길게 눌러 고정하거나 해제합니다. 고정된 동안에도 아래에 있는 화면 컨트롤은 계속 작동합니다.</string> + <string name="hud_snap">양옆에 맞추기</string> + <string name="hud_snap_hint">HUD를 놓으면 화면에서 더 가까운 쪽으로 이동합니다. 튕기면 그 방향으로 이동합니다.</string> <string name="hud_group_look">외관</string> <string name="hud_scale">화면상 크기</string> <string name="hud_color_soft">은은함</string> @@ -664,7 +704,6 @@ <string name="hud_export_failed">HUD 보고서를 저장할 수 없습니다.</string> <string name="hud_reset">HUD 설정 초기화</string> <string name="hud_reset_button">초기화</string> - <string name="hud_credit">FusionHUD 제작: The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">스케일링 모드</string> <string name="drawer_scaling_sharpness">스케일링 선명도</string> <string name="drawer_effects">화면 효과</string> @@ -699,11 +738,17 @@ <string name="drawer_touch_auto">자동(%1$s)</string> <string name="drawer_keyboard">키보드</string> <string name="drawer_latency">지연</string> + <string name="drawer_low_latency">저지연 모드</string> + <string name="drawer_low_latency_hint">CPU 및 배터리 사용량이 늘어납니다</string> <string name="drawer_low_latency_controller">저지연 컨트롤러</string> <string name="drawer_low_latency_controller_hint">컨트롤러가 250 Hz 대신 1000 Hz로 보고됩니다. CPU 사용량이 약간 늘어납니다.</string> <string name="drawer_low_latency_touch">저지연 터치</string> <string name="drawer_low_latency_touch_hint">터치가 프레임 병합을 건너뛰고 Steam 터치가 1000 Hz로 보고됩니다. CPU 사용량이 약간 늘어납니다.</string> <string name="drawer_evdev_mouse">원시 마우스 채널</string> + <string name="drawer_relative_mouse">상대 마우스</string> + <string name="drawer_relative_mouse_auto">자동</string> + <string name="drawer_relative_mouse_on">켜기</string> + <string name="drawer_relative_mouse_off">끄기</string> <string name="drawer_direct_cursor">커서</string> <string name="drawer_pc_keyboard">PC 키보드</string> <string name="drawer_android_keyboard">Android</string> @@ -790,6 +835,10 @@ <string name="setup_session">세션</string> <string name="setup_logs">세션 로그</string> <string name="setup_logs_hint">각 세션 종료 후 저장</string> + <string name="setup_game_debug_logs">게임 디버그 로그</string> + <string name="setup_game_debug_logs_hint">다음 게임 실행 시 Proton, Wine 및 그래픽 진단 정보를 포함합니다. 성능이 저하되고 저장 공간을 더 사용할 수 있습니다.</string> + <string name="setup_game_debug_logs_restart">게임 디버그 로그를 저장하려면 이 세션을 다시 시작하세요</string> + <string name="setup_logging_update_failed">로깅을 업데이트할 수 없습니다. 스위치를 확인하고 다시 시도하세요.</string> <string name="setup_agent_commands">디버깅 도구</string> <string name="setup_latest_logs">최신 세션 로그</string> <string name="setup_saved_logs">저장된 세션 로그</string> @@ -821,20 +870,22 @@ <string name="setup_home">홈 화면으로 사용</string> <string name="setup_home_on">DroidDeck을 홈 앱으로 사용할 수 있습니다</string> <string name="setup_home_off">DroidDeck은 홈 앱으로 제공되지 않습니다</string> + <string name="setup_home_game_space_first">게임 추가에서 DroidDeck을 포함으로 설정하세요</string> <string name="setup_orientation">화면 방향</string> + <string name="setup_launcher_orientation">런처 방향</string> + <string name="setup_launcher_orientation_auto">기기 회전 따르기</string> + <string name="setup_orientation_portrait">세로</string> + <string name="setup_session_orientation">세션 방향</string> + <string name="setup_session_orientation_hint">Steam, 게임, 데스크톱 및 컨트롤러 편집기에 적용됩니다. 해상도 프리셋은 세션에 맞춰 회전하며, 사용자 정의 너비와 높이는 입력한 그대로 유지됩니다.</string> <string name="setup_orientation_auto">자동 가로 모드</string> <string name="setup_orientation_landscape">가로 모드</string> <string name="setup_orientation_reverse">역방향 가로 모드</string> <string name="setup_fullscreen">전체 화면</string> <string name="setup_fullscreen_on">Android 상태 표시줄 및 탐색 표시줄 숨기기</string> <string name="setup_fullscreen_off">Android 상태 표시줄 및 탐색 표시줄 표시</string> - <string name="setup_dual_screen">듀얼 화면</string> - <string name="setup_dual_screen_hint">자동은 두 번째 화면이 내장된 휴대용 기기에서 그 화면을 사용합니다. 켜기는 모든 두 번째 디스플레이를 사용합니다. 끄기는 모든 것을 한 화면에 둡니다.</string> <string name="setup_dual_screen_auto">자동</string> <string name="setup_dual_screen_on">켜기</string> <string name="setup_dual_screen_off">끄기</string> - <string name="setup_dual_screen_menu">하단 화면 메뉴</string> - <string name="setup_dual_screen_menu_hint">섹션과 게임 중 메뉴를 두 번째 화면으로 옮기고 입력도 그곳에서 하므로 상단 화면은 전체 보기를 유지합니다. L2와 R2로 섹션을 전환합니다.</string> <string name="setup_dual_screen_controls">게임 중 하단 화면 컨트롤</string> <string name="setup_dual_screen_controls_hint">세션이 시작되면 두 번째 화면에 트랙패드와 키보드를 엽니다.</string> <string name="dual_typing_title">상단 화면에 입력 중</string> @@ -983,6 +1034,14 @@ <string name="gate_step1">설정 → 개발자 옵션 → 무선 디버깅을 열고 켜기</string> <string name="gate_step2">\"페어링 코드로 기기 페어링\" 탭</string> <string name="gate_step3">DroidDeck 알림에 페어링 코드 입력</string> + <string name="pairguide_build_number">휴대전화 정보에서 빌드 번호를 7번 탭하세요</string> + <string name="pairguide_wireless">무선 디버깅을 켜세요</string> + <string name="pairguide_pair">무선 디버깅을 연 다음 “페어링 코드로 기기 페어링”을 탭하세요</string> + <string name="pairguide_child_process">“하위 프로세스 제한 사용 중지”를 켜세요</string> + <string name="pairguide_row_child_process">하위 프로세스 제한 사용 중지</string> + <string name="pairguide_row_build_number">빌드 번호</string> + <string name="pairguide_row_wireless">무선 디버깅</string> + <string name="pairguide_row_pair">페어링 코드로 기기 페어링</string> <string name="gate_waiting">페어링 팝업을 기다리는 중…</string> <string name="gate_code_needed">팝업을 찾았습니다. 표시된 페어링 코드를 알림에 입력하세요.</string> <string name="gate_status">상태</string> @@ -1121,7 +1180,6 @@ <string name="games_never_played">플레이한 적 없음</string> <string name="games_runtime_busy_percent">런타임 사용 중 · %1$d%%</string> <string name="games_runtime_busy">런타임 사용 중</string> - <string name="games_runtime_first_play">처음 \"Steam 실행\" 시 런타임 설치</string> <string name="games_runtime_update">런타임 업데이트 있음</string> <string name="games_runtime_ready">● 런타임 준비됨</string> <string name="games_internal">내부 저장 공간</string> @@ -1138,6 +1196,9 @@ <string name="gpu_hide_other">다른 GPU의 드라이버 숨기기</string> <string name="gpu_show_other">다른 GPU의 드라이버 표시</string> <string name="gpu_advanced">고급</string> + <string name="gpu_ubwc_title">UBWC 호환성</string> + <string name="gpu_ubwc_hint">Steam이나 Android에 줄무늬나 깜박임이 보이면 켜기 또는 끄기를 시도하세요. DroidDeck을 다시 시작한 후 두 드라이버 모두에 적용됩니다.</string> + <string name="gpu_ubwc_restart">적용하려면 DroidDeck을 다시 시작하세요.</string> <string name="gpu_set_with_display">디스플레이 드라이버와 함께 설정: %1$s에 둘 다 포함됩니다.</string> <string name="gpu_set_with_runtime">런타임 드라이버와 함께 설정: %1$s에 둘 다 포함됩니다.</string> <string name="gpu_runtime_hint">게임 및 데스크톱에서 사용됩니다.</string> @@ -1246,10 +1307,15 @@ <string name="pip_auto">자동으로 PIP 시작</string> <string name="unfolded_controls">펼친 화면의 컨트롤</string> <string name="unfolded_controls_hint">펼치면 게임이 Steam Deck 터치패드와 뒷면 그립 위에 표시됩니다. 접으면 게임이 전체 화면으로 표시됩니다.</string> + <string name="unfolded_controls_with_controller">컨트롤러 사용 시에도 유지</string> + <string name="unfolded_controls_with_controller_hint">컨트롤러가 연결되어 있을 때도 이 터치 컨트롤을 표시합니다.</string> <string name="pip_suspended">일시 중지됨</string> <string name="pip_not_ready">세션이 준비되면 PIP를 사용할 수 있습니다.</string> <string name="pip_permission">Android 설정에서 DroidDeck의 PIP 사용을 허용하세요.</string> <string name="pip_unavailable">Android에서 PIP를 열 수 없습니다.</string> + <string name="game_more">더보기</string> + <string name="game_edit_art">아트 편집</string> + <string name="stores_in_steam_label">Steam에 있음</string> <string name="game_shortcut">바로 가기</string> <string name="game_shortcut_add">홈 화면에 추가</string> <string name="game_shortcut_choose">게임 선택</string> @@ -1273,6 +1339,10 @@ <string name="main_wait_runtime">런타임 작업이 끝날 때까지 기다려 주세요</string> <string name="main_wait_proton_install">호환성 도구 설치가 끝날 때까지 기다려 주세요</string> + <string name="load_compat_title">호환성 도구 준비 중</string> + <string name="load_compat_wait">호환성 설정이 끝나기를 기다리는 중</string> + <string name="load_compat_hint">설정이 끝나면 세션이 시작됩니다.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">데스크톱 앱 설치가 끝날 때까지 기다려 주세요</string> <string name="main_wait_install_game">설치가 끝난 후 게임을 실행하세요</string> <string name="main_saves_close_session">게임이 가져온 데이터를 덮어쓰지 않도록 먼저 Steam 세션을 종료하세요</string> @@ -1305,6 +1375,9 @@ <string name="main_install_anyway">그래도 설치</string> <string name="main_remove_runtime_title">Linux 런타임 제거</string> <string name="main_remove_runtime_text">런타임과 그 안의 Steam 클라이언트, 그리고 런타임에 설치된 모든 게임이 삭제됩니다.</string> + <string name="runtime_actions_title">Linux 런타임</string> + <string name="runtime_actions_text">복구는 런타임의 시스템 파일을 다시 설치하며 Steam, 게임 및 설정은 유지합니다. 데스크톱 같은 추가 기능은 다음에 사용할 때 다시 설치됩니다. 제거는 모든 것을 삭제합니다.</string> + <string name="runtime_repair">런타임 복구</string> <string name="main_applied">적용됨: %1$s</string> <string name="android_app_open_failed_primary">메인 화면에서 %1$s을(를) 열 수 없습니다</string> <string name="android_app_open_failed_on">%2$s에서 %1$s을(를) 열 수 없습니다</string> @@ -1431,6 +1504,10 @@ <string name="session_runtime_catalog_unreachable">런타임 카탈로그에 연결할 수 없습니다. 연결을 확인한 후 \"Steam 실행\"을 다시 누르세요.</string> <string name="session_runtime_install_failed">Linux 런타임이 설치되지 않았습니다. \"설정\"에서 런타임을 확인한 후 \"Steam 실행\"을 다시 누르세요.</string> <string name="session_desktop_install_failed">데스크톱이 설치되지 않았습니다(%1$s). 연결을 확인한 후 \"데스크톱\"을 다시 누르세요.</string> + <string name="session_package_resume_failed">중단된 설치를 완료할 수 없습니다(%1$s). 연결과 저장 공간을 확인한 후 다시 시도하세요.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Linux 런타임이 손상되었습니다. 라이브러리 링크 %1$d개가 없는 파일(%2$s 등)을 가리킵니다. 보통 설치가 중단된 후에 발생합니다. 복구해도 게임과 설정은 유지됩니다.</item> + </plurals> <string name="session_ended_named">%1$s이(가) 예기치 않게 중지되었습니다. 버그 리포트와 함께 로그를 공유하거나 다시 시도하세요.</string> <string name="session_ended_program">프로그램이 예기치 않게 중지되었습니다. 버그 리포트와 함께 로그를 공유하거나 다시 시도하세요.</string> <string name="session_ended_desktop">데스크톱이 예기치 않게 중지되었습니다. 버그 리포트와 함께 로그를 공유하거나 다시 시도하세요.</string> @@ -1444,6 +1521,12 @@ <string name="mode_decky_plugins_hint">다음 Steam 세션에 사용할 플러그인 ZIP을 설치합니다.</string> <string name="mode_decky_plugin_downloading">다운로드 중…</string> <string name="mode_decky_plugin_install_zip">ZIP에서 설치</string> + <string name="decky_zip_warning_title">타사 플러그인 설치</string> + <string name="decky_zip_warning_text">Decky Loader 팀이 이 플러그인을 검토하지 않았습니다. Steam 계정을 탈취하거나 기기를 손상시키는 소프트웨어 같은 악성 코드가 포함되어 있을 수 있습니다. 이 플러그인을 설치하면 기기에 대한 모든 위험을 본인이 감수하는 데 동의하는 것입니다.</string> + <string name="decky_zip_warning_continue">계속</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">%1$d초 기다려 주세요</item> + </plurals> <string name="store_cat_games">게임</string> <string name="store_cat_audio_video">오디오 및 비디오</string> <string name="store_cat_graphics">그래픽</string> @@ -1600,6 +1683,8 @@ <string name="fm_accept">수락</string> <string name="fm_decline">거절</string> <string name="fm_drive_not_readable">%1$s이(가) 마운트되었지만 지금은 읽을 수 없습니다</string> + <string name="fm_drive_access_title">%1$s 액세스 허용</string> + <string name="fm_drive_access_text">Android에서 DroidDeck이 이 드라이브를 볼 수는 있지만 읽을 수는 없습니다. DroidDeck의 모든 파일 액세스를 켠 다음 돌아오세요.</string> <string name="fm_list_view">목록 보기</string> <string name="fm_grid_view">격자 보기</string> <string name="fm_search">검색</string> @@ -1670,6 +1755,89 @@ <string name="second_mode_keyboard_trackpad">키보드 + 터치패드</string> <string name="second_mode_terminal">터미널</string> <string name="second_mode_deck_controls">Deck 그립 + 터치패드</string> + <string name="second_mode_dashboard">대시보드</string> + <string name="bottom_dashboard_empty">아직 표시할 내용이 없습니다.</string> + <string name="bottom_page_downloads">다운로드</string> + <string name="bottom_downloads_none">진행 중인 다운로드가 없습니다.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">셰이더 캐시 다운로드 중</string> + <string name="bottom_downloads_paused">일시 중지됨</string> + <string name="bottom_downloads_queued">시작 대기 중</string> + <string name="bottom_page_notifications">알림</string> + <string name="bottom_notifications_listener">DroidDeck 하단 화면</string> + <string name="bottom_notifications_why">플레이하는 동안 메시지와 기타 알림을 여기에 표시합니다. 알림은 이 화면에만 표시되며 저장되지 않습니다. Android에서 한 번만 묻습니다. 이 화면에 알림 접근 권한 페이지가 열리면 DroidDeck을 켜세요. 그러면 이 페이지로 자동으로 돌아옵니다.</string> + <string name="bottom_notifications_allow">알림 접근 허용</string> + <string name="bottom_notifications_none">알림이 없습니다.</string> + <string name="bottom_notifications_count">알림 %1$d개</string> + <string name="bottom_notifications_clear">지우기</string> + <string name="bottom_page_screenshots">스크린샷</string> + <string name="stats_fps_needs_hud">FPS를 보려면 HUD를 켜야 합니다</string> + <string name="stats_speed">속도</string> + <string name="stats_pedals">페달</string> + <string name="stats_gforce">G-포스</string> + <string name="stats_timing">타이밍</string> + <string name="stats_best_lap">베스트 랩</string> + <string name="stats_tires">타이어 °C</string> + <string name="stats_trace">스로틀 및 브레이크, 최근 10 s</string> + <string name="stats_speed_chart">속도, %1$s</string> + <string name="stats_gear">기어</string> + <string name="stats_steam_client_arm">Steam 클라이언트 ARM</string> + <string name="stats_steam_client_x86">Steam 클라이언트 x86</string> + <string name="stats_throttle">스로틀</string> + <string name="stats_brake">브레이크</string> + <string name="stats_lights">계기판 표시등</string> + <string name="stats_lamp_shift">변속</string> + <string name="stats_lamp_handbrake">핸드브레이크</string> + <string name="stats_lamp_pit">피트 리미터</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">터보 %1$s bar</string> + <string name="stats_engine_temp">엔진 %1$s °C</string> + <string name="stats_oil_temp">오일 %1$s °C</string> + <string name="stats_power">파워 분배기</string> + <string name="stats_fuel_t">연료, t</string> + <string name="stats_fuel_main">메인 %1$s t</string> + <string name="stats_fuel_reserve">예비 %1$s t</string> + <string name="bottom_telemetry_send_title">계기판 데이터 보내기</string> + <string name="bottom_telemetry_send_auto">자동</string> + <string name="bottom_telemetry_send_auto_hint">나중에 발견된 게임을 포함해 여기에 나열된 모든 게임에서 켭니다. 직접 끈 게임은 꺼진 상태로 유지됩니다.</string> + <string name="bottom_telemetry_send_note">게임 자체의 데이터 출력 설정을 변경합니다. 다음에 게임을 시작할 때 적용되며, 끄면 이전 설정으로 되돌립니다.</string> + <string name="bottom_telemetry_send_close">이 설정을 변경하려면 %1$s을(를) 종료하세요.</string> + <string name="bottom_telemetry_send_failed">%1$s의 설정을 변경할 수 없습니다.</string> + <string name="bottom_telemetry_send_menu">%1$s: 게임 설정에서 IP 127.0.0.1, 포트 %3$d(으)로 %2$s을(를) 켜세요.</string> + <string name="bottom_shots_where">Pictures/DroidDeck에 저장됩니다. Steam 스크린샷도 여기에 표시됩니다.</string> + <string name="bottom_shots_take">스크린샷 찍기</string> + <string name="bottom_shots_saved">스크린샷이 저장되었습니다.</string> + <string name="bottom_shots_failed">스크린샷을 찍을 수 없습니다.</string> + <string name="bottom_shots_none">아직 스크린샷이 없습니다.</string> + <string name="bottom_page_chat">채팅 및 음성</string> + <string name="bottom_chat_why">게임이 메인 화면에서 계속 실행되는 동안 여기에서 Steam 채팅을 읽고 답장하세요. Steam에 로그인된 계정을 사용합니다.</string> + <string name="bottom_chat_not_signed_in">Steam에 아직 공유할 웹 로그인이 없으므로 여기에서 한 번 로그인하세요.</string> + <string name="bottom_chat_stopped">DroidDeck이 백그라운드에 있는 동안 Android가 채팅 페이지를 닫았습니다. DroidDeck으로 돌아오면 다시 열립니다.</string> + <string name="bottom_chat_open">Steam Chat 열기</string> + <string name="bottom_chat_close">채팅 닫기</string> + <string name="bottom_chat_mic_on">마이크 켜짐</string> + <string name="bottom_chat_mic_off">마이크 꺼짐</string> + <string name="bottom_chat_mic_unavailable">이 게임에서는 마이크가 꺼져 있습니다. 대화하려면 DroidDeck의 Steam 설정(오디오)에서 마이크를 켜고 게임을 다시 시작하세요.</string> + <string name="bottom_chat_volume">볼륨 %1$d%%</string> + <string name="bottom_page_telemetry">게임 내 통계</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">배터리</string> + <string name="bottom_telemetry_lap">랩</string> + <string name="bottom_telemetry_position">순위</string> + <string name="bottom_telemetry_this_lap">현재 랩</string> + <string name="bottom_telemetry_last_lap">지난 랩</string> + <string name="bottom_telemetry_fuel">연료</string> + <string name="bottom_telemetry_cargo">화물</string> + <string name="bottom_telemetry_pips">파워 SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">법적 상태</string> + <string name="bottom_telemetry_balance">잔액</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">포트 %1$d에서 데이터를 받고 있지만(%3$d바이트 패킷 %2$d개), 이 페이지가 아직 읽을 수 없는 형식입니다.</string> + <string name="bottom_telemetry_port_busy">다른 프로그램이 이미 포트 %1$s을(를) 사용하고 있어 해당 게임을 여기에 표시할 수 없습니다.</string> <string name="rtinst_removing">Linux 런타임 제거 중</string> <plurals name="rtinst_removing_entries"> @@ -1699,6 +1867,7 @@ <string name="flatpakmgr_not_ready">먼저 Flatpak을 설정하세요</string> <string name="flatpakmgr_starting">시작 중</string> <string name="flatpakmgr_exit_status">Flatpak이 종료되었습니다(상태 %1$d)</string> + <string name="flatpakmgr_wrong_arch">%1$s은(는) DroidDeck이 실행할 수 없는 %2$s용으로 빌드되었습니다. 여기서 Flatpak 앱은 ARM64 또는 x86_64 빌드여야 합니다.</string> <string name="flatpakmgr_installing">%1$s 설치 중</string> <string name="flatpakmgr_updating">%1$s 업데이트 중</string> <string name="flatpakmgr_removing">%1$s 제거 중</string> @@ -1792,6 +1961,7 @@ <string name="adbpair_applying">설정을 적용하는 중…</string> <string name="adbpair_command_failed">무선 디버깅 명령 실패</string> <string name="adbpair_channel_name">무선 디버깅 설정</string> + <string name="adbpair_progress_channel_name">무선 디버깅 설정 진행률</string> <string name="adbpair_channel_description">설정이 열려 있는 동안 무선 디버깅 페어링 코드를 요청</string> <string name="adbpair_title_pair">무선 디버깅 페어링</string> <string name="adbpair_waiting_text">무선 디버깅을 켠 다음 “페어링 코드로 기기 페어링”을 탭하세요.</string> @@ -1900,6 +2070,7 @@ <string name="gpuinfo_not_adreno">Adreno GPU가 아님</string> <string name="gpuinfo_supported">지원됨</string> <string name="gpuinfo_experimental">실험적: 드라이버가 테스트 빌드입니다</string> + <string name="gpuinfo_a850_experimental">실험적 Adreno 850 지원: 호환되는 실험용 디스플레이 및 게임 드라이버가 필요하며, 이 기기에서 검증되지 않았습니다</string> <string name="gpuinfo_below_tested">테스트된 하드웨어(Adreno 725 이상)보다 낮음: 실행되지 않을 수 있습니다</string> <string name="gpuinfo_unsupported">지원되지 않음: DroidDeck에는 Adreno(Snapdragon) GPU가 필요합니다</string> @@ -1996,6 +2167,7 @@ <string name="display_look_filter">%1$s 스케일링을 %2$s(으)로 설정합니다.</string> <string name="display_match_screen">화면에 맞춤(%1$d×%2$d)</string> <string name="display_follow_screen">화면 따라가기(접거나 펼치면 크기 변경)</string> + <string name="display_follow_screen_scaled">배율 %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">기기 세부 정보 표시</string> <string name="device_info_hide">기기 세부 정보 숨기기</string> @@ -2102,6 +2274,13 @@ <string name="stores_resume">재개</string> <string name="stores_refresh">새로 고침</string> <string name="stores_sort">정렬</string> + <string name="setup_rail_labels">사이드바 레이블</string> + <string name="setup_rail_labels_hint">사이드바 아이콘 아래에 이름을 표시합니다. 끄면 사이드바가 더 슬림해집니다.</string> + <string name="library_display">표시</string> + <string name="library_display_larger">카드 크게</string> + <string name="library_display_smaller">카드 작게</string> + <string name="library_display_title">제목 표시</string> + <string name="library_display_size">크기 표시</string> <string name="stores_sort_last_played">최근 플레이</string> <string name="stores_sort_recently_installed">최근 설치</string> <string name="stores_sort_title_asc">제목 A–Z</string> @@ -2228,6 +2407,9 @@ <string name="stores_download_manager">다운로드 관리자</string> <string name="stores_parallel">동시 다운로드 수</string> <string name="stores_install_where">설치 위치</string> + <string name="stores_install_language">게임 언어</string> + <string name="stores_install_language_hint">GOG와 Epic은 이 언어로 설치합니다. 시스템은 앱 언어를 따릅니다.</string> + <string name="stores_install_language_system">시스템</string> <string name="stores_install_title">%1$s 설치:</string> <string name="stores_target_internal">내부 저장 공간</string> <string name="stores_target_free">%1$s 사용 가능</string> @@ -2266,6 +2448,9 @@ <string name="edit_target">대상</string> <string name="edit_start_in">시작 위치</string> <string name="edit_launch_options">실행 옵션</string> + <string name="edit_launch_options_steam_hint">Steam 속성과 공유됩니다. 어느 한쪽에서 바꾸면 양쪽에 모두 반영됩니다.</string> + <string name="edit_launch_options_not_saved">실행 옵션을 Steam에 저장하지 못했습니다. 다시 시도하세요.</string> + <string name="edit_launch_options_desktop">데스크톱 세션에서 Steam이 열려 있을 수 있습니다. Steam 속성에서 실행 옵션을 바꾸거나 먼저 세션을 닫으세요.</string> <string name="edit_artwork">아트워크</string> <string name="edit_other_exe">다른 exe…</string> <string name="edit_remove">제거</string> @@ -2391,6 +2576,7 @@ <string name="setup_download_source_custom">사용자 지정 프리픽스</string> <string name="setup_download_mirror">사이트</string> <string name="setup_download_prefix">프리픽스</string> + <string name="setup_download_proxy">HTTP 프록시</string> <string name="flathub_eyebrow">LINUX 앱</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Linux 데스크톱용 앱으로, 데스크톱에서 엽니다.</string> @@ -2529,6 +2715,22 @@ <string name="glasses_tracking_flat_hint">“자동”에서는 이 2D 게임이 시야에 고정됩니다. 헤드 트래킹을 사용하려면 “디스플레이”에서 “가상 화면”을 선택하세요.</string> <string name="glasses_tracking_sbs_hint">헤드 트래킹은 가상 화면이나 실행 중인 SteamVR 게임에 적용됩니다.</string> <string name="glasses_hardware">장치</string> + <string name="vr_controllers_tab">컨트롤러</string> + <string name="vr_controllers_group">SteamVR 컨트롤러</string> + <string name="vr_controllers_emulate">VR에서의 게임패드</string> + <string name="vr_controllers_emulate_hint">컨트롤러가 대신하는 두 VR 손입니다. 변경 사항은 SteamVR 실행 중에도 즉시 적용됩니다. Joy-Con과 추적된 손은 여전히 해당 쪽을 우선합니다.</string> + <string name="vr_controllers_off">일반 게임패드</string> + <string name="vr_controllers_index">Valve Index 컨트롤러</string> + <string name="vr_controllers_touch">Meta Quest 3 컨트롤러</string> + <string name="vr_controllers_vive">HTC Vive 완드</string> + <string name="vr_controllers_sticks">스틱 시작 동작</string> + <string name="vr_controllers_sticks_hint">VR 중에 두 스틱을 함께 누르면 전환됩니다.</string> + <string name="vr_controllers_sticks_game">게임에서 이동</string> + <string name="vr_controllers_sticks_hands">손 움직이기</string> + <string name="vr_controllers_buttons">버튼</string> + <string name="vr_controllers_buttons_stick">트리거는 트리거, 범퍼는 그립, A/B와 X/Y는 각 손의 페이스 버튼, 스틱 클릭은 썸스틱 클릭이며, Guide는 SteamVR 메뉴를 엽니다. 방향 패드 위아래로 손을 가깝게 또는 멀리 움직입니다.</string> + <string name="vr_controllers_buttons_vive">스틱은 트랙패드가 되며, A/X 또는 스틱 클릭으로 누릅니다. 트리거는 트리거, 범퍼는 그립, Start와 Select는 메뉴이며, Guide는 SteamVR 메뉴를 엽니다.</string> + <string name="vr_controllers_buttons_off">VR 손이 없습니다. 게임패드를 지원하는 게임과 SteamVR 메뉴에서는 평소처럼 컨트롤러를 사용합니다.</string> <string name="glasses_brightness">밝기</string> <string name="glasses_volume">볼륨</string> <string name="glasses_sunblock">선블록</string> @@ -2586,6 +2788,12 @@ <string name="hand_camera_placement">카메라 위치</string> <string name="hand_camera_placement_hint">플레이하기 전에 카메라에 당신이 보이는지 확인하세요.</string> <string name="hand_camera_check">확인</string> + <string name="tracking_pack_title">핸드 트래킹 다운로드</string> + <string name="tracking_pack_hint">핸드 트래킹을 사용하려면 %1$s를 한 번 다운로드해야 합니다.</string> + <string name="tracking_pack_download">다운로드</string> + <string name="tracking_pack_retry">다시 시도</string> + <string name="tracking_pack_downloading">핸드 트래킹 다운로드 중… %1$d%%</string> + <string name="tracking_pack_failed">핸드 트래킹을 다운로드할 수 없습니다. 연결을 확인하고 다시 시도하세요.</string> <string name="hand_camera_check_title">카메라 위치</string> <string name="hand_camera_how_rear">기기를 가슴 높이쯤에서 1.5~2m 떨어진 곳에 세우고, 후면 카메라가 당신을 향하게 하세요. 그런 다음 손을 벌리고 화면 안으로 들어오세요.</string> <string name="hand_camera_how_front">기기를 가슴 높이쯤에서 1.5~2m 떨어진 곳에 세우고, 화면이 당신을 향하게 하세요. 그런 다음 손을 벌리고 화면 안으로 들어오세요.</string> @@ -2657,6 +2865,21 @@ <string name="storage_safe_hint">사용하지 않는 런타임, 잔여물, 오래된 로그</string> <string name="storage_clean_up">정리…</string> <string name="storage_session_running">세션을 중지해야 정리하거나 제거할 수 있습니다. 용량은 계속 표시됩니다.</string> + <string name="storage_default_group">설치 위치</string> + <string name="storage_default_title">기본 저장소</string> + <string name="storage_default_hint">새 스토어 설치는 선택한 위치에 저장됩니다. 기존 게임은 그대로 유지됩니다. Steam 라이브러리는 자체 설정을 따릅니다.</string> + <string name="storage_default_ask">매번 묻기</string> + <string name="storage_default_ask_detail">설치할 때마다 위치 선택</string> + <string name="storage_default_internal">내부 저장소</string> + <string name="storage_default_external">외부 저장소</string> + <string name="storage_default_external_detail">%1$s · %2$s 남음</string> + <string name="storage_default_external_missing">연결되지 않음</string> + <string name="storage_default_folder">폴더 · %1$s</string> + <string name="storage_default_folder_free">%1$s 남음</string> + <string name="storage_default_folder_missing">연결되지 않음</string> + <string name="storage_default_choose_folder">폴더 선택…</string> + <string name="storage_default_choose_folder_detail">SD 카드나 USB 드라이브의 아무 폴더나 사용</string> + <string name="storage_default_note">게임은 선택한 위치 안의 Games 폴더에 저장됩니다. 기존 게임은 이동되지 않습니다.</string> <string name="storage_where">사용 내역</string> <string name="storage_games">Steam 게임</string> <string name="storage_game_data">게임 데이터</string> @@ -2778,6 +3001,9 @@ <string name="storage_data_installed">설치된 게임</string> <string name="storage_data_parts">프리픽스 %1$s · 셰이더 %2$s · 워크숍 %3$s</string> <string name="storage_clear_shaders">셰이더 지우기</string> + <string name="storage_reset_prefix">프리픽스 초기화</string> + <string name="storage_reset_prefix_title">%1$s의 프리픽스를 초기화하시겠습니까?</string> + <string name="storage_reset_prefix_confirm">%2$s에 있는 Wine 프리픽스(%1$s)를 삭제하고 다음 실행 시 다시 만듭니다. 그 안의 저장 파일, 설정 및 설치된 재배포 패키지는 사라지며, Steam Cloud 저장 파일은 계정에 남아 있습니다.</string> <string name="storage_data_leftovers">제거한 게임</string> <string name="storage_steam_app">Steam 앱 %1$d</string> <string name="storage_leftover_unsure_detail">프리픽스에 파일이 남아 있고 로컬 저장 파일이 있을 수 있습니다</string> @@ -2994,6 +3220,117 @@ <string name="spatial_distance_passed">거리 확인이 통과되었습니다.</string> <string name="spatial_model_checksum_error">손 모델 체크섬 불일치</string> <string name="spatial_opencv_load_error">OpenCV를 로드할 수 없습니다.</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Syncthing으로 동기화</string> + <string name="sync_enable_hint">Syncthing-Fork를 기반으로 한 Syncthing 구현으로, DroidDeck 내부 파일 시스템의 파일을 다른 Syncthing 인스턴스와 동기화할 수 있습니다. DroidDeck 내부 파일 시스템에 저장한 파일에만 적용됩니다.</string> + <string name="sync_missing">이 빌드에는 Syncthing이 포함되어 있지 않습니다.</string> + <string name="sync_starting">Syncthing 시작 중</string> + <string name="sync_status_starting">시작 중</string> + <string name="sync_status_up_to_date">최신 상태</string> + <string name="sync_status_syncing">동기화 중</string> + <string name="sync_status_paused">일시 중지됨</string> + <string name="sync_status_pausing">일시 중지 중</string> + <string name="sync_status_resuming">재개 중</string> + <string name="sync_status_attention">확인 필요</string> + <string name="sync_status_failed">Syncthing이 중지됨</string> + <string name="sync_failed_retry">다시 시도</string> + <string name="sync_paused_wifi">Wi-Fi 연결 시까지 일시 중지됨</string> + <string name="sync_paused_game">게임 중 일시 중지됨</string> + <string name="sync_summary">폴더 %1$d개 · 기기 %3$d대 중 %2$d대 연결됨</string> + <string name="sync_left">%1$s 남음</string> + <string name="sync_open_web_ui">웹 UI 열기</string> + <string name="sync_pause">일시 중지</string> + <string name="sync_resume">재개</string> + <string name="sync_running">실행 중</string> + <string name="sync_running_hint">끄면 Syncthing이 완전히 중지됩니다.</string> + <string name="sync_this_device">이 기기</string> + <string name="sync_device_id">기기 ID</string> + <string name="sync_show_qr">QR 코드 표시</string> + <string name="sync_advanced">고급</string> + <string name="sync_advanced_hint">포트, 실행 시점, 초기화</string> + <string name="sync_open">열기</string> + <string name="sync_waiting">확인 대기 중</string> + <string name="sync_pending_device">%1$s에서 연결을 요청합니다</string> + <string name="sync_pending_folder">%1$s에서 “%2$s” 폴더를 공유하려고 합니다</string> + <string name="sync_pending_folder_hint">수락하면 DroidDeck에서 저장할 위치를 선택할 수 있습니다.</string> + <string name="sync_review">웹 UI에서 검토</string> + <string name="sync_folders">폴더</string> + <string name="sync_no_folders">아직 폴더가 없습니다.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">최신 상태</string> + <string name="sync_folder_syncing">동기화 중 %1$d%%</string> + <string name="sync_folder_scanning">스캔 중</string> + <string name="sync_folder_paused">일시 중지됨</string> + <string name="sync_folder_out_of_sync">동기화되지 않음</string> + <string name="sync_folder_errors">파일 %1$d개를 동기화하지 못했습니다</string> + <string name="sync_folder_blocked">차단됨</string> + <string name="sync_folder_blocked_hint">이 폴더는 DroidDeck 저장 공간 밖에 있어서 DroidDeck이 일시 중지했습니다. DroidDeck 밖의 폴더를 동기화하려면 Syncthing-Fork 앱을 사용하세요.</string> + <string name="sync_remove_folder">Syncthing에서 제거</string> + <string name="sync_remove_folder_hint">제거해도 파일은 삭제되지 않습니다.</string> + <string name="sync_devices">기기</string> + <string name="sync_no_devices">아직 기기가 없습니다.</string> + <string name="sync_connected">연결됨</string> + <string name="sync_offline">오프라인</string> + <string name="sync_last_seen">마지막 접속: %1$s</string> + <string name="sync_device_id_title">이 기기의 ID</string> + <string name="sync_device_id_hint">다른 기기의 Syncthing에서 기기를 추가하고 이 코드를 스캔하거나 ID를 붙여넣으세요. 그런 다음 여기 웹 UI에서 수락하세요.</string> + <string name="sync_copy">복사</string> + <string name="sync_share">공유</string> + <string name="sync_done">완료</string> + <string name="sync_off_title">Syncthing을 끄시겠습니까?</string> + <string name="sync_off_body">Syncthing이 지금 중지되며 다시 켤 때까지 중지된 상태로 유지됩니다. 동기화된 파일은 그대로 유지됩니다.</string> + <string name="sync_off_forget">Syncthing 구성도 삭제</string> + <string name="sync_off_forget_hint">이 기기의 ID, 폴더 및 기기를 제거합니다. 다시 켜면 처음부터 시작합니다.</string> + <string name="sync_turn_off">끄기</string> + <string name="sync_ports">포트</string> + <string name="sync_port_sync">동기화</string> + <string name="sync_port_discovery">로컬 탐색</string> + <string name="sync_repick">새 포트 선택</string> + <string name="sync_repick_hint">시작할 때마다 다시 확인합니다.</string> + <string name="sync_repick_button">다시 선택</string> + <string name="sync_reset_group">초기화</string> + <string name="sync_api_key">API 키</string> + <string name="sync_regenerate">다시 생성</string> + <string name="sync_reset">Syncthing 초기화</string> + <string name="sync_reset_hint">새 기기 ID가 생성되고 폴더와 기기가 제거됩니다. DroidDeck 저장 공간의 파일은 유지됩니다.</string> + <string name="sync_reset_button">초기화</string> + <string name="sync_reset_confirm_title">Syncthing을 초기화하시겠습니까?</string> + <string name="sync_running_group">실행</string> + <string name="sync_run">실행</string> + <string name="sync_run_open">DroidDeck이 열려 있는 동안</string> + <string name="sync_run_background">백그라운드에서</string> + <string name="sync_wifi_only">Wi-Fi에서만</string> + <string name="sync_pause_games">게임 중 일시 중지</string> + <string name="sync_logs">로그</string> + <string name="sync_logs_hint">이 세션의 Syncthing 출력</string> + <string name="sync_logs_share">공유</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">먼저 Linux 런타임을 설치하세요.</string> + <string name="sync_accept">수락</string> + <string name="sync_accept_title">“%1$s” 저장 위치</string> + <string name="sync_add_folder">폴더 추가</string> + <string name="sync_add_folder_hint">DroidDeck 저장 공간의 폴더 동기화</string> + <string name="sync_choose">선택</string> + <string name="sync_add">추가</string> + <string name="sync_add_failed">폴더를 추가할 수 없습니다.</string> + <string name="sync_share_with">공유 대상</string> + <string name="sync_share_none">아직 기기가 없습니다. 나중에 웹 UI에서 이 폴더를 공유할 수 있습니다.</string> + <string name="sync_use_folder">이 폴더 사용</string> + <string name="sync_new_folder">새 폴더</string> + <string name="sync_location_home">컨테이너 홈</string> + <string name="sync_location_sync">Sync 폴더</string> + <string name="sync_location_shared">DroidDeck 공유 저장 공간</string> + <string name="sync_location_card">%1$s의 DroidDeck</string> + <string name="sync_location_app">DroidDeck 앱 데이터</string> + <string name="sync_web_path_locked">새 폴더는 DroidDeck의 Sync 폴더에 저장됩니다. 다른 DroidDeck 폴더를 동기화하려면 Syncthing 탭에서 \"폴더 추가\"를 사용하세요.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">새로고침</string> + <string name="sync_not_running">Syncthing이 실행 중이 아닙니다.</string> + <string name="session_end_steam_sigill">Steam이 잘못된 명령어(SIGILL)로 중지되었습니다. CPU 명령어 호환성 문제이거나 클라이언트 충돌일 수 있습니다. 기기 정보와 함께 로그를 공유하세요.</string> + <string name="session_end_steam_try_x64">Steam 설정 → Steam 클라이언트 → x86-64(실험적)를 시도해 볼 수 있습니다. 추가 다운로드가 필요하며 더 느리게 실행될 수 있습니다.</string> + <string name="session_end_vulkan_device">Linux 그래픽 드라이버가 사용 가능한 Vulkan 장치를 찾지 못했습니다. 선택한 Linux GPU 드라이버가 이 GPU를 지원하는지 확인하세요.</string> + <string name="session_end_gpu_unsupported">현재 설정에 이 GPU와 호환되는 Linux Vulkan 드라이버가 없어 세션을 시작할 수 없습니다. Adreno Turnip 드라이버로는 MediaTek/Mali GPU를 지원할 수 없습니다.</string> <string name="glasses_6dof">6DoF 가상 화면</string> <string name="tracking_recovery_look">조명이 밝은 방에서 천천히 주변을 둘러보세요.\n추적 카메라를 가리지 말고 가구처럼 특징이 뚜렷한 곳을 바라보세요.</string> <string name="tracking_recovery_restart_help">아직도 막혔나요? 휴대폰에서: 스마트 안경 → 추적 → 설정 열기 → 진단 표시 → 추적 다시 시작.</string> @@ -3102,6 +3439,12 @@ <string name="epic_client_open">열기</string> <string name="epic_client_install">설치</string> <string name="game_tab_about">정보</string> + <string name="game_resources_browser">브라우저에서 열림</string> + <string name="game_resource_guides">가이드</string> + <string name="game_resource_protondb_detail">Linux / Proton 호환성 보고서</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Steam 계정에 저장 파일이 있는 게임용</string> + <string name="game_resource_search">웹 검색</string> <string name="game_tab_install">설치</string> <string name="game_install_location">위치</string> <string name="game_install_folder">폴더</string> @@ -3118,6 +3461,11 @@ <string name="stores_eyebrow_pass">%1$s 이용 가능</string> <string name="stores_owned_in_library">라이브러리의 보유 게임</string> <string name="library_filter_added">추가됨</string> + <string name="library_filter">필터</string> + <string name="library_filter_installed">설치된 게임만</string> + <string name="library_filter_all_owned">보유한 모든 게임</string> + <string name="library_no_installed_matches">이 필터와 일치하는 설치된 게임이 없습니다.</string> + <string name="library_browse_owned">보유한 게임 둘러보기</string> <string name="game_tab_launch">실행</string> <string name="game_tab_saves_cloud">저장 및 클라우드</string> <string name="game_launch_shortcut">Steam 바로가기</string> @@ -3135,6 +3483,40 @@ <string name="stores_itch_update_replaced">개발자가 이 빌드를 %1$s(으)로 교체했습니다. 업데이트할까요?</string> <string name="xbox_filter_cloud">클라우드</string> <string name="stores_xbox_cloud_settings">클라우드 설정</string> + <string name="integration_title">Steam 연동</string> + <string name="integration_count">%2$d개 중 %1$d개 켜짐</string> + <string name="integration_set_up">설정</string> + <string name="integration_location">위치</string> + <string name="integration_app_info">앱 정보</string> + <string name="integration_wifi">Wi-Fi 이름</string> + <string name="integration_brightness">밝기</string> + <string name="integration_home">DroidDeck을 홈으로</string> + <string name="integration_shortcuts">시스템 키</string> + <string name="integration_wifi_hint">Steam에 네트워크 표시 · 위치 접근 권한 필요, 위치는 추적하지 않음</string> + <string name="integration_wifi_on">Steam에 네트워크가 표시됨</string> + <string name="integration_wifi_location_off">위치가 꺼져 있음</string> + <string name="integration_wifi_denied">위치 거부됨 · 앱 정보에서 허용하세요</string> + <string name="integration_brightness_hint">Steam 슬라이더로 화면 밝기 조절</string> + <string name="integration_home_hint">세션 중 홈 버튼으로 Steam 메뉴 열기</string> + <string name="integration_shortcuts_hint">Alt+Tab, Win 키, 홈 버튼이 세션 안에서 작동합니다</string> + <string name="integration_shortcuts_maybe_restricted">Android에서 회색으로 표시되나요? 앱 정보 → ⋮ → 제한된 설정 허용</string> + <string name="integration_shortcuts_restricted">Android에서 차단됨 · 앱 정보 → ⋮ → 제한된 설정 허용</string> + <string name="integration_shortcuts_service">DroidDeck 시스템 키</string> + <string name="integration_shortcuts_service_description">Alt+Tab, Win 키, 홈 버튼을 Android 대신 사용 중인 DroidDeck 세션에서 작동하게 합니다.</string> + <string name="integration_brightness_needed">설정 → Steam 연동에서 밝기를 켜세요</string> + <string name="setup_gpu_bridge_off">Mali 브리지: 끔</string> + <string name="setup_gpu_bridge_on">Mali 브리지: 켬</string> + <string name="setup_gpu_bridge_detail">%1$s은(는) Adreno가 아닙니다. 실험적 Vulkan 브리지가 켜져 있어 세션이 휴대폰 자체 드라이버로 그립니다. 버그가 있을 수 있으니 세션 로그를 보내 주세요.</string> + <string name="setup_bridge_safe">안전 모드</string> + <string name="setup_bridge_safe_on">안전 모드: 켬</string> + <string name="setup_bridge_safe_off">안전 모드: 끔</string> + <string name="setup_bridge_safe_on_detail">호환성이 가장 높습니다. 새 기기에 권장합니다.</string> + <string name="setup_bridge_safe_off_detail">이 GPU가 검사를 통과한 부분에서 더 빠릅니다.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: 자동</string> + <string name="setup_bridge_dxvk_proton">DXVK: Proton 기본</string> + <string name="setup_bridge_dxvk_auto_detail">이 GPU의 Vulkan이 Proton 기본 DXVK에 너무 오래된 경우 이전 DXVK를 사용합니다.</string> + <string name="setup_bridge_dxvk_proton_detail">이 GPU의 Vulkan이 너무 오래되었을 수 있어도 각 Proton은 자체 DXVK를 유지합니다.</string> <string name="apps_search_hint">앱 검색</string> <string name="apps_no_match">‘%1$s’와(과) 일치하는 앱이 없습니다.</string> <string name="apps_add_widget">위젯 추가</string> @@ -3182,6 +3564,8 @@ <string name="desktop_restore_done_body">추가한 앱이 다시 설치되었습니다.</string> <string name="desktop_restore_failed_title">일부 소프트웨어를 복원하지 못했습니다</string> <string name="desktop_restore_failed_body">~/.cache/droiddeck/apt-restore.log를 확인한 다음 Konsole에서 sudo apt install을 시도하세요.</string> + <string name="gog_full_files">기본 최적화를 사용할 수 없습니다. 다운로드에 완전한 교체 파일이 포함됩니다.</string> + <string name="gog_recover">패치 결과 확인</string> <string name="slow_usb_title">USB 연결이 느립니다</string> <string name="slow_usb_cable">%1$s이(가) %2$s(%3$s Mbps, 약 %4$d MB/s)로 연결되어 게임 로딩이 느립니다. 5 Gbps 이상의 USB 3 케이블을 사용하거나, USB-C 플러그를 뒤집어 꽂거나, 더 빠른 드라이브를 사용하세요.</string> <string name="slow_usb_port">%1$s이(가) %2$s(%3$s Mbps, 약 %4$d MB/s)로 연결되어 있습니다. 이 기기의 USB 포트는 더 빠르게 동작하지 않아 게임 로딩이 느립니다. 내부 저장소나 microSD 카드가 더 빠를 수 있습니다.</string> @@ -3192,4 +3576,52 @@ <string name="steam_import_names_more">%1$s 외 %2$d개</string> <string name="steam_import_now">지금 다시 시작</string> <string name="steam_import_later">나중에</string> + <string name="gog_maintenance">GOG 설치 관리</string> + <string name="gog_check">업데이트 확인</string> + <string name="gog_repair">확인/복구</string> + <string name="gog_patches">오프라인 패치</string> + <string name="gog_refresh">전체 오프라인 설치 프로그램 다운로드</string> + <string name="gog_update">%1$s(으)로 업데이트</string> + <string name="gog_resume">GOG 유지 관리 재개</string> + <string name="gog_open_patch">패치 설치 프로그램 열기</string> + <string name="gog_patch_in_session">Linux 세션에서 패치 설치 프로그램을 완료하거나 취소하세요.</string> + <string name="gog_patch_requirements">설치된 버전과 언어에 맞는 패치를 선택하세요. 지원되는 원본 버전이 목록에 없을 수 있습니다.</string> + <string name="gog_no_patches">GOG에는 이 게임의 독립형 Windows 패치가 없습니다.</string> + <string name="gog_managed_files">수정된 게임 파일이 교체될 수 있습니다.</string> + <string name="gog_patch_installer_note">설치 프로그램이 Linux 세션에서 열립니다.</string> + <string name="gog_download_label">다운로드</string> + <string name="gog_space_label">추가 공간</string> + <string name="gog_space_estimate_label">예상 공간</string> + <string name="gog_repair_action">파일 복구</string> + <string name="gog_refresh_action">설치 새로 고침</string> + <string name="gog_select_patch">선택</string> + <string name="stores_gamejolt_not_owned">Game Jolt 라이브러리에 없습니다</string> + <string name="stores_gamejolt_no_build">이 게임의 Windows 다운로드가 없습니다</string> + <string name="stores_gamejolt_no_exe">다운로드에서 Windows 게임을 찾을 수 없습니다</string> + <string name="stores_gamejolt_no_game">Game Jolt에서 이 게임을 찾을 수 없습니다</string> + <string name="stores_gamejolt_browse_failed">Game Jolt에서 게임을 불러오지 못했습니다</string> + <string name="stores_gamejolt_download_failed">Game Jolt가 HTTP %1$d을(를) 반환했습니다</string> + <string name="stores_gamejolt_pick_failed">Game Jolt에서 다운로드를 불러오지 못했습니다</string> + <string name="stores_gamejolt_build_open">Game Jolt에서 열기</string> + <string name="stores_gamejolt_archive">%1$s 압축 파일은 지원하지 않습니다</string> + <string name="stores_gamejolt_extract_failed">다운로드한 파일의 압축을 풀 수 없습니다(코드 %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt에 연결할 수 없습니다</string> + <string name="stores_gamejolt_download_no_link">Game Jolt에서 다운로드 링크를 제공하지 않았습니다</string> + <string name="stores_gamejolt_section_featured">추천</string> + <string name="stores_gamejolt_section_hot">인기</string> + <string name="stores_gamejolt_section_best">베스트</string> + <string name="stores_gamejolt_section_new">신규</string> + <string name="stores_gamejolt_price_under_30">$30 이하</string> + <string name="stores_gamejolt_os_other">기타</string> + <string name="stores_gamejolt_maturity_everyone">전체 이용가</string> + <string name="stores_gamejolt_maturity_teen">청소년</string> + <string name="stores_gamejolt_maturity_adult">성인</string> + <string name="stores_gamejolt_status_complete">완성</string> + <string name="stores_gamejolt_status_early">앞서 해보기</string> + <string name="stores_gamejolt_partners">파트너 게임</string> + <string name="stores_gamejolt_filter_browser">브라우저</string> + <string name="stores_gamejolt_filter_maturity">연령 등급</string> + <string name="stores_gamejolt_filter_status">상태</string> + <string name="stores_gamejolt_filter_partners">파트너</string> + <string name="stores_gamejolt_followed">팔로우한 게임</string> </resources> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 078b7724e3..4dcdb4e3fc 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Pilihan VKD3D untuk D3D12. nodxr melumpuhkan ray tracing; gunakan hanya untuk permainan yang memerlukannya.</string> <string name="game_env_proton_log">Tetapkan kepada 1 untuk log diagnostik Proton. Pengelogan boleh mengurangkan prestasi dan menggunakan storan.</string> <string name="game_env_wined3d">Tetapkan kepada 1 untuk menggunakan WineD3D berasaskan OpenGL dan bukan DXVK, untuk pengujian keserasian D3D9–11.</string> + <string name="game_env_wined3d_renderer">Pemapar untuk DirectDraw, Direct3D 1-7 dan permainan yang dijalankan dengan WineD3D. Vulkan melangkau laluan OpenGL-pada-Zink dan jauh lebih pantas untuk permainan DirectDraw dan Direct3D 7 lama pada Adreno.</string> + <string name="game_env_dxvk_d3d8">Tetapkan kepada 1 untuk menjalankan Direct3D 8 melalui DXVK dan bukan WineD3D. Lebih pantas dalam ujian Direct3D 8 AIO Graphics Test pada Adreno.</string> <string name="game_env_no_ntsync">Tetapkan kepada 1 untuk mengekalkan permainan ini di luar ntsync (droiddeck-ntsync atau pemacu kernel); ia menggunakan droiddeck-esync jika pek wujud, jika tidak droiddeck-fsync.</string> <string name="game_env_no_esync">Tetapkan kepada 1 untuk mematikan droiddeck-esync bagi permainan ini; ia menggunakan droiddeck-fsync sebagai ganti, atau droiddeck-ntsync jika fsync juga dimatikan.</string> <string name="game_env_no_fsync">Tetapkan kepada 1 untuk mengekalkan permainan ini di luar droiddeck-fsync; ia menggunakan droiddeck-esync jika pek wujud, jika tidak droiddeck-ntsync.</string> <string name="game_env_fsync_first">Tetapkan kepada 1 untuk menjalankan permainan ini pada droiddeck-fsync, atau 0 untuk meletakkan droiddeck-esync dahulu jika pek sepadan dengan Protonnya.</string> <string name="game_env_xalia">Tetapkan kepada 0 untuk melumpuhkan pembantu navigasi pad permainan Proton bagi permainan ini.</string> + <string name="game_env_anticheat_offline">Hidup secara lalai. Memulakan permainan Easy Anti-Cheat tanpa anti-tipunya apabila permainan menyokong main luar talian. Matikan untuk melancarkan melalui Easy Anti-Cheat seperti biasa. Mod dalam talian yang memerlukan Easy Anti-Cheat kekal tidak tersedia.</string> <string name="game_env_hud">Overlay DXVK untuk D3D9–11. fps memaparkan kadar bingkai; nyahtetapkan untuk menyembunyikannya.</string> <string name="game_env_dxvk_config">Tetapan DXVK diasingkan dengan tanda koma bertitik. Binaan terkini menggunakan dxvk.maxFrameRate untuk pengehadan bingkai; lebih baik gunakan pengehad bingkai sesi untuk permainan biasa.</string> + <string name="game_env_cores">Teras CPU untuk permainan ini, seperti 0-4 atau 0,2,4, menggantikan teras permainan sesi. Lebih sedikit teras berjalan lebih sejuk.</string> <string name="game_env_vkd3d_limit">Had kadar bingkai D3D12. 0 melumpuhkan had.</string> <string name="game_env_glthread">Threading OpenGL Mesa. true boleh membantu permainan OpenGL yang terhad oleh CPU; uji bagi setiap permainan.</string> <string name="sync_backend_title">Segerak Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX menjalankan program Linux x86 pada peranti ARM64 ini. Auto menggunakannya apabila program dibina untuk x86.</string> <string name="app_fex_x86">%1$s melalui FEX</string> <string name="app_fex_not_ready">Program ini dibina untuk PC %1$s dan berjalan melalui FEX, yang belum disediakan lagi. Buka Steam sekali semasa anda log masuk: DroidDeck akan memuat turun FEX dan Steam Linux Runtime yang diperlukan, kemudian ini akan dibuka.</string> + <string name="session_proot_missing">proot DroidDeck tidak dapat dimuat turun. Semak sambungan dan cuba lagi. Sesi tidak dimulakan kerana proot sandaran terlalu perlahan untuk bermain.</string> + <string name="session_directaudio_missing">DirectAudio tidak dapat dimuat turun, jadi audio permainan menggunakan laluan yang lebih perlahan untuk sesi ini.</string> <string name="session_end_program">Program ini</string> <string name="session_end_steam_download">Tidak dapat memuat turun klien Steam. Rangkaian atau VPN anda mungkin menyekat pelayan Steam; semak sambungan dan cuba lagi.</string> <string name="session_end_steam_setup">Tidak dapat menyediakan klien Steam. Semak sambungan dan ruang storan kosong, kemudian cuba lagi.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Pengawal Xbox 360</string> <string name="mode_controller_note">Deck: butang Quick Access dan giro. Steam Controller: sama, dengan grip sense pada butang belakang. DualShock 4 dan DualSense: giro, dan trackpad sebagai pad sentuhnya. Xbox 360: buka Quick Access dengan Guide+A.</string> <string name="mode_back">Kembali</string> + <string name="back_hold">Tahan Kembali untuk pintasan Steam</string> + <string name="back_hold_hint">Menahan Kembali membuka Akses Pantas atau membuat kombinasi Steam dengan butang lain. Matikan untuk mengabaikan Kembali yang ditahan; ketik dan ketik dua kali masih berfungsi.</string> + <string name="back_native_qam_hint">Tahan Kembali selama 700 ms, atau tahan Kembali dan tekan butang lain untuk pintasan Steam.</string> + <string name="back_double_tap_window">Tempoh ketik dua kali</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Benarkan kawalan kecerahan</string> + <string name="brightness_permission_text">Sediakan kawalan kecerahan dalam DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sesi</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Lambatkan penjedaan latar belakang semasa Steam aktif memuat turun.</string> <string name="mode_suspend_note">Auto menjeda di latar belakang dan menyambung semula apabila dipaparkan. Manual menunggu Sambung. Jangan sekali-kali terus berjalan.</string> <string name="mode_startup">Permulaan</string> - <string name="mode_steam_startup">Mulakan Steam bersama DroidDeck</string> - <string name="mode_steam_startup_hint">Membuka sesi Steam apabila DroidDeck dilancarkan.</string> + <string name="mode_startup_session">Buka semasa pelancaran</string> + <string name="mode_startup_session_hint">Memulakan sesi ini apabila DroidDeck dilancarkan.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Menyemak keluaran…</string> <string name="mode_decky_ready">Sedia untuk memasang %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Terkini · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Pasang yang terbaharu</string> + <string name="decky_channel">Saluran Kemas Kini</string> + <string name="decky_channel_hint">Keluaran Decky Loader yang hendak dipasang. Pengemas kini Decky sendiri menggunakan saluran yang sama.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Prakeluaran</string> + <string name="decky_channel_testing">Pengujian</string> + <string name="decky_channel_failed">Tidak dapat menyimpan saluran kemas kini Decky</string> <string name="mode_decky_on">Bermula bersama Steam. Semasa dihidupkan, apl lain pada peranti ini mungkin boleh mengawal Steam.</string> <string name="mode_decky_off">Mati. Port debug jauh Steam kekal tertutup.</string> <string name="mode_decky_remove_title">Nyahpasang Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Klien</string> <string name="mode_mangoapp">Overlay prestasi</string> <string name="mode_mangoapp_hint">Matikan jika permainan ranap atau skrin hitam dalam mod Deck. Berkuat kuasa pada sesi seterusnya.</string> + <string name="mode_return_after_game">Kembali ke DroidDeck selepas permainan</string> + <string name="mode_return_after_game_hint">Apabila permainan yang anda mulakan dari DroidDeck atau pelancar lain ditutup, Steam keluar dengan bersih (simpanan awan selesai dahulu) dan anda kembali ke sana. Mati: kekal dalam Steam.</string> + <string name="mode_shader_precache">Pra-cache shader</string> + <string name="mode_shader_precache_hint">Steam memuat turun shader yang telah dibina untuk permainan anda dan memprosesnya di latar belakang, jadi permainan kurang tersekat-sekat. Mati menjimatkan data, storan dan bateri; permainan membina shader semasa dimainkan. Tetapan yang sama seperti Downloads > Shader Pre-Caching dalam Steam. Berkuat kuasa pada sesi seterusnya.</string> <string name="mode_steam_repair">Baik pulih klien Steam</string> <string name="mode_steam_repair_hint">Memuat turun semula klien Steam pada permulaan Steam seterusnya. Gunakan jika Steam tersekat pada skrin pemuatannya. Permainan, log masuk dan tetapan dikekalkan.</string> <string name="mode_steam_repair_queued">Klien Steam akan dimuat turun semula pada permulaan Steam seterusnya.</string> @@ -389,6 +412,8 @@ <string name="mode_directaudio_hint">Memintas PulseAudio untuk kependaman yang lebih rendah.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Untuk sembang suara.</string> + <string name="drawer_mic_hint">Hidupkan atau matikan tangkapan mikrofon untuk sesi ini.</string> + <string name="drawer_mic_failed">Tidak dapat menukar mikrofon. Sila cuba lagi.</string> <string name="mode_network">Rangkaian</string> <string name="mode_wifi_discovery">Penemuan Wi-Fi</string> <string name="mode_wifi_discovery_hint">Tunjukkan nama Wi-Fi dan rangkaian berdekatan dalam Steam.</string> @@ -549,6 +574,16 @@ <string name="perf_gsrealtime">gamescope: baris gilir GPU masa nyata</string> <string name="perf_gsrealtime_hint">Mengutamakan kerja GPU compositor. Boleh melicinkan rentak bingkai dengan sedikit kos kepada permainan.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memori</string> + <string name="perf_cap_off">Mati</string> + <string name="perf_cap_auto">Lalai pemacu</string> + <string name="perf_zram_client">Mampatkan Steam semasa permainan berjalan</string> + <string name="perf_zram_client_hint">20 s selepas permainan bermula, klien Steam dimampatkan ke dalam zRAM untuk memberi permainan lebih banyak memori, dan dibaca semula apabila permainan ditutup. Matikan ini jika sesi tertutup sejurus selepas permainan bermula. Had RAM di atas masih memampatkan Steam apabila sesi melebihinya.</string> + <string name="perf_ram_cap">Had RAM</string> + <string name="perf_ram_cap_hint">Berkuat kuasa semasa klien Steam berjalan, dalam mod Steam atau dari desktop. Apabila sesi menggunakan lebih daripada ini, Steam dan kemudian proses lain sesi yang disokong dimampatkan ke dalam zRAM. Had lembut: tiada apa yang ditutup, tetapi permainan mungkin tersekat-sekat semasa halaman dibaca semula.</string> + <string name="perf_ram_cap_unavailable">Memerlukan swap zRAM, yang tiada pada peranti ini.</string> + <string name="perf_vram_cap">Had VRAM</string> + <string name="perf_vram_cap_hint">Memori video yang dilaporkan DXVK kepada permainan Direct3D, supaya ia memperuntukkan tekstur untuk jumlah yang lebih kecil. Tetapan DXVK permainan itu sendiri tetap diutamakan. Berkuat kuasa pada sesi seterusnya.</string> <string name="perf_gpuclock">Kekalkan GPU pada kelajuan tertinggi</string> <string name="perf_gpuclock_hint">Adreno sahaja. Kurang tersekat-sekat, lebih penggunaan bateri dan haba.</string> <string name="perf_fixes">Pembetulan sesi</string> @@ -567,6 +602,8 @@ <string name="perf_fastpath">Laluan pantas proot</string> <string name="perf_fastpath_needs_seccomp">Memerlukan penapis seccomp proot.</string> <string name="perf_fastpath_hint">Carian fail lebih pantas dan kurang tersekat-sekat. Matikan jika sesuatu program tidak dapat mencari failnya.</string> + <string name="perf_cursor_composite">Lukis kursor di dalam gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope melukis penuding sendiri dan bukan menyerahkannya kepada Android. Hidupkan untuk kursor yang dikawal pengawal. Mati lebih pantas pada telefon. Berkuat kuasa pada sesi seterusnya.</string> <string name="perf_identity">Identiti sesi</string> <string name="perf_hostname">Nama hos</string> <string name="perf_hostname_hint">Nama yang dilihat Steam untuk peranti ini. Kosongkan untuk memulihkan %1$s.</string> @@ -581,6 +618,8 @@ <string name="driver_delete_plain">Failnya dialih keluar daripada apl.</string> <string name="driver_delete_in_use">Failnya dialih keluar. Ia sedang digunakan, jadi lalai mengambil alih.</string> <string name="drawer_page_display">Paparan</string> + <string name="drawer_frame_limit">Had bingkai</string> + <string name="drawer_frame_limit_note">Mengehadkan permainan ini. Paparan bertukar kepada kadar segar semula yang boleh dibahagi sama rata dengan had jika ada; had lain mungkin kelihatan tidak sekata. Permainan Steam menggunakan Frame Limit Steam dalam menu Akses Pantas.</string> <string name="drawer_page_effects">Kesan</string> <string name="drawer_page_controls">Kawalan</string> <string name="drawer_page_components">Komponen</string> @@ -612,8 +651,11 @@ <string name="hud_size_pill">Pil</string> <string name="hud_size_minimal">Minimal</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Jalur</string> <string name="hud_locked">Kunci di tempat</string> <string name="hud_locked_hint">Seret HUD untuk mengalihkannya; tekan lama untuk mengunci atau membuka kuncinya. Semasa dikunci, kawalan skrin di bawahnya masih berfungsi.</string> + <string name="hud_snap">Lekap ke sisi</string> + <string name="hud_snap_hint">Lepaskan HUD dan ia akan beralih ke sisi skrin yang lebih dekat. Kuis pantas melemparkannya ke arah itu.</string> <string name="hud_group_look">Rupa</string> <string name="hud_scale">Saiz pada skrin</string> <string name="hud_color_soft">Lembut</string> @@ -662,7 +704,6 @@ <string name="hud_export_failed">Tidak dapat menyimpan laporan HUD.</string> <string name="hud_reset">Set semula tetapan HUD</string> <string name="hud_reset_button">Set semula</string> - <string name="hud_credit">FusionHUD oleh The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Mod penskalaan</string> <string name="drawer_scaling_sharpness">Ketajaman penskalaan</string> <string name="drawer_effects">Kesan skrin</string> @@ -697,11 +738,17 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Papan kekunci</string> <string name="drawer_latency">Kependaman</string> + <string name="drawer_low_latency">Mod kependaman rendah</string> + <string name="drawer_low_latency_hint">Meningkatkan penggunaan CPU dan bateri</string> <string name="drawer_low_latency_controller">Pengawal kependaman rendah</string> <string name="drawer_low_latency_controller_hint">Pengawal melapor pada 1000 Hz dan bukan 250 Hz. Sedikit lebih banyak CPU.</string> <string name="drawer_low_latency_touch">Sentuh kependaman rendah</string> <string name="drawer_low_latency_touch_hint">Sentuhan melangkau pengumpulan bingkai, jadi kawalan sentuh Steam berjalan pada 1000 Hz. Sedikit lebih banyak CPU.</string> <string name="drawer_evdev_mouse">Saluran tetikus mentah</string> + <string name="drawer_relative_mouse">Tetikus relatif</string> + <string name="drawer_relative_mouse_auto">Automatik</string> + <string name="drawer_relative_mouse_on">Hidup</string> + <string name="drawer_relative_mouse_off">Mati</string> <string name="drawer_direct_cursor">Kursor</string> <string name="drawer_pc_keyboard">Papan kekunci PC</string> <string name="drawer_android_keyboard">Android</string> @@ -788,6 +835,10 @@ <string name="setup_session">Sesi</string> <string name="setup_logs">Log sesi</string> <string name="setup_logs_hint">Disimpan selepas setiap sesi</string> + <string name="setup_game_debug_logs">Log nyahpepijat permainan</string> + <string name="setup_game_debug_logs_hint">Sertakan diagnostik Proton, Wine dan grafik pada pelancaran permainan seterusnya. Boleh mengurangkan prestasi dan menggunakan lebih banyak storan.</string> + <string name="setup_game_debug_logs_restart">Mulakan semula sesi ini untuk menyimpan log nyahpepijat permainan</string> + <string name="setup_logging_update_failed">Tidak dapat mengemas kini pengelogan. Semak suis dan cuba lagi.</string> <string name="setup_agent_commands">Alatan penyahpepijatan</string> <string name="setup_latest_logs">Log sesi terkini</string> <string name="setup_saved_logs">Log sesi tersimpan</string> @@ -819,20 +870,22 @@ <string name="setup_home">Gunakan sebagai skrin Utama</string> <string name="setup_home_on">DroidDeck boleh menjadi apl Utama</string> <string name="setup_home_off">DroidDeck tidak sekali-kali ditawarkan sebagai apl Utama</string> + <string name="setup_home_game_space_first">Dalam Tambah Permainan, tetapkan DroidDeck kepada Sertakan</string> <string name="setup_orientation">Orientasi</string> + <string name="setup_launcher_orientation">Orientasi pelancar</string> + <string name="setup_launcher_orientation_auto">Ikut putaran peranti</string> + <string name="setup_orientation_portrait">Potret</string> + <string name="setup_session_orientation">Orientasi sesi</string> + <string name="setup_session_orientation_hint">Berkuat kuasa pada Steam, permainan, desktop dan editor pengawal. Pratetap resolusi berputar bersama sesi; lebar dan tinggi tersuai kekal seperti yang dimasukkan.</string> <string name="setup_orientation_auto">Lanskap automatik</string> <string name="setup_orientation_landscape">Lanskap</string> <string name="setup_orientation_reverse">Lanskap songsang</string> <string name="setup_fullscreen">Skrin penuh</string> <string name="setup_fullscreen_on">Menyembunyikan bar status dan navigasi Android</string> <string name="setup_fullscreen_off">Memaparkan bar status dan navigasi Android</string> - <string name="setup_dual_screen">Dwi skrin</string> - <string name="setup_dual_screen_hint">Automatik menggunakan skrin kedua pada peranti pegang tangan yang mempunyai skrin terbina dalam. Hidup menggunakan sebarang paparan kedua. Mati mengekalkan semuanya pada satu skrin.</string> <string name="setup_dual_screen_auto">Automatik</string> <string name="setup_dual_screen_on">Hidup</string> <string name="setup_dual_screen_off">Mati</string> - <string name="setup_dual_screen_menu">Menu skrin bawah</string> - <string name="setup_dual_screen_menu_hint">Memindahkan bahagian dan menu dalam permainan ke skrin kedua dan menaip di sana, supaya skrin atas kekal dengan paparan penuh. L2 dan R2 menukar bahagian.</string> <string name="setup_dual_screen_controls">Kawalan skrin bawah dalam permainan</string> <string name="setup_dual_screen_controls_hint">Membuka pad jejak dan papan kekunci pada skrin kedua apabila sesi bermula.</string> <string name="dual_typing_title">Menaip untuk skrin atas</string> @@ -981,6 +1034,14 @@ <string name="gate_step1">Buka Tetapan → Pilihan pembangun → Debugging Wayarles dan hidupkannya</string> <string name="gate_step2">Ketik “Gandingkan peranti dengan kod gandingan”</string> <string name="gate_step3">Taip kod itu ke dalam pemberitahuan DroidDeck</string> + <string name="pairguide_build_number">Dalam Perihal telefon, ketik Nombor binaan 7 kali</string> + <string name="pairguide_wireless">Hidupkan Penyahpepijatan wayarles</string> + <string name="pairguide_pair">Buka Penyahpepijatan wayarles, kemudian ketik “Gandingkan peranti dengan kod gandingan”</string> + <string name="pairguide_child_process">Hidupkan “Lumpuhkan sekatan proses anak”</string> + <string name="pairguide_row_child_process">Lumpuhkan sekatan proses anak</string> + <string name="pairguide_row_build_number">Nombor binaan</string> + <string name="pairguide_row_wireless">Penyahpepijatan wayarles</string> + <string name="pairguide_row_pair">Gandingkan peranti dengan kod gandingan</string> <string name="gate_waiting">Menunggu tetingkap timbul gandingan…</string> <string name="gate_code_needed">Tetingkap timbul dijumpai. Masukkan kodnya dalam pemberitahuan.</string> <string name="gate_status">Status</string> @@ -1119,7 +1180,6 @@ <string name="games_never_played">Belum pernah dimainkan</string> <string name="games_runtime_busy_percent">Masa jalan sibuk · %1$d%%</string> <string name="games_runtime_busy">Masa jalan sibuk</string> - <string name="games_runtime_first_play">Masa jalan dipasang pada Main pertama</string> <string name="games_runtime_update">Kemas kini masa jalan tersedia</string> <string name="games_runtime_ready">● Masa jalan sedia</string> <string name="games_internal">Storan dalaman</string> @@ -1136,6 +1196,9 @@ <string name="gpu_hide_other">Sembunyikan pemacu untuk GPU lain</string> <string name="gpu_show_other">Papar pemacu untuk GPU lain</string> <string name="gpu_advanced">Lanjutan</string> + <string name="gpu_ubwc_title">Keserasian UBWC</string> + <string name="gpu_ubwc_hint">Cuba Hidup atau Mati jika Steam atau Android memaparkan jalur atau kelipan. Berkuat kuasa pada kedua-dua pemacu selepas DroidDeck dimulakan semula.</string> + <string name="gpu_ubwc_restart">Mulakan semula DroidDeck untuk menggunakannya.</string> <string name="gpu_set_with_display">Ditetapkan bersama pemacu paparan: %1$s membawa kedua-duanya.</string> <string name="gpu_set_with_runtime">Ditetapkan bersama pemacu masa jalan: %1$s membawa kedua-duanya.</string> <string name="gpu_runtime_hint">Digunakan oleh permainan dan desktop.</string> @@ -1244,10 +1307,15 @@ <string name="pip_auto">Masuk ke PiP secara automatik</string> <string name="unfolded_controls">Kawalan pada skrin terbuka</string> <string name="unfolded_controls_hint">Terbuka, permainan terletak di atas trackpad dan pemegang belakang Steam Deck. Dilipat, permainan menjadi skrin penuh.</string> + <string name="unfolded_controls_with_controller">Kekalkan dengan pengawal</string> + <string name="unfolded_controls_with_controller_hint">Juga paparkan kawalan sentuh ini semasa pengawal disambungkan.</string> <string name="pip_suspended">Digantung</string> <string name="pip_not_ready">Gambar dalam gambar tersedia sebaik sahaja sesi sedia.</string> <string name="pip_permission">Benarkan gambar dalam gambar untuk DroidDeck dalam tetapan Android.</string> <string name="pip_unavailable">Android tidak dapat membuka gambar dalam gambar.</string> + <string name="game_more">Lagi</string> + <string name="game_edit_art">Sunting seni</string> + <string name="stores_in_steam_label">Dalam Steam</string> <string name="game_shortcut">Pintasan</string> <string name="game_shortcut_add">Tambah ke skrin utama</string> <string name="game_shortcut_choose">Pilih permainan</string> @@ -1271,6 +1339,10 @@ <string name="main_wait_runtime">Tunggu operasi masa jalan selesai</string> <string name="main_wait_proton_install">Tunggu pemasangan alat keserasian selesai</string> + <string name="load_compat_title">Menyediakan alat keserasian</string> + <string name="load_compat_wait">Menunggu persediaan keserasian selesai</string> + <string name="load_compat_hint">Sesi anda akan bermula apabila persediaan selesai.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Tunggu pemasangan apl desktop selesai</string> <string name="main_wait_install_game">Tunggu pemasangan selesai sebelum melancarkan permainan</string> <string name="main_saves_close_session">Tutup sesi Steam dahulu, supaya permainan tidak dapat menyimpan di atas import</string> @@ -1303,6 +1375,9 @@ <string name="main_install_anyway">Pasang juga</string> <string name="main_remove_runtime_title">Alih keluar masa jalan Linux</string> <string name="main_remove_runtime_text">Ini memadam masa jalan, klien Steam di dalamnya, dan setiap permainan yang dipasang di sana.</string> + <string name="runtime_actions_title">Masa jalan Linux</string> + <string name="runtime_actions_text">Baik pulih memasang semula fail sistem masa jalan dan mengekalkan Steam, permainan dan tetapan anda. Tambahan seperti desktop dipasang semula apabila anda menggunakannya nanti. Alih keluar memadam segala-galanya.</string> + <string name="runtime_repair">Baik pulih masa jalan</string> <string name="main_applied">Digunakan: %1$s</string> <string name="android_app_open_failed_primary">Tidak dapat membuka %1$s pada skrin utama</string> <string name="android_app_open_failed_on">Tidak dapat membuka %1$s pada %2$s</string> @@ -1429,6 +1504,10 @@ <string name="session_runtime_catalog_unreachable">Tidak dapat menghubungi katalog masa jalan. Semak sambungan dan tekan Main semula.</string> <string name="session_runtime_install_failed">Masa jalan Linux tidak berjaya dipasang. Semak masa jalan dalam Persediaan dan tekan Main semula.</string> <string name="session_desktop_install_failed">Desktop tidak berjaya dipasang (%1$s). Semak sambungan dan tekan Desktop semula.</string> + <string name="session_package_resume_failed">Pemasangan yang terganggu tidak dapat diselesaikan (%1$s). Semak sambungan dan ruang, kemudian cuba lagi.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Masa jalan Linux rosak: %1$d pautan pustaka menghala ke fail yang tiada (%2$s dan lain-lain), biasanya selepas pemasangan terganggu. Baik pulih mengekalkan permainan dan tetapan anda.</item> + </plurals> <string name="session_ended_named">%1$s terhenti secara tidak dijangka. Kongsi log dengan laporan pepijat, atau cuba lagi.</string> <string name="session_ended_program">Program terhenti secara tidak dijangka. Kongsi log dengan laporan pepijat, atau cuba lagi.</string> <string name="session_ended_desktop">Desktop terhenti secara tidak dijangka. Kongsi log dengan laporan pepijat, atau cuba lagi.</string> @@ -1442,6 +1521,12 @@ <string name="mode_decky_plugins_hint">Pasang ZIP pemalam untuk sesi Steam seterusnya.</string> <string name="mode_decky_plugin_downloading">Memuat turun…</string> <string name="mode_decky_plugin_install_zip">Pasang daripada ZIP</string> + <string name="decky_zip_warning_title">Pemasangan Pemalam Pihak Ketiga</string> + <string name="decky_zip_warning_text">Pasukan Decky Loader belum menyemak pemalam ini. Ia mungkin mengandungi perisian hasad, seperti perisian untuk mencuri akaun Steam anda atau merosakkan peranti anda. Dengan memasang pemalam ini, anda bersetuju bahawa anda menanggung semua risiko terhadap peranti anda.</string> + <string name="decky_zip_warning_continue">Teruskan</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">Sila tunggu %1$d saat</item> + </plurals> <string name="store_cat_games">Permainan</string> <string name="store_cat_audio_video">Audio & Video</string> <string name="store_cat_graphics">Grafik</string> @@ -1598,6 +1683,8 @@ <string name="fm_accept">Terima</string> <string name="fm_decline">Tolak</string> <string name="fm_drive_not_readable">%1$s dilekapkan tetapi tidak dapat dibaca sekarang</string> + <string name="fm_drive_access_title">Benarkan akses kepada %1$s</string> + <string name="fm_drive_access_text">Android membenarkan DroidDeck melihat pemacu ini tetapi tidak membacanya. Hidupkan Akses semua fail untuk DroidDeck, kemudian kembali.</string> <string name="fm_list_view">Paparan senarai</string> <string name="fm_grid_view">Paparan grid</string> <string name="fm_search">Cari</string> @@ -1668,6 +1755,89 @@ <string name="second_mode_keyboard_trackpad">Papan kekunci + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Pemegang Deck + trackpad</string> + <string name="second_mode_dashboard">Papan pemuka</string> + <string name="bottom_dashboard_empty">Belum ada apa-apa untuk dipaparkan di sini.</string> + <string name="bottom_page_downloads">Muat turun</string> + <string name="bottom_downloads_none">Tiada muat turun yang sedang berjalan.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Memuat turun cache shader</string> + <string name="bottom_downloads_paused">Dijeda</string> + <string name="bottom_downloads_queued">Menunggu untuk bermula</string> + <string name="bottom_page_notifications">Pemberitahuan</string> + <string name="bottom_notifications_listener">Skrin bawah DroidDeck</string> + <string name="bottom_notifications_why">Paparkan mesej dan pemberitahuan lain di sini semasa anda bermain. Ia hanya kekal pada skrin ini dan tidak disimpan. Android bertanya sekali sahaja: halaman akses pemberitahuannya dibuka pada skrin ini; hidupkan DroidDeck di sana dan halaman ini akan kembali dengan sendirinya.</string> + <string name="bottom_notifications_allow">Benarkan akses pemberitahuan</string> + <string name="bottom_notifications_none">Tiada pemberitahuan.</string> + <string name="bottom_notifications_count">%1$d pemberitahuan</string> + <string name="bottom_notifications_clear">Kosongkan</string> + <string name="bottom_page_screenshots">Tangkapan skrin</string> + <string name="stats_fps_needs_hud">FPS memerlukan HUD dihidupkan</string> + <string name="stats_speed">Kelajuan</string> + <string name="stats_pedals">Pedal</string> + <string name="stats_gforce">Daya G</string> + <string name="stats_timing">Masa</string> + <string name="stats_best_lap">Pusingan terbaik</string> + <string name="stats_tires">Tayar °C</string> + <string name="stats_trace">Pendikit dan brek, 10 s terakhir</string> + <string name="stats_speed_chart">Kelajuan, %1$s</string> + <string name="stats_gear">Gear</string> + <string name="stats_steam_client_arm">Klien Steam ARM</string> + <string name="stats_steam_client_x86">Klien Steam x86</string> + <string name="stats_throttle">Pendikit</string> + <string name="stats_brake">Brek</string> + <string name="stats_lights">Lampu penunjuk</string> + <string name="stats_lamp_shift">Tukar gear</string> + <string name="stats_lamp_handbrake">Brek tangan</string> + <string name="stats_lamp_pit">Pengehad pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Enjin %1$s °C</string> + <string name="stats_oil_temp">Minyak %1$s °C</string> + <string name="stats_power">Pengagih kuasa</string> + <string name="stats_fuel_t">Bahan api, t</string> + <string name="stats_fuel_main">Utama %1$s t</string> + <string name="stats_fuel_reserve">Simpanan %1$s t</string> + <string name="bottom_telemetry_send_title">Hantar data papan pemuka</string> + <string name="bottom_telemetry_send_auto">Automatik</string> + <string name="bottom_telemetry_send_auto_hint">Menghidupkannya untuk setiap permainan yang disenaraikan di sini, termasuk permainan yang ditemui kemudian. Permainan yang anda matikan kekal mati.</string> + <string name="bottom_telemetry_send_note">Ini menukar tetapan output data permainan itu sendiri. Ia berkuat kuasa apabila permainan dimulakan seterusnya; mematikannya memulihkan tetapan lama.</string> + <string name="bottom_telemetry_send_close">Tutup %1$s untuk menukar ini.</string> + <string name="bottom_telemetry_send_failed">Tidak dapat menukar tetapan %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: hidupkan %2$s dalam tetapan permainan dengan IP 127.0.0.1 dan port %3$d.</string> + <string name="bottom_shots_where">Disimpan ke Pictures/DroidDeck. Tangkapan skrin Steam juga dipaparkan di sini.</string> + <string name="bottom_shots_take">Ambil tangkapan skrin</string> + <string name="bottom_shots_saved">Tangkapan skrin disimpan.</string> + <string name="bottom_shots_failed">Tidak dapat mengambil tangkapan skrin.</string> + <string name="bottom_shots_none">Belum ada tangkapan skrin.</string> + <string name="bottom_page_chat">Sembang & suara</string> + <string name="bottom_chat_why">Baca dan balas sembang Steam di sini sementara permainan terus berjalan pada skrin utama. Ia menggunakan akaun yang digunakan untuk log masuk ke Steam.</string> + <string name="bottom_chat_not_signed_in">Steam belum mempunyai log masuk web untuk dikongsi, jadi log masuk di sini sekali.</string> + <string name="bottom_chat_stopped">Android menutup halaman sembang semasa DroidDeck berada di latar belakang. Ia dibuka semula apabila anda kembali ke DroidDeck.</string> + <string name="bottom_chat_open">Buka Steam Chat</string> + <string name="bottom_chat_close">Tutup sembang</string> + <string name="bottom_chat_mic_on">Mikrofon hidup</string> + <string name="bottom_chat_mic_off">Mikrofon mati</string> + <string name="bottom_chat_mic_unavailable">Mikrofon dimatikan untuk permainan ini. Untuk bercakap, hidupkan Mikrofon dalam tetapan Steam DroidDeck (Audio) dan mulakan permainan semula.</string> + <string name="bottom_chat_volume">Kelantangan %1$d%%</string> + <string name="bottom_page_telemetry">Statistik dalam permainan</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Bateri</string> + <string name="bottom_telemetry_lap">Pusingan</string> + <string name="bottom_telemetry_position">Kedudukan</string> + <string name="bottom_telemetry_this_lap">Pusingan ini</string> + <string name="bottom_telemetry_last_lap">Pusingan terakhir</string> + <string name="bottom_telemetry_fuel">Bahan api</string> + <string name="bottom_telemetry_cargo">Kargo</string> + <string name="bottom_telemetry_pips">Pip SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Status undang-undang</string> + <string name="bottom_telemetry_balance">Baki</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Port %1$d menerima data (%2$d paket bersaiz %3$d bait), tetapi dalam format yang belum dapat dibaca oleh halaman ini.</string> + <string name="bottom_telemetry_port_busy">Program lain sudah menggunakan port %1$s, jadi permainan itu tidak dapat dipaparkan di sini.</string> <string name="rtinst_removing">Mengalih keluar masa jalan Linux</string> <plurals name="rtinst_removing_entries"> @@ -1697,6 +1867,7 @@ <string name="flatpakmgr_not_ready">Sediakan Flatpak dahulu</string> <string name="flatpakmgr_starting">Memulakan</string> <string name="flatpakmgr_exit_status">Flatpak keluar dengan status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s dibina untuk %2$s, yang tidak dapat dijalankan oleh DroidDeck. Apl Flatpak di sini memerlukan binaan ARM64 atau x86_64.</string> <string name="flatpakmgr_installing">Memasang %1$s</string> <string name="flatpakmgr_updating">Mengemas kini %1$s</string> <string name="flatpakmgr_removing">Mengalih keluar %1$s</string> @@ -1790,6 +1961,7 @@ <string name="adbpair_applying">Menggunakan tetapan…</string> <string name="adbpair_command_failed">Arahan Debugging Wayarles gagal</string> <string name="adbpair_channel_name">Persediaan Debugging Wayarles</string> + <string name="adbpair_progress_channel_name">Kemajuan persediaan Penyahpepijatan wayarles</string> <string name="adbpair_channel_description">Meminta kod gandingan Debugging Wayarles semasa Tetapan dibuka</string> <string name="adbpair_title_pair">Gandingkan Debugging Wayarles</string> <string name="adbpair_waiting_text">Hidupkan Debugging Wayarles, kemudian ketik “Gandingkan peranti dengan kod gandingan”.</string> @@ -1898,6 +2070,7 @@ <string name="gpuinfo_not_adreno">Bukan GPU Adreno</string> <string name="gpuinfo_supported">Disokong</string> <string name="gpuinfo_experimental">Eksperimen: pemacunya ialah binaan ujian</string> + <string name="gpuinfo_a850_experimental">Sokongan eksperimen Adreno 850: memerlukan pemacu paparan dan permainan eksperimen yang serasi; belum disahkan pada peranti ini</string> <string name="gpuinfo_below_tested">Di bawah perkakasan yang diuji (Adreno 725 dan lebih baharu): mungkin tidak dapat berjalan</string> <string name="gpuinfo_unsupported">Tidak disokong: DroidDeck memerlukan GPU Adreno (Snapdragon)</string> @@ -1994,6 +2167,7 @@ <string name="display_look_filter">%1$s Menetapkan penskalaan ke %2$s.</string> <string name="display_match_screen">Sepadan skrin (%1$d×%2$d)</string> <string name="display_follow_screen">Ikut skrin (mengubah saiz apabila dilipat atau dibuka)</string> + <string name="display_follow_screen_scaled">Diskalakan %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Papar butiran peranti</string> <string name="device_info_hide">Sembunyikan butiran peranti</string> @@ -2100,6 +2274,13 @@ <string name="stores_resume">Sambung</string> <string name="stores_refresh">Segar semula</string> <string name="stores_sort">Isih</string> + <string name="setup_rail_labels">Label bar sisi</string> + <string name="setup_rail_labels_hint">Paparkan nama di bawah ikon bar sisi. Matikan untuk bar sisi yang lebih ramping.</string> + <string name="library_display">Paparan</string> + <string name="library_display_larger">Kad lebih besar</string> + <string name="library_display_smaller">Kad lebih kecil</string> + <string name="library_display_title">Paparkan tajuk</string> + <string name="library_display_size">Paparkan saiz</string> <string name="stores_sort_last_played">Baru dimainkan</string> <string name="stores_sort_recently_installed">Baru dipasang</string> <string name="stores_sort_title_asc">Tajuk A–Z</string> @@ -2226,6 +2407,9 @@ <string name="stores_download_manager">Pengurus muat turun</string> <string name="stores_parallel">Muat turun pada satu masa</string> <string name="stores_install_where">Pasang ke</string> + <string name="stores_install_language">Bahasa permainan</string> + <string name="stores_install_language_hint">GOG dan Epic memasang bahasa ini. Sistem mengikut bahasa apl.</string> + <string name="stores_install_language_system">Sistem</string> <string name="stores_install_title">Pasang %1$s:</string> <string name="stores_target_internal">Dalaman</string> <string name="stores_target_free">%1$s bebas</string> @@ -2264,6 +2448,9 @@ <string name="edit_target">Sasaran</string> <string name="edit_start_in">Mula dalam</string> <string name="edit_launch_options">Pilihan pelancaran</string> + <string name="edit_launch_options_steam_hint">Dikongsi dengan Properties dalam Steam: perubahan di salah satu tempat dipaparkan di kedua-duanya.</string> + <string name="edit_launch_options_not_saved">Tidak dapat menyimpan pilihan pelancaran ke Steam. Cuba lagi.</string> + <string name="edit_launch_options_desktop">Steam mungkin terbuka dalam sesi desktop. Tukar pilihan pelancaran dalam Properties Steam, atau tutup sesi itu dahulu.</string> <string name="edit_artwork">Seni</string> <string name="edit_other_exe">Exe lain…</string> <string name="edit_remove">Alih keluar</string> @@ -2389,6 +2576,7 @@ <string name="setup_download_source_custom">Awalan sendiri</string> <string name="setup_download_mirror">Laman</string> <string name="setup_download_prefix">Awalan</string> + <string name="setup_download_proxy">Proksi HTTP</string> <string name="flathub_eyebrow">APL LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Apl desktop untuk desktop Linux, dibuka daripada Desktop.</string> @@ -2527,6 +2715,22 @@ <string name="glasses_tracking_flat_hint">Automatik mengekalkan permainan 2D ini tetap dalam pandangan. Pilih Skrin maya dalam Paparan untuk menggunakan penjejakan kepala.</string> <string name="glasses_tracking_sbs_hint">Penjejakan kepala digunakan untuk skrin maya atau permainan SteamVR yang sedang berjalan.</string> <string name="glasses_hardware">Peranti</string> + <string name="vr_controllers_tab">Pengawal</string> + <string name="vr_controllers_group">Pengawal SteamVR</string> + <string name="vr_controllers_emulate">Pad permainan dalam VR</string> + <string name="vr_controllers_emulate_hint">Dua tangan VR yang dimainkan oleh pengawal anda. Perubahan berkuat kuasa serta-merta, juga semasa SteamVR berjalan. Joy-Con dan tangan yang dijejak masih mengambil alih sisi masing-masing.</string> + <string name="vr_controllers_off">Pad permainan biasa</string> + <string name="vr_controllers_index">Pengawal Valve Index</string> + <string name="vr_controllers_touch">Pengawal Meta Quest 3</string> + <string name="vr_controllers_vive">Tongkat HTC Vive</string> + <string name="vr_controllers_sticks">Kayu bedik bermula dengan</string> + <string name="vr_controllers_sticks_hint">Tekan kedua-dua kayu bedik serentak semasa VR untuk bertukar.</string> + <string name="vr_controllers_sticks_game">Menggerakkan anda dalam permainan</string> + <string name="vr_controllers_sticks_hands">Menggerakkan tangan</string> + <string name="vr_controllers_buttons">Butang</string> + <string name="vr_controllers_buttons_stick">Picu kekal picu, bumper ialah genggaman, A/B dan X/Y ialah butang muka setiap tangan, klik kayu bedik mengklik thumbstick, Guide membuka menu SteamVR. D-pad atas dan bawah menggerakkan tangan lebih dekat atau lebih jauh.</string> + <string name="vr_controllers_buttons_vive">Kayu bedik menjadi pad jejak; A/X atau klik kayu bedik menekannya. Picu kekal picu, bumper ialah genggaman, Start dan Select ialah menu, Guide membuka menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Tiada tangan VR. Permainan yang menyokong pad permainan, dan menu SteamVR, menerima pengawal anda seperti biasa.</string> <string name="glasses_brightness">Kecerahan</string> <string name="glasses_volume">Kelantangan</string> <string name="glasses_sunblock">Peredup kanta</string> @@ -2584,6 +2788,12 @@ <string name="hand_camera_placement">Kedudukan kamera</string> <string name="hand_camera_placement_hint">Pastikan kamera boleh melihat anda sebelum bermain.</string> <string name="hand_camera_check">Semak</string> + <string name="tracking_pack_title">Muat turun penjejakan tangan</string> + <string name="tracking_pack_hint">Penjejakan tangan memerlukan muat turun sekali sahaja sebanyak %1$s.</string> + <string name="tracking_pack_download">Muat turun</string> + <string name="tracking_pack_retry">Cuba semula</string> + <string name="tracking_pack_downloading">Memuat turun penjejakan tangan… %1$d%%</string> + <string name="tracking_pack_failed">Penjejakan tangan tidak dapat dimuat turun. Semak sambungan anda dan cuba lagi.</string> <string name="hand_camera_check_title">Kedudukan kamera</string> <string name="hand_camera_how_rear">Dirikan peranti sejauh 1.5 hingga 2 meter kira-kira pada paras dada, dengan kamera belakang menghadap anda. Kemudian masuk ke pandangan dengan tangan terhulur.</string> <string name="hand_camera_how_front">Dirikan peranti sejauh 1.5 hingga 2 meter kira-kira pada paras dada, dengan skrin menghadap anda. Kemudian masuk ke pandangan dengan tangan terhulur.</string> @@ -2655,6 +2865,21 @@ <string name="storage_safe_hint">Runtime tidak digunakan, sisa, log lama</string> <string name="storage_clean_up">Membersihkan…</string> <string name="storage_session_running">Hentikan sesi untuk membersihkan atau memadam apa-apa. Saiz kekal kelihatan.</string> + <string name="storage_default_group">Lokasi pemasangan</string> + <string name="storage_default_title">Storan lalai</string> + <string name="storage_default_hint">Pemasangan kedai baharu pergi ke lokasi yang dipilih. Permainan sedia ada kekal di tempatnya. Pustaka Steam mengekalkan tetapan sendiri.</string> + <string name="storage_default_ask">Tanya setiap kali</string> + <string name="storage_default_ask_detail">Pilih destinasi bagi setiap pemasangan</string> + <string name="storage_default_internal">Storan dalaman</string> + <string name="storage_default_external">Storan luaran</string> + <string name="storage_default_external_detail">%1$s · %2$s kosong</string> + <string name="storage_default_external_missing">Tidak disambungkan</string> + <string name="storage_default_folder">Folder · %1$s</string> + <string name="storage_default_folder_free">%1$s kosong</string> + <string name="storage_default_folder_missing">Tidak disambungkan</string> + <string name="storage_default_choose_folder">Pilih folder…</string> + <string name="storage_default_choose_folder_detail">Gunakan mana-mana folder pada kad SD atau pemacu USB</string> + <string name="storage_default_note">Permainan dimasukkan ke dalam folder Games di dalam lokasi yang dipilih. Permainan sedia ada tidak dipindahkan.</string> <string name="storage_where">Ke mana perginya</string> <string name="storage_games">Permainan Steam</string> <string name="storage_game_data">Data permainan</string> @@ -2776,6 +3001,9 @@ <string name="storage_data_installed">Permainan dipasang</string> <string name="storage_data_parts">Awalan %1$s · shader %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Kosongkan shader</string> + <string name="storage_reset_prefix">Set semula prefix</string> + <string name="storage_reset_prefix_title">Set semula prefix untuk %1$s?</string> + <string name="storage_reset_prefix_confirm">Memadam prefix Wine-nya (%1$s) dalam %2$s dan menciptanya semula pada pelancaran seterusnya. Simpanan, tetapan dan redistributable yang dipasang di dalamnya akan hilang; simpanan Steam Cloud kekal dalam akaun anda.</string> <string name="storage_data_leftovers">Permainan dialih keluar</string> <string name="storage_steam_app">Aplikasi Steam %1$d</string> <string name="storage_leftover_unsure_detail">Awalan masih mengandungi fail, mungkin simpanan setempat</string> @@ -3075,6 +3303,117 @@ <string name="spatial_saved_views_hint">Pandangan yang disimpan boleh dikira semula. Mulakan penentukuran baharu untuk ditangkap dalam sistem koordinat penjejakan semasa.</string> <string name="spatial_model_checksum_error">Ketakpadanan checksum model tangan</string> <string name="spatial_opencv_load_error">OpenCV tidak dapat dimuatkan</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Segerakkan dengan Syncthing</string> + <string name="sync_enable_hint">Berasaskan Syncthing-Fork, ini ialah pelaksanaan Syncthing yang membolehkan anda menyegerakkan fail dalam sistem fail dalaman DroidDeck dengan tika Syncthing lain. Ini hanya untuk fail yang anda simpan dalam sistem fail dalaman DroidDeck.</string> + <string name="sync_missing">Binaan ini tidak menyertakan Syncthing.</string> + <string name="sync_starting">Memulakan Syncthing</string> + <string name="sync_status_starting">Memulakan</string> + <string name="sync_status_up_to_date">Terkini</string> + <string name="sync_status_syncing">Menyegerakkan</string> + <string name="sync_status_paused">Dijeda</string> + <string name="sync_status_pausing">Menjeda</string> + <string name="sync_status_resuming">Menyambung semula</string> + <string name="sync_status_attention">Perlu perhatian</string> + <string name="sync_status_failed">Syncthing berhenti</string> + <string name="sync_failed_retry">Cuba lagi</string> + <string name="sync_paused_wifi">Dijeda sehingga ada Wi-Fi</string> + <string name="sync_paused_game">Dijeda semasa permainan</string> + <string name="sync_summary">%1$d folder · %2$d daripada %3$d peranti disambungkan</string> + <string name="sync_left">%1$s lagi</string> + <string name="sync_open_web_ui">Buka UI web</string> + <string name="sync_pause">Jeda</string> + <string name="sync_resume">Sambung semula</string> + <string name="sync_running">Berjalan</string> + <string name="sync_running_hint">Matikan untuk menghentikan Syncthing sepenuhnya.</string> + <string name="sync_this_device">Peranti ini</string> + <string name="sync_device_id">ID Peranti</string> + <string name="sync_show_qr">Tunjukkan QR</string> + <string name="sync_advanced">Lanjutan</string> + <string name="sync_advanced_hint">Port, bila hendak dijalankan, tetapkan semula</string> + <string name="sync_open">Buka</string> + <string name="sync_waiting">Menunggu anda</string> + <string name="sync_pending_device">%1$s mahu bersambung</string> + <string name="sync_pending_folder">%1$s mahu berkongsi “%2$s”</string> + <string name="sync_pending_folder_hint">Terima untuk memilih tempat ia disimpan dalam DroidDeck.</string> + <string name="sync_review">Semak dalam UI web</string> + <string name="sync_folders">Folder</string> + <string name="sync_no_folders">Belum ada folder.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Terkini</string> + <string name="sync_folder_syncing">Menyegerakkan %1$d%%</string> + <string name="sync_folder_scanning">Mengimbas</string> + <string name="sync_folder_paused">Dijeda</string> + <string name="sync_folder_out_of_sync">Tidak segerak</string> + <string name="sync_folder_errors">%1$d fail tidak dapat disegerakkan</string> + <string name="sync_folder_blocked">Disekat</string> + <string name="sync_folder_blocked_hint">Folder ini berada di luar storan DroidDeck, jadi DroidDeck menjedanya. Untuk menyegerakkan folder di luar DroidDeck, gunakan apl Syncthing-Fork.</string> + <string name="sync_remove_folder">Alih keluar daripada Syncthing</string> + <string name="sync_remove_folder_hint">Mengalih keluarnya tidak memadamkan sebarang fail.</string> + <string name="sync_devices">Peranti</string> + <string name="sync_no_devices">Belum ada peranti.</string> + <string name="sync_connected">Disambungkan</string> + <string name="sync_offline">Luar talian</string> + <string name="sync_last_seen">Kali terakhir dilihat %1$s</string> + <string name="sync_device_id_title">ID peranti ini</string> + <string name="sync_device_id_hint">Pada peranti anda yang lain, tambah peranti dalam Syncthing dan imbas kod ini atau tampal ID. Kemudian terimanya di sini dalam UI web.</string> + <string name="sync_copy">Salin</string> + <string name="sync_share">Kongsi</string> + <string name="sync_done">Selesai</string> + <string name="sync_off_title">Matikan Syncthing?</string> + <string name="sync_off_body">Syncthing berhenti sekarang dan kekal berhenti sehingga dihidupkan semula. Fail yang disegerakkan kekal di tempatnya.</string> + <string name="sync_off_forget">Padamkan juga konfigurasi Syncthing</string> + <string name="sync_off_forget_hint">Mengalih keluar ID, folder dan peranti bagi peranti ini. Menghidupkannya semula akan bermula dari awal.</string> + <string name="sync_turn_off">Matikan</string> + <string name="sync_ports">Port</string> + <string name="sync_port_sync">Penyegerakan</string> + <string name="sync_port_discovery">Penemuan setempat</string> + <string name="sync_repick">Pilih port baharu</string> + <string name="sync_repick_hint">Disemak semula pada setiap permulaan.</string> + <string name="sync_repick_button">Pilih semula</string> + <string name="sync_reset_group">Tetapkan semula</string> + <string name="sync_api_key">Kunci API</string> + <string name="sync_regenerate">Jana semula</string> + <string name="sync_reset">Tetapkan semula Syncthing</string> + <string name="sync_reset_hint">ID peranti baharu, folder dan peranti dialih keluar. Fail dalam storan DroidDeck dikekalkan.</string> + <string name="sync_reset_button">Tetapkan semula</string> + <string name="sync_reset_confirm_title">Tetapkan semula Syncthing?</string> + <string name="sync_running_group">Berjalan</string> + <string name="sync_run">Jalankan</string> + <string name="sync_run_open">Semasa DroidDeck dibuka</string> + <string name="sync_run_background">Di latar belakang</string> + <string name="sync_wifi_only">Wi-Fi sahaja</string> + <string name="sync_pause_games">Jeda semasa permainan</string> + <string name="sync_logs">Log</string> + <string name="sync_logs_hint">Output Syncthing untuk sesi ini</string> + <string name="sync_logs_share">Kongsi</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Sediakan runtime Linux dahulu.</string> + <string name="sync_accept">Terima</string> + <string name="sync_accept_title">Simpan “%1$s” ke</string> + <string name="sync_add_folder">Tambah folder</string> + <string name="sync_add_folder_hint">Segerakkan folder dalam storan DroidDeck</string> + <string name="sync_choose">Pilih</string> + <string name="sync_add">Tambah</string> + <string name="sync_add_failed">Folder tidak dapat ditambah.</string> + <string name="sync_share_with">Kongsi dengan</string> + <string name="sync_share_none">Belum ada peranti. Anda boleh berkongsi folder ini daripada UI web kemudian.</string> + <string name="sync_use_folder">Gunakan folder ini</string> + <string name="sync_new_folder">Folder baharu</string> + <string name="sync_location_home">Folder rumah kontena</string> + <string name="sync_location_sync">Folder Sync</string> + <string name="sync_location_shared">Storan kongsi DroidDeck</string> + <string name="sync_location_card">DroidDeck pada %1$s</string> + <string name="sync_location_app">Data apl DroidDeck</string> + <string name="sync_web_path_locked">Folder baharu disimpan dalam folder Sync DroidDeck. Untuk menyegerakkan folder DroidDeck yang lain, gunakan Tambah folder pada tab Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Muat semula</string> + <string name="sync_not_running">Syncthing tidak berjalan.</string> + <string name="session_end_steam_sigill">Steam berhenti dengan arahan tidak sah (SIGILL). Ini mungkin masalah keserasian arahan CPU atau ranap klien. Kongsi log bersama butiran peranti anda.</string> + <string name="session_end_steam_try_x64">Anda boleh cuba Tetapan Steam → Klien Steam → x86-64 (eksperimen). Ia memerlukan muat turun tambahan dan mungkin berjalan lebih perlahan.</string> + <string name="session_end_vulkan_device">Pemacu grafik Linux tidak menemui peranti Vulkan yang boleh digunakan. Pastikan pemacu GPU Linux yang dipilih menyokong GPU ini.</string> + <string name="session_end_gpu_unsupported">Sesi ini tidak dapat bermula kerana GPU ini tiada pemacu Vulkan Linux yang serasi dalam persediaan semasa. Pemacu Adreno Turnip tidak dapat mendayakan sokongan untuk GPU MediaTek/Mali.</string> <string name="setup_group_memory">Memori</string> <string name="setup_clear_cached">Tutup apl dalam cache sebelum sesi</string> <string name="setup_clear_cached_hint">Apabila sesi bermula, DroidDeck menutup apl yang disimpan Android di latar belakang supaya permainan mendapat lebih banyak memori. Debugging Wayarles mesti dihidupkan.</string> @@ -3100,6 +3439,12 @@ <string name="epic_client_open">Buka</string> <string name="epic_client_install">Pasang</string> <string name="game_tab_about">Perihal</string> + <string name="game_resources_browser">Dibuka dalam pelayar anda</string> + <string name="game_resource_guides">Panduan</string> + <string name="game_resource_protondb_detail">Laporan keserasian Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Untuk permainan dengan simpanan pada akaun Steam anda</string> + <string name="game_resource_search">Carian web</string> <string name="game_tab_install">Pasang</string> <string name="game_install_location">Lokasi</string> <string name="game_install_folder">Folder</string> @@ -3116,6 +3461,11 @@ <string name="stores_eyebrow_pass">tersedia dengan %1$s</string> <string name="stores_owned_in_library">Permainan dimiliki dalam Pustaka</string> <string name="library_filter_added">Ditambah</string> + <string name="library_filter">Penapis</string> + <string name="library_filter_installed">Dipasang sahaja</string> + <string name="library_filter_all_owned">Semua permainan dimiliki</string> + <string name="library_no_installed_matches">Tiada permainan dipasang yang sepadan dengan penapis ini.</string> + <string name="library_browse_owned">Semak imbas permainan dimiliki</string> <string name="game_tab_launch">Pelancaran</string> <string name="game_tab_saves_cloud">Simpanan & awan</string> <string name="game_launch_shortcut">Pintasan Steam</string> @@ -3133,6 +3483,40 @@ <string name="stores_itch_update_replaced">Pembangun telah menggantikan binaan ini dengan %1$s. Kemas kini kepadanya?</string> <string name="xbox_filter_cloud">Awan</string> <string name="stores_xbox_cloud_settings">Tetapan awan</string> + <string name="integration_title">Integrasi Steam</string> + <string name="integration_count">%1$d daripada %2$d hidup</string> + <string name="integration_set_up">Sediakan</string> + <string name="integration_location">Lokasi</string> + <string name="integration_app_info">Maklumat apl</string> + <string name="integration_wifi">Nama Wi-Fi</string> + <string name="integration_brightness">Kecerahan</string> + <string name="integration_home">DroidDeck sebagai Laman Utama</string> + <string name="integration_shortcuts">Kekunci sistem</string> + <string name="integration_wifi_hint">Paparkan rangkaian dalam Steam · memerlukan akses Lokasi, tidak pernah dijejak</string> + <string name="integration_wifi_on">Rangkaian dipaparkan dalam Steam</string> + <string name="integration_wifi_location_off">Lokasi dimatikan</string> + <string name="integration_wifi_denied">Lokasi ditolak · benarkannya dalam Maklumat apl</string> + <string name="integration_brightness_hint">Peluncur Steam menetapkan kecerahan skrin</string> + <string name="integration_home_hint">Laman Utama membuka menu Steam dalam sesi</string> + <string name="integration_shortcuts_hint">Alt+Tab, kekunci Win dan butang Utama kekal dalam sesi</string> + <string name="integration_shortcuts_maybe_restricted">Dikelabukan dalam Android? Maklumat apl → ⋮ → Benarkan tetapan terhad</string> + <string name="integration_shortcuts_restricted">Disekat oleh Android · Maklumat apl → ⋮ → Benarkan tetapan terhad</string> + <string name="integration_shortcuts_service">Kekunci sistem DroidDeck</string> + <string name="integration_shortcuts_service_description">Mengekalkan Alt+Tab, kekunci Win dan butang Utama dalam sesi DroidDeck yang aktif, bukan Android.</string> + <string name="integration_brightness_needed">Hidupkan Kecerahan dalam Persediaan → Integrasi Steam</string> + <string name="setup_gpu_bridge_off">Jambatan Mali: mati</string> + <string name="setup_gpu_bridge_on">Jambatan Mali: hidup</string> + <string name="setup_gpu_bridge_detail">%1$s bukan Adreno. Jambatan Vulkan eksperimen dihidupkan: sesi melukis melalui pemacu telefon itu sendiri. Jangkakan pepijat; hantar log sesi.</string> + <string name="setup_bridge_safe">Mod selamat</string> + <string name="setup_bridge_safe_on">Mod selamat: hidup</string> + <string name="setup_bridge_safe_off">Mod selamat: mati</string> + <string name="setup_bridge_safe_on_detail">Paling serasi. Disyorkan untuk peranti baharu.</string> + <string name="setup_bridge_safe_off_detail">Lebih pantas di bahagian yang lulus semakan GPU ini.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatik</string> + <string name="setup_bridge_dxvk_proton">DXVK: milik Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Menggunakan DXVK yang lebih lama jika Vulkan GPU ini terlalu lama untuk DXVK Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Setiap Proton mengekalkan DXVK sendiri, walaupun Vulkan GPU ini mungkin terlalu lama untuknya.</string> <string name="apps_search_hint">Cari apl</string> <string name="apps_no_match">Tiada apl sepadan dengan “%1$s”.</string> <string name="apps_add_widget">Tambah widget</string> @@ -3180,6 +3564,8 @@ <string name="desktop_restore_done_body">Apl yang anda tambah dipasang semula.</string> <string name="desktop_restore_failed_title">Sesetengah perisian tidak dapat dipulihkan</string> <string name="desktop_restore_failed_body">Lihat ~/.cache/droiddeck/apt-restore.log, kemudian cuba sudo apt install dalam Konsole.</string> + <string name="gog_full_files">Pengoptimuman asli tidak tersedia. Muat turun termasuk fail gantian lengkap.</string> + <string name="gog_recover">Sahkan hasil tampalan</string> <string name="slow_usb_title">Sambungan USB perlahan</string> <string name="slow_usb_cable">%1$s disambungkan melalui %2$s (%3$s Mbps, kira-kira %4$d MB/s), jadi permainan padanya akan dimuatkan perlahan. Gunakan kabel USB 3 berkadar 5 Gbps atau lebih, cuba terbalikkan palam USB-C atau gunakan pemacu yang lebih pantas.</string> <string name="slow_usb_port">%1$s disambungkan melalui %2$s (%3$s Mbps, kira-kira %4$d MB/s). Port USB peranti ini tidak boleh lebih pantas, jadi permainan akan dimuatkan perlahan. Storan dalaman atau kad microSD mungkin lebih pantas.</string> @@ -3190,4 +3576,52 @@ <string name="steam_import_names_more">%1$s dan %2$d lagi</string> <string name="steam_import_now">Mulakan semula sekarang</string> <string name="steam_import_later">Kemudian</string> + <string name="gog_maintenance">Urus pemasangan GOG</string> + <string name="gog_check">Semak kemas kini</string> + <string name="gog_repair">Sahkan/Baik pulih</string> + <string name="gog_patches">Tampalan luar talian</string> + <string name="gog_refresh">Muat turun pemasang luar talian penuh</string> + <string name="gog_update">Kemas kini kepada %1$s</string> + <string name="gog_resume">Sambung penyelenggaraan GOG</string> + <string name="gog_open_patch">Buka pemasang tampalan</string> + <string name="gog_patch_in_session">Selesaikan atau batalkan pemasang tampalan dalam sesi Linux.</string> + <string name="gog_patch_requirements">Pilih tampalan untuk versi dan bahasa yang dipasang. Versi sumber yang disokong mungkin tidak disenaraikan.</string> + <string name="gog_no_patches">GOG tiada tampalan Windows berasingan untuk permainan ini.</string> + <string name="gog_managed_files">Fail permainan yang diubah suai mungkin digantikan.</string> + <string name="gog_patch_installer_note">Pemasang dibuka dalam sesi Linux anda.</string> + <string name="gog_download_label">Muat turun</string> + <string name="gog_space_label">Ruang tambahan</string> + <string name="gog_space_estimate_label">Anggaran ruang</string> + <string name="gog_repair_action">Baik pulih fail</string> + <string name="gog_refresh_action">Segar semula pemasangan</string> + <string name="gog_select_patch">Pilih</string> + <string name="stores_gamejolt_not_owned">Tiada dalam pustaka Game Jolt anda</string> + <string name="stores_gamejolt_no_build">Tiada muat turun Windows untuk permainan ini</string> + <string name="stores_gamejolt_no_exe">Tiada permainan Windows ditemui dalam muat turun</string> + <string name="stores_gamejolt_no_game">Permainan ini tidak ditemui di Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Tidak dapat memuatkan permainan daripada Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt menjawab HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Tidak dapat memuatkan muat turun daripada Game Jolt</string> + <string name="stores_gamejolt_build_open">Buka di Game Jolt</string> + <string name="stores_gamejolt_archive">Arkib %1$s tidak disokong</string> + <string name="stores_gamejolt_extract_failed">Tidak dapat mengekstrak muat turun (kod %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Tidak dapat menghubungi Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt tidak memberikan pautan muat turun</string> + <string name="stores_gamejolt_section_featured">Pilihan</string> + <string name="stores_gamejolt_section_hot">Hangat</string> + <string name="stores_gamejolt_section_best">Terbaik</string> + <string name="stores_gamejolt_section_new">Baharu</string> + <string name="stores_gamejolt_price_under_30">$30 atau kurang</string> + <string name="stores_gamejolt_os_other">Lain-lain</string> + <string name="stores_gamejolt_maturity_everyone">Semua peringkat umur</string> + <string name="stores_gamejolt_maturity_teen">Remaja</string> + <string name="stores_gamejolt_maturity_adult">Dewasa</string> + <string name="stores_gamejolt_status_complete">Siap</string> + <string name="stores_gamejolt_status_early">Akses awal</string> + <string name="stores_gamejolt_partners">Permainan rakan kongsi</string> + <string name="stores_gamejolt_filter_browser">Pelayar</string> + <string name="stores_gamejolt_filter_maturity">Kematangan</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Rakan kongsi</string> + <string name="stores_gamejolt_followed">Permainan diikuti</string> </resources> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f58ba3c2a1..a2b8f0ed8a 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-innstillinger for D3D12. nodxr slår av ray tracing; bruk bare for spill som krever det.</string> <string name="game_env_proton_log">Sett til 1 for en Proton-diagnostikklogg. Logging kan redusere ytelsen og bruke lagringsplass.</string> <string name="game_env_wined3d">Sett til 1 for å bruke OpenGL-baserte WineD3D i stedet for DXVK til kompatibilitetstesting av D3D9–11.</string> + <string name="game_env_wined3d_renderer">Gjengiver for DirectDraw, Direct3D 1-7 og spill som kjører med WineD3D. Vulkan hopper over OpenGL-via-Zink og er mye raskere for gamle DirectDraw- og Direct3D 7-spill på Adreno.</string> + <string name="game_env_dxvk_d3d8">Sett til 1 for å kjøre Direct3D 8 via DXVK i stedet for WineD3D. Raskere i Direct3D 8-testen i AIO Graphics Test på Adreno.</string> <string name="game_env_no_ntsync">Sett til 1 for å holde dette spillet unna ntsync (droiddeck-ntsync eller en kjernedriver); det bruker droiddeck-esync der en pakke finnes, ellers droiddeck-fsync.</string> <string name="game_env_no_esync">Sett til 1 for å slå av droiddeck-esync for dette spillet; det bruker droiddeck-fsync i stedet, eller droiddeck-ntsync der fsync også er av.</string> <string name="game_env_no_fsync">Sett til 1 for å holde dette spillet unna droiddeck-fsync; det bruker droiddeck-esync der en pakke finnes, ellers droiddeck-ntsync.</string> <string name="game_env_fsync_first">Sett til 1 for å kjøre dette spillet på droiddeck-fsync, eller 0 for å sette droiddeck-esync først der en pakke passer Protonen.</string> <string name="game_env_xalia">Sett til 0 for å slå av Protons hjelper for kontrollernavigasjon for dette spillet.</string> + <string name="game_env_anticheat_offline">På som standard. Starter et Easy Anti-Cheat-spill uten antijuks når spillet støtter frakoblet spilling. Slå av for å starte via Easy Anti-Cheat som vanlig. Nettmoduser som krever Easy Anti-Cheat er fortsatt utilgjengelige.</string> <string name="game_env_hud">DXVK-overlegg for D3D9–11. fps viser bildefrekvens; uten verdi skjules det.</string> <string name="game_env_dxvk_config">DXVK-innstillinger skilt med semikolon. Nyere versjoner bruker dxvk.maxFrameRate for bildefrekvensbegrensning; bruk heller sesjonens bildefrekvensbegrensning for vanlig spilling.</string> + <string name="game_env_cores">CPU-kjerner for dette spillet, for eksempel 0-4 eller 0,2,4, i stedet for sesjonens spillkjerner. Færre kjerner gir mindre varme.</string> <string name="game_env_vkd3d_limit">Bildefrekvensgrense for D3D12. 0 slår av grensen.</string> <string name="game_env_glthread">Mesa OpenGL-tråding. true kan hjelpe CPU-begrensede OpenGL-spill; test per spill.</string> <string name="sync_backend_title">Wine-synkronisering</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX kjører x86-Linux-programmer på denne ARM64-enheten. Auto bruker det når programmet er bygget for x86.</string> <string name="app_fex_x86">%1$s via FEX</string> <string name="app_fex_not_ready">Dette programmet er bygget for %1$s-PC-er og kjører via FEX, som ikke er satt opp ennå. Åpne Steam én gang mens du er innlogget: DroidDeck lar den laste ned FEX og Steam Linux Runtime den trenger, og så åpnes dette.</string> + <string name="session_proot_missing">Kunne ikke laste ned DroidDecks proot. Sjekk tilkoblingen og prøv igjen. Sesjonen ble ikke startet, fordi reserve-proot er for treg til å spille på.</string> + <string name="session_directaudio_missing">Kunne ikke laste ned DirectAudio, så spillyd bruker den tregere veien i denne sesjonen.</string> <string name="session_end_program">Dette programmet</string> <string name="session_end_steam_download">Kunne ikke laste ned Steam-klienten. Nettverket eller VPN-en din blokkerer kanskje Steams servere; sjekk tilkoblingen og prøv igjen.</string> <string name="session_end_steam_setup">Kunne ikke sette opp Steam-klienten. Sjekk tilkoblingen og ledig lagringsplass, og prøv igjen.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360-kontroller</string> <string name="mode_controller_note">Deck: Hurtigmeny-knapp og gyro. Steam Controller: det samme, med gripesensor på bakknappene. DualShock 4 og DualSense: gyro, og styreflatene som styreflate. Xbox 360: åpne Hurtigmenyen med Guide+A.</string> <string name="mode_back">Tilbake</string> + <string name="back_hold">Hold Tilbake for Steam-snarveier</string> + <string name="back_hold_hint">Hold Tilbake for å åpne Hurtigtilgang eller lage Steam-kombinasjoner med andre knapper. Slå av for å ignorere holdt Tilbake; trykk og dobbelttrykk virker fortsatt.</string> + <string name="back_native_qam_hint">Hold Tilbake i 700 ms, eller hold Tilbake og trykk en annen knapp for Steam-snarveier.</string> + <string name="back_double_tap_window">Tidsvindu for dobbelttrykk</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Tillat lysstyrkekontroll</string> + <string name="brightness_permission_text">Sett opp lysstyrkekontroll i DroidDeck.</string> <string name="back_menu_then_qam">Meny → QAM</string> <string name="back_qam_then_menu">QAM → Meny</string> <string name="mode_session">Sesjon</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Utsetter bakgrunnspause mens Steam laster aktivt ned.</string> <string name="mode_suspend_note">Auto setter på pause i bakgrunnen og gjenopptar når den vises. Manuell venter på Gjenoppta. Aldri lar den fortsette å kjøre.</string> <string name="mode_startup">Oppstart</string> - <string name="mode_steam_startup">Start Steam med DroidDeck</string> - <string name="mode_steam_startup_hint">Åpner Steam-sesjonen når DroidDeck starter.</string> + <string name="mode_startup_session">Åpne ved oppstart</string> + <string name="mode_startup_session_hint">Starter denne økten når DroidDeck starter.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Ser etter utgivelser…</string> <string name="mode_decky_ready">Klar til å installere %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Oppdatert · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Installer nyeste</string> + <string name="decky_channel">Oppdateringskanal</string> + <string name="decky_channel_hint">Hvilke Decky Loader-utgivelser som installeres. Deckys egen oppdatering bruker samme kanal.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Forhåndsutgivelse</string> + <string name="decky_channel_testing">Testing</string> + <string name="decky_channel_failed">Kunne ikke lagre oppdateringskanalen for Decky</string> <string name="mode_decky_on">Starter med Steam. Mens på, kan andre apper på denne enheten kanskje styre Steam.</string> <string name="mode_decky_off">Av. Steams fjernsøkeport for feilsøking forblir stengt.</string> <string name="mode_decky_remove_title">Avinstaller Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Klient</string> <string name="mode_mangoapp">Ytelsesoverlegg</string> <string name="mode_mangoapp_hint">Slå av hvis spill krasjer eller blir svarte i Deck-modus. Gjelder fra neste sesjon.</string> + <string name="mode_return_after_game">Gå tilbake til DroidDeck etter et spill</string> + <string name="mode_return_after_game_hint">Når et spill du startet fra DroidDeck eller en annen launcher lukkes, avslutter Steam ryddig (skylagringer fullføres først) og du går tilbake dit. Av: bli i Steam.</string> + <string name="mode_shader_precache">Forhåndsbufring av shadere</string> + <string name="mode_shader_precache_hint">Steam laster ned ferdigbygde shadere for spillene dine og behandler dem i bakgrunnen, så spillene hakker mindre. Av sparer data, lagringsplass og batteri; spillene bygger shadere mens du spiller i stedet. Samme innstilling som Steams Nedlastinger > Shader Pre-Caching. Gjelder fra neste sesjon.</string> <string name="mode_steam_repair">Reparer Steam-klienten</string> <string name="mode_steam_repair_hint">Laster ned Steam-klienten igjen neste gang Steam starter. Bruk dette hvis Steam blir hengende på lasteskjermen. Spill, innlogging og innstillinger beholdes.</string> <string name="mode_steam_repair_queued">Steam-klienten lastes ned igjen neste gang Steam starter.</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">Går forbi PulseAudio for lavere ventetid.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">For talechat.</string> + <string name="drawer_mic_hint">Slå mikrofonopptak av eller på for denne sesjonen.</string> + <string name="drawer_mic_failed">Kunne ikke endre mikrofonen. Prøv igjen.</string> <string name="mode_network">Nettverk</string> <string name="mode_wifi_discovery">Wi-Fi-oppdagelse</string> <string name="mode_wifi_discovery_hint">Vis Wi-Fi-navn og nettverk i nærheten i Steam.</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: realtime GPU-kø</string> <string name="perf_gsrealtime_hint">Prioriterer kompositørens GPU-arbeid. Kan jevne ut bildetakten, på bekostning av spillene.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Minne</string> + <string name="perf_cap_off">Av</string> + <string name="perf_cap_auto">Driverstandard</string> + <string name="perf_zram_client">Komprimer Steam mens et spill kjører</string> + <string name="perf_zram_client_hint">20 s etter at et spill starter, komprimeres Steam-klienten til zRAM for å gi spillet mer minne, og leses inn igjen når spillet lukkes. Slå av hvis sesjonen lukkes kort tid etter at spill starter. En RAM-grense ovenfor komprimerer fortsatt Steam når sesjonen går over den.</string> + <string name="perf_ram_cap">RAM-grense</string> + <string name="perf_ram_cap_hint">Gjelder mens Steam-klienten kjører, i Steam-modus eller fra skrivebordet. Når sesjonen bruker mer enn dette, komprimeres Steam og deretter sesjonens andre støttede prosesser til zRAM. En myk grense: ingenting lukkes, men spill kan hakke mens sider hentes tilbake.</string> + <string name="perf_ram_cap_unavailable">Krever zRAM-swap, som denne enheten ikke har.</string> + <string name="perf_vram_cap">VRAM-grense</string> + <string name="perf_vram_cap_hint">Videominnet DXVK rapporterer til Direct3D-spill, slik at de beregner teksturer for mindre. Spillets egne DXVK-innstillinger har forrang. Trer i kraft fra neste sesjon.</string> <string name="perf_gpuclock">Hold GPU-en på toppfrekvens</string> <string name="perf_gpuclock_hint">Bare Adreno. Færre hikk, mer batteribruk og varme.</string> <string name="perf_fixes">Sesjonsfikser</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">proot-hurtigvei</string> <string name="perf_fastpath_needs_seccomp">Krever prootens seccomp-filter.</string> <string name="perf_fastpath_hint">Raskere filoppslag og mindre hakking. Slå av hvis et program ikke finner filene sine.</string> + <string name="perf_cursor_composite">Tegn markøren i gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope tegner pekeren selv i stedet for å overlate den til Android. Slå på for en markør styrt med kontroller. Av er raskere på en telefon. Gjelder fra neste sesjon.</string> <string name="perf_identity">Sesjonsidentitet</string> <string name="perf_hostname">Vertsnavn</string> <string name="perf_hostname_hint">Navnet Steam ser for denne enheten. Tomt gjenoppretter %1$s.</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">Filene fjernes fra appen.</string> <string name="driver_delete_in_use">Filene fjernes. Den er i bruk, så standarden tar over.</string> <string name="drawer_page_display">Skjerm</string> + <string name="drawer_frame_limit">Bildefrekvensgrense</string> + <string name="drawer_frame_limit_note">Begrenser dette spillet. Skjermen bytter til en oppdateringsfrekvens som grensen går opp i når det finnes en; andre grenser kan se ujevne ut. Steam-spill bruker Steams Frame Limit i Hurtigmenyen.</string> <string name="drawer_page_effects">Effekter</string> <string name="drawer_page_controls">Kontroller</string> <string name="drawer_page_components">Komponenter</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">Pille</string> <string name="hud_size_minimal">Minimal</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Linje</string> <string name="hud_locked">Lås på plass</string> <string name="hud_locked_hint">Dra HUD-en for å flytte den; et langt trykk låser eller låser den opp. Mens den er låst, fungerer skjermkontrollene under den fortsatt.</string> + <string name="hud_snap">Fest til sidene</string> + <string name="hud_snap_hint">Slipp HUD-en, så flytter den seg til nærmeste side av skjermen. Et raskt sveip kaster den den veien.</string> <string name="hud_group_look">Utseende</string> <string name="hud_scale">Størrelse på skjermen</string> <string name="hud_color_soft">Myk</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">Kunne ikke lagre HUD-rapporten.</string> <string name="hud_reset">Tilbakestill HUD-innstillinger</string> <string name="hud_reset_button">Tilbakestill</string> - <string name="hud_credit">FusionHUD av The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Skaleringsmodus</string> <string name="drawer_scaling_sharpness">Skaleringsskarphet</string> <string name="drawer_effects">Skjermeffekter</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Tastatur</string> <string name="drawer_latency">Forsinkelse</string> + <string name="drawer_low_latency">Modus for lav forsinkelse</string> + <string name="drawer_low_latency_hint">Øker CPU- og batteribruk</string> <string name="drawer_low_latency_controller">Kontroller med lav forsinkelse</string> <string name="drawer_low_latency_controller_hint">Kontrolleren rapporterer ved 1000 Hz i stedet for 250 Hz. Litt mer CPU.</string> <string name="drawer_low_latency_touch">Berøring med lav forsinkelse</string> <string name="drawer_low_latency_touch_hint">Berøringer hopper over bildeinnsamling; Steams berøringsstyring går ved 1000 Hz. Litt mer CPU.</string> <string name="drawer_evdev_mouse">Rå musekanal</string> + <string name="drawer_relative_mouse">Relativ mus</string> + <string name="drawer_relative_mouse_auto">Automatisk</string> + <string name="drawer_relative_mouse_on">På</string> + <string name="drawer_relative_mouse_off">Av</string> <string name="drawer_direct_cursor">Peker</string> <string name="drawer_pc_keyboard">PC-tastatur</string> <string name="drawer_android_keyboard">Android</string> @@ -718,7 +765,7 @@ <string name="drawer_session_behavior">Sesjonsoppførsel</string> <string name="drawer_suspend_hint">Gjelder nå og for fremtidige sesjoner i denne modusen.</string> <string name="drawer_next_session">Neste sesjon</string> - <string name="drawer_support">Support</string> + <string name="drawer_support">Støtte</string> <string name="drawer_logs">Sesjonslogger</string> <string name="drawer_logs_hint">Legg ved en feilrapport</string> <string name="drawer_share_logs">Del logger</string> @@ -791,6 +838,10 @@ <string name="setup_session">Sesjon</string> <string name="setup_logs">Sesjonslogger</string> <string name="setup_logs_hint">Lagret etter hver sesjon</string> + <string name="setup_game_debug_logs">Feilsøkingslogger for spill</string> + <string name="setup_game_debug_logs_hint">Ta med diagnostikk for Proton, Wine og grafikk ved neste spillstart. Kan redusere ytelsen og bruke mer lagringsplass.</string> + <string name="setup_game_debug_logs_restart">Start denne sesjonen på nytt for å lagre feilsøkingslogger for spill</string> + <string name="setup_logging_update_failed">Kunne ikke oppdatere loggingen. Sjekk bryteren og prøv igjen.</string> <string name="setup_agent_commands">Feilsøkingsverktøy</string> <string name="setup_latest_logs">Nyeste sesjonslogger</string> <string name="setup_saved_logs">Lagrede sesjonslogger</string> @@ -822,20 +873,22 @@ <string name="setup_home">Bruk som Hjem-skjerm</string> <string name="setup_home_on">DroidDeck kan være Hjem-appen</string> <string name="setup_home_off">DroidDeck tilbys aldri som en Hjem-app</string> + <string name="setup_home_game_space_first">I Legg til spill setter du DroidDeck til Inkluder</string> <string name="setup_orientation">Retning</string> + <string name="setup_launcher_orientation">Retning for launcheren</string> + <string name="setup_launcher_orientation_auto">Følg enhetens rotasjon</string> + <string name="setup_orientation_portrait">Stående</string> + <string name="setup_session_orientation">Retning for sesjonen</string> + <string name="setup_session_orientation_hint">Gjelder Steam, spill, skrivebordet og kontrollerredigeringen. Forhåndsinnstilte oppløsninger roterer med sesjonen; egendefinert bredde og høyde forblir som angitt.</string> <string name="setup_orientation_auto">Automatisk liggende</string> <string name="setup_orientation_landscape">Liggende</string> <string name="setup_orientation_reverse">Omvendt liggende</string> <string name="setup_fullscreen">Fullskjerm</string> <string name="setup_fullscreen_on">Skjuler Androids status- og navigasjonslinjer</string> <string name="setup_fullscreen_off">Viser Androids status- og navigasjonslinjer</string> - <string name="setup_dual_screen">Dobbel skjerm</string> - <string name="setup_dual_screen_hint">Automatisk bruker den andre skjermen på håndholdte enheter med innebygd skjerm. På bruker enhver annen skjerm. Av holder alt på én skjerm.</string> <string name="setup_dual_screen_auto">Automatisk</string> <string name="setup_dual_screen_on">På</string> <string name="setup_dual_screen_off">Av</string> - <string name="setup_dual_screen_menu">Meny på nederste skjerm</string> - <string name="setup_dual_screen_menu_hint">Flytter seksjonene og menyen i spillet til den andre skjermen og skriver der, så den øverste skjermen beholder hele visningen. L2 og R2 bytter seksjon.</string> <string name="setup_dual_screen_controls">Kontroller på nederste skjerm i spill</string> <string name="setup_dual_screen_controls_hint">Åpner styreflaten og tastaturet på den andre skjermen når en økt starter.</string> <string name="dual_typing_title">Skriver for den øverste skjermen</string> @@ -987,6 +1040,14 @@ <string name="gate_step1">Åpne Innstillinger → Utvikleralternativer → Trådløs feilsøking og slå det på</string> <string name="gate_step2">Trykk på «Par enhet med koblingskode»</string> <string name="gate_step3">Skriv koden inn i DroidDeck-varslingen</string> + <string name="pairguide_build_number">I Om telefonen trykker du på Delversjonsnummer 7 ganger</string> + <string name="pairguide_wireless">Slå på Trådløs feilsøking</string> + <string name="pairguide_pair">Åpne Trådløs feilsøking, og trykk på «Par enhet med koblingskode»</string> + <string name="pairguide_child_process">Slå på «Deaktiver begrensninger for underordnede prosesser»</string> + <string name="pairguide_row_child_process">Deaktiver begrensninger for underordnede prosesser</string> + <string name="pairguide_row_build_number">Delversjonsnummer</string> + <string name="pairguide_row_wireless">Trådløs feilsøking</string> + <string name="pairguide_row_pair">Par enhet med koblingskode</string> <string name="gate_waiting">Venter på koblingsvarselet…</string> <string name="gate_code_needed">Varsel funnet. Skriv inn koden i varslingen.</string> <string name="gate_status">Status</string> @@ -1125,7 +1186,6 @@ <string name="games_never_played">Aldri spilt</string> <string name="games_runtime_busy_percent">Kjøretid opptatt · %1$d%%</string> <string name="games_runtime_busy">Kjøretid opptatt</string> - <string name="games_runtime_first_play">Kjøretiden installeres ved første Spill</string> <string name="games_runtime_update">Kjøretidsoppdatering tilgjengelig</string> <string name="games_runtime_ready">● Kjøretid klar</string> <string name="games_internal">Intern lagring</string> @@ -1142,6 +1202,9 @@ <string name="gpu_hide_other">Skjul drivere for andre GPU-er</string> <string name="gpu_show_other">Vis drivere for andre GPU-er</string> <string name="gpu_advanced">Avansert</string> + <string name="gpu_ubwc_title">UBWC-kompatibilitet</string> + <string name="gpu_ubwc_hint">Prøv På eller Av hvis Steam eller Android viser striper eller flimring. Gjelder begge driverne etter at DroidDeck startes på nytt.</string> + <string name="gpu_ubwc_restart">Start DroidDeck på nytt for å bruke endringen.</string> <string name="gpu_set_with_display">Angis sammen med skjermdriveren: %1$s bærer begge.</string> <string name="gpu_set_with_runtime">Angis sammen med kjøretidsdriveren: %1$s bærer begge.</string> <string name="gpu_runtime_hint">Brukes av spill og skrivebordet.</string> @@ -1250,10 +1313,15 @@ <string name="pip_auto">Gå automatisk inn i PiP</string> <string name="unfolded_controls">Kontroller på den utbrettede skjermen</string> <string name="unfolded_controls_hint">Utbrettet sitter spillet over Steam Deck-styreflatene og bakgrepene. Sammenslått er spillet i fullskjerm.</string> + <string name="unfolded_controls_with_controller">Behold dem med kontroller</string> + <string name="unfolded_controls_with_controller_hint">Vis også disse berøringskontrollene mens en kontroller er tilkoblet.</string> <string name="pip_suspended">Satt på pause</string> <string name="pip_not_ready">Bilde-i-bilde er tilgjengelig når sesjonen er klar.</string> <string name="pip_permission">Tillat bilde-i-bilde for DroidDeck i Android-innstillingene.</string> <string name="pip_unavailable">Android kunne ikke åpne bilde-i-bilde.</string> + <string name="game_more">Mer</string> + <string name="game_edit_art">Rediger grafikk</string> + <string name="stores_in_steam_label">I Steam</string> <string name="game_shortcut">Snarvei</string> <string name="game_shortcut_add">Legg til på hjem-skjermen</string> <string name="game_shortcut_choose">Velg spill</string> @@ -1277,6 +1345,10 @@ <string name="main_wait_runtime">Vent til kjøretidsoperasjonen er ferdig</string> <string name="main_wait_proton_install">Vent til installasjonen av kompatibilitetsverktøyet er ferdig</string> + <string name="load_compat_title">Gjør kompatibilitetsverktøy klare</string> + <string name="load_compat_wait">Venter på at kompatibilitetsoppsettet skal bli ferdig</string> + <string name="load_compat_hint">Sesjonen starter når oppsettet er ferdig.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Vent til installasjonen av skrivebordsappen er ferdig</string> <string name="main_wait_install_game">Vent til installasjonen er ferdig før du starter et spill</string> <string name="main_saves_close_session">Lukk Steam-sesjonen først, så spillet ikke kan lagre over importen</string> @@ -1313,6 +1385,9 @@ <string name="main_install_anyway">Installer likevel</string> <string name="main_remove_runtime_title">Fjern Linux-kjøretid</string> <string name="main_remove_runtime_text">Dette sletter kjøretiden, Steam-klienten inni den, og hvert spill installert der.</string> + <string name="runtime_actions_title">Linux-kjøretid</string> + <string name="runtime_actions_text">Reparer installerer kjøretidens systemfiler på nytt og beholder Steam, spillene og innstillingene dine. Tillegg som skrivebordet installeres igjen neste gang du bruker dem. Fjern sletter alt.</string> + <string name="runtime_repair">Reparer kjøretid</string> <string name="main_applied">Brukt: %1$s</string> <string name="android_app_open_failed_primary">Kunne ikke åpne %1$s på hovedskjermen</string> <string name="android_app_open_failed_on">Kunne ikke åpne %1$s på %2$s</string> @@ -1442,6 +1517,11 @@ <string name="session_runtime_catalog_unreachable">Kunne ikke nå kjøretidskatalogen. Kontroller tilkoblingen og trykk Spill igjen.</string> <string name="session_runtime_install_failed">Linux-kjøretiden ble ikke installert. Kontroller kjøretiden i Oppsett og trykk Spill igjen.</string> <string name="session_desktop_install_failed">Skrivebordet ble ikke installert (%1$s). Kontroller tilkoblingen og trykk Skrivebord igjen.</string> + <string name="session_package_resume_failed">En avbrutt installasjon kunne ikke fullføres (%1$s). Sjekk tilkoblingen og ledig plass, og prøv igjen.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux-kjøretiden er skadet: %1$d bibliotekslenke peker til en manglende fil (%2$s), vanligvis etter at en installasjon ble avbrutt. Reparer beholder spillene og innstillingene dine.</item> + <item quantity="other">Linux-kjøretiden er skadet: %1$d bibliotekslenker peker til manglende filer (%2$s med flere), vanligvis etter at en installasjon ble avbrutt. Reparer beholder spillene og innstillingene dine.</item> + </plurals> <string name="session_ended_named">%1$s stoppet uventet. Del loggene med en feilrapport, eller prøv igjen.</string> <string name="session_ended_program">Programmet stoppet uventet. Del loggene med en feilrapport, eller prøv igjen.</string> <string name="session_ended_desktop">Skrivebordet stoppet uventet. Del loggene med en feilrapport, eller prøv igjen.</string> @@ -1456,6 +1536,13 @@ <string name="mode_decky_plugins_hint">Installer en programtillegg-ZIP for neste Steam-sesjon.</string> <string name="mode_decky_plugin_downloading">Laster ned…</string> <string name="mode_decky_plugin_install_zip">Installer fra ZIP</string> + <string name="decky_zip_warning_title">Installasjon av tredjeparts programtillegg</string> + <string name="decky_zip_warning_text">Decky Loader-teamet har ikke gjennomgått dette programtillegget. Det kan inneholde skadevare, for eksempel programvare som stjeler Steam-kontoen din eller skader enheten din. Ved å installere dette programtillegget godtar du at du tar all risiko for enheten din.</string> + <string name="decky_zip_warning_continue">Fortsett</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Vent %1$d sekund</item> + <item quantity="other">Vent %1$d sekunder</item> + </plurals> <string name="store_cat_games">Spill</string> <string name="store_cat_audio_video">Lyd og video</string> <string name="store_cat_graphics">Grafikk</string> @@ -1617,6 +1704,8 @@ <string name="fm_accept">Godta</string> <string name="fm_decline">Avslå</string> <string name="fm_drive_not_readable">%1$s er montert, men ikke lesbar akkurat nå</string> + <string name="fm_drive_access_title">Gi tilgang til %1$s</string> + <string name="fm_drive_access_text">Android lar DroidDeck se denne stasjonen, men ikke lese den. Slå på Tilgang til alle filer for DroidDeck, og kom så tilbake.</string> <string name="fm_list_view">Listevisning</string> <string name="fm_grid_view">Rutenettvisning</string> <string name="fm_search">Søk</string> @@ -1688,6 +1777,89 @@ <string name="second_mode_keyboard_trackpad">Tastatur + styreflate</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck-grep + styreflater</string> + <string name="second_mode_dashboard">Dashbord</string> + <string name="bottom_dashboard_empty">Ingenting å vise her ennå.</string> + <string name="bottom_page_downloads">Nedlastinger</string> + <string name="bottom_downloads_none">Ingen nedlastinger pågår.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Laster ned shaderbuffer</string> + <string name="bottom_downloads_paused">Pauset</string> + <string name="bottom_downloads_queued">Venter på å starte</string> + <string name="bottom_page_notifications">Varslinger</string> + <string name="bottom_notifications_listener">DroidDeck nedre skjerm</string> + <string name="bottom_notifications_why">Vis meldinger og andre varslinger her mens du spiller. De vises bare på denne skjermen og lagres ikke. Android spør én gang: siden for varseltilgang åpnes på denne skjermen; slå på DroidDeck der, så kommer denne siden tilbake av seg selv.</string> + <string name="bottom_notifications_allow">Tillat varseltilgang</string> + <string name="bottom_notifications_none">Ingen varslinger.</string> + <string name="bottom_notifications_count">%1$d varslinger</string> + <string name="bottom_notifications_clear">Fjern</string> + <string name="bottom_page_screenshots">Skjermbilder</string> + <string name="stats_fps_needs_hud">FPS krever at HUD-en er på</string> + <string name="stats_speed">Fart</string> + <string name="stats_pedals">Pedaler</string> + <string name="stats_gforce">G-kraft</string> + <string name="stats_timing">Tider</string> + <string name="stats_best_lap">Beste runde</string> + <string name="stats_tires">Dekk °C</string> + <string name="stats_trace">Gass og brems, siste 10 s</string> + <string name="stats_speed_chart">Fart, %1$s</string> + <string name="stats_gear">Gir</string> + <string name="stats_steam_client_arm">Steam-klient ARM</string> + <string name="stats_steam_client_x86">Steam-klient x86</string> + <string name="stats_throttle">Gass</string> + <string name="stats_brake">Brems</string> + <string name="stats_lights">Varsellamper</string> + <string name="stats_lamp_shift">Girskift</string> + <string name="stats_lamp_handbrake">Håndbrekk</string> + <string name="stats_lamp_pit">Pitbegrenser</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olje %1$s °C</string> + <string name="stats_power">Kraftfordeler</string> + <string name="stats_fuel_t">Drivstoff, t</string> + <string name="stats_fuel_main">Hoved %1$s t</string> + <string name="stats_fuel_reserve">Reserve %1$s t</string> + <string name="bottom_telemetry_send_title">Send dashborddata</string> + <string name="bottom_telemetry_send_auto">Automatisk</string> + <string name="bottom_telemetry_send_auto_hint">Slår det på for alle spill som er oppført her, også spill som blir funnet senere. Spill du slår av, forblir av.</string> + <string name="bottom_telemetry_send_note">Dette endrer spillets egen innstilling for datautgang. Det trer i kraft neste gang spillet starter; slår du det av, settes den gamle innstillingen tilbake.</string> + <string name="bottom_telemetry_send_close">Lukk %1$s for å endre dette.</string> + <string name="bottom_telemetry_send_failed">Kunne ikke endre innstillingene for %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: slå på %2$s i spillets innstillinger med IP 127.0.0.1 og port %3$d.</string> + <string name="bottom_shots_where">Lagret i Pictures/DroidDeck. Skjermbilder fra Steam vises også her.</string> + <string name="bottom_shots_take">Ta skjermbilde</string> + <string name="bottom_shots_saved">Skjermbildet er lagret.</string> + <string name="bottom_shots_failed">Kunne ikke ta et skjermbilde.</string> + <string name="bottom_shots_none">Ingen skjermbilder ennå.</string> + <string name="bottom_page_chat">Chat & tale</string> + <string name="bottom_chat_why">Les og svar på Steam-chat her mens spillet fortsetter på hovedskjermen. Den bruker kontoen Steam er logget inn med.</string> + <string name="bottom_chat_not_signed_in">Steam har ingen nettinnlogging å dele ennå, så logg inn her én gang.</string> + <string name="bottom_chat_stopped">Android lukket chatsiden mens DroidDeck var i bakgrunnen. Den åpnes igjen når du kommer tilbake til DroidDeck.</string> + <string name="bottom_chat_open">Åpne Steam Chat</string> + <string name="bottom_chat_close">Lukk chat</string> + <string name="bottom_chat_mic_on">Mikrofon på</string> + <string name="bottom_chat_mic_off">Mikrofon av</string> + <string name="bottom_chat_mic_unavailable">Mikrofonen er av for dette spillet. For å snakke, slå på Mikrofon i DroidDecks Steam-innstillinger (Lyd) og start spillet på nytt.</string> + <string name="bottom_chat_volume">Volum %1$d%%</string> + <string name="bottom_page_telemetry">Statistikk i spillet</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batteri</string> + <string name="bottom_telemetry_lap">Runde</string> + <string name="bottom_telemetry_position">Plassering</string> + <string name="bottom_telemetry_this_lap">Denne runden</string> + <string name="bottom_telemetry_last_lap">Forrige runde</string> + <string name="bottom_telemetry_fuel">Drivstoff</string> + <string name="bottom_telemetry_cargo">Last</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Juridisk status</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Port %1$d mottar data (%2$d pakker på %3$d byte), men i et format denne siden ikke kan lese ennå.</string> + <string name="bottom_telemetry_port_busy">Et annet program bruker allerede port %1$s, så det spillet kan ikke vises her.</string> <string name="rtinst_removing">Fjerner Linux-kjøretid</string> <plurals name="rtinst_removing_entries"> @@ -1718,6 +1890,7 @@ <string name="flatpakmgr_not_ready">Sett opp Flatpak først</string> <string name="flatpakmgr_starting">Starter</string> <string name="flatpakmgr_exit_status">Flatpak avsluttet med status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s er bygget for %2$s, som DroidDeck ikke kan kjøre. Flatpak-apper her trenger en ARM64- eller x86_64-versjon.</string> <string name="flatpakmgr_installing">Installerer %1$s</string> <string name="flatpakmgr_updating">Oppdaterer %1$s</string> <string name="flatpakmgr_removing">Fjerner %1$s</string> @@ -1811,6 +1984,7 @@ <string name="adbpair_applying">Bruker innstillingen…</string> <string name="adbpair_command_failed">Kommandoen for trådløs feilsøking mislyktes</string> <string name="adbpair_channel_name">Oppsett av trådløs feilsøking</string> + <string name="adbpair_progress_channel_name">Fremdrift for oppsett av trådløs feilsøking</string> <string name="adbpair_channel_description">Ber om koblingskoden for trådløs feilsøking mens Innstillinger er åpen</string> <string name="adbpair_title_pair">Koble sammen trådløs feilsøking</string> <string name="adbpair_waiting_text">Slå på trådløs feilsøking, og trykk så på «Par enhet med koblingskode».</string> @@ -1919,6 +2093,7 @@ <string name="gpuinfo_not_adreno">Ikke en Adreno-GPU</string> <string name="gpuinfo_supported">Støttet</string> <string name="gpuinfo_experimental">Eksperimentell: driverne er testbuilder</string> + <string name="gpuinfo_a850_experimental">Eksperimentell støtte for Adreno 850: krever kompatible eksperimentelle skjerm- og spilldrivere; ikke bekreftet på denne enheten</string> <string name="gpuinfo_below_tested">Under testet maskinvare (Adreno 725 og nyere): den kan ikke kjøre</string> <string name="gpuinfo_unsupported">Ikke støttet: DroidDeck krever en Adreno (Snapdragon) GPU</string> @@ -2015,6 +2190,7 @@ <string name="display_look_filter">%1$s Setter skalering til %2$s.</string> <string name="display_match_screen">Tilpass skjerm (%1$d×%2$d)</string> <string name="display_follow_screen">Følg skjermen (endrer størrelse ved sammenslåing eller utbretting)</string> + <string name="display_follow_screen_scaled">Skalert %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Vis enhetsdetaljer</string> <string name="device_info_hide">Skjul enhetsdetaljer</string> @@ -2121,6 +2297,13 @@ <string name="stores_resume">Gjenoppta</string> <string name="stores_refresh">Oppdater</string> <string name="stores_sort">Sorter</string> + <string name="setup_rail_labels">Etiketter i sidepanelet</string> + <string name="setup_rail_labels_hint">Vis navn under ikonene i sidepanelet. Slå av for et smalere sidepanel.</string> + <string name="library_display">Visning</string> + <string name="library_display_larger">Større kort</string> + <string name="library_display_smaller">Mindre kort</string> + <string name="library_display_title">Vis tittel</string> + <string name="library_display_size">Vis størrelse</string> <string name="stores_sort_last_played">Nylig spilt</string> <string name="stores_sort_recently_installed">Nylig installert</string> <string name="stores_sort_title_asc">Tittel A–Å</string> @@ -2247,6 +2430,9 @@ <string name="stores_download_manager">Nedlastingsbehandling</string> <string name="stores_parallel">Samtidige nedlastinger</string> <string name="stores_install_where">Installer til</string> + <string name="stores_install_language">Spillspråk</string> + <string name="stores_install_language_hint">GOG og Epic installerer dette språket. System følger appspråket.</string> + <string name="stores_install_language_system">System</string> <string name="stores_install_title">Installer %1$s:</string> <string name="stores_target_internal">Intern</string> <string name="stores_target_free">%1$s ledig</string> @@ -2285,6 +2471,9 @@ <string name="edit_target">Mål</string> <string name="edit_start_in">Start i</string> <string name="edit_launch_options">Startalternativer</string> + <string name="edit_launch_options_steam_hint">Delt med Egenskaper i Steam: en endring det ene stedet vises begge steder.</string> + <string name="edit_launch_options_not_saved">Kunne ikke lagre startalternativene i Steam. Prøv igjen.</string> + <string name="edit_launch_options_desktop">Steam kan være åpent i skrivebordssesjonen. Endre startalternativene under Egenskaper der, eller lukk sesjonen først.</string> <string name="edit_artwork">Grafikk</string> <string name="edit_other_exe">Annen exe…</string> <string name="edit_remove">Fjern</string> @@ -2412,6 +2601,7 @@ <string name="setup_download_source_custom">Eget prefiks</string> <string name="setup_download_mirror">Nettsted</string> <string name="setup_download_prefix">Prefiks</string> + <string name="setup_download_proxy">HTTP-proxy</string> <string name="flathub_eyebrow">LINUX-APPER</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Skrivebordsapper for Linux-skrivebordet, åpnet fra Skrivebord.</string> @@ -2552,6 +2742,22 @@ <string name="glasses_tracking_flat_hint">Automatisk holder dette 2D-spillet fast i synsfeltet. Velg Virtuell skjerm under Skjerm for å bruke hodesporing.</string> <string name="glasses_tracking_sbs_hint">Hodesporing gjelder for en virtuell skjerm eller et SteamVR-spill som kjører.</string> <string name="glasses_hardware">Enhet</string> + <string name="vr_controllers_tab">Kontrollere</string> + <string name="vr_controllers_group">SteamVR-kontrollere</string> + <string name="vr_controllers_emulate">Spillkontroller i VR</string> + <string name="vr_controllers_emulate_hint">De to VR-hendene kontrolleren din spiller som. Endringer gjelder med en gang, også mens SteamVR kjører. Joy-Con og sporede hender tar fortsatt over sin side.</string> + <string name="vr_controllers_off">Vanlig spillkontroller</string> + <string name="vr_controllers_index">Valve Index-kontrollere</string> + <string name="vr_controllers_touch">Meta Quest 3-kontrollere</string> + <string name="vr_controllers_vive">HTC Vive-kontrollere</string> + <string name="vr_controllers_sticks">Spakene starter med å</string> + <string name="vr_controllers_sticks_hint">Trykk inn begge spakene samtidig i VR for å bytte.</string> + <string name="vr_controllers_sticks_game">Flytte deg i spillet</string> + <string name="vr_controllers_sticks_hands">Flytte hendene</string> + <string name="vr_controllers_buttons">Knapper</string> + <string name="vr_controllers_buttons_stick">Avtrekkere er avtrekkere, skulderknapper griper, A/B og X/Y er hver hånds frontknapper, spakeklikk klikker tommelspakene, Guide åpner SteamVR-menyen. Retningsknapp opp og ned flytter hendene nærmere eller lenger unna.</string> + <string name="vr_controllers_buttons_vive">Spakene er styreflater; A/X eller spakeklikk trykker på dem. Avtrekkere er avtrekkere, skulderknapper griper, Start og Select er meny, Guide åpner SteamVR-menyen.</string> + <string name="vr_controllers_buttons_off">Ingen VR-hender. Spill som støtter spillkontroller, og SteamVR-menyen, får kontrolleren din som vanlig.</string> <string name="glasses_brightness">Lysstyrke</string> <string name="glasses_volume">Volum</string> <string name="glasses_sunblock">Solskjerming</string> @@ -2609,6 +2815,12 @@ <string name="hand_camera_placement">Kameraplassering</string> <string name="hand_camera_placement_hint">Sjekk at kameraet kan se deg før du spiller.</string> <string name="hand_camera_check">Sjekk</string> + <string name="tracking_pack_title">Nedlasting av håndsporing</string> + <string name="tracking_pack_hint">Håndsporing krever en engangsnedlasting på %1$s.</string> + <string name="tracking_pack_download">Last ned</string> + <string name="tracking_pack_retry">Prøv igjen</string> + <string name="tracking_pack_downloading">Laster ned håndsporing… %1$d%%</string> + <string name="tracking_pack_failed">Kunne ikke laste ned håndsporing. Sjekk tilkoblingen og prøv igjen.</string> <string name="hand_camera_check_title">Kameraplassering</string> <string name="hand_camera_how_rear">Still enheten opp 1,5 til 2 meter unna i omtrent brysthøyde, med det bakre kameraet vendt mot deg. Tre så inn i bildet med hendene ute.</string> <string name="hand_camera_how_front">Still enheten opp 1,5 til 2 meter unna i omtrent brysthøyde, med skjermen vendt mot deg. Tre så inn i bildet med hendene ute.</string> @@ -2680,6 +2892,21 @@ <string name="storage_safe_hint">Ubrukte kjøretidsmiljøer, rester, gamle logger</string> <string name="storage_clean_up">Rydder…</string> <string name="storage_session_running">Stopp økten for å rydde eller slette noe. Størrelsene vises fortsatt.</string> + <string name="storage_default_group">Installasjonsplassering</string> + <string name="storage_default_title">Standard lagring</string> + <string name="storage_default_hint">Nye butikkinstallasjoner havner på valgt plassering. Eksisterende spill blir der de er. Steam-biblioteker beholder sin egen innstilling.</string> + <string name="storage_default_ask">Spør hver gang</string> + <string name="storage_default_ask_detail">Velg et mål for hver installasjon</string> + <string name="storage_default_internal">Intern lagring</string> + <string name="storage_default_external">Ekstern lagring</string> + <string name="storage_default_external_detail">%1$s · %2$s ledig</string> + <string name="storage_default_external_missing">Ikke tilkoblet</string> + <string name="storage_default_folder">Mappe · %1$s</string> + <string name="storage_default_folder_free">%1$s ledig</string> + <string name="storage_default_folder_missing">Ikke tilkoblet</string> + <string name="storage_default_choose_folder">Velg mappe…</string> + <string name="storage_default_choose_folder_detail">Bruk en hvilken som helst mappe på et SD-kort eller en USB-enhet</string> + <string name="storage_default_note">Spill legges i en Games-mappe på valgt plassering. Eksisterende spill flyttes ikke.</string> <string name="storage_where">Hvor det ender</string> <string name="storage_games">Steam-spill</string> <string name="storage_game_data">Spilldata</string> @@ -2801,6 +3028,9 @@ <string name="storage_data_installed">Installerte spill</string> <string name="storage_data_parts">Prefiks %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Rydd shaders</string> + <string name="storage_reset_prefix">Tilbakestill prefiks</string> + <string name="storage_reset_prefix_title">Tilbakestille prefiks for %1$s?</string> + <string name="storage_reset_prefix_confirm">Sletter Wine-prefikset (%1$s) i %2$s og oppretter det på nytt ved neste start. Lagringer, innstillinger og installerte redistribuerbare pakker i det går tapt; Steam Cloud-lagringer blir værende på kontoen din.</string> <string name="storage_data_leftovers">Slettede spill</string> <string name="storage_steam_app">Steam-app %1$d</string> <string name="storage_leftover_unsure_detail">Prefikset inneholder fortsatt filer, kanskje lokale lagringer</string> @@ -3102,6 +3332,117 @@ <string name="spatial_saved_views_hint">Lagrede visninger kan beregnes på nytt. Start en ny kalibrering for å fange opp i gjeldende sporingskoordinatsystem.</string> <string name="spatial_model_checksum_error">Uoverensstemmelse med håndmodellsjekksum</string> <string name="spatial_opencv_load_error">OpenCV kunne ikke laste</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synkroniser med Syncthing</string> + <string name="sync_enable_hint">Dette er en Syncthing-implementasjon basert på Syncthing-Fork som lar deg synkronisere filer i DroidDecks interne filsystem med andre Syncthing-instanser. Dette gjelder bare filer du lagrer i DroidDecks interne filsystem.</string> + <string name="sync_missing">Denne versjonen inneholder ikke Syncthing.</string> + <string name="sync_starting">Starter Syncthing</string> + <string name="sync_status_starting">Starter</string> + <string name="sync_status_up_to_date">Oppdatert</string> + <string name="sync_status_syncing">Synkroniserer</string> + <string name="sync_status_paused">Pauset</string> + <string name="sync_status_pausing">Pauser</string> + <string name="sync_status_resuming">Gjenopptar</string> + <string name="sync_status_attention">Trenger oppmerksomhet</string> + <string name="sync_status_failed">Syncthing stoppet</string> + <string name="sync_failed_retry">Prøv igjen</string> + <string name="sync_paused_wifi">Pauset til Wi-Fi er tilgjengelig</string> + <string name="sync_paused_game">Pauset under spillet</string> + <string name="sync_summary">%1$d mapper · %2$d av %3$d enheter tilkoblet</string> + <string name="sync_left">%1$s igjen</string> + <string name="sync_open_web_ui">Åpne nettgrensesnittet</string> + <string name="sync_pause">Pause</string> + <string name="sync_resume">Gjenoppta</string> + <string name="sync_running">Kjører</string> + <string name="sync_running_hint">Slå av for å stoppe Syncthing helt.</string> + <string name="sync_this_device">Denne enheten</string> + <string name="sync_device_id">Enhets-ID</string> + <string name="sync_show_qr">Vis QR</string> + <string name="sync_advanced">Avansert</string> + <string name="sync_advanced_hint">Porter, når den skal kjøre, nullstilling</string> + <string name="sync_open">Åpne</string> + <string name="sync_waiting">Venter på deg</string> + <string name="sync_pending_device">%1$s vil koble til</string> + <string name="sync_pending_folder">%1$s vil dele «%2$s»</string> + <string name="sync_pending_folder_hint">Godta for å velge hvor den lagres i DroidDeck.</string> + <string name="sync_review">Se gjennom i nettgrensesnittet</string> + <string name="sync_folders">Mapper</string> + <string name="sync_no_folders">Ingen mapper ennå.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Oppdatert</string> + <string name="sync_folder_syncing">Synkroniserer %1$d%%</string> + <string name="sync_folder_scanning">Skanner</string> + <string name="sync_folder_paused">Pauset</string> + <string name="sync_folder_out_of_sync">Ikke synkronisert</string> + <string name="sync_folder_errors">%1$d filer kunne ikke synkroniseres</string> + <string name="sync_folder_blocked">Blokkert</string> + <string name="sync_folder_blocked_hint">Denne mappen ligger utenfor DroidDecks lagring, så DroidDeck har pauset den. Bruk Syncthing-Fork-appen for å synkronisere mapper utenfor DroidDeck.</string> + <string name="sync_remove_folder">Fjern fra Syncthing</string> + <string name="sync_remove_folder_hint">Fjerning sletter ingen filer.</string> + <string name="sync_devices">Enheter</string> + <string name="sync_no_devices">Ingen enheter ennå.</string> + <string name="sync_connected">Tilkoblet</string> + <string name="sync_offline">Frakoblet</string> + <string name="sync_last_seen">Sist sett %1$s</string> + <string name="sync_device_id_title">Denne enhetens ID</string> + <string name="sync_device_id_hint">Legg til en enhet i Syncthing på den andre enheten din, og skann denne koden eller lim inn ID-en. Godta den deretter her i nettgrensesnittet.</string> + <string name="sync_copy">Kopier</string> + <string name="sync_share">Del</string> + <string name="sync_done">Ferdig</string> + <string name="sync_off_title">Slå av Syncthing?</string> + <string name="sync_off_body">Syncthing stopper nå og forblir stoppet til den slås på igjen. Synkroniserte filer blir liggende der de er.</string> + <string name="sync_off_forget">Slett også Syncthing-konfigurasjonen</string> + <string name="sync_off_forget_hint">Fjerner denne enhetens ID, mapper og enheter. Når den slås på igjen, starter den på nytt fra bunnen av.</string> + <string name="sync_turn_off">Slå av</string> + <string name="sync_ports">Porter</string> + <string name="sync_port_sync">Synkronisering</string> + <string name="sync_port_discovery">Lokal oppdaging</string> + <string name="sync_repick">Velg nye porter</string> + <string name="sync_repick_hint">Kontrolleres på nytt ved hver oppstart.</string> + <string name="sync_repick_button">Velg på nytt</string> + <string name="sync_reset_group">Nullstill</string> + <string name="sync_api_key">API-nøkkel</string> + <string name="sync_regenerate">Generer på nytt</string> + <string name="sync_reset">Nullstill Syncthing</string> + <string name="sync_reset_hint">Ny enhets-ID, mapper og enheter fjernes. Filer i DroidDecks lagring beholdes.</string> + <string name="sync_reset_button">Nullstill</string> + <string name="sync_reset_confirm_title">Nullstille Syncthing?</string> + <string name="sync_running_group">Kjøring</string> + <string name="sync_run">Kjør</string> + <string name="sync_run_open">Mens DroidDeck er åpen</string> + <string name="sync_run_background">I bakgrunnen</string> + <string name="sync_wifi_only">Bare Wi-Fi</string> + <string name="sync_pause_games">Pause under spilling</string> + <string name="sync_logs">Logger</string> + <string name="sync_logs_hint">Syncthing-utdata for denne sesjonen</string> + <string name="sync_logs_share">Del</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Konfigurer Linux-kjøretiden først.</string> + <string name="sync_accept">Godta</string> + <string name="sync_accept_title">Lagre «%1$s» i</string> + <string name="sync_add_folder">Legg til mappe</string> + <string name="sync_add_folder_hint">Synkroniser en mappe i DroidDecks lagring</string> + <string name="sync_choose">Velg</string> + <string name="sync_add">Legg til</string> + <string name="sync_add_failed">Mappen kunne ikke legges til.</string> + <string name="sync_share_with">Del med</string> + <string name="sync_share_none">Ingen enheter ennå. Du kan dele denne mappen fra nettgrensesnittet senere.</string> + <string name="sync_use_folder">Bruk denne mappen</string> + <string name="sync_new_folder">Ny mappe</string> + <string name="sync_location_home">Hjemmemappe i containeren</string> + <string name="sync_location_sync">Sync-mappe</string> + <string name="sync_location_shared">DroidDecks delte lagring</string> + <string name="sync_location_card">DroidDeck på %1$s</string> + <string name="sync_location_app">DroidDeck-appdata</string> + <string name="sync_web_path_locked">Nye mapper lagres i DroidDecks Sync-mappe. For å synkronisere en annen DroidDeck-mappe, bruk Legg til mappe på Syncthing-fanen.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Last på nytt</string> + <string name="sync_not_running">Syncthing kjører ikke.</string> + <string name="session_end_steam_sigill">Steam stoppet med en ulovlig instruksjon (SIGILL). Dette kan være et kompatibilitetsproblem med CPU-instruksjoner eller et klientkrasj. Del loggene sammen med detaljer om enheten din.</string> + <string name="session_end_steam_try_x64">Du kan prøve Steam-innstillinger → Steam-klient → x86-64 (eksperimentell). Det krever en ekstra nedlasting og kan kjøre tregere.</string> + <string name="session_end_vulkan_device">Linux-grafikkdriveren fant ingen brukbar Vulkan-enhet. Sjekk at den valgte Linux-GPU-driveren støtter denne GPU-en.</string> + <string name="session_end_gpu_unsupported">Denne sesjonen kan ikke starte fordi denne GPU-en ikke har noen kompatibel Linux Vulkan-driver i det nåværende oppsettet. Adreno Turnip-drivere kan ikke gi støtte for MediaTek/Mali-GPU-er.</string> <string name="setup_group_memory">Minne</string> <string name="setup_clear_cached">Lukk bufrede apper før en sesjon</string> <string name="setup_clear_cached_hint">Når en sesjon starter, lukker DroidDeck appene Android holder parkert i bakgrunnen, slik at spillet får mer minne. Trådløs feilsøking må være på.</string> @@ -3125,6 +3466,12 @@ <string name="epic_client_open">Åpne</string> <string name="epic_client_install">Installer</string> <string name="game_tab_about">Om</string> + <string name="game_resources_browser">Åpnes i nettleseren</string> + <string name="game_resource_guides">Veiledninger</string> + <string name="game_resource_protondb_detail">Kompatibilitetsrapporter for Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">For spill med lagringer på Steam-kontoen din</string> + <string name="game_resource_search">Nettsøk</string> <string name="game_tab_install">Installer</string> <string name="game_install_location">Plassering</string> <string name="game_install_folder">Mappe</string> @@ -3141,6 +3488,11 @@ <string name="stores_eyebrow_pass">tilgjengelig med %1$s</string> <string name="stores_owned_in_library">Eide spill i Bibliotek</string> <string name="library_filter_added">Lagt til</string> + <string name="library_filter">Filter</string> + <string name="library_filter_installed">Bare installerte</string> + <string name="library_filter_all_owned">Alle eide spill</string> + <string name="library_no_installed_matches">Ingen installerte spill samsvarer med disse filtrene.</string> + <string name="library_browse_owned">Bla gjennom eide spill</string> <string name="game_tab_launch">Start</string> <string name="game_tab_saves_cloud">Lagrede spill og sky</string> <string name="game_launch_shortcut">Steam-snarvei</string> @@ -3158,6 +3510,40 @@ <string name="stores_itch_update_replaced">Utvikleren har erstattet denne versjonen med %1$s. Oppdatere til den?</string> <string name="xbox_filter_cloud">Sky</string> <string name="stores_xbox_cloud_settings">Skyinnstillinger</string> + <string name="integration_title">Steam-integrering</string> + <string name="integration_count">%1$d av %2$d på</string> + <string name="integration_set_up">Konfigurer</string> + <string name="integration_location">Posisjon</string> + <string name="integration_app_info">Appinfo</string> + <string name="integration_wifi">Wi-Fi-navn</string> + <string name="integration_brightness">Lysstyrke</string> + <string name="integration_home">DroidDeck som startskjerm</string> + <string name="integration_shortcuts">Systemtaster</string> + <string name="integration_wifi_hint">Vis nettverk i Steam · krever posisjonstilgang, spores aldri</string> + <string name="integration_wifi_on">Nettverk vises i Steam</string> + <string name="integration_wifi_location_off">Posisjon er av</string> + <string name="integration_wifi_denied">Posisjon avslått · tillat den i Appinfo</string> + <string name="integration_brightness_hint">Steams glidebryter styrer skjermens lysstyrke</string> + <string name="integration_home_hint">Hjem åpner Steam-menyen i en sesjon</string> + <string name="integration_shortcuts_hint">Alt+Tab, Win-tasten og Hjem-knappen blir i økten</string> + <string name="integration_shortcuts_maybe_restricted">Nedtonet i Android? Appinfo → ⋮ → Tillat begrensede innstillinger</string> + <string name="integration_shortcuts_restricted">Blokkert av Android · Appinfo → ⋮ → Tillat begrensede innstillinger</string> + <string name="integration_shortcuts_service">DroidDeck-systemtaster</string> + <string name="integration_shortcuts_service_description">Holder Alt+Tab, Win-tasten og Hjem-knappen i en aktiv DroidDeck-økt i stedet for Android.</string> + <string name="integration_brightness_needed">Slå på Lysstyrke i Oppsett → Steam-integrering</string> + <string name="setup_gpu_bridge_off">Mali-bro: av</string> + <string name="setup_gpu_bridge_on">Mali-bro: på</string> + <string name="setup_gpu_bridge_detail">%1$s er ikke en Adreno. Den eksperimentelle Vulkan-broen er på: økten tegner gjennom telefonens egen driver. Forvent feil; send øktloggene.</string> + <string name="setup_bridge_safe">Sikker modus</string> + <string name="setup_bridge_safe_on">Sikker modus: på</string> + <string name="setup_bridge_safe_off">Sikker modus: av</string> + <string name="setup_bridge_safe_on_detail">Mest kompatibel. Anbefales for en ny enhet.</string> + <string name="setup_bridge_safe_off_detail">Raskere der denne GPU-en besto kontrollene sine.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatisk</string> + <string name="setup_bridge_dxvk_proton">DXVK: Protons egen</string> + <string name="setup_bridge_dxvk_auto_detail">Bruker en eldre DXVK der denne GPU-ens Vulkan er for gammel for Protons.</string> + <string name="setup_bridge_dxvk_proton_detail">Hver Proton beholder sin egen DXVK, selv der denne GPU-ens Vulkan kan være for gammel for den.</string> <string name="apps_search_hint">Søk i apper</string> <string name="apps_no_match">Ingen apper samsvarer med «%1$s».</string> <string name="apps_add_widget">Legg til modul</string> @@ -3206,6 +3592,8 @@ <string name="desktop_restore_done_body">Appene du la til er installert igjen.</string> <string name="desktop_restore_failed_title">Noe programvare kunne ikke gjenopprettes</string> <string name="desktop_restore_failed_body">Se ~/.cache/droiddeck/apt-restore.log, og prøv deretter sudo apt install i Konsole.</string> + <string name="gog_full_files">Native optimaliseringer er ikke tilgjengelige. Nedlastingen inneholder komplette erstatningsfiler.</string> + <string name="gog_recover">Kontroller resultatet av oppdateringen</string> <string name="slow_usb_title">Treg USB-tilkobling</string> <string name="slow_usb_cable">%1$s er koblet til via %2$s (%3$s Mbps, ca. %4$d MB/s), så spill på den lastes inn tregt. Bruk en USB 3-kabel for 5 Gbps eller mer, prøv å snu USB-C-pluggen, eller bruk en raskere stasjon.</string> <string name="slow_usb_port">%1$s er koblet til via %2$s (%3$s Mbps, ca. %4$d MB/s). USB-porten på denne enheten kan ikke gå raskere, så spill lastes inn tregt. Intern lagring eller et microSD-kort kan være raskere.</string> @@ -3216,4 +3604,52 @@ <string name="steam_import_names_more">%1$s og %2$d til</string> <string name="steam_import_now">Start på nytt nå</string> <string name="steam_import_later">Senere</string> + <string name="gog_maintenance">Administrer GOG-installasjon</string> + <string name="gog_check">Se etter oppdateringer</string> + <string name="gog_repair">Kontroller/reparer</string> + <string name="gog_patches">Frakoblede oppdateringer</string> + <string name="gog_refresh">Last ned fullt frakoblet installasjonsprogram</string> + <string name="gog_update">Oppdater til %1$s</string> + <string name="gog_resume">Gjenoppta GOG-vedlikehold</string> + <string name="gog_open_patch">Åpne oppdateringsprogram</string> + <string name="gog_patch_in_session">Fullfør eller avbryt oppdateringsprogrammet i Linux-sesjonen.</string> + <string name="gog_patch_requirements">Velg en oppdatering for den installerte versjonen og språket ditt. Støttede kildeversjoner er kanskje ikke oppført.</string> + <string name="gog_no_patches">GOG har ingen frittstående Windows-oppdateringer for dette spillet.</string> + <string name="gog_managed_files">Endrede spillfiler kan bli erstattet.</string> + <string name="gog_patch_installer_note">Installasjonsprogrammet åpnes i Linux-sesjonen din.</string> + <string name="gog_download_label">Nedlasting</string> + <string name="gog_space_label">Ekstra plass</string> + <string name="gog_space_estimate_label">Anslått plass</string> + <string name="gog_repair_action">Reparer filer</string> + <string name="gog_refresh_action">Oppdater installasjonen</string> + <string name="gog_select_patch">Velg</string> + <string name="stores_gamejolt_not_owned">Ikke i Game Jolt-biblioteket ditt</string> + <string name="stores_gamejolt_no_build">Ingen Windows-nedlasting for dette spillet</string> + <string name="stores_gamejolt_no_exe">Fant ikke noe Windows-spill i nedlastingen</string> + <string name="stores_gamejolt_no_game">Fant ikke dette spillet på Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Kunne ikke laste spill fra Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt svarte HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Kunne ikke laste inn nedlastingene fra Game Jolt</string> + <string name="stores_gamejolt_build_open">Åpne på Game Jolt</string> + <string name="stores_gamejolt_archive">%1$s-arkiver støttes ikke</string> + <string name="stores_gamejolt_extract_failed">Kunne ikke pakke ut nedlastingen (kode %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Kunne ikke nå Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt ga ingen nedlastingslenke</string> + <string name="stores_gamejolt_section_featured">Fremhevet</string> + <string name="stores_gamejolt_section_hot">Populære</string> + <string name="stores_gamejolt_section_best">Beste</string> + <string name="stores_gamejolt_section_new">Nye</string> + <string name="stores_gamejolt_price_under_30">$30 eller mindre</string> + <string name="stores_gamejolt_os_other">Annet</string> + <string name="stores_gamejolt_maturity_everyone">Alle aldre</string> + <string name="stores_gamejolt_maturity_teen">Tenåringer</string> + <string name="stores_gamejolt_maturity_adult">Voksne</string> + <string name="stores_gamejolt_status_complete">Ferdig</string> + <string name="stores_gamejolt_status_early">Early access</string> + <string name="stores_gamejolt_partners">Partnerspill</string> + <string name="stores_gamejolt_filter_browser">Nettleser</string> + <string name="stores_gamejolt_filter_maturity">Aldersgrense</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partnere</string> + <string name="stores_gamejolt_followed">Fulgte spill</string> </resources> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 278d7e8e86..aacc9dd20e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-opties voor D3D12. nodxr schakelt raytracing uit; gebruik dit alleen voor een game die dat nodig heeft.</string> <string name="game_env_proton_log">Stel in op 1 voor een diagnostisch Proton-log. Loggen kan de prestaties verlagen en kost opslag.</string> <string name="game_env_wined3d">Stel in op 1 om voor compatibiliteitstests met D3D9–11 het op OpenGL gebaseerde WineD3D te gebruiken in plaats van DXVK.</string> + <string name="game_env_wined3d_renderer">Renderer voor DirectDraw, Direct3D 1–7 en games die met WineD3D draaien. Vulkan slaat de route via OpenGL op Zink over en is op Adreno veel sneller voor oude DirectDraw- en Direct3D 7-games.</string> + <string name="game_env_dxvk_d3d8">Stel in op 1 om Direct3D 8 via DXVK te draaien in plaats van WineD3D. Sneller in de Direct3D 8-test van AIO Graphics Test op Adreno.</string> <string name="game_env_no_ntsync">Stel in op 1 om deze game niet op ntsync (droiddeck-ntsync of een kerneldriver) te draaien; dan wordt droiddeck-esync gebruikt als er een pakket is, anders droiddeck-fsync.</string> <string name="game_env_no_esync">Stel in op 1 om droiddeck-esync uit te zetten voor deze game; dan wordt droiddeck-fsync gebruikt, of droiddeck-ntsync als fsync ook uit staat.</string> <string name="game_env_no_fsync">Stel in op 1 om deze game niet op droiddeck-fsync te draaien; dan wordt droiddeck-esync gebruikt als er een pakket is, anders droiddeck-ntsync.</string> <string name="game_env_fsync_first">Stel in op 1 om deze game op droiddeck-fsync te draaien, of op 0 om droiddeck-esync voorrang te geven als er een pakket bij de Proton-versie past.</string> <string name="game_env_xalia">Stel in op 0 om de gamepadnavigatiehulp van Proton voor deze game uit te schakelen.</string> + <string name="game_env_anticheat_offline">Standaard aan. Start een Easy Anti-Cheat-game zonder anti-cheat als de game offline spelen ondersteunt. Zet dit uit om zoals gewoonlijk via Easy Anti-Cheat te starten. Onlinemodi die Easy Anti-Cheat vereisen, blijven onbeschikbaar.</string> <string name="game_env_hud">DXVK-overlay voor D3D9–11. fps toont de framerate; niet ingesteld verbergt de overlay.</string> <string name="game_env_dxvk_config">DXVK-instellingen, gescheiden door puntkomma’s. Recente builds gebruiken dxvk.maxFrameRate om de framerate te begrenzen; gebruik voor normaal spelen liever de framelimiet van de sessie.</string> + <string name="game_env_cores">CPU-cores voor deze game, zoals 0-4 of 0,2,4, in plaats van de gamecores van de sessie. Minder cores blijven koeler.</string> <string name="game_env_vkd3d_limit">Framerate-limiet voor D3D12. 0 schakelt de limiet uit.</string> <string name="game_env_glthread">OpenGL-threading van Mesa. true kan helpen bij CPU-beperkte OpenGL-games; test per game.</string> <string name="sync_backend_title">Wine-synchronisatie</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX draait x86-Linux-programma’s op dit ARM64-apparaat. Bij Automatisch wordt FEX gebruikt als het programma voor x86 is gemaakt.</string> <string name="app_fex_x86">%1$s via FEX</string> <string name="app_fex_not_ready">Dit programma is gemaakt voor %1$s-pc’s en draait via FEX, dat nog niet is ingesteld. Open Steam één keer terwijl je bent ingelogd: DroidDeck laat het dan FEX en de benodigde Steam Linux Runtime downloaden. Daarna opent dit.</string> + <string name="session_proot_missing">De proot van DroidDeck kon niet worden gedownload. Controleer de verbinding en probeer het opnieuw. De sessie is niet gestart, omdat de reserve-proot te traag is om op te spelen.</string> + <string name="session_directaudio_missing">DirectAudio kon niet worden gedownload, dus gamegeluid gebruikt deze sessie de tragere route.</string> <string name="session_end_program">Dit programma</string> <string name="session_end_steam_download">De Steam-client kon niet worden gedownload. Je netwerk of VPN blokkeert mogelijk de servers van Steam; controleer de verbinding en probeer het opnieuw.</string> <string name="session_end_steam_setup">De Steam-client kon niet worden ingesteld. Controleer de verbinding en de vrije opslag en probeer het opnieuw.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360-controller</string> <string name="mode_controller_note">Deck: knop Snelle toegang en gyro. Steam Controller: hetzelfde, met gripsensor op de achterknoppen. DualShock 4 en DualSense: gyro, en de trackpads als hun touchpad. Xbox 360: open Snelle toegang met Guide+A.</string> <string name="mode_back">Terug</string> + <string name="back_hold">Terug ingedrukt houden voor Steam-sneltoetsen</string> + <string name="back_hold_hint">Terug ingedrukt houden opent Snelle toegang of maakt Steam-combinaties met andere knoppen. Zet uit om ingedrukt houden te negeren; tikken en dubbeltikken blijven werken.</string> + <string name="back_native_qam_hint">Houd Terug 700 ms ingedrukt, of houd Terug ingedrukt en druk op een andere knop voor Steam-sneltoetsen.</string> + <string name="back_double_tap_window">Tijdvenster voor dubbeltikken</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Helderheidsbediening toestaan</string> + <string name="brightness_permission_text">Stel helderheidsbediening in DroidDeck in.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sessie</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Stel onderbreken op de achtergrond uit zolang Steam actief downloadt.</string> <string name="mode_suspend_note">Automatisch pauzeert op de achtergrond en hervat zodra de app weer zichtbaar is. Handmatig wacht op Hervatten. Nooit laat alles doorlopen.</string> <string name="mode_startup">Opstarten</string> - <string name="mode_steam_startup">Steam starten met DroidDeck</string> - <string name="mode_steam_startup_hint">Opent de Steam-sessie als DroidDeck start.</string> + <string name="mode_startup_session">Openen bij start</string> + <string name="mode_startup_session_hint">Start deze sessie wanneer DroidDeck start.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Zoeken naar releases…</string> <string name="mode_decky_ready">Klaar om %1$s te installeren.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Up-to-date · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Nieuwste installeren</string> + <string name="decky_channel">Updatekanaal</string> + <string name="decky_channel_hint">Welke Decky Loader-releases worden geïnstalleerd. De eigen updater van Decky gebruikt hetzelfde kanaal.</string> + <string name="decky_channel_stable">Stabiel</string> + <string name="decky_channel_prerelease">Voorlopige release</string> + <string name="decky_channel_testing">Testversie</string> + <string name="decky_channel_failed">Kan het Decky-updatekanaal niet opslaan</string> <string name="mode_decky_on">Start met Steam. Zolang dit aan staat, kunnen andere apps op dit apparaat Steam mogelijk bedienen.</string> <string name="mode_decky_off">Uit. De poort voor foutopsporing op afstand van Steam blijft dicht.</string> <string name="mode_decky_remove_title">Decky Loader verwijderen?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Client</string> <string name="mode_mangoapp">Prestatie-overlay</string> <string name="mode_mangoapp_hint">Zet dit uit als games crashen of zwart worden in de Deck-modus. Geldt vanaf de volgende sessie.</string> + <string name="mode_return_after_game">Na een game terug naar DroidDeck</string> + <string name="mode_return_after_game_hint">Als een game die je vanuit DroidDeck of een andere launcher hebt gestart sluit, stopt Steam netjes (cloudopslag wordt eerst afgerond) en ga je daarheen terug. Uit: in Steam blijven.</string> + <string name="mode_shader_precache">Shaders vooraf cachen</string> + <string name="mode_shader_precache_hint">Steam downloadt kant-en-klare shaders voor je games en verwerkt ze op de achtergrond, zodat games minder haperen. Uit bespaart data, opslag en batterij; games bouwen shaders dan tijdens het spelen. Dezelfde instelling als Downloads > Shaders vooraf cachen in Steam. Geldt vanaf de volgende sessie.</string> <string name="mode_steam_repair">Steam-client repareren</string> <string name="mode_steam_repair_hint">Downloadt de Steam-client opnieuw bij de volgende start van Steam. Gebruik dit als Steam op het laadscherm blijft hangen. Games, login en instellingen blijven behouden.</string> <string name="mode_steam_repair_queued">De Steam-client wordt opnieuw gedownload bij de volgende start van Steam.</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">Omzeilt PulseAudio voor minder vertraging.</string> <string name="mode_mic">Microfoon</string> <string name="mode_mic_hint">Voor spraakchat.</string> + <string name="drawer_mic_hint">Zet microfoonopname aan of uit voor deze sessie.</string> + <string name="drawer_mic_failed">Kan de microfoon niet wijzigen. Probeer het opnieuw.</string> <string name="mode_network">Netwerk</string> <string name="mode_wifi_discovery">Wi-Fi-detectie</string> <string name="mode_wifi_discovery_hint">Toon Wi-Fi-namen en netwerken in de buurt in Steam.</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: realtime GPU-wachtrij</string> <string name="perf_gsrealtime_hint">Geeft het GPU-werk van de compositor voorrang. Kan de framepacing gladder maken, ten koste van wat gameprestaties.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Geheugen</string> + <string name="perf_cap_off">Uit</string> + <string name="perf_cap_auto">Driverstandaard</string> + <string name="perf_zram_client">Steam comprimeren terwijl een game draait</string> + <string name="perf_zram_client_hint">20 s nadat een game start, wordt de Steam-client in zRAM gecomprimeerd om de game meer geheugen te geven, en teruggelezen als de game sluit. Zet dit uit als de sessie kort na het starten van games sluit. Een RAM-limiet hierboven comprimeert Steam nog steeds als de sessie die overschrijdt.</string> + <string name="perf_ram_cap">RAM-limiet</string> + <string name="perf_ram_cap_hint">Geldt terwijl de Steam-client draait, in de Steam-modus of vanaf de desktop. Als de sessie meer gebruikt dan dit, worden Steam en daarna de andere ondersteunde processen van de sessie in zRAM gecomprimeerd. Een zachte limiet: er wordt niets gesloten, maar games kunnen haperen terwijl pagina’s terugkomen.</string> + <string name="perf_ram_cap_unavailable">Vereist zRAM-swap, die dit apparaat niet heeft.</string> + <string name="perf_vram_cap">VRAM-limiet</string> + <string name="perf_vram_cap_hint">Het videogeheugen dat DXVK aan Direct3D-games meldt, zodat ze minder ruimte voor texturen plannen. De eigen DXVK-instellingen van een game gaan voor. Geldt vanaf de volgende sessie.</string> <string name="perf_gpuclock">GPU op hoogste kloksnelheid houden</string> <string name="perf_gpuclock_hint">Alleen Adreno. Minder haperingen, meer batterijverbruik en warmte.</string> <string name="perf_fixes">Sessiefixes</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">proot-snelpad</string> <string name="perf_fastpath_needs_seccomp">Vereist het seccomp-filter van proot.</string> <string name="perf_fastpath_hint">Snellere bestandstoegang en minder stotteren. Zet dit uit als een programma zijn bestanden niet kan vinden.</string> + <string name="perf_cursor_composite">Cursor in gamescope tekenen</string> + <string name="perf_cursor_composite_hint">Gamescope tekent de aanwijzer zelf in plaats van die aan Android over te laten. Zet dit aan voor een cursor die je met een controller bestuurt. Uit is sneller op een telefoon. Geldt vanaf de volgende sessie.</string> <string name="perf_identity">Sessie-identiteit</string> <string name="perf_hostname">Hostnaam</string> <string name="perf_hostname_hint">De naam die Steam voor dit apparaat ziet. Leeg herstelt %1$s.</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">De bestanden worden uit de app verwijderd.</string> <string name="driver_delete_in_use">De bestanden worden verwijderd. Hij is in gebruik, dus de standaard neemt het over.</string> <string name="drawer_page_display">Scherm</string> + <string name="drawer_frame_limit">Framelimiet</string> + <string name="drawer_frame_limit_note">Begrenst deze game. Het scherm schakelt over naar een vernieuwingsfrequentie die precies deelbaar is door de limiet, als die er is; andere limieten kunnen ongelijkmatig ogen. Steam-games gebruiken de framelimiet van Steam in het Snelmenu.</string> <string name="drawer_page_effects">Effecten</string> <string name="drawer_page_controls">Bediening</string> <string name="drawer_page_components">Componenten</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">Pil</string> <string name="hud_size_minimal">Minimaal</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Balk</string> <string name="hud_locked">Vastzetten</string> <string name="hud_locked_hint">Sleep de HUD om hem te verplaatsen; lang drukken zet hem vast of los. Zolang hij vastzit, blijven de schermknoppen eronder werken.</string> + <string name="hud_snap">Vastklikken aan zijkanten</string> + <string name="hud_snap_hint">Laat de HUD los en hij gaat naar de dichtstbijzijnde kant van het scherm. Met een snelle veeg gooi je hem die kant op.</string> <string name="hud_group_look">Weergave</string> <string name="hud_scale">Grootte op scherm</string> <string name="hud_color_soft">Zacht</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">Kan het HUD-rapport niet opslaan.</string> <string name="hud_reset">HUD-instellingen resetten</string> <string name="hud_reset_button">Resetten</string> - <string name="hud_credit">FusionHUD door The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Schaalmodus</string> <string name="drawer_scaling_sharpness">Schaalscherpte</string> <string name="drawer_effects">Schermeffecten</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">Automatisch (%1$s)</string> <string name="drawer_keyboard">Toetsenbord</string> <string name="drawer_latency">Latentie</string> + <string name="drawer_low_latency">Modus voor lage latentie</string> + <string name="drawer_low_latency_hint">Verhoogt CPU- en batterijgebruik</string> <string name="drawer_low_latency_controller">Controller met lage latentie</string> <string name="drawer_low_latency_controller_hint">De controller rapporteert op 1000 Hz in plaats van 250 Hz. Iets meer CPU.</string> <string name="drawer_low_latency_touch">Aanraking met lage latentie</string> <string name="drawer_low_latency_touch_hint">Aanrakingen slaan framebundeling over; Steam-aanraakbediening op 1000 Hz. Iets meer CPU.</string> <string name="drawer_evdev_mouse">Ruw muiskanaal</string> + <string name="drawer_relative_mouse">Relatieve muis</string> + <string name="drawer_relative_mouse_auto">Automatisch</string> + <string name="drawer_relative_mouse_on">Aan</string> + <string name="drawer_relative_mouse_off">Uit</string> <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Pc-toetsenbord</string> <string name="drawer_android_keyboard">Android</string> @@ -791,6 +838,10 @@ <string name="setup_session">Sessie</string> <string name="setup_logs">Sessielogs</string> <string name="setup_logs_hint">Opgeslagen na elke sessie</string> + <string name="setup_game_debug_logs">Debuglogs van games</string> + <string name="setup_game_debug_logs_hint">Neem bij de volgende gamestart diagnostiek van Proton, Wine en graphics op. Kan de prestaties verlagen en meer opslag gebruiken.</string> + <string name="setup_game_debug_logs_restart">Start deze sessie opnieuw om debuglogs van games op te slaan</string> + <string name="setup_logging_update_failed">Kan logging niet bijwerken. Controleer de schakelaar en probeer het opnieuw.</string> <string name="setup_agent_commands">Hulpmiddelen voor debuggen</string> <string name="setup_latest_logs">Nieuwste sessielogs</string> <string name="setup_saved_logs">Opgeslagen sessielogs</string> @@ -822,20 +873,22 @@ <string name="setup_home">Als startscherm gebruiken</string> <string name="setup_home_on">DroidDeck kan de startschermapp zijn</string> <string name="setup_home_off">DroidDeck wordt nooit aangeboden als startschermapp</string> + <string name="setup_home_game_space_first">Zet DroidDeck bij Games toevoegen op Opnemen</string> <string name="setup_orientation">Oriëntatie</string> + <string name="setup_launcher_orientation">Oriëntatie van launcher</string> + <string name="setup_launcher_orientation_auto">Apparaatrotatie volgen</string> + <string name="setup_orientation_portrait">Staand</string> + <string name="setup_session_orientation">Oriëntatie van sessie</string> + <string name="setup_session_orientation_hint">Geldt voor Steam, games, desktop en de controllereditor. Resolutievoorinstellingen draaien mee met de sessie; aangepaste breedte en hoogte blijven zoals ingevoerd.</string> <string name="setup_orientation_auto">Automatisch liggend</string> <string name="setup_orientation_landscape">Liggend</string> <string name="setup_orientation_reverse">Liggend omgekeerd</string> <string name="setup_fullscreen">Volledig scherm</string> <string name="setup_fullscreen_on">Verbergt de statusbalk en navigatiebalk van Android</string> <string name="setup_fullscreen_off">Toont de statusbalk en navigatiebalk van Android</string> - <string name="setup_dual_screen">Dubbel scherm</string> - <string name="setup_dual_screen_hint">Automatisch gebruikt het tweede scherm op handhelds met een ingebouwd scherm. Aan gebruikt elk tweede scherm. Uit houdt alles op één scherm.</string> <string name="setup_dual_screen_auto">Automatisch</string> <string name="setup_dual_screen_on">Aan</string> <string name="setup_dual_screen_off">Uit</string> - <string name="setup_dual_screen_menu">Menu op het onderste scherm</string> - <string name="setup_dual_screen_menu_hint">Verplaatst de onderdelen en het menu in het spel naar het tweede scherm en typt daar, zodat het bovenste scherm het volledige beeld houdt. L2 en R2 wisselen van onderdeel.</string> <string name="setup_dual_screen_controls">Bediening op het onderste scherm in games</string> <string name="setup_dual_screen_controls_hint">Opent het trackpad en toetsenbord op het tweede scherm wanneer een sessie start.</string> <string name="dual_typing_title">Typen voor het bovenste scherm</string> @@ -896,7 +949,7 @@ <string name="store_installing">Installeren…</string> <string name="store_install">Installeren</string> <string name="store_setup_first">Stel eerst Flatpak in</string> - <string name="store_download_size">%1$s download</string> + <string name="store_download_size">%1$s te downloaden</string> <string name="store_installed_chip">● Geïnstalleerd</string> <string name="store_details_failed">Kan de Flathub-pagina van deze app niet laden.</string> <string name="store_loading">Laden vanuit Flathub…</string> @@ -987,6 +1040,14 @@ <string name="gate_step1">Open Instellingen → Opties voor ontwikkelaars → Draadloos debuggen en zet het aan</string> <string name="gate_step2">Tik op “Apparaat koppelen met koppelingscode”</string> <string name="gate_step3">Voer de code in bij de melding van DroidDeck</string> + <string name="pairguide_build_number">Tik in Over de telefoon 7 keer op Buildnummer</string> + <string name="pairguide_wireless">Zet Draadloze foutopsporing aan</string> + <string name="pairguide_pair">Open Draadloze foutopsporing en tik op “Apparaat koppelen met koppelingscode”</string> + <string name="pairguide_child_process">Zet “Beperkingen voor onderliggende processen uitschakelen” aan</string> + <string name="pairguide_row_child_process">Beperkingen voor onderliggende processen uitschakelen</string> + <string name="pairguide_row_build_number">Buildnummer</string> + <string name="pairguide_row_wireless">Draadloze foutopsporing</string> + <string name="pairguide_row_pair">Apparaat koppelen met koppelingscode</string> <string name="gate_waiting">Wachten op de koppelingspop-up…</string> <string name="gate_code_needed">Pop-up gevonden. Voer de code ervan in bij de melding.</string> <string name="gate_status">Status</string> @@ -1125,7 +1186,6 @@ <string name="games_never_played">Nooit gespeeld</string> <string name="games_runtime_busy_percent">Runtime bezig · %1$d%%</string> <string name="games_runtime_busy">Runtime bezig</string> - <string name="games_runtime_first_play">Runtime wordt geïnstalleerd bij de eerste keer Spelen</string> <string name="games_runtime_update">Runtime-update beschikbaar</string> <string name="games_runtime_ready">● Runtime gereed</string> <string name="games_internal">Interne opslag</string> @@ -1142,6 +1202,9 @@ <string name="gpu_hide_other">Drivers voor andere GPU’s verbergen</string> <string name="gpu_show_other">Drivers voor andere GPU’s tonen</string> <string name="gpu_advanced">Geavanceerd</string> + <string name="gpu_ubwc_title">UBWC-compatibiliteit</string> + <string name="gpu_ubwc_hint">Probeer Aan of Uit als Steam of Android strepen of flikkering toont. Geldt voor beide drivers na het herstarten van DroidDeck.</string> + <string name="gpu_ubwc_restart">Start DroidDeck opnieuw om dit toe te passen.</string> <string name="gpu_set_with_display">Wordt samen met de beeldschermdriver ingesteld: %1$s bevat beide.</string> <string name="gpu_set_with_runtime">Wordt samen met de runtimedriver ingesteld: %1$s bevat beide.</string> <string name="gpu_runtime_hint">Gebruikt door games en de desktop.</string> @@ -1250,10 +1313,15 @@ <string name="pip_auto">Automatisch scherm-in-scherm starten</string> <string name="unfolded_controls">Bediening op het uitgevouwen scherm</string> <string name="unfolded_controls_hint">Uitgevouwen staat de game boven de Steam Deck-trackpads en achtergrepen. Dichtgevouwen is de game schermvullend.</string> + <string name="unfolded_controls_with_controller">Behouden met een controller</string> + <string name="unfolded_controls_with_controller_hint">Toon deze aanraakbediening ook als er een controller is verbonden.</string> <string name="pip_suspended">Onderbroken</string> <string name="pip_not_ready">Scherm-in-scherm is beschikbaar zodra de sessie klaar is.</string> <string name="pip_permission">Sta scherm-in-scherm toe voor DroidDeck in de Android-instellingen.</string> <string name="pip_unavailable">Android kon scherm-in-scherm niet openen.</string> + <string name="game_more">Meer</string> + <string name="game_edit_art">Afbeeldingen bewerken</string> + <string name="stores_in_steam_label">In Steam</string> <string name="game_shortcut">Snelkoppeling</string> <string name="game_shortcut_add">Toevoegen aan startscherm</string> <string name="game_shortcut_choose">Game kiezen</string> @@ -1277,6 +1345,10 @@ <string name="main_wait_runtime">Wacht tot de runtime-bewerking klaar is</string> <string name="main_wait_proton_install">Wacht tot de installatie van de compatibiliteitstool klaar is</string> + <string name="load_compat_title">Compatibiliteitstools voorbereiden</string> + <string name="load_compat_wait">Wachten tot de compatibiliteitsinstallatie klaar is</string> + <string name="load_compat_hint">Je sessie start zodra de installatie klaar is.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Wacht tot de installatie van de desktop-app klaar is</string> <string name="main_wait_install_game">Wacht tot de installatie klaar is voordat je een game start</string> <string name="main_saves_close_session">Sluit eerst de Steam-sessie, zodat de game niet over de import heen kan opslaan</string> @@ -1313,6 +1385,9 @@ <string name="main_install_anyway">Toch installeren</string> <string name="main_remove_runtime_title">Linux-runtime verwijderen</string> <string name="main_remove_runtime_text">Hiermee verwijder je de runtime, de Steam-client erin en alle games die daar zijn geïnstalleerd.</string> + <string name="runtime_actions_title">Linux-runtime</string> + <string name="runtime_actions_text">Repareren installeert de systeembestanden van de runtime opnieuw en behoudt Steam, je games en instellingen. Extra’s zoals de desktop worden opnieuw geïnstalleerd wanneer je ze weer gebruikt. Verwijderen wist alles.</string> + <string name="runtime_repair">Runtime repareren</string> <string name="main_applied">Toegepast: %1$s</string> <string name="android_app_open_failed_primary">Kan %1$s niet openen op het hoofdscherm</string> <string name="android_app_open_failed_on">Kan %1$s niet openen op %2$s</string> @@ -1442,6 +1517,11 @@ <string name="session_runtime_catalog_unreachable">Kan de runtimecatalogus niet bereiken. Controleer de verbinding en druk opnieuw op Spelen.</string> <string name="session_runtime_install_failed">De Linux-runtime is niet geïnstalleerd. Controleer de runtime bij Installatie en druk opnieuw op Spelen.</string> <string name="session_desktop_install_failed">De desktop is niet geïnstalleerd (%1$s). Controleer de verbinding en druk opnieuw op Desktop.</string> + <string name="session_package_resume_failed">Een onderbroken installatie kon niet worden voltooid (%1$s). Controleer de verbinding en de ruimte en probeer het opnieuw.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">De Linux-runtime is beschadigd: %1$d bibliotheeklink verwijst naar een ontbrekend bestand (%2$s), meestal na een onderbroken installatie. Repareren behoudt je games en instellingen.</item> + <item quantity="other">De Linux-runtime is beschadigd: %1$d bibliotheeklinks verwijzen naar ontbrekende bestanden (%2$s en andere), meestal na een onderbroken installatie. Repareren behoudt je games en instellingen.</item> + </plurals> <string name="session_ended_named">%1$s is onverwacht gestopt. Deel de logs in een bugrapport of probeer het opnieuw.</string> <string name="session_ended_program">Het programma is onverwacht gestopt. Deel de logs in een bugrapport of probeer het opnieuw.</string> <string name="session_ended_desktop">De desktop is onverwacht gestopt. Deel de logs in een bugrapport of probeer het opnieuw.</string> @@ -1456,6 +1536,13 @@ <string name="mode_decky_plugins_hint">Installeer een plug-in-ZIP voor de volgende Steam-sessie.</string> <string name="mode_decky_plugin_downloading">Downloaden…</string> <string name="mode_decky_plugin_install_zip">Installeren uit ZIP</string> + <string name="decky_zip_warning_title">Plug-in van derden installeren</string> + <string name="decky_zip_warning_text">Het Decky Loader-team heeft deze plug-in niet gecontroleerd. Hij kan malware bevatten, zoals software die je Steam-account steelt of je apparaat schaadt. Door deze plug-in te installeren, ga je ermee akkoord dat je alle risico’s voor je apparaat op je neemt.</string> + <string name="decky_zip_warning_continue">Doorgaan</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Wacht %1$d seconde</item> + <item quantity="other">Wacht %1$d seconden</item> + </plurals> <string name="store_cat_games">Games</string> <string name="store_cat_audio_video">Audio & video</string> <string name="store_cat_graphics">Grafisch</string> @@ -1617,6 +1704,8 @@ <string name="fm_accept">Accepteren</string> <string name="fm_decline">Weigeren</string> <string name="fm_drive_not_readable">%1$s is gekoppeld, maar nu niet leesbaar</string> + <string name="fm_drive_access_title">Toegang tot %1$s toestaan</string> + <string name="fm_drive_access_text">Android laat DroidDeck deze schijf zien, maar niet lezen. Zet Toegang tot alle bestanden aan voor DroidDeck en kom daarna terug.</string> <string name="fm_list_view">Lijstweergave</string> <string name="fm_grid_view">Rasterweergave</string> <string name="fm_search">Zoeken</string> @@ -1688,6 +1777,89 @@ <string name="second_mode_keyboard_trackpad">Toetsenbord + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck-grepen + trackpads</string> + <string name="second_mode_dashboard">Dashboard</string> + <string name="bottom_dashboard_empty">Hier is nog niets te zien.</string> + <string name="bottom_page_downloads">Downloads</string> + <string name="bottom_downloads_none">Er lopen geen downloads.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Shadercache downloaden</string> + <string name="bottom_downloads_paused">Gepauzeerd</string> + <string name="bottom_downloads_queued">Wacht om te starten</string> + <string name="bottom_page_notifications">Meldingen</string> + <string name="bottom_notifications_listener">DroidDeck onderste scherm</string> + <string name="bottom_notifications_why">Toon berichten en andere meldingen hier terwijl je speelt. Ze blijven alleen op dit scherm en worden niet opgeslagen. Android vraagt dit één keer: de pagina voor meldingstoegang opent op dit scherm; zet DroidDeck daar aan en deze pagina komt vanzelf terug.</string> + <string name="bottom_notifications_allow">Meldingstoegang toestaan</string> + <string name="bottom_notifications_none">Geen meldingen.</string> + <string name="bottom_notifications_count">%1$d meldingen</string> + <string name="bottom_notifications_clear">Wissen</string> + <string name="bottom_page_screenshots">Screenshots</string> + <string name="stats_fps_needs_hud">Voor FPS moet de HUD aan staan</string> + <string name="stats_speed">Snelheid</string> + <string name="stats_pedals">Pedalen</string> + <string name="stats_gforce">G-kracht</string> + <string name="stats_timing">Tijden</string> + <string name="stats_best_lap">Snelste ronde</string> + <string name="stats_tires">Banden °C</string> + <string name="stats_trace">Gas en rem, laatste 10 s</string> + <string name="stats_speed_chart">Snelheid, %1$s</string> + <string name="stats_gear">Versnelling</string> + <string name="stats_steam_client_arm">Steam-client ARM</string> + <string name="stats_steam_client_x86">Steam-client x86</string> + <string name="stats_throttle">Gas</string> + <string name="stats_brake">Rem</string> + <string name="stats_lights">Dashboard</string> + <string name="stats_lamp_shift">Schakelen</string> + <string name="stats_lamp_handbrake">Handrem</string> + <string name="stats_lamp_pit">Pitlimiter</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olie %1$s °C</string> + <string name="stats_power">Energieverdeler</string> + <string name="stats_fuel_t">Brandstof, t</string> + <string name="stats_fuel_main">Hoofdtank %1$s t</string> + <string name="stats_fuel_reserve">Reserve %1$s t</string> + <string name="bottom_telemetry_send_title">Dashboardgegevens verzenden</string> + <string name="bottom_telemetry_send_auto">Automatisch</string> + <string name="bottom_telemetry_send_auto_hint">Zet het aan voor elke game in deze lijst, ook voor games die later worden gevonden. Games die je uitzet, blijven uit.</string> + <string name="bottom_telemetry_send_note">Dit wijzigt de eigen instelling voor gegevensuitvoer van de game. Het werkt vanaf de volgende keer dat de game start; uitzetten zet de oude instelling terug.</string> + <string name="bottom_telemetry_send_close">Sluit %1$s om dit te wijzigen.</string> + <string name="bottom_telemetry_send_failed">Kan de instellingen van %1$s niet wijzigen.</string> + <string name="bottom_telemetry_send_menu">%1$s: zet %2$s aan in de instellingen van de game met IP 127.0.0.1 en poort %3$d.</string> + <string name="bottom_shots_where">Opgeslagen in Pictures/DroidDeck. Steam-screenshots verschijnen hier ook.</string> + <string name="bottom_shots_take">Screenshot maken</string> + <string name="bottom_shots_saved">Screenshot opgeslagen.</string> + <string name="bottom_shots_failed">Kan geen screenshot maken.</string> + <string name="bottom_shots_none">Nog geen screenshots.</string> + <string name="bottom_page_chat">Chat & spraak</string> + <string name="bottom_chat_why">Lees en beantwoord Steam-chats hier terwijl de game op het hoofdscherm doorloopt. Het gebruikt het account waarmee Steam is ingelogd.</string> + <string name="bottom_chat_not_signed_in">Steam heeft nog geen webaanmelding om te delen, dus log hier één keer in.</string> + <string name="bottom_chat_stopped">Android heeft de chatpagina gesloten terwijl DroidDeck op de achtergrond was. Hij opent weer wanneer je terugkeert naar DroidDeck.</string> + <string name="bottom_chat_open">Steam Chat openen</string> + <string name="bottom_chat_close">Chat sluiten</string> + <string name="bottom_chat_mic_on">Microfoon aan</string> + <string name="bottom_chat_mic_off">Microfoon uit</string> + <string name="bottom_chat_mic_unavailable">De microfoon staat uit voor deze game. Zet Microfoon aan in de Steam-instellingen van DroidDeck (Audio) en start de game opnieuw om te praten.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">In-game statistieken</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Accu</string> + <string name="bottom_telemetry_lap">Ronde</string> + <string name="bottom_telemetry_position">Positie</string> + <string name="bottom_telemetry_this_lap">Deze ronde</string> + <string name="bottom_telemetry_last_lap">Vorige ronde</string> + <string name="bottom_telemetry_fuel">Brandstof</string> + <string name="bottom_telemetry_cargo">Lading</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Juridische status</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Poort %1$d ontvangt gegevens (%2$d pakketten van %3$d bytes), maar in een formaat dat deze pagina nog niet kan lezen.</string> + <string name="bottom_telemetry_port_busy">Een ander programma gebruikt poort %1$s al, dus die game kan hier niet worden getoond.</string> <string name="rtinst_removing">Linux-runtime verwijderen</string> <plurals name="rtinst_removing_entries"> @@ -1718,6 +1890,7 @@ <string name="flatpakmgr_not_ready">Stel eerst Flatpak in</string> <string name="flatpakmgr_starting">Starten</string> <string name="flatpakmgr_exit_status">Flatpak is gestopt met status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s is gebouwd voor %2$s, wat DroidDeck niet kan draaien. Flatpak-apps hebben hier een ARM64- of x86_64-versie nodig.</string> <string name="flatpakmgr_installing">%1$s installeren</string> <string name="flatpakmgr_updating">%1$s updaten</string> <string name="flatpakmgr_removing">%1$s verwijderen</string> @@ -1811,6 +1984,7 @@ <string name="adbpair_applying">Instelling toepassen…</string> <string name="adbpair_command_failed">Opdracht voor draadloze foutopsporing mislukt</string> <string name="adbpair_channel_name">Draadloze foutopsporing instellen</string> + <string name="adbpair_progress_channel_name">Voortgang van instellen van draadloze foutopsporing</string> <string name="adbpair_channel_description">Vraagt om de koppelcode voor draadloze foutopsporing terwijl Instellingen open is</string> <string name="adbpair_title_pair">Draadloze foutopsporing koppelen</string> <string name="adbpair_waiting_text">Schakel draadloze foutopsporing in en tik vervolgens op “Apparaat koppelen met koppelcode”.</string> @@ -1919,6 +2093,7 @@ <string name="gpuinfo_not_adreno">Geen Adreno-GPU</string> <string name="gpuinfo_supported">Ondersteund</string> <string name="gpuinfo_experimental">Experimenteel: de drivers zijn testbuilds</string> + <string name="gpuinfo_a850_experimental">Experimentele ondersteuning voor Adreno 850: vereist compatibele experimentele scherm- en gamedrivers; niet geverifieerd op dit apparaat</string> <string name="gpuinfo_below_tested">Onder de geteste hardware (Adreno 725 en nieuwer): werkt mogelijk niet</string> <string name="gpuinfo_unsupported">Niet ondersteund: DroidDeck heeft een Adreno-GPU (Snapdragon) nodig</string> @@ -2015,6 +2190,7 @@ <string name="display_look_filter">%1$s Zet schaling op %2$s.</string> <string name="display_match_screen">Schermformaat (%1$d×%2$d)</string> <string name="display_follow_screen">Scherm volgen (past formaat aan bij vouwen of uitvouwen)</string> + <string name="display_follow_screen_scaled">Geschaald %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Apparaatgegevens tonen</string> <string name="device_info_hide">Apparaatgegevens verbergen</string> @@ -2121,6 +2297,13 @@ <string name="stores_resume">Hervatten</string> <string name="stores_refresh">Vernieuwen</string> <string name="stores_sort">Sorteren</string> + <string name="setup_rail_labels">Labels in zijbalk</string> + <string name="setup_rail_labels_hint">Toon namen onder de pictogrammen in de zijbalk. Zet uit voor een smallere zijbalk.</string> + <string name="library_display">Weergave</string> + <string name="library_display_larger">Grotere kaarten</string> + <string name="library_display_smaller">Kleinere kaarten</string> + <string name="library_display_title">Titel tonen</string> + <string name="library_display_size">Grootte tonen</string> <string name="stores_sort_last_played">Onlangs gespeeld</string> <string name="stores_sort_recently_installed">Onlangs geïnstalleerd</string> <string name="stores_sort_title_asc">Titel A–Z</string> @@ -2247,6 +2430,9 @@ <string name="stores_download_manager">Downloadbeheer</string> <string name="stores_parallel">Downloads tegelijk</string> <string name="stores_install_where">Installeren op</string> + <string name="stores_install_language">Gametaal</string> + <string name="stores_install_language_hint">GOG en Epic installeren deze taal. Systeem volgt de taal van de app.</string> + <string name="stores_install_language_system">Systeem</string> <string name="stores_install_title">%1$s installeren:</string> <string name="stores_target_internal">Intern</string> <string name="stores_target_free">%1$s vrij</string> @@ -2285,6 +2471,9 @@ <string name="edit_target">Doel</string> <string name="edit_start_in">Beginnen in</string> <string name="edit_launch_options">Opstartopties</string> + <string name="edit_launch_options_steam_hint">Gedeeld met de Eigenschappen in Steam: een wijziging op de ene plek is op beide te zien.</string> + <string name="edit_launch_options_not_saved">De opstartopties konden niet in Steam worden opgeslagen. Probeer het opnieuw.</string> + <string name="edit_launch_options_desktop">Steam is misschien geopend in de desktopsessie. Wijzig de opstartopties daar in de Eigenschappen, of sluit eerst de sessie.</string> <string name="edit_artwork">Artwork</string> <string name="edit_other_exe">Andere exe…</string> <string name="edit_remove">Verwijderen</string> @@ -2412,6 +2601,7 @@ <string name="setup_download_source_custom">Eigen prefix</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">HTTP-proxy</string> <string name="flathub_eyebrow">LINUX-APPS</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Bureaubladapps voor het Linux-bureaublad, geopend vanuit Desktop.</string> @@ -2552,6 +2742,22 @@ <string name="glasses_tracking_flat_hint">Automatisch houdt deze 2D-game vast in beeld. Kies Virtueel scherm bij Scherm om hoofdtracking te gebruiken.</string> <string name="glasses_tracking_sbs_hint">Hoofdtracking geldt voor een virtueel scherm of een actieve SteamVR-game.</string> <string name="glasses_hardware">Apparaat</string> + <string name="vr_controllers_tab">Controllers</string> + <string name="vr_controllers_group">SteamVR-controllers</string> + <string name="vr_controllers_emulate">Gamepad in VR</string> + <string name="vr_controllers_emulate_hint">De twee VR-handen waarmee je controller speelt. Wijzigingen gelden meteen, ook terwijl SteamVR draait. Joy-Cons en getrackte handen nemen hun kant nog steeds over.</string> + <string name="vr_controllers_off">Gewone gamepad</string> + <string name="vr_controllers_index">Valve Index-controllers</string> + <string name="vr_controllers_touch">Meta Quest 3-controllers</string> + <string name="vr_controllers_vive">HTC Vive-controllers</string> + <string name="vr_controllers_sticks">Sticks beginnen met</string> + <string name="vr_controllers_sticks_hint">Druk in VR beide sticks tegelijk in om te wisselen.</string> + <string name="vr_controllers_sticks_game">Jou bewegen in de game</string> + <string name="vr_controllers_sticks_hands">De handen bewegen</string> + <string name="vr_controllers_buttons">Knoppen</string> + <string name="vr_controllers_buttons_stick">Triggers zijn triggers, bumpers grijpen, A/B en X/Y zijn de frontknoppen van elke hand, stickklikken klikken de thumbsticks, Guide opent het SteamVR-menu. D-pad omhoog en omlaag brengt de handen dichterbij of verder weg.</string> + <string name="vr_controllers_buttons_vive">De sticks zijn trackpads; A/X of een stickklik drukt ze in. Triggers zijn triggers, bumpers grijpen, Start en Select zijn menu, Guide opent het SteamVR-menu.</string> + <string name="vr_controllers_buttons_off">Geen VR-handen. Games die een gamepad ondersteunen en het SteamVR-menu krijgen je controller zoals gewoonlijk.</string> <string name="glasses_brightness">Helderheid</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Zonwering</string> @@ -2609,6 +2815,12 @@ <string name="hand_camera_placement">Cameraplaatsing</string> <string name="hand_camera_placement_hint">Controleer of de camera je kan zien voordat je gaat spelen.</string> <string name="hand_camera_check">Controleren</string> + <string name="tracking_pack_title">Download voor handtracking</string> + <string name="tracking_pack_hint">Handtracking vereist een eenmalige download van %1$s.</string> + <string name="tracking_pack_download">Downloaden</string> + <string name="tracking_pack_retry">Opnieuw proberen</string> + <string name="tracking_pack_downloading">Handtracking downloaden… %1$d%%</string> + <string name="tracking_pack_failed">Handtracking kon niet worden gedownload. Controleer je verbinding en probeer het opnieuw.</string> <string name="hand_camera_check_title">Cameraplaatsing</string> <string name="hand_camera_how_rear">Zet het apparaat rechtop op 1,5 tot 2 meter afstand, op borsthoogte, met de achtercamera naar je toe. Stap dan in beeld met je handen vooruit.</string> <string name="hand_camera_how_front">Zet het apparaat rechtop op 1,5 tot 2 meter afstand, op borsthoogte, met het scherm naar je toe. Stap dan in beeld met je handen vooruit.</string> @@ -2680,6 +2892,21 @@ <string name="storage_safe_hint">Ongebruikte runtimes, resten, oude logs</string> <string name="storage_clean_up">Opruimen…</string> <string name="storage_session_running">Stop de sessie om op te ruimen of iets te verwijderen. De groottes blijven zichtbaar.</string> + <string name="storage_default_group">Installatielocatie</string> + <string name="storage_default_title">Standaardopslag</string> + <string name="storage_default_hint">Nieuwe winkelinstallaties gaan naar de gekozen locatie. Bestaande games blijven waar ze zijn. Steam-bibliotheken houden hun eigen instelling.</string> + <string name="storage_default_ask">Elke keer vragen</string> + <string name="storage_default_ask_detail">Kies voor elke installatie een doel</string> + <string name="storage_default_internal">Interne opslag</string> + <string name="storage_default_external">Externe opslag</string> + <string name="storage_default_external_detail">%1$s · %2$s vrij</string> + <string name="storage_default_external_missing">Niet verbonden</string> + <string name="storage_default_folder">Map · %1$s</string> + <string name="storage_default_folder_free">%1$s vrij</string> + <string name="storage_default_folder_missing">Niet verbonden</string> + <string name="storage_default_choose_folder">Map kiezen…</string> + <string name="storage_default_choose_folder_detail">Gebruik een willekeurige map op een SD-kaart of USB-stick</string> + <string name="storage_default_note">Games komen in een map Games op de gekozen locatie. Bestaande games worden niet verplaatst.</string> <string name="storage_where">Waar het naartoe gaat</string> <string name="storage_games">Steam-games</string> <string name="storage_game_data">Gamegegevens</string> @@ -2801,6 +3028,9 @@ <string name="storage_data_installed">Geïnstalleerde games</string> <string name="storage_data_parts">Prefix %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Shaders wissen</string> + <string name="storage_reset_prefix">Prefix resetten</string> + <string name="storage_reset_prefix_title">Prefix voor %1$s resetten?</string> + <string name="storage_reset_prefix_confirm">Verwijdert de Wine-prefix (%1$s) in %2$s en maakt die bij de volgende start opnieuw aan. Opgeslagen spellen, instellingen en geïnstalleerde redistributables daarin gaan verloren; Steam Cloud-opslagen blijven in je account.</string> <string name="storage_data_leftovers">Verwijderde games</string> <string name="storage_steam_app">Steam-app %1$d</string> <string name="storage_leftover_unsure_detail">Het prefix bevat nog bestanden, waaronder mogelijk lokale saves</string> @@ -3100,6 +3330,117 @@ <string name="spatial_saved_views_hint">Opgeslagen weergaven kunnen opnieuw worden berekend. Start een nieuwe kalibratie om vast te leggen in het huidige volgcoördinatensysteem.</string> <string name="spatial_model_checksum_error">Controlesom handmodel komt niet overeen</string> <string name="spatial_opencv_load_error">OpenCV kon niet laden</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synchroniseren met Syncthing</string> + <string name="sync_enable_hint">Dit is een Syncthing-implementatie op basis van Syncthing-Fork waarmee je bestanden in het interne bestandssysteem van DroidDeck synchroniseert met andere Syncthing-installaties. Dit geldt alleen voor bestanden die je in het interne bestandssysteem van DroidDeck bewaart.</string> + <string name="sync_missing">Deze build bevat geen Syncthing.</string> + <string name="sync_starting">Syncthing starten</string> + <string name="sync_status_starting">Starten</string> + <string name="sync_status_up_to_date">Bijgewerkt</string> + <string name="sync_status_syncing">Synchroniseren</string> + <string name="sync_status_paused">Gepauzeerd</string> + <string name="sync_status_pausing">Pauzeren</string> + <string name="sync_status_resuming">Hervatten</string> + <string name="sync_status_attention">Aandacht nodig</string> + <string name="sync_status_failed">Syncthing is gestopt</string> + <string name="sync_failed_retry">Opnieuw proberen</string> + <string name="sync_paused_wifi">Gepauzeerd tot er Wi-Fi is</string> + <string name="sync_paused_game">Gepauzeerd tijdens de game</string> + <string name="sync_summary">%1$d mappen · %2$d van %3$d apparaten verbonden</string> + <string name="sync_left">Nog %1$s</string> + <string name="sync_open_web_ui">Webinterface openen</string> + <string name="sync_pause">Pauzeren</string> + <string name="sync_resume">Hervatten</string> + <string name="sync_running">Actief</string> + <string name="sync_running_hint">Zet dit uit om Syncthing volledig te stoppen.</string> + <string name="sync_this_device">Dit apparaat</string> + <string name="sync_device_id">Apparaat-ID</string> + <string name="sync_show_qr">QR-code tonen</string> + <string name="sync_advanced">Geavanceerd</string> + <string name="sync_advanced_hint">Poorten, wanneer uitvoeren, resetten</string> + <string name="sync_open">Openen</string> + <string name="sync_waiting">Wacht op jou</string> + <string name="sync_pending_device">%1$s wil verbinding maken</string> + <string name="sync_pending_folder">%1$s wil “%2$s” delen</string> + <string name="sync_pending_folder_hint">Accepteer om te kiezen waar het in DroidDeck wordt opgeslagen.</string> + <string name="sync_review">Bekijken in webinterface</string> + <string name="sync_folders">Mappen</string> + <string name="sync_no_folders">Nog geen mappen.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Bijgewerkt</string> + <string name="sync_folder_syncing">Synchroniseren %1$d%%</string> + <string name="sync_folder_scanning">Scannen</string> + <string name="sync_folder_paused">Gepauzeerd</string> + <string name="sync_folder_out_of_sync">Niet gesynchroniseerd</string> + <string name="sync_folder_errors">%1$d bestanden konden niet worden gesynchroniseerd</string> + <string name="sync_folder_blocked">Geblokkeerd</string> + <string name="sync_folder_blocked_hint">Deze map staat buiten de opslag van DroidDeck, dus DroidDeck heeft hem gepauzeerd. Gebruik de Syncthing-Fork-app om mappen buiten DroidDeck te synchroniseren.</string> + <string name="sync_remove_folder">Verwijderen uit Syncthing</string> + <string name="sync_remove_folder_hint">Hierbij worden geen bestanden verwijderd.</string> + <string name="sync_devices">Apparaten</string> + <string name="sync_no_devices">Nog geen apparaten.</string> + <string name="sync_connected">Verbonden</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Laatst gezien: %1$s</string> + <string name="sync_device_id_title">ID van dit apparaat</string> + <string name="sync_device_id_hint">Voeg op je andere apparaat in Syncthing een apparaat toe en scan deze code of plak de ID. Accepteer het daarna hier in de webinterface.</string> + <string name="sync_copy">Kopiëren</string> + <string name="sync_share">Delen</string> + <string name="sync_done">Klaar</string> + <string name="sync_off_title">Syncthing uitzetten?</string> + <string name="sync_off_body">Syncthing stopt nu en blijft gestopt tot je het weer aanzet. Gesynchroniseerde bestanden blijven waar ze zijn.</string> + <string name="sync_off_forget">Ook de configuratie van Syncthing verwijderen</string> + <string name="sync_off_forget_hint">Verwijdert de ID, mappen en apparaten van dit apparaat. Als je het weer aanzet, begint het opnieuw.</string> + <string name="sync_turn_off">Uitzetten</string> + <string name="sync_ports">Poorten</string> + <string name="sync_port_sync">Synchronisatie</string> + <string name="sync_port_discovery">Lokale detectie</string> + <string name="sync_repick">Nieuwe poorten kiezen</string> + <string name="sync_repick_hint">Wordt bij elke start opnieuw gecontroleerd.</string> + <string name="sync_repick_button">Opnieuw kiezen</string> + <string name="sync_reset_group">Resetten</string> + <string name="sync_api_key">API-sleutel</string> + <string name="sync_regenerate">Opnieuw genereren</string> + <string name="sync_reset">Syncthing resetten</string> + <string name="sync_reset_hint">Nieuwe apparaat-ID, mappen en apparaten verwijderd. Bestanden in de opslag van DroidDeck blijven bewaard.</string> + <string name="sync_reset_button">Resetten</string> + <string name="sync_reset_confirm_title">Syncthing resetten?</string> + <string name="sync_running_group">Uitvoering</string> + <string name="sync_run">Uitvoeren</string> + <string name="sync_run_open">Zolang DroidDeck open is</string> + <string name="sync_run_background">Op de achtergrond</string> + <string name="sync_wifi_only">Alleen via Wi-Fi</string> + <string name="sync_pause_games">Pauzeren tijdens games</string> + <string name="sync_logs">Logs</string> + <string name="sync_logs_hint">Syncthing-uitvoer van deze sessie</string> + <string name="sync_logs_share">Delen</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Stel eerst de Linux-runtime in.</string> + <string name="sync_accept">Accepteren</string> + <string name="sync_accept_title">“%1$s” opslaan in</string> + <string name="sync_add_folder">Map toevoegen</string> + <string name="sync_add_folder_hint">Een map in de opslag van DroidDeck synchroniseren</string> + <string name="sync_choose">Kiezen</string> + <string name="sync_add">Toevoegen</string> + <string name="sync_add_failed">De map kan niet worden toegevoegd.</string> + <string name="sync_share_with">Delen met</string> + <string name="sync_share_none">Nog geen apparaten. Je kunt deze map later via de webinterface delen.</string> + <string name="sync_use_folder">Deze map gebruiken</string> + <string name="sync_new_folder">Nieuwe map</string> + <string name="sync_location_home">Thuismap van container</string> + <string name="sync_location_sync">Sync-map</string> + <string name="sync_location_shared">Gedeelde opslag van DroidDeck</string> + <string name="sync_location_card">DroidDeck op %1$s</string> + <string name="sync_location_app">App-gegevens van DroidDeck</string> + <string name="sync_web_path_locked">Nieuwe mappen worden opgeslagen in de Sync-map van DroidDeck. Gebruik Map toevoegen op het tabblad Syncthing om een andere DroidDeck-map te synchroniseren.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Opnieuw laden</string> + <string name="sync_not_running">Syncthing is niet actief.</string> + <string name="session_end_steam_sigill">Steam is gestopt met een ongeldige instructie (SIGILL). Dit kan een compatibiliteitsprobleem met CPU-instructies of een crash van de client zijn. Deel de logs met de gegevens van je apparaat.</string> + <string name="session_end_steam_try_x64">Je kunt Steam-instellingen → Steam-client → x86-64 (experimenteel) proberen. Dit vereist een extra download en kan trager draaien.</string> + <string name="session_end_vulkan_device">De Linux-grafische driver kon geen bruikbaar Vulkan-apparaat vinden. Controleer of de gekozen Linux-GPU-driver deze GPU ondersteunt.</string> + <string name="session_end_gpu_unsupported">Deze sessie kan niet starten omdat er in de huidige configuratie geen compatibele Linux-Vulkan-driver voor deze GPU is. Adreno Turnip-drivers kunnen geen ondersteuning voor MediaTek/Mali-GPU’s inschakelen.</string> <string name="setup_group_memory">Geheugen</string> <string name="setup_clear_cached">Gecachete apps sluiten voor een sessie</string> <string name="setup_clear_cached_hint">Als een sessie start, sluit DroidDeck de apps die Android op de achtergrond geparkeerd houdt, zodat de game meer geheugen heeft. Draadloos debuggen moet aanstaan.</string> @@ -3125,6 +3466,12 @@ <string name="epic_client_open">Openen</string> <string name="epic_client_install">Installeren</string> <string name="game_tab_about">Over</string> + <string name="game_resources_browser">Opent in je browser</string> + <string name="game_resource_guides">Handleidingen</string> + <string name="game_resource_protondb_detail">Compatibiliteitsrapporten voor Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Voor games met opslagbestanden in je Steam-account</string> + <string name="game_resource_search">Zoeken op het web</string> <string name="game_tab_install">Installeren</string> <string name="game_install_location">Locatie</string> <string name="game_install_folder">Map</string> @@ -3141,6 +3488,11 @@ <string name="stores_eyebrow_pass">beschikbaar met %1$s</string> <string name="stores_owned_in_library">Games in je Bibliotheek</string> <string name="library_filter_added">Toegevoegd</string> + <string name="library_filter">Filteren</string> + <string name="library_filter_installed">Alleen geïnstalleerd</string> + <string name="library_filter_all_owned">Alle games in bezit</string> + <string name="library_no_installed_matches">Geen geïnstalleerde games voldoen aan deze filters.</string> + <string name="library_browse_owned">Games in bezit bekijken</string> <string name="game_tab_launch">Starten</string> <string name="game_tab_saves_cloud">Opslag en cloud</string> <string name="game_launch_shortcut">Steam-snelkoppeling</string> @@ -3158,6 +3510,40 @@ <string name="stores_itch_update_replaced">De ontwikkelaar heeft deze build vervangen door %1$s. Bijwerken naar die build?</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Cloudinstellingen</string> + <string name="integration_title">Steam-integratie</string> + <string name="integration_count">%1$d van %2$d aan</string> + <string name="integration_set_up">Instellen</string> + <string name="integration_location">Locatie</string> + <string name="integration_app_info">App-info</string> + <string name="integration_wifi">Wi-Fi-namen</string> + <string name="integration_brightness">Helderheid</string> + <string name="integration_home">DroidDeck als startscherm</string> + <string name="integration_shortcuts">Systeemtoetsen</string> + <string name="integration_wifi_hint">Netwerken tonen in Steam · vereist locatietoegang, nooit gevolgd</string> + <string name="integration_wifi_on">Netwerken worden getoond in Steam</string> + <string name="integration_wifi_location_off">Locatie staat uit</string> + <string name="integration_wifi_denied">Locatie geweigerd · sta het toe in App-info</string> + <string name="integration_brightness_hint">De schuifregelaar van Steam stelt de schermhelderheid in</string> + <string name="integration_home_hint">Home opent het Steam-menu in een sessie</string> + <string name="integration_shortcuts_hint">Alt+Tab, Win-toets en Home-knop blijven in de sessie</string> + <string name="integration_shortcuts_maybe_restricted">Grijs in Android? App-info → ⋮ → Beperkte instellingen toestaan</string> + <string name="integration_shortcuts_restricted">Geblokkeerd door Android · App-info → ⋮ → Beperkte instellingen toestaan</string> + <string name="integration_shortcuts_service">DroidDeck-systeemtoetsen</string> + <string name="integration_shortcuts_service_description">Houdt Alt+Tab, de Win-toets en de Home-knop in een actieve DroidDeck-sessie in plaats van Android.</string> + <string name="integration_brightness_needed">Zet Helderheid aan in Installatie → Steam-integratie</string> + <string name="setup_gpu_bridge_off">Mali-brug: uit</string> + <string name="setup_gpu_bridge_on">Mali-brug: aan</string> + <string name="setup_gpu_bridge_detail">%1$s is geen Adreno. De experimentele Vulkan-brug staat aan: de sessie tekent via het eigen stuurprogramma van de telefoon. Verwacht fouten; stuur de sessielogboeken.</string> + <string name="setup_bridge_safe">Veilige modus</string> + <string name="setup_bridge_safe_on">Veilige modus: aan</string> + <string name="setup_bridge_safe_off">Veilige modus: uit</string> + <string name="setup_bridge_safe_on_detail">Meest compatibel. Aanbevolen voor een nieuw apparaat.</string> + <string name="setup_bridge_safe_off_detail">Sneller waar deze GPU zijn controles heeft doorstaan.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatisch</string> + <string name="setup_bridge_dxvk_proton">DXVK: die van Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Gebruikt een oudere DXVK als de Vulkan van deze GPU te oud is voor die van Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Elke Proton houdt zijn eigen DXVK, ook als de Vulkan van deze GPU daarvoor te oud kan zijn.</string> <string name="apps_search_hint">Apps zoeken</string> <string name="apps_no_match">Geen apps gevonden voor ‘%1$s’.</string> <string name="apps_add_widget">Widget toevoegen</string> @@ -3206,6 +3592,8 @@ <string name="desktop_restore_done_body">De apps die je hebt toegevoegd zijn weer geïnstalleerd.</string> <string name="desktop_restore_failed_title">Sommige software kon niet worden hersteld</string> <string name="desktop_restore_failed_body">Bekijk ~/.cache/droiddeck/apt-restore.log en probeer daarna sudo apt install in Konsole.</string> + <string name="gog_full_files">Systeemeigen optimalisaties zijn niet beschikbaar. De download bevat volledige vervangende bestanden.</string> + <string name="gog_recover">Patchresultaat controleren</string> <string name="slow_usb_title">Trage USB-verbinding</string> <string name="slow_usb_cable">%1$s is verbonden via %2$s (%3$s Mbps, ongeveer %4$d MB/s), dus games erop laden traag. Gebruik een USB 3-kabel van 5 Gbps of sneller, draai de USB-C-stekker om of gebruik een snellere schijf.</string> <string name="slow_usb_port">%1$s is verbonden via %2$s (%3$s Mbps, ongeveer %4$d MB/s). De USB-poort van dit apparaat kan niet sneller, dus games laden traag. Interne opslag of een microSD-kaart kan sneller zijn.</string> @@ -3216,4 +3604,52 @@ <string name="steam_import_names_more">%1$s en nog %2$d</string> <string name="steam_import_now">Nu opnieuw starten</string> <string name="steam_import_later">Later</string> + <string name="gog_maintenance">GOG-installatie beheren</string> + <string name="gog_check">Controleren op updates</string> + <string name="gog_repair">Controleren/repareren</string> + <string name="gog_patches">Offline patches</string> + <string name="gog_refresh">Volledig offline installatieprogramma downloaden</string> + <string name="gog_update">Bijwerken naar %1$s</string> + <string name="gog_resume">GOG-onderhoud hervatten</string> + <string name="gog_open_patch">Patch-installatieprogramma openen</string> + <string name="gog_patch_in_session">Rond het patch-installatieprogramma af in de Linux-sessie of annuleer het.</string> + <string name="gog_patch_requirements">Kies een patch voor je geïnstalleerde versie en taal. Ondersteunde bronversies staan mogelijk niet in de lijst.</string> + <string name="gog_no_patches">GOG heeft geen losse Windows-patches voor deze game.</string> + <string name="gog_managed_files">Aangepaste gamebestanden kunnen worden vervangen.</string> + <string name="gog_patch_installer_note">Het installatieprogramma opent in je Linux-sessie.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Extra ruimte</string> + <string name="gog_space_estimate_label">Geschatte ruimte</string> + <string name="gog_repair_action">Bestanden repareren</string> + <string name="gog_refresh_action">Installatie vernieuwen</string> + <string name="gog_select_patch">Kiezen</string> + <string name="stores_gamejolt_not_owned">Niet in je Game Jolt-bibliotheek</string> + <string name="stores_gamejolt_no_build">Geen Windows-download voor dit spel</string> + <string name="stores_gamejolt_no_exe">Geen Windows-game gevonden in de download</string> + <string name="stores_gamejolt_no_game">Deze game is niet gevonden op Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Games van Game Jolt konden niet worden geladen</string> + <string name="stores_gamejolt_download_failed">Game Jolt antwoordde HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">De downloads van Game Jolt konden niet worden geladen</string> + <string name="stores_gamejolt_build_open">Openen op Game Jolt</string> + <string name="stores_gamejolt_archive">%1$s-archieven worden niet ondersteund</string> + <string name="stores_gamejolt_extract_failed">Download kan niet worden uitgepakt (code %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt is niet bereikbaar</string> + <string name="stores_gamejolt_download_no_link">Game Jolt gaf geen downloadlink</string> + <string name="stores_gamejolt_section_featured">Uitgelicht</string> + <string name="stores_gamejolt_section_hot">Populair</string> + <string name="stores_gamejolt_section_best">Beste</string> + <string name="stores_gamejolt_section_new">Nieuw</string> + <string name="stores_gamejolt_price_under_30">$30 of minder</string> + <string name="stores_gamejolt_os_other">Overig</string> + <string name="stores_gamejolt_maturity_everyone">Alle leeftijden</string> + <string name="stores_gamejolt_maturity_teen">Tieners</string> + <string name="stores_gamejolt_maturity_adult">Volwassenen</string> + <string name="stores_gamejolt_status_complete">Voltooid</string> + <string name="stores_gamejolt_status_early">Early access</string> + <string name="stores_gamejolt_partners">Partnerspellen</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Leeftijdsklasse</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partners</string> + <string name="stores_gamejolt_followed">Gevolgde games</string> </resources> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 61f6bae810..bf3d93d8b9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opcje VKD3D dla D3D12. nodxr wyłącza ray tracing; używaj tylko w grze, która tego wymaga.</string> <string name="game_env_proton_log">Ustaw 1, aby tworzyć dziennik diagnostyczny Proton. Zapis dziennika może obniżyć wydajność i zajmuje miejsce.</string> <string name="game_env_wined3d">Ustaw 1, aby do testów zgodności D3D9–11 używać WineD3D opartego na OpenGL zamiast DXVK.</string> + <string name="game_env_wined3d_renderer">Renderer dla DirectDraw, Direct3D 1-7 i gier uruchamianych przez WineD3D. Vulkan pomija ścieżkę OpenGL na Zink i jest znacznie szybszy w starych grach DirectDraw i Direct3D 7 na Adreno.</string> + <string name="game_env_dxvk_d3d8">Ustaw 1, aby uruchamiać Direct3D 8 przez DXVK zamiast WineD3D. Szybsze w teście Direct3D 8 z AIO Graphics Test na Adreno.</string> <string name="game_env_no_ntsync">Ustaw 1, aby ta gra nie korzystała z ntsync (droiddeck-ntsync ani sterownika jądra); użyje droiddeck-esync, jeśli istnieje pakiet, a w przeciwnym razie droiddeck-fsync.</string> <string name="game_env_no_esync">Ustaw 1, aby wyłączyć droiddeck-esync w tej grze; zamiast niego użyje droiddeck-fsync lub droiddeck-ntsync, gdy fsync też jest wyłączone.</string> <string name="game_env_no_fsync">Ustaw 1, aby ta gra nie korzystała z droiddeck-fsync; użyje droiddeck-esync, jeśli istnieje pakiet, a w przeciwnym razie droiddeck-ntsync.</string> <string name="game_env_fsync_first">Ustaw 1, aby uruchamiać tę grę na droiddeck-fsync, lub 0, aby preferować droiddeck-esync, gdy pakiet pasuje do jej wersji Proton.</string> <string name="game_env_xalia">Ustaw 0, aby wyłączyć w tej grze pomocnika Proton do nawigacji kontrolerem.</string> + <string name="game_env_anticheat_offline">Domyślnie włączone. Uruchamia grę z Easy Anti-Cheat bez zabezpieczenia, gdy gra obsługuje grę offline. Wyłącz, aby uruchamiać przez Easy Anti-Cheat jak zwykle. Tryby online wymagające Easy Anti-Cheat pozostają niedostępne.</string> <string name="game_env_hud">Nakładka DXVK dla D3D9–11. fps pokazuje liczbę klatek; brak wartości ją ukrywa.</string> <string name="game_env_dxvk_config">Ustawienia DXVK rozdzielone średnikami. Nowsze wersje ograniczają klatki przez dxvk.maxFrameRate; do zwykłej gry lepiej użyć limitu klatek sesji.</string> + <string name="game_env_cores">Rdzenie CPU dla tej gry, np. 0-4 lub 0,2,4, zamiast rdzeni gier sesji. Mniej rdzeni to niższa temperatura.</string> <string name="game_env_vkd3d_limit">Limit liczby klatek D3D12. 0 wyłącza limit.</string> <string name="game_env_glthread">Wielowątkowość OpenGL w Mesa. true może pomóc grom OpenGL ograniczonym przez CPU; testuj każdą grę osobno.</string> <string name="sync_backend_title">Synchronizacja Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX uruchamia programy Linux x86 na tym urządzeniu ARM64. Auto używa go, gdy program jest zbudowany dla x86.</string> <string name="app_fex_x86">%1$s przez FEX</string> <string name="app_fex_not_ready">Ten program jest zbudowany dla komputerów %1$s i działa przez FEX, który nie jest jeszcze skonfigurowany. Otwórz raz Steam po zalogowaniu: DroidDeck pobierze wtedy FEX i potrzebne Steam Linux Runtime, a potem program się otworzy.</string> + <string name="session_proot_missing">Nie udało się pobrać proot DroidDeck. Sprawdź połączenie i spróbuj ponownie. Sesja nie została uruchomiona, bo zapasowy proot jest zbyt wolny do grania.</string> + <string name="session_directaudio_missing">Nie udało się pobrać DirectAudio, więc w tej sesji dźwięk gier używa wolniejszej ścieżki.</string> <string name="session_end_program">Ten program</string> <string name="session_end_steam_download">Nie udało się pobrać klienta Steam. Twoja sieć lub VPN może blokować serwery Steam; sprawdź połączenie i spróbuj ponownie.</string> <string name="session_end_steam_setup">Nie udało się skonfigurować klienta Steam. Sprawdź połączenie i wolne miejsce, a potem spróbuj ponownie.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Kontroler Xbox 360</string> <string name="mode_controller_note">Deck: przycisk szybkiego dostępu i żyroskop. Steam Controller: to samo oraz wykrywanie chwytu na tylnych przyciskach. DualShock 4 i DualSense: żyroskop, a gładziki działają jako ich touchpad. Xbox 360: szybki dostęp otwiera Guide+A.</string> <string name="mode_back">Wstecz</string> + <string name="back_hold">Przytrzymaj Wstecz dla skrótów Steam</string> + <string name="back_hold_hint">Przytrzymanie Wstecz otwiera Szybki dostęp lub tworzy skróty Steam z innymi przyciskami. Wyłącz, aby ignorować przytrzymanie; dotknięcie i podwójne dotknięcie nadal działają.</string> + <string name="back_native_qam_hint">Przytrzymaj Wstecz przez 700 ms lub przytrzymaj Wstecz i naciśnij inny przycisk, aby użyć skrótów Steam.</string> + <string name="back_double_tap_window">Czas podwójnego dotknięcia</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Zezwól na sterowanie jasnością</string> + <string name="brightness_permission_text">Skonfiguruj sterowanie jasnością w DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sesja</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Opóźnia wstrzymanie w tle, gdy Steam aktywnie pobiera.</string> <string name="mode_suspend_note">„Auto” wstrzymuje w tle i wznawia po powrocie. „Ręcznie” czeka na „Wznów”. „Nigdy” nie przerywa działania.</string> <string name="mode_startup">Uruchamianie</string> - <string name="mode_steam_startup">Uruchamiaj Steam z DroidDeck</string> - <string name="mode_steam_startup_hint">Otwiera sesję Steam przy uruchomieniu DroidDeck.</string> + <string name="mode_startup_session">Otwórz przy uruchomieniu</string> + <string name="mode_startup_session_hint">Uruchamia tę sesję po uruchomieniu DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Sprawdzanie wydań…</string> <string name="mode_decky_ready">Gotowe do instalacji: %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Aktualna · %1$s</string> <string name="mode_decky_loader">Program ładujący</string> <string name="mode_decky_install_latest">Zainstaluj najnowszą</string> + <string name="decky_channel">Kanał aktualizacji</string> + <string name="decky_channel_hint">Które wydania Decky Loader instalować. Wbudowany aktualizator Decky używa tego samego kanału.</string> + <string name="decky_channel_stable">Stabilny</string> + <string name="decky_channel_prerelease">Przedpremierowy</string> + <string name="decky_channel_testing">Testowy</string> + <string name="decky_channel_failed">Nie udało się zapisać kanału aktualizacji Decky</string> <string name="mode_decky_on">Uruchamia się ze Steam. Gdy jest włączony, inne aplikacje na tym urządzeniu mogą sterować Steam.</string> <string name="mode_decky_off">Wyłączony. Port zdalnego debugowania Steam pozostaje zamknięty.</string> <string name="mode_decky_remove_title">Odinstalować Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Klient</string> <string name="mode_mangoapp">Nakładka wydajności</string> <string name="mode_mangoapp_hint">Wyłącz, jeśli gry ulegają awarii lub mają czarny ekran w trybie Deck. Działa od następnej sesji.</string> + <string name="mode_return_after_game">Wracaj do DroidDeck po grze</string> + <string name="mode_return_after_game_hint">Gdy zamkniesz grę uruchomioną z DroidDeck lub innego launchera, Steam poprawnie się zamyka (najpierw kończy zapis w chmurze) i wracasz tam. Wyłączone: zostajesz w Steam.</string> + <string name="mode_shader_precache">Wstępne buforowanie shaderów</string> + <string name="mode_shader_precache_hint">Steam pobiera gotowe shadery dla Twoich gier i przetwarza je w tle, więc gry mniej się zacinają. Wyłączenie oszczędza dane, miejsce i baterię; gry budują shadery w trakcie grania. To samo ustawienie co Pobieranie > Wstępne buforowanie shaderów w Steam. Działa od następnej sesji.</string> <string name="mode_steam_repair">Napraw klienta Steam</string> <string name="mode_steam_repair_hint">Pobiera klienta Steam ponownie przy następnym uruchomieniu Steam. Użyj, jeśli Steam utknie na ekranie wczytywania. Gry, logowanie i ustawienia zostaną zachowane.</string> <string name="mode_steam_repair_queued">Klient Steam zostanie pobrany ponownie przy następnym uruchomieniu Steam.</string> @@ -392,6 +415,8 @@ <string name="mode_directaudio_hint">Omija PulseAudio, aby zmniejszyć opóźnienie.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Do czatu głosowego.</string> + <string name="drawer_mic_hint">Włącz lub wyłącz przechwytywanie mikrofonu w tej sesji.</string> + <string name="drawer_mic_failed">Nie udało się zmienić mikrofonu. Spróbuj ponownie.</string> <string name="mode_network">Sieć</string> <string name="mode_wifi_discovery">Wykrywanie Wi-Fi</string> <string name="mode_wifi_discovery_hint">Pokazuj w Steam nazwy Wi-Fi i sieci w pobliżu.</string> @@ -555,6 +580,16 @@ <string name="perf_gsrealtime">gamescope: kolejka GPU czasu rzeczywistego</string> <string name="perf_gsrealtime_hint">Nadaje priorytet pracy GPU kompozytora. Może wygładzić tempo klatek kosztem części wydajności gier.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Pamięć</string> + <string name="perf_cap_off">Wyłączony</string> + <string name="perf_cap_auto">Domyślny sterownika</string> + <string name="perf_zram_client">Kompresuj Steam podczas gry</string> + <string name="perf_zram_client_hint">20 s po starcie gry klient Steam jest kompresowany do zRAM, aby zostawić grze więcej pamięci, i wczytywany z powrotem po zamknięciu gry. Wyłącz, jeśli sesja zamyka się wkrótce po starcie gier. Powyższy limit RAM nadal kompresuje Steam, gdy sesja go przekroczy.</string> + <string name="perf_ram_cap">Limit RAM</string> + <string name="perf_ram_cap_hint">Działa, gdy działa klient Steam, w trybie Steam lub z pulpitu. Gdy sesja używa więcej, Steam, a następnie inne obsługiwane procesy sesji są kompresowane do zRAM. Miękki limit: nic nie jest zamykane, ale gry mogą się zacinać podczas wczytywania stron z powrotem.</string> + <string name="perf_ram_cap_unavailable">Wymaga swapu zRAM, którego to urządzenie nie ma.</string> + <string name="perf_vram_cap">Limit VRAM</string> + <string name="perf_vram_cap_hint">Pamięć wideo, którą DXVK zgłasza grom Direct3D, aby planowały tekstury na mniej. Własne ustawienia DXVK gry mają pierwszeństwo. Działa od następnej sesji.</string> <string name="perf_gpuclock">Utrzymuj GPU na najwyższym taktowaniu</string> <string name="perf_gpuclock_hint">Tylko Adreno. Mniej przycięć, większe zużycie baterii i więcej ciepła.</string> <string name="perf_fixes">Poprawki sesji</string> @@ -573,6 +608,8 @@ <string name="perf_fastpath">Szybka ścieżka proot</string> <string name="perf_fastpath_needs_seccomp">Wymaga filtra seccomp proot.</string> <string name="perf_fastpath_hint">Szybsze wyszukiwanie plików i mniej przycięć. Wyłącz, jeśli program nie może znaleźć swoich plików.</string> + <string name="perf_cursor_composite">Rysuj kursor w gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope sam rysuje wskaźnik zamiast przekazywać go do Androida. Włącz dla kursora sterowanego kontrolerem. Wyłączone jest szybsze na telefonie. Działa od następnej sesji.</string> <string name="perf_identity">Tożsamość sesji</string> <string name="perf_hostname">Nazwa hosta</string> <string name="perf_hostname_hint">Nazwa tego urządzenia widoczna dla Steam. Puste pole przywraca %1$s.</string> @@ -587,6 +624,8 @@ <string name="driver_delete_plain">Jego pliki zostaną usunięte z aplikacji.</string> <string name="driver_delete_in_use">Jego pliki zostaną usunięte. Jest w użyciu, więc zastąpi go domyślny.</string> <string name="drawer_page_display">Wyświetlacz</string> + <string name="drawer_frame_limit">Limit klatek</string> + <string name="drawer_frame_limit_note">Ogranicza tę grę. Wyświetlacz przełącza się na częstotliwość odświeżania podzielną przez limit, jeśli taka jest; inne limity mogą wyglądać nierówno. Gry Steam używają limitu klatek Steam w menu szybkiego dostępu.</string> <string name="drawer_page_effects">Efekty</string> <string name="drawer_page_controls">Sterowanie</string> <string name="drawer_page_components">Komponenty</string> @@ -618,8 +657,11 @@ <string name="hud_size_pill">Pigułka</string> <string name="hud_size_minimal">Minimalny</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Pasek</string> <string name="hud_locked">Zablokuj w miejscu</string> <string name="hud_locked_hint">Przeciągnij HUD, aby go przesunąć; długie naciśnięcie blokuje go lub odblokowuje. Gdy jest zablokowany, sterowanie ekranowe pod nim nadal działa.</string> + <string name="hud_snap">Przyciągaj do boków</string> + <string name="hud_snap_hint">Puść HUD, a przesunie się do bliższego boku ekranu. Szybki ruch rzuca go w tę stronę.</string> <string name="hud_group_look">Wygląd</string> <string name="hud_scale">Rozmiar na ekranie</string> <string name="hud_color_soft">Stonowany</string> @@ -668,7 +710,6 @@ <string name="hud_export_failed">Nie udało się zapisać raportu HUD.</string> <string name="hud_reset">Zresetuj ustawienia HUD</string> <string name="hud_reset_button">Resetuj</string> - <string name="hud_credit">FusionHUD autorstwa The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Tryb skalowania</string> <string name="drawer_scaling_sharpness">Ostrość skalowania</string> <string name="drawer_effects">Efekty ekranowe</string> @@ -703,11 +744,17 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Klawiatura</string> <string name="drawer_latency">Opóźnienie</string> + <string name="drawer_low_latency">Tryb niskiego opóźnienia</string> + <string name="drawer_low_latency_hint">Zwiększa użycie CPU i baterii</string> <string name="drawer_low_latency_controller">Kontroler o niskim opóźnieniu</string> <string name="drawer_low_latency_controller_hint">Kontroler raportuje z częstotliwością 1000 Hz zamiast 250 Hz. Nieco więcej CPU.</string> <string name="drawer_low_latency_touch">Dotyk o niskim opóźnieniu</string> <string name="drawer_low_latency_touch_hint">Dotknięcia pomijają łączenie klatek; sterowanie dotykiem Steam działa z 1000 Hz. Nieco więcej CPU.</string> <string name="drawer_evdev_mouse">Surowy kanał myszy</string> + <string name="drawer_relative_mouse">Mysz względna</string> + <string name="drawer_relative_mouse_auto">Automatycznie</string> + <string name="drawer_relative_mouse_on">Włączone</string> + <string name="drawer_relative_mouse_off">Wyłączone</string> <string name="drawer_direct_cursor">Kursor</string> <string name="drawer_pc_keyboard">Klawiatura PC</string> <string name="drawer_android_keyboard">Android</string> @@ -797,6 +844,10 @@ <string name="setup_session">Sesja</string> <string name="setup_logs">Logi sesji</string> <string name="setup_logs_hint">Zapisywane po każdej sesji</string> + <string name="setup_game_debug_logs">Logi debugowania gier</string> + <string name="setup_game_debug_logs_hint">Dołącz diagnostykę Proton, Wine i grafiki przy następnym uruchomieniu gry. Może obniżyć wydajność i zająć więcej miejsca.</string> + <string name="setup_game_debug_logs_restart">Uruchom ponownie tę sesję, aby zapisywać logi debugowania gier</string> + <string name="setup_logging_update_failed">Nie udało się zmienić logowania. Sprawdź przełącznik i spróbuj ponownie.</string> <string name="setup_agent_commands">Narzędzia debugowania</string> <string name="setup_latest_logs">Najnowsze logi sesji</string> <string name="setup_saved_logs">Zapisane logi sesji</string> @@ -828,20 +879,22 @@ <string name="setup_home">Użyj jako ekranu głównego</string> <string name="setup_home_on">DroidDeck może być aplikacją ekranu głównego</string> <string name="setup_home_off">DroidDeck nigdy nie jest proponowany jako aplikacja ekranu głównego</string> + <string name="setup_home_game_space_first">W sekcji Dodaj gry ustaw DroidDeck na Uwzględnij</string> <string name="setup_orientation">Orientacja</string> + <string name="setup_launcher_orientation">Orientacja launchera</string> + <string name="setup_launcher_orientation_auto">Zgodnie z obrotem urządzenia</string> + <string name="setup_orientation_portrait">Pionowa</string> + <string name="setup_session_orientation">Orientacja sesji</string> + <string name="setup_session_orientation_hint">Dotyczy Steam, gier, pulpitu i edytora kontrolera. Presety rozdzielczości obracają się z sesją; własna szerokość i wysokość pozostają jak wpisano.</string> <string name="setup_orientation_auto">Automatyczna pozioma</string> <string name="setup_orientation_landscape">Pozioma</string> <string name="setup_orientation_reverse">Odwrócona pozioma</string> <string name="setup_fullscreen">Pełny ekran</string> <string name="setup_fullscreen_on">Ukrywa systemowe paski stanu i nawigacji</string> <string name="setup_fullscreen_off">Pokazuje systemowe paski stanu i nawigacji</string> - <string name="setup_dual_screen">Dwa ekrany</string> - <string name="setup_dual_screen_hint">Automatycznie używa drugiego ekranu w urządzeniach przenośnych, które mają go wbudowanego. Włączone używa dowolnego drugiego wyświetlacza. Wyłączone zostawia wszystko na jednym ekranie.</string> <string name="setup_dual_screen_auto">Automatycznie</string> <string name="setup_dual_screen_on">Włączone</string> <string name="setup_dual_screen_off">Wyłączone</string> - <string name="setup_dual_screen_menu">Menu na dolnym ekranie</string> - <string name="setup_dual_screen_menu_hint">Przenosi sekcje i menu w grze na drugi ekran i tam odbywa się pisanie, dzięki czemu górny ekran zachowuje pełny widok. L2 i R2 przełączają sekcje.</string> <string name="setup_dual_screen_controls">Sterowanie na dolnym ekranie w grach</string> <string name="setup_dual_screen_controls_hint">Otwiera gładzik i klawiaturę na drugim ekranie po rozpoczęciu sesji.</string> <string name="dual_typing_title">Pisanie dla górnego ekranu</string> @@ -999,6 +1052,14 @@ <string name="gate_step1">Otwórz Ustawienia → Opcje programisty → Debugowanie bezprzewodowe i włącz je</string> <string name="gate_step2">Dotknij „Sparuj urządzenie za pomocą kodu parowania”</string> <string name="gate_step3">Wpisz kod w powiadomieniu DroidDeck</string> + <string name="pairguide_build_number">W sekcji Informacje o telefonie dotknij 7 razy Numer kompilacji</string> + <string name="pairguide_wireless">Włącz Debugowanie bezprzewodowe</string> + <string name="pairguide_pair">Otwórz Debugowanie bezprzewodowe, a potem dotknij „Sparuj urządzenie za pomocą kodu parowania”</string> + <string name="pairguide_child_process">Włącz „Wyłącz ograniczenia procesów podrzędnych”</string> + <string name="pairguide_row_child_process">Wyłącz ograniczenia procesów podrzędnych</string> + <string name="pairguide_row_build_number">Numer kompilacji</string> + <string name="pairguide_row_wireless">Debugowanie bezprzewodowe</string> + <string name="pairguide_row_pair">Sparuj urządzenie za pomocą kodu parowania</string> <string name="gate_waiting">Czekanie na okienko parowania…</string> <string name="gate_code_needed">Znaleziono okienko. Wpisz jego kod w powiadomieniu.</string> <string name="gate_status">Stan</string> @@ -1137,7 +1198,6 @@ <string name="games_never_played">Nigdy nie grano</string> <string name="games_runtime_busy_percent">Środowisko zajęte · %1$d%%</string> <string name="games_runtime_busy">Środowisko zajęte</string> - <string name="games_runtime_first_play">Środowisko instaluje się przy pierwszym uruchomieniu</string> <string name="games_runtime_update">Dostępna aktualizacja środowiska</string> <string name="games_runtime_ready">● Środowisko gotowe</string> <string name="games_internal">Pamięć wewnętrzna</string> @@ -1154,6 +1214,9 @@ <string name="gpu_hide_other">Ukryj sterowniki innych GPU</string> <string name="gpu_show_other">Pokaż sterowniki innych GPU</string> <string name="gpu_advanced">Zaawansowane</string> + <string name="gpu_ubwc_title">Zgodność UBWC</string> + <string name="gpu_ubwc_hint">Wypróbuj Włączone lub Wyłączone, jeśli Steam lub Android pokazuje pasy lub migotanie. Dotyczy obu sterowników po ponownym uruchomieniu DroidDeck.</string> + <string name="gpu_ubwc_restart">Uruchom ponownie DroidDeck, aby zastosować.</string> <string name="gpu_set_with_display">Ustawiany wraz ze sterownikiem wyświetlania: %1$s obejmuje oba.</string> <string name="gpu_set_with_runtime">Ustawiany wraz ze sterownikiem środowiska: %1$s obejmuje oba.</string> <string name="gpu_runtime_hint">Używany przez gry i pulpit.</string> @@ -1262,10 +1325,15 @@ <string name="pip_auto">Automatycznie włączaj obraz w obrazie</string> <string name="unfolded_controls">Sterowanie na rozłożonym ekranie</string> <string name="unfolded_controls_hint">Po rozłożeniu gra jest nad trackpadami i tylnymi uchwytami Steam Deck. Po złożeniu gra zajmuje cały ekran.</string> + <string name="unfolded_controls_with_controller">Zachowaj je przy kontrolerze</string> + <string name="unfolded_controls_with_controller_hint">Pokazuj to sterowanie dotykowe także wtedy, gdy podłączony jest kontroler.</string> <string name="pip_suspended">Wstrzymano</string> <string name="pip_not_ready">Obraz w obrazie będzie dostępny, gdy sesja będzie gotowa.</string> <string name="pip_permission">Zezwól DroidDeck na obraz w obrazie w ustawieniach systemu Android.</string> <string name="pip_unavailable">Android nie mógł otworzyć obrazu w obrazie.</string> + <string name="game_more">Więcej</string> + <string name="game_edit_art">Edytuj grafiki</string> + <string name="stores_in_steam_label">W Steam</string> <string name="game_shortcut">Skrót</string> <string name="game_shortcut_add">Dodaj do ekranu głównego</string> <string name="game_shortcut_choose">Wybierz grę</string> @@ -1289,6 +1357,10 @@ <string name="main_wait_runtime">Poczekaj na zakończenie operacji na środowisku</string> <string name="main_wait_proton_install">Poczekaj na zakończenie instalacji narzędzia zgodności</string> + <string name="load_compat_title">Przygotowywanie narzędzi zgodności</string> + <string name="load_compat_wait">Oczekiwanie na zakończenie konfiguracji zgodności</string> + <string name="load_compat_hint">Sesja uruchomi się po zakończeniu konfiguracji.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Poczekaj na zakończenie instalacji aplikacji desktopowej</string> <string name="main_wait_install_game">Poczekaj na zakończenie instalacji, zanim uruchomisz grę</string> <string name="main_saves_close_session">Najpierw zamknij sesję Steam, aby gra nie nadpisała importowanych zapisów</string> @@ -1333,6 +1405,9 @@ <string name="main_install_anyway">Zainstaluj mimo to</string> <string name="main_remove_runtime_title">Usuń środowisko Linux</string> <string name="main_remove_runtime_text">Spowoduje to usunięcie środowiska, klienta Steam w nim i wszystkich zainstalowanych tam gier.</string> + <string name="runtime_actions_title">Środowisko Linux</string> + <string name="runtime_actions_text">Naprawa ponownie instaluje pliki systemowe środowiska i zachowuje Steam, gry i ustawienia. Dodatki, takie jak pulpit, zainstalują się ponownie przy następnym użyciu. Usunięcie kasuje wszystko.</string> + <string name="runtime_repair">Napraw środowisko</string> <string name="main_applied">Zastosowano: %1$s</string> <string name="android_app_open_failed_primary">Nie udało się otworzyć %1$s na ekranie podstawowym</string> <string name="android_app_open_failed_on">Nie udało się otworzyć %1$s na wyświetlaczu %2$s</string> @@ -1468,6 +1543,13 @@ <string name="session_runtime_catalog_unreachable">Nie udało się połączyć z katalogiem środowisk. Sprawdź połączenie i ponownie naciśnij Graj.</string> <string name="session_runtime_install_failed">Środowisko Linux nie zostało zainstalowane. Sprawdź środowisko w sekcji Konfiguracja i ponownie naciśnij Graj.</string> <string name="session_desktop_install_failed">Pulpit nie został zainstalowany (%1$s). Sprawdź połączenie i ponownie naciśnij Pulpit.</string> + <string name="session_package_resume_failed">Nie udało się dokończyć przerwanej instalacji (%1$s). Sprawdź połączenie i wolne miejsce, a potem spróbuj ponownie.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Środowisko Linux jest uszkodzone: %1$d dowiązanie biblioteki wskazuje na brakujący plik (%2$s), zwykle po przerwanej instalacji. Naprawa zachowuje gry i ustawienia.</item> + <item quantity="few">Środowisko Linux jest uszkodzone: %1$d dowiązania bibliotek wskazują na brakujące pliki (%2$s i inne), zwykle po przerwanej instalacji. Naprawa zachowuje gry i ustawienia.</item> + <item quantity="many">Środowisko Linux jest uszkodzone: %1$d dowiązań bibliotek wskazuje na brakujące pliki (%2$s i inne), zwykle po przerwanej instalacji. Naprawa zachowuje gry i ustawienia.</item> + <item quantity="other">Środowisko Linux jest uszkodzone: %1$d dowiązania bibliotek wskazuje na brakujące pliki (%2$s i inne), zwykle po przerwanej instalacji. Naprawa zachowuje gry i ustawienia.</item> + </plurals> <string name="session_ended_named">%1$s – nieoczekiwane zatrzymanie. Udostępnij logi w zgłoszeniu błędu lub spróbuj ponownie.</string> <string name="session_ended_program">Program nieoczekiwanie się zatrzymał. Udostępnij logi w zgłoszeniu błędu lub spróbuj ponownie.</string> <string name="session_ended_desktop">Pulpit nieoczekiwanie się zatrzymał. Udostępnij logi w zgłoszeniu błędu lub spróbuj ponownie.</string> @@ -1484,6 +1566,15 @@ <string name="mode_decky_plugins_hint">Zainstaluj wtyczkę z pliku ZIP na następną sesję Steam.</string> <string name="mode_decky_plugin_downloading">Pobieranie…</string> <string name="mode_decky_plugin_install_zip">Zainstaluj z pliku ZIP</string> + <string name="decky_zip_warning_title">Instalacja wtyczki zewnętrznej</string> + <string name="decky_zip_warning_text">Zespół Decky Loader nie sprawdził tej wtyczki. Może zawierać złośliwe oprogramowanie, np. kradnące Twoje konto Steam lub szkodzące urządzeniu. Instalując tę wtyczkę, akceptujesz całe ryzyko dla swojego urządzenia.</string> + <string name="decky_zip_warning_continue">Dalej</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Zaczekaj %1$d sekundę</item> + <item quantity="few">Zaczekaj %1$d sekundy</item> + <item quantity="many">Zaczekaj %1$d sekund</item> + <item quantity="other">Zaczekaj %1$d sekundy</item> + </plurals> <string name="store_cat_games">Gry</string> <string name="store_cat_audio_video">Audio i wideo</string> <string name="store_cat_graphics">Grafika</string> @@ -1655,6 +1746,8 @@ <string name="fm_accept">Akceptuj</string> <string name="fm_decline">Odrzuć</string> <string name="fm_drive_not_readable">%1$s: zamontowano, ale obecnie nie można odczytać</string> + <string name="fm_drive_access_title">Zezwól na dostęp do %1$s</string> + <string name="fm_drive_access_text">Android pozwala DroidDeck widzieć ten dysk, ale nie odczytywać go. Włącz dla DroidDeck dostęp do wszystkich plików, a potem wróć.</string> <string name="fm_list_view">Widok listy</string> <string name="fm_grid_view">Widok siatki</string> <string name="fm_search">Szukaj</string> @@ -1728,6 +1821,89 @@ <string name="second_mode_keyboard_trackpad">Klawiatura + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Uchwyty Deck + trackpady</string> + <string name="second_mode_dashboard">Panel</string> + <string name="bottom_dashboard_empty">Na razie nie ma tu nic do pokazania.</string> + <string name="bottom_page_downloads">Pobieranie</string> + <string name="bottom_downloads_none">Nic nie jest pobierane.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Pobieranie pamięci podręcznej shaderów</string> + <string name="bottom_downloads_paused">Wstrzymano</string> + <string name="bottom_downloads_queued">Oczekuje na rozpoczęcie</string> + <string name="bottom_page_notifications">Powiadomienia</string> + <string name="bottom_notifications_listener">Dolny ekran DroidDeck</string> + <string name="bottom_notifications_why">Wyświetlaj tu wiadomości i inne powiadomienia podczas gry. Pozostają tylko na tym ekranie i nie są zapisywane. Android zapyta raz: na tym ekranie otworzy się jego strona dostępu do powiadomień; włącz tam DroidDeck, a ta strona wróci sama.</string> + <string name="bottom_notifications_allow">Zezwól na dostęp do powiadomień</string> + <string name="bottom_notifications_none">Brak powiadomień.</string> + <string name="bottom_notifications_count">Powiadomienia: %1$d</string> + <string name="bottom_notifications_clear">Wyczyść</string> + <string name="bottom_page_screenshots">Zrzuty ekranu</string> + <string name="stats_fps_needs_hud">FPS wymaga włączonego HUD</string> + <string name="stats_speed">Prędkość</string> + <string name="stats_pedals">Pedały</string> + <string name="stats_gforce">Przeciążenie G</string> + <string name="stats_timing">Czasy</string> + <string name="stats_best_lap">Najlepsze okrążenie</string> + <string name="stats_tires">Opony °C</string> + <string name="stats_trace">Gaz i hamulec, ostatnie 10 s</string> + <string name="stats_speed_chart">Prędkość, %1$s</string> + <string name="stats_gear">Bieg</string> + <string name="stats_steam_client_arm">Klient Steam ARM</string> + <string name="stats_steam_client_x86">Klient Steam x86</string> + <string name="stats_throttle">Gaz</string> + <string name="stats_brake">Hamulec</string> + <string name="stats_lights">Kontrolki</string> + <string name="stats_lamp_shift">Zmiana biegu</string> + <string name="stats_lamp_handbrake">Hamulec ręczny</string> + <string name="stats_lamp_pit">Ogranicznik pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Silnik %1$s °C</string> + <string name="stats_oil_temp">Olej %1$s °C</string> + <string name="stats_power">Rozdzielacz mocy</string> + <string name="stats_fuel_t">Paliwo, t</string> + <string name="stats_fuel_main">Główne %1$s t</string> + <string name="stats_fuel_reserve">Rezerwa %1$s t</string> + <string name="bottom_telemetry_send_title">Wysyłaj dane do panelu</string> + <string name="bottom_telemetry_send_auto">Automatycznie</string> + <string name="bottom_telemetry_send_auto_hint">Włącza wysyłanie dla każdej gry z tej listy, także dla gier znalezionych później. Gry, które wyłączysz, pozostaną wyłączone.</string> + <string name="bottom_telemetry_send_note">To zmienia ustawienie wyjścia danych w samej grze. Zadziała przy następnym uruchomieniu gry; wyłączenie przywraca poprzednie ustawienie.</string> + <string name="bottom_telemetry_send_close">Zamknij %1$s, aby to zmienić.</string> + <string name="bottom_telemetry_send_failed">Nie udało się zmienić ustawień %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: włącz %2$s w ustawieniach gry, podając IP 127.0.0.1 i port %3$d.</string> + <string name="bottom_shots_where">Zapisywane w Pictures/DroidDeck. Zrzuty ekranu ze Steam też się tu pojawiają.</string> + <string name="bottom_shots_take">Zrób zrzut ekranu</string> + <string name="bottom_shots_saved">Zapisano zrzut ekranu.</string> + <string name="bottom_shots_failed">Nie udało się zrobić zrzutu ekranu.</string> + <string name="bottom_shots_none">Brak zrzutów ekranu.</string> + <string name="bottom_page_chat">Czat i głos</string> + <string name="bottom_chat_why">Czytaj czat Steam i odpowiadaj tutaj, a gra działa dalej na głównym ekranie. Używane jest konto, na które zalogowany jest Steam.</string> + <string name="bottom_chat_not_signed_in">Steam nie ma jeszcze logowania przez przeglądarkę, które można udostępnić, więc zaloguj się tu raz.</string> + <string name="bottom_chat_stopped">Android zamknął stronę czatu, gdy DroidDeck działał w tle. Otworzy się ponownie, gdy wrócisz do DroidDeck.</string> + <string name="bottom_chat_open">Otwórz Steam Chat</string> + <string name="bottom_chat_close">Zamknij czat</string> + <string name="bottom_chat_mic_on">Mikrofon wł.</string> + <string name="bottom_chat_mic_off">Mikrofon wył.</string> + <string name="bottom_chat_mic_unavailable">Mikrofon jest wyłączony dla tej gry. Aby rozmawiać, włącz Mikrofon w ustawieniach Steam w DroidDeck (Dźwięk) i uruchom grę ponownie.</string> + <string name="bottom_chat_volume">Głośność %1$d%%</string> + <string name="bottom_page_telemetry">Statystyki w grze</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Bateria</string> + <string name="bottom_telemetry_lap">Okrążenie</string> + <string name="bottom_telemetry_position">Pozycja</string> + <string name="bottom_telemetry_this_lap">Bieżące okrążenie</string> + <string name="bottom_telemetry_last_lap">Ostatnie okrążenie</string> + <string name="bottom_telemetry_fuel">Paliwo</string> + <string name="bottom_telemetry_cargo">Ładunek</string> + <string name="bottom_telemetry_pips">Punkty mocy SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Status prawny</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Port %1$d odbiera dane (%2$d pakietów po %3$d bajtów), ale w formacie, którego ta strona jeszcze nie odczytuje.</string> + <string name="bottom_telemetry_port_busy">Port %1$s jest już używany przez inny program, więc tej gry nie da się tu pokazać.</string> <string name="rtinst_removing">Usuwanie środowiska Linux</string> <plurals name="rtinst_removing_entries"> @@ -1760,6 +1936,7 @@ <string name="flatpakmgr_not_ready">Najpierw skonfiguruj Flatpak</string> <string name="flatpakmgr_starting">Rozpoczynanie</string> <string name="flatpakmgr_exit_status">Flatpak zakończył działanie z kodem %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s zbudowano dla %2$s, czego DroidDeck nie potrafi uruchomić. Aplikacje Flatpak potrzebują tu wersji dla ARM64 lub x86_64.</string> <string name="flatpakmgr_installing">Instalowanie %1$s</string> <string name="flatpakmgr_updating">Aktualizowanie %1$s</string> <string name="flatpakmgr_removing">Usuwanie %1$s</string> @@ -1853,6 +2030,7 @@ <string name="adbpair_applying">Stosowanie ustawienia…</string> <string name="adbpair_command_failed">Polecenie debugowania bezprzewodowego nie powiodło się</string> <string name="adbpair_channel_name">Konfiguracja debugowania bezprzewodowego</string> + <string name="adbpair_progress_channel_name">Postęp konfiguracji debugowania bezprzewodowego</string> <string name="adbpair_channel_description">Prosi o kod parowania debugowania bezprzewodowego, gdy Ustawienia są otwarte</string> <string name="adbpair_title_pair">Sparuj debugowanie bezprzewodowe</string> <string name="adbpair_waiting_text">Włącz Debugowanie bezprzewodowe, a potem dotknij „Sparuj urządzenie za pomocą kodu parowania”.</string> @@ -1961,6 +2139,7 @@ <string name="gpuinfo_not_adreno">To nie jest GPU Adreno</string> <string name="gpuinfo_supported">Obsługiwany</string> <string name="gpuinfo_experimental">Eksperymentalny: jego sterowniki to wersje testowe</string> + <string name="gpuinfo_a850_experimental">Eksperymentalna obsługa Adreno 850: wymaga zgodnych eksperymentalnych sterowników ekranu i gier; nie zweryfikowano na tym urządzeniu</string> <string name="gpuinfo_below_tested">Poniżej testowanego sprzętu (Adreno 725 i nowsze): może nie działać</string> <string name="gpuinfo_unsupported">Nieobsługiwany: DroidDeck wymaga GPU Adreno (Snapdragon)</string> @@ -2057,6 +2236,7 @@ <string name="display_look_filter">%1$s Ustawia skalowanie na %2$s.</string> <string name="display_match_screen">Dopasuj do ekranu (%1$d×%2$d)</string> <string name="display_follow_screen">Dopasuj do ekranu (zmienia rozmiar po złożeniu lub rozłożeniu)</string> + <string name="display_follow_screen_scaled">Skalowanie %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Pokaż szczegóły urządzenia</string> <string name="device_info_hide">Skryj szczegóły urządzenia</string> @@ -2163,6 +2343,13 @@ <string name="stores_resume">Wznów</string> <string name="stores_refresh">Odśwież</string> <string name="stores_sort">Sortuj</string> + <string name="setup_rail_labels">Etykiety paska bocznego</string> + <string name="setup_rail_labels_hint">Pokazuj nazwy pod ikonami paska bocznego. Wyłącz, aby pasek był węższy.</string> + <string name="library_display">Wyświetlanie</string> + <string name="library_display_larger">Większe karty</string> + <string name="library_display_smaller">Mniejsze karty</string> + <string name="library_display_title">Pokazuj tytuł</string> + <string name="library_display_size">Pokazuj rozmiar</string> <string name="stores_sort_last_played">Ostatnio grane</string> <string name="stores_sort_recently_installed">Ostatnio zainstalowane</string> <string name="stores_sort_title_asc">Tytuł A–Z</string> @@ -2330,6 +2517,9 @@ <string name="edit_target">Element docelowy</string> <string name="edit_start_in">Uruchom w</string> <string name="edit_launch_options">Opcje uruchamiania</string> + <string name="edit_launch_options_steam_hint">Wspólne z Właściwościami w Steam: zmiana w jednym miejscu jest widoczna w obu.</string> + <string name="edit_launch_options_not_saved">Nie udało się zapisać opcji uruchamiania w Steam. Spróbuj ponownie.</string> + <string name="edit_launch_options_desktop">Steam może być otwarty w sesji pulpitu. Zmień opcje uruchamiania w jego Właściwościach albo najpierw zamknij sesję.</string> <string name="edit_artwork">Grafika</string> <string name="edit_other_exe">Inny plik exe…</string> <string name="edit_remove">Usuń</string> @@ -2461,6 +2651,7 @@ <string name="setup_download_source_custom">Własny prefiks</string> <string name="setup_download_mirror">Strona</string> <string name="setup_download_prefix">Prefiks</string> + <string name="setup_download_proxy">Serwer proxy HTTP</string> <string name="flathub_eyebrow">APLIKACJE LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Aplikacje pulpitowe dla pulpitu Linux, otwierane z Pulpitu.</string> @@ -2605,6 +2796,22 @@ <string name="glasses_tracking_flat_hint">Tryb „Automatycznie” utrzymuje tę grę 2D nieruchomo w polu widzenia. Aby używać śledzenia głowy, wybierz „Wirtualny ekran” w sekcji „Wyświetlacz”.</string> <string name="glasses_tracking_sbs_hint">Śledzenie głowy działa z wirtualnym ekranem lub uruchomioną grą SteamVR.</string> <string name="glasses_hardware">Urządzenie</string> + <string name="vr_controllers_tab">Kontrolery</string> + <string name="vr_controllers_group">Kontrolery SteamVR</string> + <string name="vr_controllers_emulate">Pad w VR</string> + <string name="vr_controllers_emulate_hint">Dwie dłonie VR, które odgrywa Twój kontroler. Zmiany działają od razu, także gdy działa SteamVR. Joy-Cony i śledzone dłonie nadal przejmują swoją stronę.</string> + <string name="vr_controllers_off">Zwykły pad</string> + <string name="vr_controllers_index">Kontrolery Valve Index</string> + <string name="vr_controllers_touch">Kontrolery Meta Quest 3</string> + <string name="vr_controllers_vive">Różdżki HTC Vive</string> + <string name="vr_controllers_sticks">Gałki na start</string> + <string name="vr_controllers_sticks_hint">Wciśnij obie gałki jednocześnie w VR, aby przełączyć.</string> + <string name="vr_controllers_sticks_game">Poruszają Tobą w grze</string> + <string name="vr_controllers_sticks_hands">Poruszają dłońmi</string> + <string name="vr_controllers_buttons">Przyciski</string> + <string name="vr_controllers_buttons_stick">Spusty to spusty, bumpery chwytają, A/B i X/Y to przyciski czołowe każdej dłoni, wciśnięcie gałki klika thumbstick, Guide otwiera menu SteamVR. Krzyżak w górę i w dół przybliża lub oddala dłonie.</string> + <string name="vr_controllers_buttons_vive">Gałki działają jak gładziki; A/X lub wciśnięcie gałki je naciska. Spusty to spusty, bumpery chwytają, Start i Select to menu, Guide otwiera menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Bez dłoni VR. Gry obsługujące pad oraz menu SteamVR dostają kontroler jak zwykle.</string> <string name="glasses_brightness">Jasność</string> <string name="glasses_volume">Głośność</string> <string name="glasses_sunblock">Przyciemnianie</string> @@ -2662,6 +2869,12 @@ <string name="hand_camera_placement">Położenie kamery</string> <string name="hand_camera_placement_hint">Sprawdź, czy kamera Cię widzi, zanim zaczniesz grać.</string> <string name="hand_camera_check">Sprawdź</string> + <string name="tracking_pack_title">Pobieranie śledzenia dłoni</string> + <string name="tracking_pack_hint">Śledzenie dłoni wymaga jednorazowego pobrania %1$s.</string> + <string name="tracking_pack_download">Pobierz</string> + <string name="tracking_pack_retry">Ponów</string> + <string name="tracking_pack_downloading">Pobieranie śledzenia dłoni… %1$d%%</string> + <string name="tracking_pack_failed">Nie udało się pobrać śledzenia dłoni. Sprawdź połączenie i spróbuj ponownie.</string> <string name="hand_camera_check_title">Położenie kamery</string> <string name="hand_camera_how_rear">Ustaw urządzenie pionowo w odległości od 1,5 do 2 metrów, mniej więcej na wysokości klatki piersiowej, tylną kamerą skierowaną w Twoją stronę. Następnie wejdź w kadr z wyciągniętymi rękami.</string> <string name="hand_camera_how_front">Ustaw urządzenie pionowo w odległości od 1,5 do 2 metrów, mniej więcej na wysokości klatki piersiowej, ekranem skierowanym w Twoją stronę. Następnie wejdź w kadr z wyciągniętymi rękami.</string> @@ -2733,6 +2946,21 @@ <string name="storage_safe_hint">Nieużywane środowiska, pozostałości, stare logi</string> <string name="storage_clean_up">Czyszczenie…</string> <string name="storage_session_running">Zatrzymaj sesję, aby wyczyścić lub coś usunąć. Rozmiary pozostają widoczne.</string> + <string name="storage_default_group">Miejsce instalacji</string> + <string name="storage_default_title">Domyślna pamięć</string> + <string name="storage_default_hint">Nowe instalacje ze sklepów trafiają do wybranego miejsca. Istniejące gry zostają, gdzie są. Biblioteki Steam mają własne ustawienie.</string> + <string name="storage_default_ask">Pytaj za każdym razem</string> + <string name="storage_default_ask_detail">Wybieraj miejsce przy każdej instalacji</string> + <string name="storage_default_internal">Pamięć wewnętrzna</string> + <string name="storage_default_external">Pamięć zewnętrzna</string> + <string name="storage_default_external_detail">%1$s · wolne %2$s</string> + <string name="storage_default_external_missing">Niepodłączona</string> + <string name="storage_default_folder">Folder · %1$s</string> + <string name="storage_default_folder_free">wolne %1$s</string> + <string name="storage_default_folder_missing">Niepodłączony</string> + <string name="storage_default_choose_folder">Wybierz folder…</string> + <string name="storage_default_choose_folder_detail">Użyj dowolnego folderu na karcie SD lub dysku USB</string> + <string name="storage_default_note">Gry trafiają do folderu Games w wybranym miejscu. Istniejące gry nie są przenoszone.</string> <string name="storage_where">Gdzie to trafia</string> <string name="storage_games">Gry Steam</string> <string name="storage_game_data">Dane gier</string> @@ -2868,6 +3096,9 @@ <string name="storage_data_installed">Zainstalowane gry</string> <string name="storage_data_parts">Prefiks %1$s · shadery %2$s · warsztat %3$s</string> <string name="storage_clear_shaders">Wyczyść shadery</string> + <string name="storage_reset_prefix">Zresetuj prefiks</string> + <string name="storage_reset_prefix_title">Zresetować prefiks dla %1$s?</string> + <string name="storage_reset_prefix_confirm">Usuwa jej prefiks Wine (%1$s) w %2$s i tworzy go od nowa przy następnym uruchomieniu. Zapisy, ustawienia i zainstalowane w nim pakiety redystrybucyjne zostaną utracone; zapisy w Steam Cloud pozostają na Twoim koncie.</string> <string name="storage_data_leftovers">Usunięte gry</string> <string name="storage_steam_app">Aplikacja Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefiks wciąż zawiera pliki, być może lokalne zapisy</string> @@ -3169,6 +3400,117 @@ <string name="spatial_saved_views_hint">Zapisane widoki można przeliczyć. Rozpocznij nową kalibrację, aby przechwycić bieżący układ współrzędnych śledzenia.</string> <string name="spatial_model_checksum_error">Niezgodność sumy kontrolnej modelu ręki</string> <string name="spatial_opencv_load_error">Nie można załadować OpenCV</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synchronizuj przez Syncthing</string> + <string name="sync_enable_hint">Oparta na Syncthing-Fork implementacja Syncthing, która pozwala synchronizować pliki z wewnętrznego systemu plików DroidDeck z innymi instancjami Syncthing. Dotyczy tylko plików przechowywanych w wewnętrznym systemie plików DroidDeck.</string> + <string name="sync_missing">Ta wersja nie zawiera Syncthing.</string> + <string name="sync_starting">Uruchamianie Syncthing</string> + <string name="sync_status_starting">Uruchamianie</string> + <string name="sync_status_up_to_date">Aktualne</string> + <string name="sync_status_syncing">Synchronizowanie</string> + <string name="sync_status_paused">Wstrzymane</string> + <string name="sync_status_pausing">Wstrzymywanie</string> + <string name="sync_status_resuming">Wznawianie</string> + <string name="sync_status_attention">Wymaga uwagi</string> + <string name="sync_status_failed">Syncthing zatrzymany</string> + <string name="sync_failed_retry">Spróbuj ponownie</string> + <string name="sync_paused_wifi">Wstrzymane do połączenia z Wi-Fi</string> + <string name="sync_paused_game">Wstrzymane na czas gry</string> + <string name="sync_summary">Foldery: %1$d · połączone urządzenia: %2$d z %3$d</string> + <string name="sync_left">Pozostało: %1$s</string> + <string name="sync_open_web_ui">Otwórz interfejs WWW</string> + <string name="sync_pause">Wstrzymaj</string> + <string name="sync_resume">Wznów</string> + <string name="sync_running">Działa</string> + <string name="sync_running_hint">Wyłącz, aby całkowicie zatrzymać Syncthing.</string> + <string name="sync_this_device">To urządzenie</string> + <string name="sync_device_id">ID urządzenia</string> + <string name="sync_show_qr">Pokaż kod QR</string> + <string name="sync_advanced">Zaawansowane</string> + <string name="sync_advanced_hint">Porty, kiedy uruchamiać, reset</string> + <string name="sync_open">Otwórz</string> + <string name="sync_waiting">Czeka na Ciebie</string> + <string name="sync_pending_device">%1$s chce się połączyć</string> + <string name="sync_pending_folder">%1$s chce udostępnić „%2$s”</string> + <string name="sync_pending_folder_hint">Zaakceptuj, aby wybrać miejsce zapisu w DroidDeck.</string> + <string name="sync_review">Sprawdź w interfejsie WWW</string> + <string name="sync_folders">Foldery</string> + <string name="sync_no_folders">Brak folderów.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Aktualny</string> + <string name="sync_folder_syncing">Synchronizowanie %1$d%%</string> + <string name="sync_folder_scanning">Skanowanie</string> + <string name="sync_folder_paused">Wstrzymany</string> + <string name="sync_folder_out_of_sync">Niezsynchronizowany</string> + <string name="sync_folder_errors">Nie udało się zsynchronizować plików: %1$d</string> + <string name="sync_folder_blocked">Zablokowany</string> + <string name="sync_folder_blocked_hint">Ten folder znajduje się poza pamięcią DroidDeck, więc DroidDeck go wstrzymał. Aby synchronizować foldery spoza DroidDeck, użyj aplikacji Syncthing-Fork.</string> + <string name="sync_remove_folder">Usuń z Syncthing</string> + <string name="sync_remove_folder_hint">Usunięcie nie kasuje żadnych plików.</string> + <string name="sync_devices">Urządzenia</string> + <string name="sync_no_devices">Brak urządzeń.</string> + <string name="sync_connected">Połączone</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Ostatnio widziane: %1$s</string> + <string name="sync_device_id_title">ID tego urządzenia</string> + <string name="sync_device_id_hint">Na drugim urządzeniu dodaj urządzenie w Syncthing i zeskanuj ten kod lub wklej ID. Następnie zaakceptuj je tutaj w interfejsie WWW.</string> + <string name="sync_copy">Kopiuj</string> + <string name="sync_share">Udostępnij</string> + <string name="sync_done">Gotowe</string> + <string name="sync_off_title">Wyłączyć Syncthing?</string> + <string name="sync_off_body">Syncthing zatrzyma się teraz i pozostanie zatrzymany, dopóki nie zostanie ponownie włączony. Zsynchronizowane pliki pozostaną na miejscu.</string> + <string name="sync_off_forget">Usuń też konfigurację Syncthing</string> + <string name="sync_off_forget_hint">Usuwa ID tego urządzenia, foldery i urządzenia. Po ponownym włączeniu Syncthing zacznie od nowa.</string> + <string name="sync_turn_off">Wyłącz</string> + <string name="sync_ports">Porty</string> + <string name="sync_port_sync">Synchronizacja</string> + <string name="sync_port_discovery">Wykrywanie lokalne</string> + <string name="sync_repick">Wybierz nowe porty</string> + <string name="sync_repick_hint">Sprawdzane ponownie przy każdym uruchomieniu.</string> + <string name="sync_repick_button">Wybierz ponownie</string> + <string name="sync_reset_group">Reset</string> + <string name="sync_api_key">Klucz API</string> + <string name="sync_regenerate">Wygeneruj ponownie</string> + <string name="sync_reset">Zresetuj Syncthing</string> + <string name="sync_reset_hint">Nowe ID urządzenia, foldery i urządzenia zostaną usunięte. Pliki w pamięci DroidDeck zostaną zachowane.</string> + <string name="sync_reset_button">Resetuj</string> + <string name="sync_reset_confirm_title">Zresetować Syncthing?</string> + <string name="sync_running_group">Działanie</string> + <string name="sync_run">Uruchamiaj</string> + <string name="sync_run_open">Gdy DroidDeck jest otwarty</string> + <string name="sync_run_background">W tle</string> + <string name="sync_wifi_only">Tylko przez Wi-Fi</string> + <string name="sync_pause_games">Wstrzymuj podczas gier</string> + <string name="sync_logs">Logi</string> + <string name="sync_logs_hint">Dane wyjściowe Syncthing z tej sesji</string> + <string name="sync_logs_share">Udostępnij</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Najpierw skonfiguruj środowisko Linux.</string> + <string name="sync_accept">Akceptuj</string> + <string name="sync_accept_title">Zapisz „%1$s” w</string> + <string name="sync_add_folder">Dodaj folder</string> + <string name="sync_add_folder_hint">Synchronizuj folder w pamięci DroidDeck</string> + <string name="sync_choose">Wybierz</string> + <string name="sync_add">Dodaj</string> + <string name="sync_add_failed">Nie udało się dodać folderu.</string> + <string name="sync_share_with">Udostępnij dla</string> + <string name="sync_share_none">Brak urządzeń. Ten folder możesz udostępnić później w interfejsie WWW.</string> + <string name="sync_use_folder">Użyj tego folderu</string> + <string name="sync_new_folder">Nowy folder</string> + <string name="sync_location_home">Katalog domowy kontenera</string> + <string name="sync_location_sync">Folder Sync</string> + <string name="sync_location_shared">Pamięć współdzielona DroidDeck</string> + <string name="sync_location_card">DroidDeck na %1$s</string> + <string name="sync_location_app">Dane aplikacji DroidDeck</string> + <string name="sync_web_path_locked">Nowe foldery są zapisywane w folderze Sync DroidDeck. Aby synchronizować inny folder DroidDeck, użyj opcji Dodaj folder na karcie Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Odśwież</string> + <string name="sync_not_running">Syncthing nie działa.</string> + <string name="session_end_steam_sigill">Steam zatrzymał się na niedozwolonej instrukcji (SIGILL). Może to być problem ze zgodnością instrukcji CPU lub awaria klienta. Udostępnij logi wraz z danymi urządzenia.</string> + <string name="session_end_steam_try_x64">Możesz spróbować Ustawienia Steam → Klient Steam → x86-64 (eksperymentalny). Wymaga dodatkowego pobrania i może działać wolniej.</string> + <string name="session_end_vulkan_device">Sterownik graficzny Linux nie znalazł używalnego urządzenia Vulkan. Sprawdź, czy wybrany sterownik GPU Linux obsługuje to GPU.</string> + <string name="session_end_gpu_unsupported">Tej sesji nie można uruchomić, bo w bieżącej konfiguracji to GPU nie ma zgodnego sterownika Vulkan dla Linux. Sterowniki Adreno Turnip nie mogą włączyć obsługi GPU MediaTek/Mali.</string> <string name="setup_group_memory">Pamięć</string> <string name="setup_clear_cached">Zamykaj aplikacje z pamięci podręcznej przed sesją</string> <string name="setup_clear_cached_hint">Na początku sesji DroidDeck zamyka aplikacje, które Android trzyma w tle, aby gra miała więcej pamięci. Debugowanie bezprzewodowe musi być włączone.</string> @@ -3196,6 +3538,12 @@ <string name="epic_client_open">Otwórz</string> <string name="epic_client_install">Zainstaluj</string> <string name="game_tab_about">Informacje</string> + <string name="game_resources_browser">Otwiera się w przeglądarce</string> + <string name="game_resource_guides">Poradniki</string> + <string name="game_resource_protondb_detail">Raporty zgodności Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Dla gier z zapisami na Twoim koncie Steam</string> + <string name="game_resource_search">Wyszukiwanie w sieci</string> <string name="game_tab_install">Zainstaluj</string> <string name="game_install_location">Lokalizacja</string> <string name="game_install_folder">Folder</string> @@ -3212,6 +3560,11 @@ <string name="stores_eyebrow_pass">dostępna w %1$s</string> <string name="stores_owned_in_library">Posiadane gry w bibliotece</string> <string name="library_filter_added">Dodane</string> + <string name="library_filter">Filtr</string> + <string name="library_filter_installed">Tylko zainstalowane</string> + <string name="library_filter_all_owned">Wszystkie posiadane gry</string> + <string name="library_no_installed_matches">Żadna zainstalowana gra nie pasuje do tych filtrów.</string> + <string name="library_browse_owned">Przeglądaj posiadane gry</string> <string name="game_tab_launch">Uruchamianie</string> <string name="game_tab_saves_cloud">Zapisy i chmura</string> <string name="game_launch_shortcut">Skrót Steam</string> @@ -3229,6 +3582,40 @@ <string name="stores_itch_update_replaced">Deweloper zastąpił tę wersję plikiem %1$s. Zaktualizować do niej?</string> <string name="xbox_filter_cloud">Chmura</string> <string name="stores_xbox_cloud_settings">Ustawienia chmury</string> + <string name="integration_title">Integracja ze Steam</string> + <string name="integration_count">Włączone: %1$d z %2$d</string> + <string name="integration_set_up">Skonfiguruj</string> + <string name="integration_location">Lokalizacja</string> + <string name="integration_app_info">Informacje o aplikacji</string> + <string name="integration_wifi">Nazwy Wi-Fi</string> + <string name="integration_brightness">Jasność</string> + <string name="integration_home">DroidDeck jako ekran główny</string> + <string name="integration_shortcuts">Klawisze systemowe</string> + <string name="integration_wifi_hint">Pokazuj sieci w Steam · wymaga dostępu do lokalizacji, nigdy nie jest śledzona</string> + <string name="integration_wifi_on">Sieci są widoczne w Steam</string> + <string name="integration_wifi_location_off">Lokalizacja jest wyłączona</string> + <string name="integration_wifi_denied">Odmówiono dostępu do lokalizacji · zezwól w Informacjach o aplikacji</string> + <string name="integration_brightness_hint">Suwak Steam ustawia jasność ekranu</string> + <string name="integration_home_hint">Przycisk ekranu głównego otwiera menu Steam w sesji</string> + <string name="integration_shortcuts_hint">Alt+Tab, klawisz Win i przycisk Home pozostają w sesji</string> + <string name="integration_shortcuts_maybe_restricted">Wyszarzone w Androidzie? Informacje o aplikacji → ⋮ → Zezwól na ustawienia z ograniczeniami</string> + <string name="integration_shortcuts_restricted">Zablokowane przez Androida · Informacje o aplikacji → ⋮ → Zezwól na ustawienia z ograniczeniami</string> + <string name="integration_shortcuts_service">Klawisze systemowe DroidDeck</string> + <string name="integration_shortcuts_service_description">Zatrzymuje Alt+Tab, klawisz Win i przycisk Home w aktywnej sesji DroidDeck zamiast w Androidzie.</string> + <string name="integration_brightness_needed">Włącz Jasność w Konfiguracja → Integracja ze Steam</string> + <string name="setup_gpu_bridge_off">Most Mali: wył.</string> + <string name="setup_gpu_bridge_on">Most Mali: wł.</string> + <string name="setup_gpu_bridge_detail">%1$s to nie Adreno. Eksperymentalny most Vulkan jest włączony: sesja rysuje przez własny sterownik telefonu. Spodziewaj się błędów; wyślij logi sesji.</string> + <string name="setup_bridge_safe">Tryb bezpieczny</string> + <string name="setup_bridge_safe_on">Tryb bezpieczny: wł.</string> + <string name="setup_bridge_safe_off">Tryb bezpieczny: wył.</string> + <string name="setup_bridge_safe_on_detail">Największa zgodność. Zalecany dla nowego urządzenia.</string> + <string name="setup_bridge_safe_off_detail">Szybciej tam, gdzie ten GPU przeszedł testy.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatycznie</string> + <string name="setup_bridge_dxvk_proton">DXVK: z Protona</string> + <string name="setup_bridge_dxvk_auto_detail">Używa starszego DXVK, gdy Vulkan tego GPU jest za stary dla DXVK z Protona.</string> + <string name="setup_bridge_dxvk_proton_detail">Każdy Proton zachowuje własny DXVK, nawet jeśli Vulkan tego GPU może być dla niego za stary.</string> <string name="apps_search_hint">Szukaj aplikacji</string> <string name="apps_no_match">Żadna aplikacja nie pasuje do „%1$s”.</string> <string name="apps_add_widget">Dodaj widżet</string> @@ -3279,6 +3666,8 @@ <string name="desktop_restore_done_body">Dodane aplikacje są ponownie zainstalowane.</string> <string name="desktop_restore_failed_title">Nie udało się przywrócić części oprogramowania</string> <string name="desktop_restore_failed_body">Sprawdź ~/.cache/droiddeck/apt-restore.log, a potem spróbuj sudo apt install w Konsole.</string> + <string name="gog_full_files">Natywne optymalizacje są niedostępne. Pobieranie zawiera pełne pliki zastępcze.</string> + <string name="gog_recover">Zweryfikuj wynik łatki</string> <string name="slow_usb_title">Wolne połączenie USB</string> <string name="slow_usb_cable">%1$s jest podłączony przez %2$s (%3$s Mb/s, około %4$d MB/s), więc gry na nim będą wczytywać się wolno. Użyj kabla USB 3 o przepustowości 5 Gb/s lub większej, odwróć wtyczkę USB-C albo użyj szybszego dysku.</string> <string name="slow_usb_port">%1$s jest podłączony przez %2$s (%3$s Mb/s, około %4$d MB/s). Port USB tego urządzenia nie działa szybciej, więc gry będą wczytywać się wolno. Pamięć wewnętrzna lub karta microSD mogą być szybsze.</string> @@ -3289,4 +3678,52 @@ <string name="steam_import_names_more">%1$s i %2$d więcej</string> <string name="steam_import_now">Uruchom ponownie teraz</string> <string name="steam_import_later">Później</string> + <string name="gog_maintenance">Zarządzaj instalacją GOG</string> + <string name="gog_check">Sprawdź aktualizacje</string> + <string name="gog_repair">Weryfikuj/napraw</string> + <string name="gog_patches">Łatki offline</string> + <string name="gog_refresh">Pobierz pełny instalator offline</string> + <string name="gog_update">Aktualizuj do %1$s</string> + <string name="gog_resume">Wznów konserwację GOG</string> + <string name="gog_open_patch">Otwórz instalator łatki</string> + <string name="gog_patch_in_session">Dokończ lub anuluj instalator łatki w sesji Linux.</string> + <string name="gog_patch_requirements">Wybierz łatkę dla zainstalowanej wersji i języka. Obsługiwane wersje źródłowe mogą nie być wymienione.</string> + <string name="gog_no_patches">GOG nie ma samodzielnych łatek Windows dla tej gry.</string> + <string name="gog_managed_files">Zmodyfikowane pliki gry mogą zostać zastąpione.</string> + <string name="gog_patch_installer_note">Instalator otworzy się w Twojej sesji Linux.</string> + <string name="gog_download_label">Pobieranie</string> + <string name="gog_space_label">Dodatkowe miejsce</string> + <string name="gog_space_estimate_label">Szacowane miejsce</string> + <string name="gog_repair_action">Napraw pliki</string> + <string name="gog_refresh_action">Odśwież instalację</string> + <string name="gog_select_patch">Wybierz</string> + <string name="stores_gamejolt_not_owned">Nie ma go w Twojej bibliotece Game Jolt</string> + <string name="stores_gamejolt_no_build">Brak wersji na Windows dla tej gry</string> + <string name="stores_gamejolt_no_exe">W pobranych plikach nie znaleziono gry na Windows</string> + <string name="stores_gamejolt_no_game">Nie znaleziono tej gry w Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Nie udało się wczytać gier z Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt odpowiedziało HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Nie udało się wczytać plików z Game Jolt</string> + <string name="stores_gamejolt_build_open">Otwórz w Game Jolt</string> + <string name="stores_gamejolt_archive">Archiwa %1$s nie są obsługiwane</string> + <string name="stores_gamejolt_extract_failed">Nie można rozpakować pobranego pliku (kod %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Nie można połączyć się z Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt nie podał linku do pobrania</string> + <string name="stores_gamejolt_section_featured">Polecane</string> + <string name="stores_gamejolt_section_hot">Na czasie</string> + <string name="stores_gamejolt_section_best">Najlepsze</string> + <string name="stores_gamejolt_section_new">Nowe</string> + <string name="stores_gamejolt_price_under_30">30 $ lub mniej</string> + <string name="stores_gamejolt_os_other">Inne</string> + <string name="stores_gamejolt_maturity_everyone">Dla wszystkich</string> + <string name="stores_gamejolt_maturity_teen">Nastolatki</string> + <string name="stores_gamejolt_maturity_adult">Dla dorosłych</string> + <string name="stores_gamejolt_status_complete">Ukończone</string> + <string name="stores_gamejolt_status_early">Wczesny dostęp</string> + <string name="stores_gamejolt_partners">Gry partnerów</string> + <string name="stores_gamejolt_filter_browser">Przeglądarka</string> + <string name="stores_gamejolt_filter_maturity">Kategoria wiekowa</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partnerzy</string> + <string name="stores_gamejolt_followed">Obserwowane gry</string> </resources> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index edfb951b44..ca404e28fb 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opções do VKD3D para D3D12. nodxr desativa o ray tracing; utilize apenas num jogo que o exija.</string> <string name="game_env_proton_log">Defina como 1 para obter um registo de diagnóstico do Proton. O registo pode reduzir o desempenho e ocupar armazenamento.</string> <string name="game_env_wined3d">Defina como 1 para utilizar o WineD3D baseado em OpenGL em vez do DXVK, para testar a compatibilidade com D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderizador para DirectDraw, Direct3D 1-7 e jogos executados com WineD3D. O Vulkan evita o caminho OpenGL sobre Zink e é muito mais rápido para jogos antigos DirectDraw e Direct3D 7 em Adreno.</string> + <string name="game_env_dxvk_d3d8">Defina como 1 para executar o Direct3D 8 através do DXVK em vez do WineD3D. Mais rápido no teste Direct3D 8 do AIO Graphics Test em Adreno.</string> <string name="game_env_no_ntsync">Defina como 1 para manter este jogo fora do ntsync (droiddeck-ntsync ou um controlador do kernel); utiliza o droiddeck-esync onde existir um pacote, caso contrário o droiddeck-fsync.</string> <string name="game_env_no_esync">Defina como 1 para desativar o droiddeck-esync neste jogo; utiliza o droiddeck-fsync em vez dele, ou o droiddeck-ntsync se o fsync também estiver desativado.</string> <string name="game_env_no_fsync">Defina como 1 para manter este jogo fora do droiddeck-fsync; utiliza o droiddeck-esync onde existir um pacote, caso contrário o droiddeck-ntsync.</string> <string name="game_env_fsync_first">Defina como 1 para executar este jogo com o droiddeck-fsync, ou 0 para dar prioridade ao droiddeck-esync onde houver um pacote compatível com o respetivo Proton.</string> <string name="game_env_xalia">Defina como 0 para desativar o assistente de navegação por comando do Proton neste jogo.</string> + <string name="game_env_anticheat_offline">Ativado por predefinição. Inicia um jogo com Easy Anti-Cheat sem o anti-cheat quando o jogo suporta jogo offline. Desative para iniciar através do Easy Anti-Cheat como habitualmente. Os modos online que exigem o Easy Anti-Cheat continuam indisponíveis.</string> <string name="game_env_hud">Sobreposição do DXVK para D3D9–11. fps mostra a taxa de fotogramas; sem valor, fica oculta.</string> <string name="game_env_dxvk_config">Definições do DXVK separadas por ponto e vírgula. As versões recentes utilizam dxvk.maxFrameRate para limitar os fotogramas; para jogar normalmente, prefira o limitador de fotogramas da sessão.</string> + <string name="game_env_cores">Núcleos da CPU para este jogo, por exemplo 0-4 ou 0,2,4, em vez dos núcleos de jogo da sessão. Menos núcleos aquecem menos.</string> <string name="game_env_vkd3d_limit">Limite da taxa de fotogramas em D3D12. 0 desativa o limite.</string> <string name="game_env_glthread">Threading OpenGL do Mesa. true pode ajudar jogos OpenGL limitados pela CPU; teste jogo a jogo.</string> <string name="sync_backend_title">Sincronização do Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">O FEX executa programas Linux x86 neste dispositivo ARM64. Em Automático, é utilizado quando o programa foi compilado para x86.</string> <string name="app_fex_x86">%1$s através do FEX</string> <string name="app_fex_not_ready">Este programa foi compilado para PCs %1$s e é executado através do FEX, que ainda não está configurado. Abra o Steam uma vez com a sessão iniciada: o DroidDeck transfere o FEX e o Steam Linux Runtime necessários e, depois, este programa abre.</string> + <string name="session_proot_missing">Não foi possível transferir o proot do DroidDeck. Verifique a ligação e tente novamente. A sessão não foi iniciada, porque o proot alternativo é demasiado lento para jogar.</string> + <string name="session_directaudio_missing">Não foi possível transferir o DirectAudio, por isso o áudio dos jogos utiliza o caminho mais lento nesta sessão.</string> <string name="session_end_program">Este programa</string> <string name="session_end_steam_download">Não foi possível transferir o cliente Steam. A sua rede ou VPN pode estar a bloquear os servidores da Steam; verifique a ligação e tente novamente.</string> <string name="session_end_steam_setup">Não foi possível configurar o cliente Steam. Verifique a ligação e o espaço livre e tente novamente.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Comando Xbox 360</string> <string name="mode_controller_note">Deck: botão de Acesso rápido e giroscópio. Steam Controller: o mesmo, com sensor de pega nos botões traseiros. DualShock 4 e DualSense: giroscópio, e os trackpads como o painel tátil do comando. Xbox 360: abra o Acesso rápido com Guide+A.</string> <string name="mode_back">Voltar</string> + <string name="back_hold">Manter Voltar premido para atalhos do Steam</string> + <string name="back_hold_hint">Manter Voltar premido abre o Acesso rápido ou cria combinações do Steam com outros botões. Desative para ignorar Voltar premido; toque e toque duplo continuam a funcionar.</string> + <string name="back_native_qam_hint">Mantenha Voltar premido durante 700 ms, ou mantenha Voltar premido e prima outro botão para atalhos do Steam.</string> + <string name="back_double_tap_window">Intervalo do toque duplo</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Permitir controlo do brilho</string> + <string name="brightness_permission_text">Configure o controlo do brilho no DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sessão</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Adia a suspensão em segundo plano enquanto o Steam está a transferir.</string> <string name="mode_suspend_note">Automático: pausa em segundo plano e retoma ao voltar a ser apresentada. Manual: aguarda por Retomar. Nunca: continua em execução.</string> <string name="mode_startup">Arranque</string> - <string name="mode_steam_startup">Iniciar o Steam com o DroidDeck</string> - <string name="mode_steam_startup_hint">Abre a sessão do Steam quando o DroidDeck é iniciado.</string> + <string name="mode_startup_session">Abrir ao iniciar</string> + <string name="mode_startup_session_hint">Inicia esta sessão quando o DroidDeck é aberto.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">A procurar versões…</string> <string name="mode_decky_ready">Pronto para instalar %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Atualizado · %1$s</string> <string name="mode_decky_loader">Carregador</string> <string name="mode_decky_install_latest">Instalar a versão mais recente</string> + <string name="decky_channel">Canal de atualização</string> + <string name="decky_channel_hint">Que versões do Decky Loader instalar. O atualizador do próprio Decky utiliza o mesmo canal.</string> + <string name="decky_channel_stable">Estável</string> + <string name="decky_channel_prerelease">Pré-lançamento</string> + <string name="decky_channel_testing">Testes</string> + <string name="decky_channel_failed">Não foi possível guardar o canal de atualização do Decky</string> <string name="mode_decky_on">Inicia com o Steam. Enquanto estiver ligado, outras apps neste dispositivo poderão controlar o Steam.</string> <string name="mode_decky_off">Desligado. A porta de depuração remota do Steam mantém-se fechada.</string> <string name="mode_decky_remove_title">Desinstalar o Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Cliente</string> <string name="mode_mangoapp">Sobreposição de desempenho</string> <string name="mode_mangoapp_hint">Desative se os jogos falharem ou ficarem a preto no Modo Deck. Aplica-se na próxima sessão.</string> + <string name="mode_return_after_game">Voltar ao DroidDeck após um jogo</string> + <string name="mode_return_after_game_hint">Quando um jogo iniciado a partir do DroidDeck ou de outro iniciador fecha, o Steam sai corretamente (os guardados na nuvem terminam primeiro) e regressa lá. Desativado: fica no Steam.</string> + <string name="mode_shader_precache">Pré-cache de shaders</string> + <string name="mode_shader_precache_hint">O Steam transfere shaders pré-compilados para os seus jogos e processa-os em segundo plano, para que os jogos tenham menos soluços. Desativado poupa dados, armazenamento e bateria; os jogos compilam os shaders enquanto são jogados. É a mesma definição de Transferências > Pré-cache de shaders do Steam. Aplica-se na próxima sessão.</string> <string name="mode_steam_repair">Reparar cliente Steam</string> <string name="mode_steam_repair_hint">Volta a transferir o cliente Steam na próxima vez que o Steam iniciar. Utilize se o Steam ficar preso no ecrã de carregamento. Os jogos, a sessão iniciada e as definições são mantidos.</string> <string name="mode_steam_repair_queued">O cliente Steam será transferido novamente na próxima vez que o Steam iniciar.</string> @@ -391,6 +414,8 @@ <string name="mode_directaudio_hint">Ignora o PulseAudio para reduzir a latência.</string> <string name="mode_mic">Microfone</string> <string name="mode_mic_hint">Para chat de voz.</string> + <string name="drawer_mic_hint">Ativa ou desativa a captura do microfone nesta sessão.</string> + <string name="drawer_mic_failed">Não foi possível alterar o microfone. Tente novamente.</string> <string name="mode_network">Rede</string> <string name="mode_wifi_discovery">Deteção de Wi-Fi</string> <string name="mode_wifi_discovery_hint">Mostrar nomes de Wi-Fi e redes próximas no Steam.</string> @@ -553,6 +578,16 @@ <string name="perf_gsrealtime">gamescope: fila de GPU em tempo real</string> <string name="perf_gsrealtime_hint">Dá prioridade ao trabalho de GPU do compositor. Pode suavizar o ritmo de fotogramas, com algum custo para os jogos.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memória</string> + <string name="perf_cap_off">Desativado</string> + <string name="perf_cap_auto">Predefinição do controlador</string> + <string name="perf_zram_client">Comprimir o Steam durante um jogo</string> + <string name="perf_zram_client_hint">20 s após o início de um jogo, o cliente Steam é comprimido na zRAM para deixar mais memória ao jogo, e é lido de volta quando o jogo fecha. Desative se a sessão fechar pouco depois de os jogos iniciarem. Um limite de RAM acima continua a comprimir o Steam quando a sessão o ultrapassa.</string> + <string name="perf_ram_cap">Limite de RAM</string> + <string name="perf_ram_cap_hint">Aplica-se enquanto o cliente Steam está em execução, no modo Steam ou a partir do ambiente de trabalho. Quando a sessão utiliza mais do que isto, o Steam e depois os outros processos suportados da sessão são comprimidos na zRAM. Um limite flexível: nada é fechado, mas os jogos podem ter soluços enquanto as páginas são repostas.</string> + <string name="perf_ram_cap_unavailable">Requer swap em zRAM, que este dispositivo não tem.</string> + <string name="perf_vram_cap">Limite de VRAM</string> + <string name="perf_vram_cap_hint">A memória de vídeo que o DXVK indica aos jogos Direct3D, para que reservem menos para texturas. As definições de DXVK do próprio jogo têm prioridade. Aplica-se na próxima sessão.</string> <string name="perf_gpuclock">Manter a GPU na frequência máxima</string> <string name="perf_gpuclock_hint">Apenas Adreno. Menos soluços, mais consumo de bateria e mais calor.</string> <string name="perf_fixes">Correções da sessão</string> @@ -571,6 +606,8 @@ <string name="perf_fastpath">Caminho rápido do proot</string> <string name="perf_fastpath_needs_seccomp">Requer o filtro seccomp do proot.</string> <string name="perf_fastpath_hint">Pesquisas de ficheiros mais rápidas e menos soluços. Desative se um programa não encontrar os seus ficheiros.</string> + <string name="perf_cursor_composite">Desenhar o cursor dentro do gamescope</string> + <string name="perf_cursor_composite_hint">O gamescope desenha o ponteiro em vez de o passar ao Android. Ative para um cursor controlado pelo comando. Desativado é mais rápido num telemóvel. Aplica-se na próxima sessão.</string> <string name="perf_identity">Identidade da sessão</string> <string name="perf_hostname">Nome do anfitrião</string> <string name="perf_hostname_hint">O nome com que o Steam vê este dispositivo. Em branco, repõe %1$s.</string> @@ -585,6 +622,8 @@ <string name="driver_delete_plain">Os ficheiros são removidos da app.</string> <string name="driver_delete_in_use">Os ficheiros são removidos. Como está em utilização, o padrão passa a ser utilizado.</string> <string name="drawer_page_display">Ecrã</string> + <string name="drawer_frame_limit">Limite de fotogramas</string> + <string name="drawer_frame_limit_note">Limita este jogo. O ecrã muda para uma taxa de atualização que o limite divida de forma exata, quando existe; outros limites podem parecer irregulares. Os jogos Steam utilizam o Limite de fotogramas do Steam no Menu de acesso rápido.</string> <string name="drawer_page_effects">Efeitos</string> <string name="drawer_page_controls">Controlos</string> <string name="drawer_page_components">Componentes</string> @@ -616,8 +655,11 @@ <string name="hud_size_pill">Pílula</string> <string name="hud_size_minimal">Mínimo</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Barra</string> <string name="hud_locked">Bloquear posição</string> <string name="hud_locked_hint">Arraste o HUD para o mover; um toque longo bloqueia-o ou desbloqueia-o. Enquanto estiver bloqueado, os controlos no ecrã por baixo dele continuam a funcionar.</string> + <string name="hud_snap">Encaixar nas laterais</string> + <string name="hud_snap_hint">Solte o HUD e ele vai para a lateral mais próxima do ecrã. Um gesto rápido lança-o nessa direção.</string> <string name="hud_group_look">Aspeto</string> <string name="hud_scale">Tamanho no ecrã</string> <string name="hud_color_soft">Suave</string> @@ -666,7 +708,6 @@ <string name="hud_export_failed">Não foi possível guardar o relatório do HUD.</string> <string name="hud_reset">Repor definições do HUD</string> <string name="hud_reset_button">Repor</string> - <string name="hud_credit">FusionHUD por The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Modo de escala</string> <string name="drawer_scaling_sharpness">Nitidez da escala</string> <string name="drawer_effects">Efeitos de ecrã</string> @@ -701,11 +742,17 @@ <string name="drawer_touch_auto">Automático (%1$s)</string> <string name="drawer_keyboard">Teclado</string> <string name="drawer_latency">Latência</string> + <string name="drawer_low_latency">Modo de baixa latência</string> + <string name="drawer_low_latency_hint">Aumenta o consumo de CPU e de bateria</string> <string name="drawer_low_latency_controller">Comando de baixa latência</string> <string name="drawer_low_latency_controller_hint">O comando comunica a 1000 Hz em vez de 250 Hz. Um pouco mais de CPU.</string> <string name="drawer_low_latency_touch">Toque de baixa latência</string> <string name="drawer_low_latency_touch_hint">Os toques ignoram o agrupamento de fotogramas; os controlos táteis do Steam passam a 1000 Hz. Um pouco mais de CPU.</string> <string name="drawer_evdev_mouse">Canal de rato em bruto</string> + <string name="drawer_relative_mouse">Rato relativo</string> + <string name="drawer_relative_mouse_auto">Automático</string> + <string name="drawer_relative_mouse_on">Ativado</string> + <string name="drawer_relative_mouse_off">Desativado</string> <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Teclado de PC</string> <string name="drawer_android_keyboard">Android</string> @@ -794,6 +841,10 @@ <string name="setup_session">Sessão</string> <string name="setup_logs">Registos da sessão</string> <string name="setup_logs_hint">Guardados após cada sessão</string> + <string name="setup_game_debug_logs">Registos de depuração dos jogos</string> + <string name="setup_game_debug_logs_hint">Inclui diagnósticos do Proton, do Wine e de gráficos no próximo arranque de um jogo. Pode reduzir o desempenho e ocupar mais armazenamento.</string> + <string name="setup_game_debug_logs_restart">Reinicie esta sessão para guardar os registos de depuração dos jogos</string> + <string name="setup_logging_update_failed">Não foi possível atualizar os registos. Verifique o interruptor e tente novamente.</string> <string name="setup_agent_commands">Ferramentas de depuração</string> <string name="setup_latest_logs">Registos da última sessão</string> <string name="setup_saved_logs">Registos de sessões guardados</string> @@ -817,20 +868,22 @@ <string name="setup_home">Utilizar como página inicial</string> <string name="setup_home_on">O DroidDeck pode ser a app de página inicial</string> <string name="setup_home_off">O DroidDeck nunca é proposto como app de página inicial</string> + <string name="setup_home_game_space_first">Em Adicionar jogos, define o DroidDeck como Incluir</string> <string name="setup_orientation">Orientação</string> + <string name="setup_launcher_orientation">Orientação do iniciador</string> + <string name="setup_launcher_orientation_auto">Seguir a rotação do dispositivo</string> + <string name="setup_orientation_portrait">Vertical</string> + <string name="setup_session_orientation">Orientação da sessão</string> + <string name="setup_session_orientation_hint">Aplica-se ao Steam, aos jogos, ao ambiente de trabalho e ao editor de comandos. As predefinições de resolução rodam com a sessão; a largura e a altura personalizadas ficam como foram introduzidas.</string> <string name="setup_orientation_auto">Horizontal automática</string> <string name="setup_orientation_landscape">Horizontal</string> <string name="setup_orientation_reverse">Horizontal invertida</string> <string name="setup_fullscreen">Ecrã inteiro</string> <string name="setup_fullscreen_on">Oculta as barras de estado e de navegação do Android</string> <string name="setup_fullscreen_off">Mostra as barras de estado e de navegação do Android</string> - <string name="setup_dual_screen">Ecrã duplo</string> - <string name="setup_dual_screen_hint">Automático usa o segundo ecrã em consolas portáteis com ecrã secundário integrado. Ativado usa qualquer segundo ecrã. Desativado mantém tudo num só ecrã.</string> <string name="setup_dual_screen_auto">Automático</string> <string name="setup_dual_screen_on">Ativado</string> <string name="setup_dual_screen_off">Desativado</string> - <string name="setup_dual_screen_menu">Menu no ecrã inferior</string> - <string name="setup_dual_screen_menu_hint">Move as secções e o menu do jogo para o segundo ecrã e a escrita é feita lá, para que o ecrã superior mantenha a vista completa. L2 e R2 mudam de secção.</string> <string name="setup_dual_screen_controls">Controlos no ecrã inferior nos jogos</string> <string name="setup_dual_screen_controls_hint">Abre o trackpad e o teclado no segundo ecrã quando uma sessão começa.</string> <string name="dual_typing_title">A escrever para o ecrã superior</string> @@ -985,6 +1038,14 @@ <string name="gate_step1">Abra Definições → Opções de programador → Depuração sem fios e ative-a</string> <string name="gate_step2">Toque em “Sincronizar dispositivo com código de sincronização”</string> <string name="gate_step3">Escreva o código na notificação do DroidDeck</string> + <string name="pairguide_build_number">Em Acerca do telemóvel, toque 7 vezes em Número de compilação</string> + <string name="pairguide_wireless">Ative a Depuração sem fios</string> + <string name="pairguide_pair">Abra a Depuração sem fios e toque em “Sincronizar dispositivo com código de sincronização”</string> + <string name="pairguide_child_process">Ative “Desativar restrições de processos secundários”</string> + <string name="pairguide_row_child_process">Desativar restrições de processos secundários</string> + <string name="pairguide_row_build_number">Número de compilação</string> + <string name="pairguide_row_wireless">Depuração sem fios</string> + <string name="pairguide_row_pair">Sincronizar dispositivo com código de sincronização</string> <string name="gate_waiting">A aguardar a janela de sincronização…</string> <string name="gate_code_needed">Janela encontrada. Introduza o código dela na notificação.</string> <string name="gate_status">Estado</string> @@ -1123,7 +1184,6 @@ <string name="games_never_played">Nunca jogado</string> <string name="games_runtime_busy_percent">Ambiente de execução ocupado · %1$d%%</string> <string name="games_runtime_busy">Ambiente de execução ocupado</string> - <string name="games_runtime_first_play">O ambiente de execução é instalado ao tocar em Jogar pela primeira vez</string> <string name="games_runtime_update">Atualização do ambiente de execução disponível</string> <string name="games_runtime_ready">● Ambiente de execução pronto</string> <string name="games_internal">Armazenamento interno</string> @@ -1140,6 +1200,9 @@ <string name="gpu_hide_other">Ocultar controladores para outras GPUs</string> <string name="gpu_show_other">Mostrar controladores para outras GPUs</string> <string name="gpu_advanced">Avançado</string> + <string name="gpu_ubwc_title">Compatibilidade UBWC</string> + <string name="gpu_ubwc_hint">Experimente Ativado ou Desativado se o Steam ou o Android mostrarem riscas ou cintilação. Aplica-se aos dois controladores após reiniciar o DroidDeck.</string> + <string name="gpu_ubwc_restart">Reinicie o DroidDeck para aplicar.</string> <string name="gpu_set_with_display">Definido em conjunto com o controlador de ecrã: %1$s inclui ambos.</string> <string name="gpu_set_with_runtime">Definido em conjunto com o controlador de execução: %1$s inclui ambos.</string> <string name="gpu_runtime_hint">Utilizado pelos jogos e pelo ambiente de trabalho.</string> @@ -1248,10 +1311,15 @@ <string name="pip_auto">Entrar automaticamente em ecrã no ecrã</string> <string name="unfolded_controls">Controlos no ecrã desdobrado</string> <string name="unfolded_controls_hint">Desdobrado, o jogo fica acima dos trackpads e das pegas traseiras do Steam Deck. Dobrado, o jogo ocupa o ecrã inteiro.</string> + <string name="unfolded_controls_with_controller">Manter com um comando</string> + <string name="unfolded_controls_with_controller_hint">Mostra também estes controlos táteis enquanto houver um comando ligado.</string> <string name="pip_suspended">Suspenso</string> <string name="pip_not_ready">O ecrã no ecrã fica disponível quando a sessão estiver pronta.</string> <string name="pip_permission">Permita o ecrã no ecrã para o DroidDeck nas definições do Android.</string> <string name="pip_unavailable">O Android não conseguiu abrir o ecrã no ecrã.</string> + <string name="game_more">Mais</string> + <string name="game_edit_art">Editar imagens</string> + <string name="stores_in_steam_label">No Steam</string> <string name="game_shortcut">Atalho</string> <string name="game_shortcut_add">Adicionar ao ecrã principal</string> <string name="game_shortcut_choose">Escolher jogo</string> @@ -1275,6 +1343,10 @@ <string name="main_wait_runtime">Aguarde que a operação do runtime termine</string> <string name="main_wait_proton_install">Aguarde que a instalação da ferramenta de compatibilidade termine</string> + <string name="load_compat_title">A preparar as ferramentas de compatibilidade</string> + <string name="load_compat_wait">A aguardar que a configuração de compatibilidade termine</string> + <string name="load_compat_hint">A sua sessão começa quando a configuração terminar.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Aguarde que a instalação da app de ambiente de trabalho termine</string> <string name="main_wait_install_game">Aguarde que a instalação termine antes de iniciar um jogo</string> <string name="main_saves_close_session">Feche primeiro a sessão do Steam, para que o jogo não grave por cima da importação</string> @@ -1315,6 +1387,9 @@ <string name="main_install_anyway">Instalar mesmo assim</string> <string name="main_remove_runtime_title">Remover runtime Linux</string> <string name="main_remove_runtime_text">Isto elimina o runtime, o cliente Steam que nele existe e todos os jogos lá instalados.</string> + <string name="runtime_actions_title">Ambiente de execução Linux</string> + <string name="runtime_actions_text">Reparar reinstala os ficheiros de sistema do ambiente de execução e mantém o Steam, os seus jogos e as definições. Extras como o ambiente de trabalho voltam a ser instalados quando os utilizar. Remover elimina tudo.</string> + <string name="runtime_repair">Reparar ambiente de execução</string> <string name="main_applied">Aplicado: %1$s</string> <string name="android_app_open_failed_primary">Não foi possível abrir %1$s no ecrã principal</string> <string name="android_app_open_failed_on">Não foi possível abrir %1$s em %2$s</string> @@ -1447,6 +1522,12 @@ <string name="session_runtime_catalog_unreachable">Não foi possível aceder ao catálogo de runtimes. Verifique a ligação e prima Jogar novamente.</string> <string name="session_runtime_install_failed">O runtime Linux não foi instalado. Verifique o runtime em Configuração e prima Jogar novamente.</string> <string name="session_desktop_install_failed">O ambiente de trabalho não foi instalado (%1$s). Verifique a ligação e prima Ambiente de trabalho novamente.</string> + <string name="session_package_resume_failed">Não foi possível concluir uma instalação interrompida (%1$s). Verifique a ligação e o espaço e tente novamente.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">O ambiente de execução Linux está danificado: %1$d ligação de biblioteca aponta para um ficheiro em falta (%2$s), normalmente após uma instalação interrompida. Reparar mantém os seus jogos e definições.</item> + <item quantity="many">O ambiente de execução Linux está danificado: %1$d ligações de biblioteca apontam para ficheiros em falta (%2$s e outros), normalmente após uma instalação interrompida. Reparar mantém os seus jogos e definições.</item> + <item quantity="other">O ambiente de execução Linux está danificado: %1$d ligações de biblioteca apontam para ficheiros em falta (%2$s e outros), normalmente após uma instalação interrompida. Reparar mantém os seus jogos e definições.</item> + </plurals> <string name="session_ended_named">%1$s parou inesperadamente. Partilhe os registos num relatório de erro ou tente novamente.</string> <string name="session_ended_program">O programa parou inesperadamente. Partilhe os registos num relatório de erro ou tente novamente.</string> <string name="session_ended_desktop">O ambiente de trabalho parou inesperadamente. Partilhe os registos num relatório de erro ou tente novamente.</string> @@ -1462,6 +1543,14 @@ <string name="mode_decky_plugins_hint">Instale um ZIP de plugin para a próxima sessão do Steam.</string> <string name="mode_decky_plugin_downloading">A transferir…</string> <string name="mode_decky_plugin_install_zip">Instalar a partir de ZIP</string> + <string name="decky_zip_warning_title">Instalação de plugin de terceiros</string> + <string name="decky_zip_warning_text">A equipa do Decky Loader não reviu este plugin. Pode conter malware, como software para roubar a sua conta Steam ou danificar o seu dispositivo. Ao instalar este plugin, aceita que assume todos os riscos para o seu dispositivo.</string> + <string name="decky_zip_warning_continue">Continuar</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Aguarde %1$d segundo</item> + <item quantity="many">Aguarde %1$d segundos</item> + <item quantity="other">Aguarde %1$d segundos</item> + </plurals> <string name="store_cat_games">Jogos</string> <string name="store_cat_audio_video">Áudio e vídeo</string> <string name="store_cat_graphics">Gráficos</string> @@ -1628,6 +1717,8 @@ <string name="fm_accept">Aceitar</string> <string name="fm_decline">Recusar</string> <string name="fm_drive_not_readable">%1$s está montado, mas não é possível lê-lo de momento</string> + <string name="fm_drive_access_title">Permitir acesso a %1$s</string> + <string name="fm_drive_access_text">O Android deixa o DroidDeck ver esta unidade, mas não lê-la. Ative o Acesso a todos os ficheiros para o DroidDeck e volte.</string> <string name="fm_list_view">Vista de lista</string> <string name="fm_grid_view">Vista de grelha</string> <string name="fm_search">Pesquisar</string> @@ -1700,6 +1791,89 @@ <string name="second_mode_keyboard_trackpad">Teclado + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Pegas + trackpads do Deck</string> + <string name="second_mode_dashboard">Painel</string> + <string name="bottom_dashboard_empty">Ainda não há nada para mostrar aqui.</string> + <string name="bottom_page_downloads">Transferências</string> + <string name="bottom_downloads_none">Nenhuma transferência em curso.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">A transferir a cache de shaders</string> + <string name="bottom_downloads_paused">Em pausa</string> + <string name="bottom_downloads_queued">A aguardar início</string> + <string name="bottom_page_notifications">Notificações</string> + <string name="bottom_notifications_listener">Ecrã inferior do DroidDeck</string> + <string name="bottom_notifications_why">Mostre aqui mensagens e outras notificações enquanto joga. Ficam apenas neste ecrã e não são guardadas. O Android pergunta uma vez: a página de acesso às notificações abre neste ecrã; ative lá o DroidDeck e esta página volta automaticamente.</string> + <string name="bottom_notifications_allow">Permitir acesso às notificações</string> + <string name="bottom_notifications_none">Sem notificações.</string> + <string name="bottom_notifications_count">%1$d notificações</string> + <string name="bottom_notifications_clear">Limpar</string> + <string name="bottom_page_screenshots">Capturas de ecrã</string> + <string name="stats_fps_needs_hud">O FPS requer o HUD ativado</string> + <string name="stats_speed">Velocidade</string> + <string name="stats_pedals">Pedais</string> + <string name="stats_gforce">Força G</string> + <string name="stats_timing">Tempos</string> + <string name="stats_best_lap">Melhor volta</string> + <string name="stats_tires">Pneus °C</string> + <string name="stats_trace">Acelerador e travão, últimos 10 s</string> + <string name="stats_speed_chart">Velocidade, %1$s</string> + <string name="stats_gear">Mudança</string> + <string name="stats_steam_client_arm">Cliente Steam ARM</string> + <string name="stats_steam_client_x86">Cliente Steam x86</string> + <string name="stats_throttle">Acelerador</string> + <string name="stats_brake">Travão</string> + <string name="stats_lights">Painel</string> + <string name="stats_lamp_shift">Engrenar mudança</string> + <string name="stats_lamp_handbrake">Travão de mão</string> + <string name="stats_lamp_pit">Limitador de pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Óleo %1$s °C</string> + <string name="stats_power">Distribuidor de energia</string> + <string name="stats_fuel_t">Combustível, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Reserva %1$s t</string> + <string name="bottom_telemetry_send_title">Enviar dados para o painel</string> + <string name="bottom_telemetry_send_auto">Automático</string> + <string name="bottom_telemetry_send_auto_hint">Ativa para todos os jogos aqui listados, incluindo os encontrados mais tarde. Os jogos que desativar permanecem desativados.</string> + <string name="bottom_telemetry_send_note">Isto altera a definição de saída de dados do próprio jogo. Aplica-se da próxima vez que o jogo iniciar; desativar repõe a definição anterior.</string> + <string name="bottom_telemetry_send_close">Feche %1$s para alterar isto.</string> + <string name="bottom_telemetry_send_failed">Não foi possível alterar as definições de %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: ative %2$s nas definições do jogo com o IP 127.0.0.1 e a porta %3$d.</string> + <string name="bottom_shots_where">Guardadas em Pictures/DroidDeck. As capturas de ecrã do Steam também aparecem aqui.</string> + <string name="bottom_shots_take">Fazer captura de ecrã</string> + <string name="bottom_shots_saved">Captura de ecrã guardada.</string> + <string name="bottom_shots_failed">Não foi possível fazer a captura de ecrã.</string> + <string name="bottom_shots_none">Ainda não há capturas de ecrã.</string> + <string name="bottom_page_chat">Chat e voz</string> + <string name="bottom_chat_why">Leia e responda ao chat do Steam aqui enquanto o jogo continua a correr no ecrã principal. Utiliza a conta com que o Steam tem sessão iniciada.</string> + <string name="bottom_chat_not_signed_in">O Steam ainda não tem uma sessão web para partilhar, por isso inicie sessão aqui uma vez.</string> + <string name="bottom_chat_stopped">O Android fechou a página do chat enquanto o DroidDeck estava em segundo plano. Volta a abrir quando regressar ao DroidDeck.</string> + <string name="bottom_chat_open">Abrir o Steam Chat</string> + <string name="bottom_chat_close">Fechar chat</string> + <string name="bottom_chat_mic_on">Microfone ligado</string> + <string name="bottom_chat_mic_off">Microfone desligado</string> + <string name="bottom_chat_mic_unavailable">O microfone está desligado neste jogo. Para falar, ative Microfone nas definições do Steam do DroidDeck (Áudio) e volte a iniciar o jogo.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">Estatísticas no jogo</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Bateria</string> + <string name="bottom_telemetry_lap">Volta</string> + <string name="bottom_telemetry_position">Posição</string> + <string name="bottom_telemetry_this_lap">Volta atual</string> + <string name="bottom_telemetry_last_lap">Última volta</string> + <string name="bottom_telemetry_fuel">Combustível</string> + <string name="bottom_telemetry_cargo">Carga</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Estado legal</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">A porta %1$d está a receber dados (%2$d pacotes de %3$d bytes), mas num formato que esta página ainda não consegue ler.</string> + <string name="bottom_telemetry_port_busy">Outro programa já utiliza a porta %1$s, por isso esse jogo não pode aparecer aqui.</string> <string name="rtinst_removing">A remover o runtime Linux</string> <plurals name="rtinst_removing_entries"> @@ -1731,6 +1905,7 @@ <string name="flatpakmgr_not_ready">Configure primeiro o Flatpak</string> <string name="flatpakmgr_starting">A iniciar</string> <string name="flatpakmgr_exit_status">O Flatpak terminou com o código %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s foi compilado para %2$s, que o DroidDeck não consegue executar. Aqui as apps Flatpak precisam de uma versão para ARM64 ou x86_64.</string> <string name="flatpakmgr_installing">A instalar %1$s</string> <string name="flatpakmgr_updating">A atualizar %1$s</string> <string name="flatpakmgr_removing">A remover %1$s</string> @@ -1824,6 +1999,7 @@ <string name="adbpair_applying">A aplicar a definição…</string> <string name="adbpair_command_failed">Falha no comando de depuração sem fios</string> <string name="adbpair_channel_name">Configuração da depuração sem fios</string> + <string name="adbpair_progress_channel_name">Progresso da configuração da Depuração sem fios</string> <string name="adbpair_channel_description">Pede o código de sincronização da depuração sem fios enquanto as Definições estão abertas</string> <string name="adbpair_title_pair">Sincronizar a depuração sem fios</string> <string name="adbpair_waiting_text">Ative a depuração sem fios e toque em «Sincronizar dispositivo com código de sincronização».</string> @@ -1932,6 +2108,7 @@ <string name="gpuinfo_not_adreno">Não é uma GPU Adreno</string> <string name="gpuinfo_supported">Suportada</string> <string name="gpuinfo_experimental">Experimental: os controladores são versões de teste</string> + <string name="gpuinfo_a850_experimental">Suporte experimental para Adreno 850: requer controladores de ecrã e de jogos experimentais compatíveis; não verificado neste dispositivo</string> <string name="gpuinfo_below_tested">Abaixo do hardware testado (Adreno 725 e mais recentes): pode não funcionar</string> <string name="gpuinfo_unsupported">Não suportada: o DroidDeck precisa de uma GPU Adreno (Snapdragon)</string> @@ -2028,6 +2205,7 @@ <string name="display_look_filter">%1$s Define a escala como %2$s.</string> <string name="display_match_screen">Igual ao ecrã (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir o ecrã (redimensiona ao dobrar ou desdobrar)</string> + <string name="display_follow_screen_scaled">Escalado %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Mostrar detalhes do dispositivo</string> <string name="device_info_hide">Ocultar detalhes do dispositivo</string> @@ -2134,6 +2312,13 @@ <string name="stores_resume">Retomar</string> <string name="stores_refresh">Atualizar</string> <string name="stores_sort">Ordenar</string> + <string name="setup_rail_labels">Etiquetas da barra lateral</string> + <string name="setup_rail_labels_hint">Mostra os nomes por baixo dos ícones da barra lateral. Desative para uma barra lateral mais estreita.</string> + <string name="library_display">Apresentação</string> + <string name="library_display_larger">Cartões maiores</string> + <string name="library_display_smaller">Cartões mais pequenos</string> + <string name="library_display_title">Mostrar título</string> + <string name="library_display_size">Mostrar tamanho</string> <string name="stores_sort_last_played">Jogados recentemente</string> <string name="stores_sort_recently_installed">Instalados recentemente</string> <string name="stores_sort_title_asc">Título A–Z</string> @@ -2260,6 +2445,9 @@ <string name="stores_download_manager">Gestor de transferências</string> <string name="stores_parallel">Transferências em simultâneo</string> <string name="stores_install_where">Instalar em</string> + <string name="stores_install_language">Idioma do jogo</string> + <string name="stores_install_language_hint">O GOG e a Epic instalam este idioma. Sistema segue o idioma da app.</string> + <string name="stores_install_language_system">Sistema</string> <string name="stores_install_title">Instalar %1$s:</string> <string name="stores_target_internal">Interno</string> <string name="stores_target_free">%1$s livres</string> @@ -2295,6 +2483,9 @@ <string name="edit_target">Destino</string> <string name="edit_start_in">Iniciar em</string> <string name="edit_launch_options">Opções de arranque</string> + <string name="edit_launch_options_steam_hint">Partilhadas com as Propriedades do Steam: uma alteração num dos locais aparece em ambos.</string> + <string name="edit_launch_options_not_saved">Não foi possível guardar as opções de arranque no Steam. Tenta novamente.</string> + <string name="edit_launch_options_desktop">O Steam pode estar aberto na sessão do ambiente de trabalho. Altera as opções de arranque nas Propriedades dele, ou fecha primeiro a sessão.</string> <string name="edit_artwork">Imagens</string> <string name="edit_other_exe">Outro exe…</string> <string name="edit_remove">Remover</string> @@ -2424,6 +2615,7 @@ <string name="setup_download_source_custom">Prefixo personalizado</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Prefixo</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APPS LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Apps para o ambiente de trabalho Linux, abertas a partir de Ambiente de trabalho.</string> @@ -2566,6 +2758,22 @@ <string name="glasses_tracking_flat_hint">O modo Automático mantém este jogo 2D fixo na vista. Escolha Ecrã virtual na secção Ecrã para utilizar o seguimento da cabeça.</string> <string name="glasses_tracking_sbs_hint">O seguimento da cabeça aplica-se a um ecrã virtual ou a um jogo do SteamVR em execução.</string> <string name="glasses_hardware">Dispositivo</string> + <string name="vr_controllers_tab">Comandos</string> + <string name="vr_controllers_group">Comandos do SteamVR</string> + <string name="vr_controllers_emulate">Comando em RV</string> + <string name="vr_controllers_emulate_hint">As duas mãos de RV que o seu comando representa. As alterações aplicam-se de imediato, mesmo com o SteamVR em execução. Os Joy-Con e as mãos rastreadas continuam a assumir o respetivo lado.</string> + <string name="vr_controllers_off">Comando normal</string> + <string name="vr_controllers_index">Comandos Valve Index</string> + <string name="vr_controllers_touch">Comandos Meta Quest 3</string> + <string name="vr_controllers_vive">Comandos HTC Vive</string> + <string name="vr_controllers_sticks">Os manípulos começam por</string> + <string name="vr_controllers_sticks_hint">Prima os dois manípulos em simultâneo durante a RV para alternar.</string> + <string name="vr_controllers_sticks_game">Mover-se no jogo</string> + <string name="vr_controllers_sticks_hands">Mover as mãos</string> + <string name="vr_controllers_buttons">Botões</string> + <string name="vr_controllers_buttons_stick">Os gatilhos são gatilhos, os botões superiores agarram, A/B e X/Y são os botões frontais de cada mão, premir os manípulos clica nos thumbsticks e Guide abre o menu do SteamVR. Direcional para cima e para baixo aproxima ou afasta as mãos.</string> + <string name="vr_controllers_buttons_vive">Os manípulos são trackpads; A/X ou premir um manípulo carrega neles. Os gatilhos são gatilhos, os botões superiores agarram, Start e Select são menu e Guide abre o menu do SteamVR.</string> + <string name="vr_controllers_buttons_off">Sem mãos de RV. Os jogos que suportam comando, e o menu do SteamVR, recebem o seu comando como habitualmente.</string> <string name="glasses_brightness">Brilho</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Escurecimento</string> @@ -2623,6 +2831,12 @@ <string name="hand_camera_placement">Posição da câmara</string> <string name="hand_camera_placement_hint">Verifique se a câmara te consegue ver antes de jogar.</string> <string name="hand_camera_check">Verificar</string> + <string name="tracking_pack_title">Transferência do rastreio de mãos</string> + <string name="tracking_pack_hint">O rastreio de mãos precisa de uma transferência única de %1$s.</string> + <string name="tracking_pack_download">Transferir</string> + <string name="tracking_pack_retry">Tentar novamente</string> + <string name="tracking_pack_downloading">A transferir o rastreio de mãos… %1$d%%</string> + <string name="tracking_pack_failed">Não foi possível transferir o rastreio de mãos. Verifique a ligação e tente novamente.</string> <string name="hand_camera_check_title">Posição da câmara</string> <string name="hand_camera_how_rear">Coloque o dispositivo em pé a 1,5-2 metros de distância, à altura do peito, com a câmara traseira voltada para ti. Depois entre no campo de visão com as mãos estendidas.</string> <string name="hand_camera_how_front">Coloque o dispositivo em pé a 1,5-2 metros de distância, à altura do peito, com o ecrã voltado para ti. Depois entre no campo de visão com as mãos estendidas.</string> @@ -2705,6 +2919,21 @@ <string name="storage_safe_hint">Ambientes de execução sem uso, resíduos, registos antigos</string> <string name="storage_clean_up">Limpar…</string> <string name="storage_session_running">Termine a sessão para limpar ou remover algo. Os tamanhos continuam visíveis.</string> + <string name="storage_default_group">Local de instalação</string> + <string name="storage_default_title">Armazenamento predefinido</string> + <string name="storage_default_hint">As novas instalações das lojas vão para o local selecionado. Os jogos existentes ficam onde estão. As bibliotecas do Steam mantêm a sua própria definição.</string> + <string name="storage_default_ask">Perguntar sempre</string> + <string name="storage_default_ask_detail">Escolha um destino para cada instalação</string> + <string name="storage_default_internal">Armazenamento interno</string> + <string name="storage_default_external">Armazenamento externo</string> + <string name="storage_default_external_detail">%1$s · %2$s livres</string> + <string name="storage_default_external_missing">Não ligado</string> + <string name="storage_default_folder">Pasta · %1$s</string> + <string name="storage_default_folder_free">%1$s livres</string> + <string name="storage_default_folder_missing">Não ligada</string> + <string name="storage_default_choose_folder">Escolher pasta…</string> + <string name="storage_default_choose_folder_detail">Utilize qualquer pasta num cartão SD ou unidade USB</string> + <string name="storage_default_note">Os jogos vão para uma pasta Games dentro do local selecionado. Os jogos existentes não são movidos.</string> <string name="storage_where">Para onde vai</string> <string name="storage_games">Jogos do Steam</string> <string name="storage_game_data">Dados dos jogos</string> @@ -2833,6 +3062,9 @@ <string name="storage_data_installed">Jogos instalados</string> <string name="storage_data_parts">Prefixo %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Apagar shaders</string> + <string name="storage_reset_prefix">Repor prefixo</string> + <string name="storage_reset_prefix_title">Repor o prefixo de %1$s?</string> + <string name="storage_reset_prefix_confirm">Elimina o respetivo prefixo do Wine (%1$s) em %2$s e recria-o no próximo arranque. Os guardados, as definições e os redistribuíveis instalados nele perdem-se; os guardados do Steam Cloud ficam na sua conta.</string> <string name="storage_data_leftovers">Jogos desinstalados</string> <string name="storage_steam_app">Aplicação Steam %1$d</string> <string name="storage_leftover_unsure_detail">O prefixo dele ainda tem ficheiros, que podem incluir jogos guardados locais</string> @@ -3135,6 +3367,117 @@ <string name="spatial_saved_views_hint">As visualizações guardadas podem ser recalculadas. Inicie uma nova calibração para captar no sistema de coordenadas de seguimento atual.</string> <string name="spatial_model_checksum_error">Incompatibilidade de checksum do modelo de mãos</string> <string name="spatial_opencv_load_error">O OpenCV não conseguiu carregar</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizar com o Syncthing</string> + <string name="sync_enable_hint">Baseada no Syncthing-Fork, esta é uma implementação do Syncthing que lhe permite sincronizar ficheiros do sistema de ficheiros interno do DroidDeck com outras instâncias do Syncthing. Aplica-se apenas aos ficheiros que guarda no sistema de ficheiros interno do DroidDeck.</string> + <string name="sync_missing">Esta compilação não inclui o Syncthing.</string> + <string name="sync_starting">A iniciar o Syncthing</string> + <string name="sync_status_starting">A iniciar</string> + <string name="sync_status_up_to_date">Atualizado</string> + <string name="sync_status_syncing">A sincronizar</string> + <string name="sync_status_paused">Em pausa</string> + <string name="sync_status_pausing">A pausar</string> + <string name="sync_status_resuming">A retomar</string> + <string name="sync_status_attention">Requer atenção</string> + <string name="sync_status_failed">O Syncthing parou</string> + <string name="sync_failed_retry">Tentar novamente</string> + <string name="sync_paused_wifi">Em pausa até haver Wi-Fi</string> + <string name="sync_paused_game">Em pausa durante o jogo</string> + <string name="sync_summary">%1$d pastas · %2$d de %3$d dispositivos ligados</string> + <string name="sync_left">Faltam %1$s</string> + <string name="sync_open_web_ui">Abrir interface web</string> + <string name="sync_pause">Pausar</string> + <string name="sync_resume">Retomar</string> + <string name="sync_running">Em execução</string> + <string name="sync_running_hint">Desative para parar o Syncthing por completo.</string> + <string name="sync_this_device">Este dispositivo</string> + <string name="sync_device_id">ID do dispositivo</string> + <string name="sync_show_qr">Mostrar QR</string> + <string name="sync_advanced">Avançado</string> + <string name="sync_advanced_hint">Portas, quando executar, repor</string> + <string name="sync_open">Abrir</string> + <string name="sync_waiting">À sua espera</string> + <string name="sync_pending_device">%1$s quer ligar-se</string> + <string name="sync_pending_folder">%1$s quer partilhar “%2$s”</string> + <string name="sync_pending_folder_hint">Aceite para escolher onde é guardada no DroidDeck.</string> + <string name="sync_review">Rever na interface web</string> + <string name="sync_folders">Pastas</string> + <string name="sync_no_folders">Ainda não há pastas.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Atualizada</string> + <string name="sync_folder_syncing">A sincronizar %1$d%%</string> + <string name="sync_folder_scanning">A analisar</string> + <string name="sync_folder_paused">Em pausa</string> + <string name="sync_folder_out_of_sync">Dessincronizada</string> + <string name="sync_folder_errors">Não foi possível sincronizar %1$d ficheiros</string> + <string name="sync_folder_blocked">Bloqueada</string> + <string name="sync_folder_blocked_hint">Esta pasta está fora do armazenamento do DroidDeck, por isso o DroidDeck colocou-a em pausa. Para sincronizar pastas fora do DroidDeck, utilize a app Syncthing-Fork.</string> + <string name="sync_remove_folder">Remover do Syncthing</string> + <string name="sync_remove_folder_hint">Removê-la não elimina nenhum ficheiro.</string> + <string name="sync_devices">Dispositivos</string> + <string name="sync_no_devices">Ainda não há dispositivos.</string> + <string name="sync_connected">Ligado</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Visto pela última vez: %1$s</string> + <string name="sync_device_id_title">ID deste dispositivo</string> + <string name="sync_device_id_hint">No outro dispositivo, adicione um dispositivo no Syncthing e leia este código ou cole o ID. Depois, aceite-o aqui na interface web.</string> + <string name="sync_copy">Copiar</string> + <string name="sync_share">Partilhar</string> + <string name="sync_done">Concluído</string> + <string name="sync_off_title">Desativar o Syncthing?</string> + <string name="sync_off_body">O Syncthing para agora e continua parado até voltar a ser ativado. Os ficheiros sincronizados ficam onde estão.</string> + <string name="sync_off_forget">Eliminar também a configuração do Syncthing</string> + <string name="sync_off_forget_hint">Remove o ID deste dispositivo, as pastas e os dispositivos. Ao voltar a ativá-lo, começa do zero.</string> + <string name="sync_turn_off">Desativar</string> + <string name="sync_ports">Portas</string> + <string name="sync_port_sync">Sincronização</string> + <string name="sync_port_discovery">Descoberta local</string> + <string name="sync_repick">Escolher novas portas</string> + <string name="sync_repick_hint">Verificadas novamente em cada início.</string> + <string name="sync_repick_button">Escolher novamente</string> + <string name="sync_reset_group">Repor</string> + <string name="sync_api_key">Chave da API</string> + <string name="sync_regenerate">Regenerar</string> + <string name="sync_reset">Repor o Syncthing</string> + <string name="sync_reset_hint">Novo ID do dispositivo; pastas e dispositivos removidos. Os ficheiros no armazenamento do DroidDeck são mantidos.</string> + <string name="sync_reset_button">Repor</string> + <string name="sync_reset_confirm_title">Repor o Syncthing?</string> + <string name="sync_running_group">Execução</string> + <string name="sync_run">Executar</string> + <string name="sync_run_open">Enquanto o DroidDeck estiver aberto</string> + <string name="sync_run_background">Em segundo plano</string> + <string name="sync_wifi_only">Apenas Wi-Fi</string> + <string name="sync_pause_games">Pausar durante os jogos</string> + <string name="sync_logs">Registos</string> + <string name="sync_logs_hint">Saída do Syncthing nesta sessão</string> + <string name="sync_logs_share">Partilhar</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Configure primeiro o ambiente de execução Linux.</string> + <string name="sync_accept">Aceitar</string> + <string name="sync_accept_title">Guardar “%1$s” em</string> + <string name="sync_add_folder">Adicionar pasta</string> + <string name="sync_add_folder_hint">Sincronizar uma pasta no armazenamento do DroidDeck</string> + <string name="sync_choose">Escolher</string> + <string name="sync_add">Adicionar</string> + <string name="sync_add_failed">Não foi possível adicionar a pasta.</string> + <string name="sync_share_with">Partilhar com</string> + <string name="sync_share_none">Ainda não há dispositivos. Pode partilhar esta pasta mais tarde a partir da interface web.</string> + <string name="sync_use_folder">Utilizar esta pasta</string> + <string name="sync_new_folder">Nova pasta</string> + <string name="sync_location_home">Pasta pessoal do contentor</string> + <string name="sync_location_sync">Pasta Sync</string> + <string name="sync_location_shared">Armazenamento partilhado do DroidDeck</string> + <string name="sync_location_card">DroidDeck em %1$s</string> + <string name="sync_location_app">Dados da app DroidDeck</string> + <string name="sync_web_path_locked">As novas pastas são guardadas na pasta Sync do DroidDeck. Para sincronizar outra pasta do DroidDeck, utilize Adicionar pasta no separador Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Recarregar</string> + <string name="sync_not_running">O Syncthing não está em execução.</string> + <string name="session_end_steam_sigill">O Steam parou com uma instrução ilegal (SIGILL). Pode ser um problema de compatibilidade de instruções da CPU ou uma falha do cliente. Partilhe os registos com os detalhes do seu dispositivo.</string> + <string name="session_end_steam_try_x64">Pode experimentar Definições do Steam → Cliente Steam → x86-64 (experimental). Requer uma transferência adicional e pode ser mais lento.</string> + <string name="session_end_vulkan_device">O controlador gráfico Linux não encontrou um dispositivo Vulkan utilizável. Verifique se o controlador de GPU Linux selecionado suporta esta GPU.</string> + <string name="session_end_gpu_unsupported">Esta sessão não pode iniciar porque esta GPU não tem nenhum controlador Vulkan Linux compatível na configuração atual. Os controladores Adreno Turnip não conseguem ativar o suporte para GPUs MediaTek/Mali.</string> <string name="setup_group_memory">Memória</string> <string name="setup_clear_cached">Fechar apps em cache antes de uma sessão</string> <string name="setup_clear_cached_hint">Quando uma sessão começa, o DroidDeck fecha as apps que o Android mantém em segundo plano, para que o jogo tenha mais memória. A Depuração sem fios tem de estar ativada.</string> @@ -3159,6 +3502,12 @@ <string name="epic_client_open">Abrir</string> <string name="epic_client_install">Instalar</string> <string name="game_tab_about">Acerca de</string> + <string name="game_resources_browser">Abre no seu navegador</string> + <string name="game_resource_guides">Guias</string> + <string name="game_resource_protondb_detail">Relatórios de compatibilidade Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Para jogos com guardados na sua conta Steam</string> + <string name="game_resource_search">Pesquisa na Web</string> <string name="game_tab_install">Instalar</string> <string name="game_install_location">Localização</string> <string name="game_install_folder">Pasta</string> @@ -3175,6 +3524,11 @@ <string name="stores_eyebrow_pass">disponível com %1$s</string> <string name="stores_owned_in_library">Jogos adquiridos na Biblioteca</string> <string name="library_filter_added">Adicionados</string> + <string name="library_filter">Filtro</string> + <string name="library_filter_installed">Apenas instalados</string> + <string name="library_filter_all_owned">Todos os jogos que possui</string> + <string name="library_no_installed_matches">Nenhum jogo instalado corresponde a estes filtros.</string> + <string name="library_browse_owned">Explorar os jogos que possui</string> <string name="game_tab_launch">Arranque</string> <string name="game_tab_saves_cloud">Gravações e nuvem</string> <string name="game_launch_shortcut">Atalho do Steam</string> @@ -3192,6 +3546,40 @@ <string name="stores_itch_update_replaced">O programador substituiu esta versão por %1$s. Atualizar para ela?</string> <string name="xbox_filter_cloud">Nuvem</string> <string name="stores_xbox_cloud_settings">Definições da nuvem</string> + <string name="integration_title">Integração com o Steam</string> + <string name="integration_count">%1$d de %2$d ativadas</string> + <string name="integration_set_up">Configurar</string> + <string name="integration_location">Localização</string> + <string name="integration_app_info">Informações da aplicação</string> + <string name="integration_wifi">Nomes de Wi-Fi</string> + <string name="integration_brightness">Brilho</string> + <string name="integration_home">DroidDeck como página inicial</string> + <string name="integration_shortcuts">Teclas do sistema</string> + <string name="integration_wifi_hint">Mostra redes no Steam · requer acesso à localização, nunca monitorizada</string> + <string name="integration_wifi_on">As redes aparecem no Steam</string> + <string name="integration_wifi_location_off">A localização está desativada</string> + <string name="integration_wifi_denied">Localização recusada · permita-a em Informações da aplicação</string> + <string name="integration_brightness_hint">O controlo de deslize do Steam ajusta o brilho do ecrã</string> + <string name="integration_home_hint">Página inicial abre o menu do Steam numa sessão</string> + <string name="integration_shortcuts_hint">Alt+Tab, tecla Win e botão Início ficam na sessão</string> + <string name="integration_shortcuts_maybe_restricted">Desativado a cinzento no Android? Informações da aplicação → ⋮ → Permitir definições restritas</string> + <string name="integration_shortcuts_restricted">Bloqueado pelo Android · Informações da aplicação → ⋮ → Permitir definições restritas</string> + <string name="integration_shortcuts_service">Teclas do sistema DroidDeck</string> + <string name="integration_shortcuts_service_description">Mantém Alt+Tab, a tecla Win e o botão Início numa sessão ativa do DroidDeck em vez do Android.</string> + <string name="integration_brightness_needed">Ative Brilho em Configuração → Integração com o Steam</string> + <string name="setup_gpu_bridge_off">Ponte Mali: desligada</string> + <string name="setup_gpu_bridge_on">Ponte Mali: ligada</string> + <string name="setup_gpu_bridge_detail">%1$s não é uma Adreno. A ponte Vulkan experimental está ligada: a sessão desenha através do próprio controlador do telemóvel. Conte com erros; envie os registos da sessão.</string> + <string name="setup_bridge_safe">Modo seguro</string> + <string name="setup_bridge_safe_on">Modo seguro: ligado</string> + <string name="setup_bridge_safe_off">Modo seguro: desligado</string> + <string name="setup_bridge_safe_on_detail">O mais compatível. Recomendado para um dispositivo novo.</string> + <string name="setup_bridge_safe_off_detail">Mais rápido onde esta GPU passou nas verificações.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automático</string> + <string name="setup_bridge_dxvk_proton">DXVK: o do Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Usa um DXVK mais antigo quando o Vulkan desta GPU é demasiado antigo para o do Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Cada Proton mantém o seu próprio DXVK, mesmo quando o Vulkan desta GPU pode ser demasiado antigo para ele.</string> <string name="apps_search_hint">Pesquisar aplicações</string> <string name="apps_no_match">Nenhuma aplicação corresponde a “%1$s”.</string> <string name="apps_add_widget">Adicionar widget</string> @@ -3241,6 +3629,8 @@ <string name="desktop_restore_done_body">As apps que adicionou estão novamente instaladas.</string> <string name="desktop_restore_failed_title">Não foi possível restaurar algum software</string> <string name="desktop_restore_failed_body">Consulte ~/.cache/droiddeck/apt-restore.log e depois experimente sudo apt install no Konsole.</string> + <string name="gog_full_files">As otimizações nativas não estão disponíveis. A transferência inclui ficheiros de substituição completos.</string> + <string name="gog_recover">Verificar o resultado do patch</string> <string name="slow_usb_title">Ligação USB lenta</string> <string name="slow_usb_cable">%1$s está ligado por %2$s (%3$s Mbps, cerca de %4$d MB/s), por isso os jogos vão carregar devagar. Use um cabo USB 3 de 5 Gbps ou mais, experimente virar a ficha USB-C ou use uma unidade mais rápida.</string> <string name="slow_usb_port">%1$s está ligado por %2$s (%3$s Mbps, cerca de %4$d MB/s). A porta USB deste dispositivo não é mais rápida, por isso os jogos vão carregar devagar. O armazenamento interno ou um cartão microSD pode ser mais rápido.</string> @@ -3251,4 +3641,52 @@ <string name="steam_import_names_more">%1$s e mais %2$d</string> <string name="steam_import_now">Reiniciar agora</string> <string name="steam_import_later">Mais tarde</string> + <string name="gog_maintenance">Gerir instalação do GOG</string> + <string name="gog_check">Procurar atualizações</string> + <string name="gog_repair">Verificar/Reparar</string> + <string name="gog_patches">Patches offline</string> + <string name="gog_refresh">Transferir o instalador offline completo</string> + <string name="gog_update">Atualizar para %1$s</string> + <string name="gog_resume">Retomar a manutenção do GOG</string> + <string name="gog_open_patch">Abrir o instalador do patch</string> + <string name="gog_patch_in_session">Conclua ou cancele o instalador do patch na sessão Linux.</string> + <string name="gog_patch_requirements">Escolha um patch para a versão e o idioma instalados. As versões de origem suportadas podem não estar listadas.</string> + <string name="gog_no_patches">O GOG não tem patches autónomos para Windows deste jogo.</string> + <string name="gog_managed_files">Os ficheiros do jogo modificados podem ser substituídos.</string> + <string name="gog_patch_installer_note">O instalador abre na sua sessão Linux.</string> + <string name="gog_download_label">Transferência</string> + <string name="gog_space_label">Espaço adicional</string> + <string name="gog_space_estimate_label">Espaço estimado</string> + <string name="gog_repair_action">Reparar ficheiros</string> + <string name="gog_refresh_action">Renovar instalação</string> + <string name="gog_select_patch">Selecionar</string> + <string name="stores_gamejolt_not_owned">Não está na sua biblioteca do Game Jolt</string> + <string name="stores_gamejolt_no_build">Sem transferência para Windows deste jogo</string> + <string name="stores_gamejolt_no_exe">Não foi encontrado nenhum jogo para Windows na transferência</string> + <string name="stores_gamejolt_no_game">Não foi possível encontrar este jogo no Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Não foi possível carregar os jogos do Game Jolt</string> + <string name="stores_gamejolt_download_failed">O Game Jolt respondeu HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Não foi possível carregar as transferências do Game Jolt</string> + <string name="stores_gamejolt_build_open">Abrir no Game Jolt</string> + <string name="stores_gamejolt_archive">Ficheiros %1$s não são suportados</string> + <string name="stores_gamejolt_extract_failed">Não foi possível extrair a transferência (código %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Não foi possível aceder ao Game Jolt</string> + <string name="stores_gamejolt_download_no_link">O Game Jolt não forneceu uma ligação de transferência</string> + <string name="stores_gamejolt_section_featured">Em destaque</string> + <string name="stores_gamejolt_section_hot">Em alta</string> + <string name="stores_gamejolt_section_best">Melhores</string> + <string name="stores_gamejolt_section_new">Novos</string> + <string name="stores_gamejolt_price_under_30">30 $ ou menos</string> + <string name="stores_gamejolt_os_other">Outros</string> + <string name="stores_gamejolt_maturity_everyone">Todas as idades</string> + <string name="stores_gamejolt_maturity_teen">Adolescentes</string> + <string name="stores_gamejolt_maturity_adult">Adulto</string> + <string name="stores_gamejolt_status_complete">Completo</string> + <string name="stores_gamejolt_status_early">Acesso antecipado</string> + <string name="stores_gamejolt_partners">Jogos de parceiros</string> + <string name="stores_gamejolt_filter_browser">Navegador</string> + <string name="stores_gamejolt_filter_maturity">Classificação</string> + <string name="stores_gamejolt_filter_status">Estado</string> + <string name="stores_gamejolt_filter_partners">Parceiros</string> + <string name="stores_gamejolt_followed">Jogos seguidos</string> </resources> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 9f1726d2bd..5376a6f731 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opções do VKD3D para D3D12. nodxr desativa o ray tracing; use só em um jogo que precise disso.</string> <string name="game_env_proton_log">Defina como 1 para gerar um log de diagnóstico do Proton. O log pode reduzir o desempenho e ocupar armazenamento.</string> <string name="game_env_wined3d">Defina como 1 para usar o WineD3D (baseado em OpenGL) em vez do DXVK ao testar a compatibilidade com D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderizador para DirectDraw, Direct3D 1-7 e jogos executados com WineD3D. O Vulkan evita o caminho OpenGL sobre Zink e é muito mais rápido para jogos antigos de DirectDraw e Direct3D 7 em Adreno.</string> + <string name="game_env_dxvk_d3d8">Defina como 1 para rodar o Direct3D 8 pelo DXVK em vez do WineD3D. Mais rápido no teste de Direct3D 8 do AIO Graphics Test em Adreno.</string> <string name="game_env_no_ntsync">Defina como 1 para manter este jogo fora do ntsync (droiddeck-ntsync ou um driver do kernel); ele usa o droiddeck-esync onde houver um pacote, senão o droiddeck-fsync.</string> <string name="game_env_no_esync">Defina como 1 para desativar o droiddeck-esync neste jogo; ele passa a usar o droiddeck-fsync, ou o droiddeck-ntsync onde o fsync também estiver desativado.</string> <string name="game_env_no_fsync">Defina como 1 para manter este jogo fora do droiddeck-fsync; ele usa o droiddeck-esync onde houver um pacote, senão o droiddeck-ntsync.</string> <string name="game_env_fsync_first">Defina como 1 para rodar este jogo no droiddeck-fsync, ou como 0 para priorizar o droiddeck-esync onde houver um pacote compatível com o Proton dele.</string> <string name="game_env_xalia">Defina como 0 para desativar o assistente de navegação por controle do Proton neste jogo.</string> + <string name="game_env_anticheat_offline">Ativado por padrão. Inicia um jogo com Easy Anti-Cheat sem o anti-cheat quando o jogo permite jogar offline. Desative para iniciar pelo Easy Anti-Cheat normalmente. Modos online que exigem o Easy Anti-Cheat continuam indisponíveis.</string> <string name="game_env_hud">Overlay do DXVK para D3D9–11. fps mostra a taxa de quadros; sem definir, fica oculto.</string> <string name="game_env_dxvk_config">Configurações do DXVK separadas por ponto e vírgula. Versões recentes usam dxvk.maxFrameRate para limitar os quadros; para jogar normalmente, prefira o limitador de quadros da sessão.</string> + <string name="game_env_cores">Núcleos da CPU para este jogo, como 0-4 ou 0,2,4, no lugar dos núcleos de jogo da sessão. Menos núcleos esquentam menos.</string> <string name="game_env_vkd3d_limit">Limite de taxa de quadros do D3D12. 0 desativa o limite.</string> <string name="game_env_glthread">Threading do OpenGL no Mesa. true pode ajudar jogos OpenGL limitados pela CPU; teste jogo a jogo.</string> <string name="sync_backend_title">Sincronização do Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">O FEX roda programas Linux x86 neste dispositivo ARM64. No Automático, ele é usado quando o programa é feito para x86.</string> <string name="app_fex_x86">%1$s pelo FEX</string> <string name="app_fex_not_ready">Este programa é feito para PCs %1$s e roda pelo FEX, que ainda não está configurado. Abra a Steam uma vez com a sessão iniciada: o DroidDeck faz com que ela baixe o FEX e o Steam Linux Runtime necessários, e então isto abre.</string> + <string name="session_proot_missing">Não foi possível baixar o proot do DroidDeck. Verifique a conexão e tente novamente. A sessão não foi iniciada, porque o proot alternativo é lento demais para jogar.</string> + <string name="session_directaudio_missing">Não foi possível baixar o DirectAudio, então o áudio dos jogos usa o caminho mais lento nesta sessão.</string> <string name="session_end_program">Este programa</string> <string name="session_end_steam_download">Não foi possível baixar o cliente Steam. Sua rede ou VPN pode estar bloqueando os servidores da Steam; verifique a conexão e tente novamente.</string> <string name="session_end_steam_setup">Não foi possível configurar o cliente Steam. Verifique a conexão e o espaço livre e tente novamente.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Controle de Xbox 360</string> <string name="mode_controller_note">Deck: botão de Acesso rápido e giroscópio. Steam Controller: o mesmo, com detecção de pegada nos botões traseiros. DualShock 4 e DualSense: giroscópio, e os trackpads como o touchpad deles. Xbox 360: abra o Acesso rápido com Guide+A.</string> <string name="mode_back">Voltar</string> + <string name="back_hold">Segurar Voltar para atalhos do Steam</string> + <string name="back_hold_hint">Segurar Voltar abre o Acesso rápido ou cria combinações do Steam com outros botões. Desative para ignorar Voltar segurado; toque e toque duplo continuam funcionando.</string> + <string name="back_native_qam_hint">Segure Voltar por 700 ms, ou segure Voltar e pressione outro botão para atalhos da Steam.</string> + <string name="back_double_tap_window">Intervalo do toque duplo</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Permitir controle de brilho</string> + <string name="brightness_permission_text">Configure o controle de brilho no DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Sessão</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Adia a suspensão em segundo plano enquanto a Steam estiver baixando.</string> <string name="mode_suspend_note">Automático pausa em segundo plano e retoma quando o app reaparece. Manual aguarda Retomar. Nunca continua em execução.</string> <string name="mode_startup">Inicialização</string> - <string name="mode_steam_startup">Iniciar a Steam com o DroidDeck</string> - <string name="mode_steam_startup_hint">Abre a sessão da Steam quando o DroidDeck é iniciado.</string> + <string name="mode_startup_session">Abrir ao iniciar</string> + <string name="mode_startup_session_hint">Inicia esta sessão quando o DroidDeck é aberto.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Procurando versões…</string> <string name="mode_decky_ready">Pronto para instalar %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Atualizado · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Instalar a mais recente</string> + <string name="decky_channel">Canal de atualização</string> + <string name="decky_channel_hint">Quais versões do Decky Loader instalar. O atualizador do próprio Decky usa o mesmo canal.</string> + <string name="decky_channel_stable">Estável</string> + <string name="decky_channel_prerelease">Pré-lançamento</string> + <string name="decky_channel_testing">Testes</string> + <string name="decky_channel_failed">Não foi possível salvar o canal de atualização do Decky</string> <string name="mode_decky_on">Inicia com a Steam. Enquanto estiver ativado, outros apps neste dispositivo podem conseguir controlar a Steam.</string> <string name="mode_decky_off">Desativado. A porta de depuração remota da Steam fica fechada.</string> <string name="mode_decky_remove_title">Desinstalar o Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Cliente</string> <string name="mode_mangoapp">Overlay de desempenho</string> <string name="mode_mangoapp_hint">Desative se os jogos travarem ou ficarem com a tela preta no modo Deck. Vale a partir da próxima sessão.</string> + <string name="mode_return_after_game">Voltar ao DroidDeck após um jogo</string> + <string name="mode_return_after_game_hint">Quando um jogo iniciado pelo DroidDeck ou por outro launcher fecha, a Steam sai corretamente (os salvamentos na nuvem terminam antes) e você volta para lá. Desativado: fica na Steam.</string> + <string name="mode_shader_precache">Pré-cache de shaders</string> + <string name="mode_shader_precache_hint">A Steam baixa shaders pré-compilados para seus jogos e os processa em segundo plano, então os jogos travam menos. Desativado economiza dados, armazenamento e bateria; os jogos compilam os shaders enquanto rodam. É a mesma opção de Downloads > Pré-cache de shaders da Steam. Vale a partir da próxima sessão.</string> <string name="mode_steam_repair">Reparar o cliente Steam</string> <string name="mode_steam_repair_hint">Baixa o cliente Steam de novo na próxima vez que a Steam iniciar. Use se a Steam ficar presa na tela de carregamento. Jogos, login e configurações são mantidos.</string> <string name="mode_steam_repair_queued">O cliente Steam será baixado de novo na próxima vez que a Steam iniciar.</string> @@ -391,6 +414,8 @@ <string name="mode_directaudio_hint">Ignora o PulseAudio para reduzir a latência.</string> <string name="mode_mic">Microfone</string> <string name="mode_mic_hint">Para chat de voz.</string> + <string name="drawer_mic_hint">Ativa ou desativa a captura do microfone nesta sessão.</string> + <string name="drawer_mic_failed">Não foi possível alterar o microfone. Tente novamente.</string> <string name="mode_network">Rede</string> <string name="mode_wifi_discovery">Descoberta de Wi-Fi</string> <string name="mode_wifi_discovery_hint">Mostra os nomes de Wi-Fi e as redes próximas na Steam.</string> @@ -553,6 +578,16 @@ <string name="perf_gsrealtime">gamescope: fila de GPU em tempo real</string> <string name="perf_gsrealtime_hint">Prioriza o trabalho de GPU do compositor. Pode suavizar o ritmo dos quadros, com algum custo para os jogos.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memória</string> + <string name="perf_cap_off">Desativado</string> + <string name="perf_cap_auto">Padrão do driver</string> + <string name="perf_zram_client">Comprimir a Steam durante o jogo</string> + <string name="perf_zram_client_hint">20 s após o início de um jogo, o cliente Steam é comprimido na zRAM para deixar mais memória ao jogo, e é lido de volta quando o jogo fecha. Desative se a sessão fechar logo após os jogos iniciarem. Um limite de RAM acima ainda comprime a Steam quando a sessão o ultrapassa.</string> + <string name="perf_ram_cap">Limite de RAM</string> + <string name="perf_ram_cap_hint">Vale enquanto o cliente Steam está em execução, no modo Steam ou pela área de trabalho. Quando a sessão usa mais que isso, a Steam e depois os outros processos compatíveis da sessão são comprimidos na zRAM. Um limite flexível: nada é fechado, mas os jogos podem travar enquanto as páginas voltam.</string> + <string name="perf_ram_cap_unavailable">Requer swap em zRAM, que este dispositivo não tem.</string> + <string name="perf_vram_cap">Limite de VRAM</string> + <string name="perf_vram_cap_hint">A memória de vídeo que o DXVK informa aos jogos Direct3D, para que reservem menos para texturas. As configurações de DXVK do próprio jogo têm prioridade. Vale a partir da próxima sessão.</string> <string name="perf_gpuclock">Manter a GPU no clock máximo</string> <string name="perf_gpuclock_hint">Só em Adreno. Menos engasgos, mais gasto de bateria e mais calor.</string> <string name="perf_fixes">Correções da sessão</string> @@ -571,6 +606,8 @@ <string name="perf_fastpath">Caminho rápido do proot</string> <string name="perf_fastpath_needs_seccomp">Requer o filtro seccomp do proot.</string> <string name="perf_fastpath_hint">Buscas de arquivos mais rápidas e menos engasgos. Desative se um programa não encontrar os arquivos dele.</string> + <string name="perf_cursor_composite">Desenhar o cursor dentro do gamescope</string> + <string name="perf_cursor_composite_hint">O gamescope desenha o ponteiro em vez de repassá-lo ao Android. Ative para um cursor movido pelo controle. Desativado é mais rápido em um celular. Vale a partir da próxima sessão.</string> <string name="perf_identity">Identidade da sessão</string> <string name="perf_hostname">Nome do host</string> <string name="perf_hostname_hint">O nome que a Steam vê para este dispositivo. Em branco, volta a ser %1$s.</string> @@ -585,6 +622,8 @@ <string name="driver_delete_plain">Os arquivos dele são removidos do app.</string> <string name="driver_delete_in_use">Os arquivos dele são removidos. Ele está em uso, então o padrão assume.</string> <string name="drawer_page_display">Tela</string> + <string name="drawer_frame_limit">Limite de quadros</string> + <string name="drawer_frame_limit_note">Limita este jogo. A tela muda para uma taxa de atualização que o limite divida por igual, quando houver; outros limites podem parecer irregulares. Jogos da Steam usam o Limite de quadros da Steam no menu de Acesso rápido.</string> <string name="drawer_page_effects">Efeitos</string> <string name="drawer_page_controls">Controles</string> <string name="drawer_page_components">Componentes</string> @@ -616,8 +655,11 @@ <string name="hud_size_pill">Pílula</string> <string name="hud_size_minimal">Mínimo</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Barra</string> <string name="hud_locked">Travar posição</string> <string name="hud_locked_hint">Arraste o HUD para movê-lo; um toque longo o trava ou destrava. Enquanto estiver travado, os controles na tela embaixo dele continuam funcionando.</string> + <string name="hud_snap">Encaixar nas laterais</string> + <string name="hud_snap_hint">Solte o HUD e ele vai para a lateral mais próxima da tela. Um gesto rápido o lança nessa direção.</string> <string name="hud_group_look">Aparência</string> <string name="hud_scale">Tamanho na tela</string> <string name="hud_color_soft">Suave</string> @@ -666,7 +708,6 @@ <string name="hud_export_failed">Não foi possível salvar o relatório do HUD.</string> <string name="hud_reset">Redefinir configurações do HUD</string> <string name="hud_reset_button">Redefinir</string> - <string name="hud_credit">FusionHUD por The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Modo de escala</string> <string name="drawer_scaling_sharpness">Nitidez da escala</string> <string name="drawer_effects">Efeitos de tela</string> @@ -701,11 +742,17 @@ <string name="drawer_touch_auto">Automático (%1$s)</string> <string name="drawer_keyboard">Teclado</string> <string name="drawer_latency">Latência</string> + <string name="drawer_low_latency">Modo de baixa latência</string> + <string name="drawer_low_latency_hint">Aumenta o uso de CPU e bateria</string> <string name="drawer_low_latency_controller">Controle de baixa latência</string> <string name="drawer_low_latency_controller_hint">O controle envia dados a 1000 Hz em vez de 250 Hz. Um pouco mais de CPU.</string> <string name="drawer_low_latency_touch">Toque de baixa latência</string> <string name="drawer_low_latency_touch_hint">Os toques ignoram o agrupamento de quadros; os controles de toque da Steam vão a 1000 Hz. Um pouco mais de CPU.</string> <string name="drawer_evdev_mouse">Canal de mouse bruto</string> + <string name="drawer_relative_mouse">Mouse relativo</string> + <string name="drawer_relative_mouse_auto">Automático</string> + <string name="drawer_relative_mouse_on">Ativado</string> + <string name="drawer_relative_mouse_off">Desativado</string> <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Teclado de PC</string> <string name="drawer_android_keyboard">Android</string> @@ -794,6 +841,10 @@ <string name="setup_session">Sessão</string> <string name="setup_logs">Logs da sessão</string> <string name="setup_logs_hint">Salvos após cada sessão</string> + <string name="setup_game_debug_logs">Logs de depuração dos jogos</string> + <string name="setup_game_debug_logs_hint">Inclui diagnósticos do Proton, do Wine e de gráficos na próxima inicialização do jogo. Pode reduzir o desempenho e usar mais armazenamento.</string> + <string name="setup_game_debug_logs_restart">Reinicie esta sessão para salvar os logs de depuração dos jogos</string> + <string name="setup_logging_update_failed">Não foi possível atualizar os logs. Verifique a chave e tente novamente.</string> <string name="setup_agent_commands">Ferramentas de depuração</string> <string name="setup_latest_logs">Logs da última sessão</string> <string name="setup_saved_logs">Logs de sessão salvos</string> @@ -817,20 +868,22 @@ <string name="setup_home">Usar como tela inicial</string> <string name="setup_home_on">O DroidDeck pode ser o app de início</string> <string name="setup_home_off">O DroidDeck nunca é oferecido como app de início</string> + <string name="setup_home_game_space_first">Em Adicionar jogos, defina o DroidDeck como Incluir</string> <string name="setup_orientation">Orientação</string> + <string name="setup_launcher_orientation">Orientação do launcher</string> + <string name="setup_launcher_orientation_auto">Seguir a rotação do dispositivo</string> + <string name="setup_orientation_portrait">Retrato</string> + <string name="setup_session_orientation">Orientação da sessão</string> + <string name="setup_session_orientation_hint">Vale para a Steam, os jogos, a área de trabalho e o editor de controle. As predefinições de resolução giram com a sessão; largura e altura personalizadas ficam como foram digitadas.</string> <string name="setup_orientation_auto">Paisagem automática</string> <string name="setup_orientation_landscape">Paisagem</string> <string name="setup_orientation_reverse">Paisagem invertida</string> <string name="setup_fullscreen">Tela cheia</string> <string name="setup_fullscreen_on">Oculta as barras de status e de navegação do Android</string> <string name="setup_fullscreen_off">Mostra as barras de status e de navegação do Android</string> - <string name="setup_dual_screen">Tela dupla</string> - <string name="setup_dual_screen_hint">Automático usa a segunda tela em portáteis que têm uma integrada. Ativado usa qualquer segunda tela. Desativado mantém tudo em uma tela.</string> <string name="setup_dual_screen_auto">Automático</string> <string name="setup_dual_screen_on">Ativado</string> <string name="setup_dual_screen_off">Desativado</string> - <string name="setup_dual_screen_menu">Menu na tela inferior</string> - <string name="setup_dual_screen_menu_hint">Move as seções e o menu do jogo para a segunda tela e a digitação acontece lá, para que a tela superior mantenha a visão completa. L2 e R2 trocam de seção.</string> <string name="setup_dual_screen_controls">Controles na tela inferior nos jogos</string> <string name="setup_dual_screen_controls_hint">Abre o trackpad e o teclado na segunda tela quando uma sessão começa.</string> <string name="dual_typing_title">Digitando para a tela superior</string> @@ -985,6 +1038,14 @@ <string name="gate_step1">Abra Configurações → Opções do desenvolvedor → Depuração por Wi-Fi e ative</string> <string name="gate_step2">Toque em “Parear o dispositivo com um código de pareamento”</string> <string name="gate_step3">Digite o código na notificação do DroidDeck</string> + <string name="pairguide_build_number">Em Sobre o telefone, toque em Número da versão 7 vezes</string> + <string name="pairguide_wireless">Ative a Depuração por Wi-Fi</string> + <string name="pairguide_pair">Abra a Depuração por Wi-Fi e toque em “Parear o dispositivo com um código de pareamento”</string> + <string name="pairguide_child_process">Ative “Desativar restrições de processos filhos”</string> + <string name="pairguide_row_child_process">Desativar restrições de processos filhos</string> + <string name="pairguide_row_build_number">Número da versão</string> + <string name="pairguide_row_wireless">Depuração por Wi-Fi</string> + <string name="pairguide_row_pair">Parear o dispositivo com um código de pareamento</string> <string name="gate_waiting">Aguardando o pop-up de pareamento…</string> <string name="gate_code_needed">Pop-up encontrado. Digite o código dele na notificação.</string> <string name="gate_status">Status</string> @@ -1123,7 +1184,6 @@ <string name="games_never_played">Nunca jogado</string> <string name="games_runtime_busy_percent">Runtime ocupado · %1$d%%</string> <string name="games_runtime_busy">Runtime ocupado</string> - <string name="games_runtime_first_play">O runtime é instalado no primeiro Jogar</string> <string name="games_runtime_update">Atualização do runtime disponível</string> <string name="games_runtime_ready">● Runtime pronto</string> <string name="games_internal">Armazenamento interno</string> @@ -1140,6 +1200,9 @@ <string name="gpu_hide_other">Ocultar drivers de outras GPUs</string> <string name="gpu_show_other">Mostrar drivers de outras GPUs</string> <string name="gpu_advanced">Avançado</string> + <string name="gpu_ubwc_title">Compatibilidade com UBWC</string> + <string name="gpu_ubwc_hint">Experimente Ativado ou Desativado se a Steam ou o Android mostrarem listras ou cintilação. Vale para os dois drivers após reiniciar o DroidDeck.</string> + <string name="gpu_ubwc_restart">Reinicie o DroidDeck para aplicar.</string> <string name="gpu_set_with_display">Definido junto com o driver de exibição: %1$s contém os dois.</string> <string name="gpu_set_with_runtime">Definido junto com o driver do runtime: %1$s contém os dois.</string> <string name="gpu_runtime_hint">Usado pelos jogos e pela área de trabalho.</string> @@ -1248,10 +1311,15 @@ <string name="pip_auto">Entrar em PiP automaticamente</string> <string name="unfolded_controls">Controles com a tela desdobrada</string> <string name="unfolded_controls_hint">Desdobrado, o jogo fica acima dos trackpads e dos botões traseiros do Steam Deck. Dobrado, o jogo fica em tela cheia.</string> + <string name="unfolded_controls_with_controller">Manter com um controle</string> + <string name="unfolded_controls_with_controller_hint">Também mostra estes controles de toque enquanto um controle estiver conectado.</string> <string name="pip_suspended">Suspenso</string> <string name="pip_not_ready">O picture-in-picture fica disponível quando a sessão estiver pronta.</string> <string name="pip_permission">Permita o picture-in-picture para o DroidDeck nas configurações do Android.</string> <string name="pip_unavailable">O Android não conseguiu abrir o picture-in-picture.</string> + <string name="game_more">Mais</string> + <string name="game_edit_art">Editar artes</string> + <string name="stores_in_steam_label">Na Steam</string> <string name="game_shortcut">Atalho</string> <string name="game_shortcut_add">Adicionar à tela inicial</string> <string name="game_shortcut_choose">Escolher jogo</string> @@ -1275,6 +1343,10 @@ <string name="main_wait_runtime">Aguarde a operação do runtime terminar</string> <string name="main_wait_proton_install">Aguarde a instalação da ferramenta de compatibilidade terminar</string> + <string name="load_compat_title">Preparando as ferramentas de compatibilidade</string> + <string name="load_compat_wait">Aguardando a configuração de compatibilidade terminar</string> + <string name="load_compat_hint">Sua sessão vai começar quando a configuração terminar.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Aguarde a instalação do app de área de trabalho terminar</string> <string name="main_wait_install_game">Aguarde a instalação terminar antes de iniciar um jogo</string> <string name="main_saves_close_session">Feche a sessão do Steam primeiro, para que o jogo não salve por cima da importação</string> @@ -1315,6 +1387,9 @@ <string name="main_install_anyway">Instalar mesmo assim</string> <string name="main_remove_runtime_title">Remover runtime Linux</string> <string name="main_remove_runtime_text">Isso exclui o runtime, o cliente Steam dentro dele e todos os jogos instalados nele.</string> + <string name="runtime_actions_title">Runtime do Linux</string> + <string name="runtime_actions_text">Reparar reinstala os arquivos de sistema do runtime e mantém a Steam, seus jogos e configurações. Extras como a área de trabalho são instalados de novo quando você os usar. Remover apaga tudo.</string> + <string name="runtime_repair">Reparar runtime</string> <string name="main_applied">Aplicado: %1$s</string> <string name="android_app_open_failed_primary">Não foi possível abrir %1$s na tela principal</string> <string name="android_app_open_failed_on">Não foi possível abrir %1$s em %2$s</string> @@ -1447,6 +1522,12 @@ <string name="session_runtime_catalog_unreachable">Não foi possível acessar o catálogo de runtimes. Verifique a conexão e toque em Jogar novamente.</string> <string name="session_runtime_install_failed">O runtime Linux não foi instalado. Verifique o runtime em Configuração e toque em Jogar novamente.</string> <string name="session_desktop_install_failed">A área de trabalho não foi instalada (%1$s). Verifique a conexão e toque em Área de trabalho novamente.</string> + <string name="session_package_resume_failed">Não foi possível concluir uma instalação interrompida (%1$s). Verifique a conexão e o espaço e tente novamente.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">O runtime do Linux está danificado: %1$d link de biblioteca aponta para um arquivo ausente (%2$s), normalmente após uma instalação interrompida. Reparar mantém seus jogos e configurações.</item> + <item quantity="many">O runtime do Linux está danificado: %1$d links de biblioteca apontam para arquivos ausentes (%2$s e outros), normalmente após uma instalação interrompida. Reparar mantém seus jogos e configurações.</item> + <item quantity="other">O runtime do Linux está danificado: %1$d links de biblioteca apontam para arquivos ausentes (%2$s e outros), normalmente após uma instalação interrompida. Reparar mantém seus jogos e configurações.</item> + </plurals> <string name="session_ended_named">%1$s parou inesperadamente. Compartilhe os logs em um relatório de bug ou tente de novo.</string> <string name="session_ended_program">O programa parou inesperadamente. Compartilhe os logs em um relatório de bug ou tente de novo.</string> <string name="session_ended_desktop">A área de trabalho parou inesperadamente. Compartilhe os logs em um relatório de bug ou tente de novo.</string> @@ -1462,6 +1543,14 @@ <string name="mode_decky_plugins_hint">Instale um ZIP de plugin para a próxima sessão do Steam.</string> <string name="mode_decky_plugin_downloading">Baixando…</string> <string name="mode_decky_plugin_install_zip">Instalar de um ZIP</string> + <string name="decky_zip_warning_title">Instalação de plugin de terceiros</string> + <string name="decky_zip_warning_text">A equipe do Decky Loader não revisou este plugin. Ele pode conter malware, como software para roubar sua conta Steam ou danificar seu dispositivo. Ao instalar este plugin, você concorda que assume todos os riscos para o seu dispositivo.</string> + <string name="decky_zip_warning_continue">Continuar</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Aguarde %1$d segundo</item> + <item quantity="many">Aguarde %1$d segundos</item> + <item quantity="other">Aguarde %1$d segundos</item> + </plurals> <string name="store_cat_games">Jogos</string> <string name="store_cat_audio_video">Áudio e vídeo</string> <string name="store_cat_graphics">Gráficos</string> @@ -1628,6 +1717,8 @@ <string name="fm_accept">Aceitar</string> <string name="fm_decline">Recusar</string> <string name="fm_drive_not_readable">%1$s está montado, mas não pode ser lido agora</string> + <string name="fm_drive_access_title">Permitir acesso a %1$s</string> + <string name="fm_drive_access_text">O Android deixa o DroidDeck ver esta unidade, mas não ler. Ative o Acesso a todos os arquivos para o DroidDeck e volte.</string> <string name="fm_list_view">Visualização em lista</string> <string name="fm_grid_view">Visualização em grade</string> <string name="fm_search">Pesquisar</string> @@ -1700,6 +1791,89 @@ <string name="second_mode_keyboard_trackpad">Teclado + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Botões traseiros + trackpads do Deck</string> + <string name="second_mode_dashboard">Painel</string> + <string name="bottom_dashboard_empty">Nada para mostrar aqui ainda.</string> + <string name="bottom_page_downloads">Downloads</string> + <string name="bottom_downloads_none">Nenhum download em andamento.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Baixando o cache de shaders</string> + <string name="bottom_downloads_paused">Pausado</string> + <string name="bottom_downloads_queued">Aguardando para começar</string> + <string name="bottom_page_notifications">Notificações</string> + <string name="bottom_notifications_listener">Tela inferior do DroidDeck</string> + <string name="bottom_notifications_why">Mostre aqui mensagens e outras notificações enquanto você joga. Elas ficam só nesta tela e não são salvas. O Android pergunta uma vez: a página de acesso a notificações dele abre nesta tela; ative o DroidDeck lá e esta página volta sozinha.</string> + <string name="bottom_notifications_allow">Permitir acesso a notificações</string> + <string name="bottom_notifications_none">Nenhuma notificação.</string> + <string name="bottom_notifications_count">%1$d notificações</string> + <string name="bottom_notifications_clear">Limpar</string> + <string name="bottom_page_screenshots">Capturas de tela</string> + <string name="stats_fps_needs_hud">O FPS precisa do HUD ativado</string> + <string name="stats_speed">Velocidade</string> + <string name="stats_pedals">Pedais</string> + <string name="stats_gforce">Força G</string> + <string name="stats_timing">Tempos</string> + <string name="stats_best_lap">Melhor volta</string> + <string name="stats_tires">Pneus °C</string> + <string name="stats_trace">Acelerador e freio, últimos 10 s</string> + <string name="stats_speed_chart">Velocidade, %1$s</string> + <string name="stats_gear">Marcha</string> + <string name="stats_steam_client_arm">Cliente Steam ARM</string> + <string name="stats_steam_client_x86">Cliente Steam x86</string> + <string name="stats_throttle">Acelerador</string> + <string name="stats_brake">Freio</string> + <string name="stats_lights">Painel</string> + <string name="stats_lamp_shift">Troca de marcha</string> + <string name="stats_lamp_handbrake">Freio de mão</string> + <string name="stats_lamp_pit">Limitador de pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Óleo %1$s °C</string> + <string name="stats_power">Distribuidor de energia</string> + <string name="stats_fuel_t">Combustível, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Reserva %1$s t</string> + <string name="bottom_telemetry_send_title">Enviar dados para o painel</string> + <string name="bottom_telemetry_send_auto">Automático</string> + <string name="bottom_telemetry_send_auto_hint">Ativa para todos os jogos listados aqui, incluindo os encontrados depois. Os jogos que você desativar continuam desativados.</string> + <string name="bottom_telemetry_send_note">Isso altera a configuração de saída de dados do próprio jogo. Vale a partir da próxima vez que o jogo iniciar; desativar restaura a configuração anterior.</string> + <string name="bottom_telemetry_send_close">Feche %1$s para alterar isso.</string> + <string name="bottom_telemetry_send_failed">Não foi possível alterar as configurações de %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: ative %2$s nas configurações do jogo com o IP 127.0.0.1 e a porta %3$d.</string> + <string name="bottom_shots_where">Salvas em Pictures/DroidDeck. As capturas de tela da Steam também aparecem aqui.</string> + <string name="bottom_shots_take">Fazer captura de tela</string> + <string name="bottom_shots_saved">Captura de tela salva.</string> + <string name="bottom_shots_failed">Não foi possível fazer a captura de tela.</string> + <string name="bottom_shots_none">Nenhuma captura de tela ainda.</string> + <string name="bottom_page_chat">Chat e voz</string> + <string name="bottom_chat_why">Leia e responda o chat da Steam aqui enquanto o jogo continua rodando na tela principal. Usa a conta com que a Steam está conectada.</string> + <string name="bottom_chat_not_signed_in">A Steam ainda não tem um login web para compartilhar, então entre aqui uma vez.</string> + <string name="bottom_chat_stopped">O Android fechou a página do chat enquanto o DroidDeck estava em segundo plano. Ela abre de novo quando você voltar ao DroidDeck.</string> + <string name="bottom_chat_open">Abrir o Steam Chat</string> + <string name="bottom_chat_close">Fechar chat</string> + <string name="bottom_chat_mic_on">Microfone ligado</string> + <string name="bottom_chat_mic_off">Microfone desligado</string> + <string name="bottom_chat_mic_unavailable">O microfone está desligado neste jogo. Para falar, ative Microfone nas configurações da Steam do DroidDeck (Áudio) e inicie o jogo de novo.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">Estatísticas no jogo</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Bateria</string> + <string name="bottom_telemetry_lap">Volta</string> + <string name="bottom_telemetry_position">Posição</string> + <string name="bottom_telemetry_this_lap">Volta atual</string> + <string name="bottom_telemetry_last_lap">Última volta</string> + <string name="bottom_telemetry_fuel">Combustível</string> + <string name="bottom_telemetry_cargo">Carga</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Situação legal</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">A porta %1$d está recebendo dados (%2$d pacotes de %3$d bytes), mas em um formato que esta página ainda não consegue ler.</string> + <string name="bottom_telemetry_port_busy">Outro programa já usa a porta %1$s, então esse jogo não pode aparecer aqui.</string> <string name="rtinst_removing">Removendo o runtime Linux</string> <plurals name="rtinst_removing_entries"> @@ -1731,6 +1905,7 @@ <string name="flatpakmgr_not_ready">Configure o Flatpak primeiro</string> <string name="flatpakmgr_starting">Iniciando</string> <string name="flatpakmgr_exit_status">O Flatpak terminou com o código %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s foi compilado para %2$s, que o DroidDeck não consegue executar. Aqui os apps Flatpak precisam de uma versão para ARM64 ou x86_64.</string> <string name="flatpakmgr_installing">Instalando %1$s</string> <string name="flatpakmgr_updating">Atualizando %1$s</string> <string name="flatpakmgr_removing">Removendo %1$s</string> @@ -1824,6 +1999,7 @@ <string name="adbpair_applying">Aplicando a configuração…</string> <string name="adbpair_command_failed">Falha no comando de depuração por Wi-Fi</string> <string name="adbpair_channel_name">Configuração da depuração por Wi-Fi</string> + <string name="adbpair_progress_channel_name">Progresso da configuração da Depuração por Wi-Fi</string> <string name="adbpair_channel_description">Pede o código de pareamento da depuração por Wi-Fi enquanto as Configurações estão abertas</string> <string name="adbpair_title_pair">Parear depuração por Wi-Fi</string> <string name="adbpair_waiting_text">Ative a depuração por Wi-Fi e toque em “Parear o dispositivo com um código de pareamento”.</string> @@ -1932,6 +2108,7 @@ <string name="gpuinfo_not_adreno">Não é uma GPU Adreno</string> <string name="gpuinfo_supported">Compatível</string> <string name="gpuinfo_experimental">Experimental: os drivers são versões de teste</string> + <string name="gpuinfo_a850_experimental">Suporte experimental à Adreno 850: requer drivers de tela e de jogos experimentais compatíveis; não verificado neste dispositivo</string> <string name="gpuinfo_below_tested">Abaixo do hardware testado (Adreno 725 ou mais recente): pode não funcionar</string> <string name="gpuinfo_unsupported">Incompatível: o DroidDeck precisa de uma GPU Adreno (Snapdragon)</string> @@ -2028,6 +2205,7 @@ <string name="display_look_filter">%1$s Define a escala como %2$s.</string> <string name="display_match_screen">Igual à tela (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir a tela (redimensiona ao dobrar ou desdobrar)</string> + <string name="display_follow_screen_scaled">Escalado %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Mostrar detalhes do dispositivo</string> <string name="device_info_hide">Ocultar detalhes do dispositivo</string> @@ -2134,6 +2312,13 @@ <string name="stores_resume">Retomar</string> <string name="stores_refresh">Atualizar</string> <string name="stores_sort">Ordenar</string> + <string name="setup_rail_labels">Rótulos da barra lateral</string> + <string name="setup_rail_labels_hint">Mostra os nomes sob os ícones da barra lateral. Desative para uma barra lateral mais estreita.</string> + <string name="library_display">Exibição</string> + <string name="library_display_larger">Cards maiores</string> + <string name="library_display_smaller">Cards menores</string> + <string name="library_display_title">Mostrar título</string> + <string name="library_display_size">Mostrar tamanho</string> <string name="stores_sort_last_played">Jogados recentemente</string> <string name="stores_sort_recently_installed">Instalados recentemente</string> <string name="stores_sort_title_asc">Título A–Z</string> @@ -2260,6 +2445,9 @@ <string name="stores_download_manager">Gerenciador de downloads</string> <string name="stores_parallel">Downloads simultâneos</string> <string name="stores_install_where">Instalar em</string> + <string name="stores_install_language">Idioma do jogo</string> + <string name="stores_install_language_hint">O GOG e a Epic instalam este idioma. Sistema segue o idioma do app.</string> + <string name="stores_install_language_system">Sistema</string> <string name="stores_install_title">Instalar %1$s:</string> <string name="stores_target_internal">Interno</string> <string name="stores_target_free">%1$s livres</string> @@ -2295,6 +2483,9 @@ <string name="edit_target">Destino</string> <string name="edit_start_in">Iniciar em</string> <string name="edit_launch_options">Opções de inicialização</string> + <string name="edit_launch_options_steam_hint">Compartilhadas com as Propriedades da Steam: uma alteração em um dos lugares aparece nos dois.</string> + <string name="edit_launch_options_not_saved">Não foi possível salvar as opções de inicialização na Steam. Tente novamente.</string> + <string name="edit_launch_options_desktop">A Steam pode estar aberta na sessão da área de trabalho. Altere as opções de inicialização nas Propriedades dela ou feche a sessão primeiro.</string> <string name="edit_artwork">Artes</string> <string name="edit_other_exe">Outro exe…</string> <string name="edit_remove">Remover</string> @@ -2424,6 +2615,7 @@ <string name="setup_download_source_custom">Prefixo personalizado</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Prefixo</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APPS LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Apps para a área de trabalho Linux, abertos pela Área de trabalho.</string> @@ -2566,6 +2758,22 @@ <string name="glasses_tracking_flat_hint">O modo Automático mantém este jogo 2D fixo na visão. Escolha Tela virtual na seção Tela para usar o rastreamento da cabeça.</string> <string name="glasses_tracking_sbs_hint">O rastreamento da cabeça vale para uma tela virtual ou um jogo do SteamVR em execução.</string> <string name="glasses_hardware">Dispositivo</string> + <string name="vr_controllers_tab">Controles</string> + <string name="vr_controllers_group">Controles do SteamVR</string> + <string name="vr_controllers_emulate">Controle em VR</string> + <string name="vr_controllers_emulate_hint">As duas mãos de VR que seu controle representa. As mudanças valem na hora, mesmo com o SteamVR em execução. Joy-Cons e mãos rastreadas ainda assumem o lado delas.</string> + <string name="vr_controllers_off">Controle comum</string> + <string name="vr_controllers_index">Controles do Valve Index</string> + <string name="vr_controllers_touch">Controles do Meta Quest 3</string> + <string name="vr_controllers_vive">Controles do HTC Vive</string> + <string name="vr_controllers_sticks">Os analógicos começam</string> + <string name="vr_controllers_sticks_hint">Pressione os dois analógicos juntos durante a VR para alternar.</string> + <string name="vr_controllers_sticks_game">Movendo você no jogo</string> + <string name="vr_controllers_sticks_hands">Movendo as mãos</string> + <string name="vr_controllers_buttons">Botões</string> + <string name="vr_controllers_buttons_stick">Gatilhos são gatilhos, os botões de ombro seguram, A/B e X/Y são os botões frontais de cada mão, os cliques dos analógicos clicam os thumbsticks e Guide abre o menu do SteamVR. Direcional para cima e para baixo aproxima ou afasta as mãos.</string> + <string name="vr_controllers_buttons_vive">Os analógicos são trackpads; A/X ou um clique do analógico os pressiona. Gatilhos são gatilhos, os botões de ombro seguram, Start e Select são menu e Guide abre o menu do SteamVR.</string> + <string name="vr_controllers_buttons_off">Sem mãos de VR. Jogos com suporte a controle, e o menu do SteamVR, recebem seu controle normalmente.</string> <string name="glasses_brightness">Brilho</string> <string name="glasses_volume">Volume</string> <string name="glasses_sunblock">Escurecimento</string> @@ -2623,6 +2831,12 @@ <string name="hand_camera_placement">Posição da câmera</string> <string name="hand_camera_placement_hint">Verifique se a câmera consegue ver você antes de jogar.</string> <string name="hand_camera_check">Verificar</string> + <string name="tracking_pack_title">Download do rastreamento de mãos</string> + <string name="tracking_pack_hint">O rastreamento de mãos precisa de um download único de %1$s.</string> + <string name="tracking_pack_download">Baixar</string> + <string name="tracking_pack_retry">Tentar novamente</string> + <string name="tracking_pack_downloading">Baixando o rastreamento de mãos… %1$d%%</string> + <string name="tracking_pack_failed">Não foi possível baixar o rastreamento de mãos. Verifique sua conexão e tente novamente.</string> <string name="hand_camera_check_title">Posição da câmera</string> <string name="hand_camera_how_rear">Deixe o dispositivo em pé a 1,5-2 metros de distância, na altura do peito, com a câmera traseira voltada para você. Depois entre no campo de visão com as mãos estendidas.</string> <string name="hand_camera_how_front">Deixe o dispositivo em pé a 1,5-2 metros de distância, na altura do peito, com a tela voltada para você. Depois entre no campo de visão com as mãos estendidas.</string> @@ -2705,6 +2919,21 @@ <string name="storage_safe_hint">Runtimes sem uso, restos, logs antigos</string> <string name="storage_clean_up">Limpar…</string> <string name="storage_session_running">Encerre a sessão para limpar ou remover algo. Os tamanhos continuam visíveis.</string> + <string name="storage_default_group">Local de instalação</string> + <string name="storage_default_title">Armazenamento padrão</string> + <string name="storage_default_hint">Novas instalações das lojas vão para o local selecionado. Jogos existentes ficam onde estão. As bibliotecas da Steam mantêm a própria configuração.</string> + <string name="storage_default_ask">Perguntar sempre</string> + <string name="storage_default_ask_detail">Escolha um destino para cada instalação</string> + <string name="storage_default_internal">Armazenamento interno</string> + <string name="storage_default_external">Armazenamento externo</string> + <string name="storage_default_external_detail">%1$s · %2$s livres</string> + <string name="storage_default_external_missing">Não conectado</string> + <string name="storage_default_folder">Pasta · %1$s</string> + <string name="storage_default_folder_free">%1$s livres</string> + <string name="storage_default_folder_missing">Não conectada</string> + <string name="storage_default_choose_folder">Escolher pasta…</string> + <string name="storage_default_choose_folder_detail">Use qualquer pasta em um cartão SD ou unidade USB</string> + <string name="storage_default_note">Os jogos vão para uma pasta Games dentro do local selecionado. Jogos existentes não são movidos.</string> <string name="storage_where">Para onde vai</string> <string name="storage_games">Jogos da Steam</string> <string name="storage_game_data">Dados dos jogos</string> @@ -2833,6 +3062,9 @@ <string name="storage_data_installed">Jogos instalados</string> <string name="storage_data_parts">Prefixo %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Apagar shaders</string> + <string name="storage_reset_prefix">Redefinir prefixo</string> + <string name="storage_reset_prefix_title">Redefinir o prefixo de %1$s?</string> + <string name="storage_reset_prefix_confirm">Apaga o prefixo do Wine (%1$s) em %2$s e o recria na próxima inicialização. Salvamentos, configurações e redistribuíveis instalados nele são perdidos; os salvamentos do Steam Cloud continuam na sua conta.</string> <string name="storage_data_leftovers">Jogos desinstalados</string> <string name="storage_steam_app">App Steam %1$d</string> <string name="storage_leftover_unsure_detail">O prefixo dele ainda tem arquivos, que podem incluir saves locais</string> @@ -3135,6 +3367,117 @@ <string name="spatial_saved_views_hint">As visualizações salvas podem ser recalculadas. Inicie uma nova calibração para capturar no sistema de coordenadas de rastreamento atual.</string> <string name="spatial_model_checksum_error">Incompatibilidade de soma de verificação do modelo de mãos</string> <string name="spatial_opencv_load_error">OpenCV não pôde carregar</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizar com o Syncthing</string> + <string name="sync_enable_hint">Baseada no Syncthing-Fork, esta é uma implementação do Syncthing que permite sincronizar arquivos do sistema de arquivos interno do DroidDeck com outras instâncias do Syncthing. Vale apenas para arquivos que você guarda no sistema de arquivos interno do DroidDeck.</string> + <string name="sync_missing">Esta versão não inclui o Syncthing.</string> + <string name="sync_starting">Iniciando o Syncthing</string> + <string name="sync_status_starting">Iniciando</string> + <string name="sync_status_up_to_date">Atualizado</string> + <string name="sync_status_syncing">Sincronizando</string> + <string name="sync_status_paused">Pausado</string> + <string name="sync_status_pausing">Pausando</string> + <string name="sync_status_resuming">Retomando</string> + <string name="sync_status_attention">Requer atenção</string> + <string name="sync_status_failed">O Syncthing parou</string> + <string name="sync_failed_retry">Tentar de novo</string> + <string name="sync_paused_wifi">Pausado até conectar ao Wi-Fi</string> + <string name="sync_paused_game">Pausado durante o jogo</string> + <string name="sync_summary">%1$d pastas · %2$d de %3$d dispositivos conectados</string> + <string name="sync_left">Faltam %1$s</string> + <string name="sync_open_web_ui">Abrir interface web</string> + <string name="sync_pause">Pausar</string> + <string name="sync_resume">Retomar</string> + <string name="sync_running">Em execução</string> + <string name="sync_running_hint">Desative para parar o Syncthing completamente.</string> + <string name="sync_this_device">Este dispositivo</string> + <string name="sync_device_id">ID do dispositivo</string> + <string name="sync_show_qr">Mostrar QR</string> + <string name="sync_advanced">Avançado</string> + <string name="sync_advanced_hint">Portas, quando executar, redefinir</string> + <string name="sync_open">Abrir</string> + <string name="sync_waiting">Aguardando você</string> + <string name="sync_pending_device">%1$s quer se conectar</string> + <string name="sync_pending_folder">%1$s quer compartilhar “%2$s”</string> + <string name="sync_pending_folder_hint">Aceite para escolher onde salvar no DroidDeck.</string> + <string name="sync_review">Revisar na interface web</string> + <string name="sync_folders">Pastas</string> + <string name="sync_no_folders">Nenhuma pasta ainda.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Atualizada</string> + <string name="sync_folder_syncing">Sincronizando %1$d%%</string> + <string name="sync_folder_scanning">Verificando</string> + <string name="sync_folder_paused">Pausada</string> + <string name="sync_folder_out_of_sync">Fora de sincronia</string> + <string name="sync_folder_errors">%1$d arquivos não puderam ser sincronizados</string> + <string name="sync_folder_blocked">Bloqueada</string> + <string name="sync_folder_blocked_hint">Esta pasta está fora do armazenamento do DroidDeck, então o DroidDeck a pausou. Para sincronizar pastas fora do DroidDeck, use o app Syncthing-Fork.</string> + <string name="sync_remove_folder">Remover do Syncthing</string> + <string name="sync_remove_folder_hint">Remover não apaga nenhum arquivo.</string> + <string name="sync_devices">Dispositivos</string> + <string name="sync_no_devices">Nenhum dispositivo ainda.</string> + <string name="sync_connected">Conectado</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Visto por último: %1$s</string> + <string name="sync_device_id_title">ID deste dispositivo</string> + <string name="sync_device_id_hint">No outro dispositivo, adicione um dispositivo no Syncthing e escaneie este código ou cole o ID. Depois, aceite-o aqui na interface web.</string> + <string name="sync_copy">Copiar</string> + <string name="sync_share">Compartilhar</string> + <string name="sync_done">Concluído</string> + <string name="sync_off_title">Desativar o Syncthing?</string> + <string name="sync_off_body">O Syncthing para agora e continua parado até ser ativado de novo. Os arquivos sincronizados ficam onde estão.</string> + <string name="sync_off_forget">Também apagar a configuração do Syncthing</string> + <string name="sync_off_forget_hint">Remove o ID deste dispositivo, as pastas e os dispositivos. Ao ativar de novo, ele começa do zero.</string> + <string name="sync_turn_off">Desativar</string> + <string name="sync_ports">Portas</string> + <string name="sync_port_sync">Sincronização</string> + <string name="sync_port_discovery">Descoberta local</string> + <string name="sync_repick">Escolher novas portas</string> + <string name="sync_repick_hint">Verificadas novamente a cada início.</string> + <string name="sync_repick_button">Escolher de novo</string> + <string name="sync_reset_group">Redefinir</string> + <string name="sync_api_key">Chave da API</string> + <string name="sync_regenerate">Gerar novamente</string> + <string name="sync_reset">Redefinir o Syncthing</string> + <string name="sync_reset_hint">Novo ID do dispositivo; pastas e dispositivos removidos. Os arquivos no armazenamento do DroidDeck são mantidos.</string> + <string name="sync_reset_button">Redefinir</string> + <string name="sync_reset_confirm_title">Redefinir o Syncthing?</string> + <string name="sync_running_group">Execução</string> + <string name="sync_run">Executar</string> + <string name="sync_run_open">Enquanto o DroidDeck estiver aberto</string> + <string name="sync_run_background">Em segundo plano</string> + <string name="sync_wifi_only">Somente Wi-Fi</string> + <string name="sync_pause_games">Pausar durante os jogos</string> + <string name="sync_logs">Logs</string> + <string name="sync_logs_hint">Saída do Syncthing nesta sessão</string> + <string name="sync_logs_share">Compartilhar</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Configure primeiro o runtime do Linux.</string> + <string name="sync_accept">Aceitar</string> + <string name="sync_accept_title">Salvar “%1$s” em</string> + <string name="sync_add_folder">Adicionar pasta</string> + <string name="sync_add_folder_hint">Sincronizar uma pasta no armazenamento do DroidDeck</string> + <string name="sync_choose">Escolher</string> + <string name="sync_add">Adicionar</string> + <string name="sync_add_failed">Não foi possível adicionar a pasta.</string> + <string name="sync_share_with">Compartilhar com</string> + <string name="sync_share_none">Nenhum dispositivo ainda. Você pode compartilhar esta pasta pela interface web depois.</string> + <string name="sync_use_folder">Usar esta pasta</string> + <string name="sync_new_folder">Nova pasta</string> + <string name="sync_location_home">Pasta pessoal do contêiner</string> + <string name="sync_location_sync">Pasta Sync</string> + <string name="sync_location_shared">Armazenamento compartilhado do DroidDeck</string> + <string name="sync_location_card">DroidDeck em %1$s</string> + <string name="sync_location_app">Dados do app DroidDeck</string> + <string name="sync_web_path_locked">Novas pastas são salvas na pasta Sync do DroidDeck. Para sincronizar outra pasta do DroidDeck, use Adicionar pasta na aba Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Recarregar</string> + <string name="sync_not_running">O Syncthing não está em execução.</string> + <string name="session_end_steam_sigill">A Steam parou com uma instrução ilegal (SIGILL). Pode ser um problema de compatibilidade de instruções da CPU ou uma falha do cliente. Compartilhe os logs com os detalhes do seu dispositivo.</string> + <string name="session_end_steam_try_x64">Você pode tentar Configurações da Steam → Cliente Steam → x86-64 (experimental). Requer um download adicional e pode rodar mais devagar.</string> + <string name="session_end_vulkan_device">O driver gráfico do Linux não encontrou um dispositivo Vulkan utilizável. Verifique se o driver de GPU Linux selecionado é compatível com esta GPU.</string> + <string name="session_end_gpu_unsupported">Esta sessão não pode começar porque esta GPU não tem um driver Vulkan para Linux compatível na configuração atual. Os drivers Adreno Turnip não conseguem habilitar suporte a GPUs MediaTek/Mali.</string> <string name="setup_group_memory">Memória</string> <string name="setup_clear_cached">Fechar apps em cache antes de uma sessão</string> <string name="setup_clear_cached_hint">Quando uma sessão começa, o DroidDeck fecha os apps que o Android mantém em segundo plano, para que o jogo tenha mais memória. A Depuração por Wi-Fi precisa estar ativada.</string> @@ -3159,6 +3502,12 @@ <string name="epic_client_open">Abrir</string> <string name="epic_client_install">Instalar</string> <string name="game_tab_about">Sobre</string> + <string name="game_resources_browser">Abre no seu navegador</string> + <string name="game_resource_guides">Guias</string> + <string name="game_resource_protondb_detail">Relatórios de compatibilidade Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Para jogos com salvamentos na sua conta Steam</string> + <string name="game_resource_search">Pesquisa na web</string> <string name="game_tab_install">Instalar</string> <string name="game_install_location">Local</string> <string name="game_install_folder">Pasta</string> @@ -3175,6 +3524,11 @@ <string name="stores_eyebrow_pass">disponível com %1$s</string> <string name="stores_owned_in_library">Jogos comprados na Biblioteca</string> <string name="library_filter_added">Adicionados</string> + <string name="library_filter">Filtro</string> + <string name="library_filter_installed">Só instalados</string> + <string name="library_filter_all_owned">Todos os jogos que você tem</string> + <string name="library_no_installed_matches">Nenhum jogo instalado corresponde a estes filtros.</string> + <string name="library_browse_owned">Ver jogos que você tem</string> <string name="game_tab_launch">Inicialização</string> <string name="game_tab_saves_cloud">Salvamentos e nuvem</string> <string name="game_launch_shortcut">Atalho do Steam</string> @@ -3192,6 +3546,40 @@ <string name="stores_itch_update_replaced">O desenvolvedor substituiu esta versão por %1$s. Atualizar para ela?</string> <string name="xbox_filter_cloud">Nuvem</string> <string name="stores_xbox_cloud_settings">Configurações da nuvem</string> + <string name="integration_title">Integração com a Steam</string> + <string name="integration_count">%1$d de %2$d ativados</string> + <string name="integration_set_up">Configurar</string> + <string name="integration_location">Localização</string> + <string name="integration_app_info">Informações do app</string> + <string name="integration_wifi">Nomes de Wi-Fi</string> + <string name="integration_brightness">Brilho</string> + <string name="integration_home">DroidDeck como tela inicial</string> + <string name="integration_shortcuts">Teclas do sistema</string> + <string name="integration_wifi_hint">Mostra redes na Steam · requer acesso à localização, nunca rastreada</string> + <string name="integration_wifi_on">As redes aparecem na Steam</string> + <string name="integration_wifi_location_off">A localização está desativada</string> + <string name="integration_wifi_denied">Localização negada · permita em Informações do app</string> + <string name="integration_brightness_hint">O controle deslizante da Steam ajusta o brilho da tela</string> + <string name="integration_home_hint">Início abre o menu Steam em uma sessão</string> + <string name="integration_shortcuts_hint">Alt+Tab, tecla Win e botão Início ficam na sessão</string> + <string name="integration_shortcuts_maybe_restricted">Esmaecido no Android? Informações do app → ⋮ → Permitir configurações restritas</string> + <string name="integration_shortcuts_restricted">Bloqueado pelo Android · Informações do app → ⋮ → Permitir configurações restritas</string> + <string name="integration_shortcuts_service">Teclas do sistema DroidDeck</string> + <string name="integration_shortcuts_service_description">Mantém Alt+Tab, a tecla Win e o botão Início em uma sessão ativa do DroidDeck em vez do Android.</string> + <string name="integration_brightness_needed">Ative Brilho em Configuração → Integração com a Steam</string> + <string name="setup_gpu_bridge_off">Ponte Mali: desligada</string> + <string name="setup_gpu_bridge_on">Ponte Mali: ligada</string> + <string name="setup_gpu_bridge_detail">%1$s não é uma Adreno. A ponte Vulkan experimental está ligada: a sessão desenha pelo próprio driver do celular. Espere bugs; envie os logs da sessão.</string> + <string name="setup_bridge_safe">Modo seguro</string> + <string name="setup_bridge_safe_on">Modo seguro: ligado</string> + <string name="setup_bridge_safe_off">Modo seguro: desligado</string> + <string name="setup_bridge_safe_on_detail">O mais compatível. Recomendado para um dispositivo novo.</string> + <string name="setup_bridge_safe_off_detail">Mais rápido onde esta GPU passou nas verificações.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automático</string> + <string name="setup_bridge_dxvk_proton">DXVK: o do Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Usa um DXVK mais antigo quando o Vulkan desta GPU é antigo demais para o do Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Cada Proton mantém o próprio DXVK, mesmo quando o Vulkan desta GPU pode ser antigo demais para ele.</string> <string name="apps_search_hint">Pesquisar apps</string> <string name="apps_no_match">Nenhum app corresponde a “%1$s”.</string> <string name="apps_add_widget">Adicionar widget</string> @@ -3241,6 +3629,8 @@ <string name="desktop_restore_done_body">Os apps que você adicionou estão instalados de novo.</string> <string name="desktop_restore_failed_title">Não foi possível restaurar alguns programas</string> <string name="desktop_restore_failed_body">Veja ~/.cache/droiddeck/apt-restore.log e depois tente sudo apt install no Konsole.</string> + <string name="gog_full_files">As otimizações nativas não estão disponíveis. O download inclui arquivos de substituição completos.</string> + <string name="gog_recover">Verificar o resultado do patch</string> <string name="slow_usb_title">Conexão USB lenta</string> <string name="slow_usb_cable">%1$s está conectado por %2$s (%3$s Mbps, cerca de %4$d MB/s), então os jogos nele vão carregar devagar. Use um cabo USB 3 de 5 Gbps ou mais, tente virar o conector USB-C ou use uma unidade mais rápida.</string> <string name="slow_usb_port">%1$s está conectado por %2$s (%3$s Mbps, cerca de %4$d MB/s). A porta USB deste aparelho não fica mais rápida, então os jogos vão carregar devagar. O armazenamento interno ou um cartão microSD pode ser mais rápido.</string> @@ -3251,4 +3641,52 @@ <string name="steam_import_names_more">%1$s e mais %2$d</string> <string name="steam_import_now">Reiniciar agora</string> <string name="steam_import_later">Mais tarde</string> + <string name="gog_maintenance">Gerenciar instalação do GOG</string> + <string name="gog_check">Procurar atualizações</string> + <string name="gog_repair">Verificar/Reparar</string> + <string name="gog_patches">Patches offline</string> + <string name="gog_refresh">Baixar o instalador offline completo</string> + <string name="gog_update">Atualizar para %1$s</string> + <string name="gog_resume">Retomar a manutenção do GOG</string> + <string name="gog_open_patch">Abrir o instalador do patch</string> + <string name="gog_patch_in_session">Conclua ou cancele o instalador do patch na sessão Linux.</string> + <string name="gog_patch_requirements">Escolha um patch para a versão e o idioma instalados. Versões de origem compatíveis podem não estar listadas.</string> + <string name="gog_no_patches">O GOG não tem patches avulsos para Windows deste jogo.</string> + <string name="gog_managed_files">Arquivos do jogo modificados podem ser substituídos.</string> + <string name="gog_patch_installer_note">O instalador abre na sua sessão Linux.</string> + <string name="gog_download_label">Download</string> + <string name="gog_space_label">Espaço extra</string> + <string name="gog_space_estimate_label">Espaço estimado</string> + <string name="gog_repair_action">Reparar arquivos</string> + <string name="gog_refresh_action">Renovar instalação</string> + <string name="gog_select_patch">Selecionar</string> + <string name="stores_gamejolt_not_owned">Não está na sua biblioteca do Game Jolt</string> + <string name="stores_gamejolt_no_build">Sem download para Windows deste jogo</string> + <string name="stores_gamejolt_no_exe">Nenhum jogo para Windows encontrado no download</string> + <string name="stores_gamejolt_no_game">Não foi possível encontrar este jogo no Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Não foi possível carregar os jogos do Game Jolt</string> + <string name="stores_gamejolt_download_failed">O Game Jolt respondeu HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Não foi possível carregar os downloads do Game Jolt</string> + <string name="stores_gamejolt_build_open">Abrir no Game Jolt</string> + <string name="stores_gamejolt_archive">Arquivos %1$s não são suportados</string> + <string name="stores_gamejolt_extract_failed">Não foi possível extrair o download (código %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Não foi possível acessar o Game Jolt</string> + <string name="stores_gamejolt_download_no_link">O Game Jolt não forneceu um link de download</string> + <string name="stores_gamejolt_section_featured">Em destaque</string> + <string name="stores_gamejolt_section_hot">Em alta</string> + <string name="stores_gamejolt_section_best">Melhores</string> + <string name="stores_gamejolt_section_new">Novos</string> + <string name="stores_gamejolt_price_under_30">US$ 30 ou menos</string> + <string name="stores_gamejolt_os_other">Outros</string> + <string name="stores_gamejolt_maturity_everyone">Todas as idades</string> + <string name="stores_gamejolt_maturity_teen">Adolescentes</string> + <string name="stores_gamejolt_maturity_adult">Adulto</string> + <string name="stores_gamejolt_status_complete">Completo</string> + <string name="stores_gamejolt_status_early">Acesso antecipado</string> + <string name="stores_gamejolt_partners">Jogos de parceiros</string> + <string name="stores_gamejolt_filter_browser">Navegador</string> + <string name="stores_gamejolt_filter_maturity">Classificação</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Parceiros</string> + <string name="stores_gamejolt_followed">Jogos seguidos</string> </resources> diff --git a/app/src/main/res/values-ro/gestures.xml b/app/src/main/res/values-ro/gestures.xml index 50ab4e0ab5..da13d5f14f 100644 --- a/app/src/main/res/values-ro/gestures.xml +++ b/app/src/main/res/values-ro/gestures.xml @@ -71,7 +71,7 @@ <string name="gesture_key_backspace">Backspace</string> <string name="gesture_key_enter">Enter</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">Spațiu</string> <string name="gesture_key_delete">Delete</string> <string name="gesture_key_insert">Insert</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index c75540057d..0104424cd5 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Opțiuni VKD3D pentru D3D12. nodxr dezactivează ray tracing-ul; folosește doar pentru un joc care are nevoie de el.</string> <string name="game_env_proton_log">Setează la 1 pentru un jurnal de diagnosticare Proton. Înregistrarea poate reduce performanța și folosește spațiu de stocare.</string> <string name="game_env_wined3d">Setează la 1 pentru a folosi WineD3D bazat pe OpenGL în locul DXVK, pentru testarea compatibilității D3D9–11.</string> + <string name="game_env_wined3d_renderer">Randare pentru DirectDraw, Direct3D 1-7 și jocurile rulate cu WineD3D. Vulkan ocolește calea OpenGL-prin-Zink și este mult mai rapid pentru jocurile vechi DirectDraw și Direct3D 7 pe Adreno.</string> + <string name="game_env_dxvk_d3d8">Setează la 1 pentru a rula Direct3D 8 prin DXVK în loc de WineD3D. Mai rapid în testul Direct3D 8 din AIO Graphics Test pe Adreno.</string> <string name="game_env_no_ntsync">Setează la 1 pentru a păstra acest joc în afara ntsync (droiddeck-ntsync sau un driver de kernel); folosește droiddeck-esync unde există un pachet, altfel droiddeck-fsync.</string> <string name="game_env_no_esync">Setează la 1 pentru a dezactiva droiddeck-esync pentru acest joc; folosește în schimb droiddeck-fsync, sau droiddeck-ntsync unde fsync este dezactivat și el.</string> <string name="game_env_no_fsync">Setează la 1 pentru a păstra acest joc în afara droiddeck-fsync; folosește droiddeck-esync unde există un pachet, altfel droiddeck-ntsync.</string> <string name="game_env_fsync_first">Setează la 1 pentru a rula acest joc pe droiddeck-fsync, sau la 0 pentru a pune droiddeck-esync primul unde un pachet se potrivește cu Proton-ul său.</string> <string name="game_env_xalia">Setează la 0 pentru a dezactiva asistentul de navigare cu gamepad al Proton pentru acest joc.</string> + <string name="game_env_anticheat_offline">Activat implicit. Pornește un joc cu Easy Anti-Cheat fără anti-cheat atunci când jocul acceptă jocul offline. Dezactivează pentru a lansa prin Easy Anti-Cheat ca de obicei. Modurile online care necesită Easy Anti-Cheat rămân indisponibile.</string> <string name="game_env_hud">Suprapunere DXVK pentru D3D9–11. fps afișează rata de cadre; nesetat o ascunde.</string> <string name="game_env_dxvk_config">Setări DXVK separate prin punct și virgulă. Versiunile recente folosesc dxvk.maxFrameRate pentru limitarea cadrelor; preferă limitatorul de cadre al sesiunii pentru joc obișnuit.</string> + <string name="game_env_cores">Nuclee CPU pentru acest joc, de exemplu 0-4 sau 0,2,4, în locul nucleelor pentru joc ale sesiunii. Mai puține nuclee se încălzesc mai puțin.</string> <string name="game_env_vkd3d_limit">Limita ratei de cadre D3D12. 0 dezactivează limita.</string> <string name="game_env_glthread">Procesarea pe fire a Mesa OpenGL. true poate ajuta jocurile OpenGL limitate de CPU; testează pentru fiecare joc.</string> <string name="sync_backend_title">Sincronizare Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX rulează programe Linux x86 pe acest dispozitiv ARM64. Automat îl folosește atunci când programul este compilat pentru x86.</string> <string name="app_fex_x86">%1$s prin FEX</string> <string name="app_fex_not_ready">Acest program este compilat pentru PC-uri %1$s și rulează prin FEX, care nu este încă configurat. Deschide Steam o dată, fiind autentificat: DroidDeck îl pune să descarce FEX și Steam Linux Runtime de care are nevoie, apoi acesta se deschide.</string> + <string name="session_proot_missing">Proot-ul DroidDeck nu a putut fi descărcat. Verifică conexiunea și încearcă din nou. Sesiunea nu a fost pornită, deoarece proot-ul de rezervă este prea lent pentru jocuri.</string> + <string name="session_directaudio_missing">DirectAudio nu a putut fi descărcat, așa că sunetul jocurilor folosește calea mai lentă în această sesiune.</string> <string name="session_end_program">Acest program</string> <string name="session_end_steam_download">Clientul Steam nu a putut fi descărcat. Rețeaua sau VPN-ul tău poate bloca serverele Steam; verifică conexiunea și încearcă din nou.</string> <string name="session_end_steam_setup">Clientul Steam nu a putut fi configurat. Verifică conexiunea și spațiul liber, apoi încearcă din nou.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Controller Xbox 360</string> <string name="mode_controller_note">Deck: butonul Acces rapid și giroscopul. Steam Controller: la fel, cu senzori de strângere pe butoanele din spate. DualShock 4 și DualSense: giroscop, și trackpadurile ca touchpad propriu. Xbox 360: deschide Acces rapid cu Guide+A.</string> <string name="mode_back">Înapoi</string> + <string name="back_hold">Ține apăsat Înapoi pentru comenzi Steam</string> + <string name="back_hold_hint">Dacă ții apăsat Înapoi se deschide Acces rapid sau se fac combinații Steam cu alte butoane. Dezactivează pentru a ignora apăsarea lungă; atingerea și dubla atingere funcționează în continuare.</string> + <string name="back_native_qam_hint">Ține apăsat Înapoi 700 ms sau ține apăsat Înapoi și apasă alt buton pentru comenzile rapide Steam.</string> + <string name="back_double_tap_window">Interval pentru atingere dublă</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Permite controlul luminozității</string> + <string name="brightness_permission_text">Configurează controlul luminozității în DroidDeck.</string> <string name="back_menu_then_qam">Meniu → QAM</string> <string name="back_qam_then_menu">QAM → Meniu</string> <string name="mode_session">Sesiune</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Întârzie suspendarea în fundal cât timp Steam descarcă activ.</string> <string name="mode_suspend_note">Automat pune pe pauză în fundal și reia atunci când este afișată. Manual așteaptă Reluare. Niciodată continuă să ruleze.</string> <string name="mode_startup">Pornire</string> - <string name="mode_steam_startup">Pornește Steam odată cu DroidDeck</string> - <string name="mode_steam_startup_hint">Deschide sesiunea Steam la lansarea DroidDeck.</string> + <string name="mode_startup_session">Deschide la pornire</string> + <string name="mode_startup_session_hint">Pornește această sesiune când se lansează DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Se verifică versiunile…</string> <string name="mode_decky_ready">Pregătit pentru instalarea %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Actualizat · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Instalează cea mai recentă versiune</string> + <string name="decky_channel">Canal de actualizare</string> + <string name="decky_channel_hint">Ce versiuni Decky Loader se instalează. Actualizatorul propriu al Decky folosește același canal.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Pre-lansare</string> + <string name="decky_channel_testing">Testare</string> + <string name="decky_channel_failed">Canalul de actualizare Decky nu a putut fi salvat</string> <string name="mode_decky_on">Pornește odată cu Steam. Cât timp este activ, alte aplicații de pe acest dispozitiv pot fi capabile să controleze Steam.</string> <string name="mode_decky_off">Dezactivat. Portul de depanare la distanță al Steam rămâne închis.</string> <string name="mode_decky_remove_title">Dezinstalezi Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Client</string> <string name="mode_mangoapp">Suprapunere de performanță</string> <string name="mode_mangoapp_hint">Dezactivează dacă jocurile se blochează sau ecranul devine negru în modul Deck. Se aplică la sesiunea următoare.</string> + <string name="mode_return_after_game">Revino la DroidDeck după un joc</string> + <string name="mode_return_after_game_hint">Când un joc pornit din DroidDeck sau din alt launcher se închide, Steam iese curat (salvările în cloud se termină întâi) și revii acolo. Dezactivat: rămâi în Steam.</string> + <string name="mode_shader_precache">Pre-cache pentru shadere</string> + <string name="mode_shader_precache_hint">Steam descarcă shadere precompilate pentru jocurile tale și le procesează în fundal, ca jocurile să aibă mai puține sacadări. Dezactivat economisește date, spațiu și baterie; jocurile își compilează shaderele în timpul jocului. Aceeași setare ca Descărcări > Pre-cache pentru shadere din Steam. Se aplică la sesiunea următoare.</string> <string name="mode_steam_repair">Repară clientul Steam</string> <string name="mode_steam_repair_hint">Descarcă din nou clientul Steam la următoarea pornire a Steam. Folosește-l dacă Steam rămâne blocat pe ecranul de încărcare. Jocurile, autentificarea și setările sunt păstrate.</string> <string name="mode_steam_repair_queued">Clientul Steam va fi descărcat din nou la următoarea pornire a Steam.</string> @@ -391,6 +414,8 @@ <string name="mode_directaudio_hint">Evită PulseAudio pentru o latență mai mică.</string> <string name="mode_mic">Microfon</string> <string name="mode_mic_hint">Pentru chat vocal.</string> + <string name="drawer_mic_hint">Activează sau dezactivează captarea microfonului pentru această sesiune.</string> + <string name="drawer_mic_failed">Microfonul nu a putut fi schimbat. Încearcă din nou.</string> <string name="mode_network">Rețea</string> <string name="mode_wifi_discovery">Descoperire Wi-Fi</string> <string name="mode_wifi_discovery_hint">Arată numele rețelelor Wi-Fi și rețelele din apropiere în Steam.</string> @@ -553,6 +578,16 @@ <string name="perf_gsrealtime">gamescope: coadă GPU în timp real</string> <string name="perf_gsrealtime_hint">Prioritizează lucrul GPU al compositorului. Poate netezi ritmul cadrelor, cu un cost pentru jocuri.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memorie</string> + <string name="perf_cap_off">Dezactivat</string> + <string name="perf_cap_auto">Implicit driver</string> + <string name="perf_zram_client">Comprimă Steam cât rulează un joc</string> + <string name="perf_zram_client_hint">La 20 s după pornirea unui joc, clientul Steam este comprimat în zRAM pentru a lăsa jocului mai multă memorie și este citit înapoi când jocul se închide. Dezactivează dacă sesiunea se închide la scurt timp după pornirea jocurilor. O limită RAM de mai sus tot comprimă Steam când sesiunea o depășește.</string> + <string name="perf_ram_cap">Limită RAM</string> + <string name="perf_ram_cap_hint">Se aplică cât rulează clientul Steam, în modul Steam sau de pe desktop. Când sesiunea folosește mai mult de atât, Steam și apoi celelalte procese acceptate ale sesiunii sunt comprimate în zRAM. O limită flexibilă: nimic nu se închide, dar jocurile pot sacada cât paginile revin.</string> + <string name="perf_ram_cap_unavailable">Necesită swap zRAM, pe care acest dispozitiv nu îl are.</string> + <string name="perf_vram_cap">Limită VRAM</string> + <string name="perf_vram_cap_hint">Memoria video pe care DXVK o raportează jocurilor Direct3D, ca acestea să aloce mai puțin pentru texturi. Setările DXVK proprii ale unui joc au prioritate. Intră în vigoare la sesiunea următoare.</string> <string name="perf_gpuclock">Fixează GPU-ul la frecvența maximă</string> <string name="perf_gpuclock_hint">Doar Adreno. Mai puține întreruperi, consum mai mare de baterie și căldură.</string> <string name="perf_fixes">Remedieri de sesiune</string> @@ -571,6 +606,8 @@ <string name="perf_fastpath">Cale rapidă proot</string> <string name="perf_fastpath_needs_seccomp">Necesită filtrul seccomp al proot.</string> <string name="perf_fastpath_hint">Căutări de fișiere mai rapide și mai puține sacadări. Dezactivează dacă un program nu își găsește fișierele.</string> + <string name="perf_cursor_composite">Desenează cursorul în gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope desenează singur cursorul în loc să-l predea Android. Activează pentru un cursor controlat cu controllerul. Dezactivat este mai rapid pe telefon. Se aplică la sesiunea următoare.</string> <string name="perf_identity">Identitatea sesiunii</string> <string name="perf_hostname">Nume de host</string> <string name="perf_hostname_hint">Numele pe care Steam îl vede pentru acest dispozitiv. Gol restaurează %1$s.</string> @@ -585,6 +622,8 @@ <string name="driver_delete_plain">Fișierele sale sunt eliminate din aplicație.</string> <string name="driver_delete_in_use">Fișierele sale sunt eliminate. Este în uz, așa că cel implicit îi ia locul.</string> <string name="drawer_page_display">Afișaj</string> + <string name="drawer_frame_limit">Limită de cadre</string> + <string name="drawer_frame_limit_note">Limitează acest joc. Afișajul trece la o rată de reîmprospătare pe care limita o împarte exact, dacă există; alte limite pot părea neuniforme. Jocurile Steam folosesc Limita de cadre a Steam din meniul Acces rapid.</string> <string name="drawer_page_effects">Efecte</string> <string name="drawer_page_controls">Comenzi</string> <string name="drawer_page_components">Componente</string> @@ -616,8 +655,11 @@ <string name="hud_size_pill">Pastilă</string> <string name="hud_size_minimal">Minimal</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Bară</string> <string name="hud_locked">Blochează pe loc</string> <string name="hud_locked_hint">Trage HUD-ul pentru a-l muta; o apăsare lungă îl blochează sau îl deblochează. Cât timp e blocat, comenzile de pe ecran de sub el funcționează în continuare.</string> + <string name="hud_snap">Fixare în lateral</string> + <string name="hud_snap_hint">Eliberează HUD-ul și se mută în partea mai apropiată a ecranului. Un gest rapid îl aruncă în acea direcție.</string> <string name="hud_group_look">Aspect</string> <string name="hud_scale">Dimensiune pe ecran</string> <string name="hud_color_soft">Discretă</string> @@ -666,7 +708,6 @@ <string name="hud_export_failed">Raportul HUD nu a putut fi salvat.</string> <string name="hud_reset">Resetează setările HUD</string> <string name="hud_reset_button">Resetează</string> - <string name="hud_credit">FusionHUD de The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Mod de scalare</string> <string name="drawer_scaling_sharpness">Claritatea scalării</string> <string name="drawer_effects">Efecte de ecran</string> @@ -701,11 +742,17 @@ <string name="drawer_touch_auto">Automat (%1$s)</string> <string name="drawer_keyboard">Tastatură</string> <string name="drawer_latency">Latență</string> + <string name="drawer_low_latency">Mod latență redusă</string> + <string name="drawer_low_latency_hint">Crește consumul de CPU și baterie</string> <string name="drawer_low_latency_controller">Controller cu latență mică</string> <string name="drawer_low_latency_controller_hint">Controllerul raportează la 1000 Hz în loc de 250 Hz. Consum CPU puțin mai mare.</string> <string name="drawer_low_latency_touch">Atingere cu latență mică</string> <string name="drawer_low_latency_touch_hint">Atingerile sar peste gruparea cadrelor, deci controlul tactil Steam rulează la 1000 Hz. Consum CPU puțin mai mare.</string> <string name="drawer_evdev_mouse">Canal brut de mouse</string> + <string name="drawer_relative_mouse">Mouse relativ</string> + <string name="drawer_relative_mouse_auto">Automat</string> + <string name="drawer_relative_mouse_on">Pornit</string> + <string name="drawer_relative_mouse_off">Oprit</string> <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">Tastatură de PC</string> <string name="drawer_android_keyboard">Android</string> @@ -794,6 +841,10 @@ <string name="setup_session">Sesiune</string> <string name="setup_logs">Jurnalele sesiunii</string> <string name="setup_logs_hint">Salvate după fiecare sesiune</string> + <string name="setup_game_debug_logs">Jurnale de depanare a jocurilor</string> + <string name="setup_game_debug_logs_hint">Include diagnosticare Proton, Wine și grafică la următoarea lansare a unui joc. Poate reduce performanța și folosește mai mult spațiu.</string> + <string name="setup_game_debug_logs_restart">Repornește această sesiune pentru a salva jurnalele de depanare</string> + <string name="setup_logging_update_failed">Jurnalizarea nu a putut fi actualizată. Verifică comutatorul și încearcă din nou.</string> <string name="setup_agent_commands">Instrumente de depanare</string> <string name="setup_latest_logs">Cele mai recente jurnale de sesiune</string> <string name="setup_saved_logs">Jurnale de sesiune salvate</string> @@ -825,20 +876,22 @@ <string name="setup_home">Folosește ca ecran Acasă</string> <string name="setup_home_on">DroidDeck poate fi aplicația Acasă</string> <string name="setup_home_off">DroidDeck nu este niciodată oferit ca aplicație Acasă</string> + <string name="setup_home_game_space_first">În Adaugă jocuri, setează DroidDeck pe Include</string> <string name="setup_orientation">Orientare</string> + <string name="setup_launcher_orientation">Orientarea launcherului</string> + <string name="setup_launcher_orientation_auto">Urmează rotirea dispozitivului</string> + <string name="setup_orientation_portrait">Portret</string> + <string name="setup_session_orientation">Orientarea sesiunii</string> + <string name="setup_session_orientation_hint">Se aplică pentru Steam, jocuri, desktop și editorul de controller. Presetările de rezoluție se rotesc odată cu sesiunea; lățimea și înălțimea personalizate rămân cum au fost introduse.</string> <string name="setup_orientation_auto">Peisaj automat</string> <string name="setup_orientation_landscape">Peisaj</string> <string name="setup_orientation_reverse">Peisaj inversat</string> <string name="setup_fullscreen">Ecran complet</string> <string name="setup_fullscreen_on">Ascunde barele de stare și de navigare Android</string> <string name="setup_fullscreen_off">Arată barele de stare și de navigare Android</string> - <string name="setup_dual_screen">Ecran dublu</string> - <string name="setup_dual_screen_hint">Automat folosește al doilea ecran pe consolele portabile care au unul integrat. Pornit folosește orice al doilea afișaj. Oprit păstrează totul pe un singur ecran.</string> <string name="setup_dual_screen_auto">Automat</string> <string name="setup_dual_screen_on">Pornit</string> <string name="setup_dual_screen_off">Oprit</string> - <string name="setup_dual_screen_menu">Meniu pe ecranul de jos</string> - <string name="setup_dual_screen_menu_hint">Mută secțiunile și meniul din joc pe al doilea ecran și scrierea se face acolo, astfel încât ecranul de sus păstrează imaginea completă. L2 și R2 schimbă secțiunea.</string> <string name="setup_dual_screen_controls">Comenzi pe ecranul de jos în jocuri</string> <string name="setup_dual_screen_controls_hint">Deschide trackpadul și tastatura pe al doilea ecran când pornește o sesiune.</string> <string name="dual_typing_title">Scriere pentru ecranul de sus</string> @@ -993,6 +1046,14 @@ <string name="gate_step1">Deschide Setări → Opțiuni pentru dezvoltatori → Depanare wireless și activează-o</string> <string name="gate_step2">Apasă „Asociază dispozitivul cu un cod de asociere”</string> <string name="gate_step3">Introdu codul în notificarea DroidDeck</string> + <string name="pairguide_build_number">În Despre telefon, atinge Numărul versiunii de 7 ori</string> + <string name="pairguide_wireless">Activează Depanarea wireless</string> + <string name="pairguide_pair">Deschide Depanare wireless, apoi atinge „Asociază dispozitivul cu un cod de asociere”</string> + <string name="pairguide_child_process">Activează „Dezactivează restricțiile pentru procese secundare”</string> + <string name="pairguide_row_child_process">Dezactivează restricțiile pentru procese secundare</string> + <string name="pairguide_row_build_number">Numărul versiunii</string> + <string name="pairguide_row_wireless">Depanare wireless</string> + <string name="pairguide_row_pair">Asociază dispozitivul cu un cod de asociere</string> <string name="gate_waiting">Se așteaptă fereastra de asociere…</string> <string name="gate_code_needed">Fereastra a fost găsită. Introdu codul său în notificare.</string> <string name="gate_status">Stare</string> @@ -1131,7 +1192,6 @@ <string name="games_never_played">Niciodată jucat</string> <string name="games_runtime_busy_percent">Mediu de execuție ocupat · %1$d%%</string> <string name="games_runtime_busy">Mediu de execuție ocupat</string> - <string name="games_runtime_first_play">Mediul de execuție se instalează la prima apăsare pe Play</string> <string name="games_runtime_update">Actualizare disponibilă pentru mediul de execuție</string> <string name="games_runtime_ready">● Mediu de execuție pregătit</string> <string name="games_internal">Stocare internă</string> @@ -1148,6 +1208,9 @@ <string name="gpu_hide_other">Ascunde driverele pentru alte GPU-uri</string> <string name="gpu_show_other">Arată driverele pentru alte GPU-uri</string> <string name="gpu_advanced">Avansat</string> + <string name="gpu_ubwc_title">Compatibilitate UBWC</string> + <string name="gpu_ubwc_hint">Încearcă Activat sau Dezactivat dacă Steam sau Android afișează dungi ori pâlpâiri. Se aplică ambelor drivere după repornirea DroidDeck.</string> + <string name="gpu_ubwc_restart">Repornește DroidDeck pentru a aplica.</string> <string name="gpu_set_with_display">Setat împreună cu driverul de afișaj: %1$s include ambele.</string> <string name="gpu_set_with_runtime">Setat împreună cu driverul mediului de execuție: %1$s include ambele.</string> <string name="gpu_runtime_hint">Folosit de jocuri și de desktop.</string> @@ -1256,10 +1319,15 @@ <string name="pip_auto">Intră automat în PiP</string> <string name="unfolded_controls">Comenzi pe ecranul desfăcut</string> <string name="unfolded_controls_hint">Desfăcut, jocul se află peste trackpadurile și mânerele din spate ale Steam Deck. Împăturit, jocul este pe tot ecranul.</string> + <string name="unfolded_controls_with_controller">Păstrează-le cu un controller</string> + <string name="unfolded_controls_with_controller_hint">Afișează aceste comenzi tactile și cât timp un controller este conectat.</string> <string name="pip_suspended">Suspendat</string> <string name="pip_not_ready">Imaginea în imagine este disponibilă odată ce sesiunea este pregătită.</string> <string name="pip_permission">Permite imaginea în imagine pentru DroidDeck în setările Android.</string> <string name="pip_unavailable">Android nu a putut deschide imaginea în imagine.</string> + <string name="game_more">Mai multe</string> + <string name="game_edit_art">Editează grafica</string> + <string name="stores_in_steam_label">În Steam</string> <string name="game_shortcut">Comandă rapidă</string> <string name="game_shortcut_add">Adaugă pe ecranul principal</string> <string name="game_shortcut_choose">Alege jocul</string> @@ -1283,6 +1351,10 @@ <string name="main_wait_runtime">Așteaptă să se termine operația asupra mediului de execuție</string> <string name="main_wait_proton_install">Așteaptă să se termine instalarea instrumentului de compatibilitate</string> + <string name="load_compat_title">Se pregătesc instrumentele de compatibilitate</string> + <string name="load_compat_wait">Se așteaptă finalizarea configurării compatibilității</string> + <string name="load_compat_hint">Sesiunea va porni după finalizarea configurării.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Așteaptă să se termine instalarea aplicației desktop</string> <string name="main_wait_install_game">Așteaptă să se termine instalarea înainte de a lansa un joc</string> <string name="main_saves_close_session">Închide mai întâi sesiunea Steam, ca jocul să nu poată salva peste import</string> @@ -1323,6 +1395,9 @@ <string name="main_install_anyway">Instalează oricum</string> <string name="main_remove_runtime_title">Elimină mediul de execuție Linux</string> <string name="main_remove_runtime_text">Aceasta șterge mediul de execuție, clientul Steam din interiorul lui și fiecare joc instalat acolo.</string> + <string name="runtime_actions_title">Mediul de execuție Linux</string> + <string name="runtime_actions_text">Repararea reinstalează fișierele de sistem ale mediului de execuție și păstrează Steam, jocurile și setările. Extrasele, precum desktopul, se instalează din nou la următoarea utilizare. Eliminarea șterge tot.</string> + <string name="runtime_repair">Repară mediul de execuție</string> <string name="main_applied">Aplicat: %1$s</string> <string name="android_app_open_failed_primary">%1$s nu a putut fi deschis pe ecranul principal</string> <string name="android_app_open_failed_on">%1$s nu a putut fi deschis pe %2$s</string> @@ -1455,6 +1530,12 @@ <string name="session_runtime_catalog_unreachable">Catalogul mediului de execuție nu a putut fi accesat. Verifică conexiunea și apasă din nou Play.</string> <string name="session_runtime_install_failed">Mediul de execuție Linux nu s-a instalat. Verifică mediul de execuție în Configurare și apasă din nou Play.</string> <string name="session_desktop_install_failed">Desktopul nu s-a instalat (%1$s). Verifică conexiunea și apasă din nou Desktop.</string> + <string name="session_package_resume_failed">O instalare întreruptă nu a putut fi finalizată (%1$s). Verifică conexiunea și spațiul, apoi încearcă din nou.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Mediul de execuție Linux este deteriorat: %1$d legătură de bibliotecă indică un fișier lipsă (%2$s), de obicei după o instalare întreruptă. Repararea păstrează jocurile și setările.</item> + <item quantity="few">Mediul de execuție Linux este deteriorat: %1$d legături de bibliotecă indică fișiere lipsă (%2$s și altele), de obicei după o instalare întreruptă. Repararea păstrează jocurile și setările.</item> + <item quantity="other">Mediul de execuție Linux este deteriorat: %1$d de legături de bibliotecă indică fișiere lipsă (%2$s și altele), de obicei după o instalare întreruptă. Repararea păstrează jocurile și setările.</item> + </plurals> <string name="session_ended_named">%1$s s-a oprit neașteptat. Partajează jurnalele cu un raport de eroare, sau încearcă din nou.</string> <string name="session_ended_program">Programul s-a oprit neașteptat. Partajează jurnalele cu un raport de eroare, sau încearcă din nou.</string> <string name="session_ended_desktop">Desktopul s-a oprit neașteptat. Partajează jurnalele cu un raport de eroare, sau încearcă din nou.</string> @@ -1470,6 +1551,14 @@ <string name="mode_decky_plugins_hint">Instalează o arhivă ZIP cu un plugin pentru sesiunea Steam următoare.</string> <string name="mode_decky_plugin_downloading">Se descarcă…</string> <string name="mode_decky_plugin_install_zip">Instalează din ZIP</string> + <string name="decky_zip_warning_title">Instalarea unui plugin terț</string> + <string name="decky_zip_warning_text">Echipa Decky Loader nu a verificat acest plugin. Poate conține malware, de exemplu software care îți fură contul Steam sau îți afectează dispozitivul. Instalând acest plugin, accepți că îți asumi toate riscurile pentru dispozitiv.</string> + <string name="decky_zip_warning_continue">Continuă</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Așteaptă %1$d secundă</item> + <item quantity="few">Așteaptă %1$d secunde</item> + <item quantity="other">Așteaptă %1$d de secunde</item> + </plurals> <string name="store_cat_games">Jocuri</string> <string name="store_cat_audio_video">Audio & video</string> <string name="store_cat_graphics">Grafică</string> @@ -1525,7 +1614,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">Spațiu</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1636,6 +1725,8 @@ <string name="fm_accept">Acceptă</string> <string name="fm_decline">Refuză</string> <string name="fm_drive_not_readable">%1$s este montat, dar nu poate fi citit acum</string> + <string name="fm_drive_access_title">Permite accesul la %1$s</string> + <string name="fm_drive_access_text">Android permite DroidDeck să vadă această unitate, dar nu să o citească. Activează Acces la toate fișierele pentru DroidDeck, apoi revino.</string> <string name="fm_list_view">Vizualizare listă</string> <string name="fm_grid_view">Vizualizare grilă</string> <string name="fm_search">Căutare</string> @@ -1708,6 +1799,89 @@ <string name="second_mode_keyboard_trackpad">Tastatură + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Mânere + trackpaduri Deck</string> + <string name="second_mode_dashboard">Tablou de bord</string> + <string name="bottom_dashboard_empty">Nimic de afișat aici încă.</string> + <string name="bottom_page_downloads">Descărcări</string> + <string name="bottom_downloads_none">Nicio descărcare în curs.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Se descarcă cache-ul de shadere</string> + <string name="bottom_downloads_paused">Întrerupt</string> + <string name="bottom_downloads_queued">Așteaptă să înceapă</string> + <string name="bottom_page_notifications">Notificări</string> + <string name="bottom_notifications_listener">Ecranul de jos DroidDeck</string> + <string name="bottom_notifications_why">Afișează aici mesajele și alte notificări în timp ce te joci. Rămân doar pe acest ecran și nu sunt salvate. Android întreabă o singură dată: pagina sa de acces la notificări se deschide pe acest ecran; activează DroidDeck acolo, iar această pagină revine singură.</string> + <string name="bottom_notifications_allow">Permite accesul la notificări</string> + <string name="bottom_notifications_none">Nicio notificare.</string> + <string name="bottom_notifications_count">Notificări: %1$d</string> + <string name="bottom_notifications_clear">Șterge</string> + <string name="bottom_page_screenshots">Capturi de ecran</string> + <string name="stats_fps_needs_hud">FPS necesită HUD-ul activat</string> + <string name="stats_speed">Viteză</string> + <string name="stats_pedals">Pedale</string> + <string name="stats_gforce">Forță G</string> + <string name="stats_timing">Cronometrare</string> + <string name="stats_best_lap">Cel mai bun tur</string> + <string name="stats_tires">Anvelope °C</string> + <string name="stats_trace">Accelerație și frână, ultimele 10 s</string> + <string name="stats_speed_chart">Viteză, %1$s</string> + <string name="stats_gear">Treaptă</string> + <string name="stats_steam_client_arm">Client Steam ARM</string> + <string name="stats_steam_client_x86">Client Steam x86</string> + <string name="stats_throttle">Accelerație</string> + <string name="stats_brake">Frână</string> + <string name="stats_lights">Bord</string> + <string name="stats_lamp_shift">Schimbă treapta</string> + <string name="stats_lamp_handbrake">Frână de mână</string> + <string name="stats_lamp_pit">Limitator de boxe</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Ulei %1$s °C</string> + <string name="stats_power">Distribuitor de putere</string> + <string name="stats_fuel_t">Combustibil, t</string> + <string name="stats_fuel_main">Principal %1$s t</string> + <string name="stats_fuel_reserve">Rezervă %1$s t</string> + <string name="bottom_telemetry_send_title">Trimite date pentru tabloul de bord</string> + <string name="bottom_telemetry_send_auto">Automat</string> + <string name="bottom_telemetry_send_auto_hint">Activează trimiterea pentru fiecare joc din listă, inclusiv pentru jocurile găsite mai târziu. Jocurile pe care le dezactivezi rămân dezactivate.</string> + <string name="bottom_telemetry_send_note">Aceasta modifică setarea de ieșire a datelor din joc. Intră în vigoare la următoarea pornire a jocului; dezactivarea readuce setarea veche.</string> + <string name="bottom_telemetry_send_close">Închide %1$s pentru a schimba asta.</string> + <string name="bottom_telemetry_send_failed">Nu s-au putut modifica setările pentru %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: activează %2$s în setările jocului, cu IP-ul 127.0.0.1 și portul %3$d.</string> + <string name="bottom_shots_where">Salvate în Pictures/DroidDeck. Capturile de ecran Steam apar și ele aici.</string> + <string name="bottom_shots_take">Fă o captură de ecran</string> + <string name="bottom_shots_saved">Captură de ecran salvată.</string> + <string name="bottom_shots_failed">Nu s-a putut face o captură de ecran.</string> + <string name="bottom_shots_none">Încă nu există capturi de ecran.</string> + <string name="bottom_page_chat">Chat și voce</string> + <string name="bottom_chat_why">Citește și răspunde aici la chatul Steam, în timp ce jocul continuă să ruleze pe ecranul principal. Folosește contul cu care este conectat Steam.</string> + <string name="bottom_chat_not_signed_in">Steam nu are încă o conectare web de partajat, așa că conectează-te aici o dată.</string> + <string name="bottom_chat_stopped">Android a închis pagina de chat cât timp DroidDeck era în fundal. Se redeschide când revii în DroidDeck.</string> + <string name="bottom_chat_open">Deschide Steam Chat</string> + <string name="bottom_chat_close">Închide chatul</string> + <string name="bottom_chat_mic_on">Microfon pornit</string> + <string name="bottom_chat_mic_off">Microfon oprit</string> + <string name="bottom_chat_mic_unavailable">Microfonul este oprit pentru acest joc. Pentru a vorbi, activează Microfon în setările Steam din DroidDeck (Sunet) și pornește din nou jocul.</string> + <string name="bottom_chat_volume">Volum %1$d%%</string> + <string name="bottom_page_telemetry">Statistici în joc</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Baterie</string> + <string name="bottom_telemetry_lap">Tur</string> + <string name="bottom_telemetry_position">Poziție</string> + <string name="bottom_telemetry_this_lap">Turul curent</string> + <string name="bottom_telemetry_last_lap">Ultimul tur</string> + <string name="bottom_telemetry_fuel">Combustibil</string> + <string name="bottom_telemetry_cargo">Încărcătură</string> + <string name="bottom_telemetry_pips">Puncte SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Statut legal</string> + <string name="bottom_telemetry_balance">Sold</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Portul %1$d primește date (%2$d pachete de %3$d octeți), dar într-un format pe care această pagină nu îl poate citi încă.</string> + <string name="bottom_telemetry_port_busy">Alt program folosește deja portul %1$s, așa că acel joc nu poate fi afișat aici.</string> <string name="rtinst_removing">Se elimină mediul de execuție Linux</string> <plurals name="rtinst_removing_entries"> @@ -1739,6 +1913,7 @@ <string name="flatpakmgr_not_ready">Configurează mai întâi Flatpak</string> <string name="flatpakmgr_starting">Se pornește</string> <string name="flatpakmgr_exit_status">Flatpak s-a închis cu starea %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s este construită pentru %2$s, pe care DroidDeck nu o poate rula. Aici aplicațiile Flatpak au nevoie de o versiune pentru ARM64 sau x86_64.</string> <string name="flatpakmgr_installing">Se instalează %1$s</string> <string name="flatpakmgr_updating">Se actualizează %1$s</string> <string name="flatpakmgr_removing">Se elimină %1$s</string> @@ -1832,6 +2007,7 @@ <string name="adbpair_applying">Se aplică setarea…</string> <string name="adbpair_command_failed">Comanda Depanării wireless a eșuat</string> <string name="adbpair_channel_name">Configurarea Depanării wireless</string> + <string name="adbpair_progress_channel_name">Progresul configurării Depanării wireless</string> <string name="adbpair_channel_description">Cere codul de asociere al Depanării wireless cât timp Setările sunt deschise</string> <string name="adbpair_title_pair">Asociază Depanarea wireless</string> <string name="adbpair_waiting_text">Activează Depanarea wireless, apoi apasă „Asociază dispozitivul cu un cod de asociere”.</string> @@ -1940,6 +2116,7 @@ <string name="gpuinfo_not_adreno">Nu este un GPU Adreno</string> <string name="gpuinfo_supported">Acceptat</string> <string name="gpuinfo_experimental">Experimental: driverele sale sunt versiuni de test</string> + <string name="gpuinfo_a850_experimental">Suport experimental pentru Adreno 850: necesită drivere experimentale compatibile de afișaj și de jocuri; neverificat pe acest dispozitiv</string> <string name="gpuinfo_below_tested">Sub hardware-ul testat (Adreno 725 și mai nou): poate să nu ruleze</string> <string name="gpuinfo_unsupported">Neacceptat: DroidDeck are nevoie de un GPU Adreno (Snapdragon)</string> @@ -2036,6 +2213,7 @@ <string name="display_look_filter">%1$s Setează scalarea la %2$s.</string> <string name="display_match_screen">Potrivire ecran (%1$d×%2$d)</string> <string name="display_follow_screen">Urmărește ecranul (se redimensionează la împăturire sau desfacere)</string> + <string name="display_follow_screen_scaled">Scalat %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Arată detaliile dispozitivului</string> <string name="device_info_hide">Ascunde detaliile dispozitivului</string> @@ -2142,6 +2320,13 @@ <string name="stores_resume">Reluare</string> <string name="stores_refresh">Reîmprospătează</string> <string name="stores_sort">Sortează</string> + <string name="setup_rail_labels">Etichete în bara laterală</string> + <string name="setup_rail_labels_hint">Afișează numele sub pictogramele din bara laterală. Dezactivează pentru o bară laterală mai îngustă.</string> + <string name="library_display">Afișare</string> + <string name="library_display_larger">Carduri mai mari</string> + <string name="library_display_smaller">Carduri mai mici</string> + <string name="library_display_title">Afișează titlul</string> + <string name="library_display_size">Afișează dimensiunea</string> <string name="stores_sort_last_played">Jucate recent</string> <string name="stores_sort_recently_installed">Instalate recent</string> <string name="stores_sort_title_asc">Titlu A–Z</string> @@ -2268,6 +2453,9 @@ <string name="stores_download_manager">Administrator de descărcări</string> <string name="stores_parallel">Descărcări simultane</string> <string name="stores_install_where">Instalează în</string> + <string name="stores_install_language">Limba jocului</string> + <string name="stores_install_language_hint">GOG și Epic instalează această limbă. Sistem urmează limba aplicației.</string> + <string name="stores_install_language_system">Sistem</string> <string name="stores_install_title">Instalezi %1$s:</string> <string name="stores_target_internal">Internă</string> <string name="stores_target_free">%1$s liber</string> @@ -2306,6 +2494,9 @@ <string name="edit_target">Țintă</string> <string name="edit_start_in">Pornește în</string> <string name="edit_launch_options">Opțiuni de lansare</string> + <string name="edit_launch_options_steam_hint">Comune cu Proprietățile din Steam: o modificare într-unul dintre locuri apare în ambele.</string> + <string name="edit_launch_options_not_saved">Opțiunile de lansare nu au putut fi salvate în Steam. Încearcă din nou.</string> + <string name="edit_launch_options_desktop">Steam poate fi deschis în sesiunea desktop. Schimbă opțiunile de lansare din Proprietățile lui sau închide mai întâi sesiunea.</string> <string name="edit_artwork">Grafică</string> <string name="edit_other_exe">Alt exe…</string> <string name="edit_remove">Elimină</string> @@ -2435,6 +2626,7 @@ <string name="setup_download_source_custom">Prefix propriu</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">APLICAȚII LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Aplicații desktop pentru desktopul Linux, deschise din Desktop.</string> @@ -2577,6 +2769,22 @@ <string name="glasses_tracking_flat_hint">Modul Automat menține acest joc 2D fix în câmpul vizual. Alege Ecran virtual în Afișaj pentru a folosi urmărirea capului.</string> <string name="glasses_tracking_sbs_hint">Urmărirea capului se aplică unui ecran virtual sau unui joc SteamVR care rulează.</string> <string name="glasses_hardware">Dispozitiv</string> + <string name="vr_controllers_tab">Controllere</string> + <string name="vr_controllers_group">Controllere SteamVR</string> + <string name="vr_controllers_emulate">Gamepad în VR</string> + <string name="vr_controllers_emulate_hint">Cele două mâini VR pe care le joacă controllerul tău. Modificările se aplică imediat, chiar și cât rulează SteamVR. Joy-Con-urile și mâinile urmărite preiau în continuare partea lor.</string> + <string name="vr_controllers_off">Gamepad obișnuit</string> + <string name="vr_controllers_index">Controllere Valve Index</string> + <string name="vr_controllers_touch">Controllere Meta Quest 3</string> + <string name="vr_controllers_vive">Baghete HTC Vive</string> + <string name="vr_controllers_sticks">Stickurile încep prin</string> + <string name="vr_controllers_sticks_hint">Apasă ambele stickuri simultan în VR pentru a comuta.</string> + <string name="vr_controllers_sticks_game">A te mișca în joc</string> + <string name="vr_controllers_sticks_hands">A mișca mâinile</string> + <string name="vr_controllers_buttons">Butoane</string> + <string name="vr_controllers_buttons_stick">Trăgaciele sunt trăgaci, butoanele umăr apucă, A/B și X/Y sunt butoanele frontale ale fiecărei mâini, apăsarea stickurilor apasă thumbstickurile, Guide deschide meniul SteamVR. D-pad sus și jos apropie sau depărtează mâinile.</string> + <string name="vr_controllers_buttons_vive">Stickurile sunt trackpaduri; A/X sau apăsarea unui stick le apasă. Trăgaciele sunt trăgaci, butoanele umăr apucă, Start și Select sunt meniu, Guide deschide meniul SteamVR.</string> + <string name="vr_controllers_buttons_off">Fără mâini VR. Jocurile care acceptă gamepad, și meniul SteamVR, primesc controllerul ca de obicei.</string> <string name="glasses_brightness">Luminozitate</string> <string name="glasses_volume">Volum</string> <string name="glasses_sunblock">Întunecare</string> @@ -2625,7 +2833,7 @@ <string name="hand_camera_not_now">Nu acum</string> <string name="hand_camera_setting">Urmărirea mâinilor cu camera</string> <string name="hand_camera_setting_hint">Folosește camera telefonului pentru gesturi cu mâinile goale sau pentru a poziționa controlerele Joy-Con asociate în VR. Controlerele Joy-Con oferă comenzi de rotație și comenzi de butoane. Pune pauză în timp ce ochelarii inteligenți urmăresc mâinile sau controlerele Joy-Con. Imaginile sunt procesate numai pe acest dispozitiv.</string> - <string name="hand_camera_choice">Camera</string> + <string name="hand_camera_choice">Cameră</string> <string name="hand_camera_access">Acces la cameră</string> <string name="hand_camera_access_hint">Permite accesul la cameră pentru a putea începe urmărirea mâinilor.</string> <string name="hand_camera_access_denied">Accesul la cameră este dezactivat. Activează-l din setările Android.</string> @@ -2634,6 +2842,12 @@ <string name="hand_camera_placement">Poziționarea camerei</string> <string name="hand_camera_placement_hint">Verifică dacă te vede camera înainte de a juca.</string> <string name="hand_camera_check">Verifică</string> + <string name="tracking_pack_title">Descărcare urmărire mâini</string> + <string name="tracking_pack_hint">Urmărirea mâinilor necesită o descărcare unică de %1$s.</string> + <string name="tracking_pack_download">Descarcă</string> + <string name="tracking_pack_retry">Reîncearcă</string> + <string name="tracking_pack_downloading">Se descarcă urmărirea mâinilor… %1$d%%</string> + <string name="tracking_pack_failed">Urmărirea mâinilor nu a putut fi descărcată. Verifică conexiunea și încearcă din nou.</string> <string name="hand_camera_check_title">Poziționarea camerei</string> <string name="hand_camera_how_rear">Așază dispozitivul vertical, la 1,5–2 metri distanță, cam la înălțimea pieptului, cu camera din spate îndreptată spre tine. Apoi intră în cadru cu mâinile întinse.</string> <string name="hand_camera_how_front">Așază dispozitivul vertical, la 1,5–2 metri distanță, cam la înălțimea pieptului, cu ecranul îndreptat spre tine. Apoi intră în cadru cu mâinile întinse.</string> @@ -2705,6 +2919,21 @@ <string name="storage_safe_hint">Medii de execuție nefolosite, resturi, jurnale vechi</string> <string name="storage_clean_up">Se curăță…</string> <string name="storage_session_running">Oprește sesiunea pentru a curăța sau șterge ceva. Dimensiunile rămân vizibile.</string> + <string name="storage_default_group">Locație de instalare</string> + <string name="storage_default_title">Stocare implicită</string> + <string name="storage_default_hint">Instalările noi din magazine merg în locația selectată. Jocurile existente rămân unde sunt. Bibliotecile Steam își păstrează propria setare.</string> + <string name="storage_default_ask">Întreabă de fiecare dată</string> + <string name="storage_default_ask_detail">Alege o destinație pentru fiecare instalare</string> + <string name="storage_default_internal">Stocare internă</string> + <string name="storage_default_external">Stocare externă</string> + <string name="storage_default_external_detail">%1$s · %2$s liber</string> + <string name="storage_default_external_missing">Neconectat</string> + <string name="storage_default_folder">Folder · %1$s</string> + <string name="storage_default_folder_free">%1$s liber</string> + <string name="storage_default_folder_missing">Neconectat</string> + <string name="storage_default_choose_folder">Alege un folder…</string> + <string name="storage_default_choose_folder_detail">Folosește orice folder de pe un card SD sau o unitate USB</string> + <string name="storage_default_note">Jocurile sunt puse într-un folder Games din locația selectată. Jocurile existente nu sunt mutate.</string> <string name="storage_where">Unde ajunge</string> <string name="storage_games">Jocuri Steam</string> <string name="storage_game_data">Datele jocurilor</string> @@ -2833,6 +3062,9 @@ <string name="storage_data_installed">Jocuri instalate</string> <string name="storage_data_parts">Prefixe %1$s · shadere %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Șterge shaderele</string> + <string name="storage_reset_prefix">Resetează prefixul</string> + <string name="storage_reset_prefix_title">Resetezi prefixul pentru %1$s?</string> + <string name="storage_reset_prefix_confirm">Șterge prefixul Wine (%1$s) din %2$s și îl recreează la următoarea lansare. Salvările, setările și pachetele redistribuibile instalate în el se pierd; salvările din Steam Cloud rămân în contul tău.</string> <string name="storage_data_leftovers">Jocuri șterse</string> <string name="storage_steam_app">Aplicația Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefixul mai conține fișiere, probabil salvări locale</string> @@ -3136,6 +3368,117 @@ <string name="spatial_saved_views_hint">Vizualizările salvate pot fi recalculate. Începe o nouă calibrare pentru a captura în sistemul de coordonate de urmărire curent.</string> <string name="spatial_model_checksum_error">Nepotrivire a sumei de control a modelului de mâini</string> <string name="spatial_opencv_load_error">OpenCV nu s-a putut încărca</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sincronizează cu Syncthing</string> + <string name="sync_enable_hint">Bazată pe Syncthing-Fork, aceasta este o implementare Syncthing care îți permite să sincronizezi fișierele din sistemul de fișiere intern al DroidDeck cu alte instanțe Syncthing. Este doar pentru fișierele pe care le păstrezi în sistemul de fișiere intern al DroidDeck.</string> + <string name="sync_missing">Această versiune nu include Syncthing.</string> + <string name="sync_starting">Se pornește Syncthing</string> + <string name="sync_status_starting">Se pornește</string> + <string name="sync_status_up_to_date">Actualizat</string> + <string name="sync_status_syncing">Se sincronizează</string> + <string name="sync_status_paused">Întrerupt</string> + <string name="sync_status_pausing">Se întrerupe</string> + <string name="sync_status_resuming">Se reia</string> + <string name="sync_status_attention">Necesită atenție</string> + <string name="sync_status_failed">Syncthing s-a oprit</string> + <string name="sync_failed_retry">Încearcă din nou</string> + <string name="sync_paused_wifi">Întrerupt până la Wi-Fi</string> + <string name="sync_paused_game">Întrerupt în timpul jocului</string> + <string name="sync_summary">Foldere: %1$d · dispozitive conectate: %2$d din %3$d</string> + <string name="sync_left">Rămas: %1$s</string> + <string name="sync_open_web_ui">Deschide interfața web</string> + <string name="sync_pause">Întrerupe</string> + <string name="sync_resume">Reia</string> + <string name="sync_running">Rulează</string> + <string name="sync_running_hint">Dezactivează pentru a opri complet Syncthing.</string> + <string name="sync_this_device">Acest dispozitiv</string> + <string name="sync_device_id">ID dispozitiv</string> + <string name="sync_show_qr">Arată codul QR</string> + <string name="sync_advanced">Avansat</string> + <string name="sync_advanced_hint">Porturi, când să ruleze, resetare</string> + <string name="sync_open">Deschide</string> + <string name="sync_waiting">Te așteaptă</string> + <string name="sync_pending_device">%1$s vrea să se conecteze</string> + <string name="sync_pending_folder">%1$s vrea să partajeze „%2$s”</string> + <string name="sync_pending_folder_hint">Acceptă pentru a alege unde este salvat în DroidDeck.</string> + <string name="sync_review">Verifică în interfața web</string> + <string name="sync_folders">Foldere</string> + <string name="sync_no_folders">Niciun folder încă.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Actualizat</string> + <string name="sync_folder_syncing">Se sincronizează %1$d%%</string> + <string name="sync_folder_scanning">Se scanează</string> + <string name="sync_folder_paused">Întrerupt</string> + <string name="sync_folder_out_of_sync">Nesincronizat</string> + <string name="sync_folder_errors">Fișiere care nu s-au putut sincroniza: %1$d</string> + <string name="sync_folder_blocked">Blocat</string> + <string name="sync_folder_blocked_hint">Acest folder se află în afara spațiului de stocare DroidDeck, așa că DroidDeck l-a întrerupt. Pentru a sincroniza foldere din afara DroidDeck, folosește aplicația Syncthing-Fork.</string> + <string name="sync_remove_folder">Elimină din Syncthing</string> + <string name="sync_remove_folder_hint">Eliminarea nu șterge niciun fișier.</string> + <string name="sync_devices">Dispozitive</string> + <string name="sync_no_devices">Niciun dispozitiv încă.</string> + <string name="sync_connected">Conectat</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Văzut ultima dată %1$s</string> + <string name="sync_device_id_title">ID-ul acestui dispozitiv</string> + <string name="sync_device_id_hint">Pe celălalt dispozitiv, adaugă un dispozitiv în Syncthing și scanează acest cod sau lipește ID-ul. Apoi acceptă-l aici, în interfața web.</string> + <string name="sync_copy">Copiază</string> + <string name="sync_share">Partajează</string> + <string name="sync_done">Gata</string> + <string name="sync_off_title">Dezactivezi Syncthing?</string> + <string name="sync_off_body">Syncthing se oprește acum și rămâne oprit până când îl activezi din nou. Fișierele sincronizate rămân unde sunt.</string> + <string name="sync_off_forget">Șterge și configurația Syncthing</string> + <string name="sync_off_forget_hint">Elimină ID-ul acestui dispozitiv, folderele și dispozitivele. La reactivare, pornește de la zero.</string> + <string name="sync_turn_off">Dezactivează</string> + <string name="sync_ports">Porturi</string> + <string name="sync_port_sync">Sincronizare</string> + <string name="sync_port_discovery">Descoperire locală</string> + <string name="sync_repick">Alege porturi noi</string> + <string name="sync_repick_hint">Verificate din nou la fiecare pornire.</string> + <string name="sync_repick_button">Alege din nou</string> + <string name="sync_reset_group">Resetare</string> + <string name="sync_api_key">Cheie API</string> + <string name="sync_regenerate">Regenerează</string> + <string name="sync_reset">Resetează Syncthing</string> + <string name="sync_reset_hint">ID de dispozitiv nou, folderele și dispozitivele sunt eliminate. Fișierele din spațiul de stocare DroidDeck sunt păstrate.</string> + <string name="sync_reset_button">Resetează</string> + <string name="sync_reset_confirm_title">Resetezi Syncthing?</string> + <string name="sync_running_group">Rulare</string> + <string name="sync_run">Rulează</string> + <string name="sync_run_open">Cât timp DroidDeck este deschis</string> + <string name="sync_run_background">În fundal</string> + <string name="sync_wifi_only">Doar prin Wi-Fi</string> + <string name="sync_pause_games">Întrerupe în timpul jocurilor</string> + <string name="sync_logs">Jurnale</string> + <string name="sync_logs_hint">Ieșirea Syncthing pentru această sesiune</string> + <string name="sync_logs_share">Partajează</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Instalează mai întâi mediul de execuție Linux.</string> + <string name="sync_accept">Acceptă</string> + <string name="sync_accept_title">Salvează „%1$s” în</string> + <string name="sync_add_folder">Adaugă folder</string> + <string name="sync_add_folder_hint">Sincronizează un folder din spațiul de stocare DroidDeck</string> + <string name="sync_choose">Alege</string> + <string name="sync_add">Adaugă</string> + <string name="sync_add_failed">Folderul nu a putut fi adăugat.</string> + <string name="sync_share_with">Partajează cu</string> + <string name="sync_share_none">Niciun dispozitiv încă. Poți partaja acest folder mai târziu din interfața web.</string> + <string name="sync_use_folder">Folosește acest folder</string> + <string name="sync_new_folder">Folder nou</string> + <string name="sync_location_home">Directorul home al containerului</string> + <string name="sync_location_sync">Folderul Sync</string> + <string name="sync_location_shared">Stocarea partajată DroidDeck</string> + <string name="sync_location_card">DroidDeck pe %1$s</string> + <string name="sync_location_app">Datele aplicației DroidDeck</string> + <string name="sync_web_path_locked">Folderele noi sunt salvate în folderul Sync al DroidDeck. Pentru a sincroniza alt folder DroidDeck, folosește Adaugă folder din fila Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Reîncarcă</string> + <string name="sync_not_running">Syncthing nu rulează.</string> + <string name="session_end_steam_sigill">Steam s-a oprit cu o instrucțiune ilegală (SIGILL). Poate fi o problemă de compatibilitate a instrucțiunilor CPU sau o blocare a clientului. Partajează jurnalele împreună cu detaliile dispozitivului.</string> + <string name="session_end_steam_try_x64">Poți încerca Setări Steam → Client Steam → x86-64 (experimental). Necesită o descărcare suplimentară și poate rula mai lent.</string> + <string name="session_end_vulkan_device">Driverul grafic Linux nu a găsit un dispozitiv Vulkan utilizabil. Verifică dacă driverul GPU Linux selectat acceptă acest GPU.</string> + <string name="session_end_gpu_unsupported">Această sesiune nu poate porni deoarece acest GPU nu are un driver Vulkan Linux compatibil în configurația actuală. Driverele Adreno Turnip nu pot activa suportul pentru GPU-uri MediaTek/Mali.</string> <string name="setup_group_memory">Memorie</string> <string name="setup_clear_cached">Închide aplicațiile din cache înainte de o sesiune</string> <string name="setup_clear_cached_hint">La pornirea unei sesiuni, DroidDeck închide aplicațiile pe care Android le ține în fundal, ca jocul să aibă mai multă memorie. Depanarea wireless trebuie să fie activată.</string> @@ -3159,6 +3502,12 @@ <string name="epic_client_open">Deschide</string> <string name="epic_client_install">Instalează</string> <string name="game_tab_about">Despre</string> + <string name="game_resources_browser">Se deschide în browser</string> + <string name="game_resource_guides">Ghiduri</string> + <string name="game_resource_protondb_detail">Rapoarte de compatibilitate Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Pentru jocurile cu salvări în contul tău Steam</string> + <string name="game_resource_search">Căutare pe web</string> <string name="game_tab_install">Instalează</string> <string name="game_install_location">Locație</string> <string name="game_install_folder">Folder</string> @@ -3175,6 +3524,11 @@ <string name="stores_eyebrow_pass">disponibil cu %1$s</string> <string name="stores_owned_in_library">Jocuri deținute în Bibliotecă</string> <string name="library_filter_added">Adăugate</string> + <string name="library_filter">Filtru</string> + <string name="library_filter_installed">Doar instalate</string> + <string name="library_filter_all_owned">Toate jocurile deținute</string> + <string name="library_no_installed_matches">Niciun joc instalat nu corespunde acestor filtre.</string> + <string name="library_browse_owned">Răsfoiește jocurile deținute</string> <string name="game_tab_launch">Lansare</string> <string name="game_tab_saves_cloud">Salvări și cloud</string> <string name="game_launch_shortcut">Scurtătură Steam</string> @@ -3192,6 +3546,40 @@ <string name="stores_itch_update_replaced">Dezvoltatorul a înlocuit această versiune cu %1$s. Actualizezi la ea?</string> <string name="xbox_filter_cloud">Cloud</string> <string name="stores_xbox_cloud_settings">Setări cloud</string> + <string name="integration_title">Integrare Steam</string> + <string name="integration_count">%1$d din %2$d activate</string> + <string name="integration_set_up">Configurează</string> + <string name="integration_location">Locație</string> + <string name="integration_app_info">Informații despre aplicație</string> + <string name="integration_wifi">Nume Wi-Fi</string> + <string name="integration_brightness">Luminozitate</string> + <string name="integration_home">DroidDeck ca Acasă</string> + <string name="integration_shortcuts">Taste de sistem</string> + <string name="integration_wifi_hint">Afișează rețelele în Steam · necesită acces la locație, fără urmărire</string> + <string name="integration_wifi_on">Rețelele apar în Steam</string> + <string name="integration_wifi_location_off">Locația este dezactivată</string> + <string name="integration_wifi_denied">Locație refuzată · permite-o în Informații despre aplicație</string> + <string name="integration_brightness_hint">Glisorul din Steam setează luminozitatea ecranului</string> + <string name="integration_home_hint">Acasă deschide meniul Steam într-o sesiune</string> + <string name="integration_shortcuts_hint">Alt+Tab, tasta Win și butonul Acasă rămân în sesiune</string> + <string name="integration_shortcuts_maybe_restricted">Inactiv în Android? Informații despre aplicație → ⋮ → Permite setările restricționate</string> + <string name="integration_shortcuts_restricted">Blocat de Android · Informații despre aplicație → ⋮ → Permite setările restricționate</string> + <string name="integration_shortcuts_service">Taste de sistem DroidDeck</string> + <string name="integration_shortcuts_service_description">Păstrează Alt+Tab, tasta Win și butonul Acasă într-o sesiune DroidDeck activă în loc de Android.</string> + <string name="integration_brightness_needed">Activează Luminozitate în Configurare → Integrare Steam</string> + <string name="setup_gpu_bridge_off">Punte Mali: oprită</string> + <string name="setup_gpu_bridge_on">Punte Mali: pornită</string> + <string name="setup_gpu_bridge_detail">%1$s nu este Adreno. Puntea Vulkan experimentală este pornită: sesiunea desenează prin driverul propriu al telefonului. Așteaptă-te la erori; trimite jurnalele sesiunii.</string> + <string name="setup_bridge_safe">Mod sigur</string> + <string name="setup_bridge_safe_on">Mod sigur: pornit</string> + <string name="setup_bridge_safe_off">Mod sigur: oprit</string> + <string name="setup_bridge_safe_on_detail">Cel mai compatibil. Recomandat pentru un dispozitiv nou.</string> + <string name="setup_bridge_safe_off_detail">Mai rapid acolo unde acest GPU a trecut verificările.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automat</string> + <string name="setup_bridge_dxvk_proton">DXVK: al Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Folosește un DXVK mai vechi când Vulkan-ul acestui GPU este prea vechi pentru cel din Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Fiecare Proton își păstrează propriul DXVK, chiar dacă Vulkan-ul acestui GPU poate fi prea vechi pentru el.</string> <string name="apps_search_hint">Caută aplicații</string> <string name="apps_no_match">Nicio aplicație nu se potrivește cu „%1$s”.</string> <string name="apps_add_widget">Adaugă widget</string> @@ -3241,6 +3629,8 @@ <string name="desktop_restore_done_body">Aplicațiile adăugate de tine sunt instalate din nou.</string> <string name="desktop_restore_failed_title">O parte din software nu a putut fi restaurată</string> <string name="desktop_restore_failed_body">Vezi ~/.cache/droiddeck/apt-restore.log, apoi încearcă sudo apt install în Konsole.</string> + <string name="gog_full_files">Optimizările native nu sunt disponibile. Descărcarea include fișiere de înlocuire complete.</string> + <string name="gog_recover">Verifică rezultatul patch-ului</string> <string name="slow_usb_title">Conexiune USB lentă</string> <string name="slow_usb_cable">%1$s este conectat prin %2$s (%3$s Mbps, aproximativ %4$d MB/s), așa că jocurile de pe el se vor încărca lent. Folosește un cablu USB 3 de 5 Gbps sau mai rapid, încearcă să întorci mufa USB-C sau folosește o unitate mai rapidă.</string> <string name="slow_usb_port">%1$s este conectat prin %2$s (%3$s Mbps, aproximativ %4$d MB/s). Portul USB al acestui dispozitiv nu poate merge mai repede, așa că jocurile se vor încărca lent. Memoria internă sau un card microSD pot fi mai rapide.</string> @@ -3251,4 +3641,52 @@ <string name="steam_import_names_more">%1$s și încă %2$d</string> <string name="steam_import_now">Repornește acum</string> <string name="steam_import_later">Mai târziu</string> + <string name="gog_maintenance">Gestionează instalarea GOG</string> + <string name="gog_check">Caută actualizări</string> + <string name="gog_repair">Verifică/Repară</string> + <string name="gog_patches">Patch-uri offline</string> + <string name="gog_refresh">Descarcă programul de instalare offline complet</string> + <string name="gog_update">Actualizează la %1$s</string> + <string name="gog_resume">Reia întreținerea GOG</string> + <string name="gog_open_patch">Deschide programul de instalare a patch-ului</string> + <string name="gog_patch_in_session">Finalizează sau anulează instalarea patch-ului în sesiunea Linux.</string> + <string name="gog_patch_requirements">Alege un patch pentru versiunea și limba instalate. Versiunile sursă acceptate pot să nu fie listate.</string> + <string name="gog_no_patches">GOG nu are patch-uri Windows independente pentru acest joc.</string> + <string name="gog_managed_files">Fișierele de joc modificate pot fi înlocuite.</string> + <string name="gog_patch_installer_note">Programul de instalare se deschide în sesiunea ta Linux.</string> + <string name="gog_download_label">Descărcare</string> + <string name="gog_space_label">Spațiu suplimentar</string> + <string name="gog_space_estimate_label">Spațiu estimat</string> + <string name="gog_repair_action">Repară fișierele</string> + <string name="gog_refresh_action">Reîmprospătează instalarea</string> + <string name="gog_select_patch">Selectează</string> + <string name="stores_gamejolt_not_owned">Nu este în biblioteca ta Game Jolt</string> + <string name="stores_gamejolt_no_build">Nu există descărcare pentru Windows la acest joc</string> + <string name="stores_gamejolt_no_exe">Nu s-a găsit niciun joc Windows în descărcare</string> + <string name="stores_gamejolt_no_game">Jocul nu a fost găsit pe Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Nu s-au putut încărca jocurile de pe Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt a răspuns HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Descărcările de pe Game Jolt nu au putut fi încărcate</string> + <string name="stores_gamejolt_build_open">Deschide pe Game Jolt</string> + <string name="stores_gamejolt_archive">Arhivele %1$s nu sunt acceptate</string> + <string name="stores_gamejolt_extract_failed">Descărcarea nu a putut fi extrasă (cod %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Nu s-a putut contacta Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt nu a oferit un link de descărcare</string> + <string name="stores_gamejolt_section_featured">Recomandate</string> + <string name="stores_gamejolt_section_hot">În tendințe</string> + <string name="stores_gamejolt_section_best">Cele mai bune</string> + <string name="stores_gamejolt_section_new">Noi</string> + <string name="stores_gamejolt_price_under_30">30 $ sau mai puțin</string> + <string name="stores_gamejolt_os_other">Altele</string> + <string name="stores_gamejolt_maturity_everyone">Toate vârstele</string> + <string name="stores_gamejolt_maturity_teen">Adolescenți</string> + <string name="stores_gamejolt_maturity_adult">Adulți</string> + <string name="stores_gamejolt_status_complete">Finalizat</string> + <string name="stores_gamejolt_status_early">Acces anticipat</string> + <string name="stores_gamejolt_partners">Jocuri partenere</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Maturitate</string> + <string name="stores_gamejolt_filter_status">Stare</string> + <string name="stores_gamejolt_filter_partners">Parteneri</string> + <string name="stores_gamejolt_followed">Jocuri urmărite</string> </resources> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 636f297a7a..38d47aa156 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Параметры VKD3D для D3D12. nodxr отключает трассировку лучей; используйте только для игры, которой это нужно.</string> <string name="game_env_proton_log">Установите 1 для создания диагностического журнала Proton. Ведение журнала может снизить производительность и занять место.</string> <string name="game_env_wined3d">Установите 1, чтобы использовать WineD3D на базе OpenGL вместо DXVK для тестирования совместимости с D3D9–11.</string> + <string name="game_env_wined3d_renderer">Рендерер для DirectDraw, Direct3D 1-7 и игр, запущенных через WineD3D. Vulkan обходит путь OpenGL через Zink и намного быстрее для старых игр DirectDraw и Direct3D 7 на Adreno.</string> + <string name="game_env_dxvk_d3d8">Установите 1, чтобы запускать Direct3D 8 через DXVK вместо WineD3D. Быстрее в тесте Direct3D 8 из AIO Graphics Test на Adreno.</string> <string name="game_env_no_ntsync">Установите 1, чтобы не использовать ntsync (droiddeck-ntsync или драйвер ядра) для этой игры; тогда используется droiddeck-esync, если есть пакет, иначе droiddeck-fsync.</string> <string name="game_env_no_esync">Установите 1, чтобы отключить droiddeck-esync для этой игры; вместо него используется droiddeck-fsync или droiddeck-ntsync, если fsync тоже отключен.</string> <string name="game_env_no_fsync">Установите 1, чтобы не использовать droiddeck-fsync для этой игры; тогда используется droiddeck-esync, если есть пакет, иначе droiddeck-ntsync.</string> <string name="game_env_fsync_first">Установите 1, чтобы запускать эту игру на droiddeck-fsync, или 0, чтобы ставить droiddeck-esync первым, когда для ее Proton есть пакет.</string> <string name="game_env_xalia">Установите 0, чтобы отключить помощник навигации геймпада Proton для этой игры.</string> + <string name="game_env_anticheat_offline">Включено по умолчанию. Запускает игру с Easy Anti-Cheat без античита, если игра поддерживает офлайн-режим. Отключите, чтобы запускать через Easy Anti-Cheat как обычно. Онлайн-режимы, требующие Easy Anti-Cheat, остаются недоступны.</string> <string name="game_env_hud">Оверлей DXVK для D3D9–11. fps показывает частоту кадров; если не задано — оверлей скрыт.</string> <string name="game_env_dxvk_config">Настройки DXVK, разделенные точкой с запятой. В последних версиях используется dxvk.maxFrameRate для ограничения частоты кадров; для повседневной игры рекомендуется использовать ограничитель частоты кадров сессии.</string> + <string name="game_env_cores">Ядра CPU для этой игры, например 0-4 или 0,2,4, вместо ядер игры сессии. Меньше ядер — меньше нагрев.</string> <string name="game_env_vkd3d_limit">Ограничение частоты кадров D3D12. 0 отключает ограничение.</string> <string name="game_env_glthread">Многопоточность Mesa OpenGL. Для игр OpenGL с ограничением CPU значение true может помочь; тестируйте отдельно для каждой игры.</string> <string name="sync_backend_title">Синхронизация Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX запускает x86-программы Linux на этом ARM64-устройстве. «Авто» использует его, если программа собрана для x86.</string> <string name="app_fex_x86">%1$s через FEX</string> <string name="app_fex_not_ready">Эта программа собрана для ПК на %1$s и работает через FEX, который еще не настроен. Откройте Steam один раз, войдя в аккаунт: DroidDeck скачает через него FEX и нужную Steam Linux Runtime, после чего программа откроется.</string> + <string name="session_proot_missing">Не удалось скачать proot DroidDeck. Проверьте подключение и повторите попытку. Сессия не запущена, так как резервный proot слишком медленный для игры.</string> + <string name="session_directaudio_missing">Не удалось скачать DirectAudio, поэтому в этой сессии звук игр идёт по более медленному пути.</string> <string name="session_end_program">Эта программа</string> <string name="session_end_steam_download">Не удалось скачать клиент Steam. Возможно, ваша сеть или VPN блокирует серверы Steam; проверьте подключение и повторите попытку.</string> <string name="session_end_steam_setup">Не удалось настроить клиент Steam. Проверьте подключение и свободное место, затем повторите попытку.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Контроллер Xbox 360</string> <string name="mode_controller_note">Deck: кнопка быстрого доступа и гироскоп. Steam Controller: то же самое, с датчиком хвата на задних кнопках. DualShock 4 и DualSense: гироскоп, а трекпады работают как их тачпад. Xbox 360: используйте Guide+A для быстрого доступа.</string> <string name="mode_back">Назад</string> + <string name="back_hold">Удержание «Назад» для сочетаний Steam</string> + <string name="back_hold_hint">Удержание «Назад» открывает быстрый доступ или создаёт сочетания Steam с другими кнопками. Выключите, чтобы удержание игнорировалось; нажатие и двойное нажатие работают.</string> + <string name="back_native_qam_hint">Удерживайте «Назад» 700 мс или удерживайте «Назад» и нажмите другую кнопку для сочетаний Steam.</string> + <string name="back_double_tap_window">Интервал двойного нажатия</string> + <string name="back_tap_ms">%1$d мс</string> + <string name="brightness_permission_title">Разрешить управление яркостью</string> + <string name="brightness_permission_text">Настройте управление яркостью в DroidDeck.</string> <string name="back_menu_then_qam">Меню → QAM</string> <string name="back_qam_then_menu">QAM → Меню</string> <string name="mode_session">Сессия</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Откладывает приостановку в фоне, пока Steam что-то скачивает.</string> <string name="mode_suspend_note">Авто: пауза в фоне и возобновление при показе. Вручную: ждет нажатия «Продолжить». Никогда: сессия продолжает работать.</string> <string name="mode_startup">Запуск</string> - <string name="mode_steam_startup">Запускать Steam при открытии DroidDeck</string> - <string name="mode_steam_startup_hint">Открывает сессию Steam при запуске DroidDeck.</string> + <string name="mode_startup_session">Открывать при запуске</string> + <string name="mode_startup_session_hint">Запускает этот сеанс при запуске DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Проверка выпусков…</string> <string name="mode_decky_ready">Готово к установке %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Актуально · %1$s</string> <string name="mode_decky_loader">Загрузчик</string> <string name="mode_decky_install_latest">Установить последнюю</string> + <string name="decky_channel">Канал обновлений</string> + <string name="decky_channel_hint">Какие выпуски Decky Loader устанавливать. Встроенное средство обновления Decky использует тот же канал.</string> + <string name="decky_channel_stable">Стабильный</string> + <string name="decky_channel_prerelease">Предварительный</string> + <string name="decky_channel_testing">Тестовый</string> + <string name="decky_channel_failed">Не удалось сохранить канал обновлений Decky</string> <string name="mode_decky_on">Запускается вместе со Steam. Пока включено, другие приложения на этом устройстве могут управлять Steam.</string> <string name="mode_decky_off">Выкл. Порт удаленной отладки Steam остается закрытым.</string> <string name="mode_decky_remove_title">Удалить Decky Loader?</string> @@ -325,6 +344,8 @@ <string name="mode_mangoapp_hint">Отключите, если игры вылетают или показывают черный экран в режиме Deck. Вступит в силу в следующей сессии.</string> <string name="mode_return_after_game">Возвращаться в DroidDeck после игры</string> <string name="mode_return_after_game_hint">Когда игра, запущенная из DroidDeck или другого лаунчера, закрывается, Steam корректно завершает работу (сначала синхронизирует облачные сохранения), и вы возвращаетесь туда. Выкл.: остаётесь в Steam.</string> + <string name="mode_shader_precache">Предварительное кэширование шейдеров</string> + <string name="mode_shader_precache_hint">Steam скачивает готовые шейдеры для ваших игр и обрабатывает их в фоне, поэтому игры меньше подтормаживают. Если отключено, экономятся трафик, место и батарея; игры собирают шейдеры прямо во время игры. Это та же настройка, что и «Загрузки > Предварительное кэширование шейдеров» в Steam. Применится в следующей сессии.</string> <string name="mode_steam_repair">Восстановить клиент Steam</string> <string name="mode_steam_repair_hint">При следующем запуске Steam клиент будет скачан заново. Используйте, если Steam зависает на экране загрузки. Игры, вход и настройки сохраняются.</string> <string name="mode_steam_repair_queued">Клиент Steam будет скачан заново при следующем запуске Steam.</string> @@ -394,6 +415,8 @@ <string name="mode_directaudio_hint">Обходит PulseAudio для снижения задержки.</string> <string name="mode_mic">Микрофон</string> <string name="mode_mic_hint">Используется для голосового чата.</string> + <string name="drawer_mic_hint">Включить или отключить захват микрофона в этой сессии.</string> + <string name="drawer_mic_failed">Не удалось изменить микрофон. Повторите попытку.</string> <string name="mode_network">Сеть</string> <string name="mode_wifi_discovery">Обнаружение Wi-Fi</string> <string name="mode_wifi_discovery_hint">Показывает названия сетей Wi-Fi и сети поблизости в Steam.</string> @@ -557,6 +580,16 @@ <string name="perf_gsrealtime">gamescope: очередь GPU в реальном времени</string> <string name="perf_gsrealtime_hint">Повышает приоритет работы GPU композитора. Может улучшить стабильность времени кадра, но потребляет часть производительности игры.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Память</string> + <string name="perf_cap_off">Выкл.</string> + <string name="perf_cap_auto">По умолчанию драйвера</string> + <string name="perf_zram_client">Сжимать Steam во время игры</string> + <string name="perf_zram_client_hint">Через 20 с после запуска игры клиент Steam сжимается в zRAM, чтобы оставить игре больше памяти, и считывается обратно после закрытия игры. Отключите, если сессия закрывается вскоре после запуска игр. Лимит RAM выше всё равно сжимает Steam, когда сессия его превышает.</string> + <string name="perf_ram_cap">Лимит RAM</string> + <string name="perf_ram_cap_hint">Действует, пока работает клиент Steam, в режиме Steam или с рабочего стола. Когда сессия использует больше этого значения, Steam, а затем другие поддерживаемые процессы сессии сжимаются в zRAM. Мягкий лимит: ничего не закрывается, но игры могут подтормаживать, пока страницы возвращаются.</string> + <string name="perf_ram_cap_unavailable">Нужен своп zRAM, которого на этом устройстве нет.</string> + <string name="perf_vram_cap">Лимит VRAM</string> + <string name="perf_vram_cap_hint">Объём видеопамяти, который DXVK сообщает играм Direct3D, чтобы они рассчитывали текстуры на меньший объём. Собственные настройки DXVK игры имеют приоритет. Вступит в силу в следующей сессии.</string> <string name="perf_gpuclock">Поддерживать максимальную частоту GPU</string> <string name="perf_gpuclock_hint">Только для Adreno. Меньше подтормаживаний, но больше энергопотребления и нагрева.</string> <string name="perf_fixes">Исправления сессии</string> @@ -575,6 +608,8 @@ <string name="perf_fastpath">Быстрый путь proot</string> <string name="perf_fastpath_needs_seccomp">Требуется фильтр seccomp для proot.</string> <string name="perf_fastpath_hint">Быстрый поиск файлов, меньше подтормаживаний. Отключите, если программа не находит файлы.</string> + <string name="perf_cursor_composite">Рисовать курсор внутри gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope сам отрисовывает указатель, а не передаёт его Android. Включите для курсора, управляемого контроллером. На телефоне быстрее, если отключено. Применится в следующей сессии.</string> <string name="perf_identity">Имя сессии</string> <string name="perf_hostname">Имя хоста</string> <string name="perf_hostname_hint">Имя, под которым Steam видит это устройство. Оставьте пустым, чтобы вернуть %1$s.</string> @@ -589,6 +624,8 @@ <string name="driver_delete_plain">Файлы будут удалены из приложения.</string> <string name="driver_delete_in_use">Файлы будут удалены. Поскольку драйвер используется, будет применен драйвер по умолчанию.</string> <string name="drawer_page_display">Экран</string> + <string name="drawer_frame_limit">Ограничение кадров</string> + <string name="drawer_frame_limit_note">Ограничивает эту игру. Экран переключается на частоту обновления, которая делится на ограничение без остатка, если такая есть; при других ограничениях движение может быть неровным. Игры Steam используют ограничение кадров Steam в меню быстрого доступа.</string> <string name="drawer_page_effects">Эффекты</string> <string name="drawer_page_controls">Управление</string> <string name="drawer_page_components">Компоненты</string> @@ -620,8 +657,11 @@ <string name="hud_size_pill">Капсула</string> <string name="hud_size_minimal">Минимальный</string> <string name="hud_size_mega">Мега</string> + <string name="hud_size_strip">Полоса</string> <string name="hud_locked">Закрепить на месте</string> <string name="hud_locked_hint">Перетащите HUD, чтобы переместить его; долгое нажатие закрепляет или открепляет его. Пока он закреплён, экранные элементы управления под ним продолжают работать.</string> + <string name="hud_snap">Прилипание к бокам</string> + <string name="hud_snap_hint">Отпустите HUD, и он переместится к ближайшей стороне экрана. Резкий жест отбросит его в ту сторону.</string> <string name="hud_group_look">Внешний вид</string> <string name="hud_scale">Размер на экране</string> <string name="hud_color_soft">Мягкий</string> @@ -670,7 +710,6 @@ <string name="hud_export_failed">Не удалось сохранить отчет HUD.</string> <string name="hud_reset">Сбросить настройки HUD</string> <string name="hud_reset_button">Сбросить</string> - <string name="hud_credit">FusionHUD от The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Режим масштабирования</string> <string name="drawer_scaling_sharpness">Резкость масштабирования</string> <string name="drawer_effects">Экранные эффекты</string> @@ -705,11 +744,17 @@ <string name="drawer_touch_auto">Авто (%1$s)</string> <string name="drawer_keyboard">Клавиатура</string> <string name="drawer_latency">Задержка</string> + <string name="drawer_low_latency">Режим низкой задержки</string> + <string name="drawer_low_latency_hint">Увеличивает нагрузку на CPU и расход батареи</string> <string name="drawer_low_latency_controller">Контроллер с низкой задержкой</string> <string name="drawer_low_latency_controller_hint">Контроллер опрашивается на 1000 Гц вместо 250 Гц. Немного больше нагрузки на CPU.</string> <string name="drawer_low_latency_touch">Сенсор с низкой задержкой</string> <string name="drawer_low_latency_touch_hint">Касания идут без объединения кадров; сенсорное управление Steam работает на 1000 Гц. Немного больше нагрузки на CPU.</string> <string name="drawer_evdev_mouse">Сырой канал мыши</string> + <string name="drawer_relative_mouse">Относительная мышь</string> + <string name="drawer_relative_mouse_auto">Автоматически</string> + <string name="drawer_relative_mouse_on">Включено</string> + <string name="drawer_relative_mouse_off">Выключено</string> <string name="drawer_direct_cursor">Курсор</string> <string name="drawer_pc_keyboard">Клавиатура ПК</string> <string name="drawer_android_keyboard">Android</string> @@ -799,6 +844,10 @@ <string name="setup_session">Сессия</string> <string name="setup_logs">Журналы сессии</string> <string name="setup_logs_hint">Сохраняется после каждой сессии</string> + <string name="setup_game_debug_logs">Журналы отладки игр</string> + <string name="setup_game_debug_logs_hint">Добавлять диагностику Proton, Wine и графики при следующем запуске игры. Может снизить производительность и занять больше места.</string> + <string name="setup_game_debug_logs_restart">Перезапустите сессию, чтобы сохранять журналы отладки игр</string> + <string name="setup_logging_update_failed">Не удалось обновить журналирование. Проверьте переключатель и повторите попытку.</string> <string name="setup_agent_commands">Инструменты отладки</string> <string name="setup_latest_logs">Последние журналы сессии</string> <string name="setup_saved_logs">Сохраненные журналы сессии</string> @@ -830,20 +879,22 @@ <string name="setup_home">Использовать как главный экран</string> <string name="setup_home_on">DroidDeck может использоваться как приложение главного экрана</string> <string name="setup_home_off">DroidDeck не будет доступен как приложение главного экрана</string> + <string name="setup_home_game_space_first">В разделе «Добавить игры» переключите DroidDeck на «Включить»</string> <string name="setup_orientation">Ориентация</string> + <string name="setup_launcher_orientation">Ориентация лаунчера</string> + <string name="setup_launcher_orientation_auto">Следовать повороту устройства</string> + <string name="setup_orientation_portrait">Портретная</string> + <string name="setup_session_orientation">Ориентация сессии</string> + <string name="setup_session_orientation_hint">Применяется к Steam, играм, рабочему столу и редактору контроллера. Предустановки разрешения поворачиваются вместе с сессией; свои ширина и высота остаются как введены.</string> <string name="setup_orientation_auto">Альбомная (авто)</string> <string name="setup_orientation_landscape">Альбомная</string> <string name="setup_orientation_reverse">Перевернутая альбомная</string> <string name="setup_fullscreen">Полноэкранный режим</string> <string name="setup_fullscreen_on">Скрывает строку состояния и панель навигации Android</string> <string name="setup_fullscreen_off">Показывает строку состояния и панель навигации Android</string> - <string name="setup_dual_screen">Два экрана</string> - <string name="setup_dual_screen_hint">Автоматически — использует второй экран на портативных устройствах со встроенным вторым экраном. Вкл. — использует любой второй дисплей. Выкл. — всё остаётся на одном экране.</string> <string name="setup_dual_screen_auto">Автоматически</string> <string name="setup_dual_screen_on">Вкл.</string> <string name="setup_dual_screen_off">Выкл.</string> - <string name="setup_dual_screen_menu">Меню на нижнем экране</string> - <string name="setup_dual_screen_menu_hint">Переносит разделы и меню в игре на второй экран, и ввод выполняется там, поэтому верхний экран остаётся полностью свободным. L2 и R2 переключают разделы.</string> <string name="setup_dual_screen_controls">Управление на нижнем экране в играх</string> <string name="setup_dual_screen_controls_hint">Открывает тачпад и клавиатуру на втором экране при запуске сеанса.</string> <string name="dual_typing_title">Ввод для верхнего экрана</string> @@ -999,8 +1050,16 @@ <string name="gate_needs_notifications">Код сопряжения придет в уведомлении. Разрешите DroidDeck отправлять уведомления или используйте «Другие способы».</string> <string name="gate_allow_notifications">Разрешить уведомления</string> <string name="gate_step1">Откройте Настройки → Для разработчиков → Отладка по Wi-Fi и включите ее</string> - <string name="gate_step2">Нажмите «Сопряжение устройства с помощью кода»</string> + <string name="gate_step2">Нажмите «Подключить устройство с помощью кода подключения»</string> <string name="gate_step3">Введите код сопряжения в уведомлении DroidDeck</string> + <string name="pairguide_build_number">В разделе «О телефоне» нажмите «Номер сборки» 7 раз</string> + <string name="pairguide_wireless">Включите «Отладку по Wi-Fi»</string> + <string name="pairguide_pair">Откройте «Отладку по Wi-Fi» и нажмите «Подключить устройство с помощью кода подключения»</string> + <string name="pairguide_child_process">Включите «Отключить ограничения дочерних процессов»</string> + <string name="pairguide_row_child_process">Отключить ограничения дочерних процессов</string> + <string name="pairguide_row_build_number">Номер сборки</string> + <string name="pairguide_row_wireless">Отладка по Wi-Fi</string> + <string name="pairguide_row_pair">Подключить устройство с помощью кода подключения</string> <string name="gate_waiting">Ожидание окна сопряжения…</string> <string name="gate_code_needed">Окно найдено. Введите код сопряжения из него в уведомление.</string> <string name="gate_status">Статус</string> @@ -1139,7 +1198,6 @@ <string name="games_never_played">Никогда не запускалась</string> <string name="games_runtime_busy_percent">Среда выполнения занята · %1$d%%</string> <string name="games_runtime_busy">Среда выполнения занята</string> - <string name="games_runtime_first_play">Среда выполнения установится при первом запуске игры</string> <string name="games_runtime_update">Доступно обновление среды выполнения</string> <string name="games_runtime_ready">● Среда выполнения готова</string> <string name="games_internal">Внутреннее хранилище</string> @@ -1156,6 +1214,9 @@ <string name="gpu_hide_other">Скрыть драйверы других GPU</string> <string name="gpu_show_other">Показать драйверы других GPU</string> <string name="gpu_advanced">Дополнительно</string> + <string name="gpu_ubwc_title">Совместимость UBWC</string> + <string name="gpu_ubwc_hint">Попробуйте «Вкл.» или «Выкл.», если в Steam или Android появляются полосы или мерцание. Применяется к обоим драйверам после перезапуска DroidDeck.</string> + <string name="gpu_ubwc_restart">Перезапустите DroidDeck, чтобы применить.</string> <string name="gpu_set_with_display">Настраивается вместе с драйвером дисплея: %1$s включает оба.</string> <string name="gpu_set_with_runtime">Настраивается вместе с драйвером среды выполнения: %1$s включает оба.</string> <string name="gpu_runtime_hint">Используется играми и рабочим столом.</string> @@ -1264,10 +1325,15 @@ <string name="pip_auto">Автоматически переходить в режим PiP</string> <string name="unfolded_controls">Управление на разложенном экране</string> <string name="unfolded_controls_hint">В разложенном виде игра находится над тачпадами и грипсами Steam Deck. В сложенном — игра на весь экран.</string> + <string name="unfolded_controls_with_controller">Оставлять с контроллером</string> + <string name="unfolded_controls_with_controller_hint">Показывать это сенсорное управление и при подключённом контроллере.</string> <string name="pip_suspended">Приостановлено</string> <string name="pip_not_ready">PiP станет доступен после готовности сессии.</string> <string name="pip_permission">Разрешите DroidDeck использовать PiP в настройках Android.</string> <string name="pip_unavailable">Android не может открыть PiP.</string> + <string name="game_more">Ещё</string> + <string name="game_edit_art">Изменить обложку</string> + <string name="stores_in_steam_label">В Steam</string> <string name="game_shortcut">Ярлык</string> <string name="game_shortcut_add">Добавить на главный экран</string> <string name="game_shortcut_choose">Выбрать игру</string> @@ -1291,6 +1357,10 @@ <string name="main_wait_runtime">Дождитесь завершения операции со средой выполнения</string> <string name="main_wait_proton_install">Дождитесь завершения установки инструмента совместимости</string> + <string name="load_compat_title">Подготовка инструментов совместимости</string> + <string name="load_compat_wait">Ожидание завершения настройки совместимости</string> + <string name="load_compat_hint">Сессия запустится, когда настройка завершится.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Дождитесь завершения установки приложения рабочего стола</string> <string name="main_wait_install_game">Дождитесь завершения установки, прежде чем запускать игру</string> <string name="main_saves_close_session">Сначала закройте сессию Steam, чтобы игра не записала свои сохранения поверх импортированных</string> @@ -1335,6 +1405,9 @@ <string name="main_install_anyway">Все равно установить</string> <string name="main_remove_runtime_title">Удалить среду выполнения Linux</string> <string name="main_remove_runtime_text">Будут удалены среда выполнения, клиент Steam в ней и все установленные туда игры.</string> + <string name="runtime_actions_title">Среда выполнения Linux</string> + <string name="runtime_actions_text">Восстановление переустанавливает системные файлы среды выполнения и сохраняет Steam, ваши игры и настройки. Дополнения, например рабочий стол, установятся снова при следующем использовании. Удаление стирает всё.</string> + <string name="runtime_repair">Восстановить среду выполнения</string> <string name="main_applied">Применено: %1$s</string> <string name="android_app_open_failed_primary">Не удалось открыть %1$s на главном экране</string> <string name="android_app_open_failed_on">Не удалось открыть %1$s на экране «%2$s»</string> @@ -1470,6 +1543,13 @@ <string name="session_runtime_catalog_unreachable">Не удалось получить каталог сред выполнения. Проверьте подключение и снова нажмите Play.</string> <string name="session_runtime_install_failed">Среда выполнения Linux не установилась. Проверьте ее на странице «Настройка» и снова нажмите Play.</string> <string name="session_desktop_install_failed">Рабочий стол не установился (%1$s). Проверьте подключение и снова нажмите «Рабочий стол».</string> + <string name="session_package_resume_failed">Не удалось завершить прерванную установку (%1$s). Проверьте подключение и свободное место, затем повторите попытку.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Среда выполнения Linux повреждена: %1$d ссылка на библиотеку указывает на отсутствующий файл (%2$s), обычно после прерванной установки. Восстановление сохранит ваши игры и настройки.</item> + <item quantity="few">Среда выполнения Linux повреждена: %1$d ссылки на библиотеки указывают на отсутствующие файлы (%2$s и другие), обычно после прерванной установки. Восстановление сохранит ваши игры и настройки.</item> + <item quantity="many">Среда выполнения Linux повреждена: %1$d ссылок на библиотеки указывают на отсутствующие файлы (%2$s и другие), обычно после прерванной установки. Восстановление сохранит ваши игры и настройки.</item> + <item quantity="other">Среда выполнения Linux повреждена: %1$d ссылки на библиотеки указывают на отсутствующие файлы (%2$s и другие), обычно после прерванной установки. Восстановление сохранит ваши игры и настройки.</item> + </plurals> <string name="session_ended_named">Работа %1$s неожиданно прервалась. Приложите журналы к отчету об ошибке или попробуйте снова.</string> <string name="session_ended_program">Программа неожиданно завершила работу. Приложите журналы к отчету об ошибке или попробуйте снова.</string> <string name="session_ended_desktop">Рабочий стол неожиданно завершил работу. Приложите журналы к отчету об ошибке или попробуйте снова.</string> @@ -1486,6 +1566,15 @@ <string name="mode_decky_plugins_hint">Установите ZIP-архив плагина для следующей сессии Steam.</string> <string name="mode_decky_plugin_downloading">Загрузка…</string> <string name="mode_decky_plugin_install_zip">Установить из ZIP</string> + <string name="decky_zip_warning_title">Установка стороннего плагина</string> + <string name="decky_zip_warning_text">Команда Decky Loader не проверяла этот плагин. Он может содержать вредоносное ПО, например программы для кражи вашего аккаунта Steam или повреждения устройства. Устанавливая этот плагин, вы соглашаетесь, что берёте на себя все риски для вашего устройства.</string> + <string name="decky_zip_warning_continue">Продолжить</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Подождите %1$d секунду</item> + <item quantity="few">Подождите %1$d секунды</item> + <item quantity="many">Подождите %1$d секунд</item> + <item quantity="other">Подождите %1$d секунды</item> + </plurals> <string name="store_cat_games">Игры</string> <string name="store_cat_audio_video">Аудио и видео</string> <string name="store_cat_graphics">Графика</string> @@ -1657,6 +1746,8 @@ <string name="fm_accept">Принять</string> <string name="fm_decline">Отклонить</string> <string name="fm_drive_not_readable">%1$s: подключено, но сейчас недоступно для чтения</string> + <string name="fm_drive_access_title">Разрешить доступ к %1$s</string> + <string name="fm_drive_access_text">Android позволяет DroidDeck видеть этот диск, но не читать его. Включите для DroidDeck доступ ко всем файлам и вернитесь.</string> <string name="fm_list_view">Список</string> <string name="fm_grid_view">Сетка</string> <string name="fm_search">Поиск</string> @@ -1730,6 +1821,89 @@ <string name="second_mode_keyboard_trackpad">Клавиатура + тачпад</string> <string name="second_mode_terminal">Терминал</string> <string name="second_mode_deck_controls">Грипсы и тачпады Deck</string> + <string name="second_mode_dashboard">Дашборд</string> + <string name="bottom_dashboard_empty">Здесь пока ничего нет.</string> + <string name="bottom_page_downloads">Загрузки</string> + <string name="bottom_downloads_none">Нет активных загрузок.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Загрузка кэша шейдеров</string> + <string name="bottom_downloads_paused">Приостановлено</string> + <string name="bottom_downloads_queued">Ожидает начала</string> + <string name="bottom_page_notifications">Уведомления</string> + <string name="bottom_notifications_listener">Нижний экран DroidDeck</string> + <string name="bottom_notifications_why">Показывает сообщения и другие уведомления здесь, пока вы играете. Они отображаются только на этом экране и не сохраняются. Android спросит один раз: на этом экране откроется страница доступа к уведомлениям; включите там DroidDeck, и эта страница вернется сама.</string> + <string name="bottom_notifications_allow">Разрешить доступ к уведомлениям</string> + <string name="bottom_notifications_none">Нет уведомлений.</string> + <string name="bottom_notifications_count">Уведомлений: %1$d</string> + <string name="bottom_notifications_clear">Очистить</string> + <string name="bottom_page_screenshots">Скриншоты</string> + <string name="stats_fps_needs_hud">Для FPS нужно включить HUD</string> + <string name="stats_speed">Скорость</string> + <string name="stats_pedals">Педали</string> + <string name="stats_gforce">Перегрузка</string> + <string name="stats_timing">Время</string> + <string name="stats_best_lap">Лучший круг</string> + <string name="stats_tires">Шины, °C</string> + <string name="stats_trace">Газ и тормоз за последние 10 s</string> + <string name="stats_speed_chart">Скорость, %1$s</string> + <string name="stats_gear">Передача</string> + <string name="stats_steam_client_arm">Клиент Steam ARM</string> + <string name="stats_steam_client_x86">Клиент Steam x86</string> + <string name="stats_throttle">Газ</string> + <string name="stats_brake">Тормоз</string> + <string name="stats_lights">Приборная панель</string> + <string name="stats_lamp_shift">Переключение</string> + <string name="stats_lamp_handbrake">Ручник</string> + <string name="stats_lamp_pit">Ограничитель скорости</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Турбо %1$s bar</string> + <string name="stats_engine_temp">Двигатель %1$s °C</string> + <string name="stats_oil_temp">Масло %1$s °C</string> + <string name="stats_power">Распределитель энергии</string> + <string name="stats_fuel_t">Топливо, t</string> + <string name="stats_fuel_main">Основное %1$s t</string> + <string name="stats_fuel_reserve">Резерв %1$s t</string> + <string name="bottom_telemetry_send_title">Передавать данные на дашборд</string> + <string name="bottom_telemetry_send_auto">Автоматически</string> + <string name="bottom_telemetry_send_auto_hint">Включает передачу для всех игр в этом списке, в том числе найденных позже. Игры, для которых вы ее выключили, остаются выключенными.</string> + <string name="bottom_telemetry_send_note">Это меняет собственную настройку вывода данных в игре. Изменение вступит в силу при следующем запуске игры; при выключении восстанавливается прежняя настройка.</string> + <string name="bottom_telemetry_send_close">Закройте %1$s, чтобы изменить это.</string> + <string name="bottom_telemetry_send_failed">Не удалось изменить настройки %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: включите %2$s в настройках игры, указав IP 127.0.0.1 и порт %3$d.</string> + <string name="bottom_shots_where">Сохраняются в Pictures/DroidDeck. Скриншоты Steam тоже отображаются здесь.</string> + <string name="bottom_shots_take">Сделать скриншот</string> + <string name="bottom_shots_saved">Скриншот сохранен.</string> + <string name="bottom_shots_failed">Не удалось сделать скриншот.</string> + <string name="bottom_shots_none">Скриншотов пока нет.</string> + <string name="bottom_page_chat">Чат и голос</string> + <string name="bottom_chat_why">Читайте чат Steam и отвечайте в нем здесь, пока игра продолжает работать на основном экране. Используется аккаунт, в который выполнен вход в Steam.</string> + <string name="bottom_chat_not_signed_in">У Steam пока нет веб-входа, которым можно поделиться, поэтому войдите здесь один раз.</string> + <string name="bottom_chat_stopped">Android закрыл страницу чата, пока DroidDeck работал в фоне. Она откроется снова, когда вы вернетесь в DroidDeck.</string> + <string name="bottom_chat_open">Открыть Steam Chat</string> + <string name="bottom_chat_close">Закрыть чат</string> + <string name="bottom_chat_mic_on">Микрофон вкл.</string> + <string name="bottom_chat_mic_off">Микрофон выкл.</string> + <string name="bottom_chat_mic_unavailable">Микрофон для этой игры выключен. Чтобы говорить, включите «Микрофон» в настройках Steam в DroidDeck (Аудио) и запустите игру снова.</string> + <string name="bottom_chat_volume">Громкость %1$d%%</string> + <string name="bottom_page_telemetry">Игровая статистика</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Батарея</string> + <string name="bottom_telemetry_lap">Круг</string> + <string name="bottom_telemetry_position">Позиция</string> + <string name="bottom_telemetry_this_lap">Текущий круг</string> + <string name="bottom_telemetry_last_lap">Прошлый круг</string> + <string name="bottom_telemetry_fuel">Топливо</string> + <string name="bottom_telemetry_cargo">Груз</string> + <string name="bottom_telemetry_pips">Деления SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Правовой статус</string> + <string name="bottom_telemetry_balance">Баланс</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Порт %1$d получает данные (пакетов: %2$d, размер: %3$d байт), но в формате, который эта страница пока не умеет читать.</string> + <string name="bottom_telemetry_port_busy">Порт %1$s уже занят другой программой, поэтому эта игра не может отображаться здесь.</string> <string name="rtinst_removing">Удаление среды выполнения Linux</string> <plurals name="rtinst_removing_entries"> @@ -1762,6 +1936,7 @@ <string name="flatpakmgr_not_ready">Сначала настройте Flatpak</string> <string name="flatpakmgr_starting">Запуск</string> <string name="flatpakmgr_exit_status">Flatpak завершился с кодом %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s собрано для %2$s, а DroidDeck не может это запустить. Приложениям Flatpak здесь нужна сборка для ARM64 или x86_64.</string> <string name="flatpakmgr_installing">Установка %1$s</string> <string name="flatpakmgr_updating">Обновление %1$s</string> <string name="flatpakmgr_removing">Удаление %1$s</string> @@ -1855,6 +2030,7 @@ <string name="adbpair_applying">Применение настройки…</string> <string name="adbpair_command_failed">Ошибка команды отладки по Wi-Fi</string> <string name="adbpair_channel_name">Настройка отладки по Wi-Fi</string> + <string name="adbpair_progress_channel_name">Ход настройки отладки по Wi-Fi</string> <string name="adbpair_channel_description">Запрашивает код сопряжения для отладки по Wi-Fi, пока открыты Настройки</string> <string name="adbpair_title_pair">Сопряжение отладки по Wi-Fi</string> <string name="adbpair_waiting_text">Включите отладку по Wi-Fi и нажмите «Сопряжение устройства с помощью кода».</string> @@ -1963,6 +2139,7 @@ <string name="gpuinfo_not_adreno">GPU не Adreno</string> <string name="gpuinfo_supported">Поддерживается</string> <string name="gpuinfo_experimental">Экспериментально: его драйверы — тестовые сборки</string> + <string name="gpuinfo_a850_experimental">Экспериментальная поддержка Adreno 850: требуются совместимые экспериментальные драйверы дисплея и игр; не проверено на этом устройстве</string> <string name="gpuinfo_below_tested">Ниже проверенного оборудования (Adreno 725 и новее): может не работать</string> <string name="gpuinfo_unsupported">Не поддерживается: DroidDeck требует GPU Adreno (Snapdragon)</string> @@ -2059,6 +2236,7 @@ <string name="display_look_filter">%1$s Устанавливает масштабирование: %2$s.</string> <string name="display_match_screen">По размеру экрана (%1$d×%2$d)</string> <string name="display_follow_screen">По экрану (меняется при складывании и раскладывании)</string> + <string name="display_follow_screen_scaled">Масштаб %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Показать сведения об устройстве</string> <string name="device_info_hide">Скрыть сведения об устройстве</string> @@ -2165,6 +2343,13 @@ <string name="stores_resume">Продолжить</string> <string name="stores_refresh">Обновить</string> <string name="stores_sort">Сортировка</string> + <string name="setup_rail_labels">Подписи боковой панели</string> + <string name="setup_rail_labels_hint">Показывать названия под значками боковой панели. Отключите, чтобы сделать панель уже.</string> + <string name="library_display">Вид</string> + <string name="library_display_larger">Крупные карточки</string> + <string name="library_display_smaller">Мелкие карточки</string> + <string name="library_display_title">Показывать название</string> + <string name="library_display_size">Показывать размер</string> <string name="stores_sort_last_played">Недавно запущенные</string> <string name="stores_sort_recently_installed">Недавно установленные</string> <string name="stores_sort_title_asc">Название А–Я</string> @@ -2291,6 +2476,9 @@ <string name="stores_download_manager">Менеджер загрузок</string> <string name="stores_parallel">Одновременных загрузок</string> <string name="stores_install_where">Установить в</string> + <string name="stores_install_language">Язык игры</string> + <string name="stores_install_language_hint">GOG и Epic устанавливают этот язык. «Системный» следует языку приложения.</string> + <string name="stores_install_language_system">Системный</string> <string name="stores_install_title">Установка %1$s:</string> <string name="stores_target_internal">Внутреннее хранилище</string> <string name="stores_target_free">Свободно: %1$s</string> @@ -2326,6 +2514,9 @@ <string name="edit_target">Объект</string> <string name="edit_start_in">Рабочая папка</string> <string name="edit_launch_options">Параметры запуска</string> + <string name="edit_launch_options_steam_hint">Общие со «Свойствами» Steam: изменение в одном месте видно в обоих.</string> + <string name="edit_launch_options_not_saved">Не удалось сохранить параметры запуска в Steam. Попробуйте ещё раз.</string> + <string name="edit_launch_options_desktop">Steam может быть открыт в сессии рабочего стола. Измените параметры запуска в его «Свойствах» или сначала закройте сессию.</string> <string name="edit_artwork">Обложки</string> <string name="edit_other_exe">Другой exe…</string> <string name="edit_remove">Убрать</string> @@ -2457,6 +2648,7 @@ <string name="setup_download_source_custom">Свой префикс</string> <string name="setup_download_mirror">Сайт</string> <string name="setup_download_prefix">Префикс</string> + <string name="setup_download_proxy">HTTP-прокси</string> <string name="flathub_eyebrow">ПРИЛОЖЕНИЯ LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Приложения для рабочего стола Linux, запускаются на рабочем столе.</string> @@ -2601,6 +2793,22 @@ <string name="glasses_tracking_flat_hint">В режиме «Автоматически» эта 2D-игра неподвижна в поле зрения. Чтобы использовать отслеживание головы, выберите «Виртуальный экран» в разделе «Экран».</string> <string name="glasses_tracking_sbs_hint">Отслеживание головы работает с виртуальным экраном или запущенной игрой SteamVR.</string> <string name="glasses_hardware">Устройство</string> + <string name="vr_controllers_tab">Контроллеры</string> + <string name="vr_controllers_group">Контроллеры SteamVR</string> + <string name="vr_controllers_emulate">Геймпад в VR</string> + <string name="vr_controllers_emulate_hint">Две VR-руки, которыми играет ваш контроллер. Изменения применяются сразу, даже пока работает SteamVR. Joy-Con и отслеживаемые руки всё равно берут на себя свою сторону.</string> + <string name="vr_controllers_off">Обычный геймпад</string> + <string name="vr_controllers_index">Контроллеры Valve Index</string> + <string name="vr_controllers_touch">Контроллеры Meta Quest 3</string> + <string name="vr_controllers_vive">Контроллеры HTC Vive</string> + <string name="vr_controllers_sticks">Стики сначала</string> + <string name="vr_controllers_sticks_hint">Нажмите оба стика одновременно в VR, чтобы переключить.</string> + <string name="vr_controllers_sticks_game">Перемещают вас в игре</string> + <string name="vr_controllers_sticks_hands">Перемещают руки</string> + <string name="vr_controllers_buttons">Кнопки</string> + <string name="vr_controllers_buttons_stick">Триггеры — это триггеры, бамперы — хват, A/B и X/Y — лицевые кнопки каждой руки, нажатия стиков нажимают стики VR-контроллеров, Guide открывает меню SteamVR. Вверх и вниз на крестовине приближают или отдаляют руки.</string> + <string name="vr_controllers_buttons_vive">Стики работают как трекпады; A/X или нажатие стика нажимает их. Триггеры — это триггеры, бамперы — хват, Start и Select — меню, Guide открывает меню SteamVR.</string> + <string name="vr_controllers_buttons_off">Без VR-рук. Игры с поддержкой геймпада и меню SteamVR получают ваш контроллер как обычно.</string> <string name="glasses_brightness">Яркость</string> <string name="glasses_volume">Громкость</string> <string name="glasses_sunblock">Затемнение</string> @@ -2658,6 +2866,12 @@ <string name="hand_camera_placement">Расположение камеры</string> <string name="hand_camera_placement_hint">Проверьте, что камера видит вас, прежде чем начать игру.</string> <string name="hand_camera_check">Проверить</string> + <string name="tracking_pack_title">Загрузка отслеживания рук</string> + <string name="tracking_pack_hint">Для отслеживания рук нужна однократная загрузка %1$s.</string> + <string name="tracking_pack_download">Скачать</string> + <string name="tracking_pack_retry">Повторить</string> + <string name="tracking_pack_downloading">Загрузка отслеживания рук… %1$d%%</string> + <string name="tracking_pack_failed">Не удалось скачать отслеживание рук. Проверьте подключение и повторите попытку.</string> <string name="hand_camera_check_title">Расположение камеры</string> <string name="hand_camera_how_rear">Поставьте устройство вертикально на расстоянии от 1,5 до 2 метров, примерно на уровне груди, направив заднюю камеру на себя. Затем встаньте в кадр, вытянув руки.</string> <string name="hand_camera_how_front">Поставьте устройство вертикально на расстоянии от 1,5 до 2 метров, примерно на уровне груди, направив экран на себя. Затем встаньте в кадр, вытянув руки.</string> @@ -2732,6 +2946,21 @@ <string name="storage_safe_hint">Неиспользуемые среды выполнения, остатки, старые журналы</string> <string name="storage_clean_up">Очистить…</string> <string name="storage_session_running">Остановите сессию, чтобы очистить или удалить что-либо. Размеры останутся видны.</string> + <string name="storage_default_group">Место установки</string> + <string name="storage_default_title">Хранилище по умолчанию</string> + <string name="storage_default_hint">Новые установки из магазинов попадают в выбранное место. Установленные игры остаются на месте. У библиотек Steam своя настройка.</string> + <string name="storage_default_ask">Спрашивать каждый раз</string> + <string name="storage_default_ask_detail">Выбирать место для каждой установки</string> + <string name="storage_default_internal">Внутреннее хранилище</string> + <string name="storage_default_external">Внешнее хранилище</string> + <string name="storage_default_external_detail">%1$s · свободно %2$s</string> + <string name="storage_default_external_missing">Не подключено</string> + <string name="storage_default_folder">Папка · %1$s</string> + <string name="storage_default_folder_free">Свободно %1$s</string> + <string name="storage_default_folder_missing">Не подключено</string> + <string name="storage_default_choose_folder">Выбрать папку…</string> + <string name="storage_default_choose_folder_detail">Любая папка на SD-карте или USB-накопителе</string> + <string name="storage_default_note">Игры помещаются в папку Games в выбранном месте. Установленные игры не перемещаются.</string> <string name="storage_where">Куда уходит</string> <string name="storage_games">Игры Steam</string> <string name="storage_game_data">Данные игр</string> @@ -2867,6 +3096,9 @@ <string name="storage_data_installed">Установленные игры</string> <string name="storage_data_parts">Префикс %1$s · шейдеры %2$s · мастерская %3$s</string> <string name="storage_clear_shaders">Удалить шейдеры</string> + <string name="storage_reset_prefix">Сбросить префикс</string> + <string name="storage_reset_prefix_title">Сбросить префикс для %1$s?</string> + <string name="storage_reset_prefix_confirm">Удаляет префикс Wine (%1$s) в %2$s и создаёт его заново при следующем запуске. Сохранения, настройки и установленные в нём распространяемые пакеты будут потеряны; сохранения Steam Cloud остаются в вашем аккаунте.</string> <string name="storage_data_leftovers">Удалённые игры</string> <string name="storage_steam_app">Приложение Steam %1$d</string> <string name="storage_leftover_unsure_detail">В его префиксе ещё есть файлы, среди них могут быть локальные сохранения</string> @@ -3168,6 +3400,117 @@ <string name="spatial_saved_views_hint">Сохраненные представления можно пересчитать. Запустите новую калибровку для захвата текущей системы координат отслеживания.</string> <string name="spatial_model_checksum_error">Несоответствие контрольной суммы модели руки.</string> <string name="spatial_opencv_load_error">OpenCV не удалось загрузить.</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Синхронизация через Syncthing</string> + <string name="sync_enable_hint">Это реализация Syncthing на основе Syncthing-Fork, которая позволяет синхронизировать файлы из внутренней файловой системы DroidDeck с другими экземплярами Syncthing. Она работает только с файлами, которые хранятся во внутренней файловой системе DroidDeck.</string> + <string name="sync_missing">Эта сборка не включает Syncthing.</string> + <string name="sync_starting">Запуск Syncthing</string> + <string name="sync_status_starting">Запуск</string> + <string name="sync_status_up_to_date">Актуально</string> + <string name="sync_status_syncing">Синхронизация</string> + <string name="sync_status_paused">Приостановлено</string> + <string name="sync_status_pausing">Приостановка</string> + <string name="sync_status_resuming">Возобновление</string> + <string name="sync_status_attention">Требует внимания</string> + <string name="sync_status_failed">Syncthing остановлен</string> + <string name="sync_failed_retry">Повторить</string> + <string name="sync_paused_wifi">Приостановлено до подключения к Wi-Fi</string> + <string name="sync_paused_game">Приостановлено на время игры</string> + <string name="sync_summary">Папок: %1$d · подключено устройств: %2$d из %3$d</string> + <string name="sync_left">Осталось: %1$s</string> + <string name="sync_open_web_ui">Открыть веб-интерфейс</string> + <string name="sync_pause">Приостановить</string> + <string name="sync_resume">Возобновить</string> + <string name="sync_running">Работает</string> + <string name="sync_running_hint">Выключите, чтобы полностью остановить Syncthing.</string> + <string name="sync_this_device">Это устройство</string> + <string name="sync_device_id">ID устройства</string> + <string name="sync_show_qr">Показать QR-код</string> + <string name="sync_advanced">Дополнительно</string> + <string name="sync_advanced_hint">Порты, режим работы, сброс</string> + <string name="sync_open">Открыть</string> + <string name="sync_waiting">Ожидает вашего ответа</string> + <string name="sync_pending_device">%1$s хочет подключиться</string> + <string name="sync_pending_folder">%1$s хочет предоставить доступ к папке «%2$s»</string> + <string name="sync_pending_folder_hint">Примите, чтобы выбрать, куда сохранить ее в DroidDeck.</string> + <string name="sync_review">Просмотреть в веб-интерфейсе</string> + <string name="sync_folders">Папки</string> + <string name="sync_no_folders">Папок пока нет.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Актуально</string> + <string name="sync_folder_syncing">Синхронизация: %1$d%%</string> + <string name="sync_folder_scanning">Сканирование</string> + <string name="sync_folder_paused">Приостановлено</string> + <string name="sync_folder_out_of_sync">Не синхронизировано</string> + <string name="sync_folder_errors">Не удалось синхронизировать файлов: %1$d</string> + <string name="sync_folder_blocked">Заблокировано</string> + <string name="sync_folder_blocked_hint">Эта папка находится вне хранилища DroidDeck, поэтому DroidDeck приостановил ее. Чтобы синхронизировать папки вне DroidDeck, используйте приложение Syncthing-Fork.</string> + <string name="sync_remove_folder">Удалить из Syncthing</string> + <string name="sync_remove_folder_hint">При удалении файлы не удаляются.</string> + <string name="sync_devices">Устройства</string> + <string name="sync_no_devices">Устройств пока нет.</string> + <string name="sync_connected">Подключено</string> + <string name="sync_offline">Не в сети</string> + <string name="sync_last_seen">Последний раз в сети: %1$s</string> + <string name="sync_device_id_title">ID этого устройства</string> + <string name="sync_device_id_hint">На другом устройстве добавьте устройство в Syncthing и отсканируйте этот код или вставьте ID. Затем примите его здесь, в веб-интерфейсе.</string> + <string name="sync_copy">Копировать</string> + <string name="sync_share">Поделиться</string> + <string name="sync_done">Готово</string> + <string name="sync_off_title">Выключить Syncthing?</string> + <string name="sync_off_body">Syncthing остановится сейчас и не запустится, пока вы снова его не включите. Синхронизированные файлы останутся на месте.</string> + <string name="sync_off_forget">Также удалить конфигурацию Syncthing</string> + <string name="sync_off_forget_hint">Удаляет ID этого устройства, папки и устройства. При повторном включении все начнется с нуля.</string> + <string name="sync_turn_off">Выключить</string> + <string name="sync_ports">Порты</string> + <string name="sync_port_sync">Синхронизация</string> + <string name="sync_port_discovery">Локальное обнаружение</string> + <string name="sync_repick">Выбрать новые порты</string> + <string name="sync_repick_hint">Проверяются заново при каждом запуске.</string> + <string name="sync_repick_button">Выбрать заново</string> + <string name="sync_reset_group">Сброс</string> + <string name="sync_api_key">Ключ API</string> + <string name="sync_regenerate">Создать заново</string> + <string name="sync_reset">Сбросить Syncthing</string> + <string name="sync_reset_hint">Новый ID устройства, папки и устройства удаляются. Файлы в хранилище DroidDeck сохраняются.</string> + <string name="sync_reset_button">Сбросить</string> + <string name="sync_reset_confirm_title">Сбросить Syncthing?</string> + <string name="sync_running_group">Работа</string> + <string name="sync_run">Работать</string> + <string name="sync_run_open">Пока DroidDeck открыт</string> + <string name="sync_run_background">В фоновом режиме</string> + <string name="sync_wifi_only">Только по Wi-Fi</string> + <string name="sync_pause_games">Приостанавливать во время игр</string> + <string name="sync_logs">Журналы</string> + <string name="sync_logs_hint">Вывод Syncthing за эту сессию</string> + <string name="sync_logs_share">Поделиться</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Сначала установите среду выполнения Linux.</string> + <string name="sync_accept">Принять</string> + <string name="sync_accept_title">Сохранить «%1$s» в</string> + <string name="sync_add_folder">Добавить папку</string> + <string name="sync_add_folder_hint">Синхронизировать папку в хранилище DroidDeck</string> + <string name="sync_choose">Выбрать</string> + <string name="sync_add">Добавить</string> + <string name="sync_add_failed">Не удалось добавить папку.</string> + <string name="sync_share_with">Поделиться с</string> + <string name="sync_share_none">Устройств пока нет. Вы сможете предоставить доступ к этой папке позже в веб-интерфейсе.</string> + <string name="sync_use_folder">Использовать эту папку</string> + <string name="sync_new_folder">Новая папка</string> + <string name="sync_location_home">Домашняя папка контейнера</string> + <string name="sync_location_sync">Папка Sync</string> + <string name="sync_location_shared">Общее хранилище DroidDeck</string> + <string name="sync_location_card">DroidDeck на %1$s</string> + <string name="sync_location_app">Данные приложения DroidDeck</string> + <string name="sync_web_path_locked">Новые папки сохраняются в папку Sync DroidDeck. Чтобы синхронизировать другую папку DroidDeck, используйте «Добавить папку» на вкладке Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Перезагрузить</string> + <string name="sync_not_running">Syncthing не запущен.</string> + <string name="session_end_steam_sigill">Steam остановился из-за недопустимой инструкции (SIGILL). Это может быть проблема совместимости инструкций CPU или сбой клиента. Отправьте журналы вместе с данными о вашем устройстве.</string> + <string name="session_end_steam_try_x64">Можно попробовать «Настройки Steam → Клиент Steam → x86-64 (экспериментально)». Потребуется дополнительная загрузка, и работа может быть медленнее.</string> + <string name="session_end_vulkan_device">Графический драйвер Linux не нашёл подходящее устройство Vulkan. Проверьте, что выбранный драйвер GPU для Linux поддерживает этот GPU.</string> + <string name="session_end_gpu_unsupported">Сессия не может запуститься: для этого GPU в текущей конфигурации нет совместимого драйвера Vulkan для Linux. Драйверы Adreno Turnip не могут включить поддержку GPU MediaTek/Mali.</string> <string name="glasses_6dof">Виртуальный экран 6DoF</string> <string name="spatial_gpu">Распознавание рук на GPU</string> <string name="spatial_gpu_hint">По умолчанию используется CPU. Режим GPU экспериментальный и может вызывать перезапуск SteamVR. Выбор сбрасывается при перезапуске отслеживания.</string> @@ -3195,6 +3538,12 @@ <string name="epic_client_open">Открыть</string> <string name="epic_client_install">Установить</string> <string name="game_tab_about">О приложении</string> + <string name="game_resources_browser">Откроется в браузере</string> + <string name="game_resource_guides">Руководства</string> + <string name="game_resource_protondb_detail">Отчёты о совместимости с Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Для игр с сохранениями в аккаунте Steam</string> + <string name="game_resource_search">Поиск в интернете</string> <string name="game_tab_install">Установить</string> <string name="game_install_location">Расположение</string> <string name="game_install_folder">Папка</string> @@ -3211,6 +3560,11 @@ <string name="stores_eyebrow_pass">доступно с %1$s</string> <string name="stores_owned_in_library">Ваши игры в библиотеке</string> <string name="library_filter_added">Добавленные</string> + <string name="library_filter">Фильтр</string> + <string name="library_filter_installed">Только установленные</string> + <string name="library_filter_all_owned">Все ваши игры</string> + <string name="library_no_installed_matches">Нет установленных игр, подходящих под эти фильтры.</string> + <string name="library_browse_owned">Просмотреть ваши игры</string> <string name="game_tab_launch">Запуск</string> <string name="game_tab_saves_cloud">Сохранения и облако</string> <string name="game_launch_shortcut">Ярлык Steam</string> @@ -3228,6 +3582,40 @@ <string name="stores_itch_update_replaced">Разработчик заменил эту сборку на %1$s. Обновиться до неё?</string> <string name="xbox_filter_cloud">Облако</string> <string name="stores_xbox_cloud_settings">Настройки облака</string> + <string name="integration_title">Интеграция со Steam</string> + <string name="integration_count">Включено %1$d из %2$d</string> + <string name="integration_set_up">Настроить</string> + <string name="integration_location">Местоположение</string> + <string name="integration_app_info">О приложении</string> + <string name="integration_wifi">Названия сетей Wi-Fi</string> + <string name="integration_brightness">Яркость</string> + <string name="integration_home">DroidDeck как главный экран</string> + <string name="integration_shortcuts">Системные клавиши</string> + <string name="integration_wifi_hint">Показывать сети в Steam · нужен доступ к местоположению, без отслеживания</string> + <string name="integration_wifi_on">Сети отображаются в Steam</string> + <string name="integration_wifi_location_off">Местоположение отключено</string> + <string name="integration_wifi_denied">Доступ к местоположению запрещён · разрешите его в «О приложении»</string> + <string name="integration_brightness_hint">Ползунок Steam задаёт яркость экрана</string> + <string name="integration_home_hint">«Домой» открывает меню Steam в сессии</string> + <string name="integration_shortcuts_hint">Alt+Tab, клавиша Win и кнопка «Домой» работают в сеансе</string> + <string name="integration_shortcuts_maybe_restricted">Неактивно в Android? «О приложении» → ⋮ → «Разрешить доступ к настройкам с ограниченным доступом»</string> + <string name="integration_shortcuts_restricted">Заблокировано Android · «О приложении» → ⋮ → «Разрешить доступ к настройкам с ограниченным доступом»</string> + <string name="integration_shortcuts_service">Системные клавиши DroidDeck</string> + <string name="integration_shortcuts_service_description">Оставляет Alt+Tab, клавишу Win и кнопку «Домой» в активном сеансе DroidDeck, а не в Android.</string> + <string name="integration_brightness_needed">Включите «Яркость» в «Настройка → Интеграция со Steam»</string> + <string name="setup_gpu_bridge_off">Мост Mali: выкл.</string> + <string name="setup_gpu_bridge_on">Мост Mali: вкл.</string> + <string name="setup_gpu_bridge_detail">%1$s — не Adreno. Включён экспериментальный мост Vulkan: сеанс рисует через собственный драйвер телефона. Возможны ошибки; отправьте журналы сеанса.</string> + <string name="setup_bridge_safe">Безопасный режим</string> + <string name="setup_bridge_safe_on">Безопасный режим: вкл.</string> + <string name="setup_bridge_safe_off">Безопасный режим: выкл.</string> + <string name="setup_bridge_safe_on_detail">Максимальная совместимость. Рекомендуется для нового устройства.</string> + <string name="setup_bridge_safe_off_detail">Быстрее там, где этот GPU прошёл проверки.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: автоматически</string> + <string name="setup_bridge_dxvk_proton">DXVK: из Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Использует более старый DXVK, если Vulkan этого GPU слишком стар для DXVK из Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Каждый Proton оставляет свой DXVK, даже если Vulkan этого GPU может быть для него слишком старым.</string> <string name="apps_search_hint">Поиск приложений</string> <string name="apps_no_match">Нет приложений по запросу «%1$s».</string> <string name="apps_add_widget">Добавить виджет</string> @@ -3278,6 +3666,8 @@ <string name="desktop_restore_done_body">Добавленные вами приложения снова установлены.</string> <string name="desktop_restore_failed_title">Не удалось восстановить часть программ</string> <string name="desktop_restore_failed_body">Посмотрите ~/.cache/droiddeck/apt-restore.log, затем попробуйте sudo apt install в Konsole.</string> + <string name="gog_full_files">Нативные оптимизации недоступны. Загрузка содержит полные файлы для замены.</string> + <string name="gog_recover">Проверить результат патча</string> <string name="slow_usb_title">Медленное подключение USB</string> <string name="slow_usb_cable">%1$s подключён через %2$s (%3$s Мбит/с, около %4$d МБ/с), поэтому игры на нём будут загружаться медленно. Используйте кабель USB 3 на 5 Гбит/с или быстрее, попробуйте перевернуть разъём USB-C или возьмите более быстрый накопитель.</string> <string name="slow_usb_port">%1$s подключён через %2$s (%3$s Мбит/с, около %4$d МБ/с). USB-порт этого устройства не работает быстрее, поэтому игры будут загружаться медленно. Внутренняя память или карта microSD могут быть быстрее.</string> @@ -3288,4 +3678,52 @@ <string name="steam_import_names_more">%1$s и ещё %2$d</string> <string name="steam_import_now">Перезапустить сейчас</string> <string name="steam_import_later">Позже</string> + <string name="gog_maintenance">Управление установкой GOG</string> + <string name="gog_check">Проверить обновления</string> + <string name="gog_repair">Проверка/восстановление</string> + <string name="gog_patches">Офлайн-патчи</string> + <string name="gog_refresh">Скачать полный офлайн-установщик</string> + <string name="gog_update">Обновить до %1$s</string> + <string name="gog_resume">Продолжить обслуживание GOG</string> + <string name="gog_open_patch">Открыть установщик патча</string> + <string name="gog_patch_in_session">Завершите или отмените установщик патча в сессии Linux.</string> + <string name="gog_patch_requirements">Выберите патч для вашей установленной версии и языка. Поддерживаемые исходные версии могут быть не указаны.</string> + <string name="gog_no_patches">У GOG нет отдельных патчей для Windows для этой игры.</string> + <string name="gog_managed_files">Изменённые файлы игры могут быть заменены.</string> + <string name="gog_patch_installer_note">Установщик откроется в вашей сессии Linux.</string> + <string name="gog_download_label">Загрузка</string> + <string name="gog_space_label">Доп. место</string> + <string name="gog_space_estimate_label">Оценка места</string> + <string name="gog_repair_action">Восстановить файлы</string> + <string name="gog_refresh_action">Обновить установку</string> + <string name="gog_select_patch">Выбрать</string> + <string name="stores_gamejolt_not_owned">Нет в вашей библиотеке Game Jolt</string> + <string name="stores_gamejolt_no_build">Для этой игры нет загрузки для Windows</string> + <string name="stores_gamejolt_no_exe">В загрузке не найдена игра для Windows</string> + <string name="stores_gamejolt_no_game">Не удалось найти эту игру на Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Не удалось загрузить игры с Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt ответил HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Не удалось загрузить список файлов с Game Jolt</string> + <string name="stores_gamejolt_build_open">Открыть на Game Jolt</string> + <string name="stores_gamejolt_archive">Архивы %1$s не поддерживаются</string> + <string name="stores_gamejolt_extract_failed">Не удалось распаковать загрузку (код %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Не удалось связаться с Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt не предоставил ссылку для скачивания</string> + <string name="stores_gamejolt_section_featured">Рекомендуемые</string> + <string name="stores_gamejolt_section_hot">Популярные</string> + <string name="stores_gamejolt_section_best">Лучшие</string> + <string name="stores_gamejolt_section_new">Новые</string> + <string name="stores_gamejolt_price_under_30">30 $ или дешевле</string> + <string name="stores_gamejolt_os_other">Другое</string> + <string name="stores_gamejolt_maturity_everyone">Для всех возрастов</string> + <string name="stores_gamejolt_maturity_teen">Подростки</string> + <string name="stores_gamejolt_maturity_adult">Для взрослых</string> + <string name="stores_gamejolt_status_complete">Завершена</string> + <string name="stores_gamejolt_status_early">Ранний доступ</string> + <string name="stores_gamejolt_partners">Игры партнёров</string> + <string name="stores_gamejolt_filter_browser">Браузер</string> + <string name="stores_gamejolt_filter_maturity">Возрастной рейтинг</string> + <string name="stores_gamejolt_filter_status">Статус</string> + <string name="stores_gamejolt_filter_partners">Партнёры</string> + <string name="stores_gamejolt_followed">Отслеживаемые игры</string> </resources> diff --git a/app/src/main/res/values-sv/gestures.xml b/app/src/main/res/values-sv/gestures.xml index e8034b112e..064ee4168c 100644 --- a/app/src/main/res/values-sv/gestures.xml +++ b/app/src/main/res/values-sv/gestures.xml @@ -71,7 +71,7 @@ <string name="gesture_key_backspace">Backsteg</string> <string name="gesture_key_enter">Retur</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">Mellanslag</string> <string name="gesture_key_delete">Delete</string> <string name="gesture_key_insert">Insert</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d9eab8b996..f94dc7d290 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">VKD3D-alternativ för D3D12. nodxr inaktiverar strålspårning; använd bara för ett spel som behöver det.</string> <string name="game_env_proton_log">Ange 1 för en diagnostiklogg från Proton. Loggning kan sänka prestandan och tar lagringsutrymme.</string> <string name="game_env_wined3d">Ange 1 för att använda OpenGL-baserade WineD3D i stället för DXVK vid kompatibilitetstester för D3D9–11.</string> + <string name="game_env_wined3d_renderer">Renderare för DirectDraw, Direct3D 1-7 och spel som körs med WineD3D. Vulkan hoppar över OpenGL-via-Zink-vägen och är mycket snabbare för gamla DirectDraw- och Direct3D 7-spel på Adreno.</string> + <string name="game_env_dxvk_d3d8">Ange 1 för att köra Direct3D 8 via DXVK i stället för WineD3D. Snabbare i AIO Graphics Tests Direct3D 8-test på Adreno.</string> <string name="game_env_no_ntsync">Ange 1 för att hålla spelet borta från ntsync (droiddeck-ntsync eller en kärndrivrutin); det använder droiddeck-esync där ett paket finns, annars droiddeck-fsync.</string> <string name="game_env_no_esync">Ange 1 för att stänga av droiddeck-esync för det här spelet; det använder droiddeck-fsync i stället, eller droiddeck-ntsync där även fsync är av.</string> <string name="game_env_no_fsync">Ange 1 för att hålla spelet borta från droiddeck-fsync; det använder droiddeck-esync där ett paket finns, annars droiddeck-ntsync.</string> <string name="game_env_fsync_first">Ange 1 för att köra spelet på droiddeck-fsync, eller 0 för att prioritera droiddeck-esync där ett paket passar dess Proton.</string> <string name="game_env_xalia">Ange 0 för att inaktivera Protons hjälp för handkontrollsnavigering i det här spelet.</string> + <string name="game_env_anticheat_offline">På som standard. Startar ett Easy Anti-Cheat-spel utan dess anti-cheat när spelet stöder offlinespel. Stäng av för att starta via Easy Anti-Cheat som vanligt. Onlinelägen som kräver Easy Anti-Cheat förblir otillgängliga.</string> <string name="game_env_hud">DXVK-överlägg för D3D9–11. fps visar bildfrekvensen; utan värde döljs det.</string> <string name="game_env_dxvk_config">DXVK-inställningar avgränsade med semikolon. Nyare versioner använder dxvk.maxFrameRate för bildbegränsning; använd hellre sessionens bildbegränsare vid vanligt spelande.</string> + <string name="game_env_cores">CPU-kärnor för det här spelet, t.ex. 0-4 eller 0,2,4, i stället för sessionens spelkärnor. Färre kärnor går svalare.</string> <string name="game_env_vkd3d_limit">Gräns för bildfrekvens i D3D12. 0 inaktiverar gränsen.</string> <string name="game_env_glthread">Trådning för Mesa OpenGL. true kan hjälpa CPU-begränsade OpenGL-spel; testa för varje spel.</string> <string name="sync_backend_title">Wine-synk</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX kör Linux-program för x86 på den här ARM64-enheten. Auto använder det när programmet är byggt för x86.</string> <string name="app_fex_x86">%1$s via FEX</string> <string name="app_fex_not_ready">Programmet är byggt för %1$s-datorer och körs via FEX, som inte har konfigurerats än. Öppna Steam en gång medan du är inloggad: DroidDeck låter Steam ladda ned FEX och den Steam Linux Runtime som behövs, sedan öppnas detta.</string> + <string name="session_proot_missing">Det gick inte att ladda ned DroidDecks proot. Kontrollera anslutningen och försök igen. Sessionen startades inte eftersom reserv-proot är för långsam att spela på.</string> + <string name="session_directaudio_missing">Det gick inte att ladda ned DirectAudio, så spelljudet använder den långsammare vägen den här sessionen.</string> <string name="session_end_program">Det här programmet</string> <string name="session_end_steam_download">Det gick inte att ladda ned Steam-klienten. Ditt nätverk eller din VPN kanske blockerar Steams servrar; kontrollera anslutningen och försök igen.</string> <string name="session_end_steam_setup">Det gick inte att konfigurera Steam-klienten. Kontrollera anslutningen och det lediga lagringsutrymmet och försök igen.</string> @@ -292,7 +298,14 @@ <string name="mode_controller_dualsense">DualSense</string> <string name="mode_controller_x360">Xbox 360-kontroll</string> <string name="mode_controller_note">Deck: snabbåtkomstknappen och gyro. Steam Controller: samma, med greppkänsla på bakknapparna. DualShock 4 och DualSense: gyro, och styrplattorna som deras pekplatta. Xbox 360: öppna snabbåtkomst med Guide+A.</string> - <string name="mode_back">Back</string> + <string name="mode_back">Bakåt</string> + <string name="back_hold">Håll Bakåt för Steam-genvägar</string> + <string name="back_hold_hint">Håll Bakåt för att öppna Snabbåtkomst eller göra Steam-kombinationer med andra knappar. Stäng av för att ignorera hållen Bakåt; tryck och dubbeltryck fungerar fortfarande.</string> + <string name="back_native_qam_hint">Håll Back i 700 ms, eller håll Back och tryck på en annan knapp för Steam-genvägar.</string> + <string name="back_double_tap_window">Tidsfönster för dubbeltryck</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Tillåt styrning av ljusstyrka</string> + <string name="brightness_permission_text">Konfigurera styrning av ljusstyrka i DroidDeck.</string> <string name="back_menu_then_qam">Meny → QAM</string> <string name="back_qam_then_menu">QAM → Meny</string> <string name="mode_session">Session</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Skjut upp bakgrundspausning medan Steam aktivt laddar ned.</string> <string name="mode_suspend_note">Auto pausar i bakgrunden och återupptar när den visas. Manuell väntar på Återuppta. Aldrig fortsätter köra.</string> <string name="mode_startup">Uppstart</string> - <string name="mode_steam_startup">Starta Steam med DroidDeck</string> - <string name="mode_steam_startup_hint">Öppnar Steam-sessionen när DroidDeck startar.</string> + <string name="mode_startup_session">Öppna vid start</string> + <string name="mode_startup_session_hint">Startar den här sessionen när DroidDeck startar.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Söker efter utgåvor…</string> <string name="mode_decky_ready">Redo att installera %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Senaste versionen · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Installera senaste</string> + <string name="decky_channel">Uppdateringskanal</string> + <string name="decky_channel_hint">Vilka Decky Loader-utgåvor som installeras. Deckys egen uppdaterare använder samma kanal.</string> + <string name="decky_channel_stable">Stabil</string> + <string name="decky_channel_prerelease">Förhandsversion</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Det gick inte att spara Deckys uppdateringskanal</string> <string name="mode_decky_on">Startar med Steam. Medan det är på kan andra appar på enheten eventuellt styra Steam.</string> <string name="mode_decky_off">Av. Steams fjärrfelsökningsport förblir stängd.</string> <string name="mode_decky_remove_title">Avinstallera Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Klient</string> <string name="mode_mangoapp">Prestandaöverlägg</string> <string name="mode_mangoapp_hint">Stäng av om spel kraschar eller blir svarta i Deck-läge. Gäller från nästa session.</string> + <string name="mode_return_after_game">Återgå till DroidDeck efter ett spel</string> + <string name="mode_return_after_game_hint">När ett spel du startade från DroidDeck eller en annan launcher stängs avslutas Steam korrekt (molnsparningar slutförs först) och du kommer tillbaka dit. Av: stanna i Steam.</string> + <string name="mode_shader_precache">Förhandscachning av shaders</string> + <string name="mode_shader_precache_hint">Steam laddar ned förbyggda shaders för dina spel och bearbetar dem i bakgrunden, så att spel hackar mindre. Av sparar data, lagringsutrymme och batteri; spel bygger i stället shaders medan de körs. Samma inställning som Steams Nedladdningar > Shader Pre-Caching. Gäller från nästa session.</string> <string name="mode_steam_repair">Reparera Steam-klienten</string> <string name="mode_steam_repair_hint">Laddar ned Steam-klienten igen nästa gång Steam startar. Använd det om Steam fastnar på sin inläsningsskärm. Spel, inloggning och inställningar behålls.</string> <string name="mode_steam_repair_queued">Steam-klienten laddas ned igen nästa gång Steam startar.</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">Kringgår PulseAudio för lägre latens.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">För röstchatt.</string> + <string name="drawer_mic_hint">Slå på eller av mikrofoninspelning för den här sessionen.</string> + <string name="drawer_mic_failed">Det gick inte att ändra mikrofonen. Försök igen.</string> <string name="mode_network">Nätverk</string> <string name="mode_wifi_discovery">Wi-Fi-identifiering</string> <string name="mode_wifi_discovery_hint">Visa Wi-Fi-namn och nätverk i närheten i Steam.</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: GPU-kö i realtid</string> <string name="perf_gsrealtime_hint">Prioriterar kompositorns GPU-arbete. Kan jämna ut bildtakten till viss kostnad för spelen.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Minne</string> + <string name="perf_cap_off">Av</string> + <string name="perf_cap_auto">Drivrutinens standard</string> + <string name="perf_zram_client">Komprimera Steam medan ett spel körs</string> + <string name="perf_zram_client_hint">20 s efter att ett spel startat komprimeras Steam-klienten till zRAM för att ge spelet mer minne, och läses tillbaka när spelet stängs. Stäng av om sessionen stängs strax efter att spel startar. En RAM-gräns ovan komprimerar fortfarande Steam när sessionen överskrider den.</string> + <string name="perf_ram_cap">RAM-gräns</string> + <string name="perf_ram_cap_hint">Gäller medan Steam-klienten körs, i Steam-läge eller från skrivbordet. När sessionen använder mer än detta komprimeras Steam och sedan sessionens övriga processer som stöds till zRAM. En mjuk gräns: inget stängs, men spel kan hacka medan sidor läses tillbaka.</string> + <string name="perf_ram_cap_unavailable">Kräver zRAM-swap, vilket den här enheten saknar.</string> + <string name="perf_vram_cap">VRAM-gräns</string> + <string name="perf_vram_cap_hint">Videominnet som DXVK rapporterar till Direct3D-spel, så att de budgeterar texturer för mindre. Ett spels egna DXVK-inställningar har företräde. Börjar gälla vid nästa session.</string> <string name="perf_gpuclock">Håll GPU:n på dess högsta klockfrekvens</string> <string name="perf_gpuclock_hint">Bara Adreno. Färre hack, högre batteriförbrukning och mer värme.</string> <string name="perf_fixes">Sessionsfixar</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">proot snabbväg</string> <string name="perf_fastpath_needs_seccomp">Kräver proots seccomp-filter.</string> <string name="perf_fastpath_hint">Snabbare filuppslagningar och mindre hack. Stäng av om ett program inte hittar sina filer.</string> + <string name="perf_cursor_composite">Rita markören i gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope ritar själv pekaren i stället för att lämna den till Android. Slå på för en handkontrollsstyrd markör. Av är snabbare på en telefon. Gäller från nästa session.</string> <string name="perf_identity">Sessionsidentitet</string> <string name="perf_hostname">Värdnamn</string> <string name="perf_hostname_hint">Namnet Steam ser för den här enheten. Lämna tomt för att återställa till %1$s.</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">Dess filer tas bort från appen.</string> <string name="driver_delete_in_use">Dess filer tas bort. Den används, så standarden tar över.</string> <string name="drawer_page_display">Skärm</string> + <string name="drawer_frame_limit">Bildgräns</string> + <string name="drawer_frame_limit_note">Begränsar det här spelet. Skärmen byter till en uppdateringsfrekvens som gränsen delar jämnt när en sådan finns; andra gränser kan se ojämna ut. Steam-spel använder Steams Frame Limit i snabbåtkomstmenyn.</string> <string name="drawer_page_effects">Effekter</string> <string name="drawer_page_controls">Kontroller</string> <string name="drawer_page_components">Komponenter</string> @@ -601,10 +640,10 @@ <string name="drawer_hud_battery">Batteritemperatur</string> <string name="drawer_hud_graph">Prestandagraf</string> <string name="drawer_hud_color">Färg</string> - <string name="drawer_hud_color_mint">Mint</string> + <string name="drawer_hud_color_mint">Mintgrön</string> <string name="drawer_hud_color_white">Vit</string> <string name="drawer_hud_color_sky">Himmelsblå</string> - <string name="drawer_hud_color_amber">Amber</string> + <string name="drawer_hud_color_amber">Bärnsten</string> <string name="drawer_hud_color_violet">Lila</string> <string name="drawer_hud_opacity">Opacitet</string> <string name="hud_size">Storlek</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">Piller</string> <string name="hud_size_minimal">Minimal</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">List</string> <string name="hud_locked">Lås på plats</string> <string name="hud_locked_hint">Dra HUD:en för att flytta den; ett långt tryck låser eller låser upp den. När den är låst fungerar skärmkontrollerna under den fortfarande.</string> + <string name="hud_snap">Fäst mot sidorna</string> + <string name="hud_snap_hint">Släpp HUD:en så flyttas den till skärmens närmaste sida. En snabb svepning kastar den åt det hållet.</string> <string name="hud_group_look">Utseende</string> <string name="hud_scale">Storlek på skärmen</string> <string name="hud_color_soft">Mjuk</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">Det gick inte att spara HUD-rapporten.</string> <string name="hud_reset">Återställ HUD-inställningar</string> <string name="hud_reset_button">Återställ</string> - <string name="hud_credit">FusionHUD av The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Skalningsläge</string> <string name="drawer_scaling_sharpness">Skalningsskärpa</string> <string name="drawer_effects">Skärmeffekter</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Tangentbord</string> <string name="drawer_latency">Latens</string> + <string name="drawer_low_latency">Läge för låg latens</string> + <string name="drawer_low_latency_hint">Ökar CPU- och batteriförbrukningen</string> <string name="drawer_low_latency_controller">Handkontroll med låg latens</string> <string name="drawer_low_latency_controller_hint">Handkontrollen rapporterar i 1000 Hz i stället för 250 Hz. Något mer CPU.</string> <string name="drawer_low_latency_touch">Pekning med låg latens</string> <string name="drawer_low_latency_touch_hint">Pekningar hoppar över bildrutebatchning; Steams pekstyrning går i 1000 Hz. Något mer CPU.</string> <string name="drawer_evdev_mouse">Rå muskanal</string> + <string name="drawer_relative_mouse">Relativ mus</string> + <string name="drawer_relative_mouse_auto">Automatiskt</string> + <string name="drawer_relative_mouse_on">På</string> + <string name="drawer_relative_mouse_off">Av</string> <string name="drawer_direct_cursor">Markör</string> <string name="drawer_pc_keyboard">PC-tangentbord</string> <string name="drawer_android_keyboard">Android</string> @@ -791,6 +838,10 @@ <string name="setup_session">Session</string> <string name="setup_logs">Sessionsloggar</string> <string name="setup_logs_hint">Sparas efter varje session</string> + <string name="setup_game_debug_logs">Felsökningsloggar för spel</string> + <string name="setup_game_debug_logs_hint">Ta med diagnostik för Proton, Wine och grafik vid nästa spelstart. Kan sänka prestandan och använda mer lagringsutrymme.</string> + <string name="setup_game_debug_logs_restart">Starta om sessionen för att spara felsökningsloggar för spel</string> + <string name="setup_logging_update_failed">Det gick inte att uppdatera loggningen. Kontrollera reglaget och försök igen.</string> <string name="setup_agent_commands">Felsökningsverktyg</string> <string name="setup_latest_logs">Senaste sessionsloggar</string> <string name="setup_saved_logs">Sparade sessionsloggar</string> @@ -822,20 +873,22 @@ <string name="setup_home">Använd som startskärm</string> <string name="setup_home_on">DroidDeck kan vara startskärmsappen</string> <string name="setup_home_off">DroidDeck erbjuds aldrig som startskärmsapp</string> + <string name="setup_home_game_space_first">Under Lägg till spel ställer du DroidDeck på Inkludera</string> <string name="setup_orientation">Orientering</string> + <string name="setup_launcher_orientation">Launcherns orientering</string> + <string name="setup_launcher_orientation_auto">Följ enhetens rotation</string> + <string name="setup_orientation_portrait">Stående</string> + <string name="setup_session_orientation">Sessionens orientering</string> + <string name="setup_session_orientation_hint">Gäller Steam, spel, skrivbordet och kontrollredigeraren. Upplösningsförinställningar roterar med sessionen; anpassad bredd och höjd förblir som angivet.</string> <string name="setup_orientation_auto">Automatiskt liggande</string> <string name="setup_orientation_landscape">Liggande</string> <string name="setup_orientation_reverse">Liggande, upp och ned</string> <string name="setup_fullscreen">Helskärm</string> <string name="setup_fullscreen_on">Döljer Androids statusfält och navigeringsfält</string> <string name="setup_fullscreen_off">Visar Androids statusfält och navigeringsfält</string> - <string name="setup_dual_screen">Dubbelskärm</string> - <string name="setup_dual_screen_hint">Automatiskt använder den andra skärmen på handhållna enheter med en inbyggd andra skärm. På använder vilken andra skärm som helst. Av håller allt på en skärm.</string> <string name="setup_dual_screen_auto">Automatiskt</string> <string name="setup_dual_screen_on">På</string> <string name="setup_dual_screen_off">Av</string> - <string name="setup_dual_screen_menu">Meny på nedre skärmen</string> - <string name="setup_dual_screen_menu_hint">Flyttar avsnitten och menyn i spelet till den andra skärmen och skrivandet sker där, så att den övre skärmen behåller hela vyn. L2 och R2 byter avsnitt.</string> <string name="setup_dual_screen_controls">Kontroller på nedre skärmen i spel</string> <string name="setup_dual_screen_controls_hint">Öppnar styrplattan och tangentbordet på den andra skärmen när en session startar.</string> <string name="dual_typing_title">Skriver för den övre skärmen</string> @@ -987,6 +1040,14 @@ <string name="gate_step1">Öppna Inställningar → Utvecklaralternativ → Trådlös felsökning och slå på det</string> <string name="gate_step2">Tryck på ”Para ihop enhet med ihopkopplingskod”</string> <string name="gate_step3">Skriv in koden i DroidDeck-aviseringen</string> + <string name="pairguide_build_number">Tryck sju gånger på Versionsnummer under Om telefonen</string> + <string name="pairguide_wireless">Slå på Trådlös felsökning</string> + <string name="pairguide_pair">Öppna Trådlös felsökning och tryck på ”Parkoppla enheten med en kopplingskod”</string> + <string name="pairguide_child_process">Slå på ”Inaktivera begränsningar för underordnade processer”</string> + <string name="pairguide_row_child_process">Inaktivera begränsningar för underordnade processer</string> + <string name="pairguide_row_build_number">Versionsnummer</string> + <string name="pairguide_row_wireless">Trådlös felsökning</string> + <string name="pairguide_row_pair">Parkoppla enheten med en kopplingskod</string> <string name="gate_waiting">Väntar på popup-fönstret för ihopkoppling…</string> <string name="gate_code_needed">Popup-fönster hittat. Ange dess kod i aviseringen.</string> <string name="gate_status">Status</string> @@ -1125,7 +1186,6 @@ <string name="games_never_played">Aldrig spelat</string> <string name="games_runtime_busy_percent">Körmiljö upptagen · %1$d %%</string> <string name="games_runtime_busy">Körmiljö upptagen</string> - <string name="games_runtime_first_play">Körmiljön installeras första gången du trycker på Play</string> <string name="games_runtime_update">Uppdatering av körmiljön tillgänglig</string> <string name="games_runtime_ready">● Körmiljö redo</string> <string name="games_internal">Internt lagringsutrymme</string> @@ -1142,6 +1202,9 @@ <string name="gpu_hide_other">Dölj drivrutiner för andra GPU:er</string> <string name="gpu_show_other">Visa drivrutiner för andra GPU:er</string> <string name="gpu_advanced">Avancerat</string> + <string name="gpu_ubwc_title">UBWC-kompatibilitet</string> + <string name="gpu_ubwc_hint">Prova På eller Av om Steam eller Android visar ränder eller flimmer. Gäller båda drivrutinerna efter omstart av DroidDeck.</string> + <string name="gpu_ubwc_restart">Starta om DroidDeck för att tillämpa.</string> <string name="gpu_set_with_display">Ställs in tillsammans med skärmdrivrutinen: %1$s innehåller båda.</string> <string name="gpu_set_with_runtime">Ställs in tillsammans med körmiljödrivrutinen: %1$s innehåller båda.</string> <string name="gpu_runtime_hint">Används av spel och skrivbordet.</string> @@ -1250,10 +1313,15 @@ <string name="pip_auto">Öppna bild-i-bild automatiskt</string> <string name="unfolded_controls">Kontroller på den uppfällda skärmen</string> <string name="unfolded_controls_hint">Uppfälld ligger spelet ovanför Steam Decks styrplattor och greppknappar. Hopfälld visas spelet i helskärm.</string> + <string name="unfolded_controls_with_controller">Behåll dem med en handkontroll</string> + <string name="unfolded_controls_with_controller_hint">Visa även de här pekkontrollerna medan en handkontroll är ansluten.</string> <string name="pip_suspended">Pausad</string> <string name="pip_not_ready">Bild-i-bild blir tillgängligt när sessionen är redo.</string> <string name="pip_permission">Tillåt bild-i-bild för DroidDeck i Android-inställningarna.</string> <string name="pip_unavailable">Android kunde inte öppna bild-i-bild.</string> + <string name="game_more">Mer</string> + <string name="game_edit_art">Redigera grafik</string> + <string name="stores_in_steam_label">I Steam</string> <string name="game_shortcut">Genväg</string> <string name="game_shortcut_add">Lägg till på hemskärmen</string> <string name="game_shortcut_choose">Välj spel</string> @@ -1277,6 +1345,10 @@ <string name="main_wait_runtime">Vänta tills åtgärden på körmiljön är klar</string> <string name="main_wait_proton_install">Vänta tills installationen av kompatibilitetsverktyget är klar</string> + <string name="load_compat_title">Förbereder kompatibilitetsverktyg</string> + <string name="load_compat_wait">Väntar på att kompatibilitetskonfigurationen ska bli klar</string> + <string name="load_compat_hint">Sessionen startar när konfigurationen är klar.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Vänta tills installationen av skrivbordsappen är klar</string> <string name="main_wait_install_game">Vänta tills installationen är klar innan du startar ett spel</string> <string name="main_saves_close_session">Stäng Steam-sessionen först, så att spelet inte skriver över importen</string> @@ -1313,6 +1385,9 @@ <string name="main_install_anyway">Installera trots det</string> <string name="main_remove_runtime_title">Ta bort Linux-körmiljön</string> <string name="main_remove_runtime_text">Det här tar bort körmiljön, Steam-klienten i den och alla spel som är installerade där.</string> + <string name="runtime_actions_title">Linux-körmiljö</string> + <string name="runtime_actions_text">Reparera installerar om körmiljöns systemfiler och behåller Steam, dina spel och inställningar. Tillägg som skrivbordet installeras igen nästa gång du använder dem. Ta bort raderar allt.</string> + <string name="runtime_repair">Reparera körmiljön</string> <string name="main_applied">Tillämpat: %1$s</string> <string name="android_app_open_failed_primary">Kunde inte öppna %1$s på den primära skärmen</string> <string name="android_app_open_failed_on">Kunde inte öppna %1$s på %2$s</string> @@ -1442,6 +1517,11 @@ <string name="session_runtime_catalog_unreachable">Kunde inte nå körmiljökatalogen. Kontrollera anslutningen och tryck på Spela igen.</string> <string name="session_runtime_install_failed">Linux-körmiljön installerades inte. Kontrollera körmiljön i Konfiguration och tryck på Spela igen.</string> <string name="session_desktop_install_failed">Skrivbordet installerades inte (%1$s). Kontrollera anslutningen och tryck på Skrivbord igen.</string> + <string name="session_package_resume_failed">En avbruten installation kunde inte slutföras (%1$s). Kontrollera anslutningen och utrymmet och försök sedan igen.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux-körmiljön är skadad: %1$d bibliotekslänk pekar på en saknad fil (%2$s), oftast efter en avbruten installation. Reparera behåller dina spel och inställningar.</item> + <item quantity="other">Linux-körmiljön är skadad: %1$d bibliotekslänkar pekar på saknade filer (%2$s med flera), oftast efter en avbruten installation. Reparera behåller dina spel och inställningar.</item> + </plurals> <string name="session_ended_named">%1$s stoppades oväntat. Dela loggarna i en felrapport, eller försök igen.</string> <string name="session_ended_program">Programmet stoppades oväntat. Dela loggarna i en felrapport, eller försök igen.</string> <string name="session_ended_desktop">Skrivbordet stoppades oväntat. Dela loggarna i en felrapport, eller försök igen.</string> @@ -1456,6 +1536,13 @@ <string name="mode_decky_plugins_hint">Installera en plugin-zip för nästa Steam-session.</string> <string name="mode_decky_plugin_downloading">Laddar ned…</string> <string name="mode_decky_plugin_install_zip">Installera från zip</string> + <string name="decky_zip_warning_title">Installation av tredjepartstillägg</string> + <string name="decky_zip_warning_text">Decky Loader-teamet har inte granskat det här tillägget. Det kan innehålla skadlig kod, till exempel program som stjäl ditt Steam-konto eller skadar din enhet. Genom att installera tillägget godkänner du att du tar på dig alla risker för din enhet.</string> + <string name="decky_zip_warning_continue">Fortsätt</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Vänta %1$d sekund</item> + <item quantity="other">Vänta %1$d sekunder</item> + </plurals> <string name="store_cat_games">Spel</string> <string name="store_cat_audio_video">Ljud & video</string> <string name="store_cat_graphics">Grafik</string> @@ -1511,7 +1598,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">Mellanslag</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1617,6 +1704,8 @@ <string name="fm_accept">Acceptera</string> <string name="fm_decline">Avböj</string> <string name="fm_drive_not_readable">%1$s är monterad men inte läsbar just nu</string> + <string name="fm_drive_access_title">Tillåt åtkomst till %1$s</string> + <string name="fm_drive_access_text">Android låter DroidDeck se den här enheten men inte läsa den. Slå på Åtkomst till alla filer för DroidDeck och kom sedan tillbaka.</string> <string name="fm_list_view">Listvy</string> <string name="fm_grid_view">Rutnätsvy</string> <string name="fm_search">Sök</string> @@ -1661,7 +1750,7 @@ <string name="ctrl_tint_white">Vit</string> <string name="ctrl_tint_violet">Lila</string> <string name="ctrl_tint_green">Grön</string> - <string name="ctrl_tint_amber">Amber</string> + <string name="ctrl_tint_amber">Bärnsten</string> <string name="ctrl_tint_red">Röd</string> <string name="ctrl_tint_pink">Rosa</string> <string name="ctrl_button_a">A-knappen</string> @@ -1688,6 +1777,89 @@ <string name="second_mode_keyboard_trackpad">Tangentbord + styrplatta</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck-grepp + styrplattor</string> + <string name="second_mode_dashboard">Översikt</string> + <string name="bottom_dashboard_empty">Inget att visa här än.</string> + <string name="bottom_page_downloads">Nedladdningar</string> + <string name="bottom_downloads_none">Inga nedladdningar pågår.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Laddar ned shadercache</string> + <string name="bottom_downloads_paused">Pausad</string> + <string name="bottom_downloads_queued">Väntar på att starta</string> + <string name="bottom_page_notifications">Aviseringar</string> + <string name="bottom_notifications_listener">DroidDecks nedre skärm</string> + <string name="bottom_notifications_why">Visa meddelanden och andra aviseringar här medan du spelar. De visas bara på den här skärmen och sparas inte. Android frågar en gång: sidan för aviseringsåtkomst öppnas på den här skärmen; slå på DroidDeck där så kommer den här sidan tillbaka av sig själv.</string> + <string name="bottom_notifications_allow">Tillåt aviseringsåtkomst</string> + <string name="bottom_notifications_none">Inga aviseringar.</string> + <string name="bottom_notifications_count">%1$d aviseringar</string> + <string name="bottom_notifications_clear">Rensa</string> + <string name="bottom_page_screenshots">Skärmbilder</string> + <string name="stats_fps_needs_hud">FPS kräver att HUD:en är på</string> + <string name="stats_speed">Hastighet</string> + <string name="stats_pedals">Pedaler</string> + <string name="stats_gforce">G-kraft</string> + <string name="stats_timing">Tidtagning</string> + <string name="stats_best_lap">Bästa varv</string> + <string name="stats_tires">Däck °C</string> + <string name="stats_trace">Gas och broms, senaste 10 s</string> + <string name="stats_speed_chart">Hastighet, %1$s</string> + <string name="stats_gear">Växel</string> + <string name="stats_steam_client_arm">Steam-klient ARM</string> + <string name="stats_steam_client_x86">Steam-klient x86</string> + <string name="stats_throttle">Gas</string> + <string name="stats_brake">Broms</string> + <string name="stats_lights">Instrumentpanel</string> + <string name="stats_lamp_shift">Växla</string> + <string name="stats_lamp_handbrake">Handbroms</string> + <string name="stats_lamp_pit">Depåbegränsare</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Olja %1$s °C</string> + <string name="stats_power">Kraftfördelare</string> + <string name="stats_fuel_t">Bränsle, t</string> + <string name="stats_fuel_main">Huvudtank %1$s t</string> + <string name="stats_fuel_reserve">Reserv %1$s t</string> + <string name="bottom_telemetry_send_title">Skicka data till instrumentpanelen</string> + <string name="bottom_telemetry_send_auto">Automatiskt</string> + <string name="bottom_telemetry_send_auto_hint">Slår på det för alla spel i listan, även spel som hittas senare. Spel som du stänger av förblir avstängda.</string> + <string name="bottom_telemetry_send_note">Detta ändrar spelets egen inställning för datautmatning. Ändringen gäller nästa gång spelet startar; när du stänger av den återställs den gamla inställningen.</string> + <string name="bottom_telemetry_send_close">Stäng %1$s för att ändra detta.</string> + <string name="bottom_telemetry_send_failed">Det gick inte att ändra inställningarna för %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: slå på %2$s i spelets inställningar med IP 127.0.0.1 och port %3$d.</string> + <string name="bottom_shots_where">Sparas i Pictures/DroidDeck. Steam-skärmbilder visas också här.</string> + <string name="bottom_shots_take">Ta skärmbild</string> + <string name="bottom_shots_saved">Skärmbilden har sparats.</string> + <string name="bottom_shots_failed">Det gick inte att ta en skärmbild.</string> + <string name="bottom_shots_none">Inga skärmbilder än.</string> + <string name="bottom_page_chat">Chatt och röst</string> + <string name="bottom_chat_why">Läs och svara på Steam-chatten här medan spelet fortsätter att köras på huvudskärmen. Kontot som Steam är inloggat med används.</string> + <string name="bottom_chat_not_signed_in">Steam har ingen webbinloggning att dela än, så logga in här en gång.</string> + <string name="bottom_chat_stopped">Android stängde chattsidan medan DroidDeck var i bakgrunden. Den öppnas igen när du kommer tillbaka till DroidDeck.</string> + <string name="bottom_chat_open">Öppna Steam Chat</string> + <string name="bottom_chat_close">Stäng chatten</string> + <string name="bottom_chat_mic_on">Mikrofon på</string> + <string name="bottom_chat_mic_off">Mikrofon av</string> + <string name="bottom_chat_mic_unavailable">Mikrofonen är avstängd för det här spelet. Slå på Mikrofon i DroidDecks Steam-inställningar (Ljud) och starta spelet igen för att prata.</string> + <string name="bottom_chat_volume">Volym %1$d%%</string> + <string name="bottom_page_telemetry">Statistik i spelet</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Batteri</string> + <string name="bottom_telemetry_lap">Varv</string> + <string name="bottom_telemetry_position">Placering</string> + <string name="bottom_telemetry_this_lap">Detta varv</string> + <string name="bottom_telemetry_last_lap">Senaste varv</string> + <string name="bottom_telemetry_fuel">Bränsle</string> + <string name="bottom_telemetry_cargo">Last</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Rättslig status</string> + <string name="bottom_telemetry_balance">Saldo</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Port %1$d tar emot data (%2$d paket på %3$d byte), men i ett format som den här sidan inte kan läsa än.</string> + <string name="bottom_telemetry_port_busy">Ett annat program använder redan port %1$s, så det spelet kan inte visas här.</string> <string name="rtinst_removing">Tar bort Linux-körmiljön</string> <plurals name="rtinst_removing_entries"> @@ -1718,6 +1890,7 @@ <string name="flatpakmgr_not_ready">Konfigurera Flatpak först</string> <string name="flatpakmgr_starting">Startar</string> <string name="flatpakmgr_exit_status">Flatpak avslutades med status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s är byggd för %2$s, som DroidDeck inte kan köra. Flatpak-appar här behöver en ARM64- eller x86_64-version.</string> <string name="flatpakmgr_installing">Installerar %1$s</string> <string name="flatpakmgr_updating">Uppdaterar %1$s</string> <string name="flatpakmgr_removing">Tar bort %1$s</string> @@ -1811,6 +1984,7 @@ <string name="adbpair_applying">Tillämpar inställningen…</string> <string name="adbpair_command_failed">Kommandot för trådlös felsökning misslyckades</string> <string name="adbpair_channel_name">Konfiguration av trådlös felsökning</string> + <string name="adbpair_progress_channel_name">Förlopp för konfiguration av trådlös felsökning</string> <string name="adbpair_channel_description">Frågar efter parkopplingskoden för trådlös felsökning medan Inställningar är öppen</string> <string name="adbpair_title_pair">Parkoppla trådlös felsökning</string> <string name="adbpair_waiting_text">Slå på trådlös felsökning och tryck sedan på ”Parkoppla enhet med parkopplingskod”.</string> @@ -1919,6 +2093,7 @@ <string name="gpuinfo_not_adreno">Inte en Adreno-GPU</string> <string name="gpuinfo_supported">Stöds</string> <string name="gpuinfo_experimental">Experimentell: dess drivrutiner är testversioner</string> + <string name="gpuinfo_a850_experimental">Experimentellt stöd för Adreno 850: kräver kompatibla experimentella skärm- och speldrivrutiner; inte verifierat på den här enheten</string> <string name="gpuinfo_below_tested">Under testad maskinvara (Adreno 725 och nyare): det kan hända att det inte fungerar</string> <string name="gpuinfo_unsupported">Stöds inte: DroidDeck behöver en Adreno-GPU (Snapdragon)</string> @@ -2015,6 +2190,7 @@ <string name="display_look_filter">%1$s Ställer in skalning till %2$s.</string> <string name="display_match_screen">Matcha skärmen (%1$d×%2$d)</string> <string name="display_follow_screen">Följ skärmen (ändrar storlek vid vikning)</string> + <string name="display_follow_screen_scaled">Skalad %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Visa enhetsinformation</string> <string name="device_info_hide">Dölj enhetsinformation</string> @@ -2121,6 +2297,13 @@ <string name="stores_resume">Återuppta</string> <string name="stores_refresh">Uppdatera</string> <string name="stores_sort">Sortera</string> + <string name="setup_rail_labels">Sidofältets etiketter</string> + <string name="setup_rail_labels_hint">Visa namn under ikonerna i sidofältet. Stäng av för ett smalare sidofält.</string> + <string name="library_display">Visning</string> + <string name="library_display_larger">Större kort</string> + <string name="library_display_smaller">Mindre kort</string> + <string name="library_display_title">Visa titel</string> + <string name="library_display_size">Visa storlek</string> <string name="stores_sort_last_played">Senast spelade</string> <string name="stores_sort_recently_installed">Senast installerade</string> <string name="stores_sort_title_asc">Titel A–Ö</string> @@ -2247,6 +2430,9 @@ <string name="stores_download_manager">Nedladdningshanterare</string> <string name="stores_parallel">Samtidiga nedladdningar</string> <string name="stores_install_where">Installera till</string> + <string name="stores_install_language">Spelspråk</string> + <string name="stores_install_language_hint">GOG och Epic installerar det här språket. System följer appens språk.</string> + <string name="stores_install_language_system">System</string> <string name="stores_install_title">Installera %1$s:</string> <string name="stores_target_internal">Internminne</string> <string name="stores_target_free">%1$s ledigt</string> @@ -2285,6 +2471,9 @@ <string name="edit_target">Mål</string> <string name="edit_start_in">Starta i</string> <string name="edit_launch_options">Startalternativ</string> + <string name="edit_launch_options_steam_hint">Delas med Egenskaper i Steam: en ändring på det ena stället syns på båda.</string> + <string name="edit_launch_options_not_saved">Det gick inte att spara startalternativen i Steam. Försök igen.</string> + <string name="edit_launch_options_desktop">Steam kan vara öppet i skrivbordssessionen. Ändra startalternativen under Egenskaper där, eller stäng sessionen först.</string> <string name="edit_artwork">Bildmaterial</string> <string name="edit_other_exe">Annan exe…</string> <string name="edit_remove">Ta bort</string> @@ -2412,6 +2601,7 @@ <string name="setup_download_source_custom">Eget prefix</string> <string name="setup_download_mirror">Webbplats</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">HTTP-proxy</string> <string name="flathub_eyebrow">LINUX-APPAR</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Skrivbordsappar för Linux-skrivbordet, öppnas från Skrivbordsläge.</string> @@ -2552,6 +2742,22 @@ <string name="glasses_tracking_flat_hint">Automatiskt håller det här 2D-spelet fast i synfältet. Välj Virtuell skärm under Skärm för att använda huvudspårning.</string> <string name="glasses_tracking_sbs_hint">Huvudspårning gäller en virtuell skärm eller ett SteamVR-spel som körs.</string> <string name="glasses_hardware">Enhet</string> + <string name="vr_controllers_tab">Handkontroller</string> + <string name="vr_controllers_group">SteamVR-handkontroller</string> + <string name="vr_controllers_emulate">Handkontroll i VR</string> + <string name="vr_controllers_emulate_hint">De två VR-händer som din handkontroll agerar som. Ändringar gäller direkt, även medan SteamVR körs. Joy-Cons och spårade händer tar fortfarande över sin sida.</string> + <string name="vr_controllers_off">Vanlig handkontroll</string> + <string name="vr_controllers_index">Valve Index-handkontroller</string> + <string name="vr_controllers_touch">Meta Quest 3-handkontroller</string> + <string name="vr_controllers_vive">HTC Vive-handkontroller</string> + <string name="vr_controllers_sticks">Spakarna börjar med att</string> + <string name="vr_controllers_sticks_hint">Tryck in båda spakarna samtidigt i VR för att växla.</string> + <string name="vr_controllers_sticks_game">Flytta dig i spelet</string> + <string name="vr_controllers_sticks_hands">Flytta händerna</string> + <string name="vr_controllers_buttons">Knappar</string> + <string name="vr_controllers_buttons_stick">Avtryckare är avtryckare, bumprar greppar, A/B och X/Y är varje hands frontknappar, spakklick klickar på tumspakarna, Guide öppnar SteamVR-menyn. Styrkorset upp och ned flyttar händerna närmare eller längre bort.</string> + <string name="vr_controllers_buttons_vive">Spakarna är styrplattor; A/X eller ett spakklick trycker på dem. Avtryckare är avtryckare, bumprar greppar, Start och Select är meny, Guide öppnar SteamVR-menyn.</string> + <string name="vr_controllers_buttons_off">Inga VR-händer. Spel som stöder handkontroll, och SteamVR-menyn, får din handkontroll som vanligt.</string> <string name="glasses_brightness">Ljusstyrka</string> <string name="glasses_volume">Volym</string> <string name="glasses_sunblock">Solskydd</string> @@ -2609,6 +2815,12 @@ <string name="hand_camera_placement">Kameraplacering</string> <string name="hand_camera_placement_hint">Kontrollera att kameran kan se dig innan du spelar.</string> <string name="hand_camera_check">Kontrollera</string> + <string name="tracking_pack_title">Nedladdning av handspårning</string> + <string name="tracking_pack_hint">Handspårning kräver en engångsnedladdning på %1$s.</string> + <string name="tracking_pack_download">Ladda ned</string> + <string name="tracking_pack_retry">Försök igen</string> + <string name="tracking_pack_downloading">Laddar ned handspårning… %1$d%%</string> + <string name="tracking_pack_failed">Det gick inte att ladda ned handspårning. Kontrollera anslutningen och försök igen.</string> <string name="hand_camera_check_title">Kameraplacering</string> <string name="hand_camera_how_rear">Ställ enheten upprätt 1,5 till 2 meter bort, på ungefär bröstnivå, med den bakre kameran vänd mot dig. Kliv sedan in i bild med händerna ute.</string> <string name="hand_camera_how_front">Ställ enheten upprätt 1,5 till 2 meter bort, på ungefär bröstnivå, med skärmen vänd mot dig. Kliv sedan in i bild med händerna ute.</string> @@ -2680,6 +2892,21 @@ <string name="storage_safe_hint">Oanvända körmiljöer, rester, gamla loggar</string> <string name="storage_clean_up">Rensar…</string> <string name="storage_session_running">Stoppa sessionen för att rensa eller ta bort något. Storlekarna syns fortfarande.</string> + <string name="storage_default_group">Installationsplats</string> + <string name="storage_default_title">Standardlagring</string> + <string name="storage_default_hint">Nya butiksinstallationer hamnar på den valda platsen. Befintliga spel stannar där de är. Steam-bibliotek har sin egen inställning.</string> + <string name="storage_default_ask">Fråga varje gång</string> + <string name="storage_default_ask_detail">Välj mål för varje installation</string> + <string name="storage_default_internal">Intern lagring</string> + <string name="storage_default_external">Extern lagring</string> + <string name="storage_default_external_detail">%1$s · %2$s ledigt</string> + <string name="storage_default_external_missing">Inte ansluten</string> + <string name="storage_default_folder">Mapp · %1$s</string> + <string name="storage_default_folder_free">%1$s ledigt</string> + <string name="storage_default_folder_missing">Inte ansluten</string> + <string name="storage_default_choose_folder">Välj mapp…</string> + <string name="storage_default_choose_folder_detail">Använd valfri mapp på ett SD-kort eller USB-minne</string> + <string name="storage_default_note">Spel hamnar i en Games-mapp på den valda platsen. Befintliga spel flyttas inte.</string> <string name="storage_where">Vart det tar vägen</string> <string name="storage_games">Steam-spel</string> <string name="storage_game_data">Speldata</string> @@ -2801,6 +3028,9 @@ <string name="storage_data_installed">Installerade spel</string> <string name="storage_data_parts">Prefix %1$s · shaders %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Rensa shaders</string> + <string name="storage_reset_prefix">Återställ prefix</string> + <string name="storage_reset_prefix_title">Återställa prefix för %1$s?</string> + <string name="storage_reset_prefix_confirm">Raderar dess Wine-prefix (%1$s) i %2$s och återskapar det vid nästa start. Sparningar, inställningar och installerade redistributables i det går förlorade; Steam Cloud-sparningar finns kvar på ditt konto.</string> <string name="storage_data_leftovers">Borttagna spel</string> <string name="storage_steam_app">Steam-app %1$d</string> <string name="storage_leftover_unsure_detail">Prefixet innehåller fortfarande filer, kanske lokala sparfiler</string> @@ -3101,6 +3331,117 @@ <string name="spatial_saved_views_hint">Sparade vyer kan räknas om. Starta en ny kalibrering för att fånga i det aktuella spårningskoordinatsystemet.</string> <string name="spatial_model_checksum_error">Kontrollsumman för handmodellen inte överensstämmer</string> <string name="spatial_opencv_load_error">OpenCV kunde inte laddas</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Synkronisera med Syncthing</string> + <string name="sync_enable_hint">Det här är en Syncthing-implementering baserad på Syncthing-Fork som låter dig synkronisera filer i DroidDecks interna filsystem med andra Syncthing-instanser. Den gäller bara filer som du lagrar i DroidDecks interna filsystem.</string> + <string name="sync_missing">Den här versionen innehåller inte Syncthing.</string> + <string name="sync_starting">Startar Syncthing</string> + <string name="sync_status_starting">Startar</string> + <string name="sync_status_up_to_date">Aktuell</string> + <string name="sync_status_syncing">Synkroniserar</string> + <string name="sync_status_paused">Pausad</string> + <string name="sync_status_pausing">Pausar</string> + <string name="sync_status_resuming">Återupptar</string> + <string name="sync_status_attention">Behöver åtgärdas</string> + <string name="sync_status_failed">Syncthing har stoppats</string> + <string name="sync_failed_retry">Försök igen</string> + <string name="sync_paused_wifi">Pausad tills Wi-Fi finns</string> + <string name="sync_paused_game">Pausad under spelet</string> + <string name="sync_summary">%1$d mappar · %2$d av %3$d enheter anslutna</string> + <string name="sync_left">%1$s kvar</string> + <string name="sync_open_web_ui">Öppna webbgränssnittet</string> + <string name="sync_pause">Pausa</string> + <string name="sync_resume">Återuppta</string> + <string name="sync_running">Körs</string> + <string name="sync_running_hint">Stäng av för att stoppa Syncthing helt.</string> + <string name="sync_this_device">Den här enheten</string> + <string name="sync_device_id">Enhets-ID</string> + <string name="sync_show_qr">Visa QR-kod</string> + <string name="sync_advanced">Avancerat</string> + <string name="sync_advanced_hint">Portar, när den ska köras, återställning</string> + <string name="sync_open">Öppna</string> + <string name="sync_waiting">Väntar på dig</string> + <string name="sync_pending_device">%1$s vill ansluta</string> + <string name="sync_pending_folder">%1$s vill dela ”%2$s”</string> + <string name="sync_pending_folder_hint">Acceptera för att välja var den sparas i DroidDeck.</string> + <string name="sync_review">Granska i webbgränssnittet</string> + <string name="sync_folders">Mappar</string> + <string name="sync_no_folders">Inga mappar än.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Aktuell</string> + <string name="sync_folder_syncing">Synkroniserar %1$d %%</string> + <string name="sync_folder_scanning">Skannar</string> + <string name="sync_folder_paused">Pausad</string> + <string name="sync_folder_out_of_sync">Inte synkroniserad</string> + <string name="sync_folder_errors">%1$d filer kunde inte synkroniseras</string> + <string name="sync_folder_blocked">Blockerad</string> + <string name="sync_folder_blocked_hint">Den här mappen ligger utanför DroidDecks lagring, så DroidDeck har pausat den. Använd appen Syncthing-Fork för att synkronisera mappar utanför DroidDeck.</string> + <string name="sync_remove_folder">Ta bort från Syncthing</string> + <string name="sync_remove_folder_hint">Inga filer raderas när den tas bort.</string> + <string name="sync_devices">Enheter</string> + <string name="sync_no_devices">Inga enheter än.</string> + <string name="sync_connected">Ansluten</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Senast sedd %1$s</string> + <string name="sync_device_id_title">Den här enhetens ID</string> + <string name="sync_device_id_hint">Lägg till en enhet i Syncthing på din andra enhet och skanna den här koden eller klistra in ID:t. Acceptera den sedan här i webbgränssnittet.</string> + <string name="sync_copy">Kopiera</string> + <string name="sync_share">Dela</string> + <string name="sync_done">Klar</string> + <string name="sync_off_title">Stänga av Syncthing?</string> + <string name="sync_off_body">Syncthing stoppas nu och förblir stoppat tills det slås på igen. Synkroniserade filer ligger kvar där de är.</string> + <string name="sync_off_forget">Radera även Syncthings konfiguration</string> + <string name="sync_off_forget_hint">Tar bort enhetens ID, mappar och enheter. När du slår på det igen börjar det från början.</string> + <string name="sync_turn_off">Stäng av</string> + <string name="sync_ports">Portar</string> + <string name="sync_port_sync">Synkronisering</string> + <string name="sync_port_discovery">Lokal identifiering</string> + <string name="sync_repick">Välj nya portar</string> + <string name="sync_repick_hint">Kontrolleras igen vid varje start.</string> + <string name="sync_repick_button">Välj om</string> + <string name="sync_reset_group">Återställ</string> + <string name="sync_api_key">API-nyckel</string> + <string name="sync_regenerate">Generera ny</string> + <string name="sync_reset">Återställ Syncthing</string> + <string name="sync_reset_hint">Nytt enhets-ID, mappar och enheter tas bort. Filer i DroidDecks lagring behålls.</string> + <string name="sync_reset_button">Återställ</string> + <string name="sync_reset_confirm_title">Återställa Syncthing?</string> + <string name="sync_running_group">Körning</string> + <string name="sync_run">Kör</string> + <string name="sync_run_open">Medan DroidDeck är öppet</string> + <string name="sync_run_background">I bakgrunden</string> + <string name="sync_wifi_only">Endast Wi-Fi</string> + <string name="sync_pause_games">Pausa under spel</string> + <string name="sync_logs">Loggar</string> + <string name="sync_logs_hint">Syncthing-utdata för den här sessionen</string> + <string name="sync_logs_share">Dela</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Konfigurera Linux-körmiljön först.</string> + <string name="sync_accept">Acceptera</string> + <string name="sync_accept_title">Spara ”%1$s” i</string> + <string name="sync_add_folder">Lägg till mapp</string> + <string name="sync_add_folder_hint">Synkronisera en mapp i DroidDecks lagring</string> + <string name="sync_choose">Välj</string> + <string name="sync_add">Lägg till</string> + <string name="sync_add_failed">Mappen kunde inte läggas till.</string> + <string name="sync_share_with">Dela med</string> + <string name="sync_share_none">Inga enheter än. Du kan dela den här mappen från webbgränssnittet senare.</string> + <string name="sync_use_folder">Använd den här mappen</string> + <string name="sync_new_folder">Ny mapp</string> + <string name="sync_location_home">Containerns hemmapp</string> + <string name="sync_location_sync">Sync-mappen</string> + <string name="sync_location_shared">DroidDecks delade lagring</string> + <string name="sync_location_card">DroidDeck på %1$s</string> + <string name="sync_location_app">DroidDecks appdata</string> + <string name="sync_web_path_locked">Nya mappar sparas i DroidDecks Sync-mapp. Använd Lägg till mapp på fliken Syncthing för att synkronisera en annan DroidDeck-mapp.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Läs in igen</string> + <string name="sync_not_running">Syncthing körs inte.</string> + <string name="session_end_steam_sigill">Steam stoppades av en otillåten instruktion (SIGILL). Det kan vara ett kompatibilitetsproblem med CPU-instruktioner eller en klientkrasch. Dela loggarna med uppgifter om din enhet.</string> + <string name="session_end_steam_try_x64">Du kan prova Steam-inställningar → Steam-klient → x86-64 (experimentellt). Det kräver en extra nedladdning och kan gå långsammare.</string> + <string name="session_end_vulkan_device">Linux-grafikdrivrutinen hittade ingen användbar Vulkan-enhet. Kontrollera att den valda Linux-GPU-drivrutinen stöder den här GPU:n.</string> + <string name="session_end_gpu_unsupported">Sessionen kan inte starta eftersom den här GPU:n saknar en kompatibel Linux Vulkan-drivrutin i den aktuella konfigurationen. Adreno Turnip-drivrutiner kan inte aktivera stöd för MediaTek/Mali-GPU:er.</string> <string name="setup_group_memory">Minne</string> <string name="setup_clear_cached">Stäng cachade appar före en session</string> <string name="setup_clear_cached_hint">När en session startar stänger DroidDeck apparna som Android håller parkerade i bakgrunden, så att spelet får mer minne. Trådlös felsökning måste vara på.</string> @@ -3125,6 +3466,12 @@ <string name="epic_client_open">Öppna</string> <string name="epic_client_install">Installera</string> <string name="game_tab_about">Om</string> + <string name="game_resources_browser">Öppnas i webbläsaren</string> + <string name="game_resource_guides">Guider</string> + <string name="game_resource_protondb_detail">Kompatibilitetsrapporter för Linux/Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">För spel med sparningar på ditt Steam-konto</string> + <string name="game_resource_search">Webbsökning</string> <string name="game_tab_install">Installera</string> <string name="game_install_location">Plats</string> <string name="game_install_folder">Mapp</string> @@ -3141,6 +3488,11 @@ <string name="stores_eyebrow_pass">tillgängligt med %1$s</string> <string name="stores_owned_in_library">Ägda spel i Bibliotek</string> <string name="library_filter_added">Tillagda</string> + <string name="library_filter">Filter</string> + <string name="library_filter_installed">Endast installerade</string> + <string name="library_filter_all_owned">Alla ägda spel</string> + <string name="library_no_installed_matches">Inga installerade spel matchar filtren.</string> + <string name="library_browse_owned">Bläddra bland ägda spel</string> <string name="game_tab_launch">Start</string> <string name="game_tab_saves_cloud">Sparade spel och moln</string> <string name="game_launch_shortcut">Steam-genväg</string> @@ -3158,6 +3510,40 @@ <string name="stores_itch_update_replaced">Utvecklaren har ersatt den här versionen med %1$s. Uppdatera till den?</string> <string name="xbox_filter_cloud">Moln</string> <string name="stores_xbox_cloud_settings">Molninställningar</string> + <string name="integration_title">Steam-integration</string> + <string name="integration_count">%1$d av %2$d på</string> + <string name="integration_set_up">Konfigurera</string> + <string name="integration_location">Plats</string> + <string name="integration_app_info">Appinfo</string> + <string name="integration_wifi">Wi-Fi-namn</string> + <string name="integration_brightness">Ljusstyrka</string> + <string name="integration_home">DroidDeck som startskärm</string> + <string name="integration_shortcuts">Systemtangenter</string> + <string name="integration_wifi_hint">Visa nätverk i Steam · kräver platsåtkomst, spåras aldrig</string> + <string name="integration_wifi_on">Nätverk visas i Steam</string> + <string name="integration_wifi_location_off">Plats är avstängd</string> + <string name="integration_wifi_denied">Plats nekad · tillåt den i Appinfo</string> + <string name="integration_brightness_hint">Steams reglage ställer in skärmens ljusstyrka</string> + <string name="integration_home_hint">Hem öppnar Steam-menyn i en session</string> + <string name="integration_shortcuts_hint">Alt+Tab, Win-tangenten och Hem-knappen stannar i sessionen</string> + <string name="integration_shortcuts_maybe_restricted">Nedtonat i Android? Appinfo → ⋮ → Tillåt begränsade inställningar</string> + <string name="integration_shortcuts_restricted">Blockerat av Android · Appinfo → ⋮ → Tillåt begränsade inställningar</string> + <string name="integration_shortcuts_service">DroidDeck-systemtangenter</string> + <string name="integration_shortcuts_service_description">Håller Alt+Tab, Win-tangenten och Hem-knappen i en aktiv DroidDeck-session i stället för Android.</string> + <string name="integration_brightness_needed">Slå på Ljusstyrka under Konfiguration → Steam-integration</string> + <string name="setup_gpu_bridge_off">Mali-brygga: av</string> + <string name="setup_gpu_bridge_on">Mali-brygga: på</string> + <string name="setup_gpu_bridge_detail">%1$s är inte en Adreno. Den experimentella Vulkan-bryggan är på: sessionen ritar via telefonens egen drivrutin. Räkna med buggar; skicka sessionsloggarna.</string> + <string name="setup_bridge_safe">Säkert läge</string> + <string name="setup_bridge_safe_on">Säkert läge: på</string> + <string name="setup_bridge_safe_off">Säkert läge: av</string> + <string name="setup_bridge_safe_on_detail">Mest kompatibelt. Rekommenderas för en ny enhet.</string> + <string name="setup_bridge_safe_off_detail">Snabbare där den här GPU:n klarade sina kontroller.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatiskt</string> + <string name="setup_bridge_dxvk_proton">DXVK: Protons egen</string> + <string name="setup_bridge_dxvk_auto_detail">Använder en äldre DXVK när den här GPU:ns Vulkan är för gammal för Protons.</string> + <string name="setup_bridge_dxvk_proton_detail">Varje Proton behåller sin egen DXVK, även där den här GPU:ns Vulkan kan vara för gammal för den.</string> <string name="apps_search_hint">Sök appar</string> <string name="apps_no_match">Inga appar matchar ”%1$s”.</string> <string name="apps_add_widget">Lägg till widget</string> @@ -3206,6 +3592,8 @@ <string name="desktop_restore_done_body">Apparna du lade till är installerade igen.</string> <string name="desktop_restore_failed_title">Viss programvara kunde inte återställas</string> <string name="desktop_restore_failed_body">Se ~/.cache/droiddeck/apt-restore.log och prova sedan sudo apt install i Konsole.</string> + <string name="gog_full_files">Inbyggda optimeringar är inte tillgängliga. Nedladdningen innehåller fullständiga ersättningsfiler.</string> + <string name="gog_recover">Verifiera patchresultatet</string> <string name="slow_usb_title">Långsam USB-anslutning</string> <string name="slow_usb_cable">%1$s är ansluten via %2$s (%3$s Mbit/s, cirka %4$d MB/s), så spel på den läses in långsamt. Använd en USB 3-kabel för 5 Gbit/s eller mer, prova att vända USB-C-kontakten eller använd en snabbare enhet.</string> <string name="slow_usb_port">%1$s är ansluten via %2$s (%3$s Mbit/s, cirka %4$d MB/s). USB-porten på den här enheten kan inte gå snabbare, så spel läses in långsamt. Internt lagringsutrymme eller ett microSD-kort kan vara snabbare.</string> @@ -3216,4 +3604,52 @@ <string name="steam_import_names_more">%1$s och %2$d till</string> <string name="steam_import_now">Starta om nu</string> <string name="steam_import_later">Senare</string> + <string name="gog_maintenance">Hantera GOG-installation</string> + <string name="gog_check">Sök efter uppdateringar</string> + <string name="gog_repair">Verifiera/reparera</string> + <string name="gog_patches">Offlinepatchar</string> + <string name="gog_refresh">Ladda ned fullständigt offlineinstallationsprogram</string> + <string name="gog_update">Uppdatera till %1$s</string> + <string name="gog_resume">Återuppta GOG-underhåll</string> + <string name="gog_open_patch">Öppna patchinstallationsprogrammet</string> + <string name="gog_patch_in_session">Slutför eller avbryt patchinstallationsprogrammet i Linux-sessionen.</string> + <string name="gog_patch_requirements">Välj en patch för din installerade version och ditt språk. Källversioner som stöds kanske inte visas.</string> + <string name="gog_no_patches">GOG har inga fristående Windows-patchar för det här spelet.</string> + <string name="gog_managed_files">Ändrade spelfiler kan ersättas.</string> + <string name="gog_patch_installer_note">Installationsprogrammet öppnas i din Linux-session.</string> + <string name="gog_download_label">Nedladdning</string> + <string name="gog_space_label">Extra utrymme</string> + <string name="gog_space_estimate_label">Uppskattat utrymme</string> + <string name="gog_repair_action">Reparera filer</string> + <string name="gog_refresh_action">Uppdatera installationen</string> + <string name="gog_select_patch">Välj</string> + <string name="stores_gamejolt_not_owned">Inte i ditt Game Jolt-bibliotek</string> + <string name="stores_gamejolt_no_build">Ingen Windows-nedladdning för det här spelet</string> + <string name="stores_gamejolt_no_exe">Inget Windows-spel hittades i nedladdningen</string> + <string name="stores_gamejolt_no_game">Spelet hittades inte på Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Det gick inte att läsa in spel från Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt svarade HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Det gick inte att läsa in nedladdningarna från Game Jolt</string> + <string name="stores_gamejolt_build_open">Öppna på Game Jolt</string> + <string name="stores_gamejolt_archive">%1$s-arkiv stöds inte</string> + <string name="stores_gamejolt_extract_failed">Det gick inte att packa upp nedladdningen (kod %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Det gick inte att nå Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt gav ingen nedladdningslänk</string> + <string name="stores_gamejolt_section_featured">Utvalda</string> + <string name="stores_gamejolt_section_hot">Populära</string> + <string name="stores_gamejolt_section_best">Bästa</string> + <string name="stores_gamejolt_section_new">Nya</string> + <string name="stores_gamejolt_price_under_30">$30 eller mindre</string> + <string name="stores_gamejolt_os_other">Övrigt</string> + <string name="stores_gamejolt_maturity_everyone">Alla åldrar</string> + <string name="stores_gamejolt_maturity_teen">Tonåringar</string> + <string name="stores_gamejolt_maturity_adult">Vuxna</string> + <string name="stores_gamejolt_status_complete">Färdigt</string> + <string name="stores_gamejolt_status_early">Tidig åtkomst</string> + <string name="stores_gamejolt_partners">Partnerspel</string> + <string name="stores_gamejolt_filter_browser">Webbläsare</string> + <string name="stores_gamejolt_filter_maturity">Åldersgräns</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partner</string> + <string name="stores_gamejolt_followed">Följda spel</string> </resources> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1d82dc425c..faaf350e24 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">ตัวเลือก VKD3D สำหรับ D3D12 nodxr ปิดการเรย์เทรซิง ใช้เฉพาะกับเกมที่จำเป็นต้องปิด</string> <string name="game_env_proton_log">ตั้งเป็น 1 เพื่อบันทึกล็อกวินิจฉัยของ Proton การบันทึกล็อกอาจลดประสิทธิภาพและใช้พื้นที่จัดเก็บ</string> <string name="game_env_wined3d">ตั้งเป็น 1 เพื่อใช้ WineD3D แบบ OpenGL แทน DXVK สำหรับทดสอบความเข้ากันได้ของ D3D9–11</string> + <string name="game_env_wined3d_renderer">ตัวเรนเดอร์สำหรับ DirectDraw, Direct3D 1-7 และเกมที่รันด้วย WineD3D โดย Vulkan จะข้ามเส้นทาง OpenGL-on-Zink และเร็วกว่ามากสำหรับเกม DirectDraw และ Direct3D 7 รุ่นเก่าบน Adreno</string> + <string name="game_env_dxvk_d3d8">ตั้งเป็น 1 เพื่อรัน Direct3D 8 ผ่าน DXVK แทน WineD3D เร็วกว่าในการทดสอบ Direct3D 8 ของ AIO Graphics Test บน Adreno</string> <string name="game_env_no_ntsync">ตั้งเป็น 1 เพื่อให้เกมนี้ไม่ใช้ ntsync (droiddeck-ntsync หรือไดรเวอร์เคอร์เนล) โดยจะใช้ droiddeck-esync เมื่อมีแพ็กที่เหมาะสม มิฉะนั้นใช้ droiddeck-fsync</string> <string name="game_env_no_esync">ตั้งเป็น 1 เพื่อปิด droiddeck-esync สำหรับเกมนี้ โดยจะใช้ droiddeck-fsync แทน หรือ droiddeck-ntsync เมื่อ fsync ปิดอยู่ด้วย</string> <string name="game_env_no_fsync">ตั้งเป็น 1 เพื่อให้เกมนี้ไม่ใช้ droiddeck-fsync โดยจะใช้ droiddeck-esync เมื่อมีแพ็กที่เหมาะสม มิฉะนั้นใช้ droiddeck-ntsync</string> <string name="game_env_fsync_first">ตั้งเป็น 1 เพื่อให้เกมนี้ทำงานบน droiddeck-fsync หรือ 0 เพื่อให้ droiddeck-esync มาก่อนเมื่อมีแพ็กที่เข้ากับ Proton นี้</string> <string name="game_env_xalia">ตั้งเป็น 0 เพื่อปิดตัวช่วยควบคุมด้วยคอนโทรลเลอร์ของ Proton สำหรับเกมนี้</string> + <string name="game_env_anticheat_offline">เปิดเป็นค่าเริ่มต้น เริ่มเกม Easy Anti-Cheat โดยไม่มีระบบป้องกันการโกงเมื่อเกมรองรับการเล่นออฟไลน์ ปิดเพื่อเปิดผ่าน Easy Anti-Cheat ตามปกติ โหมดออนไลน์ที่ต้องใช้ Easy Anti-Cheat จะยังใช้งานไม่ได้</string> <string name="game_env_hud">โอเวอร์เลย์ DXVK สำหรับ D3D9–11 fps จะแสดงอัตราเฟรม หากไม่ตั้งค่าจะซ่อนไว้</string> <string name="game_env_dxvk_config">ตั้งค่า DXVK คั่นด้วยเซมิโคลอน รุ่นใหม่ใช้ dxvk.maxFrameRate สำหรับจำกัดเฟรมเรต ควรใช้ตัวจำกัดเฟรมของเซสชันสำหรับการเล่นทั่วไป</string> + <string name="game_env_cores">คอร์ CPU สำหรับเกมนี้ เช่น 0-4 หรือ 0,2,4 แทนคอร์เกมของเซสชัน ใช้คอร์น้อยลงจะร้อนน้อยลง</string> <string name="game_env_vkd3d_limit">ขีดจำกัดอัตราเฟรม D3D12 0 คือไม่จำกัด</string> <string name="game_env_glthread">การทำเธรด OpenGL ของ Mesa true อาจช่วยเกม OpenGL ที่ติดขัดจาก CPU ทดสอบดูตามแต่ละเกม</string> <string name="sync_backend_title">การซิงค์ของ Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX รันโปรแกรม Linux x86 บนอุปกรณ์ ARM64 นี้ อัตโนมัติจะใช้งานเมื่อโปรแกรมถูกสร้างมาสำหรับ x86</string> <string name="app_fex_x86">%1$s ผ่าน FEX</string> <string name="app_fex_not_ready">โปรแกรมนี้สร้างมาสำหรับพีซี %1$s และรันผ่าน FEX ซึ่งยังไม่ได้ตั้งค่า เปิด Steam สักครั้งขณะลงชื่อเข้าใช้: DroidDeck จะดาวน์โหลด FEX และ Steam Linux Runtime ที่จำเป็น จากนั้นโปรแกรมนี้จะเปิดขึ้น</string> + <string name="session_proot_missing">ดาวน์โหลด proot ของ DroidDeck ไม่ได้ ตรวจสอบการเชื่อมต่อแล้วลองใหม่ เซสชันไม่ได้เริ่มเพราะ proot สำรองช้าเกินกว่าจะเล่นได้</string> + <string name="session_directaudio_missing">ดาวน์โหลด DirectAudio ไม่ได้ เสียงเกมในเซสชันนี้จึงใช้เส้นทางที่ช้ากว่า</string> <string name="session_end_program">โปรแกรมนี้</string> <string name="session_end_steam_download">ดาวน์โหลดไคลเอนต์ Steam ไม่ได้ เครือข่ายหรือ VPN ของคุณอาจบล็อกเซิร์ฟเวอร์ของ Steam ตรวจสอบการเชื่อมต่อแล้วลองอีกครั้ง</string> <string name="session_end_steam_setup">ตั้งค่าไคลเอนต์ Steam ไม่ได้ ตรวจสอบการเชื่อมต่อและพื้นที่ว่าง แล้วลองอีกครั้ง</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">คอนโทรลเลอร์ Xbox 360</string> <string name="mode_controller_note">Deck: ปุ่ม Quick Access และไจโร Steam Controller: เหมือนกัน พร้อมเซนเซอร์แรงจับที่ปุ่มด้านหลัง DualShock 4 และ DualSense: ไจโร และแทร็กแพดทำหน้าที่เป็นทัชแพด Xbox 360: เปิด Quick Access ด้วย Guide+A</string> <string name="mode_back">กลับ</string> + <string name="back_hold">กดค้างย้อนกลับสำหรับทางลัด Steam</string> + <string name="back_hold_hint">กดค้างย้อนกลับเพื่อเปิดการเข้าถึงด่วนหรือใช้คอมโบ Steam กับปุ่มอื่น ปิดเพื่อไม่สนใจการกดค้าง การแตะและแตะสองครั้งยังใช้ได้</string> + <string name="back_native_qam_hint">กดปุ่ม Back ค้างไว้ 700 ms หรือกด Back ค้างแล้วกดปุ่มอื่นเพื่อใช้ทางลัดของ Steam</string> + <string name="back_double_tap_window">ช่วงเวลาแตะสองครั้ง</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">อนุญาตการควบคุมความสว่าง</string> + <string name="brightness_permission_text">ตั้งค่าการควบคุมความสว่างใน DroidDeck</string> <string name="back_menu_then_qam">เมนู → QAM</string> <string name="back_qam_then_menu">QAM → เมนู</string> <string name="mode_session">เซสชัน</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">เลื่อนการหยุดพื้นหลังชั่วคราวออกไปขณะ Steam กำลังดาวน์โหลดอยู่</string> <string name="mode_suspend_note">อัตโนมัติจะหยุดชั่วคราวเมื่ออยู่ในพื้นหลังและดำเนินการต่อเมื่อแสดงผล กำหนดเองรอการกดดำเนินการต่อ ไม่มีวันทำงานต่อเนื่องตลอด</string> <string name="mode_startup">การเริ่มทำงาน</string> - <string name="mode_steam_startup">เริ่ม Steam พร้อมกับ DroidDeck</string> - <string name="mode_steam_startup_hint">เปิดเซสชัน Steam เมื่อ DroidDeck เริ่มทำงาน</string> + <string name="mode_startup_session">เปิดเมื่อเริ่มต้น</string> + <string name="mode_startup_session_hint">เริ่มเซสชันนี้เมื่อเปิด DroidDeck</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">กำลังค้นหารุ่นที่เผยแพร่…</string> <string name="mode_decky_ready">พร้อมติดตั้ง %1$s</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">เป็นรุ่นล่าสุดแล้ว · %1$s</string> <string name="mode_decky_loader">ตัวโหลด</string> <string name="mode_decky_install_latest">ติดตั้งรุ่นล่าสุด</string> + <string name="decky_channel">ช่องทางอัปเดต</string> + <string name="decky_channel_hint">รุ่นของ Decky Loader ที่จะติดตั้ง ตัวอัปเดตของ Decky เองก็ใช้ช่องทางเดียวกัน</string> + <string name="decky_channel_stable">เสถียร</string> + <string name="decky_channel_prerelease">ก่อนเปิดตัว</string> + <string name="decky_channel_testing">ทดสอบ</string> + <string name="decky_channel_failed">บันทึกช่องทางอัปเดตของ Decky ไม่ได้</string> <string name="mode_decky_on">เริ่มพร้อมกับ Steam เมื่อเปิดใช้งาน แอปอื่นบนอุปกรณ์นี้อาจสามารถควบคุม Steam ได้</string> <string name="mode_decky_off">ปิดอยู่ พอร์ตดีบักระยะไกลของ Steam ยังคงปิดอยู่</string> <string name="mode_decky_remove_title">ถอนการติดตั้ง Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">ไคลเอนต์</string> <string name="mode_mangoapp">โอเวอร์เลย์แสดงประสิทธิภาพ</string> <string name="mode_mangoapp_hint">ปิดหากเกมขัดข้องหรือจอดำในโหมด Deck จะมีผลในเซสชันถัดไป</string> + <string name="mode_return_after_game">กลับไปที่ DroidDeck หลังเล่นเกม</string> + <string name="mode_return_after_game_hint">เมื่อเกมที่คุณเริ่มจาก DroidDeck หรือตัวเปิดเกมอื่นปิดลง Steam จะออกอย่างเรียบร้อย (บันทึกบนคลาวด์เสร็จก่อน) แล้วคุณจะกลับไปที่นั่น ปิด: อยู่ใน Steam ต่อ</string> + <string name="mode_shader_precache">แคชเชเดอร์ล่วงหน้า</string> + <string name="mode_shader_precache_hint">Steam จะดาวน์โหลดเชเดอร์ที่สร้างไว้แล้วสำหรับเกมของคุณและประมวลผลในเบื้องหลัง เกมจึงกระตุกน้อยลง การปิดช่วยประหยัดข้อมูล พื้นที่จัดเก็บ และแบตเตอรี่ โดยเกมจะสร้างเชเดอร์ระหว่างเล่นแทน เป็นการตั้งค่าเดียวกับ Downloads > Shader Pre-Caching ของ Steam มีผลในเซสชันถัดไป</string> <string name="mode_steam_repair">ซ่อมแซมไคลเอนต์ Steam</string> <string name="mode_steam_repair_hint">ดาวน์โหลดไคลเอนต์ Steam ใหม่อีกครั้งในครั้งถัดไปที่ Steam เริ่มทำงาน ใช้เมื่อ Steam ค้างอยู่ที่หน้าจอโหลด เกม การลงชื่อเข้าใช้ และการตั้งค่ายังคงอยู่</string> <string name="mode_steam_repair_queued">ไคลเอนต์ Steam จะถูกดาวน์โหลดใหม่อีกครั้งในครั้งถัดไปที่ Steam เริ่มทำงาน</string> @@ -389,6 +412,8 @@ <string name="mode_directaudio_hint">ข้าม PulseAudio เพื่อลดความหน่วง</string> <string name="mode_mic">ไมโครโฟน</string> <string name="mode_mic_hint">สำหรับการแชทด้วยเสียง</string> + <string name="drawer_mic_hint">เปิดหรือปิดการรับเสียงจากไมโครโฟนสำหรับเซสชันนี้</string> + <string name="drawer_mic_failed">เปลี่ยนไมโครโฟนไม่ได้ โปรดลองอีกครั้ง</string> <string name="mode_network">เครือข่าย</string> <string name="mode_wifi_discovery">การค้นหา Wi-Fi</string> <string name="mode_wifi_discovery_hint">แสดงชื่อ Wi-Fi และเครือข่ายใกล้เคียงใน Steam</string> @@ -430,7 +455,7 @@ <string name="comp_import_adrenotools">นำเข้า AdrenoTools zip…</string> <string name="comp_never">ไม่เคย</string> <string name="comp_nightlies_checked">ตรวจสอบ Nightlies ครั้งล่าสุด %1$s</string> - <string name="comp_title">Components</string> + <string name="comp_title">คอมโพเนนต์</string> <string name="comp_about">เกี่ยวกับ Components</string> <string name="comp_check_drivers">ตรวจสอบไดรเวอร์ใหม่</string> <string name="comp_check_nightlies">ตรวจสอบแพ็กเกจใหม่ใน Nightlies</string> @@ -549,6 +574,16 @@ <string name="perf_gsrealtime">gamescope: คิว GPU แบบเรียลไทม์</string> <string name="perf_gsrealtime_hint">ให้ความสำคัญกับงาน GPU ของตัวประกอบภาพก่อน อาจทำให้การเรียงเฟรมราบรื่นขึ้นโดยแลกกับประสิทธิภาพของเกมบางส่วน</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">หน่วยความจำ</string> + <string name="perf_cap_off">ปิด</string> + <string name="perf_cap_auto">ค่าเริ่มต้นของไดรเวอร์</string> + <string name="perf_zram_client">บีบอัด Steam ขณะเล่นเกม</string> + <string name="perf_zram_client_hint">20 วินาทีหลังเกมเริ่ม ไคลเอนต์ Steam จะถูกบีบอัดลงใน zRAM เพื่อเหลือหน่วยความจำให้เกมมากขึ้น และอ่านกลับเมื่อปิดเกม ปิดตัวเลือกนี้หากเซสชันปิดไปไม่นานหลังเริ่มเกม ขีดจำกัด RAM ด้านบนยังคงบีบอัด Steam เมื่อเซสชันใช้เกินขีดจำกัด</string> + <string name="perf_ram_cap">ขีดจำกัด RAM</string> + <string name="perf_ram_cap_hint">มีผลขณะไคลเอนต์ Steam ทำงาน ทั้งในโหมด Steam หรือจากเดสก์ท็อป เมื่อเซสชันใช้เกินค่านี้ Steam และโปรเซสอื่นที่รองรับของเซสชันจะถูกบีบอัดลงใน zRAM ตามลำดับ เป็นขีดจำกัดแบบอ่อน: ไม่มีอะไรถูกปิด แต่เกมอาจกระตุกขณะดึงหน้าหน่วยความจำกลับมา</string> + <string name="perf_ram_cap_unavailable">ต้องใช้ zRAM swap ซึ่งอุปกรณ์นี้ไม่มี</string> + <string name="perf_vram_cap">ขีดจำกัด VRAM</string> + <string name="perf_vram_cap_hint">หน่วยความจำวิดีโอที่ DXVK รายงานต่อเกม Direct3D เพื่อให้เกมจัดสรรเท็กซ์เจอร์น้อยลง การตั้งค่า DXVK ของเกมเองยังมีผลเหนือกว่า มีผลในเซสชันถัดไป</string> <string name="perf_gpuclock">ตรึง GPU ไว้ที่ความเร็วสัญญาณนาฬิกาสูงสุด</string> <string name="perf_gpuclock_hint">สำหรับ Adreno เท่านั้น สะดุดน้อยลง แต่ใช้แบตเตอรี่และเกิดความร้อนมากขึ้น</string> <string name="perf_fixes">การแก้ไขเซสชัน</string> @@ -567,6 +602,8 @@ <string name="perf_fastpath">เส้นทางลัดของ proot</string> <string name="perf_fastpath_needs_seccomp">ต้องใช้ตัวกรอง seccomp ของ proot</string> <string name="perf_fastpath_hint">ค้นหาไฟล์เร็วขึ้นและสะดุดน้อยลง ปิดหากโปรแกรมหาไฟล์ของตัวเองไม่พบ</string> + <string name="perf_cursor_composite">วาดเคอร์เซอร์ภายใน gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope จะวาดตัวชี้เองแทนการส่งให้ Android เปิดเพื่อใช้เคอร์เซอร์ที่ควบคุมด้วยคอนโทรลเลอร์ ปิดไว้จะเร็วกว่าบนโทรศัพท์ มีผลในเซสชันถัดไป</string> <string name="perf_identity">ข้อมูลประจำตัวของเซสชัน</string> <string name="perf_hostname">ชื่อโฮสต์</string> <string name="perf_hostname_hint">ชื่อที่ Steam มองเห็นสำหรับอุปกรณ์นี้ เว้นว่างไว้เพื่อคืนค่าเป็น %1$s</string> @@ -581,9 +618,11 @@ <string name="driver_delete_plain">ไฟล์ของมันจะถูกลบออกจากแอป</string> <string name="driver_delete_in_use">ไฟล์ของมันถูกลบออก เนื่องจากกำลังใช้งานอยู่ ค่าเริ่มต้นจะเข้ามาแทนที่</string> <string name="drawer_page_display">หน้าจอ</string> + <string name="drawer_frame_limit">จำกัดเฟรม</string> + <string name="drawer_frame_limit_note">จำกัดเฟรมเรตของเกมนี้ หน้าจอจะเปลี่ยนไปใช้อัตรารีเฟรชที่หารด้วยค่าที่จำกัดได้ลงตัวหากมี ค่าอื่นอาจดูไม่สม่ำเสมอ เกม Steam ใช้ Frame Limit ของ Steam ในเมนู Quick Access</string> <string name="drawer_page_effects">เอฟเฟกต์</string> <string name="drawer_page_controls">การควบคุม</string> - <string name="drawer_page_components">Components</string> + <string name="drawer_page_components">คอมโพเนนต์</string> <string name="drawer_page_controller">คอนโทรลเลอร์</string> <string name="drawer_page_settings">การตั้งค่า</string> <string name="drawer_page_desc">หน้า %1$s</string> @@ -612,8 +651,11 @@ <string name="hud_size_pill">แคปซูล</string> <string name="hud_size_minimal">มินิมอล</string> <string name="hud_size_mega">เมกะ</string> + <string name="hud_size_strip">แถบ</string> <string name="hud_locked">ล็อกตำแหน่ง</string> <string name="hud_locked_hint">ลาก HUD เพื่อย้าย กดค้างเพื่อล็อกหรือปลดล็อก ขณะล็อก ปุ่มควบคุมบนหน้าจอที่อยู่ด้านล่างยังใช้งานได้</string> + <string name="hud_snap">ยึดติดด้านข้าง</string> + <string name="hud_snap_hint">ปล่อย HUD แล้วจะย้ายไปด้านที่ใกล้กว่าของหน้าจอ ปัดเร็วๆ เพื่อเหวี่ยงไปทางนั้น</string> <string name="hud_group_look">รูปลักษณ์</string> <string name="hud_scale">ขนาดบนหน้าจอ</string> <string name="hud_color_soft">อ่อน</string> @@ -662,7 +704,6 @@ <string name="hud_export_failed">บันทึกรายงาน HUD ไม่ได้</string> <string name="hud_reset">รีเซ็ตการตั้งค่า HUD</string> <string name="hud_reset_button">รีเซ็ต</string> - <string name="hud_credit">FusionHUD โดย The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0)</string> <string name="drawer_scaling">โหมดการปรับขนาด</string> <string name="drawer_scaling_sharpness">ความคมชัดของการปรับขนาด</string> <string name="drawer_effects">เอฟเฟกต์หน้าจอ</string> @@ -697,11 +738,17 @@ <string name="drawer_touch_auto">อัตโนมัติ (%1$s)</string> <string name="drawer_keyboard">แป้นพิมพ์</string> <string name="drawer_latency">ความหน่วง</string> + <string name="drawer_low_latency">โหมดหน่วงเวลาต่ำ</string> + <string name="drawer_low_latency_hint">ใช้ CPU และแบตเตอรี่มากขึ้น</string> <string name="drawer_low_latency_controller">คอนโทรลเลอร์ความหน่วงต่ำ</string> <string name="drawer_low_latency_controller_hint">คอนโทรลเลอร์รายงานที่ 1000 Hz แทน 250 Hz ใช้ CPU เพิ่มขึ้นเล็กน้อย</string> <string name="drawer_low_latency_touch">การสัมผัสความหน่วงต่ำ</string> <string name="drawer_low_latency_touch_hint">การสัมผัสข้ามการรวมเฟรม ทำให้ระบบสัมผัสของ Steam ทำงานที่ 1000 Hz ใช้ CPU เพิ่มขึ้นเล็กน้อย</string> <string name="drawer_evdev_mouse">ช่องเมาส์ดิบ</string> + <string name="drawer_relative_mouse">เมาส์แบบสัมพัทธ์</string> + <string name="drawer_relative_mouse_auto">อัตโนมัติ</string> + <string name="drawer_relative_mouse_on">เปิด</string> + <string name="drawer_relative_mouse_off">ปิด</string> <string name="drawer_direct_cursor">เคอร์เซอร์</string> <string name="drawer_pc_keyboard">แป้นพิมพ์พีซี</string> <string name="drawer_android_keyboard">Android</string> @@ -788,6 +835,10 @@ <string name="setup_session">เซสชัน</string> <string name="setup_logs">ล็อกเซสชัน</string> <string name="setup_logs_hint">บันทึกไว้หลังจบแต่ละเซสชัน</string> + <string name="setup_game_debug_logs">บันทึกดีบักของเกม</string> + <string name="setup_game_debug_logs_hint">รวมข้อมูลวินิจฉัยของ Proton, Wine และกราฟิกในการเปิดเกมครั้งถัดไป อาจลดประสิทธิภาพและใช้พื้นที่จัดเก็บมากขึ้น</string> + <string name="setup_game_debug_logs_restart">รีสตาร์ทเซสชันนี้เพื่อบันทึกบันทึกดีบักของเกม</string> + <string name="setup_logging_update_failed">อัปเดตการบันทึกไม่ได้ ตรวจสอบสวิตช์แล้วลองใหม่</string> <string name="setup_agent_commands">เครื่องมือดีบัก</string> <string name="setup_latest_logs">ล็อกเซสชันล่าสุด</string> <string name="setup_saved_logs">ล็อกเซสชันที่บันทึกไว้</string> @@ -819,20 +870,22 @@ <string name="setup_home">ใช้เป็นหน้าจอหลัก</string> <string name="setup_home_on">DroidDeck สามารถเป็นแอปหน้าจอหลักได้</string> <string name="setup_home_off">DroidDeck จะไม่ถูกเสนอให้เป็นแอปหน้าจอหลัก</string> + <string name="setup_home_game_space_first">ในเพิ่มเกม ให้ตั้ง DroidDeck เป็นรวม</string> <string name="setup_orientation">การวางแนว</string> + <string name="setup_launcher_orientation">การวางแนวของตัวเปิดใช้</string> + <string name="setup_launcher_orientation_auto">หมุนตามอุปกรณ์</string> + <string name="setup_orientation_portrait">แนวตั้ง</string> + <string name="setup_session_orientation">การวางแนวของเซสชัน</string> + <string name="setup_session_orientation_hint">มีผลกับ Steam เกม เดสก์ท็อป และตัวแก้ไขคอนโทรลเลอร์ ค่าความละเอียดที่ตั้งไว้ล่วงหน้าจะหมุนตามเซสชัน ส่วนความกว้างและความสูงที่กำหนดเองจะคงตามที่ป้อนไว้</string> <string name="setup_orientation_auto">แนวนอนอัตโนมัติ</string> <string name="setup_orientation_landscape">แนวนอน</string> <string name="setup_orientation_reverse">แนวนอนกลับด้าน</string> <string name="setup_fullscreen">เต็มจอ</string> <string name="setup_fullscreen_on">ซ่อนแถบสถานะและแถบนำทางของ Android</string> <string name="setup_fullscreen_off">แสดงแถบสถานะและแถบนำทางของ Android</string> - <string name="setup_dual_screen">หน้าจอคู่</string> - <string name="setup_dual_screen_hint">อัตโนมัติจะใช้หน้าจอที่สองบนเครื่องพกพาที่มีหน้าจอที่สองในตัว เปิดจะใช้หน้าจอที่สองใดก็ได้ ปิดจะแสดงทุกอย่างบนหน้าจอเดียว</string> <string name="setup_dual_screen_auto">อัตโนมัติ</string> <string name="setup_dual_screen_on">เปิด</string> <string name="setup_dual_screen_off">ปิด</string> - <string name="setup_dual_screen_menu">เมนูหน้าจอล่าง</string> - <string name="setup_dual_screen_menu_hint">ย้ายส่วนต่าง ๆ และเมนูระหว่างเล่นเกมไปที่หน้าจอที่สองและพิมพ์ที่นั่น เพื่อให้หน้าจอบนแสดงเต็มพื้นที่ L2 และ R2 ใช้สลับส่วน</string> <string name="setup_dual_screen_controls">ปุ่มควบคุมหน้าจอล่างในเกม</string> <string name="setup_dual_screen_controls_hint">เปิดแทร็กแพดและแป้นพิมพ์บนหน้าจอที่สองเมื่อเริ่มเซสชัน</string> <string name="dual_typing_title">กำลังพิมพ์ให้หน้าจอบน</string> @@ -849,7 +902,7 @@ <string name="setup_tool_performance_hint">การกำหนดคอร์ CPU</string> <string name="setup_tool_roms">โฟลเดอร์ ROM</string> <string name="setup_tool_roms_hint">ตำแหน่งที่เก็บเกมของโปรแกรมจำลอง</string> - <string name="setup_card_components">Components</string> + <string name="setup_card_components">คอมโพเนนต์</string> <string name="setup_card_components_hint">FEX, DXVK, VKD3D</string> <string name="setup_card_controls">การควบคุม</string> <string name="setup_card_controls_hint">การกำหนดปุ่ม</string> @@ -981,6 +1034,14 @@ <string name="gate_step1">เปิดการตั้งค่า → ตัวเลือกสำหรับนักพัฒนา → Wireless debugging แล้วเปิดใช้งาน</string> <string name="gate_step2">แตะ “Pair device with pairing code”</string> <string name="gate_step3">พิมพ์รหัสลงในการแจ้งเตือนของ DroidDeck</string> + <string name="pairguide_build_number">ในเกี่ยวกับโทรศัพท์ แตะหมายเลขบิลด์ 7 ครั้ง</string> + <string name="pairguide_wireless">เปิดการแก้ไขข้อบกพร่องผ่าน Wi-Fi</string> + <string name="pairguide_pair">เปิดการแก้ไขข้อบกพร่องผ่าน Wi-Fi แล้วแตะ “จับคู่อุปกรณ์ด้วยรหัสการจับคู่”</string> + <string name="pairguide_child_process">เปิด “ปิดการจำกัดการประมวลผลข้อมูลย่อย”</string> + <string name="pairguide_row_child_process">ปิดการจำกัดการประมวลผลข้อมูลย่อย</string> + <string name="pairguide_row_build_number">หมายเลขบิลด์</string> + <string name="pairguide_row_wireless">การแก้ไขข้อบกพร่องผ่าน Wi-Fi</string> + <string name="pairguide_row_pair">จับคู่อุปกรณ์ด้วยรหัสการจับคู่</string> <string name="gate_waiting">กำลังรอป๊อปอัปการจับคู่…</string> <string name="gate_code_needed">พบป๊อปอัปแล้ว กรอกรหัสในการแจ้งเตือน</string> <string name="gate_status">สถานะ</string> @@ -1000,7 +1061,7 @@ <string name="wadb_enter_port">จับคู่แล้ว กรอกพอร์ตจากการตั้งค่า</string> <string name="wadb_applying">พบอุปกรณ์แล้ว กำลังปรับใช้การตั้งค่า…</string> <string name="wadb_apply_failed">ไม่สามารถปรับใช้โดยอัตโนมัติได้ ตรวจสอบที่อยู่ด้านล่างแล้วลองใหม่ %1$s</string> - <string name="wadb_title_wireless">Wireless debugging</string> + <string name="wadb_title_wireless">การแก้ไขข้อบกพร่องแบบไร้สาย</string> <string name="wadb_title_done">อัปเดตขีดจำกัดโพรเซสลูกแล้ว</string> <string name="wadb_title">เปลี่ยนขีดจำกัดโพรเซสลูก</string> <string name="wadb_lede_compact0">หากไม่พบตัวเลือกนี้ ให้จับคู่ผ่าน Wireless debugging</string> @@ -1119,7 +1180,6 @@ <string name="games_never_played">ยังไม่เคยเล่น</string> <string name="games_runtime_busy_percent">รันไทม์กำลังทำงาน · %1$d%%</string> <string name="games_runtime_busy">รันไทม์กำลังทำงาน</string> - <string name="games_runtime_first_play">รันไทม์จะติดตั้งเมื่อกด Play ครั้งแรก</string> <string name="games_runtime_update">มีอัปเดตรันไทม์</string> <string name="games_runtime_ready">● รันไทม์พร้อมใช้งาน</string> <string name="games_internal">พื้นที่จัดเก็บภายใน</string> @@ -1136,6 +1196,9 @@ <string name="gpu_hide_other">ซ่อนไดรเวอร์สำหรับ GPU อื่น</string> <string name="gpu_show_other">แสดงไดรเวอร์สำหรับ GPU อื่น</string> <string name="gpu_advanced">ขั้นสูง</string> + <string name="gpu_ubwc_title">ความเข้ากันได้ของ UBWC</string> + <string name="gpu_ubwc_hint">ลองเปิดหรือปิดหาก Steam หรือ Android แสดงเป็นแถบลายหรือกะพริบ มีผลกับไดรเวอร์ทั้งสองหลังรีสตาร์ท DroidDeck</string> + <string name="gpu_ubwc_restart">รีสตาร์ท DroidDeck เพื่อใช้การเปลี่ยนแปลง</string> <string name="gpu_set_with_display">ตั้งค่าร่วมกับไดรเวอร์แสดงผล: %1$s รวมทั้งสองอย่าง</string> <string name="gpu_set_with_runtime">ตั้งค่าร่วมกับไดรเวอร์รันไทม์: %1$s รวมทั้งสองอย่าง</string> <string name="gpu_runtime_hint">ใช้โดยเกมและเดสก์ท็อป</string> @@ -1193,7 +1256,7 @@ <string name="rail_games">ไลบรารี</string> <string name="rail_desktop">เดสก์ท็อป</string> <string name="rail_store">สโตร์</string> - <string name="rail_components">Components</string> + <string name="rail_components">คอมโพเนนต์</string> <string name="rail_apps">แอป</string> <string name="rail_setup">การตั้งค่า</string> <string name="rail_updates">การอัปเดต</string> @@ -1244,10 +1307,15 @@ <string name="pip_auto">เข้าสู่ภาพซ้อนภาพโดยอัตโนมัติ</string> <string name="unfolded_controls">การควบคุมบนหน้าจอที่กางออก</string> <string name="unfolded_controls_hint">เมื่อกางออก เกมจะอยู่เหนือแทร็กแพดและปุ่มด้านหลังของ Steam Deck เมื่อพับ เกมจะแสดงเต็มจอ</string> + <string name="unfolded_controls_with_controller">คงไว้เมื่อใช้คอนโทรลเลอร์</string> + <string name="unfolded_controls_with_controller_hint">แสดงปุ่มสัมผัสเหล่านี้ด้วยขณะเชื่อมต่อคอนโทรลเลอร์</string> <string name="pip_suspended">หยุดชั่วคราว</string> <string name="pip_not_ready">ภาพซ้อนภาพจะพร้อมใช้งานเมื่อเซสชันพร้อม</string> <string name="pip_permission">อนุญาตภาพซ้อนภาพสำหรับ DroidDeck ในการตั้งค่า Android</string> <string name="pip_unavailable">Android ไม่สามารถเปิดภาพซ้อนภาพได้</string> + <string name="game_more">เพิ่มเติม</string> + <string name="game_edit_art">แก้ไขภาพปก</string> + <string name="stores_in_steam_label">ใน Steam</string> <string name="game_shortcut">ช็อตคัต</string> <string name="game_shortcut_add">เพิ่มไปยังหน้าจอหลัก</string> <string name="game_shortcut_choose">เลือกเกม</string> @@ -1271,6 +1339,10 @@ <string name="main_wait_runtime">รอให้การดำเนินการของรันไทม์เสร็จสิ้น</string> <string name="main_wait_proton_install">รอให้การติดตั้งเครื่องมือความเข้ากันได้เสร็จสิ้น</string> + <string name="load_compat_title">กำลังเตรียมเครื่องมือความเข้ากันได้</string> + <string name="load_compat_wait">กำลังรอให้การตั้งค่าความเข้ากันได้เสร็จสิ้น</string> + <string name="load_compat_hint">เซสชันของคุณจะเริ่มเมื่อการตั้งค่าเสร็จสิ้น</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">รอให้การติดตั้งแอปเดสก์ท็อปเสร็จสิ้น</string> <string name="main_wait_install_game">รอให้การติดตั้งเสร็จสิ้นก่อนเปิดเกม</string> <string name="main_saves_close_session">ปิดเซสชัน Steam ก่อน เพื่อไม่ให้เกมบันทึกทับการนำเข้า</string> @@ -1303,6 +1375,9 @@ <string name="main_install_anyway">ติดตั้งอยู่ดี</string> <string name="main_remove_runtime_title">ลบรันไทม์ Linux</string> <string name="main_remove_runtime_text">การลบนี้จะลบรันไทม์ ไคลเอนต์ Steam ภายใน และเกมทุกเกมที่ติดตั้งอยู่ในนั้น</string> + <string name="runtime_actions_title">รันไทม์ Linux</string> + <string name="runtime_actions_text">ซ่อมแซมจะติดตั้งไฟล์ระบบของรันไทม์ใหม่โดยเก็บ Steam เกม และการตั้งค่าของคุณไว้ ส่วนเสริมอย่างเดสก์ท็อปจะติดตั้งใหม่เมื่อคุณใช้งานครั้งถัดไป ลบจะลบทุกอย่าง</string> + <string name="runtime_repair">ซ่อมแซมรันไทม์</string> <string name="main_applied">นำมาใช้แล้ว: %1$s</string> <string name="android_app_open_failed_primary">ไม่สามารถเปิด %1$s บนหน้าจอหลักได้</string> <string name="android_app_open_failed_on">ไม่สามารถเปิด %1$s บน %2$s ได้</string> @@ -1429,6 +1504,10 @@ <string name="session_runtime_catalog_unreachable">ไม่สามารถเข้าถึงแคตตาล็อกรันไทม์ได้ ตรวจสอบการเชื่อมต่อแล้วกด Play อีกครั้ง</string> <string name="session_runtime_install_failed">รันไทม์ Linux ติดตั้งไม่สำเร็จ ตรวจสอบรันไทม์ในการตั้งค่าแล้วกด Play อีกครั้ง</string> <string name="session_desktop_install_failed">เดสก์ท็อปติดตั้งไม่สำเร็จ (%1$s) ตรวจสอบการเชื่อมต่อแล้วกดเดสก์ท็อปอีกครั้ง</string> + <string name="session_package_resume_failed">การติดตั้งที่ถูกขัดจังหวะไม่สามารถทำให้เสร็จได้ (%1$s) ตรวจสอบการเชื่อมต่อและพื้นที่ แล้วลองใหม่</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">รันไทม์ Linux เสียหาย: ลิงก์ไลบรารี %1$d รายการชี้ไปยังไฟล์ที่หายไป (%2$s และอื่นๆ) มักเกิดหลังการติดตั้งถูกขัดจังหวะ การซ่อมแซมจะเก็บเกมและการตั้งค่าของคุณไว้</item> + </plurals> <string name="session_ended_named">%1$s หยุดทำงานกะทันหัน แชร์ล็อกพร้อมรายงานข้อบกพร่อง หรือลองใหม่</string> <string name="session_ended_program">โปรแกรมหยุดทำงานกะทันหัน แชร์ล็อกพร้อมรายงานข้อบกพร่อง หรือลองใหม่</string> <string name="session_ended_desktop">เดสก์ท็อปหยุดทำงานกะทันหัน แชร์ล็อกพร้อมรายงานข้อบกพร่อง หรือลองใหม่</string> @@ -1442,6 +1521,12 @@ <string name="mode_decky_plugins_hint">ติดตั้งไฟล์ ZIP พลักอินสำหรับเซสชัน Steam ครั้งถัดไป</string> <string name="mode_decky_plugin_downloading">กำลังดาวน์โหลด…</string> <string name="mode_decky_plugin_install_zip">ติดตั้งจาก ZIP</string> + <string name="decky_zip_warning_title">การติดตั้งพลักอินจากบุคคลที่สาม</string> + <string name="decky_zip_warning_text">ทีม Decky Loader ยังไม่ได้ตรวจสอบพลักอินนี้ อาจมีมัลแวร์ เช่น ซอฟต์แวร์ที่ขโมยบัญชี Steam ของคุณหรือทำอันตรายต่ออุปกรณ์ การติดตั้งพลักอินนี้ถือว่าคุณยอมรับความเสี่ยงทั้งหมดต่ออุปกรณ์ของคุณ</string> + <string name="decky_zip_warning_continue">ดำเนินการต่อ</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">โปรดรอ %1$d วินาที</item> + </plurals> <string name="store_cat_games">เกม</string> <string name="store_cat_audio_video">เสียงและวิดีโอ</string> <string name="store_cat_graphics">กราฟิก</string> @@ -1598,6 +1683,8 @@ <string name="fm_accept">ยอมรับ</string> <string name="fm_decline">ปฏิเสธ</string> <string name="fm_drive_not_readable">%1$s ติดตั้งอยู่แต่อ่านไม่ได้ในขณะนี้</string> + <string name="fm_drive_access_title">อนุญาตให้เข้าถึง %1$s</string> + <string name="fm_drive_access_text">Android ให้ DroidDeck เห็นไดรฟ์นี้แต่อ่านไม่ได้ เปิดสิทธิ์เข้าถึงไฟล์ทั้งหมดให้ DroidDeck แล้วกลับมาที่นี่</string> <string name="fm_list_view">มุมมองรายการ</string> <string name="fm_grid_view">มุมมองตาราง</string> <string name="fm_search">ค้นหา</string> @@ -1668,6 +1755,89 @@ <string name="second_mode_keyboard_trackpad">แป้นพิมพ์ + แทร็กแพด</string> <string name="second_mode_terminal">เทอร์มินัล</string> <string name="second_mode_deck_controls">ปุ่มด้านหลังและแทร็กแพดของ Deck</string> + <string name="second_mode_dashboard">แดชบอร์ด</string> + <string name="bottom_dashboard_empty">ยังไม่มีอะไรให้แสดงที่นี่</string> + <string name="bottom_page_downloads">ดาวน์โหลด</string> + <string name="bottom_downloads_none">ไม่มีการดาวน์โหลดที่กำลังทำงาน</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">กำลังดาวน์โหลดแคชเชเดอร์</string> + <string name="bottom_downloads_paused">หยุดชั่วคราว</string> + <string name="bottom_downloads_queued">กำลังรอเริ่ม</string> + <string name="bottom_page_notifications">การแจ้งเตือน</string> + <string name="bottom_notifications_listener">หน้าจอล่างของ DroidDeck</string> + <string name="bottom_notifications_why">แสดงข้อความและการแจ้งเตือนอื่นๆ ที่นี่ขณะที่คุณเล่น การแจ้งเตือนจะแสดงบนหน้าจอนี้เท่านั้นและจะไม่ถูกบันทึก Android จะถามเพียงครั้งเดียว: หน้าการเข้าถึงการแจ้งเตือนจะเปิดขึ้นบนหน้าจอนี้ เปิด DroidDeck ที่นั่น แล้วหน้านี้จะกลับมาเอง</string> + <string name="bottom_notifications_allow">อนุญาตการเข้าถึงการแจ้งเตือน</string> + <string name="bottom_notifications_none">ไม่มีการแจ้งเตือน</string> + <string name="bottom_notifications_count">การแจ้งเตือน %1$d รายการ</string> + <string name="bottom_notifications_clear">ล้าง</string> + <string name="bottom_page_screenshots">ภาพหน้าจอ</string> + <string name="stats_fps_needs_hud">ต้องเปิด HUD เพื่อแสดง FPS</string> + <string name="stats_speed">ความเร็ว</string> + <string name="stats_pedals">แป้นเหยียบ</string> + <string name="stats_gforce">แรง G</string> + <string name="stats_timing">การจับเวลา</string> + <string name="stats_best_lap">รอบที่ดีที่สุด</string> + <string name="stats_tires">ยาง °C</string> + <string name="stats_trace">คันเร่งและเบรก 10 s ล่าสุด</string> + <string name="stats_speed_chart">ความเร็ว, %1$s</string> + <string name="stats_gear">เกียร์</string> + <string name="stats_steam_client_arm">ไคลเอนต์ Steam ARM</string> + <string name="stats_steam_client_x86">ไคลเอนต์ Steam x86</string> + <string name="stats_throttle">คันเร่ง</string> + <string name="stats_brake">เบรก</string> + <string name="stats_lights">แผงหน้าปัด</string> + <string name="stats_lamp_shift">เปลี่ยนเกียร์</string> + <string name="stats_lamp_handbrake">เบรกมือ</string> + <string name="stats_lamp_pit">ตัวจำกัดความเร็วพิต</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">เทอร์โบ %1$s bar</string> + <string name="stats_engine_temp">เครื่องยนต์ %1$s °C</string> + <string name="stats_oil_temp">น้ำมันเครื่อง %1$s °C</string> + <string name="stats_power">ตัวกระจายพลังงาน</string> + <string name="stats_fuel_t">เชื้อเพลิง, t</string> + <string name="stats_fuel_main">หลัก %1$s t</string> + <string name="stats_fuel_reserve">สำรอง %1$s t</string> + <string name="bottom_telemetry_send_title">ส่งข้อมูลแดชบอร์ด</string> + <string name="bottom_telemetry_send_auto">อัตโนมัติ</string> + <string name="bottom_telemetry_send_auto_hint">เปิดใช้สำหรับทุกเกมที่แสดงที่นี่ รวมถึงเกมที่พบในภายหลัง เกมที่คุณปิดไว้จะยังคงปิดอยู่</string> + <string name="bottom_telemetry_send_note">การตั้งค่านี้จะเปลี่ยนการตั้งค่าการส่งออกข้อมูลของเกมเอง และมีผลในครั้งถัดไปที่เกมเริ่มทำงาน การปิดจะคืนค่าการตั้งค่าเดิม</string> + <string name="bottom_telemetry_send_close">ปิด %1$s เพื่อเปลี่ยนการตั้งค่านี้</string> + <string name="bottom_telemetry_send_failed">เปลี่ยนการตั้งค่าของ %1$s ไม่ได้</string> + <string name="bottom_telemetry_send_menu">%1$s: เปิด %2$s ในการตั้งค่าของเกม โดยใช้ IP 127.0.0.1 และพอร์ต %3$d</string> + <string name="bottom_shots_where">บันทึกไว้ที่ Pictures/DroidDeck ภาพหน้าจอของ Steam จะแสดงที่นี่ด้วย</string> + <string name="bottom_shots_take">ถ่ายภาพหน้าจอ</string> + <string name="bottom_shots_saved">บันทึกภาพหน้าจอแล้ว</string> + <string name="bottom_shots_failed">ถ่ายภาพหน้าจอไม่ได้</string> + <string name="bottom_shots_none">ยังไม่มีภาพหน้าจอ</string> + <string name="bottom_page_chat">แชทและเสียง</string> + <string name="bottom_chat_why">อ่านและตอบแชท Steam ที่นี่ขณะที่เกมยังทำงานบนหน้าจอหลัก โดยใช้บัญชีที่ลงชื่อเข้าใช้ Steam อยู่</string> + <string name="bottom_chat_not_signed_in">Steam ยังไม่มีการลงชื่อเข้าใช้เว็บที่แชร์ได้ โปรดลงชื่อเข้าใช้ที่นี่หนึ่งครั้ง</string> + <string name="bottom_chat_stopped">Android ปิดหน้าแชทขณะที่ DroidDeck ทำงานอยู่ในเบื้องหลัง หน้าแชทจะเปิดอีกครั้งเมื่อคุณกลับมาที่ DroidDeck</string> + <string name="bottom_chat_open">เปิด Steam Chat</string> + <string name="bottom_chat_close">ปิดแชท</string> + <string name="bottom_chat_mic_on">ไมค์เปิด</string> + <string name="bottom_chat_mic_off">ไมค์ปิด</string> + <string name="bottom_chat_mic_unavailable">ไมค์ปิดอยู่สำหรับเกมนี้ หากต้องการพูด ให้เปิดไมโครโฟนในการตั้งค่า Steam ของ DroidDeck (เสียง) แล้วเริ่มเกมอีกครั้ง</string> + <string name="bottom_chat_volume">ระดับเสียง %1$d%%</string> + <string name="bottom_page_telemetry">สถิติในเกม</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">แบตเตอรี่</string> + <string name="bottom_telemetry_lap">รอบ</string> + <string name="bottom_telemetry_position">อันดับ</string> + <string name="bottom_telemetry_this_lap">รอบนี้</string> + <string name="bottom_telemetry_last_lap">รอบที่แล้ว</string> + <string name="bottom_telemetry_fuel">เชื้อเพลิง</string> + <string name="bottom_telemetry_cargo">สินค้า</string> + <string name="bottom_telemetry_pips">พิป SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">สถานะทางกฎหมาย</string> + <string name="bottom_telemetry_balance">ยอดเงิน</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">พอร์ต %1$d ได้รับข้อมูล (%2$d แพ็กเก็ต ขนาด %3$d ไบต์) แต่อยู่ในรูปแบบที่หน้านี้ยังอ่านไม่ได้</string> + <string name="bottom_telemetry_port_busy">มีโปรแกรมอื่นใช้พอร์ต %1$s อยู่แล้ว เกมนั้นจึงแสดงที่นี่ไม่ได้</string> <string name="rtinst_removing">กำลังลบรันไทม์ Linux</string> <plurals name="rtinst_removing_entries"> @@ -1697,6 +1867,7 @@ <string name="flatpakmgr_not_ready">ตั้งค่า Flatpak ก่อน</string> <string name="flatpakmgr_starting">กำลังเริ่ม</string> <string name="flatpakmgr_exit_status">Flatpak ออกด้วยสถานะ %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s สร้างมาสำหรับ %2$s ซึ่ง DroidDeck เรียกใช้ไม่ได้ แอป Flatpak ที่นี่ต้องเป็นเวอร์ชัน ARM64 หรือ x86_64</string> <string name="flatpakmgr_installing">กำลังติดตั้ง %1$s</string> <string name="flatpakmgr_updating">กำลังอัปเดต %1$s</string> <string name="flatpakmgr_removing">กำลังลบ %1$s</string> @@ -1790,6 +1961,7 @@ <string name="adbpair_applying">กำลังปรับใช้การตั้งค่า…</string> <string name="adbpair_command_failed">คำสั่ง Wireless debugging ล้มเหลว</string> <string name="adbpair_channel_name">การตั้งค่า Wireless debugging</string> + <string name="adbpair_progress_channel_name">ความคืบหน้าการตั้งค่า Wireless debugging</string> <string name="adbpair_channel_description">ขอรหัสจับคู่ Wireless debugging ขณะเปิดการตั้งค่าอยู่</string> <string name="adbpair_title_pair">จับคู่ Wireless debugging</string> <string name="adbpair_waiting_text">เปิด Wireless debugging แล้วแตะ “Pair device with pairing code”</string> @@ -1898,6 +2070,7 @@ <string name="gpuinfo_not_adreno">ไม่ใช่ GPU Adreno</string> <string name="gpuinfo_supported">รองรับ</string> <string name="gpuinfo_experimental">ทดลอง: ไดรเวอร์เป็นบิลด์ทดสอบ</string> + <string name="gpuinfo_a850_experimental">รองรับ Adreno 850 แบบทดลอง: ต้องใช้ไดรเวอร์จอแสดงผลและไดรเวอร์เกมแบบทดลองที่เข้ากันได้ ยังไม่ได้ตรวจสอบบนอุปกรณ์นี้</string> <string name="gpuinfo_below_tested">ต่ำกว่าฮาร์ดแวร์ที่ทดสอบแล้ว (Adreno 725 และรุ่นใหม่กว่า): อาจรันไม่ได้</string> <string name="gpuinfo_unsupported">ไม่รองรับ: DroidDeck ต้องใช้ GPU Adreno (Snapdragon)</string> @@ -1994,6 +2167,7 @@ <string name="display_look_filter">%1$s ตั้งการปรับขนาดเป็น %2$s</string> <string name="display_match_screen">พอดีหน้าจอ (%1$d×%2$d)</string> <string name="display_follow_screen">ตามหน้าจอ (ปรับขนาดเมื่อพับหรือกาง)</string> + <string name="display_follow_screen_scaled">ปรับสเกล %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">แสดงรายละเอียดอุปกรณ์</string> <string name="device_info_hide">ซ่อนรายละเอียดอุปกรณ์</string> @@ -2100,6 +2274,13 @@ <string name="stores_resume">ดำเนินการต่อ</string> <string name="stores_refresh">รีเฟรช</string> <string name="stores_sort">จัดเรียง</string> + <string name="setup_rail_labels">ป้ายแถบด้านข้าง</string> + <string name="setup_rail_labels_hint">แสดงชื่อใต้ไอคอนในแถบด้านข้าง ปิดเพื่อให้แถบด้านข้างแคบลง</string> + <string name="library_display">การแสดงผล</string> + <string name="library_display_larger">การ์ดใหญ่ขึ้น</string> + <string name="library_display_smaller">การ์ดเล็กลง</string> + <string name="library_display_title">แสดงชื่อ</string> + <string name="library_display_size">แสดงขนาด</string> <string name="stores_sort_last_played">เล่นล่าสุด</string> <string name="stores_sort_recently_installed">เพิ่งติดตั้ง</string> <string name="stores_sort_title_asc">ชื่อ A–Z</string> @@ -2177,7 +2358,7 @@ <string name="stores_card_proton_value">การเลือกของ Steam ต่อเกม</string> <string name="stores_card_audio">เสียง</string> <string name="stores_card_audio_value">DirectAudio</string> - <string name="stores_card_components">Components</string> + <string name="stores_card_components">คอมโพเนนต์</string> <string name="stores_card_components_value">FEX, DXVK, VKD3D</string> <string name="stores_card_engine">เอนจิน</string> <string name="stores_card_engine_value">%1$s · เนทีฟ</string> @@ -2226,6 +2407,9 @@ <string name="stores_download_manager">ตัวจัดการดาวน์โหลด</string> <string name="stores_parallel">การดาวน์โหลดพร้อมกัน</string> <string name="stores_install_where">ติดตั้งไปที่</string> + <string name="stores_install_language">ภาษาของเกม</string> + <string name="stores_install_language_hint">GOG และ Epic จะติดตั้งภาษานี้ ระบบจะใช้ภาษาตามแอป</string> + <string name="stores_install_language_system">ระบบ</string> <string name="stores_install_title">ติดตั้ง %1$s:</string> <string name="stores_target_internal">ภายใน</string> <string name="stores_target_free">เหลือ %1$s</string> @@ -2264,6 +2448,9 @@ <string name="edit_target">เป้าหมาย</string> <string name="edit_start_in">เริ่มที่</string> <string name="edit_launch_options">ตัวเลือกการเปิด</string> + <string name="edit_launch_options_steam_hint">ใช้ร่วมกับคุณสมบัติใน Steam: เปลี่ยนที่ใดที่หนึ่งก็จะแสดงในทั้งสองที่</string> + <string name="edit_launch_options_not_saved">บันทึกตัวเลือกการเปิดลงใน Steam ไม่ได้ ลองอีกครั้ง</string> + <string name="edit_launch_options_desktop">Steam อาจเปิดอยู่ในเซสชันเดสก์ท็อป เปลี่ยนตัวเลือกการเปิดในคุณสมบัติของ Steam หรือปิดเซสชันก่อน</string> <string name="edit_artwork">ภาพปก</string> <string name="edit_other_exe">exe อื่น…</string> <string name="edit_remove">ลบ</string> @@ -2389,6 +2576,7 @@ <string name="setup_download_source_custom">Prefix ของตัวเอง</string> <string name="setup_download_mirror">เว็บไซต์</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">พร็อกซี HTTP</string> <string name="flathub_eyebrow">แอป LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">แอปเดสก์ท็อปสำหรับเดสก์ท็อป Linux เปิดจากเดสก์ท็อป</string> @@ -2527,6 +2715,22 @@ <string name="glasses_tracking_flat_hint">โหมดอัตโนมัติจะตรึงเกม 2D นี้ไว้ในมุมมอง เลือก “หน้าจอเสมือน” ในส่วน “หน้าจอ” เพื่อใช้การติดตามศีรษะ</string> <string name="glasses_tracking_sbs_hint">การติดตามศีรษะใช้กับหน้าจอเสมือนหรือเกม SteamVR ที่กำลังทำงาน</string> <string name="glasses_hardware">อุปกรณ์</string> + <string name="vr_controllers_tab">คอนโทรลเลอร์</string> + <string name="vr_controllers_group">คอนโทรลเลอร์ SteamVR</string> + <string name="vr_controllers_emulate">เกมแพดใน VR</string> + <string name="vr_controllers_emulate_hint">มือ VR สองข้างที่คอนโทรลเลอร์ของคุณจำลอง การเปลี่ยนแปลงมีผลทันที แม้ขณะ SteamVR ทำงาน Joy-Con และมือที่ติดตามได้ยังคงควบคุมฝั่งของตัวเองแทน</string> + <string name="vr_controllers_off">เกมแพดปกติ</string> + <string name="vr_controllers_index">คอนโทรลเลอร์ Valve Index</string> + <string name="vr_controllers_touch">คอนโทรลเลอร์ Meta Quest 3</string> + <string name="vr_controllers_vive">ไม้ควบคุม HTC Vive</string> + <string name="vr_controllers_sticks">สติ๊กเริ่มต้นด้วยการ</string> + <string name="vr_controllers_sticks_hint">กดสติ๊กทั้งสองพร้อมกันระหว่างใช้ VR เพื่อสลับ</string> + <string name="vr_controllers_sticks_game">เคลื่อนที่ตัวคุณในเกม</string> + <string name="vr_controllers_sticks_hands">ขยับมือ</string> + <string name="vr_controllers_buttons">ปุ่ม</string> + <string name="vr_controllers_buttons_stick">ทริกเกอร์เป็นทริกเกอร์ บัมเปอร์เป็นการจับ A/B และ X/Y เป็นปุ่มหน้าของมือแต่ละข้าง การกดสติ๊กคือการกดธัมบ์สติ๊ก Guide เปิดเมนู SteamVR D-pad ขึ้นและลงขยับมือเข้าใกล้หรือออกห่าง</string> + <string name="vr_controllers_buttons_vive">สติ๊กเป็นแทร็กแพด กด A/X หรือกดสติ๊กเพื่อกดแทร็กแพด ทริกเกอร์เป็นทริกเกอร์ บัมเปอร์เป็นการจับ Start และ Select เป็นเมนู Guide เปิดเมนู SteamVR</string> + <string name="vr_controllers_buttons_off">ไม่มีมือ VR เกมที่รองรับเกมแพดและเมนู SteamVR จะรับคอนโทรลเลอร์ของคุณตามปกติ</string> <string name="glasses_brightness">ความสว่าง</string> <string name="glasses_volume">ระดับเสียง</string> <string name="glasses_sunblock">กันแดด</string> @@ -2584,6 +2788,12 @@ <string name="hand_camera_placement">ตำแหน่งกล้อง</string> <string name="hand_camera_placement_hint">ตรวจสอบว่ากล้องมองเห็นคุณก่อนเริ่มเล่น</string> <string name="hand_camera_check">ตรวจสอบ</string> + <string name="tracking_pack_title">ดาวน์โหลดการติดตามมือ</string> + <string name="tracking_pack_hint">การติดตามมือต้องดาวน์โหลด %1$s เพียงครั้งเดียว</string> + <string name="tracking_pack_download">ดาวน์โหลด</string> + <string name="tracking_pack_retry">ลองใหม่</string> + <string name="tracking_pack_downloading">กำลังดาวน์โหลดการติดตามมือ… %1$d%%</string> + <string name="tracking_pack_failed">ดาวน์โหลดการติดตามมือไม่ได้ ตรวจสอบการเชื่อมต่อแล้วลองใหม่</string> <string name="hand_camera_check_title">ตำแหน่งกล้อง</string> <string name="hand_camera_how_rear">ตั้งอุปกรณ์ให้ห่างออกไป 1.5 ถึง 2 เมตร ที่ระดับความสูงประมาณหน้าอก โดยให้กล้องหลังหันมาทางคุณ จากนั้นเดินเข้ามาในมุมมองพร้อมยื่นมือทั้งสองข้างออกมา</string> <string name="hand_camera_how_front">ตั้งอุปกรณ์ให้ห่างออกไป 1.5 ถึง 2 เมตร ที่ระดับความสูงประมาณหน้าอก โดยให้หน้าจอหันมาทางคุณ จากนั้นเดินเข้ามาในมุมมองพร้อมยื่นมือทั้งสองข้างออกมา</string> @@ -2655,6 +2865,21 @@ <string name="storage_safe_hint">รันไทม์ที่ไม่ได้ใช้ เศษที่เหลือ ล็อกเก่า</string> <string name="storage_clean_up">กำลังล้าง…</string> <string name="storage_session_running">หยุดเซสชันเพื่อล้างหรือลบอะไรก็ตาม ขนาดจะยังแสดงอยู่</string> + <string name="storage_default_group">ตำแหน่งติดตั้ง</string> + <string name="storage_default_title">พื้นที่จัดเก็บเริ่มต้น</string> + <string name="storage_default_hint">การติดตั้งใหม่จากสโตร์จะไปยังตำแหน่งที่เลือก เกมที่มีอยู่จะอยู่ที่เดิม ไลบรารี Steam ใช้การตั้งค่าของตัวเอง</string> + <string name="storage_default_ask">ถามทุกครั้ง</string> + <string name="storage_default_ask_detail">เลือกปลายทางสำหรับการติดตั้งแต่ละครั้ง</string> + <string name="storage_default_internal">พื้นที่จัดเก็บภายใน</string> + <string name="storage_default_external">พื้นที่จัดเก็บภายนอก</string> + <string name="storage_default_external_detail">%1$s · ว่าง %2$s</string> + <string name="storage_default_external_missing">ไม่ได้เชื่อมต่อ</string> + <string name="storage_default_folder">โฟลเดอร์ · %1$s</string> + <string name="storage_default_folder_free">ว่าง %1$s</string> + <string name="storage_default_folder_missing">ไม่ได้เชื่อมต่อ</string> + <string name="storage_default_choose_folder">เลือกโฟลเดอร์…</string> + <string name="storage_default_choose_folder_detail">ใช้โฟลเดอร์ใดก็ได้บนการ์ด SD หรือไดรฟ์ USB</string> + <string name="storage_default_note">เกมจะอยู่ในโฟลเดอร์ Games ภายในตำแหน่งที่เลือก เกมที่มีอยู่จะไม่ถูกย้าย</string> <string name="storage_where">ไปอยู่ที่ไหน</string> <string name="storage_games">เกม Steam</string> <string name="storage_game_data">ข้อมูลเกม</string> @@ -2776,6 +3001,9 @@ <string name="storage_data_installed">เกมที่ติดตั้ง</string> <string name="storage_data_parts">Prefix %1$s · เชเดอร์ %2$s · เวิร์กชอป %3$s</string> <string name="storage_clear_shaders">ล้างเชเดอร์</string> + <string name="storage_reset_prefix">รีเซ็ต prefix</string> + <string name="storage_reset_prefix_title">รีเซ็ต prefix ของ %1$s?</string> + <string name="storage_reset_prefix_confirm">ลบ Wine prefix (%1$s) ใน %2$s และสร้างใหม่เมื่อเปิดครั้งถัดไป เซฟ การตั้งค่า และ redistributable ที่ติดตั้งไว้ข้างในจะหายไป เซฟใน Steam Cloud ยังอยู่ในบัญชีของคุณ</string> <string name="storage_data_leftovers">เกมที่ลบแล้ว</string> <string name="storage_steam_app">แอป Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefix ยังมีไฟล์อยู่ อาจเป็นเซฟในเครื่อง</string> @@ -3076,6 +3304,117 @@ <string name="spatial_saved_views_hint">มุมมองที่บันทึกไว้สามารถคำนวณใหม่ได้ เริ่มการสอบเทียบใหม่เพื่อบันทึกในระบบพิกัดการติดตามปัจจุบัน</string> <string name="spatial_model_checksum_error">ผลรวมตรวจสอบแบบจำลองมือไม่ตรงกัน</string> <string name="spatial_opencv_load_error">OpenCV ไม่สามารถโหลดได้</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">ซิงค์ด้วย Syncthing</string> + <string name="sync_enable_hint">นี่คือ Syncthing ที่อิงจาก Syncthing-Fork ซึ่งช่วยให้คุณซิงค์ไฟล์ในระบบไฟล์ภายในของ DroidDeck กับ Syncthing เครื่องอื่นได้ ใช้ได้เฉพาะกับไฟล์ที่คุณจัดเก็บไว้ในระบบไฟล์ภายในของ DroidDeck เท่านั้น</string> + <string name="sync_missing">บิลด์นี้ไม่มี Syncthing</string> + <string name="sync_starting">กำลังเริ่ม Syncthing</string> + <string name="sync_status_starting">กำลังเริ่ม</string> + <string name="sync_status_up_to_date">เป็นปัจจุบัน</string> + <string name="sync_status_syncing">กำลังซิงค์</string> + <string name="sync_status_paused">หยุดชั่วคราว</string> + <string name="sync_status_pausing">กำลังหยุดชั่วคราว</string> + <string name="sync_status_resuming">กำลังทำต่อ</string> + <string name="sync_status_attention">ต้องตรวจสอบ</string> + <string name="sync_status_failed">Syncthing หยุดทำงาน</string> + <string name="sync_failed_retry">ลองอีกครั้ง</string> + <string name="sync_paused_wifi">หยุดชั่วคราวจนกว่าจะเชื่อมต่อ Wi-Fi</string> + <string name="sync_paused_game">หยุดชั่วคราวระหว่างเล่นเกม</string> + <string name="sync_summary">%1$d โฟลเดอร์ · เชื่อมต่อแล้ว %2$d จาก %3$d อุปกรณ์</string> + <string name="sync_left">เหลืออีก %1$s</string> + <string name="sync_open_web_ui">เปิดเว็บ UI</string> + <string name="sync_pause">หยุดชั่วคราว</string> + <string name="sync_resume">ทำต่อ</string> + <string name="sync_running">กำลังทำงาน</string> + <string name="sync_running_hint">ปิดเพื่อหยุด Syncthing ทั้งหมด</string> + <string name="sync_this_device">อุปกรณ์นี้</string> + <string name="sync_device_id">ID อุปกรณ์</string> + <string name="sync_show_qr">แสดง QR</string> + <string name="sync_advanced">ขั้นสูง</string> + <string name="sync_advanced_hint">พอร์ต เวลาที่ทำงาน การรีเซ็ต</string> + <string name="sync_open">เปิด</string> + <string name="sync_waiting">รอคุณอยู่</string> + <string name="sync_pending_device">%1$s ต้องการเชื่อมต่อ</string> + <string name="sync_pending_folder">%1$s ต้องการแชร์ “%2$s”</string> + <string name="sync_pending_folder_hint">ยอมรับเพื่อเลือกตำแหน่งที่จะบันทึกใน DroidDeck</string> + <string name="sync_review">ตรวจสอบในเว็บ UI</string> + <string name="sync_folders">โฟลเดอร์</string> + <string name="sync_no_folders">ยังไม่มีโฟลเดอร์</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">เป็นปัจจุบัน</string> + <string name="sync_folder_syncing">กำลังซิงค์ %1$d%%</string> + <string name="sync_folder_scanning">กำลังสแกน</string> + <string name="sync_folder_paused">หยุดชั่วคราว</string> + <string name="sync_folder_out_of_sync">ไม่ตรงกัน</string> + <string name="sync_folder_errors">ซิงค์ไม่ได้ %1$d ไฟล์</string> + <string name="sync_folder_blocked">ถูกบล็อก</string> + <string name="sync_folder_blocked_hint">โฟลเดอร์นี้อยู่นอกพื้นที่จัดเก็บของ DroidDeck ดังนั้น DroidDeck จึงหยุดโฟลเดอร์นี้ชั่วคราว หากต้องการซิงค์โฟลเดอร์ที่อยู่นอก DroidDeck ให้ใช้แอป Syncthing-Fork</string> + <string name="sync_remove_folder">นำออกจาก Syncthing</string> + <string name="sync_remove_folder_hint">การนำออกจะไม่ลบไฟล์ใดๆ</string> + <string name="sync_devices">อุปกรณ์</string> + <string name="sync_no_devices">ยังไม่มีอุปกรณ์</string> + <string name="sync_connected">เชื่อมต่อแล้ว</string> + <string name="sync_offline">ออฟไลน์</string> + <string name="sync_last_seen">พบล่าสุด %1$s</string> + <string name="sync_device_id_title">ID ของอุปกรณ์นี้</string> + <string name="sync_device_id_hint">บนอุปกรณ์อีกเครื่อง ให้เพิ่มอุปกรณ์ใน Syncthing แล้วสแกนโค้ดนี้หรือวาง ID จากนั้นยอมรับอุปกรณ์นั้นที่นี่ในเว็บ UI</string> + <string name="sync_copy">คัดลอก</string> + <string name="sync_share">แชร์</string> + <string name="sync_done">เสร็จสิ้น</string> + <string name="sync_off_title">ปิด Syncthing?</string> + <string name="sync_off_body">Syncthing จะหยุดทันทีและหยุดอยู่จนกว่าจะเปิดอีกครั้ง ไฟล์ที่ซิงค์แล้วจะยังอยู่ที่เดิม</string> + <string name="sync_off_forget">ลบการกำหนดค่าของ Syncthing ด้วย</string> + <string name="sync_off_forget_hint">นำ ID ของอุปกรณ์นี้ โฟลเดอร์ และอุปกรณ์ออก เมื่อเปิดอีกครั้งจะเริ่มต้นใหม่ทั้งหมด</string> + <string name="sync_turn_off">ปิด</string> + <string name="sync_ports">พอร์ต</string> + <string name="sync_port_sync">ซิงค์</string> + <string name="sync_port_discovery">การค้นหาในเครือข่ายท้องถิ่น</string> + <string name="sync_repick">เลือกพอร์ตใหม่</string> + <string name="sync_repick_hint">ตรวจสอบอีกครั้งทุกครั้งที่เริ่ม</string> + <string name="sync_repick_button">เลือกใหม่</string> + <string name="sync_reset_group">รีเซ็ต</string> + <string name="sync_api_key">คีย์ API</string> + <string name="sync_regenerate">สร้างใหม่</string> + <string name="sync_reset">รีเซ็ต Syncthing</string> + <string name="sync_reset_hint">ได้ ID อุปกรณ์ใหม่ และนำโฟลเดอร์กับอุปกรณ์ออก ไฟล์ในพื้นที่จัดเก็บของ DroidDeck จะยังคงอยู่</string> + <string name="sync_reset_button">รีเซ็ต</string> + <string name="sync_reset_confirm_title">รีเซ็ต Syncthing?</string> + <string name="sync_running_group">การทำงาน</string> + <string name="sync_run">ทำงาน</string> + <string name="sync_run_open">ขณะที่ DroidDeck เปิดอยู่</string> + <string name="sync_run_background">ในเบื้องหลัง</string> + <string name="sync_wifi_only">Wi-Fi เท่านั้น</string> + <string name="sync_pause_games">หยุดชั่วคราวระหว่างเล่นเกม</string> + <string name="sync_logs">ล็อก</string> + <string name="sync_logs_hint">เอาต์พุตของ Syncthing สำหรับเซสชันนี้</string> + <string name="sync_logs_share">แชร์</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">ตั้งค่ารันไทม์ Linux ก่อน</string> + <string name="sync_accept">ยอมรับ</string> + <string name="sync_accept_title">บันทึก “%1$s” ไปที่</string> + <string name="sync_add_folder">เพิ่มโฟลเดอร์</string> + <string name="sync_add_folder_hint">ซิงค์โฟลเดอร์ในพื้นที่จัดเก็บของ DroidDeck</string> + <string name="sync_choose">เลือก</string> + <string name="sync_add">เพิ่ม</string> + <string name="sync_add_failed">เพิ่มโฟลเดอร์ไม่ได้</string> + <string name="sync_share_with">แชร์กับ</string> + <string name="sync_share_none">ยังไม่มีอุปกรณ์ คุณสามารถแชร์โฟลเดอร์นี้จากเว็บ UI ได้ในภายหลัง</string> + <string name="sync_use_folder">ใช้โฟลเดอร์นี้</string> + <string name="sync_new_folder">โฟลเดอร์ใหม่</string> + <string name="sync_location_home">โฮมของคอนเทนเนอร์</string> + <string name="sync_location_sync">โฟลเดอร์ Sync</string> + <string name="sync_location_shared">พื้นที่จัดเก็บที่ใช้ร่วมกันของ DroidDeck</string> + <string name="sync_location_card">DroidDeck บน %1$s</string> + <string name="sync_location_app">ข้อมูลแอป DroidDeck</string> + <string name="sync_web_path_locked">โฟลเดอร์ใหม่จะบันทึกไว้ในโฟลเดอร์ Sync ของ DroidDeck หากต้องการซิงค์โฟลเดอร์อื่นของ DroidDeck ให้ใช้ เพิ่มโฟลเดอร์ ในแท็บ Syncthing</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">โหลดซ้ำ</string> + <string name="sync_not_running">Syncthing ไม่ได้ทำงานอยู่</string> + <string name="session_end_steam_sigill">Steam หยุดทำงานเพราะคำสั่งที่ไม่ถูกต้อง (SIGILL) อาจเป็นปัญหาความเข้ากันได้ของคำสั่ง CPU หรือไคลเอนต์ขัดข้อง แชร์บันทึกพร้อมรายละเอียดอุปกรณ์ของคุณ</string> + <string name="session_end_steam_try_x64">คุณสามารถลองการตั้งค่า Steam → ไคลเอนต์ Steam → x86-64 (ทดลอง) ต้องดาวน์โหลดเพิ่มเติมและอาจทำงานช้าลง</string> + <string name="session_end_vulkan_device">ไดรเวอร์กราฟิก Linux ไม่พบอุปกรณ์ Vulkan ที่ใช้งานได้ ตรวจสอบว่าไดรเวอร์ GPU ของ Linux ที่เลือกรองรับ GPU นี้</string> + <string name="session_end_gpu_unsupported">เซสชันนี้เริ่มไม่ได้เพราะ GPU นี้ไม่มีไดรเวอร์ Linux Vulkan ที่เข้ากันได้ในการตั้งค่าปัจจุบัน ไดรเวอร์ Adreno Turnip ไม่สามารถเปิดการรองรับ GPU ของ MediaTek/Mali ได้</string> <string name="setup_group_memory">หน่วยความจำ</string> <string name="setup_clear_cached">ปิดแอปที่แคชไว้ก่อนเริ่มเซสชัน</string> <string name="setup_clear_cached_hint">เมื่อเซสชันเริ่ม DroidDeck จะปิดแอปที่ Android พักไว้ในพื้นหลัง เพื่อให้เกมมีหน่วยความจำมากขึ้น ต้องเปิด Wireless debugging ไว้</string> @@ -3092,7 +3431,7 @@ <string name="setup_bg_limit_4">ไม่เกิน 4</string> <string name="setup_bg_limit_1">ไม่เกิน 1</string> <string name="setup_bg_limit_0">ไม่มี</string> - <string name="setup_adb_pair">Wireless debugging</string> + <string name="setup_adb_pair">การแก้ไขข้อบกพร่องแบบไร้สาย</string> <string name="setup_adb_pair_hint">จับคู่ DroidDeck กับ Wireless debugging ของ Android สำหรับตัวเลือกด้านบน ขีดจำกัดโพรเซสลูกยังคงปิดอยู่</string> <string name="setup_adb_pair_button">จับคู่</string> <string name="spatial_restored">กู้คืนมุมมองที่บันทึกไว้แล้ว %1$d รายการ คำนวณการสอบเทียบเพื่อลองอีกครั้ง หรือเริ่มชุดใหม่เพื่อบันทึกข้อมูลเพิ่มเติม</string> @@ -3100,6 +3439,12 @@ <string name="epic_client_open">เปิด</string> <string name="epic_client_install">ติดตั้ง</string> <string name="game_tab_about">เกี่ยวกับ</string> + <string name="game_resources_browser">เปิดในเบราว์เซอร์ของคุณ</string> + <string name="game_resource_guides">คู่มือ</string> + <string name="game_resource_protondb_detail">รายงานความเข้ากันได้ของ Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">สำหรับเกมที่มีเซฟอยู่ในบัญชี Steam ของคุณ</string> + <string name="game_resource_search">ค้นหาเว็บ</string> <string name="game_tab_install">ติดตั้ง</string> <string name="game_install_location">ตำแหน่ง</string> <string name="game_install_folder">โฟลเดอร์</string> @@ -3116,6 +3461,11 @@ <string name="stores_eyebrow_pass">มีให้เล่นกับ %1$s</string> <string name="stores_owned_in_library">เกมที่เป็นเจ้าของในไลบรารี</string> <string name="library_filter_added">ที่เพิ่มเอง</string> + <string name="library_filter">ตัวกรอง</string> + <string name="library_filter_installed">เฉพาะที่ติดตั้ง</string> + <string name="library_filter_all_owned">เกมทั้งหมดที่เป็นเจ้าของ</string> + <string name="library_no_installed_matches">ไม่มีเกมที่ติดตั้งไว้ตรงกับตัวกรองเหล่านี้</string> + <string name="library_browse_owned">เรียกดูเกมที่เป็นเจ้าของ</string> <string name="game_tab_launch">การเปิดเกม</string> <string name="game_tab_saves_cloud">เซฟและคลาวด์</string> <string name="game_launch_shortcut">ทางลัด Steam</string> @@ -3133,6 +3483,40 @@ <string name="stores_itch_update_replaced">ผู้พัฒนาได้แทนที่บิลด์นี้ด้วย %1$s ต้องการอัปเดตเป็นบิลด์นั้นไหม</string> <string name="xbox_filter_cloud">คลาวด์</string> <string name="stores_xbox_cloud_settings">การตั้งค่าคลาวด์</string> + <string name="integration_title">การผสานรวม Steam</string> + <string name="integration_count">เปิด %1$d จาก %2$d</string> + <string name="integration_set_up">ตั้งค่า</string> + <string name="integration_location">ตำแหน่ง</string> + <string name="integration_app_info">ข้อมูลแอป</string> + <string name="integration_wifi">ชื่อ Wi-Fi</string> + <string name="integration_brightness">ความสว่าง</string> + <string name="integration_home">DroidDeck เป็นหน้าหลัก</string> + <string name="integration_shortcuts">ปุ่มระบบ</string> + <string name="integration_wifi_hint">แสดงเครือข่ายใน Steam · ต้องใช้สิทธิ์ตำแหน่ง ไม่มีการติดตาม</string> + <string name="integration_wifi_on">เครือข่ายแสดงใน Steam</string> + <string name="integration_wifi_location_off">ตำแหน่งปิดอยู่</string> + <string name="integration_wifi_denied">ปฏิเสธตำแหน่ง · อนุญาตในข้อมูลแอป</string> + <string name="integration_brightness_hint">แถบเลื่อนของ Steam ปรับความสว่างหน้าจอ</string> + <string name="integration_home_hint">ปุ่มหน้าหลักเปิดเมนู Steam ในเซสชัน</string> + <string name="integration_shortcuts_hint">Alt+Tab ปุ่ม Win และปุ่มโฮมทำงานในเซสชัน</string> + <string name="integration_shortcuts_maybe_restricted">เป็นสีเทาใน Android? ข้อมูลแอป → ⋮ → อนุญาตการตั้งค่าที่จำกัด</string> + <string name="integration_shortcuts_restricted">ถูกบล็อกโดย Android · ข้อมูลแอป → ⋮ → อนุญาตการตั้งค่าที่จำกัด</string> + <string name="integration_shortcuts_service">ปุ่มระบบของ DroidDeck</string> + <string name="integration_shortcuts_service_description">ให้ Alt+Tab ปุ่ม Win และปุ่มโฮมทำงานในเซสชัน DroidDeck ที่ใช้งานอยู่แทน Android</string> + <string name="integration_brightness_needed">เปิดความสว่างในการตั้งค่า → การผสานรวม Steam</string> + <string name="setup_gpu_bridge_off">บริดจ์ Mali: ปิด</string> + <string name="setup_gpu_bridge_on">บริดจ์ Mali: เปิด</string> + <string name="setup_gpu_bridge_detail">%1$s ไม่ใช่ Adreno บริดจ์ Vulkan รุ่นทดลองเปิดอยู่: เซสชันวาดผ่านไดรเวอร์ของโทรศัพท์เอง อาจพบบั๊ก โปรดส่งบันทึกของเซสชัน</string> + <string name="setup_bridge_safe">โหมดปลอดภัย</string> + <string name="setup_bridge_safe_on">โหมดปลอดภัย: เปิด</string> + <string name="setup_bridge_safe_off">โหมดปลอดภัย: ปิด</string> + <string name="setup_bridge_safe_on_detail">เข้ากันได้มากที่สุด แนะนำสำหรับอุปกรณ์ใหม่</string> + <string name="setup_bridge_safe_off_detail">เร็วขึ้นในส่วนที่ GPU นี้ผ่านการตรวจสอบ</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: อัตโนมัติ</string> + <string name="setup_bridge_dxvk_proton">DXVK: ของ Proton</string> + <string name="setup_bridge_dxvk_auto_detail">ใช้ DXVK รุ่นเก่ากว่าเมื่อ Vulkan ของ GPU นี้เก่าเกินไปสำหรับ DXVK ของ Proton</string> + <string name="setup_bridge_dxvk_proton_detail">Proton แต่ละตัวใช้ DXVK ของตัวเอง แม้ Vulkan ของ GPU นี้อาจเก่าเกินไปสำหรับมัน</string> <string name="apps_search_hint">ค้นหาแอป</string> <string name="apps_no_match">ไม่มีแอปที่ตรงกับ “%1$s”</string> <string name="apps_add_widget">เพิ่มวิดเจ็ต</string> @@ -3180,6 +3564,8 @@ <string name="desktop_restore_done_body">แอปที่คุณเพิ่มไว้ติดตั้งกลับมาแล้ว</string> <string name="desktop_restore_failed_title">กู้คืนซอฟต์แวร์บางส่วนไม่ได้</string> <string name="desktop_restore_failed_body">ดู ~/.cache/droiddeck/apt-restore.log แล้วลองใช้ sudo apt install ใน Konsole</string> + <string name="gog_full_files">การปรับแต่งแบบเนทีฟใช้งานไม่ได้ การดาวน์โหลดมีไฟล์ทดแทนแบบสมบูรณ์</string> + <string name="gog_recover">ตรวจสอบผลลัพธ์แพตช์</string> <string name="slow_usb_title">การเชื่อมต่อ USB ช้า</string> <string name="slow_usb_cable">%1$s เชื่อมต่อผ่าน %2$s (%3$s Mbps ประมาณ %4$d MB/s) เกมในไดรฟ์นี้จึงโหลดช้า ใช้สาย USB 3 ที่รองรับ 5 Gbps ขึ้นไป ลองกลับด้านหัว USB-C หรือใช้ไดรฟ์ที่เร็วกว่า</string> <string name="slow_usb_port">%1$s เชื่อมต่อผ่าน %2$s (%3$s Mbps ประมาณ %4$d MB/s) พอร์ต USB ของอุปกรณ์นี้เร็วกว่านี้ไม่ได้ เกมจึงโหลดช้า ที่เก็บข้อมูลภายในหรือการ์ด microSD อาจเร็วกว่า</string> @@ -3190,4 +3576,52 @@ <string name="steam_import_names_more">%1$s และอีก %2$d เกม</string> <string name="steam_import_now">รีสตาร์ตเลย</string> <string name="steam_import_later">ภายหลัง</string> + <string name="gog_maintenance">จัดการการติดตั้ง GOG</string> + <string name="gog_check">ตรวจหาอัปเดต</string> + <string name="gog_repair">ตรวจสอบ/ซ่อมแซม</string> + <string name="gog_patches">แพตช์ออฟไลน์</string> + <string name="gog_refresh">ดาวน์โหลดตัวติดตั้งออฟไลน์แบบเต็ม</string> + <string name="gog_update">อัปเดตเป็น %1$s</string> + <string name="gog_resume">ดำเนินการบำรุงรักษา GOG ต่อ</string> + <string name="gog_open_patch">เปิดตัวติดตั้งแพตช์</string> + <string name="gog_patch_in_session">ทำตัวติดตั้งแพตช์ให้เสร็จหรือยกเลิกในเซสชัน Linux</string> + <string name="gog_patch_requirements">เลือกแพตช์สำหรับเวอร์ชันและภาษาที่คุณติดตั้งไว้ เวอร์ชันต้นทางที่รองรับอาจไม่ได้แสดงในรายการ</string> + <string name="gog_no_patches">GOG ไม่มีแพตช์ Windows แบบแยกสำหรับเกมนี้</string> + <string name="gog_managed_files">ไฟล์เกมที่ถูกแก้ไขอาจถูกแทนที่</string> + <string name="gog_patch_installer_note">ตัวติดตั้งจะเปิดในเซสชัน Linux ของคุณ</string> + <string name="gog_download_label">ดาวน์โหลด</string> + <string name="gog_space_label">พื้นที่เพิ่มเติม</string> + <string name="gog_space_estimate_label">พื้นที่โดยประมาณ</string> + <string name="gog_repair_action">ซ่อมแซมไฟล์</string> + <string name="gog_refresh_action">รีเฟรชการติดตั้ง</string> + <string name="gog_select_patch">เลือก</string> + <string name="stores_gamejolt_not_owned">ไม่มีในคลัง Game Jolt ของคุณ</string> + <string name="stores_gamejolt_no_build">เกมนี้ไม่มีการดาวน์โหลดสำหรับ Windows</string> + <string name="stores_gamejolt_no_exe">ไม่พบเกม Windows ในไฟล์ที่ดาวน์โหลด</string> + <string name="stores_gamejolt_no_game">ไม่พบเกมนี้บน Game Jolt</string> + <string name="stores_gamejolt_browse_failed">โหลดเกมจาก Game Jolt ไม่ได้</string> + <string name="stores_gamejolt_download_failed">Game Jolt ตอบกลับ HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">โหลดรายการดาวน์โหลดจาก Game Jolt ไม่ได้</string> + <string name="stores_gamejolt_build_open">เปิดบน Game Jolt</string> + <string name="stores_gamejolt_archive">ไม่รองรับไฟล์ %1$s</string> + <string name="stores_gamejolt_extract_failed">แตกไฟล์ที่ดาวน์โหลดไม่ได้ (รหัส %1$d)</string> + <string name="stores_gamejolt_download_unreachable">ไม่สามารถเชื่อมต่อ Game Jolt ได้</string> + <string name="stores_gamejolt_download_no_link">Game Jolt ไม่ได้ให้ลิงก์ดาวน์โหลด</string> + <string name="stores_gamejolt_section_featured">แนะนำ</string> + <string name="stores_gamejolt_section_hot">มาแรง</string> + <string name="stores_gamejolt_section_best">ยอดนิยมสูงสุด</string> + <string name="stores_gamejolt_section_new">ใหม่</string> + <string name="stores_gamejolt_price_under_30">$30 หรือต่ำกว่า</string> + <string name="stores_gamejolt_os_other">อื่น ๆ</string> + <string name="stores_gamejolt_maturity_everyone">ทุกวัย</string> + <string name="stores_gamejolt_maturity_teen">วัยรุ่น</string> + <string name="stores_gamejolt_maturity_adult">ผู้ใหญ่</string> + <string name="stores_gamejolt_status_complete">เสร็จสมบูรณ์</string> + <string name="stores_gamejolt_status_early">เข้าถึงก่อนใคร</string> + <string name="stores_gamejolt_partners">เกมของพาร์ตเนอร์</string> + <string name="stores_gamejolt_filter_browser">เบราว์เซอร์</string> + <string name="stores_gamejolt_filter_maturity">ระดับเนื้อหา</string> + <string name="stores_gamejolt_filter_status">สถานะ</string> + <string name="stores_gamejolt_filter_partners">พาร์ตเนอร์</string> + <string name="stores_gamejolt_followed">เกมที่ติดตาม</string> </resources> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d0954c0cf9..1b5613944b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12 için VKD3D seçenekleri. nodxr ışın izlemeyi kapatır; yalnızca buna ihtiyaç duyan bir oyunda kullanın.</string> <string name="game_env_proton_log">Proton tanılama günlüğü için 1 olarak ayarlayın. Günlük kaydı performansı düşürebilir ve depolama alanı kullanır.</string> <string name="game_env_wined3d">D3D9–11 uyumluluk testi için DXVK yerine OpenGL tabanlı WineD3D kullanmak üzere 1 olarak ayarlayın.</string> + <string name="game_env_wined3d_renderer">DirectDraw, Direct3D 1-7 ve WineD3D ile çalışan oyunlar için oluşturucu. Vulkan, Zink üzerinden OpenGL yolunu atlar ve Adreno\'da eski DirectDraw ve Direct3D 7 oyunlarında çok daha hızlıdır.</string> + <string name="game_env_dxvk_d3d8">Direct3D 8\'i WineD3D yerine DXVK ile çalıştırmak için 1 yapın. Adreno\'da AIO Graphics Test\'in Direct3D 8 testinde daha hızlıdır.</string> <string name="game_env_no_ntsync">Bu oyunda ntsync\'i (droiddeck-ntsync veya çekirdek sürücüsü) kapatmak için 1 olarak ayarlayın; paket varsa droiddeck-esync, yoksa droiddeck-fsync kullanılır.</string> <string name="game_env_no_esync">Bu oyunda droiddeck-esync\'i kapatmak için 1 olarak ayarlayın; yerine droiddeck-fsync, fsync de kapalıysa droiddeck-ntsync kullanılır.</string> <string name="game_env_no_fsync">Bu oyunda droiddeck-fsync\'i kapatmak için 1 olarak ayarlayın; paket varsa droiddeck-esync, yoksa droiddeck-ntsync kullanılır.</string> <string name="game_env_fsync_first">Bu oyunu droiddeck-fsync ile çalıştırmak için 1, Proton sürümüne uyan bir paket varsa droiddeck-esync\'i öne almak için 0 olarak ayarlayın.</string> <string name="game_env_xalia">Bu oyunda Proton’un kumandayla gezinme yardımcısını kapatmak için 0 olarak ayarlayın.</string> + <string name="game_env_anticheat_offline">Varsayılan olarak açık. Oyun çevrimdışı oynamayı destekliyorsa Easy Anti-Cheat oyununu hile önleyicisi olmadan başlatır. Her zamanki gibi Easy Anti-Cheat üzerinden başlatmak için kapatın. Easy Anti-Cheat gerektiren çevrimiçi modlar kullanılamaz.</string> <string name="game_env_hud">D3D9–11 için DXVK katmanı. fps kare hızını gösterir; boş bırakılırsa gizlenir.</string> <string name="game_env_dxvk_config">Noktalı virgülle ayrılmış DXVK ayarları. Yeni sürümler kare sınırlama için dxvk.maxFrameRate kullanır; normal oyun için oturumun kare sınırlayıcısını tercih edin.</string> + <string name="game_env_cores">Oturumun oyun çekirdekleri yerine bu oyun için CPU çekirdekleri, örneğin 0-4 veya 0,2,4. Daha az çekirdek daha serin çalışır.</string> <string name="game_env_vkd3d_limit">D3D12 kare hızı sınırı. 0 sınırı kaldırır.</string> <string name="game_env_glthread">Mesa OpenGL iş parçacığı kullanımı. true, CPU sınırlı OpenGL oyunlarına yardımcı olabilir; her oyunda ayrı deneyin.</string> <string name="sync_backend_title">Wine senkronizasyonu</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX, x86 Linux programlarını bu ARM64 cihazda çalıştırır. Otomatik, program x86 için derlenmişse FEX\'i kullanır.</string> <string name="app_fex_x86">FEX ile %1$s</string> <string name="app_fex_not_ready">Bu program %1$s PC\'ler için derlenmiş ve FEX ile çalışır, ancak FEX henüz kurulmadı. Oturum açmışken Steam\'i bir kez açın: DroidDeck, FEX\'i ve gereken Steam Linux Runtime\'ı indirtir, ardından bu program açılır.</string> + <string name="session_proot_missing">DroidDeck\'in proot\'u indirilemedi. Bağlantıyı kontrol edip tekrar deneyin. Yedek proot oynamak için fazla yavaş olduğundan oturum başlatılmadı.</string> + <string name="session_directaudio_missing">DirectAudio indirilemedi, bu yüzden oyun sesi bu oturumda daha yavaş yolu kullanıyor.</string> <string name="session_end_program">Bu program</string> <string name="session_end_steam_download">Steam istemcisi indirilemedi. Ağınız veya VPN\'iniz Steam sunucularını engelliyor olabilir; bağlantıyı kontrol edip yeniden deneyin.</string> <string name="session_end_steam_setup">Steam istemcisi kurulamadı. Bağlantınızı ve boş depolama alanını kontrol edip yeniden deneyin.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 kumandası</string> <string name="mode_controller_note">Deck: Hızlı Erişim düğmesi ve jiroskop. Steam Controller: aynısı, ayrıca arka düğmelerde kavrama algılama. DualShock 4 ve DualSense: jiroskop; dokunmatik yüzeyler kumandanın dokunmatik paneli olur. Xbox 360: Hızlı Erişim\'i Guide+A ile açın.</string> <string name="mode_back">Geri</string> + <string name="back_hold">Steam kısayolları için Geri\'yi basılı tut</string> + <string name="back_hold_hint">Geri\'yi basılı tutmak Hızlı Erişim\'i açar veya diğer düğmelerle Steam kombinasyonları yapar. Basılı tutmayı yok saymak için kapatın; dokunma ve çift dokunma çalışmaya devam eder.</string> + <string name="back_native_qam_hint">Steam kısayolları için Geri\'yi 700 ms basılı tutun veya Geri\'yi basılı tutup başka bir düğmeye basın.</string> + <string name="back_double_tap_window">Çift dokunma aralığı</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Parlaklık denetimine izin ver</string> + <string name="brightness_permission_text">Parlaklık denetimini DroidDeck\'te ayarlayın.</string> <string name="back_menu_then_qam">Menü → QAM</string> <string name="back_qam_then_menu">QAM → Menü</string> <string name="mode_session">Oturum</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam etkin olarak indirme yaparken arka planda askıya almayı erteler.</string> <string name="mode_suspend_note">Otomatik: arka planda duraklatır, gösterilince devam eder. Manuel: Devam et\'i bekler. Asla: çalışmaya devam eder.</string> <string name="mode_startup">Başlangıç</string> - <string name="mode_steam_startup">Steam\'i DroidDeck ile başlat</string> - <string name="mode_steam_startup_hint">DroidDeck açıldığında Steam oturumunu açar.</string> + <string name="mode_startup_session">Açılışta başlat</string> + <string name="mode_startup_session_hint">DroidDeck açıldığında bu oturumu başlatır.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Sürümler kontrol ediliyor…</string> <string name="mode_decky_ready">%1$s yüklenmeye hazır.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Güncel · %1$s</string> <string name="mode_decky_loader">Yükleyici</string> <string name="mode_decky_install_latest">En yenisini yükle</string> + <string name="decky_channel">Güncelleme kanalı</string> + <string name="decky_channel_hint">Hangi Decky Loader sürümlerinin yükleneceği. Decky\'nin kendi güncelleyicisi de aynı kanalı kullanır.</string> + <string name="decky_channel_stable">Kararlı</string> + <string name="decky_channel_prerelease">Ön sürüm</string> + <string name="decky_channel_testing">Test</string> + <string name="decky_channel_failed">Decky güncelleme kanalı kaydedilemedi</string> <string name="mode_decky_on">Steam ile başlar. Açıkken bu cihazdaki diğer uygulamalar Steam\'i kontrol edebilir.</string> <string name="mode_decky_off">Kapalı. Steam\'in uzaktan hata ayıklama bağlantı noktası kapalı kalır.</string> <string name="mode_decky_remove_title">Decky Loader kaldırılsın mı?</string> @@ -323,6 +342,10 @@ <string name="mode_client">İstemci</string> <string name="mode_mangoapp">Performans katmanı</string> <string name="mode_mangoapp_hint">Oyunlar Deck modunda çökerse veya ekran kararırsa kapatın. Sonraki oturumda uygulanır.</string> + <string name="mode_return_after_game">Oyundan sonra DroidDeck\'e dön</string> + <string name="mode_return_after_game_hint">DroidDeck\'ten veya başka bir başlatıcıdan açtığınız oyun kapandığında Steam düzgünce kapanır (önce bulut kayıtları tamamlanır) ve oraya geri dönersiniz. Kapalı: Steam\'de kal.</string> + <string name="mode_shader_precache">Gölgelendirici ön önbelleği</string> + <string name="mode_shader_precache_hint">Steam oyunlarınız için önceden derlenmiş gölgelendiricileri indirir ve arka planda işler, böylece oyunlar daha az takılır. Kapalıyken veri, depolama ve pil tasarrufu sağlanır; oyunlar gölgelendiricileri oynarken derler. Steam\'in İndirmeler > Gölgelendirici Ön Önbelleği ayarıyla aynıdır. Sonraki oturumda uygulanır.</string> <string name="mode_steam_repair">Steam istemcisini onar</string> <string name="mode_steam_repair_hint">Steam bir sonraki başlatıldığında Steam istemcisini yeniden indirir. Steam yükleme ekranında takılı kalırsa kullanın. Oyunlar, oturum bilgileri ve ayarlar korunur.</string> <string name="mode_steam_repair_queued">Steam istemcisi, Steam bir sonraki başlatıldığında yeniden indirilecek.</string> @@ -390,6 +413,8 @@ <string name="mode_directaudio_hint">Daha düşük gecikme için PulseAudio\'yu atlar.</string> <string name="mode_mic">Mikrofon</string> <string name="mode_mic_hint">Sesli sohbet için.</string> + <string name="drawer_mic_hint">Bu oturum için mikrofon kaydını açın veya kapatın.</string> + <string name="drawer_mic_failed">Mikrofon değiştirilemedi. Lütfen tekrar deneyin.</string> <string name="mode_network">Ağ</string> <string name="mode_wifi_discovery">Wi-Fi keşfi</string> <string name="mode_wifi_discovery_hint">Steam\'de Wi-Fi adlarını ve yakındaki ağları göster.</string> @@ -551,6 +576,16 @@ <string name="perf_gsrealtime">gamescope: gerçek zamanlı GPU kuyruğu</string> <string name="perf_gsrealtime_hint">Bileştiricinin GPU işine öncelik verir. Oyunlardan biraz feda ederek kare zamanlamasını yumuşatabilir.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Bellek</string> + <string name="perf_cap_off">Kapalı</string> + <string name="perf_cap_auto">Sürücü varsayılanı</string> + <string name="perf_zram_client">Oyun çalışırken Steam\'i sıkıştır</string> + <string name="perf_zram_client_hint">Oyun başladıktan 20 sn sonra oyuna daha fazla bellek kalması için Steam istemcisi zRAM\'e sıkıştırılır ve oyun kapanınca geri okunur. Oyunlar başladıktan kısa süre sonra oturum kapanıyorsa bunu kapatın. Yukarıdaki RAM sınırı, oturum onu aştığında Steam\'i yine sıkıştırır.</string> + <string name="perf_ram_cap">RAM sınırı</string> + <string name="perf_ram_cap_hint">Steam istemcisi Steam oturumunda veya masaüstünden çalışırken uygulanır. Oturum bundan fazlasını kullandığında önce Steam, ardından oturumun desteklenen diğer işlemleri zRAM\'e sıkıştırılır. Yumuşak bir sınırdır: hiçbir şey kapatılmaz, ancak sayfalar geri yüklenirken oyunlar takılabilir.</string> + <string name="perf_ram_cap_unavailable">Bu cihazda olmayan zRAM takası gerekir.</string> + <string name="perf_vram_cap">VRAM sınırı</string> + <string name="perf_vram_cap_hint">DXVK\'nin Direct3D oyunlarına bildirdiği video belleği; böylece oyunlar dokuları daha az belleğe göre ayarlar. Oyunun kendi DXVK ayarları yine önceliklidir. Sonraki oturumda geçerli olur.</string> <string name="perf_gpuclock">GPU\'yu en yüksek saat hızında tut</string> <string name="perf_gpuclock_hint">Yalnızca Adreno. Daha az takılma, daha fazla pil tüketimi ve ısınma.</string> <string name="perf_fixes">Oturum düzeltmeleri</string> @@ -569,6 +604,8 @@ <string name="perf_fastpath">proot hızlı yolu</string> <string name="perf_fastpath_needs_seccomp">proot\'un seccomp filtresi gerekir.</string> <string name="perf_fastpath_hint">Daha hızlı dosya aramaları ve daha az takılma. Bir program dosyalarını bulamıyorsa kapatın.</string> + <string name="perf_cursor_composite">İmleci gamescope içinde çiz</string> + <string name="perf_cursor_composite_hint">Gamescope işaretçiyi Android\'e bırakmak yerine kendisi çizer. Kumandayla yönetilen imleç için açın. Telefonda kapalıyken daha hızlıdır. Sonraki oturumda uygulanır.</string> <string name="perf_identity">Oturum kimliği</string> <string name="perf_hostname">Ana bilgisayar adı</string> <string name="perf_hostname_hint">Steam\'in bu cihaz için gördüğü ad. Boş bırakılırsa %1$s geri yüklenir.</string> @@ -583,6 +620,8 @@ <string name="driver_delete_plain">Dosyaları uygulamadan kaldırılır.</string> <string name="driver_delete_in_use">Dosyaları kaldırılır. Kullanımda olduğu için varsayılan devreye girer.</string> <string name="drawer_page_display">Ekran</string> + <string name="drawer_frame_limit">Kare sınırı</string> + <string name="drawer_frame_limit_note">Bu oyunu sınırlar. Ekran, varsa sınırın tam böldüğü bir yenileme hızına geçer; diğer sınırlar düzensiz görünebilir. Steam oyunları Hızlı erişim menüsündeki Steam\'in Kare Sınırı ayarını kullanır.</string> <string name="drawer_page_effects">Efektler</string> <string name="drawer_page_controls">Kontroller</string> <string name="drawer_page_components">Bileşenler</string> @@ -614,8 +653,11 @@ <string name="hud_size_pill">Hap</string> <string name="hud_size_minimal">Minimal</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Şerit</string> <string name="hud_locked">Yerinde kilitle</string> <string name="hud_locked_hint">Taşımak için HUD\'u sürükleyin; uzun basmak onu kilitler veya kilidini açar. Kilitliyken altındaki ekran kontrolleri çalışmaya devam eder.</string> + <string name="hud_snap">Yanlara yapıştır</string> + <string name="hud_snap_hint">HUD\'u bıraktığınızda ekranın daha yakın tarafına gider. Hızlı bir kaydırma onu o yöne fırlatır.</string> <string name="hud_group_look">Görünüm</string> <string name="hud_scale">Ekrandaki boyut</string> <string name="hud_color_soft">Yumuşak</string> @@ -664,7 +706,6 @@ <string name="hud_export_failed">HUD raporu kaydedilemedi.</string> <string name="hud_reset">HUD ayarlarını sıfırla</string> <string name="hud_reset_button">Sıfırla</string> - <string name="hud_credit">FusionHUD, yapımcı: The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Ölçekleme modu</string> <string name="drawer_scaling_sharpness">Ölçekleme keskinliği</string> <string name="drawer_effects">Ekran efektleri</string> @@ -699,11 +740,17 @@ <string name="drawer_touch_auto">Otomatik (%1$s)</string> <string name="drawer_keyboard">Klavye</string> <string name="drawer_latency">Gecikme</string> + <string name="drawer_low_latency">Düşük gecikme modu</string> + <string name="drawer_low_latency_hint">CPU ve pil kullanımını artırır</string> <string name="drawer_low_latency_controller">Düşük gecikmeli kumanda</string> <string name="drawer_low_latency_controller_hint">Kumanda 250 Hz yerine 1000 Hz bildirir. CPU kullanımı biraz artar.</string> <string name="drawer_low_latency_touch">Düşük gecikmeli dokunma</string> <string name="drawer_low_latency_touch_hint">Dokunmalar kare gruplamasını atlar; Steam dokunmatik kontrolleri 1000 Hz çalışır. CPU kullanımı biraz artar.</string> <string name="drawer_evdev_mouse">Ham fare kanalı</string> + <string name="drawer_relative_mouse">Göreli fare</string> + <string name="drawer_relative_mouse_auto">Otomatik</string> + <string name="drawer_relative_mouse_on">Açık</string> + <string name="drawer_relative_mouse_off">Kapalı</string> <string name="drawer_direct_cursor">İmleç</string> <string name="drawer_pc_keyboard">PC klavyesi</string> <string name="drawer_android_keyboard">Android</string> @@ -791,6 +838,10 @@ <string name="setup_session">Oturum</string> <string name="setup_logs">Oturum günlükleri</string> <string name="setup_logs_hint">Her oturumdan sonra kaydedilir</string> + <string name="setup_game_debug_logs">Oyun hata ayıklama günlükleri</string> + <string name="setup_game_debug_logs_hint">Sonraki oyun başlatmada Proton, Wine ve grafik tanılamalarını ekler. Performansı düşürebilir ve daha fazla depolama kullanabilir.</string> + <string name="setup_game_debug_logs_restart">Oyun hata ayıklama günlüklerini kaydetmek için bu oturumu yeniden başlatın</string> + <string name="setup_logging_update_failed">Günlük kaydı güncellenemedi. Anahtarı kontrol edip tekrar deneyin.</string> <string name="setup_agent_commands">Hata ayıklama araçları</string> <string name="setup_latest_logs">Son oturum günlükleri</string> <string name="setup_saved_logs">Kayıtlı oturum günlükleri</string> @@ -814,20 +865,22 @@ <string name="setup_home">Ana ekran olarak kullan</string> <string name="setup_home_on">DroidDeck ana ekran uygulaması olabilir</string> <string name="setup_home_off">DroidDeck hiçbir zaman ana ekran uygulaması olarak sunulmaz</string> + <string name="setup_home_game_space_first">Oyun Ekle bölümünde DroidDeck\'i Dahil Et olarak ayarlayın</string> <string name="setup_orientation">Yön</string> + <string name="setup_launcher_orientation">Başlatıcı yönü</string> + <string name="setup_launcher_orientation_auto">Cihaz dönüşünü izle</string> + <string name="setup_orientation_portrait">Dikey</string> + <string name="setup_session_orientation">Oturum yönü</string> + <string name="setup_session_orientation_hint">Steam, oyunlar, masaüstü ve kumanda düzenleyicisi için geçerlidir. Çözünürlük ön ayarları oturumla birlikte döner; özel genişlik ve yükseklik girildiği gibi kalır.</string> <string name="setup_orientation_auto">Otomatik yatay</string> <string name="setup_orientation_landscape">Yatay</string> <string name="setup_orientation_reverse">Ters yatay</string> <string name="setup_fullscreen">Tam ekran</string> <string name="setup_fullscreen_on">Android durum ve gezinme çubuklarını gizler</string> <string name="setup_fullscreen_off">Android durum ve gezinme çubuklarını gösterir</string> - <string name="setup_dual_screen">Çift ekran</string> - <string name="setup_dual_screen_hint">Otomatik, dahili ikinci ekranı olan el konsollarında ikinci ekranı kullanır. Açık, herhangi bir ikinci ekranı kullanır. Kapalı, her şeyi tek ekranda tutar.</string> <string name="setup_dual_screen_auto">Otomatik</string> <string name="setup_dual_screen_on">Açık</string> <string name="setup_dual_screen_off">Kapalı</string> - <string name="setup_dual_screen_menu">Alt ekran menüsü</string> - <string name="setup_dual_screen_menu_hint">Bölümleri ve oyun içi menüyü ikinci ekrana taşır ve yazma orada yapılır, böylece üst ekran tam görünümü korur. L2 ve R2 bölümler arasında geçiş yapar.</string> <string name="setup_dual_screen_controls">Oyunlarda alt ekran kontrolleri</string> <string name="setup_dual_screen_controls_hint">Bir oturum başladığında ikinci ekranda dokunmatik yüzeyi ve klavyeyi açar.</string> <string name="dual_typing_title">Üst ekran için yazılıyor</string> @@ -979,6 +1032,14 @@ <string name="gate_step1">Ayarlar → Geliştirici seçenekleri → Kablosuz hata ayıklama\'yı açın</string> <string name="gate_step2">“Eşleştirme koduyla cihaz eşle” seçeneğine dokunun</string> <string name="gate_step3">Kodu DroidDeck bildirimine yazın</string> + <string name="pairguide_build_number">Telefon hakkında bölümünde Derleme numarası\'na 7 kez dokunun</string> + <string name="pairguide_wireless">Kablosuz hata ayıklama\'yı açın</string> + <string name="pairguide_pair">Kablosuz hata ayıklama\'yı açın, ardından “Cihazı eşleme koduyla eşle”ye dokunun</string> + <string name="pairguide_child_process">“Alt işlem kısıtlamalarını devre dışı bırak” seçeneğini açın</string> + <string name="pairguide_row_child_process">Alt işlem kısıtlamalarını devre dışı bırak</string> + <string name="pairguide_row_build_number">Derleme numarası</string> + <string name="pairguide_row_wireless">Kablosuz hata ayıklama</string> + <string name="pairguide_row_pair">Cihazı eşleme koduyla eşle</string> <string name="gate_waiting">Eşleştirme açılır penceresi bekleniyor…</string> <string name="gate_code_needed">Açılır pencere bulundu. Kodunu bildirime girin.</string> <string name="gate_status">Durum</string> @@ -1117,7 +1178,6 @@ <string name="games_never_played">Hiç oynanmadı</string> <string name="games_runtime_busy_percent">Çalışma ortamı meşgul · %1$d%%</string> <string name="games_runtime_busy">Çalışma ortamı meşgul</string> - <string name="games_runtime_first_play">Çalışma ortamı ilk Oyna\'da yüklenir</string> <string name="games_runtime_update">Çalışma ortamı güncellemesi var</string> <string name="games_runtime_ready">● Çalışma ortamı hazır</string> <string name="games_internal">Dahili depolama</string> @@ -1134,6 +1194,9 @@ <string name="gpu_hide_other">Diğer GPU\'lara ait sürücüleri gizle</string> <string name="gpu_show_other">Diğer GPU\'lara ait sürücüleri göster</string> <string name="gpu_advanced">Gelişmiş</string> + <string name="gpu_ubwc_title">UBWC uyumluluğu</string> + <string name="gpu_ubwc_hint">Steam veya Android\'de şeritler ya da titreme görülürse Açık veya Kapalı\'yı deneyin. DroidDeck yeniden başlatıldıktan sonra iki sürücüye de uygulanır.</string> + <string name="gpu_ubwc_restart">Uygulamak için DroidDeck\'i yeniden başlatın.</string> <string name="gpu_set_with_display">Ekran sürücüsüyle birlikte ayarlanır: %1$s ikisini de taşır.</string> <string name="gpu_set_with_runtime">Çalışma ortamı sürücüsüyle birlikte ayarlanır: %1$s ikisini de taşır.</string> <string name="gpu_runtime_hint">Oyunlar ve masaüstü tarafından kullanılır.</string> @@ -1248,6 +1311,9 @@ <string name="pip_not_ready">Pencere içinde pencere, oturum hazır olduğunda kullanılabilir.</string> <string name="pip_permission">Android ayarlarında DroidDeck için pencere içinde pencereye izin verin.</string> <string name="pip_unavailable">Android, pencere içinde pencereyi açamadı.</string> + <string name="game_more">Diğer</string> + <string name="game_edit_art">Görseli düzenle</string> + <string name="stores_in_steam_label">Steam\'de</string> <string name="game_shortcut">Kısayol</string> <string name="game_shortcut_add">Ana ekrana ekle</string> <string name="game_shortcut_choose">Oyun seç</string> @@ -1271,6 +1337,10 @@ <string name="main_wait_runtime">Çalışma ortamı işleminin bitmesini bekleyin</string> <string name="main_wait_proton_install">Uyumluluk aracı yüklemesinin bitmesini bekleyin</string> + <string name="load_compat_title">Uyumluluk araçları hazırlanıyor</string> + <string name="load_compat_wait">Uyumluluk kurulumunun bitmesi bekleniyor</string> + <string name="load_compat_hint">Kurulum bitince oturumunuz başlayacak.</string> + <string name="load_compat_progress">%1$s · %%%2$d</string> <string name="main_wait_desktop_install">Masaüstü uygulaması yüklemesinin bitmesini bekleyin</string> <string name="main_wait_install_game">Oyun başlatmadan önce yüklemenin bitmesini bekleyin</string> <string name="main_saves_close_session">Önce Steam oturumunu kapatın; böylece oyun, içe aktarılan kayıtların üzerine yazamaz</string> @@ -1307,6 +1377,9 @@ <string name="main_install_anyway">Yine de yükle</string> <string name="main_remove_runtime_title">Linux çalışma ortamını kaldır</string> <string name="main_remove_runtime_text">Bu işlem çalışma ortamını, içindeki Steam istemcisini ve oraya yüklenen tüm oyunları siler.</string> + <string name="runtime_actions_title">Linux çalışma zamanı</string> + <string name="runtime_actions_text">Onarma, çalışma zamanının sistem dosyalarını yeniden yükler; Steam, oyunlarınız ve ayarlarınız korunur. Masaüstü gibi ekler bir sonraki kullanımda yeniden yüklenir. Kaldırma her şeyi siler.</string> + <string name="runtime_repair">Çalışma zamanını onar</string> <string name="main_applied">Uygulandı: %1$s</string> <string name="android_app_open_failed_primary">%1$s birincil ekranda açılamadı</string> <string name="android_app_open_failed_on">%1$s, %2$s üzerinde açılamadı</string> @@ -1436,6 +1509,11 @@ <string name="session_runtime_catalog_unreachable">Çalışma ortamı kataloğuna ulaşılamadı. Bağlantıyı kontrol edip yeniden Oyna\'ya basın.</string> <string name="session_runtime_install_failed">Linux çalışma ortamı yüklenmedi. Kurulum bölümünde çalışma ortamını kontrol edip yeniden Oyna\'ya basın.</string> <string name="session_desktop_install_failed">Masaüstü yüklenmedi (%1$s). Bağlantıyı kontrol edip yeniden Masaüstü\'ne basın.</string> + <string name="session_package_resume_failed">Yarıda kalan bir yükleme tamamlanamadı (%1$s). Bağlantıyı ve boş alanı kontrol edip tekrar deneyin.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Linux çalışma zamanı hasarlı: %1$d kitaplık bağlantısı eksik bir dosyayı gösteriyor (%2$s); genellikle yarıda kalan bir yüklemeden sonra olur. Onarma oyunlarınızı ve ayarlarınızı korur.</item> + <item quantity="other">Linux çalışma zamanı hasarlı: %1$d kitaplık bağlantısı eksik dosyaları gösteriyor (%2$s ve diğerleri); genellikle yarıda kalan bir yüklemeden sonra olur. Onarma oyunlarınızı ve ayarlarınızı korur.</item> + </plurals> <string name="session_ended_named">%1$s beklenmedik şekilde durdu. Günlükleri bir hata raporuyla paylaşın veya yeniden deneyin.</string> <string name="session_ended_program">Program beklenmedik şekilde durdu. Günlükleri bir hata raporuyla paylaşın veya yeniden deneyin.</string> <string name="session_ended_desktop">Masaüstü beklenmedik şekilde durdu. Günlükleri bir hata raporuyla paylaşın veya yeniden deneyin.</string> @@ -1450,6 +1528,13 @@ <string name="mode_decky_plugins_hint">Sonraki Steam oturumu için bir eklenti ZIP dosyası yükleyin.</string> <string name="mode_decky_plugin_downloading">İndiriliyor…</string> <string name="mode_decky_plugin_install_zip">ZIP dosyasından yükle</string> + <string name="decky_zip_warning_title">Üçüncü Taraf Eklenti Yükleme</string> + <string name="decky_zip_warning_text">Decky Loader ekibi bu eklentiyi incelemedi. Steam hesabınızı çalmaya veya cihazınıza zarar vermeye yönelik yazılımlar gibi kötü amaçlı yazılımlar içerebilir. Bu eklentiyi yükleyerek cihazınızla ilgili tüm riskleri üstlendiğinizi kabul edersiniz.</string> + <string name="decky_zip_warning_continue">Devam et</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Lütfen %1$d saniye bekleyin</item> + <item quantity="other">Lütfen %1$d saniye bekleyin</item> + </plurals> <string name="store_cat_games">Oyunlar</string> <string name="store_cat_audio_video">Ses ve Video</string> <string name="store_cat_graphics">Grafik</string> @@ -1611,6 +1696,8 @@ <string name="fm_accept">Kabul et</string> <string name="fm_decline">Reddet</string> <string name="fm_drive_not_readable">%1$s bağlı ancak şu anda okunamıyor</string> + <string name="fm_drive_access_title">%1$s erişimine izin ver</string> + <string name="fm_drive_access_text">Android, DroidDeck\'in bu sürücüyü görmesine izin veriyor ama okumasına izin vermiyor. DroidDeck için Tüm dosyalara erişimi açın, sonra geri dönün.</string> <string name="fm_list_view">Liste görünümü</string> <string name="fm_grid_view">Izgara görünümü</string> <string name="fm_search">Ara</string> @@ -1682,6 +1769,89 @@ <string name="second_mode_keyboard_trackpad">Klavye + dokunmatik yüzey</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck tutamakları + dokunmatik yüzeyler</string> + <string name="second_mode_dashboard">Gösterge paneli</string> + <string name="bottom_dashboard_empty">Burada henüz gösterilecek bir şey yok.</string> + <string name="bottom_page_downloads">İndirmeler</string> + <string name="bottom_downloads_none">Devam eden indirme yok.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Gölgelendirici önbelleği indiriliyor</string> + <string name="bottom_downloads_paused">Duraklatıldı</string> + <string name="bottom_downloads_queued">Başlamayı bekliyor</string> + <string name="bottom_page_notifications">Bildirimler</string> + <string name="bottom_notifications_listener">DroidDeck alt ekranı</string> + <string name="bottom_notifications_why">Oynarken mesajları ve diğer bildirimleri burada görün. Yalnızca bu ekranda kalırlar ve kaydedilmezler. Android bunu bir kez sorar: bildirim erişimi sayfası bu ekranda açılır; orada DroidDeck\'i açın, bu sayfa kendiliğinden geri gelir.</string> + <string name="bottom_notifications_allow">Bildirim erişimine izin ver</string> + <string name="bottom_notifications_none">Bildirim yok.</string> + <string name="bottom_notifications_count">%1$d bildirim</string> + <string name="bottom_notifications_clear">Temizle</string> + <string name="bottom_page_screenshots">Ekran görüntüleri</string> + <string name="stats_fps_needs_hud">FPS için HUD açık olmalı</string> + <string name="stats_speed">Hız</string> + <string name="stats_pedals">Pedallar</string> + <string name="stats_gforce">G kuvveti</string> + <string name="stats_timing">Zamanlama</string> + <string name="stats_best_lap">En iyi tur</string> + <string name="stats_tires">Lastikler °C</string> + <string name="stats_trace">Gaz ve fren, son 10 s</string> + <string name="stats_speed_chart">Hız, %1$s</string> + <string name="stats_gear">Vites</string> + <string name="stats_steam_client_arm">Steam İstemcisi ARM</string> + <string name="stats_steam_client_x86">Steam İstemcisi x86</string> + <string name="stats_throttle">Gaz</string> + <string name="stats_brake">Fren</string> + <string name="stats_lights">Gösterge ışıkları</string> + <string name="stats_lamp_shift">Vites uyarısı</string> + <string name="stats_lamp_handbrake">El freni</string> + <string name="stats_lamp_pit">Pit hız sınırlayıcı</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Motor %1$s °C</string> + <string name="stats_oil_temp">Yağ %1$s °C</string> + <string name="stats_power">Güç dağıtıcı</string> + <string name="stats_fuel_t">Yakıt, t</string> + <string name="stats_fuel_main">Ana %1$s t</string> + <string name="stats_fuel_reserve">Yedek %1$s t</string> + <string name="bottom_telemetry_send_title">Gösterge verilerini gönder</string> + <string name="bottom_telemetry_send_auto">Otomatik</string> + <string name="bottom_telemetry_send_auto_hint">Sonradan bulunanlar dahil, burada listelenen her oyun için açar. Kapattığınız oyunlar kapalı kalır.</string> + <string name="bottom_telemetry_send_note">Bu, oyunun kendi veri çıkışı ayarını değiştirir. Oyun bir sonraki başlatılışında geçerli olur; kapatmak eski ayarı geri getirir.</string> + <string name="bottom_telemetry_send_close">Bunu değiştirmek için %1$s oyununu kapatın.</string> + <string name="bottom_telemetry_send_failed">%1$s ayarları değiştirilemedi.</string> + <string name="bottom_telemetry_send_menu">%1$s: oyunun ayarlarında IP 127.0.0.1 ve %3$d portuyla %2$s seçeneğini açın.</string> + <string name="bottom_shots_where">Pictures/DroidDeck klasörüne kaydedilir. Steam ekran görüntüleri de burada görünür.</string> + <string name="bottom_shots_take">Ekran görüntüsü al</string> + <string name="bottom_shots_saved">Ekran görüntüsü kaydedildi.</string> + <string name="bottom_shots_failed">Ekran görüntüsü alınamadı.</string> + <string name="bottom_shots_none">Henüz ekran görüntüsü yok.</string> + <string name="bottom_page_chat">Sohbet ve ses</string> + <string name="bottom_chat_why">Oyun ana ekranda çalışmaya devam ederken Steam sohbetini burada okuyun ve yanıtlayın. Steam\'de oturum açılmış hesabı kullanır.</string> + <string name="bottom_chat_not_signed_in">Steam\'in paylaşabileceği bir web oturumu henüz yok, bu yüzden burada bir kez oturum açın.</string> + <string name="bottom_chat_stopped">DroidDeck arka plandayken Android sohbet sayfasını kapattı. DroidDeck\'e döndüğünüzde yeniden açılır.</string> + <string name="bottom_chat_open">Steam Chat\'i aç</string> + <string name="bottom_chat_close">Sohbeti kapat</string> + <string name="bottom_chat_mic_on">Mikrofon açık</string> + <string name="bottom_chat_mic_off">Mikrofon kapalı</string> + <string name="bottom_chat_mic_unavailable">Bu oyun için mikrofon kapalı. Konuşmak için DroidDeck\'in Steam ayarlarında (Ses) Mikrofon\'u açın ve oyunu yeniden başlatın.</string> + <string name="bottom_chat_volume">Ses düzeyi %1$d%%</string> + <string name="bottom_page_telemetry">Oyun içi istatistikler</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Pil</string> + <string name="bottom_telemetry_lap">Tur</string> + <string name="bottom_telemetry_position">Sıra</string> + <string name="bottom_telemetry_this_lap">Bu tur</string> + <string name="bottom_telemetry_last_lap">Son tur</string> + <string name="bottom_telemetry_fuel">Yakıt</string> + <string name="bottom_telemetry_cargo">Kargo</string> + <string name="bottom_telemetry_pips">Güç SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Yasal durum</string> + <string name="bottom_telemetry_balance">Bakiye</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">%1$d portu veri alıyor (%3$d baytlık %2$d paket), ancak bu sayfanın henüz okuyamadığı bir biçimde.</string> + <string name="bottom_telemetry_port_busy">%1$s portunu zaten başka bir program kullanıyor, bu yüzden o oyun burada gösterilemez.</string> <string name="rtinst_removing">Linux çalışma ortamı kaldırılıyor</string> <plurals name="rtinst_removing_entries"> @@ -1712,6 +1882,7 @@ <string name="flatpakmgr_not_ready">Önce Flatpak\'i kurun</string> <string name="flatpakmgr_starting">Başlatılıyor</string> <string name="flatpakmgr_exit_status">Flatpak %1$d durum koduyla çıktı</string> + <string name="flatpakmgr_wrong_arch">%1$s, DroidDeck\'in çalıştıramadığı %2$s için derlenmiş. Buradaki Flatpak uygulamalarının ARM64 veya x86_64 sürümü olmalı.</string> <string name="flatpakmgr_installing">%1$s yükleniyor</string> <string name="flatpakmgr_updating">%1$s güncelleniyor</string> <string name="flatpakmgr_removing">%1$s kaldırılıyor</string> @@ -1805,6 +1976,7 @@ <string name="adbpair_applying">Ayar uygulanıyor…</string> <string name="adbpair_command_failed">Kablosuz hata ayıklama komutu başarısız oldu</string> <string name="adbpair_channel_name">Kablosuz hata ayıklama kurulumu</string> + <string name="adbpair_progress_channel_name">Kablosuz hata ayıklama kurulum ilerlemesi</string> <string name="adbpair_channel_description">Ayarlar açıkken Kablosuz hata ayıklama eşleştirme kodunu ister</string> <string name="adbpair_title_pair">Kablosuz hata ayıklamayı eşle</string> <string name="adbpair_waiting_text">Kablosuz hata ayıklamayı açın, sonra “Eşleştirme koduyla cihaz eşle” seçeneğine dokunun.</string> @@ -1913,6 +2085,7 @@ <string name="gpuinfo_not_adreno">Adreno GPU değil</string> <string name="gpuinfo_supported">Destekleniyor</string> <string name="gpuinfo_experimental">Deneysel: sürücüleri test derlemeleri</string> + <string name="gpuinfo_a850_experimental">Deneysel Adreno 850 desteği: uyumlu deneysel ekran ve oyun sürücüleri gerekir; bu cihazda doğrulanmadı</string> <string name="gpuinfo_below_tested">Test edilen donanımın altında (Adreno 725 ve daha yenisi): çalışmayabilir</string> <string name="gpuinfo_unsupported">Desteklenmiyor: DroidDeck bir Adreno (Snapdragon) GPU\'su gerektirir</string> @@ -2009,6 +2182,7 @@ <string name="display_look_filter">%1$s Ölçeklemeyi %2$s olarak ayarlar.</string> <string name="display_match_screen">Ekrana Uydur (%1$d×%2$d)</string> <string name="display_follow_screen">Ekranı takip et (katlanıp açıldığında yeniden boyutlanır)</string> + <string name="display_follow_screen_scaled">Ölçekli %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Cihaz ayrıntılarını göster</string> <string name="device_info_hide">Cihaz ayrıntılarını gizle</string> @@ -2115,6 +2289,13 @@ <string name="stores_resume">Sürdür</string> <string name="stores_refresh">Yenile</string> <string name="stores_sort">Sırala</string> + <string name="setup_rail_labels">Kenar çubuğu etiketleri</string> + <string name="setup_rail_labels_hint">Kenar çubuğu simgelerinin altında adları gösterir. Daha ince bir kenar çubuğu için kapatın.</string> + <string name="library_display">Görünüm</string> + <string name="library_display_larger">Daha büyük kartlar</string> + <string name="library_display_smaller">Daha küçük kartlar</string> + <string name="library_display_title">Başlığı göster</string> + <string name="library_display_size">Boyutu göster</string> <string name="stores_sort_last_played">Son oynanan</string> <string name="stores_sort_recently_installed">Son yüklenen</string> <string name="stores_sort_title_asc">Başlık A–Z</string> @@ -2241,6 +2422,9 @@ <string name="stores_download_manager">İndirme yöneticisi</string> <string name="stores_parallel">Aynı anda indirme sayısı</string> <string name="stores_install_where">Şuraya yükle</string> + <string name="stores_install_language">Oyun dili</string> + <string name="stores_install_language_hint">GOG ve Epic bu dili yükler. Sistem, uygulama dilini izler.</string> + <string name="stores_install_language_system">Sistem</string> <string name="stores_install_title">%1$s\'i yükle:</string> <string name="stores_target_internal">Dahili</string> <string name="stores_target_free">%1$s boş</string> @@ -2276,6 +2460,9 @@ <string name="edit_target">Hedef</string> <string name="edit_start_in">Başlangıç yeri</string> <string name="edit_launch_options">Başlatma seçenekleri</string> + <string name="edit_launch_options_steam_hint">Steam Özellikleri ile ortaktır: birinde yapılan değişiklik ikisinde de görünür.</string> + <string name="edit_launch_options_not_saved">Başlatma seçenekleri Steam\'e kaydedilemedi. Tekrar deneyin.</string> + <string name="edit_launch_options_desktop">Steam masaüstü oturumunda açık olabilir. Başlatma seçeneklerini Steam Özellikleri\'nden değiştirin veya önce oturumu kapatın.</string> <string name="edit_artwork">Görsel</string> <string name="edit_other_exe">Diğer exe…</string> <string name="edit_remove">Kaldır</string> @@ -2403,6 +2590,7 @@ <string name="setup_download_source_custom">Özel önek</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Önek</string> + <string name="setup_download_proxy">HTTP proxy</string> <string name="flathub_eyebrow">LINUX UYGULAMALARI</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Linux masaüstü için masaüstü uygulamaları, Masaüstü\'nden açılır.</string> @@ -2543,6 +2731,22 @@ <string name="glasses_tracking_flat_hint">Otomatik, bu 2D oyunu görüşte sabit tutar. Kafa takibini kullanmak için “Ekran” bölümünde “Sanal ekran” seçeneğine geçin.</string> <string name="glasses_tracking_sbs_hint">Kafa takibi, sanal ekranda veya çalışan bir SteamVR oyununda geçerlidir.</string> <string name="glasses_hardware">Cihaz</string> + <string name="vr_controllers_tab">Kumandalar</string> + <string name="vr_controllers_group">SteamVR kumandaları</string> + <string name="vr_controllers_emulate">VR\'da oyun kumandası</string> + <string name="vr_controllers_emulate_hint">Kumandanızın oynadığı iki VR eli. Değişiklikler hemen, SteamVR çalışırken de uygulanır. Joy-Con\'lar ve izlenen eller yine kendi taraflarını devralır.</string> + <string name="vr_controllers_off">Normal oyun kumandası</string> + <string name="vr_controllers_index">Valve Index kumandaları</string> + <string name="vr_controllers_touch">Meta Quest 3 kumandaları</string> + <string name="vr_controllers_vive">HTC Vive kumandaları</string> + <string name="vr_controllers_sticks">Çubukların başlangıç görevi</string> + <string name="vr_controllers_sticks_hint">Geçiş yapmak için VR sırasında iki çubuğa birlikte basın.</string> + <string name="vr_controllers_sticks_game">Sizi oyunda hareket ettirir</string> + <string name="vr_controllers_sticks_hands">Elleri hareket ettirir</string> + <string name="vr_controllers_buttons">Düğmeler</string> + <string name="vr_controllers_buttons_stick">Tetikler tetik, omuz düğmeleri kavrama, A/B ve X/Y her elin ön düğmeleridir; çubuk tıklamaları başparmak çubuklarına tıklar, Guide SteamVR menüsünü açar. Yön tuşlarında yukarı ve aşağı elleri yaklaştırır veya uzaklaştırır.</string> + <string name="vr_controllers_buttons_vive">Çubuklar dokunmatik yüzeydir; A/X veya çubuk tıklaması onlara basar. Tetikler tetik, omuz düğmeleri kavrama, Start ve Select menüdür, Guide SteamVR menüsünü açar.</string> + <string name="vr_controllers_buttons_off">VR eli yok. Oyun kumandasını destekleyen oyunlar ve SteamVR menüsü kumandanızı her zamanki gibi alır.</string> <string name="glasses_brightness">Parlaklık</string> <string name="glasses_volume">Ses düzeyi</string> <string name="glasses_sunblock">Güneş koruması</string> @@ -2600,6 +2804,12 @@ <string name="hand_camera_placement">Kamera konumu</string> <string name="hand_camera_placement_hint">Oynamadan önce kameranın sizi görebildiğini kontrol edin.</string> <string name="hand_camera_check">Kontrol et</string> + <string name="tracking_pack_title">El izleme indirmesi</string> + <string name="tracking_pack_hint">El izleme için bir kerelik %1$s indirme gerekir.</string> + <string name="tracking_pack_download">İndir</string> + <string name="tracking_pack_retry">Yeniden dene</string> + <string name="tracking_pack_downloading">El izleme indiriliyor… %%%1$d</string> + <string name="tracking_pack_failed">El izleme indirilemedi. Bağlantınızı kontrol edip tekrar deneyin.</string> <string name="hand_camera_check_title">Kamera konumu</string> <string name="hand_camera_how_rear">Cihazı yaklaşık göğüs hizasında, 1,5 ila 2 metre uzağa, arka kamera size dönük olacak şekilde dik durdurun. Ardından ellerinizi açarak görüntüye girin.</string> <string name="hand_camera_how_front">Cihazı yaklaşık göğüs hizasında, 1,5 ila 2 metre uzağa, ekran size dönük olacak şekilde dik durdurun. Ardından ellerinizi açarak görüntüye girin.</string> @@ -2682,6 +2892,21 @@ <string name="storage_safe_hint">Kullanılmayan çalışma zamanları, artıklar, eski günlükler</string> <string name="storage_clean_up">Temizle…</string> <string name="storage_session_running">Bir şeyi temizlemek veya kaldırmak için oturumu durdurun. Boyutlar yine de gösterilir.</string> + <string name="storage_default_group">Yükleme konumu</string> + <string name="storage_default_title">Varsayılan depolama</string> + <string name="storage_default_hint">Yeni mağaza yüklemeleri seçilen konuma gider. Mevcut oyunlar yerinde kalır. Steam kütüphaneleri kendi ayarlarını korur.</string> + <string name="storage_default_ask">Her seferinde sor</string> + <string name="storage_default_ask_detail">Her yükleme için bir hedef seçin</string> + <string name="storage_default_internal">Dahili depolama</string> + <string name="storage_default_external">Harici depolama</string> + <string name="storage_default_external_detail">%1$s · %2$s boş</string> + <string name="storage_default_external_missing">Bağlı değil</string> + <string name="storage_default_folder">Klasör · %1$s</string> + <string name="storage_default_folder_free">%1$s boş</string> + <string name="storage_default_folder_missing">Bağlı değil</string> + <string name="storage_default_choose_folder">Klasör seç…</string> + <string name="storage_default_choose_folder_detail">SD kart veya USB sürücüdeki herhangi bir klasörü kullanın</string> + <string name="storage_default_note">Oyunlar, seçilen konumdaki bir Games klasörüne yüklenir. Mevcut oyunlar taşınmaz.</string> <string name="storage_where">Nereye gidiyor</string> <string name="storage_games">Steam oyunları</string> <string name="storage_game_data">Oyun verileri</string> @@ -2803,6 +3028,9 @@ <string name="storage_data_installed">Yüklü oyunlar</string> <string name="storage_data_parts">Önek %1$s · gölgelendiriciler %2$s · atölye %3$s</string> <string name="storage_clear_shaders">Gölgelendiricileri temizle</string> + <string name="storage_reset_prefix">Öneki sıfırla</string> + <string name="storage_reset_prefix_title">%1$s için önek sıfırlansın mı?</string> + <string name="storage_reset_prefix_confirm">%2$s içindeki Wine önekini (%1$s) siler ve sonraki başlatmada yeniden oluşturur. İçindeki kayıtlar, ayarlar ve yüklü yeniden dağıtılabilir paketler kaybolur; Steam Cloud kayıtları hesabınızda kalır.</string> <string name="storage_data_leftovers">Kaldırılan oyunlar</string> <string name="storage_steam_app">Steam uygulaması %1$d</string> <string name="storage_leftover_unsure_detail">Öneki hâlâ dosya içeriyor, bunlar yerel kayıtları da içerebilir</string> @@ -3101,6 +3329,117 @@ <string name="spatial_saved_views_hint">Kaydedilen görünümler yeniden hesaplanabilir. Geçerli izleme koordinat sistemini yakalamak için yeni bir kalibrasyon başlatın.</string> <string name="spatial_model_checksum_error">El modeli sağlama toplamı uyuşmazlığı</string> <string name="spatial_opencv_load_error">OpenCV yüklenemedi</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Syncthing ile eşitle</string> + <string name="sync_enable_hint">Syncthing-Fork tabanlı bu Syncthing uygulaması, DroidDeck\'in dahili dosya sistemindeki dosyaları diğer Syncthing örnekleriyle eşitlemenizi sağlar. Yalnızca DroidDeck\'in dahili dosya sisteminde sakladığınız dosyalar içindir.</string> + <string name="sync_missing">Bu sürüm Syncthing içermiyor.</string> + <string name="sync_starting">Syncthing başlatılıyor</string> + <string name="sync_status_starting">Başlatılıyor</string> + <string name="sync_status_up_to_date">Güncel</string> + <string name="sync_status_syncing">Eşitleniyor</string> + <string name="sync_status_paused">Duraklatıldı</string> + <string name="sync_status_pausing">Duraklatılıyor</string> + <string name="sync_status_resuming">Sürdürülüyor</string> + <string name="sync_status_attention">İlgilenmeniz gerekiyor</string> + <string name="sync_status_failed">Syncthing durdu</string> + <string name="sync_failed_retry">Tekrar dene</string> + <string name="sync_paused_wifi">Wi-Fi\'ye bağlanana kadar duraklatıldı</string> + <string name="sync_paused_game">Oyun sırasında duraklatıldı</string> + <string name="sync_summary">%1$d klasör · %3$d cihazdan %2$d tanesi bağlı</string> + <string name="sync_left">%1$s kaldı</string> + <string name="sync_open_web_ui">Web arayüzünü aç</string> + <string name="sync_pause">Duraklat</string> + <string name="sync_resume">Sürdür</string> + <string name="sync_running">Çalışıyor</string> + <string name="sync_running_hint">Syncthing\'i tamamen durdurmak için kapatın.</string> + <string name="sync_this_device">Bu cihaz</string> + <string name="sync_device_id">Cihaz Kimliği</string> + <string name="sync_show_qr">QR kodu göster</string> + <string name="sync_advanced">Gelişmiş</string> + <string name="sync_advanced_hint">Bağlantı noktaları, ne zaman çalışacağı, sıfırlama</string> + <string name="sync_open">Aç</string> + <string name="sync_waiting">Onayınızı bekliyor</string> + <string name="sync_pending_device">%1$s bağlanmak istiyor</string> + <string name="sync_pending_folder">%1$s “%2$s” klasörünü paylaşmak istiyor</string> + <string name="sync_pending_folder_hint">DroidDeck\'te nereye kaydedileceğini seçmek için kabul edin.</string> + <string name="sync_review">Web arayüzünde incele</string> + <string name="sync_folders">Klasörler</string> + <string name="sync_no_folders">Henüz klasör yok.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Güncel</string> + <string name="sync_folder_syncing">Eşitleniyor %%%1$d</string> + <string name="sync_folder_scanning">Taranıyor</string> + <string name="sync_folder_paused">Duraklatıldı</string> + <string name="sync_folder_out_of_sync">Eşitlenmemiş</string> + <string name="sync_folder_errors">%1$d dosya eşitlenemedi</string> + <string name="sync_folder_blocked">Engellendi</string> + <string name="sync_folder_blocked_hint">Bu klasör DroidDeck\'in depolama alanının dışında olduğu için DroidDeck onu duraklattı. DroidDeck dışındaki klasörleri eşitlemek için Syncthing-Fork uygulamasını kullanın.</string> + <string name="sync_remove_folder">Syncthing\'den kaldır</string> + <string name="sync_remove_folder_hint">Kaldırmak hiçbir dosyayı silmez.</string> + <string name="sync_devices">Cihazlar</string> + <string name="sync_no_devices">Henüz cihaz yok.</string> + <string name="sync_connected">Bağlı</string> + <string name="sync_offline">Çevrimdışı</string> + <string name="sync_last_seen">Son görülme: %1$s</string> + <string name="sync_device_id_title">Bu cihazın kimliği</string> + <string name="sync_device_id_hint">Diğer cihazınızda Syncthing\'e bir cihaz ekleyin ve bu kodu tarayın ya da kimliği yapıştırın. Ardından burada web arayüzünden kabul edin.</string> + <string name="sync_copy">Kopyala</string> + <string name="sync_share">Paylaş</string> + <string name="sync_done">Bitti</string> + <string name="sync_off_title">Syncthing kapatılsın mı?</string> + <string name="sync_off_body">Syncthing şimdi durur ve yeniden açılana kadar kapalı kalır. Eşitlenen dosyalar yerinde kalır.</string> + <string name="sync_off_forget">Syncthing yapılandırmasını da sil</string> + <string name="sync_off_forget_hint">Bu cihazın kimliğini, klasörleri ve cihazları kaldırır. Yeniden açıldığında sıfırdan başlar.</string> + <string name="sync_turn_off">Kapat</string> + <string name="sync_ports">Bağlantı noktaları</string> + <string name="sync_port_sync">Eşitleme</string> + <string name="sync_port_discovery">Yerel keşif</string> + <string name="sync_repick">Yeni bağlantı noktaları seç</string> + <string name="sync_repick_hint">Her başlangıçta yeniden denetlenir.</string> + <string name="sync_repick_button">Yeniden seç</string> + <string name="sync_reset_group">Sıfırla</string> + <string name="sync_api_key">API anahtarı</string> + <string name="sync_regenerate">Yeniden oluştur</string> + <string name="sync_reset">Syncthing\'i sıfırla</string> + <string name="sync_reset_hint">Yeni cihaz kimliği oluşturulur, klasörler ve cihazlar kaldırılır. DroidDeck\'in depolama alanındaki dosyalar korunur.</string> + <string name="sync_reset_button">Sıfırla</string> + <string name="sync_reset_confirm_title">Syncthing sıfırlansın mı?</string> + <string name="sync_running_group">Çalışma</string> + <string name="sync_run">Çalıştırma</string> + <string name="sync_run_open">DroidDeck açıkken</string> + <string name="sync_run_background">Arka planda</string> + <string name="sync_wifi_only">Yalnızca Wi-Fi</string> + <string name="sync_pause_games">Oyunlar sırasında duraklat</string> + <string name="sync_logs">Günlükler</string> + <string name="sync_logs_hint">Bu oturumun Syncthing çıktısı</string> + <string name="sync_logs_share">Paylaş</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Önce Linux çalışma zamanını yükleyin.</string> + <string name="sync_accept">Kabul et</string> + <string name="sync_accept_title">“%1$s” klasörünün kaydedileceği yer</string> + <string name="sync_add_folder">Klasör ekle</string> + <string name="sync_add_folder_hint">DroidDeck\'in depolama alanındaki bir klasörü eşitleyin</string> + <string name="sync_choose">Seç</string> + <string name="sync_add">Ekle</string> + <string name="sync_add_failed">Klasör eklenemedi.</string> + <string name="sync_share_with">Paylaşılacak cihazlar</string> + <string name="sync_share_none">Henüz cihaz yok. Bu klasörü daha sonra web arayüzünden paylaşabilirsiniz.</string> + <string name="sync_use_folder">Bu klasörü kullan</string> + <string name="sync_new_folder">Yeni klasör</string> + <string name="sync_location_home">Konteyner ana dizini</string> + <string name="sync_location_sync">Sync klasörü</string> + <string name="sync_location_shared">DroidDeck paylaşılan depolama alanı</string> + <string name="sync_location_card">%1$s üzerindeki DroidDeck</string> + <string name="sync_location_app">DroidDeck uygulama verileri</string> + <string name="sync_web_path_locked">Yeni klasörler DroidDeck\'in Sync klasörüne kaydedilir. Başka bir DroidDeck klasörünü eşitlemek için Syncthing sekmesindeki Klasör ekle seçeneğini kullanın.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Yeniden yükle</string> + <string name="sync_not_running">Syncthing çalışmıyor.</string> + <string name="session_end_steam_sigill">Steam geçersiz bir komutla durdu (SIGILL). Bu bir CPU komut uyumluluğu sorunu veya istemci çökmesi olabilir. Günlükleri cihaz bilgilerinizle paylaşın.</string> + <string name="session_end_steam_try_x64">Steam ayarları → Steam istemcisi → x86-64 (deneysel) seçeneğini deneyebilirsiniz. Ek bir indirme gerektirir ve daha yavaş çalışabilir.</string> + <string name="session_end_vulkan_device">Linux grafik sürücüsü kullanılabilir bir Vulkan cihazı bulamadı. Seçilen Linux GPU sürücüsünün bu GPU\'yu desteklediğini kontrol edin.</string> + <string name="session_end_gpu_unsupported">Bu GPU için geçerli kurulumda uyumlu bir Linux Vulkan sürücüsü olmadığından bu oturum başlatılamıyor. Adreno Turnip sürücüleri MediaTek/Mali GPU\'lar için destek sağlayamaz.</string> <string name="setup_group_memory">Bellek</string> <string name="setup_clear_cached">Oturumdan önce önbellekteki uygulamaları kapat</string> <string name="setup_clear_cached_hint">Bir oturum başladığında DroidDeck, Android\'in arka planda tuttuğu uygulamaları kapatır; böylece oyuna daha fazla bellek kalır. Kablosuz hata ayıklama açık olmalıdır.</string> @@ -3127,6 +3466,12 @@ <string name="epic_client_open">Aç</string> <string name="epic_client_install">Yükle</string> <string name="game_tab_about">Hakkında</string> + <string name="game_resources_browser">Tarayıcınızda açılır</string> + <string name="game_resource_guides">Rehberler</string> + <string name="game_resource_protondb_detail">Linux / Proton uyumluluk raporları</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Kayıtları Steam hesabınızda olan oyunlar için</string> + <string name="game_resource_search">Web\'de ara</string> <string name="game_tab_install">Yükle</string> <string name="game_install_location">Konum</string> <string name="game_install_folder">Klasör</string> @@ -3143,6 +3488,11 @@ <string name="stores_eyebrow_pass">%1$s ile kullanılabilir</string> <string name="stores_owned_in_library">Kütüphane içindeki oyunlarınız</string> <string name="library_filter_added">Eklenenler</string> + <string name="library_filter">Filtre</string> + <string name="library_filter_installed">Yalnızca yüklü</string> + <string name="library_filter_all_owned">Sahip olunan tüm oyunlar</string> + <string name="library_no_installed_matches">Bu filtrelere uyan yüklü oyun yok.</string> + <string name="library_browse_owned">Sahip olunan oyunlara göz at</string> <string name="game_tab_launch">Başlatma</string> <string name="game_tab_saves_cloud">Kayıtlar ve bulut</string> <string name="game_launch_shortcut">Steam kısayolu</string> @@ -3160,6 +3510,40 @@ <string name="stores_itch_update_replaced">Geliştirici bu sürümü %1$s ile değiştirdi. Ona güncellensin mi?</string> <string name="xbox_filter_cloud">Bulut</string> <string name="stores_xbox_cloud_settings">Bulut ayarları</string> + <string name="integration_title">Steam entegrasyonu</string> + <string name="integration_count">%2$d içinden %1$d açık</string> + <string name="integration_set_up">Ayarla</string> + <string name="integration_location">Konum</string> + <string name="integration_app_info">Uygulama bilgileri</string> + <string name="integration_wifi">Wi-Fi adları</string> + <string name="integration_brightness">Parlaklık</string> + <string name="integration_home">Ana ekran olarak DroidDeck</string> + <string name="integration_shortcuts">Sistem tuşları</string> + <string name="integration_wifi_hint">Ağları Steam\'de göster · Konum erişimi gerekir, konum asla izlenmez</string> + <string name="integration_wifi_on">Ağlar Steam\'de görünür</string> + <string name="integration_wifi_location_off">Konum kapalı</string> + <string name="integration_wifi_denied">Konum reddedildi · Uygulama bilgileri\'nden izin verin</string> + <string name="integration_brightness_hint">Steam\'in kaydırıcısı ekran parlaklığını ayarlar</string> + <string name="integration_home_hint">Ana ekran düğmesi oturumda Steam menüsünü açar</string> + <string name="integration_shortcuts_hint">Alt+Tab, Win tuşu ve Ana Ekran düğmesi oturumda kalır</string> + <string name="integration_shortcuts_maybe_restricted">Android\'de gri mi görünüyor? Uygulama bilgileri → ⋮ → Kısıtlanmış ayarlara izin ver</string> + <string name="integration_shortcuts_restricted">Android tarafından engellendi · Uygulama bilgileri → ⋮ → Kısıtlanmış ayarlara izin ver</string> + <string name="integration_shortcuts_service">DroidDeck sistem tuşları</string> + <string name="integration_shortcuts_service_description">Alt+Tab, Win tuşu ve Ana Ekran düğmesini Android yerine etkin DroidDeck oturumunda tutar.</string> + <string name="integration_brightness_needed">Kurulum → Steam entegrasyonu bölümünde Parlaklık\'ı açın</string> + <string name="setup_gpu_bridge_off">Mali köprüsü: kapalı</string> + <string name="setup_gpu_bridge_on">Mali köprüsü: açık</string> + <string name="setup_gpu_bridge_detail">%1$s bir Adreno değil. Deneysel Vulkan köprüsü açık: oturum, telefonun kendi sürücüsü üzerinden çizer. Hatalar olabilir; oturum günlüklerini gönderin.</string> + <string name="setup_bridge_safe">Güvenli mod</string> + <string name="setup_bridge_safe_on">Güvenli mod: açık</string> + <string name="setup_bridge_safe_off">Güvenli mod: kapalı</string> + <string name="setup_bridge_safe_on_detail">En uyumlu. Yeni bir cihaz için önerilir.</string> + <string name="setup_bridge_safe_off_detail">Bu GPU\'nun kontrollerini geçtiği yerlerde daha hızlı.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: otomatik</string> + <string name="setup_bridge_dxvk_proton">DXVK: Proton\'unki</string> + <string name="setup_bridge_dxvk_auto_detail">Bu GPU\'nun Vulkan\'ı Proton\'un DXVK\'sı için çok eskiyse daha eski bir DXVK kullanır.</string> + <string name="setup_bridge_dxvk_proton_detail">Bu GPU\'nun Vulkan\'ı onun için çok eski olsa bile her Proton kendi DXVK\'sını korur.</string> <string name="apps_search_hint">Uygulama ara</string> <string name="apps_no_match">“%1$s” ile eşleşen uygulama yok.</string> <string name="apps_add_widget">Widget ekle</string> @@ -3208,6 +3592,8 @@ <string name="desktop_restore_done_body">Eklediğiniz uygulamalar yeniden yüklendi.</string> <string name="desktop_restore_failed_title">Bazı yazılımlar geri yüklenemedi</string> <string name="desktop_restore_failed_body">~/.cache/droiddeck/apt-restore.log dosyasına bakın, ardından Konsole\'da sudo apt install deneyin.</string> + <string name="gog_full_files">Yerel iyileştirmeler kullanılamıyor. İndirme, yerine geçecek tam dosyaları içerir.</string> + <string name="gog_recover">Yama sonucunu doğrula</string> <string name="slow_usb_title">Yavaş USB bağlantısı</string> <string name="slow_usb_cable">%1$s, %2$s üzerinden bağlı (%3$s Mbps, yaklaşık %4$d MB/sn), bu yüzden üzerindeki oyunlar yavaş yüklenecek. 5 Gbps veya daha hızlı bir USB 3 kablo kullanın, USB-C fişini ters çevirmeyi deneyin ya da daha hızlı bir sürücü kullanın.</string> <string name="slow_usb_port">%1$s, %2$s üzerinden bağlı (%3$s Mbps, yaklaşık %4$d MB/sn). Bu cihazın USB bağlantı noktası daha hızlı çalışamıyor, bu yüzden oyunlar yavaş yüklenecek. Dahili depolama veya bir microSD kart daha hızlı olabilir.</string> @@ -3218,4 +3604,52 @@ <string name="steam_import_names_more">%1$s ve %2$d tane daha</string> <string name="steam_import_now">Şimdi yeniden başlat</string> <string name="steam_import_later">Daha sonra</string> + <string name="gog_maintenance">GOG kurulumunu yönet</string> + <string name="gog_check">Güncellemeleri denetle</string> + <string name="gog_repair">Doğrula/Onar</string> + <string name="gog_patches">Çevrimdışı yamalar</string> + <string name="gog_refresh">Tam çevrimdışı yükleyiciyi indir</string> + <string name="gog_update">%1$s sürümüne güncelle</string> + <string name="gog_resume">GOG bakımını sürdür</string> + <string name="gog_open_patch">Yama yükleyicisini aç</string> + <string name="gog_patch_in_session">Linux oturumundaki yama yükleyicisini tamamlayın veya iptal edin.</string> + <string name="gog_patch_requirements">Yüklü sürümünüze ve dilinize uygun bir yama seçin. Desteklenen kaynak sürümler listelenmemiş olabilir.</string> + <string name="gog_no_patches">GOG\'da bu oyun için bağımsız Windows yaması yok.</string> + <string name="gog_managed_files">Değiştirilmiş oyun dosyalarının yerine yenileri konabilir.</string> + <string name="gog_patch_installer_note">Yükleyici Linux oturumunuzda açılır.</string> + <string name="gog_download_label">İndirme</string> + <string name="gog_space_label">Ek alan</string> + <string name="gog_space_estimate_label">Tahmini alan</string> + <string name="gog_repair_action">Dosyaları onar</string> + <string name="gog_refresh_action">Kurulumu yenile</string> + <string name="gog_select_patch">Seç</string> + <string name="stores_gamejolt_not_owned">Game Jolt kütüphanenizde yok</string> + <string name="stores_gamejolt_no_build">Bu oyunun Windows indirmesi yok</string> + <string name="stores_gamejolt_no_exe">İndirmede Windows oyunu bulunamadı</string> + <string name="stores_gamejolt_no_game">Bu oyun Game Jolt\'ta bulunamadı</string> + <string name="stores_gamejolt_browse_failed">Game Jolt oyunları yüklenemedi</string> + <string name="stores_gamejolt_download_failed">Game Jolt HTTP %1$d yanıtı verdi</string> + <string name="stores_gamejolt_pick_failed">İndirmeler Game Jolt\'tan yüklenemedi</string> + <string name="stores_gamejolt_build_open">Game Jolt\'ta aç</string> + <string name="stores_gamejolt_archive">%1$s arşivleri desteklenmiyor</string> + <string name="stores_gamejolt_extract_failed">İndirme ayıklanamadı (kod %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Game Jolt\'a ulaşılamadı</string> + <string name="stores_gamejolt_download_no_link">Game Jolt bir indirme bağlantısı vermedi</string> + <string name="stores_gamejolt_section_featured">Öne çıkanlar</string> + <string name="stores_gamejolt_section_hot">Popüler</string> + <string name="stores_gamejolt_section_best">En iyiler</string> + <string name="stores_gamejolt_section_new">Yeni</string> + <string name="stores_gamejolt_price_under_30">30 $ veya daha az</string> + <string name="stores_gamejolt_os_other">Diğer</string> + <string name="stores_gamejolt_maturity_everyone">Her yaş</string> + <string name="stores_gamejolt_maturity_teen">Gençler</string> + <string name="stores_gamejolt_maturity_adult">Yetişkin</string> + <string name="stores_gamejolt_status_complete">Tamamlandı</string> + <string name="stores_gamejolt_status_early">Erken erişim</string> + <string name="stores_gamejolt_partners">Ortak oyunlar</string> + <string name="stores_gamejolt_filter_browser">Tarayıcı</string> + <string name="stores_gamejolt_filter_maturity">Yaş sınırı</string> + <string name="stores_gamejolt_filter_status">Durum</string> + <string name="stores_gamejolt_filter_partners">Ortaklar</string> + <string name="stores_gamejolt_followed">Takip edilen oyunlar</string> </resources> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c4a1d85515..d80343472b 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Параметри VKD3D для D3D12. nodxr вимикає трасування променів; використовуйте лише для гри, якій це потрібно.</string> <string name="game_env_proton_log">Установіть 1, щоб вести діагностичний журнал Proton. Журналювання може знизити продуктивність і займає місце.</string> <string name="game_env_wined3d">Установіть 1, щоб використовувати WineD3D на основі OpenGL замість DXVK для перевірки сумісності D3D9–11.</string> + <string name="game_env_wined3d_renderer">Рендерер для DirectDraw, Direct3D 1-7 та ігор, запущених через WineD3D. Vulkan оминає шлях OpenGL через Zink і набагато швидший для старих ігор DirectDraw і Direct3D 7 на Adreno.</string> + <string name="game_env_dxvk_d3d8">Установіть 1, щоб запускати Direct3D 8 через DXVK замість WineD3D. Швидше в тесті Direct3D 8 з AIO Graphics Test на Adreno.</string> <string name="game_env_no_ntsync">Установіть 1, щоб ця гра не використовувала ntsync (droiddeck-ntsync або драйвер ядра); тоді вона працює на droiddeck-esync, якщо є пакет, інакше на droiddeck-fsync.</string> <string name="game_env_no_esync">Установіть 1, щоб вимкнути droiddeck-esync для цієї гри; замість нього використовується droiddeck-fsync або droiddeck-ntsync, якщо fsync теж вимкнено.</string> <string name="game_env_no_fsync">Установіть 1, щоб ця гра не використовувала droiddeck-fsync; тоді вона працює на droiddeck-esync, якщо є пакет, інакше на droiddeck-ntsync.</string> <string name="game_env_fsync_first">Установіть 1, щоб запускати цю гру на droiddeck-fsync, або 0, щоб надавати перевагу droiddeck-esync, якщо є пакет для її Proton.</string> <string name="game_env_xalia">Установіть 0, щоб вимкнути в цій грі помічник Proton для навігації геймпадом.</string> + <string name="game_env_anticheat_offline">Увімкнено за замовчуванням. Запускає гру з Easy Anti-Cheat без античита, якщо гра підтримує офлайн-режим. Вимкніть, щоб запускати через Easy Anti-Cheat як зазвичай. Онлайн-режими, що потребують Easy Anti-Cheat, залишаються недоступними.</string> <string name="game_env_hud">Оверлей DXVK для D3D9–11. fps показує частоту кадрів; якщо не задано, оверлей приховано.</string> <string name="game_env_dxvk_config">Параметри DXVK, розділені крапкою з комою. Нові збірки обмежують частоту кадрів через dxvk.maxFrameRate; для звичайної гри краще використовувати обмеження кадрів сеансу.</string> + <string name="game_env_cores">Ядра CPU для цієї гри, наприклад 0-4 або 0,2,4, замість ядер гри сеансу. Менше ядер — менше нагрівання.</string> <string name="game_env_vkd3d_limit">Обмеження частоти кадрів D3D12. 0 вимикає обмеження.</string> <string name="game_env_glthread">Багатопотоковість OpenGL у Mesa. true може допомогти іграм OpenGL, які впираються в CPU; перевіряйте для кожної гри окремо.</string> <string name="sync_backend_title">Синхронізація Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX запускає програми Linux для x86 на цьому пристрої ARM64. У режимі «Авто» він вмикається, якщо програму зібрано для x86.</string> <string name="app_fex_x86">%1$s через FEX</string> <string name="app_fex_not_ready">Цю програму зібрано для ПК з архітектурою %1$s, і вона працює через FEX, який ще не налаштовано. Один раз відкрийте Steam, увійшовши в обліковий запис: DroidDeck завантажить FEX і потрібний йому Steam Linux Runtime, після чого програма відкриється.</string> + <string name="session_proot_missing">Не вдалося завантажити proot DroidDeck. Перевірте зʼєднання та спробуйте ще раз. Сеанс не запущено, бо резервний proot занадто повільний для гри.</string> + <string name="session_directaudio_missing">Не вдалося завантажити DirectAudio, тому в цьому сеансі звук ігор іде повільнішим шляхом.</string> <string name="session_end_program">Ця програма</string> <string name="session_end_steam_download">Не вдалося завантажити клієнт Steam. Можливо, ваша мережа або VPN блокує сервери Steam; перевірте з’єднання та спробуйте ще раз.</string> <string name="session_end_steam_setup">Не вдалося налаштувати клієнт Steam. Перевірте з’єднання та вільне місце, потім спробуйте ще раз.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Контролер Xbox 360</string> <string name="mode_controller_note">Deck: кнопка швидкого доступу й гіроскоп. Steam Controller: те саме плюс датчики хвату на задніх кнопках. DualShock 4 і DualSense: гіроскоп, а трекпади працюють як їхня сенсорна панель. Xbox 360: меню швидкого доступу відкривається комбінацією Guide+A.</string> <string name="mode_back">Кнопка Back</string> + <string name="back_hold">Утримання «Назад» для комбінацій Steam</string> + <string name="back_hold_hint">Утримання «Назад» відкриває швидкий доступ або створює комбінації Steam з іншими кнопками. Вимкніть, щоб утримання ігнорувалося; натискання й подвійне натискання працюють.</string> + <string name="back_native_qam_hint">Утримуйте «Назад» 700 мс або утримуйте «Назад» і натисніть іншу кнопку для комбінацій Steam.</string> + <string name="back_double_tap_window">Інтервал подвійного натискання</string> + <string name="back_tap_ms">%1$d мс</string> + <string name="brightness_permission_title">Дозволити керування яскравістю</string> + <string name="brightness_permission_text">Налаштуйте керування яскравістю в DroidDeck.</string> <string name="back_menu_then_qam">Меню → QAM</string> <string name="back_qam_then_menu">QAM → Меню</string> <string name="mode_session">Сеанс</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Відкладає призупинення у фоні, поки Steam активно щось завантажує.</string> <string name="mode_suspend_note">«Авто» призупиняє сеанс у фоні й відновлює, коли додаток знову на екрані. «Вручну» чекає на «Відновити». «Ніколи» — сеанс працює далі.</string> <string name="mode_startup">Запуск</string> - <string name="mode_steam_startup">Запускати Steam разом із DroidDeck</string> - <string name="mode_steam_startup_hint">Відкриває сеанс Steam під час запуску DroidDeck.</string> + <string name="mode_startup_session">Відкривати під час запуску</string> + <string name="mode_startup_session_hint">Запускає цей сеанс під час запуску DroidDeck.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Пошук випусків…</string> <string name="mode_decky_ready">Можна встановити %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Актуальна версія · %1$s</string> <string name="mode_decky_loader">Завантажувач</string> <string name="mode_decky_install_latest">Установити останню версію</string> + <string name="decky_channel">Канал оновлень</string> + <string name="decky_channel_hint">Які випуски Decky Loader встановлювати. Власний засіб оновлення Decky використовує той самий канал.</string> + <string name="decky_channel_stable">Стабільний</string> + <string name="decky_channel_prerelease">Попередній</string> + <string name="decky_channel_testing">Тестовий</string> + <string name="decky_channel_failed">Не вдалося зберегти канал оновлень Decky</string> <string name="mode_decky_on">Запускається разом зі Steam. Поки його ввімкнено, інші додатки на цьому пристрої можуть керувати Steam.</string> <string name="mode_decky_off">Вимкнено. Порт віддаленого налагодження Steam залишається закритим.</string> <string name="mode_decky_remove_title">Видалити Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Клієнт</string> <string name="mode_mangoapp">Оверлей продуктивності</string> <string name="mode_mangoapp_hint">Вимкніть, якщо в режимі Deck ігри вилітають або показують чорний екран. Застосовується в наступному сеансі.</string> + <string name="mode_return_after_game">Повертатися в DroidDeck після гри</string> + <string name="mode_return_after_game_hint">Коли гра, запущена з DroidDeck або іншого лаунчера, закривається, Steam коректно завершує роботу (спершу завершується збереження в хмару), і ви повертаєтеся туди. Вимкнено: залишатися в Steam.</string> + <string name="mode_shader_precache">Попереднє кешування шейдерів</string> + <string name="mode_shader_precache_hint">Steam завантажує готові шейдери для ваших ігор і обробляє їх у фоні, тож ігри менше підвисають. Вимкнення заощаджує трафік, місце й заряд батареї; натомість ігри збирають шейдери під час гри. Це те саме налаштування, що й «Завантаження > Попереднє кешування шейдерів» у Steam. Застосовується в наступному сеансі.</string> <string name="mode_steam_repair">Відновити клієнт Steam</string> <string name="mode_steam_repair_hint">Повторно завантажує клієнт Steam під час наступного запуску Steam. Скористайтеся цим, якщо Steam не виходить з екрана завантаження. Ігри, вхід і налаштування зберігаються.</string> <string name="mode_steam_repair_queued">Клієнт Steam буде повторно завантажено під час наступного запуску Steam.</string> @@ -392,6 +415,8 @@ <string name="mode_directaudio_hint">Обходить PulseAudio для меншої затримки.</string> <string name="mode_mic">Мікрофон</string> <string name="mode_mic_hint">Для голосового чату.</string> + <string name="drawer_mic_hint">Увімкнути або вимкнути захоплення мікрофона в цьому сеансі.</string> + <string name="drawer_mic_failed">Не вдалося змінити мікрофон. Спробуйте ще раз.</string> <string name="mode_network">Мережа</string> <string name="mode_wifi_discovery">Пошук Wi-Fi</string> <string name="mode_wifi_discovery_hint">Показувати в Steam назви Wi-Fi і мережі поблизу.</string> @@ -555,6 +580,16 @@ <string name="perf_gsrealtime">gamescope: черга GPU реального часу</string> <string name="perf_gsrealtime_hint">Надає пріоритет роботі композитора на GPU. Може вирівняти темп кадрів ціною частини продуктивності ігор.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Памʼять</string> + <string name="perf_cap_off">Вимк.</string> + <string name="perf_cap_auto">Типово для драйвера</string> + <string name="perf_zram_client">Стискати Steam під час гри</string> + <string name="perf_zram_client_hint">Через 20 с після запуску гри клієнт Steam стискається в zRAM, щоб залишити грі більше памʼяті, і зчитується назад, коли гра закривається. Вимкніть, якщо сеанс закривається невдовзі після запуску ігор. Ліміт RAM вище все одно стискає Steam, коли сеанс його перевищує.</string> + <string name="perf_ram_cap">Ліміт RAM</string> + <string name="perf_ram_cap_hint">Діє, поки працює клієнт Steam, у режимі Steam або з робочого столу. Коли сеанс використовує більше цього значення, Steam, а потім інші підтримувані процеси сеансу стискаються в zRAM. Мʼякий ліміт: нічого не закривається, але ігри можуть підвисати, поки сторінки повертаються.</string> + <string name="perf_ram_cap_unavailable">Потрібен своп zRAM, якого на цьому пристрої немає.</string> + <string name="perf_vram_cap">Ліміт VRAM</string> + <string name="perf_vram_cap_hint">Обсяг відеопамʼяті, який DXVK повідомляє іграм Direct3D, щоб вони розраховували текстури на менше. Власні налаштування DXVK гри мають пріоритет. Набуде чинності в наступному сеансі.</string> <string name="perf_gpuclock">Тримати GPU на максимальній частоті</string> <string name="perf_gpuclock_hint">Лише Adreno. Менше запинок, вища витрата заряду та нагрів.</string> <string name="perf_fixes">Виправлення сеансу</string> @@ -573,6 +608,8 @@ <string name="perf_fastpath">Швидкий шлях proot</string> <string name="perf_fastpath_needs_seccomp">Потребує фільтра seccomp у proot.</string> <string name="perf_fastpath_hint">Швидший пошук файлів і менше запинок. Вимкніть, якщо програма не може знайти свої файли.</string> + <string name="perf_cursor_composite">Малювати курсор усередині gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope сам малює вказівник замість передавати його Android. Увімкніть для курсора, керованого контролером. На телефоні швидше вимкнено. Застосовується в наступному сеансі.</string> <string name="perf_identity">Ідентифікація сеансу</string> <string name="perf_hostname">Ім’я хоста</string> <string name="perf_hostname_hint">Ім’я, яке Steam бачить для цього пристрою. Порожнє значення відновлює %1$s.</string> @@ -587,6 +624,8 @@ <string name="driver_delete_plain">Його файли видаляються з додатка.</string> <string name="driver_delete_in_use">Його файли видаляються. Він зараз використовується, тому його замінює стандартний драйвер.</string> <string name="drawer_page_display">Екран</string> + <string name="drawer_frame_limit">Обмеження кадрів</string> + <string name="drawer_frame_limit_note">Обмежує цю гру. Екран перемикається на частоту оновлення, яка ділиться на обмеження без залишку, якщо така є; інші обмеження можуть виглядати нерівно. Ігри Steam використовують обмеження кадрів Steam у меню швидкого доступу.</string> <string name="drawer_page_effects">Ефекти</string> <string name="drawer_page_controls">Керування</string> <string name="drawer_page_components">Компоненти</string> @@ -618,8 +657,11 @@ <string name="hud_size_pill">Капсула</string> <string name="hud_size_minimal">Мінімальний</string> <string name="hud_size_mega">Мега</string> + <string name="hud_size_strip">Смуга</string> <string name="hud_locked">Закріпити на місці</string> <string name="hud_locked_hint">Перетягніть HUD, щоб перемістити його; довге натискання закріплює або відкріплює його. Поки його закріплено, екранні елементи керування під ним працюють і далі.</string> + <string name="hud_snap">Прилипання до боків</string> + <string name="hud_snap_hint">Відпустіть HUD, і він переміститься до ближчого боку екрана. Різкий жест відкине його в той бік.</string> <string name="hud_group_look">Вигляд</string> <string name="hud_scale">Розмір на екрані</string> <string name="hud_color_soft">М\'який</string> @@ -668,7 +710,6 @@ <string name="hud_export_failed">Не вдалося зберегти звіт HUD.</string> <string name="hud_reset">Скинути налаштування HUD</string> <string name="hud_reset_button">Скинути</string> - <string name="hud_credit">FusionHUD від The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Режим масштабування</string> <string name="drawer_scaling_sharpness">Чіткість масштабування</string> <string name="drawer_effects">Ефекти екрана</string> @@ -703,11 +744,17 @@ <string name="drawer_touch_auto">Авто (%1$s)</string> <string name="drawer_keyboard">Клавіатура</string> <string name="drawer_latency">Затримка</string> + <string name="drawer_low_latency">Режим низької затримки</string> + <string name="drawer_low_latency_hint">Збільшує навантаження на CPU та витрату батареї</string> <string name="drawer_low_latency_controller">Контролер із низькою затримкою</string> <string name="drawer_low_latency_controller_hint">Контролер звітує на 1000 Hz замість 250 Hz. Трохи більше навантаження на CPU.</string> <string name="drawer_low_latency_touch">Дотик із низькою затримкою</string> <string name="drawer_low_latency_touch_hint">Дотики обходять групування кадрів, тож сенсорне керування Steam працює на 1000 Hz. Трохи більше навантаження на CPU.</string> <string name="drawer_evdev_mouse">Сирий канал миші</string> + <string name="drawer_relative_mouse">Відносна миша</string> + <string name="drawer_relative_mouse_auto">Автоматично</string> + <string name="drawer_relative_mouse_on">Увімкнено</string> + <string name="drawer_relative_mouse_off">Вимкнено</string> <string name="drawer_direct_cursor">Курсор</string> <string name="drawer_pc_keyboard">Клавіатура ПК</string> <string name="drawer_android_keyboard">Android</string> @@ -797,6 +844,10 @@ <string name="setup_session">Сеанс</string> <string name="setup_logs">Журнали сеансу</string> <string name="setup_logs_hint">Зберігаються після кожного сеансу</string> + <string name="setup_game_debug_logs">Журнали налагодження ігор</string> + <string name="setup_game_debug_logs_hint">Додавати діагностику Proton, Wine і графіки під час наступного запуску гри. Може знизити продуктивність і зайняти більше місця.</string> + <string name="setup_game_debug_logs_restart">Перезапустіть цей сеанс, щоб зберігати журнали налагодження ігор</string> + <string name="setup_logging_update_failed">Не вдалося оновити журналювання. Перевірте перемикач і спробуйте ще раз.</string> <string name="setup_agent_commands">Засоби діагностики</string> <string name="setup_latest_logs">Останні журнали сеансу</string> <string name="setup_saved_logs">Збережені журнали сеансу</string> @@ -828,20 +879,22 @@ <string name="setup_home">Використовувати як головний екран</string> <string name="setup_home_on">DroidDeck може бути додатком головного екрана</string> <string name="setup_home_off">DroidDeck ніколи не пропонується як додаток головного екрана</string> + <string name="setup_home_game_space_first">У розділі «Додати ігри» перемкніть DroidDeck на «Включити»</string> <string name="setup_orientation">Орієнтація</string> + <string name="setup_launcher_orientation">Орієнтація лаунчера</string> + <string name="setup_launcher_orientation_auto">Слідувати повороту пристрою</string> + <string name="setup_orientation_portrait">Книжкова</string> + <string name="setup_session_orientation">Орієнтація сеансу</string> + <string name="setup_session_orientation_hint">Застосовується до Steam, ігор, робочого столу й редактора контролера. Готові роздільні здатності повертаються разом із сеансом; власні ширина й висота залишаються як введено.</string> <string name="setup_orientation_auto">Автоматично альбомна</string> <string name="setup_orientation_landscape">Альбомна</string> <string name="setup_orientation_reverse">Перевернута альбомна</string> <string name="setup_fullscreen">Повний екран</string> <string name="setup_fullscreen_on">Приховує рядок стану та панель навігації Android</string> <string name="setup_fullscreen_off">Показує рядок стану та панель навігації Android</string> - <string name="setup_dual_screen">Два екрани</string> - <string name="setup_dual_screen_hint">Автоматично — використовує другий екран на портативних пристроях із вбудованим другим екраном. Увімк. — використовує будь-який другий дисплей. Вимк. — усе лишається на одному екрані.</string> <string name="setup_dual_screen_auto">Автоматично</string> <string name="setup_dual_screen_on">Увімк.</string> <string name="setup_dual_screen_off">Вимк.</string> - <string name="setup_dual_screen_menu">Меню на нижньому екрані</string> - <string name="setup_dual_screen_menu_hint">Переносить розділи та меню в грі на другий екран, і введення відбувається там, тож верхній екран лишається повністю вільним. L2 і R2 перемикають розділи.</string> <string name="setup_dual_screen_controls">Керування на нижньому екрані в іграх</string> <string name="setup_dual_screen_controls_hint">Відкриває тачпад і клавіатуру на другому екрані під час запуску сеансу.</string> <string name="dual_typing_title">Введення для верхнього екрана</string> @@ -999,6 +1052,14 @@ <string name="gate_step1">Відкрийте «Налаштування» → «Параметри розробника» → «Бездротове налагодження» і увімкніть його</string> <string name="gate_step2">Натисніть «Поєднати пристрій за кодом»</string> <string name="gate_step3">Введіть код у сповіщення DroidDeck</string> + <string name="pairguide_build_number">У розділі «Про телефон» натисніть «Номер збірки» 7 разів</string> + <string name="pairguide_wireless">Увімкніть «Налагодження через Wi-Fi»</string> + <string name="pairguide_pair">Відкрийте «Налагодження через Wi-Fi» і натисніть «Підключити пристрій за допомогою коду»</string> + <string name="pairguide_child_process">Увімкніть «Вимкнути обмеження дочірніх процесів»</string> + <string name="pairguide_row_child_process">Вимкнути обмеження дочірніх процесів</string> + <string name="pairguide_row_build_number">Номер збірки</string> + <string name="pairguide_row_wireless">Налагодження через Wi-Fi</string> + <string name="pairguide_row_pair">Підключити пристрій за допомогою коду</string> <string name="gate_waiting">Очікування вікна поєднання…</string> <string name="gate_code_needed">Вікно знайдено. Введіть його код у сповіщенні.</string> <string name="gate_status">Статус</string> @@ -1137,7 +1198,6 @@ <string name="games_never_played">Ще не грали</string> <string name="games_runtime_busy_percent">Середовище зайняте · %1$d%%</string> <string name="games_runtime_busy">Середовище зайняте</string> - <string name="games_runtime_first_play">Середовище встановлюється під час першого натискання «Грати»</string> <string name="games_runtime_update">Є оновлення середовища</string> <string name="games_runtime_ready">● Середовище готове</string> <string name="games_internal">Внутрішнє сховище</string> @@ -1154,6 +1214,9 @@ <string name="gpu_hide_other">Приховати драйвери для інших GPU</string> <string name="gpu_show_other">Показати драйвери для інших GPU</string> <string name="gpu_advanced">Додатково</string> + <string name="gpu_ubwc_title">Сумісність UBWC</string> + <string name="gpu_ubwc_hint">Спробуйте «Увімк.» або «Вимк.», якщо в Steam чи Android зʼявляються смуги або мерехтіння. Застосовується до обох драйверів після перезапуску DroidDeck.</string> + <string name="gpu_ubwc_restart">Перезапустіть DroidDeck, щоб застосувати.</string> <string name="gpu_set_with_display">Задається разом із драйвером дисплея: %1$s містить обидва.</string> <string name="gpu_set_with_runtime">Задається разом із драйвером середовища: %1$s містить обидва.</string> <string name="gpu_runtime_hint">Використовується іграми та робочим столом.</string> @@ -1262,10 +1325,15 @@ <string name="pip_auto">Автоматично вмикати режим PiP</string> <string name="unfolded_controls">Керування на розгорнутому екрані</string> <string name="unfolded_controls_hint">У розгорнутому стані гра розташована над трекпадами й задніми кнопками Steam Deck. У складеному — гра на весь екран.</string> + <string name="unfolded_controls_with_controller">Залишати з контролером</string> + <string name="unfolded_controls_with_controller_hint">Показувати це сенсорне керування також, коли підʼєднано контролер.</string> <string name="pip_suspended">Призупинено</string> <string name="pip_not_ready">Режим «Картинка в картинці» стане доступним, щойно сеанс буде готовий.</string> <string name="pip_permission">Дозвольте DroidDeck режим «Картинка в картинці» в налаштуваннях Android.</string> <string name="pip_unavailable">Android не вдалося відкрити режим «Картинка в картинці».</string> + <string name="game_more">Більше</string> + <string name="game_edit_art">Змінити обкладинку</string> + <string name="stores_in_steam_label">У Steam</string> <string name="game_shortcut">Ярлик</string> <string name="game_shortcut_add">Додати на головний екран</string> <string name="game_shortcut_choose">Вибрати гру</string> @@ -1289,6 +1357,10 @@ <string name="main_wait_runtime">Дочекайтеся завершення операції із середовищем</string> <string name="main_wait_proton_install">Дочекайтеся завершення встановлення інструмента сумісності</string> + <string name="load_compat_title">Підготовка інструментів сумісності</string> + <string name="load_compat_wait">Очікування завершення налаштування сумісності</string> + <string name="load_compat_hint">Сеанс запуститься, коли налаштування завершиться.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Дочекайтеся завершення встановлення програми для робочого столу</string> <string name="main_wait_install_game">Дочекайтеся завершення встановлення, перш ніж запускати гру</string> <string name="main_saves_close_session">Спершу закрийте сеанс Steam, щоб гра не перезаписала імпортовані збереження</string> @@ -1333,6 +1405,9 @@ <string name="main_install_anyway">Усе одно встановити</string> <string name="main_remove_runtime_title">Видалити середовище Linux</string> <string name="main_remove_runtime_text">Буде видалено середовище, клієнт Steam у ньому та всі встановлені там ігри.</string> + <string name="runtime_actions_title">Середовище Linux</string> + <string name="runtime_actions_text">Відновлення перевстановлює системні файли середовища й зберігає Steam, ваші ігри та налаштування. Доповнення, як-от робочий стіл, установляться знову, коли ви їх наступного разу використаєте. Видалення стирає все.</string> + <string name="runtime_repair">Відновити середовище</string> <string name="main_applied">Застосовано: %1$s</string> <string name="android_app_open_failed_primary">Не вдалося відкрити %1$s на основному екрані</string> <string name="android_app_open_failed_on">Не вдалося відкрити %1$s на %2$s</string> @@ -1468,6 +1543,13 @@ <string name="session_runtime_catalog_unreachable">Не вдалося отримати каталог середовищ. Перевірте з’єднання й натисніть «Грати» ще раз.</string> <string name="session_runtime_install_failed">Середовище Linux не встановилося. Перевірте його в розділі «Налаштування» й натисніть «Грати» ще раз.</string> <string name="session_desktop_install_failed">Робочий стіл не встановився (%1$s). Перевірте з’єднання й натисніть «Робочий стіл» ще раз.</string> + <string name="session_package_resume_failed">Не вдалося завершити перерване встановлення (%1$s). Перевірте зʼєднання та вільне місце, потім спробуйте ще раз.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="one">Середовище Linux пошкоджено: %1$d посилання на бібліотеку вказує на відсутній файл (%2$s), зазвичай після перерваного встановлення. Відновлення зберігає ваші ігри та налаштування.</item> + <item quantity="few">Середовище Linux пошкоджено: %1$d посилання на бібліотеки вказують на відсутні файли (%2$s та інші), зазвичай після перерваного встановлення. Відновлення зберігає ваші ігри та налаштування.</item> + <item quantity="many">Середовище Linux пошкоджено: %1$d посилань на бібліотеки вказують на відсутні файли (%2$s та інші), зазвичай після перерваного встановлення. Відновлення зберігає ваші ігри та налаштування.</item> + <item quantity="other">Середовище Linux пошкоджено: %1$d посилання на бібліотеки вказують на відсутні файли (%2$s та інші), зазвичай після перерваного встановлення. Відновлення зберігає ваші ігри та налаштування.</item> + </plurals> <string name="session_ended_named">Роботу %1$s несподівано завершено. Додайте журнали до звіту про помилку або спробуйте ще раз.</string> <string name="session_ended_program">Програма несподівано зупинилася. Додайте журнали до звіту про помилку або спробуйте ще раз.</string> <string name="session_ended_desktop">Робочий стіл несподівано зупинився. Додайте журнали до звіту про помилку або спробуйте ще раз.</string> @@ -1484,6 +1566,15 @@ <string name="mode_decky_plugins_hint">Встановіть плагін із ZIP для наступного сеансу Steam.</string> <string name="mode_decky_plugin_downloading">Завантаження…</string> <string name="mode_decky_plugin_install_zip">Встановити із ZIP</string> + <string name="decky_zip_warning_title">Встановлення стороннього плагіна</string> + <string name="decky_zip_warning_text">Команда Decky Loader не перевіряла цей плагін. Він може містити шкідливе ПЗ, наприклад програми для крадіжки вашого облікового запису Steam або пошкодження пристрою. Встановлюючи цей плагін, ви погоджуєтеся, що берете на себе всі ризики для свого пристрою.</string> + <string name="decky_zip_warning_continue">Продовжити</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="one">Зачекайте %1$d секунду</item> + <item quantity="few">Зачекайте %1$d секунди</item> + <item quantity="many">Зачекайте %1$d секунд</item> + <item quantity="other">Зачекайте %1$d секунди</item> + </plurals> <string name="store_cat_games">Ігри</string> <string name="store_cat_audio_video">Аудіо й відео</string> <string name="store_cat_graphics">Графіка</string> @@ -1655,6 +1746,8 @@ <string name="fm_accept">Прийняти</string> <string name="fm_decline">Відхилити</string> <string name="fm_drive_not_readable">%1$s: підключено, але читання зараз недоступне</string> + <string name="fm_drive_access_title">Дозволити доступ до %1$s</string> + <string name="fm_drive_access_text">Android дозволяє DroidDeck бачити цей диск, але не читати його. Увімкніть для DroidDeck доступ до всіх файлів і поверніться.</string> <string name="fm_list_view">Список</string> <string name="fm_grid_view">Сітка</string> <string name="fm_search">Пошук</string> @@ -1728,6 +1821,89 @@ <string name="second_mode_keyboard_trackpad">Клавіатура + трекпад</string> <string name="second_mode_terminal">Термінал</string> <string name="second_mode_deck_controls">Задні кнопки + трекпади Deck</string> + <string name="second_mode_dashboard">Панель</string> + <string name="bottom_dashboard_empty">Тут поки нічого показати.</string> + <string name="bottom_page_downloads">Завантаження</string> + <string name="bottom_downloads_none">Немає активних завантажень.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Завантаження кешу шейдерів</string> + <string name="bottom_downloads_paused">Призупинено</string> + <string name="bottom_downloads_queued">Очікує початку</string> + <string name="bottom_page_notifications">Сповіщення</string> + <string name="bottom_notifications_listener">Нижній екран DroidDeck</string> + <string name="bottom_notifications_why">Показуйте тут повідомлення та інші сповіщення під час гри. Вони лишаються лише на цьому екрані й не зберігаються. Android запитає один раз: сторінка доступу до сповіщень відкриється на цьому екрані; увімкніть там DroidDeck, і ця сторінка повернеться сама.</string> + <string name="bottom_notifications_allow">Дозволити доступ до сповіщень</string> + <string name="bottom_notifications_none">Немає сповіщень.</string> + <string name="bottom_notifications_count">Сповіщень: %1$d</string> + <string name="bottom_notifications_clear">Очистити</string> + <string name="bottom_page_screenshots">Знімки екрана</string> + <string name="stats_fps_needs_hud">Для FPS потрібно ввімкнути HUD</string> + <string name="stats_speed">Швидкість</string> + <string name="stats_pedals">Педалі</string> + <string name="stats_gforce">Перевантаження</string> + <string name="stats_timing">Час</string> + <string name="stats_best_lap">Найкраще коло</string> + <string name="stats_tires">Шини °C</string> + <string name="stats_trace">Газ і гальмо, останні 10 s</string> + <string name="stats_speed_chart">Швидкість, %1$s</string> + <string name="stats_gear">Передача</string> + <string name="stats_steam_client_arm">Клієнт Steam ARM</string> + <string name="stats_steam_client_x86">Клієнт Steam x86</string> + <string name="stats_throttle">Газ</string> + <string name="stats_brake">Гальмо</string> + <string name="stats_lights">Панель приладів</string> + <string name="stats_lamp_shift">Перемикання</string> + <string name="stats_lamp_handbrake">Ручне гальмо</string> + <string name="stats_lamp_pit">Обмежувач піт-лейну</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Турбо %1$s bar</string> + <string name="stats_engine_temp">Двигун %1$s °C</string> + <string name="stats_oil_temp">Олива %1$s °C</string> + <string name="stats_power">Розподільник енергії</string> + <string name="stats_fuel_t">Пальне, t</string> + <string name="stats_fuel_main">Основне %1$s t</string> + <string name="stats_fuel_reserve">Резерв %1$s t</string> + <string name="bottom_telemetry_send_title">Надсилати дані для панелі</string> + <string name="bottom_telemetry_send_auto">Автоматично</string> + <string name="bottom_telemetry_send_auto_hint">Вмикає це для кожної гри в цьому списку, зокрема для знайдених пізніше. Ігри, які ви вимкнете, лишаються вимкненими.</string> + <string name="bottom_telemetry_send_note">Це змінює власне налаштування виведення даних у грі. Зміна діє з наступного запуску гри; вимкнення повертає попереднє налаштування.</string> + <string name="bottom_telemetry_send_close">Закрийте %1$s, щоб змінити це.</string> + <string name="bottom_telemetry_send_failed">Не вдалося змінити налаштування %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: увімкніть %2$s у налаштуваннях гри з IP 127.0.0.1 і портом %3$d.</string> + <string name="bottom_shots_where">Зберігаються в Pictures/DroidDeck. Знімки екрана Steam також показуються тут.</string> + <string name="bottom_shots_take">Зробити знімок екрана</string> + <string name="bottom_shots_saved">Знімок екрана збережено.</string> + <string name="bottom_shots_failed">Не вдалося зробити знімок екрана.</string> + <string name="bottom_shots_none">Ще немає знімків екрана.</string> + <string name="bottom_page_chat">Чат і голос</string> + <string name="bottom_chat_why">Читайте чат Steam і відповідайте в ньому тут, поки гра працює на головному екрані. Використовується обліковий запис, у який виконано вхід у Steam.</string> + <string name="bottom_chat_not_signed_in">У Steam ще немає вебвходу, яким можна поділитися, тож увійдіть тут один раз.</string> + <string name="bottom_chat_stopped">Android закрив сторінку чату, поки DroidDeck був у фоні. Вона знову відкриється, коли ви повернетеся до DroidDeck.</string> + <string name="bottom_chat_open">Відкрити Steam Chat</string> + <string name="bottom_chat_close">Закрити чат</string> + <string name="bottom_chat_mic_on">Мікрофон увімкнено</string> + <string name="bottom_chat_mic_off">Мікрофон вимкнено</string> + <string name="bottom_chat_mic_unavailable">Для цієї гри мікрофон вимкнено. Щоб говорити, увімкніть «Мікрофон» у налаштуваннях Steam у DroidDeck (Звук) і запустіть гру знову.</string> + <string name="bottom_chat_volume">Гучність %1$d%%</string> + <string name="bottom_page_telemetry">Ігрова статистика</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Батарея</string> + <string name="bottom_telemetry_lap">Коло</string> + <string name="bottom_telemetry_position">Позиція</string> + <string name="bottom_telemetry_this_lap">Поточне коло</string> + <string name="bottom_telemetry_last_lap">Останнє коло</string> + <string name="bottom_telemetry_fuel">Пальне</string> + <string name="bottom_telemetry_cargo">Вантаж</string> + <string name="bottom_telemetry_pips">Енергія SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Правовий статус</string> + <string name="bottom_telemetry_balance">Баланс</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Порт %1$d отримує дані (пакетів: %2$d, по %3$d байт), але у форматі, який ця сторінка ще не вміє читати.</string> + <string name="bottom_telemetry_port_busy">Порт %1$s уже використовує інша програма, тому ця гра не може відображатися тут.</string> <string name="rtinst_removing">Видалення середовища Linux</string> <plurals name="rtinst_removing_entries"> @@ -1760,6 +1936,7 @@ <string name="flatpakmgr_not_ready">Спершу налаштуйте Flatpak</string> <string name="flatpakmgr_starting">Запуск</string> <string name="flatpakmgr_exit_status">Flatpak завершився з кодом %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s зібрано для %2$s, а DroidDeck не може це запустити. Застосункам Flatpak тут потрібна збірка для ARM64 або x86_64.</string> <string name="flatpakmgr_installing">Встановлення %1$s</string> <string name="flatpakmgr_updating">Оновлення %1$s</string> <string name="flatpakmgr_removing">Видалення %1$s</string> @@ -1853,6 +2030,7 @@ <string name="adbpair_applying">Застосування налаштування…</string> <string name="adbpair_command_failed">Помилка команди бездротового налагодження</string> <string name="adbpair_channel_name">Налаштування бездротового налагодження</string> + <string name="adbpair_progress_channel_name">Хід налаштування налагодження через Wi-Fi</string> <string name="adbpair_channel_description">Запитує код прив’язки бездротового налагодження, коли відкрито «Налаштування»</string> <string name="adbpair_title_pair">Прив’язати бездротове налагодження</string> <string name="adbpair_waiting_text">Увімкніть бездротове налагодження, потім торкніться «Прив’язати пристрій за кодом прив’язки».</string> @@ -1961,6 +2139,7 @@ <string name="gpuinfo_not_adreno">Не GPU Adreno</string> <string name="gpuinfo_supported">Підтримується</string> <string name="gpuinfo_experimental">Експериментально: його драйвери - тестові збірки</string> + <string name="gpuinfo_a850_experimental">Експериментальна підтримка Adreno 850: потрібні сумісні експериментальні драйвери дисплея та ігор; не перевірено на цьому пристрої</string> <string name="gpuinfo_below_tested">Нижче за протестоване обладнання (Adreno 725 і новіші): може не запрацювати</string> <string name="gpuinfo_unsupported">Не підтримується: DroidDeck потребує GPU Adreno (Snapdragon)</string> @@ -2057,6 +2236,7 @@ <string name="display_look_filter">%1$s Встановлює масштабування на %2$s.</string> <string name="display_match_screen">Під екран (%1$d×%2$d)</string> <string name="display_follow_screen">Слідувати за екраном (змінює розмір при згортанні чи розгортанні)</string> + <string name="display_follow_screen_scaled">Масштаб %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Показати відомості про пристрій</string> <string name="device_info_hide">Сховати відомості про пристрій</string> @@ -2163,6 +2343,13 @@ <string name="stores_resume">Продовжити</string> <string name="stores_refresh">Оновити</string> <string name="stores_sort">Сортувати</string> + <string name="setup_rail_labels">Підписи бічної панелі</string> + <string name="setup_rail_labels_hint">Показувати назви під значками бічної панелі. Вимкніть, щоб зробити панель вужчою.</string> + <string name="library_display">Вигляд</string> + <string name="library_display_larger">Великі картки</string> + <string name="library_display_smaller">Малі картки</string> + <string name="library_display_title">Показувати назву</string> + <string name="library_display_size">Показувати розмір</string> <string name="stores_sort_last_played">Нещодавно запущені</string> <string name="stores_sort_recently_installed">Нещодавно встановлені</string> <string name="stores_sort_title_asc">Назва А–Я</string> @@ -2289,6 +2476,9 @@ <string name="stores_download_manager">Менеджер завантажень</string> <string name="stores_parallel">Одночасних завантажень</string> <string name="stores_install_where">Встановити в</string> + <string name="stores_install_language">Мова гри</string> + <string name="stores_install_language_hint">GOG і Epic установлюють цю мову. «Системна» відповідає мові додатка.</string> + <string name="stores_install_language_system">Системна</string> <string name="stores_install_title">Встановити %1$s:</string> <string name="stores_target_internal">Внутрішня пам’ять</string> <string name="stores_target_free">%1$s вільно</string> @@ -2327,6 +2517,9 @@ <string name="edit_target">Ціль</string> <string name="edit_start_in">Робоча папка</string> <string name="edit_launch_options">Параметри запуску</string> + <string name="edit_launch_options_steam_hint">Спільні з «Властивостями» Steam: зміна в одному місці видна в обох.</string> + <string name="edit_launch_options_not_saved">Не вдалося зберегти параметри запуску в Steam. Спробуйте ще раз.</string> + <string name="edit_launch_options_desktop">Steam може бути відкритий у сеансі робочого столу. Змініть параметри запуску в його «Властивостях» або спершу закрийте сеанс.</string> <string name="edit_artwork">Графіка</string> <string name="edit_other_exe">Інший exe…</string> <string name="edit_remove">Вилучити</string> @@ -2458,6 +2651,7 @@ <string name="setup_download_source_custom">Власний префікс</string> <string name="setup_download_mirror">Сайт</string> <string name="setup_download_prefix">Префікс</string> + <string name="setup_download_proxy">HTTP-проксі</string> <string name="flathub_eyebrow">ПРОГРАМИ LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Програми для стільниці Linux, які відкриваються з Робочого столу.</string> @@ -2602,6 +2796,22 @@ <string name="glasses_tracking_flat_hint">«Автоматично» тримає цю 2D-гру нерухомою в полі зору. Щоб використовувати відстеження голови, виберіть «Віртуальний екран» у розділі «Екран».</string> <string name="glasses_tracking_sbs_hint">Відстеження голови діє для віртуального екрана або запущеної гри SteamVR.</string> <string name="glasses_hardware">Пристрій</string> + <string name="vr_controllers_tab">Контролери</string> + <string name="vr_controllers_group">Контролери SteamVR</string> + <string name="vr_controllers_emulate">Геймпад у VR</string> + <string name="vr_controllers_emulate_hint">Дві VR-руки, якими грає ваш контролер. Зміни застосовуються одразу, навіть коли працює SteamVR. Joy-Con і відстежувані руки все одно перебирають свою сторону.</string> + <string name="vr_controllers_off">Звичайний геймпад</string> + <string name="vr_controllers_index">Контролери Valve Index</string> + <string name="vr_controllers_touch">Контролери Meta Quest 3</string> + <string name="vr_controllers_vive">Контролери HTC Vive</string> + <string name="vr_controllers_sticks">Стіки спочатку</string> + <string name="vr_controllers_sticks_hint">Натисніть обидва стіки одночасно у VR, щоб перемкнути.</string> + <string name="vr_controllers_sticks_game">Переміщують вас у грі</string> + <string name="vr_controllers_sticks_hands">Переміщують руки</string> + <string name="vr_controllers_buttons">Кнопки</string> + <string name="vr_controllers_buttons_stick">Тригери — це тригери, бампери — хват, A/B і X/Y — лицьові кнопки кожної руки, натискання стіків натискають стіки VR-контролерів, Guide відкриває меню SteamVR. Вгору й вниз на хрестовині наближають або віддаляють руки.</string> + <string name="vr_controllers_buttons_vive">Стіки працюють як трекпади; A/X або натискання стіка натискає їх. Тригери — це тригери, бампери — хват, Start і Select — меню, Guide відкриває меню SteamVR.</string> + <string name="vr_controllers_buttons_off">Без VR-рук. Ігри з підтримкою геймпада й меню SteamVR отримують ваш контролер як зазвичай.</string> <string name="glasses_brightness">Яскравість</string> <string name="glasses_volume">Гучність</string> <string name="glasses_sunblock">Затемнення</string> @@ -2659,6 +2869,12 @@ <string name="hand_camera_placement">Розташування камери</string> <string name="hand_camera_placement_hint">Перевірте, що камера бачить вас, перш ніж почати гру.</string> <string name="hand_camera_check">Перевірити</string> + <string name="tracking_pack_title">Завантаження відстеження рук</string> + <string name="tracking_pack_hint">Для відстеження рук потрібне одноразове завантаження %1$s.</string> + <string name="tracking_pack_download">Завантажити</string> + <string name="tracking_pack_retry">Повторити</string> + <string name="tracking_pack_downloading">Завантаження відстеження рук… %1$d%%</string> + <string name="tracking_pack_failed">Не вдалося завантажити відстеження рук. Перевірте зʼєднання та спробуйте ще раз.</string> <string name="hand_camera_check_title">Розташування камери</string> <string name="hand_camera_how_rear">Поставте пристрій вертикально на відстані від 1,5 до 2 метрів, приблизно на рівні грудей, спрямувавши задню камеру на себе. Потім станьте в кадр, витягнувши руки.</string> <string name="hand_camera_how_front">Поставте пристрій вертикально на відстані від 1,5 до 2 метрів, приблизно на рівні грудей, спрямувавши екран на себе. Потім станьте в кадр, витягнувши руки.</string> @@ -2730,6 +2946,21 @@ <string name="storage_safe_hint">Невикористані середовища виконання, залишки, старі журнали</string> <string name="storage_clean_up">Очищення…</string> <string name="storage_session_running">Зупиніть сеанс, щоб очистити або видалити будь-що. Розміри залишаться видними.</string> + <string name="storage_default_group">Місце встановлення</string> + <string name="storage_default_title">Сховище за замовчуванням</string> + <string name="storage_default_hint">Нові встановлення з магазинів потрапляють у вибране місце. Наявні ігри залишаються на місці. Бібліотеки Steam мають власне налаштування.</string> + <string name="storage_default_ask">Питати щоразу</string> + <string name="storage_default_ask_detail">Вибирати місце для кожного встановлення</string> + <string name="storage_default_internal">Внутрішнє сховище</string> + <string name="storage_default_external">Зовнішнє сховище</string> + <string name="storage_default_external_detail">%1$s · вільно %2$s</string> + <string name="storage_default_external_missing">Не підключено</string> + <string name="storage_default_folder">Папка · %1$s</string> + <string name="storage_default_folder_free">Вільно %1$s</string> + <string name="storage_default_folder_missing">Не підключено</string> + <string name="storage_default_choose_folder">Вибрати папку…</string> + <string name="storage_default_choose_folder_detail">Будь-яка папка на SD-картці або USB-накопичувачі</string> + <string name="storage_default_note">Ігри потрапляють у папку Games у вибраному місці. Наявні ігри не переміщуються.</string> <string name="storage_where">Куди йде</string> <string name="storage_games">Ігри Steam</string> <string name="storage_game_data">Дані ігор</string> @@ -2865,6 +3096,9 @@ <string name="storage_data_installed">Встановлені ігри</string> <string name="storage_data_parts">Префікси %1$s · шейдери %2$s · майстерня %3$s</string> <string name="storage_clear_shaders">Очистити шейдери</string> + <string name="storage_reset_prefix">Скинути префікс</string> + <string name="storage_reset_prefix_title">Скинути префікс для %1$s?</string> + <string name="storage_reset_prefix_confirm">Видаляє префікс Wine (%1$s) у %2$s і створює його знову під час наступного запуску. Збереження, налаштування та встановлені в ньому розповсюджувані пакети буде втрачено; збереження Steam Cloud залишаються у вашому обліковому записі.</string> <string name="storage_data_leftovers">Видалені ігри</string> <string name="storage_steam_app">Застосунок Steam %1$d</string> <string name="storage_leftover_unsure_detail">Префікс ще містить файли, можливо локальні збереження</string> @@ -3169,6 +3403,117 @@ <string name="spatial_saved_views_hint">Збережені перегляди можна перерахувати. Розпочніть нове калібрування для запису в поточній системі координат відстеження.</string> <string name="spatial_model_checksum_error">Невідповідність контрольної суми моделі руки</string> <string name="spatial_opencv_load_error">Не вдалося завантажити OpenCV</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Синхронізація через Syncthing</string> + <string name="sync_enable_hint">Це реалізація Syncthing на основі Syncthing-Fork, яка дає змогу синхронізувати файли у внутрішній файловій системі DroidDeck з іншими екземплярами Syncthing. Вона працює лише з файлами, які ви зберігаєте у внутрішній файловій системі DroidDeck.</string> + <string name="sync_missing">Ця збірка не містить Syncthing.</string> + <string name="sync_starting">Запуск Syncthing</string> + <string name="sync_status_starting">Запуск</string> + <string name="sync_status_up_to_date">Синхронізовано</string> + <string name="sync_status_syncing">Синхронізація</string> + <string name="sync_status_paused">Призупинено</string> + <string name="sync_status_pausing">Призупинення</string> + <string name="sync_status_resuming">Відновлення</string> + <string name="sync_status_attention">Потрібна увага</string> + <string name="sync_status_failed">Syncthing зупинено</string> + <string name="sync_failed_retry">Повторити</string> + <string name="sync_paused_wifi">Призупинено до підключення до Wi-Fi</string> + <string name="sync_paused_game">Призупинено на час гри</string> + <string name="sync_summary">Папок: %1$d · підключено пристроїв: %2$d з %3$d</string> + <string name="sync_left">Залишилося: %1$s</string> + <string name="sync_open_web_ui">Відкрити вебінтерфейс</string> + <string name="sync_pause">Призупинити</string> + <string name="sync_resume">Відновити</string> + <string name="sync_running">Працює</string> + <string name="sync_running_hint">Вимкніть, щоб повністю зупинити Syncthing.</string> + <string name="sync_this_device">Цей пристрій</string> + <string name="sync_device_id">ID пристрою</string> + <string name="sync_show_qr">Показати QR-код</string> + <string name="sync_advanced">Додатково</string> + <string name="sync_advanced_hint">Порти, коли працювати, скидання</string> + <string name="sync_open">Відкрити</string> + <string name="sync_waiting">Чекає на вас</string> + <string name="sync_pending_device">%1$s хоче підключитися</string> + <string name="sync_pending_folder">%1$s хоче надати доступ до «%2$s»</string> + <string name="sync_pending_folder_hint">Прийміть, щоб вибрати, куди зберігати її в DroidDeck.</string> + <string name="sync_review">Переглянути у вебінтерфейсі</string> + <string name="sync_folders">Папки</string> + <string name="sync_no_folders">Папок ще немає.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Синхронізовано</string> + <string name="sync_folder_syncing">Синхронізація: %1$d%%</string> + <string name="sync_folder_scanning">Сканування</string> + <string name="sync_folder_paused">Призупинено</string> + <string name="sync_folder_out_of_sync">Не синхронізовано</string> + <string name="sync_folder_errors">Не вдалося синхронізувати файлів: %1$d</string> + <string name="sync_folder_blocked">Заблоковано</string> + <string name="sync_folder_blocked_hint">Ця папка розташована поза сховищем DroidDeck, тому DroidDeck її призупинив. Щоб синхронізувати папки поза DroidDeck, скористайтеся додатком Syncthing-Fork.</string> + <string name="sync_remove_folder">Видалити із Syncthing</string> + <string name="sync_remove_folder_hint">Видалення не стирає жодних файлів.</string> + <string name="sync_devices">Пристрої</string> + <string name="sync_no_devices">Пристроїв ще немає.</string> + <string name="sync_connected">Підключено</string> + <string name="sync_offline">Не в мережі</string> + <string name="sync_last_seen">Востаннє в мережі: %1$s</string> + <string name="sync_device_id_title">ID цього пристрою</string> + <string name="sync_device_id_hint">На іншому пристрої додайте пристрій у Syncthing і відскануйте цей код або вставте ID. Потім прийміть його тут у вебінтерфейсі.</string> + <string name="sync_copy">Копіювати</string> + <string name="sync_share">Поділитися</string> + <string name="sync_done">Готово</string> + <string name="sync_off_title">Вимкнути Syncthing?</string> + <string name="sync_off_body">Syncthing зупиниться зараз і не працюватиме, доки ви його знову не ввімкнете. Синхронізовані файли залишаться на місці.</string> + <string name="sync_off_forget">Також видалити конфігурацію Syncthing</string> + <string name="sync_off_forget_hint">Видаляє ID цього пристрою, папки й пристрої. Після повторного ввімкнення все почнеться з нуля.</string> + <string name="sync_turn_off">Вимкнути</string> + <string name="sync_ports">Порти</string> + <string name="sync_port_sync">Синхронізація</string> + <string name="sync_port_discovery">Локальне виявлення</string> + <string name="sync_repick">Вибрати нові порти</string> + <string name="sync_repick_hint">Перевіряється під час кожного запуску.</string> + <string name="sync_repick_button">Вибрати знову</string> + <string name="sync_reset_group">Скидання</string> + <string name="sync_api_key">Ключ API</string> + <string name="sync_regenerate">Згенерувати знову</string> + <string name="sync_reset">Скинути Syncthing</string> + <string name="sync_reset_hint">Новий ID пристрою, папки й пристрої буде видалено. Файли у сховищі DroidDeck збережуться.</string> + <string name="sync_reset_button">Скинути</string> + <string name="sync_reset_confirm_title">Скинути Syncthing?</string> + <string name="sync_running_group">Робота</string> + <string name="sync_run">Режим роботи</string> + <string name="sync_run_open">Поки DroidDeck відкрито</string> + <string name="sync_run_background">У фоновому режимі</string> + <string name="sync_wifi_only">Лише Wi-Fi</string> + <string name="sync_pause_games">Призупиняти під час ігор</string> + <string name="sync_logs">Журнали</string> + <string name="sync_logs_hint">Вивід Syncthing за цей сеанс</string> + <string name="sync_logs_share">Поділитися</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Спершу встановіть середовище Linux.</string> + <string name="sync_accept">Прийняти</string> + <string name="sync_accept_title">Куди зберегти «%1$s»</string> + <string name="sync_add_folder">Додати папку</string> + <string name="sync_add_folder_hint">Синхронізувати папку у сховищі DroidDeck</string> + <string name="sync_choose">Вибрати</string> + <string name="sync_add">Додати</string> + <string name="sync_add_failed">Не вдалося додати папку.</string> + <string name="sync_share_with">Надати доступ</string> + <string name="sync_share_none">Пристроїв ще немає. Ви зможете надати доступ до цієї папки пізніше у вебінтерфейсі.</string> + <string name="sync_use_folder">Використати цю папку</string> + <string name="sync_new_folder">Нова папка</string> + <string name="sync_location_home">Домашня папка контейнера</string> + <string name="sync_location_sync">Папка Sync</string> + <string name="sync_location_shared">Спільне сховище DroidDeck</string> + <string name="sync_location_card">DroidDeck на %1$s</string> + <string name="sync_location_app">Дані додатка DroidDeck</string> + <string name="sync_web_path_locked">Нові папки зберігаються в папці Sync у DroidDeck. Щоб синхронізувати іншу папку DroidDeck, скористайтеся кнопкою «Додати папку» на вкладці Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Перезавантажити</string> + <string name="sync_not_running">Syncthing не запущено.</string> + <string name="session_end_steam_sigill">Steam зупинився через недопустиму інструкцію (SIGILL). Це може бути проблема сумісності інструкцій CPU або збій клієнта. Надішліть журнали разом із даними про ваш пристрій.</string> + <string name="session_end_steam_try_x64">Можна спробувати «Налаштування Steam → Клієнт Steam → x86-64 (експериментально)». Потрібне додаткове завантаження, і робота може бути повільнішою.</string> + <string name="session_end_vulkan_device">Графічний драйвер Linux не знайшов придатного пристрою Vulkan. Перевірте, чи вибраний драйвер GPU для Linux підтримує цей GPU.</string> + <string name="session_end_gpu_unsupported">Сеанс не може запуститися: для цього GPU в поточній конфігурації немає сумісного драйвера Vulkan для Linux. Драйвери Adreno Turnip не можуть увімкнути підтримку GPU MediaTek/Mali.</string> <string name="setup_group_memory">Пам\'ять</string> <string name="setup_clear_cached">Закривати кешовані додатки перед сеансом</string> <string name="setup_clear_cached_hint">Коли починається сеанс, DroidDeck закриває додатки, які Android тримає у фоні, щоб грі дісталося більше пам\'яті. Бездротове налагодження має бути ввімкнене.</string> @@ -3193,6 +3538,12 @@ <string name="epic_client_open">Відкрити</string> <string name="epic_client_install">Установити</string> <string name="game_tab_about">Про додаток</string> + <string name="game_resources_browser">Відкриється в браузері</string> + <string name="game_resource_guides">Посібники</string> + <string name="game_resource_protondb_detail">Звіти про сумісність з Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Для ігор зі збереженнями в обліковому записі Steam</string> + <string name="game_resource_search">Пошук в інтернеті</string> <string name="game_tab_install">Установити</string> <string name="game_install_location">Розташування</string> <string name="game_install_folder">Папка</string> @@ -3209,6 +3560,11 @@ <string name="stores_eyebrow_pass">доступно з %1$s</string> <string name="stores_owned_in_library">Ваші ігри в бібліотеці</string> <string name="library_filter_added">Додані</string> + <string name="library_filter">Фільтр</string> + <string name="library_filter_installed">Лише встановлені</string> + <string name="library_filter_all_owned">Усі придбані ігри</string> + <string name="library_no_installed_matches">Немає встановлених ігор, що відповідають цим фільтрам.</string> + <string name="library_browse_owned">Переглянути придбані ігри</string> <string name="game_tab_launch">Запуск</string> <string name="game_tab_saves_cloud">Збереження й хмара</string> <string name="game_launch_shortcut">Ярлик Steam</string> @@ -3226,6 +3582,40 @@ <string name="stores_itch_update_replaced">Розробник замінив цю збірку на %1$s. Оновити до неї?</string> <string name="xbox_filter_cloud">Хмара</string> <string name="stores_xbox_cloud_settings">Налаштування хмари</string> + <string name="integration_title">Інтеграція зі Steam</string> + <string name="integration_count">Увімкнено %1$d з %2$d</string> + <string name="integration_set_up">Налаштувати</string> + <string name="integration_location">Місцезнаходження</string> + <string name="integration_app_info">Про додаток</string> + <string name="integration_wifi">Назви мереж Wi-Fi</string> + <string name="integration_brightness">Яскравість</string> + <string name="integration_home">DroidDeck як головний екран</string> + <string name="integration_shortcuts">Системні клавіші</string> + <string name="integration_wifi_hint">Показувати мережі в Steam · потрібен доступ до місцезнаходження, без стеження</string> + <string name="integration_wifi_on">Мережі відображаються в Steam</string> + <string name="integration_wifi_location_off">Місцезнаходження вимкнено</string> + <string name="integration_wifi_denied">Доступ до місцезнаходження заборонено · дозвольте його в «Про додаток»</string> + <string name="integration_brightness_hint">Повзунок Steam задає яскравість екрана</string> + <string name="integration_home_hint">«Додому» відкриває меню Steam у сеансі</string> + <string name="integration_shortcuts_hint">Alt+Tab, клавіша Win і кнопка «Додому» працюють у сеансі</string> + <string name="integration_shortcuts_maybe_restricted">Неактивно в Android? «Про додаток» → ⋮ → «Дозволити обмежені налаштування»</string> + <string name="integration_shortcuts_restricted">Заблоковано Android · «Про додаток» → ⋮ → «Дозволити обмежені налаштування»</string> + <string name="integration_shortcuts_service">Системні клавіші DroidDeck</string> + <string name="integration_shortcuts_service_description">Залишає Alt+Tab, клавішу Win і кнопку «Додому» в активному сеансі DroidDeck, а не в Android.</string> + <string name="integration_brightness_needed">Увімкніть «Яскравість» у «Налаштування → Інтеграція зі Steam»</string> + <string name="setup_gpu_bridge_off">Міст Mali: вимк.</string> + <string name="setup_gpu_bridge_on">Міст Mali: увімк.</string> + <string name="setup_gpu_bridge_detail">%1$s — не Adreno. Увімкнено експериментальний міст Vulkan: сеанс малює через власний драйвер телефона. Можливі помилки; надішліть журнали сеансу.</string> + <string name="setup_bridge_safe">Безпечний режим</string> + <string name="setup_bridge_safe_on">Безпечний режим: увімк.</string> + <string name="setup_bridge_safe_off">Безпечний режим: вимк.</string> + <string name="setup_bridge_safe_on_detail">Найкраща сумісність. Рекомендовано для нового пристрою.</string> + <string name="setup_bridge_safe_off_detail">Швидше там, де цей GPU пройшов перевірки.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: автоматично</string> + <string name="setup_bridge_dxvk_proton">DXVK: з Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Використовує старіший DXVK, якщо Vulkan цього GPU застарий для DXVK з Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Кожен Proton залишає свій DXVK, навіть якщо Vulkan цього GPU може бути для нього застарим.</string> <string name="apps_search_hint">Пошук застосунків</string> <string name="apps_no_match">Немає застосунків за запитом «%1$s».</string> <string name="apps_add_widget">Додати віджет</string> @@ -3276,6 +3666,8 @@ <string name="desktop_restore_done_body">Додані вами застосунки знову встановлено.</string> <string name="desktop_restore_failed_title">Не вдалося відновити частину програм</string> <string name="desktop_restore_failed_body">Перегляньте ~/.cache/droiddeck/apt-restore.log, потім спробуйте sudo apt install у Konsole.</string> + <string name="gog_full_files">Нативні оптимізації недоступні. Завантаження містить повні файли для заміни.</string> + <string name="gog_recover">Перевірити результат патча</string> <string name="slow_usb_title">Повільне з’єднання USB</string> <string name="slow_usb_cable">%1$s під’єднано через %2$s (%3$s Мбіт/с, близько %4$d МБ/с), тому ігри на ньому завантажуватимуться повільно. Використайте кабель USB 3 на 5 Гбіт/с або швидший, спробуйте перевернути роз’єм USB-C або візьміть швидший накопичувач.</string> <string name="slow_usb_port">%1$s під’єднано через %2$s (%3$s Мбіт/с, близько %4$d МБ/с). USB-порт цього пристрою не працює швидше, тому ігри завантажуватимуться повільно. Внутрішня пам’ять або карта microSD можуть бути швидшими.</string> @@ -3286,4 +3678,52 @@ <string name="steam_import_names_more">%1$s і ще %2$d</string> <string name="steam_import_now">Перезапустити зараз</string> <string name="steam_import_later">Пізніше</string> + <string name="gog_maintenance">Керування встановленням GOG</string> + <string name="gog_check">Перевірити оновлення</string> + <string name="gog_repair">Перевірка/відновлення</string> + <string name="gog_patches">Офлайн-патчі</string> + <string name="gog_refresh">Завантажити повний офлайн-інсталятор</string> + <string name="gog_update">Оновити до %1$s</string> + <string name="gog_resume">Продовжити обслуговування GOG</string> + <string name="gog_open_patch">Відкрити інсталятор патча</string> + <string name="gog_patch_in_session">Завершіть або скасуйте інсталятор патча в сеансі Linux.</string> + <string name="gog_patch_requirements">Виберіть патч для встановленої версії та мови. Підтримувані вихідні версії можуть бути не вказані.</string> + <string name="gog_no_patches">У GOG немає окремих патчів для Windows для цієї гри.</string> + <string name="gog_managed_files">Змінені файли гри можуть бути замінені.</string> + <string name="gog_patch_installer_note">Інсталятор відкриється у вашому сеансі Linux.</string> + <string name="gog_download_label">Завантаження</string> + <string name="gog_space_label">Додаткове місце</string> + <string name="gog_space_estimate_label">Оцінка місця</string> + <string name="gog_repair_action">Відновити файли</string> + <string name="gog_refresh_action">Оновити встановлення</string> + <string name="gog_select_patch">Вибрати</string> + <string name="stores_gamejolt_not_owned">Немає у вашій бібліотеці Game Jolt</string> + <string name="stores_gamejolt_no_build">Для цієї гри немає завантаження для Windows</string> + <string name="stores_gamejolt_no_exe">У завантаженні не знайдено гри для Windows</string> + <string name="stores_gamejolt_no_game">Не вдалося знайти цю гру на Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Не вдалося завантажити ігри з Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt відповів HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Не вдалося завантажити список файлів з Game Jolt</string> + <string name="stores_gamejolt_build_open">Відкрити на Game Jolt</string> + <string name="stores_gamejolt_archive">Архіви %1$s не підтримуються</string> + <string name="stores_gamejolt_extract_failed">Не вдалося розпакувати завантаження (код %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Не вдалося зв\'язатися з Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt не надав посилання для завантаження</string> + <string name="stores_gamejolt_section_featured">Рекомендовані</string> + <string name="stores_gamejolt_section_hot">Популярні</string> + <string name="stores_gamejolt_section_best">Найкращі</string> + <string name="stores_gamejolt_section_new">Нові</string> + <string name="stores_gamejolt_price_under_30">30 $ або менше</string> + <string name="stores_gamejolt_os_other">Інше</string> + <string name="stores_gamejolt_maturity_everyone">Для всіх віків</string> + <string name="stores_gamejolt_maturity_teen">Підлітки</string> + <string name="stores_gamejolt_maturity_adult">Для дорослих</string> + <string name="stores_gamejolt_status_complete">Завершена</string> + <string name="stores_gamejolt_status_early">Рання версія</string> + <string name="stores_gamejolt_partners">Ігри партнерів</string> + <string name="stores_gamejolt_filter_browser">Браузер</string> + <string name="stores_gamejolt_filter_maturity">Вікова категорія</string> + <string name="stores_gamejolt_filter_status">Статус</string> + <string name="stores_gamejolt_filter_partners">Партнери</string> + <string name="stores_gamejolt_followed">Ігри, за якими ви стежите</string> </resources> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 6a958face6..6a2d94d83a 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">Tùy chọn VKD3D cho D3D12. nodxr tắt dò tia; chỉ dùng cho game cần nó.</string> <string name="game_env_proton_log">Đặt thành 1 để có log chẩn đoán Proton. Ghi log có thể giảm hiệu năng và dùng dung lượng.</string> <string name="game_env_wined3d">Đặt thành 1 để dùng WineD3D dựa trên OpenGL thay cho DXVK khi kiểm tra tương thích D3D9–11.</string> + <string name="game_env_wined3d_renderer">Trình kết xuất cho DirectDraw, Direct3D 1-7 và các game chạy bằng WineD3D. Vulkan bỏ qua đường OpenGL-trên-Zink và nhanh hơn nhiều cho game DirectDraw và Direct3D 7 cũ trên Adreno.</string> + <string name="game_env_dxvk_d3d8">Đặt thành 1 để chạy Direct3D 8 qua DXVK thay cho WineD3D. Nhanh hơn trong bài kiểm tra Direct3D 8 của AIO Graphics Test trên Adreno.</string> <string name="game_env_no_ntsync">Đặt thành 1 để giữ game này không dùng ntsync (droiddeck-ntsync hoặc driver kernel); nó sẽ dùng droiddeck-esync nếu có pack phù hợp, nếu không thì droiddeck-fsync.</string> <string name="game_env_no_esync">Đặt thành 1 để tắt droiddeck-esync cho game này; nó sẽ dùng droiddeck-fsync thay vào đó, hoặc droiddeck-ntsync nếu fsync cũng tắt.</string> <string name="game_env_no_fsync">Đặt thành 1 để giữ game này không dùng droiddeck-fsync; nó sẽ dùng droiddeck-esync nếu có pack phù hợp, nếu không thì droiddeck-ntsync.</string> <string name="game_env_fsync_first">Đặt thành 1 để chạy game này trên droiddeck-fsync, hoặc 0 để ưu tiên droiddeck-esync nếu có pack phù hợp với Proton.</string> <string name="game_env_xalia">Đặt thành 0 để tắt trình hỗ trợ điều hướng bằng tay cầm của Proton cho game này.</string> + <string name="game_env_anticheat_offline">Bật mặc định. Khởi động game Easy Anti-Cheat mà không có anti-cheat khi game hỗ trợ chơi ngoại tuyến. Tắt để khởi chạy qua Easy Anti-Cheat như thường. Các chế độ trực tuyến yêu cầu Easy Anti-Cheat vẫn không khả dụng.</string> <string name="game_env_hud">Lớp phủ DXVK cho D3D9–11. fps hiển thị tốc độ khung hình; để trống để ẩn.</string> <string name="game_env_dxvk_config">Các thiết lập DXVK ngăn cách bằng dấu chấm phẩy. Các bản build gần đây dùng dxvk.maxFrameRate để giới hạn khung hình; nên dùng bộ giới hạn khung hình của phiên khi chơi thông thường.</string> + <string name="game_env_cores">Lõi CPU cho game này, ví dụ 0-4 hoặc 0,2,4, thay cho lõi game của phiên. Ít lõi hơn thì mát hơn.</string> <string name="game_env_vkd3d_limit">Giới hạn tốc độ khung hình D3D12. 0 tắt giới hạn.</string> <string name="game_env_glthread">Luồng OpenGL của Mesa. true có thể giúp các game OpenGL bị giới hạn bởi CPU; hãy thử trên từng game.</string> <string name="sync_backend_title">Đồng bộ Wine</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX chạy các chương trình Linux x86 trên thiết bị ARM64 này. Tự động sẽ dùng nó khi chương trình được build cho x86.</string> <string name="app_fex_x86">%1$s qua FEX</string> <string name="app_fex_not_ready">Chương trình này được build cho PC %1$s và chạy qua FEX, hiện chưa được thiết lập. Mở Steam một lần khi đã đăng nhập: DroidDeck sẽ tải FEX và Steam Linux Runtime cần thiết, sau đó ứng dụng này sẽ mở.</string> + <string name="session_proot_missing">Không thể tải proot của DroidDeck. Hãy kiểm tra kết nối rồi thử lại. Phiên chưa được khởi động vì proot dự phòng quá chậm để chơi.</string> + <string name="session_directaudio_missing">Không thể tải DirectAudio, nên âm thanh game dùng đường chậm hơn trong phiên này.</string> <string name="session_end_program">Chương trình này</string> <string name="session_end_steam_download">Không thể tải xuống client Steam. Mạng hoặc VPN của bạn có thể đang chặn máy chủ Steam; hãy kiểm tra kết nối rồi thử lại.</string> <string name="session_end_steam_setup">Không thể thiết lập client Steam. Hãy kiểm tra kết nối và dung lượng trống rồi thử lại.</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Tay cầm Xbox 360</string> <string name="mode_controller_note">Deck: nút Quick Access và con quay hồi chuyển. Steam Controller: tương tự, cộng với cảm biến nắm ở các nút phía sau. DualShock 4 và DualSense: con quay hồi chuyển, và touchpad dùng làm bàn di chuột. Xbox 360: mở Quick Access bằng Guide+A.</string> <string name="mode_back">Quay lại</string> + <string name="back_hold">Giữ Quay lại cho phím tắt Steam</string> + <string name="back_hold_hint">Giữ Quay lại để mở Truy cập nhanh hoặc tạo tổ hợp Steam với nút khác. Tắt để bỏ qua thao tác giữ; nhấn và nhấn đúp vẫn hoạt động.</string> + <string name="back_native_qam_hint">Giữ Back 700 ms, hoặc giữ Back và nhấn nút khác để dùng phím tắt Steam.</string> + <string name="back_double_tap_window">Khoảng thời gian nhấn đúp</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Cho phép điều khiển độ sáng</string> + <string name="brightness_permission_text">Thiết lập điều khiển độ sáng trong DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Phiên</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Trì hoãn tạm dừng nền khi Steam đang tải xuống.</string> <string name="mode_suspend_note">Tự động tạm dừng ở nền và tiếp tục khi hiển thị lại. Thủ công chờ nhấn Tiếp tục. Không bao giờ giữ nó luôn chạy.</string> <string name="mode_startup">Khởi động</string> - <string name="mode_steam_startup">Khởi động Steam cùng DroidDeck</string> - <string name="mode_steam_startup_hint">Mở phiên Steam khi DroidDeck khởi chạy.</string> + <string name="mode_startup_session">Mở khi khởi chạy</string> + <string name="mode_startup_session_hint">Bắt đầu phiên này khi DroidDeck khởi chạy.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Đang kiểm tra bản phát hành…</string> <string name="mode_decky_ready">Sẵn sàng cài %1$s.</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">Đã mới nhất · %1$s</string> <string name="mode_decky_loader">Loader</string> <string name="mode_decky_install_latest">Cài bản mới nhất</string> + <string name="decky_channel">Kênh cập nhật</string> + <string name="decky_channel_hint">Các bản phát hành Decky Loader sẽ cài. Trình cập nhật riêng của Decky dùng cùng kênh này.</string> + <string name="decky_channel_stable">Ổn định</string> + <string name="decky_channel_prerelease">Tiền phát hành</string> + <string name="decky_channel_testing">Thử nghiệm</string> + <string name="decky_channel_failed">Không thể lưu kênh cập nhật Decky</string> <string name="mode_decky_on">Khởi động cùng Steam. Khi đang bật, các ứng dụng khác trên thiết bị này có thể điều khiển được Steam.</string> <string name="mode_decky_off">Tắt. Cổng gỡ lỗi từ xa của Steam luôn đóng.</string> <string name="mode_decky_remove_title">Gỡ cài đặt Decky Loader?</string> @@ -323,6 +342,10 @@ <string name="mode_client">Client</string> <string name="mode_mangoapp">Lớp phủ hiệu năng</string> <string name="mode_mangoapp_hint">Tắt nếu game bị crash hoặc màn hình đen ở Chế độ Deck. Áp dụng từ phiên sau.</string> + <string name="mode_return_after_game">Quay lại DroidDeck sau khi chơi</string> + <string name="mode_return_after_game_hint">Khi game bạn mở từ DroidDeck hoặc launcher khác đóng lại, Steam thoát gọn gàng (bản lưu đám mây hoàn tất trước) và bạn quay về đó. Tắt: ở lại Steam.</string> + <string name="mode_shader_precache">Lưu trước shader</string> + <string name="mode_shader_precache_hint">Steam tải shader dựng sẵn cho game của bạn và xử lý chúng ở nền, nên game ít giật hơn. Tắt giúp tiết kiệm dữ liệu, bộ nhớ và pin; game sẽ tự dựng shader khi chơi. Giống thiết lập Downloads > Shader Pre-Caching của Steam. Áp dụng từ phiên sau.</string> <string name="mode_steam_repair">Sửa chữa client Steam</string> <string name="mode_steam_repair_hint">Tải lại client Steam vào lần Steam khởi động kế tiếp. Dùng khi Steam bị kẹt ở màn hình tải. Game, đăng nhập và thiết lập được giữ lại.</string> <string name="mode_steam_repair_queued">Client Steam sẽ được tải lại vào lần Steam khởi động kế tiếp.</string> @@ -389,6 +412,8 @@ <string name="mode_directaudio_hint">Bỏ qua PulseAudio để giảm độ trễ.</string> <string name="mode_mic">Micro</string> <string name="mode_mic_hint">Dùng cho chat bằng giọng nói.</string> + <string name="drawer_mic_hint">Bật hoặc tắt thu micro cho phiên này.</string> + <string name="drawer_mic_failed">Không thể thay đổi micro. Vui lòng thử lại.</string> <string name="mode_network">Mạng</string> <string name="mode_wifi_discovery">Dò tìm Wi-Fi</string> <string name="mode_wifi_discovery_hint">Hiện tên Wi-Fi và các mạng gần đó trong Steam.</string> @@ -549,6 +574,16 @@ <string name="perf_gsrealtime">gamescope: hàng đợi GPU thời gian thực</string> <string name="perf_gsrealtime_hint">Ưu tiên công việc GPU của compositor. Có thể làm nhịp khung hình mượt hơn với một phần chi phí cho game.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Bộ nhớ</string> + <string name="perf_cap_off">Tắt</string> + <string name="perf_cap_auto">Mặc định của driver</string> + <string name="perf_zram_client">Nén Steam khi game đang chạy</string> + <string name="perf_zram_client_hint">20 giây sau khi game bắt đầu, client Steam được nén vào zRAM để game có thêm bộ nhớ, và được đọc lại khi game đóng. Tắt nếu phiên bị đóng ngay sau khi game bắt đầu. Giới hạn RAM ở trên vẫn nén Steam khi phiên vượt quá mức đó.</string> + <string name="perf_ram_cap">Giới hạn RAM</string> + <string name="perf_ram_cap_hint">Áp dụng khi client Steam đang chạy, ở chế độ Steam hoặc từ desktop. Khi phiên dùng nhiều hơn mức này, Steam rồi đến các tiến trình được hỗ trợ khác của phiên sẽ bị nén vào zRAM. Giới hạn mềm: không có gì bị đóng, nhưng game có thể giật khi các trang được nạp lại.</string> + <string name="perf_ram_cap_unavailable">Cần swap zRAM, thiết bị này không có.</string> + <string name="perf_vram_cap">Giới hạn VRAM</string> + <string name="perf_vram_cap_hint">Bộ nhớ video mà DXVK báo cho game Direct3D, để chúng dùng ít texture hơn. Thiết lập DXVK riêng của game vẫn được ưu tiên. Có hiệu lực từ phiên sau.</string> <string name="perf_gpuclock">Giữ GPU ở xung nhịp cao nhất</string> <string name="perf_gpuclock_hint">Chỉ dành cho Adreno. Ít giật hơn, dùng nhiều pin và nhiệt hơn.</string> <string name="perf_fixes">Các bản sửa phiên</string> @@ -567,6 +602,8 @@ <string name="perf_fastpath">Fast path của proot</string> <string name="perf_fastpath_needs_seccomp">Cần bộ lọc seccomp của proot.</string> <string name="perf_fastpath_hint">Tra cứu tệp nhanh hơn và ít giật hơn. Tắt nếu một chương trình không tìm thấy tệp của nó.</string> + <string name="perf_cursor_composite">Vẽ con trỏ bên trong gamescope</string> + <string name="perf_cursor_composite_hint">Gamescope tự vẽ con trỏ thay vì giao cho Android. Bật để dùng con trỏ điều khiển bằng tay cầm. Tắt sẽ nhanh hơn trên điện thoại. Áp dụng từ phiên sau.</string> <string name="perf_identity">Danh tính phiên</string> <string name="perf_hostname">Tên máy chủ</string> <string name="perf_hostname_hint">Tên mà Steam thấy cho thiết bị này. Để trống để khôi phục %1$s.</string> @@ -581,6 +618,8 @@ <string name="driver_delete_plain">Các tệp của nó bị xóa khỏi ứng dụng.</string> <string name="driver_delete_in_use">Các tệp của nó bị xóa. Nó đang được dùng, nên mặc định sẽ thay thế.</string> <string name="drawer_page_display">Hiển thị</string> + <string name="drawer_frame_limit">Giới hạn khung hình</string> + <string name="drawer_frame_limit_note">Giới hạn game này. Màn hình chuyển sang tần số quét chia hết cho mức giới hạn nếu có; các mức khác có thể trông không đều. Game Steam dùng Frame Limit của Steam trong menu Quick Access.</string> <string name="drawer_page_effects">Hiệu ứng</string> <string name="drawer_page_controls">Điều khiển</string> <string name="drawer_page_components">Thành phần</string> @@ -612,8 +651,11 @@ <string name="hud_size_pill">Dạng viên</string> <string name="hud_size_minimal">Tối giản</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Thanh</string> <string name="hud_locked">Khóa vị trí</string> <string name="hud_locked_hint">Kéo HUD để di chuyển; nhấn giữ để khóa hoặc mở khóa. Khi đã khóa, các nút điều khiển trên màn hình bên dưới vẫn hoạt động.</string> + <string name="hud_snap">Bám vào cạnh trái/phải</string> + <string name="hud_snap_hint">Thả HUD ra và nó sẽ di chuyển sang cạnh màn hình gần hơn. Vuốt nhanh để ném nó theo hướng đó.</string> <string name="hud_group_look">Giao diện</string> <string name="hud_scale">Kích thước trên màn hình</string> <string name="hud_color_soft">Dịu</string> @@ -662,7 +704,6 @@ <string name="hud_export_failed">Không thể lưu báo cáo HUD.</string> <string name="hud_reset">Đặt lại thiết lập HUD</string> <string name="hud_reset_button">Đặt lại</string> - <string name="hud_credit">FusionHUD của The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Chế độ chia tỷ lệ</string> <string name="drawer_scaling_sharpness">Độ sắc nét khi chia tỷ lệ</string> <string name="drawer_effects">Hiệu ứng màn hình</string> @@ -697,11 +738,17 @@ <string name="drawer_touch_auto">Tự động (%1$s)</string> <string name="drawer_keyboard">Bàn phím</string> <string name="drawer_latency">Độ trễ</string> + <string name="drawer_low_latency">Chế độ độ trễ thấp</string> + <string name="drawer_low_latency_hint">Tăng mức dùng CPU và pin</string> <string name="drawer_low_latency_controller">Tay cầm độ trễ thấp</string> <string name="drawer_low_latency_controller_hint">Tay cầm báo cáo ở 1000 Hz thay vì 250 Hz. Tốn thêm một chút CPU.</string> <string name="drawer_low_latency_touch">Cảm ứng độ trễ thấp</string> <string name="drawer_low_latency_touch_hint">Cảm ứng bỏ qua việc gộp khung hình, nên điều khiển cảm ứng của Steam chạy ở 1000 Hz. Tốn thêm một chút CPU.</string> <string name="drawer_evdev_mouse">Kênh chuột thô</string> + <string name="drawer_relative_mouse">Chuột tương đối</string> + <string name="drawer_relative_mouse_auto">Tự động</string> + <string name="drawer_relative_mouse_on">Bật</string> + <string name="drawer_relative_mouse_off">Tắt</string> <string name="drawer_direct_cursor">Con trỏ</string> <string name="drawer_pc_keyboard">Bàn phím PC</string> <string name="drawer_android_keyboard">Android</string> @@ -788,6 +835,10 @@ <string name="setup_session">Phiên</string> <string name="setup_logs">Log phiên</string> <string name="setup_logs_hint">Được lưu sau mỗi phiên</string> + <string name="setup_game_debug_logs">Nhật ký gỡ lỗi game</string> + <string name="setup_game_debug_logs_hint">Thêm chẩn đoán Proton, Wine và đồ họa vào lần khởi chạy game tiếp theo. Có thể giảm hiệu năng và tốn thêm bộ nhớ.</string> + <string name="setup_game_debug_logs_restart">Khởi động lại phiên này để lưu nhật ký gỡ lỗi game</string> + <string name="setup_logging_update_failed">Không thể cập nhật ghi nhật ký. Hãy kiểm tra công tắc rồi thử lại.</string> <string name="setup_agent_commands">Công cụ gỡ lỗi</string> <string name="setup_latest_logs">Log phiên gần nhất</string> <string name="setup_saved_logs">Log phiên đã lưu</string> @@ -819,20 +870,22 @@ <string name="setup_home">Dùng làm màn hình chính</string> <string name="setup_home_on">DroidDeck có thể là ứng dụng Màn hình chính</string> <string name="setup_home_off">DroidDeck không bao giờ được đề xuất làm ứng dụng Màn hình chính</string> + <string name="setup_home_game_space_first">Trong Thêm trò chơi, đặt DroidDeck thành Bao gồm</string> <string name="setup_orientation">Hướng màn hình</string> + <string name="setup_launcher_orientation">Hướng màn hình launcher</string> + <string name="setup_launcher_orientation_auto">Theo hướng xoay thiết bị</string> + <string name="setup_orientation_portrait">Dọc</string> + <string name="setup_session_orientation">Hướng màn hình phiên</string> + <string name="setup_session_orientation_hint">Áp dụng cho Steam, game, desktop và trình chỉnh sửa tay cầm. Độ phân giải đặt sẵn xoay theo phiên; chiều rộng và chiều cao tùy chỉnh giữ nguyên như đã nhập.</string> <string name="setup_orientation_auto">Ngang tự động</string> <string name="setup_orientation_landscape">Ngang</string> <string name="setup_orientation_reverse">Ngang ngược</string> <string name="setup_fullscreen">Toàn màn hình</string> <string name="setup_fullscreen_on">Ẩn thanh trạng thái và thanh điều hướng của Android</string> <string name="setup_fullscreen_off">Hiện thanh trạng thái và thanh điều hướng của Android</string> - <string name="setup_dual_screen">Màn hình kép</string> - <string name="setup_dual_screen_hint">Tự động dùng màn hình thứ hai trên máy cầm tay có màn hình thứ hai tích hợp. Bật dùng bất kỳ màn hình thứ hai nào. Tắt giữ mọi thứ trên một màn hình.</string> <string name="setup_dual_screen_auto">Tự động</string> <string name="setup_dual_screen_on">Bật</string> <string name="setup_dual_screen_off">Tắt</string> - <string name="setup_dual_screen_menu">Menu ở màn hình dưới</string> - <string name="setup_dual_screen_menu_hint">Chuyển các mục và menu trong trò chơi sang màn hình thứ hai và nhập liệu ở đó, để màn hình trên giữ toàn bộ khung nhìn. L2 và R2 chuyển mục.</string> <string name="setup_dual_screen_controls">Điều khiển màn hình dưới khi chơi game</string> <string name="setup_dual_screen_controls_hint">Mở bàn di chuột và bàn phím trên màn hình thứ hai khi phiên bắt đầu.</string> <string name="dual_typing_title">Đang nhập cho màn hình trên</string> @@ -981,6 +1034,14 @@ <string name="gate_step1">Mở Settings → Developer options → Wireless debugging và bật nó lên</string> <string name="gate_step2">Nhấn “Pair device with pairing code”</string> <string name="gate_step3">Nhập mã vào thông báo của DroidDeck</string> + <string name="pairguide_build_number">Trong Giới thiệu về điện thoại, nhấn Số bản dựng 7 lần</string> + <string name="pairguide_wireless">Bật Gỡ lỗi không dây</string> + <string name="pairguide_pair">Mở Gỡ lỗi không dây, rồi nhấn “Ghép nối thiết bị bằng mã ghép nối”</string> + <string name="pairguide_child_process">Bật “Tắt các hạn chế đối với quy trình con”</string> + <string name="pairguide_row_child_process">Tắt các hạn chế đối với quy trình con</string> + <string name="pairguide_row_build_number">Số bản dựng</string> + <string name="pairguide_row_wireless">Gỡ lỗi không dây</string> + <string name="pairguide_row_pair">Ghép nối thiết bị bằng mã ghép nối</string> <string name="gate_waiting">Đang chờ cửa sổ bật lên ghép nối…</string> <string name="gate_code_needed">Đã tìm thấy cửa sổ bật lên. Nhập mã của nó vào thông báo.</string> <string name="gate_status">Trạng thái</string> @@ -1119,7 +1180,6 @@ <string name="games_never_played">Chưa chơi bao giờ</string> <string name="games_runtime_busy_percent">Runtime đang bận · %1$d%%</string> <string name="games_runtime_busy">Runtime đang bận</string> - <string name="games_runtime_first_play">Runtime sẽ cài ở lần Play đầu tiên</string> <string name="games_runtime_update">Có cập nhật runtime</string> <string name="games_runtime_ready">● Runtime đã sẵn sàng</string> <string name="games_internal">Bộ nhớ trong</string> @@ -1136,6 +1196,9 @@ <string name="gpu_hide_other">Ẩn driver cho GPU khác</string> <string name="gpu_show_other">Hiện driver cho GPU khác</string> <string name="gpu_advanced">Nâng cao</string> + <string name="gpu_ubwc_title">Tương thích UBWC</string> + <string name="gpu_ubwc_hint">Thử Bật hoặc Tắt nếu Steam hoặc Android hiện sọc hay nhấp nháy. Áp dụng cho cả hai driver sau khi khởi động lại DroidDeck.</string> + <string name="gpu_ubwc_restart">Khởi động lại DroidDeck để áp dụng.</string> <string name="gpu_set_with_display">Được đặt cùng với driver hiển thị: %1$s mang cả hai.</string> <string name="gpu_set_with_runtime">Được đặt cùng với driver runtime: %1$s mang cả hai.</string> <string name="gpu_runtime_hint">Dùng bởi game và desktop.</string> @@ -1244,10 +1307,15 @@ <string name="pip_auto">Tự động vào hình trong hình</string> <string name="unfolded_controls">Điều khiển trên màn hình mở</string> <string name="unfolded_controls_hint">Khi mở, game nằm phía trên trackpad và grip phía sau của Steam Deck. Khi gập, game chiếm toàn màn hình.</string> + <string name="unfolded_controls_with_controller">Giữ lại khi có tay cầm</string> + <string name="unfolded_controls_with_controller_hint">Vẫn hiện các điều khiển cảm ứng này khi đã kết nối tay cầm.</string> <string name="pip_suspended">Đã tạm dừng</string> <string name="pip_not_ready">Hình trong hình chỉ khả dụng khi phiên đã sẵn sàng.</string> <string name="pip_permission">Cho phép hình trong hình cho DroidDeck trong thiết lập Android.</string> <string name="pip_unavailable">Android không thể mở hình trong hình.</string> + <string name="game_more">Thêm</string> + <string name="game_edit_art">Sửa ảnh bìa</string> + <string name="stores_in_steam_label">Trong Steam</string> <string name="game_shortcut">Shortcut</string> <string name="game_shortcut_add">Thêm vào màn hình chính</string> <string name="game_shortcut_choose">Chọn game</string> @@ -1271,6 +1339,10 @@ <string name="main_wait_runtime">Chờ hoạt động runtime hoàn tất</string> <string name="main_wait_proton_install">Chờ việc cài công cụ tương thích hoàn tất</string> + <string name="load_compat_title">Đang chuẩn bị công cụ tương thích</string> + <string name="load_compat_wait">Đang chờ thiết lập tương thích hoàn tất</string> + <string name="load_compat_hint">Phiên của bạn sẽ bắt đầu khi thiết lập hoàn tất.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Chờ việc cài ứng dụng desktop hoàn tất</string> <string name="main_wait_install_game">Chờ việc cài hoàn tất trước khi khởi chạy một game</string> <string name="main_saves_close_session">Hãy đóng phiên Steam trước, để game không ghi đè lên tệp vừa nhập</string> @@ -1303,6 +1375,9 @@ <string name="main_install_anyway">Vẫn cài</string> <string name="main_remove_runtime_title">Gỡ runtime Linux</string> <string name="main_remove_runtime_text">Việc này xóa runtime, client Steam bên trong nó, và mọi game đã cài ở đó.</string> + <string name="runtime_actions_title">Runtime Linux</string> + <string name="runtime_actions_text">Sửa chữa sẽ cài lại các tệp hệ thống của runtime và giữ lại Steam, game và thiết lập của bạn. Các phần thêm như desktop sẽ được cài lại khi bạn dùng lần tới. Gỡ bỏ sẽ xóa mọi thứ.</string> + <string name="runtime_repair">Sửa chữa runtime</string> <string name="main_applied">Đã áp dụng: %1$s</string> <string name="android_app_open_failed_primary">Không thể mở %1$s trên màn hình chính</string> <string name="android_app_open_failed_on">Không thể mở %1$s trên %2$s</string> @@ -1429,6 +1504,10 @@ <string name="session_runtime_catalog_unreachable">Không thể kết nối danh mục runtime. Kiểm tra kết nối và nhấn Play lại.</string> <string name="session_runtime_install_failed">Runtime Linux chưa cài được. Kiểm tra runtime trong Thiết lập và nhấn Play lại.</string> <string name="session_desktop_install_failed">Desktop chưa cài được (%1$s). Kiểm tra kết nối và nhấn Desktop lại.</string> + <string name="session_package_resume_failed">Không thể hoàn tất một lượt cài đặt bị gián đoạn (%1$s). Hãy kiểm tra kết nối và dung lượng trống rồi thử lại.</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Runtime Linux bị hỏng: %1$d liên kết thư viện trỏ tới tệp không tồn tại (%2$s và các tệp khác), thường do một lượt cài đặt bị gián đoạn. Sửa chữa sẽ giữ lại game và thiết lập của bạn.</item> + </plurals> <string name="session_ended_named">%1$s đã dừng ngoài ý muốn. Hãy chia sẻ log cùng báo cáo lỗi, hoặc thử lại.</string> <string name="session_ended_program">Chương trình đã dừng ngoài ý muốn. Hãy chia sẻ log cùng báo cáo lỗi, hoặc thử lại.</string> <string name="session_ended_desktop">Desktop đã dừng ngoài ý muốn. Hãy chia sẻ log cùng báo cáo lỗi, hoặc thử lại.</string> @@ -1442,6 +1521,12 @@ <string name="mode_decky_plugins_hint">Cài một tệp ZIP plugin cho phiên Steam kế tiếp.</string> <string name="mode_decky_plugin_downloading">Đang tải…</string> <string name="mode_decky_plugin_install_zip">Cài từ ZIP</string> + <string name="decky_zip_warning_title">Cài đặt plugin bên thứ ba</string> + <string name="decky_zip_warning_text">Nhóm Decky Loader chưa kiểm duyệt plugin này. Nó có thể chứa phần mềm độc hại, chẳng hạn phần mềm đánh cắp tài khoản Steam hoặc gây hại cho thiết bị của bạn. Khi cài plugin này, bạn đồng ý tự chịu mọi rủi ro cho thiết bị của mình.</string> + <string name="decky_zip_warning_continue">Tiếp tục</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">Vui lòng đợi %1$d giây</item> + </plurals> <string name="store_cat_games">Games</string> <string name="store_cat_audio_video">Âm thanh & Video</string> <string name="store_cat_graphics">Đồ họa</string> @@ -1598,6 +1683,8 @@ <string name="fm_accept">Chấp nhận</string> <string name="fm_decline">Từ chối</string> <string name="fm_drive_not_readable">%1$s đã được gắn nhưng hiện không đọc được</string> + <string name="fm_drive_access_title">Cho phép truy cập %1$s</string> + <string name="fm_drive_access_text">Android cho DroidDeck thấy ổ này nhưng không đọc được. Hãy bật Quyền truy cập mọi tệp cho DroidDeck rồi quay lại.</string> <string name="fm_list_view">Xem dạng danh sách</string> <string name="fm_grid_view">Xem dạng lưới</string> <string name="fm_search">Tìm kiếm</string> @@ -1668,6 +1755,89 @@ <string name="second_mode_keyboard_trackpad">Bàn phím + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Grip + trackpad Deck</string> + <string name="second_mode_dashboard">Bảng điều khiển</string> + <string name="bottom_dashboard_empty">Chưa có gì để hiển thị ở đây.</string> + <string name="bottom_page_downloads">Tải xuống</string> + <string name="bottom_downloads_none">Không có lượt tải nào đang chạy.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Đang tải bộ nhớ đệm shader</string> + <string name="bottom_downloads_paused">Đã tạm dừng</string> + <string name="bottom_downloads_queued">Đang chờ bắt đầu</string> + <string name="bottom_page_notifications">Thông báo</string> + <string name="bottom_notifications_listener">Màn hình dưới DroidDeck</string> + <string name="bottom_notifications_why">Hiển thị tin nhắn và các thông báo khác ở đây khi bạn chơi. Chúng chỉ ở trên màn hình này và không được lưu. Android chỉ hỏi một lần: trang quyền truy cập thông báo sẽ mở trên màn hình này; hãy bật DroidDeck ở đó và trang này sẽ tự quay lại.</string> + <string name="bottom_notifications_allow">Cho phép truy cập thông báo</string> + <string name="bottom_notifications_none">Không có thông báo.</string> + <string name="bottom_notifications_count">%1$d thông báo</string> + <string name="bottom_notifications_clear">Xóa</string> + <string name="bottom_page_screenshots">Ảnh chụp màn hình</string> + <string name="stats_fps_needs_hud">Cần bật HUD để xem FPS</string> + <string name="stats_speed">Tốc độ</string> + <string name="stats_pedals">Bàn đạp</string> + <string name="stats_gforce">Lực G</string> + <string name="stats_timing">Thời gian</string> + <string name="stats_best_lap">Vòng nhanh nhất</string> + <string name="stats_tires">Lốp °C</string> + <string name="stats_trace">Ga và phanh, 10 s gần nhất</string> + <string name="stats_speed_chart">Tốc độ, %1$s</string> + <string name="stats_gear">Số</string> + <string name="stats_steam_client_arm">Client Steam ARM</string> + <string name="stats_steam_client_x86">Client Steam x86</string> + <string name="stats_throttle">Ga</string> + <string name="stats_brake">Phanh</string> + <string name="stats_lights">Đèn báo</string> + <string name="stats_lamp_shift">Sang số</string> + <string name="stats_lamp_handbrake">Phanh tay</string> + <string name="stats_lamp_pit">Giới hạn tốc độ pit</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Động cơ %1$s °C</string> + <string name="stats_oil_temp">Dầu %1$s °C</string> + <string name="stats_power">Bộ phân phối năng lượng</string> + <string name="stats_fuel_t">Nhiên liệu, t</string> + <string name="stats_fuel_main">Chính %1$s t</string> + <string name="stats_fuel_reserve">Dự trữ %1$s t</string> + <string name="bottom_telemetry_send_title">Gửi dữ liệu bảng đồng hồ</string> + <string name="bottom_telemetry_send_auto">Tự động</string> + <string name="bottom_telemetry_send_auto_hint">Bật cho mọi game trong danh sách này, kể cả game được tìm thấy sau này. Game bạn đã tắt sẽ vẫn tắt.</string> + <string name="bottom_telemetry_send_note">Thao tác này thay đổi thiết lập xuất dữ liệu của chính game. Thay đổi có hiệu lực từ lần chạy game tiếp theo; tắt đi sẽ khôi phục thiết lập cũ.</string> + <string name="bottom_telemetry_send_close">Hãy đóng %1$s để thay đổi mục này.</string> + <string name="bottom_telemetry_send_failed">Không thể thay đổi thiết lập của %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: hãy bật %2$s trong thiết lập của game với IP 127.0.0.1 và cổng %3$d.</string> + <string name="bottom_shots_where">Được lưu vào Pictures/DroidDeck. Ảnh chụp màn hình Steam cũng hiện ở đây.</string> + <string name="bottom_shots_take">Chụp màn hình</string> + <string name="bottom_shots_saved">Đã lưu ảnh chụp màn hình.</string> + <string name="bottom_shots_failed">Không thể chụp màn hình.</string> + <string name="bottom_shots_none">Chưa có ảnh chụp màn hình.</string> + <string name="bottom_page_chat">Chat & thoại</string> + <string name="bottom_chat_why">Đọc và trả lời chat Steam ở đây trong khi game vẫn chạy trên màn hình chính. Dùng tài khoản đang đăng nhập Steam.</string> + <string name="bottom_chat_not_signed_in">Steam chưa có phiên đăng nhập web để chia sẻ, vì vậy hãy đăng nhập ở đây một lần.</string> + <string name="bottom_chat_stopped">Android đã đóng trang chat khi DroidDeck chạy nền. Trang sẽ mở lại khi bạn quay lại DroidDeck.</string> + <string name="bottom_chat_open">Mở Steam Chat</string> + <string name="bottom_chat_close">Đóng chat</string> + <string name="bottom_chat_mic_on">Micro bật</string> + <string name="bottom_chat_mic_off">Micro tắt</string> + <string name="bottom_chat_mic_unavailable">Micro đang tắt cho game này. Để nói chuyện, hãy bật Micro trong thiết lập Steam của DroidDeck (Âm thanh) rồi khởi động lại game.</string> + <string name="bottom_chat_volume">Âm lượng %1$d%%</string> + <string name="bottom_page_telemetry">Thông số trong game</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Pin</string> + <string name="bottom_telemetry_lap">Vòng</string> + <string name="bottom_telemetry_position">Vị trí</string> + <string name="bottom_telemetry_this_lap">Vòng này</string> + <string name="bottom_telemetry_last_lap">Vòng trước</string> + <string name="bottom_telemetry_fuel">Nhiên liệu</string> + <string name="bottom_telemetry_cargo">Hàng hóa</string> + <string name="bottom_telemetry_pips">Năng lượng SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Tình trạng pháp lý</string> + <string name="bottom_telemetry_balance">Số dư</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Cổng %1$d đang nhận dữ liệu (%2$d gói, mỗi gói %3$d byte), nhưng ở định dạng mà trang này chưa đọc được.</string> + <string name="bottom_telemetry_port_busy">Một chương trình khác đang dùng cổng %1$s, nên game đó không thể hiển thị ở đây.</string> <string name="rtinst_removing">Đang gỡ runtime Linux</string> <plurals name="rtinst_removing_entries"> @@ -1697,6 +1867,7 @@ <string name="flatpakmgr_not_ready">Thiết lập Flatpak trước</string> <string name="flatpakmgr_starting">Đang khởi động</string> <string name="flatpakmgr_exit_status">Flatpak đã thoát với mã %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s được dựng cho %2$s, DroidDeck không chạy được. Ứng dụng Flatpak ở đây cần bản ARM64 hoặc x86_64.</string> <string name="flatpakmgr_installing">Đang cài %1$s</string> <string name="flatpakmgr_updating">Đang cập nhật %1$s</string> <string name="flatpakmgr_removing">Đang gỡ %1$s</string> @@ -1790,6 +1961,7 @@ <string name="adbpair_applying">Đang áp dụng thiết lập…</string> <string name="adbpair_command_failed">Lệnh Gỡ lỗi qua mạng không dây thất bại</string> <string name="adbpair_channel_name">Thiết lập Gỡ lỗi qua mạng không dây</string> + <string name="adbpair_progress_channel_name">Tiến trình thiết lập gỡ lỗi không dây</string> <string name="adbpair_channel_description">Hỏi mã ghép nối Gỡ lỗi qua mạng không dây khi Settings đang mở</string> <string name="adbpair_title_pair">Ghép nối Gỡ lỗi qua mạng không dây</string> <string name="adbpair_waiting_text">Bật Gỡ lỗi qua mạng không dây, rồi nhấn “Pair device with pairing code”.</string> @@ -1898,6 +2070,7 @@ <string name="gpuinfo_not_adreno">Không phải GPU Adreno</string> <string name="gpuinfo_supported">Được hỗ trợ</string> <string name="gpuinfo_experimental">Thử nghiệm: driver của nó là bản build thử nghiệm</string> + <string name="gpuinfo_a850_experimental">Hỗ trợ thử nghiệm Adreno 850: cần driver hiển thị và driver game thử nghiệm tương thích; chưa được xác minh trên thiết bị này</string> <string name="gpuinfo_below_tested">Dưới mức phần cứng đã kiểm thử (Adreno 725 và mới hơn): có thể không chạy được</string> <string name="gpuinfo_unsupported">Không được hỗ trợ: DroidDeck cần GPU Adreno (Snapdragon)</string> @@ -1994,6 +2167,7 @@ <string name="display_look_filter">%1$s Đặt chia tỷ lệ thành %2$s.</string> <string name="display_match_screen">Khớp màn hình (%1$d×%2$d)</string> <string name="display_follow_screen">Theo màn hình (đổi kích thước khi gập hoặc mở)</string> + <string name="display_follow_screen_scaled">Thu nhỏ %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Hiện chi tiết thiết bị</string> <string name="device_info_hide">Ẩn chi tiết thiết bị</string> @@ -2100,6 +2274,13 @@ <string name="stores_resume">Tiếp tục</string> <string name="stores_refresh">Làm mới</string> <string name="stores_sort">Sắp xếp</string> + <string name="setup_rail_labels">Nhãn thanh bên</string> + <string name="setup_rail_labels_hint">Hiện tên dưới các biểu tượng thanh bên. Tắt để thanh bên gọn hơn.</string> + <string name="library_display">Hiển thị</string> + <string name="library_display_larger">Thẻ lớn hơn</string> + <string name="library_display_smaller">Thẻ nhỏ hơn</string> + <string name="library_display_title">Hiện tiêu đề</string> + <string name="library_display_size">Hiện kích thước</string> <string name="stores_sort_last_played">Chơi gần đây</string> <string name="stores_sort_recently_installed">Cài gần đây</string> <string name="stores_sort_title_asc">Tên A–Z</string> @@ -2226,6 +2407,9 @@ <string name="stores_download_manager">Quản lý tải xuống</string> <string name="stores_parallel">Số lượt tải cùng lúc</string> <string name="stores_install_where">Cài vào</string> + <string name="stores_install_language">Ngôn ngữ game</string> + <string name="stores_install_language_hint">GOG và Epic cài ngôn ngữ này. Hệ thống sẽ theo ngôn ngữ của ứng dụng.</string> + <string name="stores_install_language_system">Hệ thống</string> <string name="stores_install_title">Cài %1$s:</string> <string name="stores_target_internal">Nội bộ</string> <string name="stores_target_free">%1$s trống</string> @@ -2264,6 +2448,9 @@ <string name="edit_target">Đích</string> <string name="edit_start_in">Khởi chạy trong</string> <string name="edit_launch_options">Tùy chọn khởi chạy</string> + <string name="edit_launch_options_steam_hint">Dùng chung với Thuộc tính của Steam: thay đổi ở một nơi sẽ hiện ở cả hai.</string> + <string name="edit_launch_options_not_saved">Không thể lưu tùy chọn khởi chạy vào Steam. Hãy thử lại.</string> + <string name="edit_launch_options_desktop">Steam có thể đang mở trong phiên desktop. Hãy đổi tùy chọn khởi chạy trong Thuộc tính của Steam, hoặc đóng phiên trước.</string> <string name="edit_artwork">Hình ảnh</string> <string name="edit_other_exe">Exe khác…</string> <string name="edit_remove">Xóa</string> @@ -2389,6 +2576,7 @@ <string name="setup_download_source_custom">Prefix riêng</string> <string name="setup_download_mirror">Trang</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">Proxy HTTP</string> <string name="flathub_eyebrow">ỨNG DỤNG LINUX</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Ứng dụng desktop cho desktop Linux, mở từ Desktop.</string> @@ -2527,6 +2715,22 @@ <string name="glasses_tracking_flat_hint">Tự động giữ game 2D này cố định trong tầm nhìn. Chọn “Màn hình ảo” trong “Hiển thị” để dùng theo dõi đầu.</string> <string name="glasses_tracking_sbs_hint">Theo dõi đầu áp dụng cho màn hình ảo hoặc game SteamVR đang chạy.</string> <string name="glasses_hardware">Thiết bị</string> + <string name="vr_controllers_tab">Tay cầm</string> + <string name="vr_controllers_group">Tay cầm SteamVR</string> + <string name="vr_controllers_emulate">Tay cầm chơi game trong VR</string> + <string name="vr_controllers_emulate_hint">Hai tay VR mà tay cầm của bạn đóng vai. Thay đổi có hiệu lực ngay, kể cả khi SteamVR đang chạy. Joy-Con và tay được theo dõi vẫn điều khiển bên của chúng.</string> + <string name="vr_controllers_off">Tay cầm thông thường</string> + <string name="vr_controllers_index">Tay cầm Valve Index</string> + <string name="vr_controllers_touch">Tay cầm Meta Quest 3</string> + <string name="vr_controllers_vive">Tay cầm HTC Vive</string> + <string name="vr_controllers_sticks">Cần analog ban đầu dùng để</string> + <string name="vr_controllers_sticks_hint">Nhấn đồng thời cả hai cần analog trong VR để chuyển đổi.</string> + <string name="vr_controllers_sticks_game">Di chuyển bạn trong game</string> + <string name="vr_controllers_sticks_hands">Di chuyển hai tay</string> + <string name="vr_controllers_buttons">Nút</string> + <string name="vr_controllers_buttons_stick">Cò là cò, nút vai là nắm, A/B và X/Y là các nút mặt của từng tay, nhấn cần analog là nhấn thumbstick, Guide mở menu SteamVR. D-pad lên và xuống đưa hai tay lại gần hoặc ra xa.</string> + <string name="vr_controllers_buttons_vive">Cần analog là trackpad; A/X hoặc nhấn cần analog sẽ nhấn chúng. Cò là cò, nút vai là nắm, Start và Select là menu, Guide mở menu SteamVR.</string> + <string name="vr_controllers_buttons_off">Không có tay VR. Các game hỗ trợ tay cầm, và menu SteamVR, nhận tay cầm của bạn như thường.</string> <string name="glasses_brightness">Độ sáng</string> <string name="glasses_volume">Âm lượng</string> <string name="glasses_sunblock">Chống nắng</string> @@ -2584,6 +2788,12 @@ <string name="hand_camera_placement">Vị trí camera</string> <string name="hand_camera_placement_hint">Hãy kiểm tra xem camera có thấy bạn không trước khi chơi.</string> <string name="hand_camera_check">Kiểm tra</string> + <string name="tracking_pack_title">Tải theo dõi tay</string> + <string name="tracking_pack_hint">Theo dõi tay cần tải %1$s một lần.</string> + <string name="tracking_pack_download">Tải xuống</string> + <string name="tracking_pack_retry">Thử lại</string> + <string name="tracking_pack_downloading">Đang tải theo dõi tay… %1$d%%</string> + <string name="tracking_pack_failed">Không thể tải theo dõi tay. Hãy kiểm tra kết nối rồi thử lại.</string> <string name="hand_camera_check_title">Vị trí camera</string> <string name="hand_camera_how_rear">Dựng thiết bị cách xa khoảng 1,5 đến 2 mét, ở độ cao ngang ngực, với camera sau hướng về phía bạn. Sau đó bước vào khung hình và đưa cả hai tay ra.</string> <string name="hand_camera_how_front">Dựng thiết bị cách xa khoảng 1,5 đến 2 mét, ở độ cao ngang ngực, với màn hình hướng về phía bạn. Sau đó bước vào khung hình và đưa cả hai tay ra.</string> @@ -2655,6 +2865,21 @@ <string name="storage_safe_hint">Runtime không dùng, phần còn lại, log cũ</string> <string name="storage_clean_up">Đang dọn…</string> <string name="storage_session_running">Dừng phiên để dọn hoặc xóa bất cứ thứ gì. Kích thước vẫn hiển thị.</string> + <string name="storage_default_group">Vị trí cài đặt</string> + <string name="storage_default_title">Bộ nhớ mặc định</string> + <string name="storage_default_hint">Các bản cài mới từ cửa hàng sẽ vào vị trí đã chọn. Game hiện có vẫn ở nguyên chỗ. Thư viện Steam giữ thiết lập riêng.</string> + <string name="storage_default_ask">Luôn hỏi</string> + <string name="storage_default_ask_detail">Chọn nơi lưu cho mỗi lần cài</string> + <string name="storage_default_internal">Bộ nhớ trong</string> + <string name="storage_default_external">Bộ nhớ ngoài</string> + <string name="storage_default_external_detail">%1$s · còn trống %2$s</string> + <string name="storage_default_external_missing">Chưa kết nối</string> + <string name="storage_default_folder">Thư mục · %1$s</string> + <string name="storage_default_folder_free">Còn trống %1$s</string> + <string name="storage_default_folder_missing">Chưa kết nối</string> + <string name="storage_default_choose_folder">Chọn thư mục…</string> + <string name="storage_default_choose_folder_detail">Dùng bất kỳ thư mục nào trên thẻ SD hoặc ổ USB</string> + <string name="storage_default_note">Game được đặt vào thư mục Games bên trong vị trí đã chọn. Game hiện có không bị di chuyển.</string> <string name="storage_where">Đi đâu</string> <string name="storage_games">Game Steam</string> <string name="storage_game_data">Dữ liệu game</string> @@ -2776,6 +3001,9 @@ <string name="storage_data_installed">Game đã cài</string> <string name="storage_data_parts">Prefix %1$s · shader %2$s · workshop %3$s</string> <string name="storage_clear_shaders">Dọn shader</string> + <string name="storage_reset_prefix">Đặt lại prefix</string> + <string name="storage_reset_prefix_title">Đặt lại prefix của %1$s?</string> + <string name="storage_reset_prefix_confirm">Xóa prefix Wine (%1$s) trong %2$s và tạo lại ở lần khởi chạy sau. Bản lưu, thiết lập và các redistributable đã cài bên trong sẽ mất; bản lưu Steam Cloud vẫn ở trong tài khoản của bạn.</string> <string name="storage_data_leftovers">Game đã xóa</string> <string name="storage_steam_app">Ứng dụng Steam %1$d</string> <string name="storage_leftover_unsure_detail">Prefix vẫn còn tệp, có thể là bản lưu cục bộ</string> @@ -3076,6 +3304,117 @@ <string name="spatial_saved_views_hint">Các lượt xem đã lưu có thể được tính toán lại. Bắt đầu hiệu chuẩn mới để chụp trong hệ tọa độ theo dõi hiện tại.</string> <string name="spatial_model_checksum_error">Tổng kiểm tra mô hình bàn tay không khớp</string> <string name="spatial_opencv_load_error">OpenCV không thể tải</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Đồng bộ với Syncthing</string> + <string name="sync_enable_hint">Dựa trên Syncthing-Fork, đây là bản triển khai Syncthing cho phép bạn đồng bộ các tệp trong hệ thống tệp nội bộ của DroidDeck với các phiên bản Syncthing khác. Tính năng này chỉ dành cho các tệp bạn lưu trong hệ thống tệp nội bộ của DroidDeck.</string> + <string name="sync_missing">Bản dựng này không có Syncthing.</string> + <string name="sync_starting">Đang khởi động Syncthing</string> + <string name="sync_status_starting">Đang khởi động</string> + <string name="sync_status_up_to_date">Đã cập nhật</string> + <string name="sync_status_syncing">Đang đồng bộ</string> + <string name="sync_status_paused">Đã tạm dừng</string> + <string name="sync_status_pausing">Đang tạm dừng</string> + <string name="sync_status_resuming">Đang tiếp tục</string> + <string name="sync_status_attention">Cần chú ý</string> + <string name="sync_status_failed">Syncthing đã dừng</string> + <string name="sync_failed_retry">Thử lại</string> + <string name="sync_paused_wifi">Tạm dừng cho đến khi có Wi-Fi</string> + <string name="sync_paused_game">Tạm dừng trong khi chơi game</string> + <string name="sync_summary">%1$d thư mục · %2$d/%3$d thiết bị đã kết nối</string> + <string name="sync_left">Còn %1$s</string> + <string name="sync_open_web_ui">Mở giao diện web</string> + <string name="sync_pause">Tạm dừng</string> + <string name="sync_resume">Tiếp tục</string> + <string name="sync_running">Đang chạy</string> + <string name="sync_running_hint">Tắt để dừng hoàn toàn Syncthing.</string> + <string name="sync_this_device">Thiết bị này</string> + <string name="sync_device_id">ID thiết bị</string> + <string name="sync_show_qr">Hiện mã QR</string> + <string name="sync_advanced">Nâng cao</string> + <string name="sync_advanced_hint">Cổng, thời điểm chạy, đặt lại</string> + <string name="sync_open">Mở</string> + <string name="sync_waiting">Đang chờ bạn</string> + <string name="sync_pending_device">%1$s muốn kết nối</string> + <string name="sync_pending_folder">%1$s muốn chia sẻ “%2$s”</string> + <string name="sync_pending_folder_hint">Chấp nhận để chọn nơi lưu thư mục này trong DroidDeck.</string> + <string name="sync_review">Xem lại trong giao diện web</string> + <string name="sync_folders">Thư mục</string> + <string name="sync_no_folders">Chưa có thư mục nào.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Đã cập nhật</string> + <string name="sync_folder_syncing">Đang đồng bộ %1$d%%</string> + <string name="sync_folder_scanning">Đang quét</string> + <string name="sync_folder_paused">Đã tạm dừng</string> + <string name="sync_folder_out_of_sync">Chưa đồng bộ</string> + <string name="sync_folder_errors">%1$d tệp không thể đồng bộ</string> + <string name="sync_folder_blocked">Bị chặn</string> + <string name="sync_folder_blocked_hint">Thư mục này nằm ngoài bộ nhớ của DroidDeck nên DroidDeck đã tạm dừng nó. Để đồng bộ các thư mục bên ngoài DroidDeck, hãy dùng app Syncthing-Fork.</string> + <string name="sync_remove_folder">Xóa khỏi Syncthing</string> + <string name="sync_remove_folder_hint">Xóa khỏi Syncthing không xóa tệp nào.</string> + <string name="sync_devices">Thiết bị</string> + <string name="sync_no_devices">Chưa có thiết bị nào.</string> + <string name="sync_connected">Đã kết nối</string> + <string name="sync_offline">Ngoại tuyến</string> + <string name="sync_last_seen">Lần cuối thấy %1$s</string> + <string name="sync_device_id_title">ID của thiết bị này</string> + <string name="sync_device_id_hint">Trên thiết bị còn lại, thêm thiết bị trong Syncthing rồi quét mã này hoặc dán ID. Sau đó chấp nhận ở đây trong giao diện web.</string> + <string name="sync_copy">Sao chép</string> + <string name="sync_share">Chia sẻ</string> + <string name="sync_done">Xong</string> + <string name="sync_off_title">Tắt Syncthing?</string> + <string name="sync_off_body">Syncthing sẽ dừng ngay và không chạy cho đến khi được bật lại. Các tệp đã đồng bộ vẫn giữ nguyên vị trí.</string> + <string name="sync_off_forget">Xóa cả cấu hình của Syncthing</string> + <string name="sync_off_forget_hint">Xóa ID của thiết bị này, các thư mục và thiết bị. Khi bật lại sẽ bắt đầu từ đầu.</string> + <string name="sync_turn_off">Tắt</string> + <string name="sync_ports">Cổng</string> + <string name="sync_port_sync">Đồng bộ</string> + <string name="sync_port_discovery">Khám phá cục bộ</string> + <string name="sync_repick">Chọn cổng mới</string> + <string name="sync_repick_hint">Được kiểm tra lại mỗi lần khởi động.</string> + <string name="sync_repick_button">Chọn lại</string> + <string name="sync_reset_group">Đặt lại</string> + <string name="sync_api_key">Khóa API</string> + <string name="sync_regenerate">Tạo lại</string> + <string name="sync_reset">Đặt lại Syncthing</string> + <string name="sync_reset_hint">ID thiết bị mới, các thư mục và thiết bị bị xóa. Tệp trong bộ nhớ của DroidDeck được giữ lại.</string> + <string name="sync_reset_button">Đặt lại</string> + <string name="sync_reset_confirm_title">Đặt lại Syncthing?</string> + <string name="sync_running_group">Chạy</string> + <string name="sync_run">Chạy</string> + <string name="sync_run_open">Khi DroidDeck đang mở</string> + <string name="sync_run_background">Trong nền</string> + <string name="sync_wifi_only">Chỉ Wi-Fi</string> + <string name="sync_pause_games">Tạm dừng khi chơi game</string> + <string name="sync_logs">Log</string> + <string name="sync_logs_hint">Đầu ra của Syncthing trong phiên này</string> + <string name="sync_logs_share">Chia sẻ</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Cài runtime Linux trước.</string> + <string name="sync_accept">Chấp nhận</string> + <string name="sync_accept_title">Lưu “%1$s” vào</string> + <string name="sync_add_folder">Thêm thư mục</string> + <string name="sync_add_folder_hint">Đồng bộ một thư mục trong bộ nhớ của DroidDeck</string> + <string name="sync_choose">Chọn</string> + <string name="sync_add">Thêm</string> + <string name="sync_add_failed">Không thể thêm thư mục.</string> + <string name="sync_share_with">Chia sẻ với</string> + <string name="sync_share_none">Chưa có thiết bị nào. Bạn có thể chia sẻ thư mục này từ giao diện web sau.</string> + <string name="sync_use_folder">Dùng thư mục này</string> + <string name="sync_new_folder">Thư mục mới</string> + <string name="sync_location_home">Thư mục home của container</string> + <string name="sync_location_sync">Thư mục Sync</string> + <string name="sync_location_shared">Bộ nhớ dùng chung DroidDeck</string> + <string name="sync_location_card">DroidDeck trên %1$s</string> + <string name="sync_location_app">Dữ liệu app DroidDeck</string> + <string name="sync_web_path_locked">Thư mục mới được lưu trong thư mục Sync của DroidDeck. Để đồng bộ một thư mục DroidDeck khác, hãy dùng Thêm thư mục trong thẻ Syncthing.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Tải lại</string> + <string name="sync_not_running">Syncthing không chạy.</string> + <string name="session_end_steam_sigill">Steam đã dừng do lệnh không hợp lệ (SIGILL). Đây có thể là vấn đề tương thích lệnh CPU hoặc client bị lỗi. Hãy chia sẻ nhật ký cùng thông tin thiết bị của bạn.</string> + <string name="session_end_steam_try_x64">Bạn có thể thử Thiết lập Steam → Client Steam → x86-64 (thử nghiệm). Cần tải thêm và có thể chạy chậm hơn.</string> + <string name="session_end_vulkan_device">Driver đồ họa Linux không tìm thấy thiết bị Vulkan dùng được. Hãy kiểm tra driver GPU Linux đã chọn có hỗ trợ GPU này không.</string> + <string name="session_end_gpu_unsupported">Không thể bắt đầu phiên vì GPU này không có driver Vulkan Linux tương thích trong thiết lập hiện tại. Driver Adreno Turnip không thể bật hỗ trợ cho GPU MediaTek/Mali.</string> <string name="setup_group_memory">Bộ nhớ</string> <string name="setup_clear_cached">Đóng ứng dụng đã lưu đệm trước phiên</string> <string name="setup_clear_cached_hint">Khi phiên bắt đầu, DroidDeck đóng các ứng dụng mà Android giữ ở nền để game có thêm bộ nhớ. Phải bật Gỡ lỗi qua mạng không dây.</string> @@ -3100,6 +3439,12 @@ <string name="epic_client_open">Mở</string> <string name="epic_client_install">Cài đặt</string> <string name="game_tab_about">Giới thiệu</string> + <string name="game_resources_browser">Mở trong trình duyệt</string> + <string name="game_resource_guides">Hướng dẫn</string> + <string name="game_resource_protondb_detail">Báo cáo tương thích Linux / Proton</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">Cho game có bản lưu trong tài khoản Steam của bạn</string> + <string name="game_resource_search">Tìm kiếm trên web</string> <string name="game_tab_install">Cài đặt</string> <string name="game_install_location">Vị trí</string> <string name="game_install_folder">Thư mục</string> @@ -3116,6 +3461,11 @@ <string name="stores_eyebrow_pass">có trong %1$s</string> <string name="stores_owned_in_library">Trò chơi đã sở hữu trong Thư viện</string> <string name="library_filter_added">Đã thêm</string> + <string name="library_filter">Bộ lọc</string> + <string name="library_filter_installed">Chỉ đã cài</string> + <string name="library_filter_all_owned">Tất cả game đã sở hữu</string> + <string name="library_no_installed_matches">Không có game đã cài nào khớp với bộ lọc này.</string> + <string name="library_browse_owned">Duyệt game đã sở hữu</string> <string name="game_tab_launch">Khởi chạy</string> <string name="game_tab_saves_cloud">Bản lưu và đám mây</string> <string name="game_launch_shortcut">Lối tắt Steam</string> @@ -3133,6 +3483,40 @@ <string name="stores_itch_update_replaced">Nhà phát triển đã thay bản dựng này bằng %1$s. Cập nhật lên bản đó?</string> <string name="xbox_filter_cloud">Đám mây</string> <string name="stores_xbox_cloud_settings">Cài đặt đám mây</string> + <string name="integration_title">Tích hợp Steam</string> + <string name="integration_count">Bật %1$d/%2$d</string> + <string name="integration_set_up">Thiết lập</string> + <string name="integration_location">Vị trí</string> + <string name="integration_app_info">Thông tin ứng dụng</string> + <string name="integration_wifi">Tên Wi-Fi</string> + <string name="integration_brightness">Độ sáng</string> + <string name="integration_home">DroidDeck làm màn hình chính</string> + <string name="integration_shortcuts">Phím hệ thống</string> + <string name="integration_wifi_hint">Hiện mạng trong Steam · cần quyền Vị trí, không bao giờ theo dõi</string> + <string name="integration_wifi_on">Mạng hiện trong Steam</string> + <string name="integration_wifi_location_off">Vị trí đang tắt</string> + <string name="integration_wifi_denied">Vị trí bị từ chối · hãy cho phép trong Thông tin ứng dụng</string> + <string name="integration_brightness_hint">Thanh trượt của Steam đặt độ sáng màn hình</string> + <string name="integration_home_hint">Home mở menu Steam trong phiên</string> + <string name="integration_shortcuts_hint">Alt+Tab, phím Win và nút Trang chủ giữ trong phiên</string> + <string name="integration_shortcuts_maybe_restricted">Bị làm mờ trong Android? Thông tin ứng dụng → ⋮ → Cho phép chế độ cài đặt bị hạn chế</string> + <string name="integration_shortcuts_restricted">Bị Android chặn · Thông tin ứng dụng → ⋮ → Cho phép chế độ cài đặt bị hạn chế</string> + <string name="integration_shortcuts_service">Phím hệ thống DroidDeck</string> + <string name="integration_shortcuts_service_description">Giữ Alt+Tab, phím Win và nút Trang chủ trong phiên DroidDeck đang dùng thay vì Android.</string> + <string name="integration_brightness_needed">Bật Độ sáng trong Thiết lập → Tích hợp Steam</string> + <string name="setup_gpu_bridge_off">Cầu Mali: tắt</string> + <string name="setup_gpu_bridge_on">Cầu Mali: bật</string> + <string name="setup_gpu_bridge_detail">%1$s không phải Adreno. Cầu Vulkan thử nghiệm đang bật: phiên vẽ qua trình điều khiển của chính điện thoại. Có thể gặp lỗi; hãy gửi nhật ký phiên.</string> + <string name="setup_bridge_safe">Chế độ an toàn</string> + <string name="setup_bridge_safe_on">Chế độ an toàn: bật</string> + <string name="setup_bridge_safe_off">Chế độ an toàn: tắt</string> + <string name="setup_bridge_safe_on_detail">Tương thích nhất. Nên dùng cho thiết bị mới.</string> + <string name="setup_bridge_safe_off_detail">Nhanh hơn ở những chỗ GPU này đã vượt qua kiểm tra.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: tự động</string> + <string name="setup_bridge_dxvk_proton">DXVK: của Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Dùng DXVK cũ hơn khi Vulkan của GPU này quá cũ cho DXVK của Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Mỗi Proton giữ DXVK riêng, kể cả khi Vulkan của GPU này có thể quá cũ cho nó.</string> <string name="apps_search_hint">Tìm ứng dụng</string> <string name="apps_no_match">Không có ứng dụng nào khớp với “%1$s”.</string> <string name="apps_add_widget">Thêm tiện ích</string> @@ -3180,6 +3564,8 @@ <string name="desktop_restore_done_body">Các ứng dụng bạn đã thêm đã được cài lại.</string> <string name="desktop_restore_failed_title">Không thể khôi phục một số phần mềm</string> <string name="desktop_restore_failed_body">Xem ~/.cache/droiddeck/apt-restore.log, rồi thử sudo apt install trong Konsole.</string> + <string name="gog_full_files">Không có tối ưu hóa gốc. Bản tải xuống bao gồm các tệp thay thế đầy đủ.</string> + <string name="gog_recover">Xác minh kết quả vá</string> <string name="slow_usb_title">Kết nối USB chậm</string> <string name="slow_usb_cable">%1$s đang kết nối qua %2$s (%3$s Mbps, khoảng %4$d MB/s), nên trò chơi trên đó sẽ tải chậm. Hãy dùng cáp USB 3 tốc độ 5 Gbps trở lên, thử lật đầu cắm USB-C hoặc dùng ổ nhanh hơn.</string> <string name="slow_usb_port">%1$s đang kết nối qua %2$s (%3$s Mbps, khoảng %4$d MB/s). Cổng USB của thiết bị này không thể nhanh hơn, nên trò chơi sẽ tải chậm. Bộ nhớ trong hoặc thẻ microSD có thể nhanh hơn.</string> @@ -3190,4 +3576,52 @@ <string name="steam_import_names_more">%1$s và %2$d trò chơi khác</string> <string name="steam_import_now">Khởi động lại ngay</string> <string name="steam_import_later">Để sau</string> + <string name="gog_maintenance">Quản lý bản cài GOG</string> + <string name="gog_check">Kiểm tra cập nhật</string> + <string name="gog_repair">Xác minh/Sửa chữa</string> + <string name="gog_patches">Bản vá ngoại tuyến</string> + <string name="gog_refresh">Tải bộ cài ngoại tuyến đầy đủ</string> + <string name="gog_update">Cập nhật lên %1$s</string> + <string name="gog_resume">Tiếp tục bảo trì GOG</string> + <string name="gog_open_patch">Mở trình cài bản vá</string> + <string name="gog_patch_in_session">Hoàn tất hoặc hủy trình cài bản vá trong phiên Linux.</string> + <string name="gog_patch_requirements">Chọn bản vá cho phiên bản và ngôn ngữ bạn đã cài. Có thể không liệt kê các phiên bản nguồn được hỗ trợ.</string> + <string name="gog_no_patches">GOG không có bản vá Windows độc lập cho game này.</string> + <string name="gog_managed_files">Các tệp game đã sửa đổi có thể bị thay thế.</string> + <string name="gog_patch_installer_note">Trình cài đặt sẽ mở trong phiên Linux của bạn.</string> + <string name="gog_download_label">Tải xuống</string> + <string name="gog_space_label">Dung lượng thêm</string> + <string name="gog_space_estimate_label">Ước tính dung lượng</string> + <string name="gog_repair_action">Sửa tệp</string> + <string name="gog_refresh_action">Làm mới bản cài</string> + <string name="gog_select_patch">Chọn</string> + <string name="stores_gamejolt_not_owned">Không có trong thư viện Game Jolt của bạn</string> + <string name="stores_gamejolt_no_build">Không có bản tải Windows cho game này</string> + <string name="stores_gamejolt_no_exe">Không tìm thấy trò chơi Windows trong bản tải xuống</string> + <string name="stores_gamejolt_no_game">Không tìm thấy trò chơi này trên Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Không tải được game từ Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt trả về HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Không thể tải danh sách tải xuống từ Game Jolt</string> + <string name="stores_gamejolt_build_open">Mở trên Game Jolt</string> + <string name="stores_gamejolt_archive">Không hỗ trợ tệp %1$s</string> + <string name="stores_gamejolt_extract_failed">Không thể giải nén bản tải xuống (mã %1$d)</string> + <string name="stores_gamejolt_download_unreachable">Không thể kết nối với Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt không cung cấp liên kết tải xuống</string> + <string name="stores_gamejolt_section_featured">Nổi bật</string> + <string name="stores_gamejolt_section_hot">Thịnh hành</string> + <string name="stores_gamejolt_section_best">Hay nhất</string> + <string name="stores_gamejolt_section_new">Mới</string> + <string name="stores_gamejolt_price_under_30">$30 trở xuống</string> + <string name="stores_gamejolt_os_other">Khác</string> + <string name="stores_gamejolt_maturity_everyone">Mọi lứa tuổi</string> + <string name="stores_gamejolt_maturity_teen">Thanh thiếu niên</string> + <string name="stores_gamejolt_maturity_adult">Người lớn</string> + <string name="stores_gamejolt_status_complete">Hoàn chỉnh</string> + <string name="stores_gamejolt_status_early">Truy cập sớm</string> + <string name="stores_gamejolt_partners">Game của đối tác</string> + <string name="stores_gamejolt_filter_browser">Trình duyệt</string> + <string name="stores_gamejolt_filter_maturity">Độ tuổi</string> + <string name="stores_gamejolt_filter_status">Trạng thái</string> + <string name="stores_gamejolt_filter_partners">Đối tác</string> + <string name="stores_gamejolt_followed">Game đang theo dõi</string> </resources> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1643e453dd..4d23bbf244 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12 的 VKD3D 选项。nodxr 禁用光线追踪;仅供需要它的游戏使用。</string> <string name="game_env_proton_log">设为 1 可生成 Proton 诊断日志。记录日志会降低性能并占用存储。</string> <string name="game_env_wined3d">设为 1 可对 D3D9–11 使用基于 OpenGL 的 WineD3D 代替 DXVK 进行兼容性测试。</string> + <string name="game_env_wined3d_renderer">用于 DirectDraw、Direct3D 1–7 以及通过 WineD3D 运行的游戏的渲染器。Vulkan 会跳过 OpenGL-on-Zink 路径,在 Adreno 上运行旧版 DirectDraw 和 Direct3D 7 游戏时快得多。</string> + <string name="game_env_dxvk_d3d8">设为 1 可通过 DXVK 而非 WineD3D 运行 Direct3D 8。在 Adreno 上的 AIO Graphics Test 的 Direct3D 8 测试中更快。</string> <string name="game_env_no_ntsync">设为 1 可让此游戏禁用 ntsync(droiddeck-ntsync 或内核驱动);存在对应包时使用 droiddeck-esync,否则使用 droiddeck-fsync。</string> <string name="game_env_no_esync">设为 1 可为此游戏禁用 droiddeck-esync;改用 droiddeck-fsync,若 fsync 也已禁用则使用 droiddeck-ntsync。</string> <string name="game_env_no_fsync">设为 1 可让此游戏禁用 droiddeck-fsync;存在对应包时使用 droiddeck-esync,否则使用 droiddeck-ntsync。</string> <string name="game_env_fsync_first">设为 1 可让此游戏使用 droiddeck-fsync;设为 0 则在有匹配其 Proton 的包时优先使用 droiddeck-esync。</string> <string name="game_env_xalia">设为 0 可为此游戏禁用 Proton 的手柄导航助手。</string> + <string name="game_env_anticheat_offline">默认开启。当游戏支持离线游玩时,以不加载反作弊的方式启动 Easy Anti-Cheat 游戏。关闭后将照常通过 Easy Anti-Cheat 启动。需要 Easy Anti-Cheat 的在线模式仍不可用。</string> <string name="game_env_hud">针对 D3D9–11 的 DXVK 覆盖层。fps 显示帧率;不设置则隐藏。</string> <string name="game_env_dxvk_config">以英文分号(;)分隔的 DXVK 设置。新版本使用 dxvk.maxFrameRate 限制帧率;日常游戏建议优先使用会话帧率限制。</string> + <string name="game_env_cores">此游戏使用的 CPU 核心,例如 0-4 或 0,2,4,用于替代会话的游戏核心。核心越少,温度越低。</string> <string name="game_env_vkd3d_limit">D3D12 帧率限制。0 表示不限制。</string> <string name="game_env_glthread">Mesa OpenGL 多线程。true 可能有助于受 CPU 限制的 OpenGL 游戏;请逐个游戏测试。</string> <string name="sync_backend_title">Wine 同步</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX 在此 ARM64 设备上运行 x86 Linux 程序。自动模式会在程序为 x86 构建时启用。</string> <string name="app_fex_x86">%1$s 经由 FEX</string> <string name="app_fex_not_ready">此程序面向 %1$s PC 构建,需经由 FEX 运行,而 FEX 尚未配置。请在登录状态下打开一次 Steam:DroidDeck 会让其下载 FEX 及所需的 Steam Linux Runtime,之后即可打开。</string> + <string name="session_proot_missing">无法下载 DroidDeck 的 proot。请检查网络连接后重试。由于备用 proot 太慢无法流畅游玩,会话未启动。</string> + <string name="session_directaudio_missing">无法下载 DirectAudio,本次会话的游戏音频将使用较慢的路径。</string> <string name="session_end_program">此程序</string> <string name="session_end_steam_download">无法下载 Steam 客户端。你的网络或 VPN 可能屏蔽了 Steam 的服务器;请检查网络连接后重试。</string> <string name="session_end_steam_setup">无法设置 Steam 客户端。请检查网络连接和可用存储空间,然后重试。</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 手柄</string> <string name="mode_controller_note">Deck:快捷访问按钮与陀螺仪。Xbox 360:用 Guide+A 打开快捷访问。</string> <string name="mode_back">返回</string> + <string name="back_hold">长按返回键使用 Steam 快捷操作</string> + <string name="back_hold_hint">长按返回键打开快速访问,或与其他按键组成 Steam 组合键。关闭后忽略长按;单击和双击仍然有效。</string> + <string name="back_native_qam_hint">按住返回键 700 毫秒,或按住返回键再按另一个按钮以使用 Steam 快捷键。</string> + <string name="back_double_tap_window">双击间隔</string> + <string name="back_tap_ms">%1$d 毫秒</string> + <string name="brightness_permission_title">允许亮度控制</string> + <string name="brightness_permission_text">在 DroidDeck 中设置亮度控制。</string> <string name="back_menu_then_qam">菜单 → QAM</string> <string name="back_qam_then_menu">QAM → 菜单</string> <string name="mode_session">会话</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam 正在下载时推迟后台暂停。</string> <string name="mode_suspend_note">自动会在后台暂停并在显示时恢复。手动会等待点按恢复。“从不”则保持运行。</string> <string name="mode_startup">启动</string> - <string name="mode_steam_startup">随 DroidDeck 启动 Steam</string> - <string name="mode_steam_startup_hint">启动 DroidDeck 时打开 Steam 会话。</string> + <string name="mode_startup_session">启动时打开</string> + <string name="mode_startup_session_hint">DroidDeck 启动时开始此会话。</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">正在检查发布版本…</string> <string name="mode_decky_ready">已就绪,可安装 %1$s。</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">已是最新 · %1$s</string> <string name="mode_decky_loader">加载器</string> <string name="mode_decky_install_latest">安装最新版</string> + <string name="decky_channel">更新通道</string> + <string name="decky_channel_hint">要安装哪种 Decky Loader 版本。Decky 自带的更新程序也使用相同的通道。</string> + <string name="decky_channel_stable">稳定版</string> + <string name="decky_channel_prerelease">预发布版</string> + <string name="decky_channel_testing">测试版</string> + <string name="decky_channel_failed">无法保存 Decky 更新通道</string> <string name="mode_decky_on">随 Steam 启动。开启期间,本设备上的其他应用可能可以控制 Steam。</string> <string name="mode_decky_off">已关闭。Steam 的远程调试端口保持关闭。</string> <string name="mode_decky_remove_title">卸载 Decky Loader?</string> @@ -325,6 +344,8 @@ <string name="mode_mangoapp_hint">若游戏在 Deck 模式下崩溃或黑屏,请关闭性能覆盖层。将在下次会话生效。</string> <string name="mode_return_after_game">游戏结束后返回 DroidDeck</string> <string name="mode_return_after_game_hint">从 DroidDeck 或其他启动器启动的游戏关闭后,Steam 会正常退出(先完成云存档同步),并返回启动位置。关闭:留在 Steam 中。</string> + <string name="mode_shader_precache">着色器预缓存</string> + <string name="mode_shader_precache_hint">Steam 会为你的游戏下载预编译的着色器并在后台处理,以减少游戏卡顿。关闭可节省流量、存储空间和电量;游戏会改为在运行时编译着色器。与 Steam 的“下载”>“着色器预缓存”为同一设置。下次会话时生效。</string> <string name="mode_steam_repair">修复 Steam 客户端</string> <string name="mode_steam_repair_hint">下次启动 Steam 时重新下载 Steam 客户端。如果 Steam 一直停在加载画面,请使用此项。游戏、登录信息和设置都会保留。</string> <string name="mode_steam_repair_queued">下次启动 Steam 时将重新下载 Steam 客户端。</string> @@ -391,6 +412,8 @@ <string name="mode_directaudio_hint">绕过 PulseAudio 以降低延迟。</string> <string name="mode_mic">麦克风</string> <string name="mode_mic_hint">用于语音聊天。</string> + <string name="drawer_mic_hint">为此会话开启或关闭麦克风采集。</string> + <string name="drawer_mic_failed">无法更改麦克风设置。请重试。</string> <string name="mode_network">网络</string> <string name="mode_wifi_discovery">Wi-Fi 网络发现</string> <string name="mode_wifi_discovery_hint">在 Steam 中显示 Wi-Fi 名称和附近网络。</string> @@ -551,6 +574,16 @@ <string name="perf_gsrealtime">gamescope:实时 GPU 队列</string> <string name="perf_gsrealtime_hint">优先处理合成器的 GPU 工作。可平滑帧节奏,但会牺牲部分游戏性能。</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">内存</string> + <string name="perf_cap_off">关闭</string> + <string name="perf_cap_auto">驱动默认</string> + <string name="perf_zram_client">游戏运行时压缩 Steam</string> + <string name="perf_zram_client_hint">游戏启动 20 秒后,Steam 客户端会被压缩到 zRAM 中,为游戏腾出更多内存,并在游戏关闭时读回。如果会话在游戏启动后不久就关闭,请关闭此选项。设置了上方的 RAM 上限时,会话超出上限后仍会压缩 Steam。</string> + <string name="perf_ram_cap">RAM 上限</string> + <string name="perf_ram_cap_hint">在 Steam 客户端运行时生效,无论是 Steam 模式还是从桌面启动。会话使用量超过此值时,会先将 Steam、再将会话中其他受支持的进程压缩到 zRAM。这是软上限:不会关闭任何进程,但在页面读回时游戏可能卡顿。</string> + <string name="perf_ram_cap_unavailable">需要 zRAM 交换空间,但此设备不支持。</string> + <string name="perf_vram_cap">VRAM 上限</string> + <string name="perf_vram_cap_hint">DXVK 向 Direct3D 游戏报告的显存大小,使游戏按更少的显存分配纹理。游戏自身的 DXVK 设置仍然优先。下次会话时生效。</string> <string name="perf_gpuclock">把 GPU 锁定在最高频率</string> <string name="perf_gpuclock_hint">仅限 Adreno。卡顿更少,但更耗电、更发热。</string> <string name="perf_fixes">会话修复</string> @@ -569,6 +602,8 @@ <string name="perf_fastpath">proot 快速路径</string> <string name="perf_fastpath_needs_seccomp">需要 proot 的 seccomp 过滤器。</string> <string name="perf_fastpath_hint">文件查找更快、卡顿更少。若某个程序找不到它的文件,请关闭。</string> + <string name="perf_cursor_composite">在 gamescope 内绘制光标</string> + <string name="perf_cursor_composite_hint">由 Gamescope 自行绘制指针,而不是交给 Android。使用手柄控制光标时请开启。在手机上关闭会更流畅。下次会话时生效。</string> <string name="perf_identity">会话标识</string> <string name="perf_hostname">主机名</string> <string name="perf_hostname_hint">Steam 看到的本设备名称。留空恢复为 %1$s。</string> @@ -583,6 +618,8 @@ <string name="driver_delete_plain">它的文件会从应用中移除。</string> <string name="driver_delete_in_use">文件将被移除。该驱动正在使用,将由默认驱动接管。</string> <string name="drawer_page_display">显示</string> + <string name="drawer_frame_limit">帧率限制</string> + <string name="drawer_frame_limit_note">限制此游戏的帧率。如有能被上限整除的刷新率,显示屏会切换到该刷新率;其他上限可能导致画面不均匀。Steam 游戏请使用快捷访问菜单中的 Steam 帧率限制。</string> <string name="drawer_page_effects">画面效果</string> <string name="drawer_page_controls">控制</string> <string name="drawer_page_components">组件</string> @@ -614,8 +651,11 @@ <string name="hud_size_pill">胶囊</string> <string name="hud_size_minimal">极简</string> <string name="hud_size_mega">超大</string> + <string name="hud_size_strip">横条</string> <string name="hud_locked">锁定位置</string> <string name="hud_locked_hint">拖动 HUD 可移动位置;长按可锁定或解锁。锁定时,下方的屏幕控件仍可使用。</string> + <string name="hud_snap">吸附到两侧</string> + <string name="hud_snap_hint">松开 HUD 后,它会移到屏幕较近的一侧。轻甩可将它甩向该方向。</string> <string name="hud_group_look">外观</string> <string name="hud_scale">屏幕显示大小</string> <string name="hud_color_soft">柔和</string> @@ -664,7 +704,6 @@ <string name="hud_export_failed">无法保存 HUD 报告。</string> <string name="hud_reset">重置 HUD 设置</string> <string name="hud_reset_button">重置</string> - <string name="hud_credit">FusionHUD,作者 The412Banner,github.com/The412Banner/FusionHUD (GPL-3.0)。</string> <string name="drawer_scaling">缩放模式</string> <string name="drawer_scaling_sharpness">缩放锐度</string> <string name="drawer_effects">屏幕效果</string> @@ -699,11 +738,17 @@ <string name="drawer_touch_auto">自动(%1$s)</string> <string name="drawer_keyboard">键盘</string> <string name="drawer_latency">延迟</string> + <string name="drawer_low_latency">低延迟模式</string> + <string name="drawer_low_latency_hint">会增加 CPU 和电池消耗</string> <string name="drawer_low_latency_controller">低延迟手柄</string> <string name="drawer_low_latency_controller_hint">手柄以 1000 Hz 而非 250 Hz 上报。CPU 占用略高。</string> <string name="drawer_low_latency_touch">低延迟触控</string> <string name="drawer_low_latency_touch_hint">触控跳过帧合并,Steam 触控以 1000 Hz 上报。CPU 占用略高。</string> <string name="drawer_evdev_mouse">原生鼠标通道</string> + <string name="drawer_relative_mouse">相对鼠标</string> + <string name="drawer_relative_mouse_auto">自动</string> + <string name="drawer_relative_mouse_on">开</string> + <string name="drawer_relative_mouse_off">关</string> <string name="drawer_direct_cursor">光标</string> <string name="drawer_pc_keyboard">PC 键盘</string> <string name="drawer_android_keyboard">Android</string> @@ -761,6 +806,7 @@ <string name="setup_gpu_supported">设备受支持</string> <string name="setup_gpu_untested">未经测试的 GPU</string> <string name="setup_gpu_unsupported">GPU 不受支持</string> + <string name="setup_gpu_bridged">GPU 通过 Mali 桥接</string> <string name="setup_gpu_detail">%1$s · %2$s</string> <string name="setup_gpu_untested_detail">%1$s:%2$s</string> <string name="setup_gpu_unsupported_detail">Steam 需要 Adreno 驱动;%1$s 可能显示黑屏</string> @@ -790,6 +836,10 @@ <string name="setup_session">会话</string> <string name="setup_logs">会话日志</string> <string name="setup_logs_hint">每次会话后保存</string> + <string name="setup_game_debug_logs">游戏调试日志</string> + <string name="setup_game_debug_logs_hint">在下次启动游戏时包含 Proton、Wine 和图形诊断信息。可能降低性能并占用更多存储空间。</string> + <string name="setup_game_debug_logs_restart">重启此会话以保存游戏调试日志</string> + <string name="setup_logging_update_failed">无法更新日志设置。请检查开关后重试。</string> <string name="setup_agent_commands">调试工具</string> <string name="setup_latest_logs">最新会话日志</string> <string name="setup_saved_logs">已保存的会话日志</string> @@ -821,20 +871,22 @@ <string name="setup_home">用作主屏幕</string> <string name="setup_home_on">DroidDeck 可以设为主屏幕应用</string> <string name="setup_home_off">系统不会把 DroidDeck 作为主屏幕应用提供</string> + <string name="setup_home_game_space_first">请在“添加游戏”中将 DroidDeck 设为“包含”</string> <string name="setup_orientation">屏幕方向</string> + <string name="setup_launcher_orientation">启动器方向</string> + <string name="setup_launcher_orientation_auto">跟随设备旋转</string> + <string name="setup_orientation_portrait">竖屏</string> + <string name="setup_session_orientation">会话方向</string> + <string name="setup_session_orientation_hint">适用于 Steam、游戏、桌面和手柄编辑器。分辨率预设会随会话旋转;自定义宽度和高度保持输入值不变。</string> <string name="setup_orientation_auto">自动横屏</string> <string name="setup_orientation_landscape">横屏</string> <string name="setup_orientation_reverse">反向横屏</string> <string name="setup_fullscreen">全屏</string> <string name="setup_fullscreen_on">隐藏 Android 状态栏和导航栏</string> <string name="setup_fullscreen_off">显示 Android 状态栏和导航栏</string> - <string name="setup_dual_screen">双屏</string> - <string name="setup_dual_screen_hint">自动:在内置第二块屏幕的掌机上使用该屏幕。开启:使用任何第二块显示器。关闭:所有内容只显示在一块屏幕上。</string> <string name="setup_dual_screen_auto">自动</string> <string name="setup_dual_screen_on">开启</string> <string name="setup_dual_screen_off">关闭</string> - <string name="setup_dual_screen_menu">下屏菜单</string> - <string name="setup_dual_screen_menu_hint">将各个分区和游戏内菜单移到第二块屏幕并在那里输入,让上屏保持完整画面。L2 和 R2 切换分区。</string> <string name="setup_dual_screen_controls">游戏中的下屏控制</string> <string name="setup_dual_screen_controls_hint">会话开始时在第二块屏幕上打开触控板和键盘。</string> <string name="dual_typing_title">正在为上屏输入</string> @@ -1066,6 +1118,14 @@ <string name="gate_step1">打开“设置”→“开发者选项”→“无线调试”,并将其开启</string> <string name="gate_step2">点按“使用配对码配对设备”</string> <string name="gate_step3">在 DroidDeck 通知中输入配对码</string> + <string name="pairguide_build_number">在“关于手机”中,点按“Build 号”(版本号)7 次</string> + <string name="pairguide_wireless">开启“无线调试”</string> + <string name="pairguide_pair">打开“无线调试”,然后点按“使用配对码配对设备”</string> + <string name="pairguide_child_process">开启“停用子进程限制”</string> + <string name="pairguide_row_child_process">停用子进程限制</string> + <string name="pairguide_row_build_number">Build 号(版本号)</string> + <string name="pairguide_row_wireless">无线调试</string> + <string name="pairguide_row_pair">使用配对码配对设备</string> <string name="gate_waiting">正在等待配对弹窗…</string> <string name="gate_code_needed">已找到弹窗。请在通知中输入它的配对码。</string> <string name="gate_status">状态</string> @@ -1204,7 +1264,6 @@ <string name="games_never_played">从未游玩</string> <string name="games_runtime_busy_percent">运行时繁忙 · %1$d%%</string> <string name="games_runtime_busy">运行时繁忙</string> - <string name="games_runtime_first_play">运行时在首次“游玩”时安装</string> <string name="games_runtime_update">运行时有可用更新</string> <string name="games_runtime_ready">● 运行时就绪</string> <string name="games_internal">内部存储</string> @@ -1221,6 +1280,9 @@ <string name="gpu_hide_other">隐藏其他 GPU 的驱动</string> <string name="gpu_show_other">显示其他 GPU 的驱动</string> <string name="gpu_advanced">高级</string> + <string name="gpu_ubwc_title">UBWC 兼容性</string> + <string name="gpu_ubwc_hint">如果 Steam 或 Android 出现条纹或闪烁,请尝试开启或关闭。重启 DroidDeck 后对两种驱动均生效。</string> + <string name="gpu_ubwc_restart">重启 DroidDeck 以应用。</string> <string name="gpu_set_with_display">与显示驱动一起设置:%1$s 同时携带两者。</string> <string name="gpu_set_with_runtime">与运行时驱动一起设置:%1$s 同时携带两者。</string> <string name="gpu_runtime_hint">由游戏和桌面使用。</string> @@ -1329,10 +1391,15 @@ <string name="pip_auto">自动进入画中画</string> <string name="unfolded_controls">展开屏幕上的控制</string> <string name="unfolded_controls_hint">展开时,游戏画面位于 Steam Deck 触控板和背键上方。折叠时,游戏全屏显示。</string> + <string name="unfolded_controls_with_controller">连接手柄时也保留</string> + <string name="unfolded_controls_with_controller_hint">连接手柄时也显示这些触控按键。</string> <string name="pip_suspended">已暂停</string> <string name="pip_not_ready">会话就绪后即可使用画中画。</string> <string name="pip_permission">请在 Android 设置中允许 DroidDeck 的画中画。</string> <string name="pip_unavailable">Android 无法打开画中画。</string> + <string name="game_more">更多</string> + <string name="game_edit_art">编辑封面</string> + <string name="stores_in_steam_label">已在 Steam 中</string> <string name="game_shortcut">快捷方式</string> <string name="game_shortcut_add">添加到主屏幕</string> <string name="game_shortcut_choose">选择游戏</string> @@ -1356,6 +1423,10 @@ <string name="main_wait_runtime">请等待运行时操作完成</string> <string name="main_wait_proton_install">请等待兼容性工具安装完成</string> + <string name="load_compat_title">正在准备兼容性工具</string> + <string name="load_compat_wait">正在等待兼容性设置完成</string> + <string name="load_compat_hint">设置完成后会话将自动启动。</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">请等待桌面应用安装完成</string> <string name="main_wait_install_game">请等待安装完成后再启动游戏</string> <string name="main_saves_close_session">请先关闭 Steam 会话,以免游戏存档覆盖导入的内容</string> @@ -1388,6 +1459,9 @@ <string name="main_install_anyway">仍要安装</string> <string name="main_remove_runtime_title">移除 Linux 运行时</string> <string name="main_remove_runtime_text">这会删除运行时、其中的 Steam 客户端,以及安装在其中的所有游戏。</string> + <string name="runtime_actions_title">Linux 运行时</string> + <string name="runtime_actions_text">“修复”会重新安装运行时的系统文件,并保留 Steam、游戏和设置。桌面等附加组件会在下次使用时重新安装。“移除”会删除所有内容。</string> + <string name="runtime_repair">修复运行时</string> <string name="main_applied">已应用:%1$s</string> <string name="android_app_open_failed_primary">无法在主屏幕上打开 %1$s</string> <string name="android_app_open_failed_on">无法在 %2$s 上打开 %1$s</string> @@ -1508,6 +1582,10 @@ <string name="session_runtime_catalog_unreachable">无法连接运行时目录。请检查网络连接,然后再次点“游玩”。</string> <string name="session_runtime_install_failed">Linux 运行时未能安装。请在“配置”中检查运行时,然后再次点“游玩”。</string> <string name="session_desktop_install_failed">桌面未能安装(%1$s)。请检查网络连接,然后再次点“桌面”。</string> + <string name="session_package_resume_failed">无法完成之前中断的安装(%1$s)。请检查网络连接和存储空间,然后重试。</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Linux 运行时已损坏:%1$d 个库链接指向缺失的文件(%2$s 等),通常是安装中断所致。修复会保留你的游戏和设置。</item> + </plurals> <string name="session_ended_named">%1$s 意外停止。请将日志随错误报告一起分享,或重试。</string> <string name="session_ended_program">程序意外停止。请将日志随错误报告一起分享,或重试。</string> <string name="session_ended_desktop">桌面意外停止。请将日志随错误报告一起分享,或重试。</string> @@ -1521,6 +1599,12 @@ <string name="mode_decky_plugins_hint">安装插件 ZIP 包,将在下次 Steam 会话中生效。</string> <string name="mode_decky_plugin_downloading">正在下载…</string> <string name="mode_decky_plugin_install_zip">从 ZIP 安装</string> + <string name="decky_zip_warning_title">安装第三方插件</string> + <string name="decky_zip_warning_text">Decky Loader 团队尚未审核此插件。它可能包含恶意软件,例如窃取你的 Steam 账户或损害设备的软件。安装此插件即表示你同意自行承担设备的一切风险。</string> + <string name="decky_zip_warning_continue">继续</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">请等待 %1$d 秒</item> + </plurals> <string name="store_cat_games">游戏</string> <string name="store_cat_audio_video">影音</string> <string name="store_cat_graphics">图形</string> @@ -1677,6 +1761,8 @@ <string name="fm_accept">接受</string> <string name="fm_decline">拒绝</string> <string name="fm_drive_not_readable">%1$s 已挂载,但当前无法读取</string> + <string name="fm_drive_access_title">允许访问 %1$s</string> + <string name="fm_drive_access_text">Android 允许 DroidDeck 看到此驱动器,但不允许读取。请为 DroidDeck 开启“所有文件访问权限”,然后返回。</string> <string name="fm_list_view">列表视图</string> <string name="fm_grid_view">网格视图</string> <string name="fm_search">搜索</string> @@ -1747,6 +1833,89 @@ <string name="second_mode_keyboard_trackpad">键盘 + 触控板</string> <string name="second_mode_terminal">终端</string> <string name="second_mode_deck_controls">Deck 背键 + 触控板</string> + <string name="second_mode_dashboard">仪表盘</string> + <string name="bottom_dashboard_empty">暂无内容。</string> + <string name="bottom_page_downloads">下载</string> + <string name="bottom_downloads_none">没有正在进行的下载。</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">正在下载着色器缓存</string> + <string name="bottom_downloads_paused">已暂停</string> + <string name="bottom_downloads_queued">等待开始</string> + <string name="bottom_page_notifications">通知</string> + <string name="bottom_notifications_listener">DroidDeck 底部屏幕</string> + <string name="bottom_notifications_why">在游戏时于此处显示消息和其他通知。通知只显示在此屏幕上,不会被保存。Android 只会询问一次:其通知使用权页面会在此屏幕上打开,在那里开启 DroidDeck 后,会自动返回此页面。</string> + <string name="bottom_notifications_allow">允许通知使用权</string> + <string name="bottom_notifications_none">没有通知。</string> + <string name="bottom_notifications_count">%1$d 条通知</string> + <string name="bottom_notifications_clear">清除</string> + <string name="bottom_page_screenshots">截图</string> + <string name="stats_fps_needs_hud">显示 FPS 需要开启 HUD</string> + <string name="stats_speed">速度</string> + <string name="stats_pedals">踏板</string> + <string name="stats_gforce">G 值</string> + <string name="stats_timing">计时</string> + <string name="stats_best_lap">最佳圈速</string> + <string name="stats_tires">轮胎 °C</string> + <string name="stats_trace">油门和刹车,最近 10 s</string> + <string name="stats_speed_chart">速度,%1$s</string> + <string name="stats_gear">挡位</string> + <string name="stats_steam_client_arm">Steam 客户端 ARM</string> + <string name="stats_steam_client_x86">Steam 客户端 x86</string> + <string name="stats_throttle">油门</string> + <string name="stats_brake">刹车</string> + <string name="stats_lights">仪表指示灯</string> + <string name="stats_lamp_shift">换挡</string> + <string name="stats_lamp_handbrake">手刹</string> + <string name="stats_lamp_pit">维修区限速</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">涡轮 %1$s bar</string> + <string name="stats_engine_temp">发动机 %1$s °C</string> + <string name="stats_oil_temp">机油 %1$s °C</string> + <string name="stats_power">能量分配器</string> + <string name="stats_fuel_t">燃料,t</string> + <string name="stats_fuel_main">主油箱 %1$s t</string> + <string name="stats_fuel_reserve">备用 %1$s t</string> + <string name="bottom_telemetry_send_title">发送仪表盘数据</string> + <string name="bottom_telemetry_send_auto">自动</string> + <string name="bottom_telemetry_send_auto_hint">为此处列出的所有游戏开启,包括之后发现的游戏。你手动关闭的游戏会保持关闭。</string> + <string name="bottom_telemetry_send_note">这会更改游戏自身的数据输出设置。将在游戏下次启动时生效;关闭后会恢复原来的设置。</string> + <string name="bottom_telemetry_send_close">请关闭 %1$s 后再更改此项。</string> + <string name="bottom_telemetry_send_failed">无法更改 %1$s 的设置。</string> + <string name="bottom_telemetry_send_menu">%1$s:请在游戏设置中开启 %2$s,IP 设为 127.0.0.1,端口设为 %3$d。</string> + <string name="bottom_shots_where">保存到 Pictures/DroidDeck。Steam 截图也会显示在这里。</string> + <string name="bottom_shots_take">截图</string> + <string name="bottom_shots_saved">截图已保存。</string> + <string name="bottom_shots_failed">无法截图。</string> + <string name="bottom_shots_none">暂无截图。</string> + <string name="bottom_page_chat">聊天和语音</string> + <string name="bottom_chat_why">在主屏幕继续运行游戏的同时,在此阅读和回复 Steam 聊天。使用 Steam 当前登录的账户。</string> + <string name="bottom_chat_not_signed_in">Steam 目前还没有可共享的网页登录,请在此登录一次。</string> + <string name="bottom_chat_stopped">DroidDeck 在后台时,Android 关闭了聊天页面。返回 DroidDeck 后会重新打开。</string> + <string name="bottom_chat_open">打开 Steam 聊天</string> + <string name="bottom_chat_close">关闭聊天</string> + <string name="bottom_chat_mic_on">麦克风已开</string> + <string name="bottom_chat_mic_off">麦克风已关</string> + <string name="bottom_chat_mic_unavailable">此游戏的麦克风已关闭。如需语音通话,请在 DroidDeck 的 Steam 设置(音频)中开启麦克风,然后重新启动游戏。</string> + <string name="bottom_chat_volume">音量 %1$d%%</string> + <string name="bottom_page_telemetry">游戏内数据</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">电池</string> + <string name="bottom_telemetry_lap">圈数</string> + <string name="bottom_telemetry_position">名次</string> + <string name="bottom_telemetry_this_lap">本圈</string> + <string name="bottom_telemetry_last_lap">上一圈</string> + <string name="bottom_telemetry_fuel">燃料</string> + <string name="bottom_telemetry_cargo">货物</string> + <string name="bottom_telemetry_pips">能量分配 SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">法律状态</string> + <string name="bottom_telemetry_balance">余额</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">端口 %1$d 正在接收数据(%2$d 个 %3$d 字节的数据包),但其格式本页面暂时无法读取。</string> + <string name="bottom_telemetry_port_busy">端口 %1$s 已被其他程序占用,因此该游戏无法在此显示。</string> <string name="rtinst_removing">正在移除 Linux 运行时</string> <plurals name="rtinst_removing_entries"> @@ -1776,6 +1945,7 @@ <string name="flatpakmgr_not_ready">请先配置 Flatpak</string> <string name="flatpakmgr_starting">启动中</string> <string name="flatpakmgr_exit_status">Flatpak 已退出,状态码 %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s 是为 %2$s 构建的,DroidDeck 无法运行。这里的 Flatpak 应用需要 ARM64 或 x86_64 版本。</string> <string name="flatpakmgr_installing">正在安装 %1$s</string> <string name="flatpakmgr_updating">正在更新 %1$s</string> <string name="flatpakmgr_removing">正在移除 %1$s</string> @@ -1869,6 +2039,7 @@ <string name="adbpair_applying">正在应用设置…</string> <string name="adbpair_command_failed">无线调试命令执行失败</string> <string name="adbpair_channel_name">无线调试配置</string> + <string name="adbpair_progress_channel_name">无线调试设置进度</string> <string name="adbpair_channel_description">在“设置”打开时请求输入无线调试配对码</string> <string name="adbpair_title_pair">配对无线调试</string> <string name="adbpair_waiting_text">开启无线调试,然后点按“使用配对码配对设备”。</string> @@ -1980,6 +2151,8 @@ <string name="gpuinfo_a850_experimental">Adreno 850 实验支持:需要配套的实验版显示驱动和游戏驱动;尚未在此设备上验证</string> <string name="gpuinfo_below_tested">低于已测试的硬件(Adreno 725 及更新):可能无法运行</string> <string name="gpuinfo_unsupported">不受支持:DroidDeck 需要 Adreno(骁龙)GPU</string> + <string name="gpuinfo_bridge">通过 Mali 桥接运行,使用手机自带的 Vulkan 驱动</string> + <string name="gpuinfo_bridge_off">关闭 Mali 桥接时不受支持:Turnip 需要 Adreno(骁龙)GPU</string> <string name="turnip_rate_limited">已达到 GitHub 的请求频率限制 — 请稍后重试</string> <string name="turnip_github_http">GitHub 返回 HTTP %1$d</string> @@ -2074,6 +2247,7 @@ <string name="display_look_filter">%1$s 将缩放设为 %2$s。</string> <string name="display_match_screen">匹配屏幕(%1$d×%2$d)</string> <string name="display_follow_screen">跟随屏幕(折叠或展开时调整大小)</string> + <string name="display_follow_screen_scaled">缩放 %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">显示设备详情</string> <string name="device_info_hide">隐藏设备详情</string> @@ -2180,6 +2354,13 @@ <string name="stores_resume">继续</string> <string name="stores_refresh">刷新</string> <string name="stores_sort">排序</string> + <string name="setup_rail_labels">侧边栏标签</string> + <string name="setup_rail_labels_hint">在侧边栏图标下方显示名称。关闭后侧边栏更窄。</string> + <string name="library_display">显示</string> + <string name="library_display_larger">较大卡片</string> + <string name="library_display_smaller">较小卡片</string> + <string name="library_display_title">显示标题</string> + <string name="library_display_size">显示大小</string> <string name="stores_sort_last_played">最近游玩</string> <string name="stores_sort_recently_installed">最近安装</string> <string name="stores_sort_title_asc">标题 A–Z</string> @@ -2306,6 +2487,9 @@ <string name="stores_download_manager">下载管理</string> <string name="stores_parallel">同时下载数</string> <string name="stores_install_where">安装到</string> + <string name="stores_install_language">游戏语言</string> + <string name="stores_install_language_hint">GOG 和 Epic 会安装此语言。“系统”跟随应用语言。</string> + <string name="stores_install_language_system">系统</string> <string name="stores_install_title">安装 %1$s:</string> <string name="stores_target_internal">内部存储</string> <string name="stores_target_free">可用 %1$s</string> @@ -2341,6 +2525,9 @@ <string name="edit_target">目标</string> <string name="edit_start_in">起始位置</string> <string name="edit_launch_options">启动选项</string> + <string name="edit_launch_options_steam_hint">与 Steam 的“属性”共用:在任一处更改,两处都会更新。</string> + <string name="edit_launch_options_not_saved">无法将启动选项保存到 Steam。请重试。</string> + <string name="edit_launch_options_desktop">Steam 可能正在桌面会话中运行。请在 Steam 的“属性”中更改启动选项,或先关闭该会话。</string> <string name="edit_artwork">美术图</string> <string name="edit_other_exe">其他 exe…</string> <string name="edit_remove">移除</string> @@ -2531,6 +2718,22 @@ <string name="glasses_tracking_flat_hint">“自动”会让这款 2D 游戏固定在视野中。要使用头部追踪,请在“显示”中选择“虚拟屏幕”。</string> <string name="glasses_tracking_sbs_hint">头部追踪适用于虚拟屏幕或正在运行的 SteamVR 游戏。</string> <string name="glasses_hardware">设备</string> + <string name="vr_controllers_tab">控制器</string> + <string name="vr_controllers_group">SteamVR 控制器</string> + <string name="vr_controllers_emulate">VR 中的手柄</string> + <string name="vr_controllers_emulate_hint">你的手柄所模拟的两只 VR 手。更改会立即生效,SteamVR 运行时也是如此。Joy-Con 和手部追踪仍会接管各自对应的一侧。</string> + <string name="vr_controllers_off">普通手柄</string> + <string name="vr_controllers_index">Valve Index 控制器</string> + <string name="vr_controllers_touch">Meta Quest 3 控制器</string> + <string name="vr_controllers_vive">HTC Vive 控制器</string> + <string name="vr_controllers_sticks">摇杆初始用途</string> + <string name="vr_controllers_sticks_hint">在 VR 中同时按下两个摇杆即可切换。</string> + <string name="vr_controllers_sticks_game">在游戏中移动</string> + <string name="vr_controllers_sticks_hands">移动双手</string> + <string name="vr_controllers_buttons">按键</string> + <string name="vr_controllers_buttons_stick">扳机即扳机,肩键为握持,A/B 和 X/Y 为各只手的正面按键,按下摇杆即按下拇指摇杆,Guide 键打开 SteamVR 菜单。方向键上下可让双手靠近或远离。</string> + <string name="vr_controllers_buttons_vive">摇杆作为触控板使用;按 A/X 或按下摇杆即按压触控板。扳机即扳机,肩键为握持,Start 和 Select 为菜单键,Guide 键打开 SteamVR 菜单。</string> + <string name="vr_controllers_buttons_off">不使用 VR 手。支持手柄的游戏以及 SteamVR 菜单会照常使用你的手柄。</string> <string name="glasses_brightness">亮度</string> <string name="glasses_volume">音量</string> <string name="glasses_sunblock">遮光</string> @@ -2588,6 +2791,12 @@ <string name="hand_camera_placement">相机位置</string> <string name="hand_camera_placement_hint">开始游戏前,请确认相机能看到你。</string> <string name="hand_camera_check">检查</string> + <string name="tracking_pack_title">手部追踪下载</string> + <string name="tracking_pack_hint">手部追踪需要一次性下载 %1$s。</string> + <string name="tracking_pack_download">下载</string> + <string name="tracking_pack_retry">重试</string> + <string name="tracking_pack_downloading">正在下载手部追踪… %1$d%%</string> + <string name="tracking_pack_failed">无法下载手部追踪。请检查网络连接后重试。</string> <string name="hand_camera_check_title">相机位置</string> <string name="hand_camera_how_rear">将设备立在距离 1.5 到 2 米、约胸口高度的地方,让后置相机对着你。然后张开双手走进画面。</string> <string name="hand_camera_how_front">将设备立在距离 1.5 到 2 米、约胸口高度的地方,让屏幕对着你。然后张开双手走进画面。</string> @@ -2659,6 +2868,21 @@ <string name="storage_safe_hint">未使用的运行时、残留、旧日志</string> <string name="storage_clean_up">清理…</string> <string name="storage_session_running">停止会话后才能清理或移除。容量仍会显示。</string> + <string name="storage_default_group">安装位置</string> + <string name="storage_default_title">默认存储</string> + <string name="storage_default_hint">新的商店安装将保存到所选位置。现有游戏保持原位。Steam 库使用各自的设置。</string> + <string name="storage_default_ask">每次询问</string> + <string name="storage_default_ask_detail">每次安装时选择目标位置</string> + <string name="storage_default_internal">内部存储</string> + <string name="storage_default_external">外部存储</string> + <string name="storage_default_external_detail">%1$s · 可用 %2$s</string> + <string name="storage_default_external_missing">未连接</string> + <string name="storage_default_folder">文件夹 · %1$s</string> + <string name="storage_default_folder_free">可用 %1$s</string> + <string name="storage_default_folder_missing">未连接</string> + <string name="storage_default_choose_folder">选择文件夹…</string> + <string name="storage_default_choose_folder_detail">使用 SD 卡或 USB 驱动器上的任意文件夹</string> + <string name="storage_default_note">游戏会放在所选位置中的 Games 文件夹内。现有游戏不会被移动。</string> <string name="storage_where">占用去向</string> <string name="storage_games">Steam 游戏</string> <string name="storage_game_data">游戏数据</string> @@ -2780,6 +3004,9 @@ <string name="storage_data_installed">已安装游戏</string> <string name="storage_data_parts">前缀 %1$s · 着色器 %2$s · 创意工坊 %3$s</string> <string name="storage_clear_shaders">清除着色器</string> + <string name="storage_reset_prefix">重置前缀</string> + <string name="storage_reset_prefix_title">要重置 %1$s 的前缀吗?</string> + <string name="storage_reset_prefix_confirm">删除 %2$s 中的 Wine 前缀(%1$s),并在下次启动时重新创建。其中的存档、设置和已安装的运行库将丢失;Steam Cloud 存档仍保留在你的账户中。</string> <string name="storage_data_leftovers">已卸载游戏</string> <string name="storage_steam_app">Steam 应用 %1$d</string> <string name="storage_leftover_unsure_detail">其前缀仍含文件,其中可能有本地存档</string> @@ -3078,6 +3305,113 @@ <string name="spatial_saved_views_hint">可以重新计算保存的视图。开始新的校准以在当前跟踪坐标系中捕获。</string> <string name="spatial_model_checksum_error">手模型校验和不匹配</string> <string name="spatial_opencv_load_error">OpenCV 无法加载</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">使用 Syncthing 同步</string> + <string name="sync_enable_hint">这是基于 Syncthing-Fork 的 Syncthing 实现,可将 DroidDeck 内部文件系统中的文件与其他 Syncthing 实例同步。仅适用于你存放在 DroidDeck 内部文件系统中的文件。</string> + <string name="sync_missing">此版本不包含 Syncthing。</string> + <string name="sync_starting">正在启动 Syncthing</string> + <string name="sync_status_starting">正在启动</string> + <string name="sync_status_up_to_date">最新</string> + <string name="sync_status_syncing">同步中</string> + <string name="sync_status_paused">已暂停</string> + <string name="sync_status_pausing">正在暂停</string> + <string name="sync_status_resuming">正在恢复</string> + <string name="sync_status_attention">需要处理</string> + <string name="sync_status_failed">Syncthing 已停止</string> + <string name="sync_failed_retry">重试</string> + <string name="sync_paused_wifi">已暂停,等待连接 Wi-Fi</string> + <string name="sync_paused_game">游戏期间已暂停</string> + <string name="sync_summary">%1$d 个文件夹 · 已连接 %2$d/%3$d 台设备</string> + <string name="sync_left">剩余 %1$s</string> + <string name="sync_open_web_ui">打开 Web 管理页面</string> + <string name="sync_pause">暂停</string> + <string name="sync_resume">恢复</string> + <string name="sync_running">运行中</string> + <string name="sync_running_hint">关闭后将完全停止 Syncthing。</string> + <string name="sync_this_device">本设备</string> + <string name="sync_device_id">设备 ID</string> + <string name="sync_show_qr">显示二维码</string> + <string name="sync_advanced">高级</string> + <string name="sync_advanced_hint">端口、运行时机、重置</string> + <string name="sync_open">打开</string> + <string name="sync_waiting">等待你处理</string> + <string name="sync_pending_device">%1$s 请求连接</string> + <string name="sync_pending_folder">%1$s 想要共享“%2$s”</string> + <string name="sync_pending_folder_hint">接受后可选择在 DroidDeck 中的保存位置。</string> + <string name="sync_review">在 Web 管理页面中查看</string> + <string name="sync_folders">文件夹</string> + <string name="sync_no_folders">暂无文件夹。</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">最新</string> + <string name="sync_folder_syncing">同步中 %1$d%%</string> + <string name="sync_folder_scanning">正在扫描</string> + <string name="sync_folder_paused">已暂停</string> + <string name="sync_folder_out_of_sync">未同步</string> + <string name="sync_folder_errors">%1$d 个文件无法同步</string> + <string name="sync_folder_blocked">已阻止</string> + <string name="sync_folder_blocked_hint">此文件夹位于 DroidDeck 的存储空间之外,因此 DroidDeck 已将其暂停。要同步 DroidDeck 之外的文件夹,请使用 Syncthing-Fork 应用。</string> + <string name="sync_remove_folder">从 Syncthing 中移除</string> + <string name="sync_remove_folder_hint">移除不会删除任何文件。</string> + <string name="sync_devices">设备</string> + <string name="sync_no_devices">暂无设备。</string> + <string name="sync_connected">已连接</string> + <string name="sync_offline">离线</string> + <string name="sync_last_seen">最后在线:%1$s</string> + <string name="sync_device_id_title">本设备的 ID</string> + <string name="sync_device_id_hint">在你的另一台设备上,于 Syncthing 中添加设备,然后扫描此二维码或粘贴 ID。之后在这里的 Web 管理页面中接受该设备。</string> + <string name="sync_copy">复制</string> + <string name="sync_share">分享</string> + <string name="sync_done">完成</string> + <string name="sync_off_title">关闭 Syncthing?</string> + <string name="sync_off_body">Syncthing 将立即停止,并保持停止状态,直到你重新开启。已同步的文件保留在原处。</string> + <string name="sync_off_forget">同时删除 Syncthing 的配置</string> + <string name="sync_off_forget_hint">将移除本设备的 ID、文件夹和设备。重新开启后将从头开始。</string> + <string name="sync_turn_off">关闭</string> + <string name="sync_ports">端口</string> + <string name="sync_port_sync">同步</string> + <string name="sync_port_discovery">本地发现</string> + <string name="sync_repick">选择新端口</string> + <string name="sync_repick_hint">每次启动时都会重新检查。</string> + <string name="sync_repick_button">重新选择</string> + <string name="sync_reset_group">重置</string> + <string name="sync_api_key">API 密钥</string> + <string name="sync_regenerate">重新生成</string> + <string name="sync_reset">重置 Syncthing</string> + <string name="sync_reset_hint">将生成新的设备 ID,并移除文件夹和设备。DroidDeck 存储空间中的文件会保留。</string> + <string name="sync_reset_button">重置</string> + <string name="sync_reset_confirm_title">重置 Syncthing?</string> + <string name="sync_running_group">运行</string> + <string name="sync_run">运行时机</string> + <string name="sync_run_open">DroidDeck 打开时</string> + <string name="sync_run_background">在后台</string> + <string name="sync_wifi_only">仅限 Wi-Fi</string> + <string name="sync_pause_games">游戏期间暂停</string> + <string name="sync_logs">日志</string> + <string name="sync_logs_hint">本次会话的 Syncthing 输出</string> + <string name="sync_logs_share">分享</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">请先设置 Linux 运行时。</string> + <string name="sync_accept">接受</string> + <string name="sync_accept_title">将“%1$s”保存到</string> + <string name="sync_add_folder">添加文件夹</string> + <string name="sync_add_folder_hint">同步 DroidDeck 存储空间中的文件夹</string> + <string name="sync_choose">选择</string> + <string name="sync_add">添加</string> + <string name="sync_add_failed">无法添加该文件夹。</string> + <string name="sync_share_with">共享给</string> + <string name="sync_share_none">暂无设备。你稍后可以在 Web 管理页面中共享此文件夹。</string> + <string name="sync_use_folder">使用此文件夹</string> + <string name="sync_new_folder">新建文件夹</string> + <string name="sync_location_home">容器主目录</string> + <string name="sync_location_sync">Sync 文件夹</string> + <string name="sync_location_shared">DroidDeck 共享存储</string> + <string name="sync_location_card">%1$s 上的 DroidDeck</string> + <string name="sync_location_app">DroidDeck 应用数据</string> + <string name="sync_web_path_locked">新文件夹会保存在 DroidDeck 的 Sync 文件夹中。要同步其他 DroidDeck 文件夹,请在“Syncthing”标签页中使用“添加文件夹”。</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">重新加载</string> + <string name="sync_not_running">Syncthing 未在运行。</string> <string name="glasses_6dof">6DoF 虚拟屏幕</string> <string name="tracking_recovery_look">在光线充足的房间内缓慢环顾四周。\n不要遮挡追踪摄像头,并面向家具等有明显细节的物体。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> @@ -3108,6 +3442,12 @@ <string name="epic_client_open">打开</string> <string name="epic_client_install">安装</string> <string name="game_tab_about">关于</string> + <string name="game_resources_browser">在浏览器中打开</string> + <string name="game_resource_guides">指南</string> + <string name="game_resource_protondb_detail">Linux / Proton 兼容性报告</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">适用于存档保存在 Steam 账户中的游戏</string> + <string name="game_resource_search">网页搜索</string> <string name="game_tab_install">安装</string> <string name="game_install_location">位置</string> <string name="game_install_folder">文件夹</string> @@ -3124,6 +3464,11 @@ <string name="stores_eyebrow_pass">%1$s 可玩</string> <string name="stores_owned_in_library">游戏库中已拥有的游戏</string> <string name="library_filter_added">已添加</string> + <string name="library_filter">筛选</string> + <string name="library_filter_installed">仅已安装</string> + <string name="library_filter_all_owned">所有已拥有的游戏</string> + <string name="library_no_installed_matches">没有符合这些筛选条件的已安装游戏。</string> + <string name="library_browse_owned">浏览已拥有的游戏</string> <string name="game_tab_launch">启动</string> <string name="game_tab_saves_cloud">存档和云</string> <string name="game_launch_shortcut">Steam 快捷方式</string> @@ -3141,6 +3486,40 @@ <string name="stores_itch_update_replaced">开发者已将此版本替换为 %1$s。要更新到该版本吗?</string> <string name="xbox_filter_cloud">云</string> <string name="stores_xbox_cloud_settings">云设置</string> + <string name="integration_title">Steam 集成</string> + <string name="integration_count">已开启 %1$d/%2$d 项</string> + <string name="integration_set_up">设置</string> + <string name="integration_location">位置信息</string> + <string name="integration_app_info">应用信息</string> + <string name="integration_wifi">Wi-Fi 名称</string> + <string name="integration_brightness">亮度</string> + <string name="integration_home">将 DroidDeck 设为主屏幕</string> + <string name="integration_shortcuts">系统按键</string> + <string name="integration_wifi_hint">在 Steam 中显示网络 · 需要位置信息权限,绝不跟踪</string> + <string name="integration_wifi_on">网络会显示在 Steam 中</string> + <string name="integration_wifi_location_off">位置信息已关闭</string> + <string name="integration_wifi_denied">位置信息权限被拒绝 · 请在“应用信息”中允许</string> + <string name="integration_brightness_hint">Steam 的滑块可调节屏幕亮度</string> + <string name="integration_home_hint">在会话中按主屏幕按钮会打开 Steam 菜单</string> + <string name="integration_shortcuts_hint">Alt+Tab、Win 键和主页键留在会话中</string> + <string name="integration_shortcuts_maybe_restricted">在 Android 中显示为灰色?应用信息 → ⋮ → 允许受限设置</string> + <string name="integration_shortcuts_restricted">已被 Android 阻止 · 应用信息 → ⋮ → 允许受限设置</string> + <string name="integration_shortcuts_service">DroidDeck 系统按键</string> + <string name="integration_shortcuts_service_description">让 Alt+Tab、Win 键和主页键在当前 DroidDeck 会话中生效,而不是交给 Android。</string> + <string name="integration_brightness_needed">请在“配置”→“Steam 集成”中开启亮度</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK:自动</string> + <string name="setup_bridge_dxvk_proton">DXVK:Proton 自带</string> + <string name="setup_bridge_dxvk_auto_detail">此 GPU 的 Vulkan 版本对 Proton 自带的 DXVK 来说太旧时,改用较旧的 DXVK。</string> + <string name="setup_bridge_dxvk_proton_detail">每个 Proton 都使用自带的 DXVK,即使此 GPU 的 Vulkan 版本可能太旧。</string> + <string name="setup_gpu_bridge_off">Mali 桥接:关</string> + <string name="setup_gpu_bridge_on">Mali 桥接:开</string> + <string name="setup_gpu_bridge_detail">%1$s 不是 Adreno。实验性 Vulkan 桥接已开启:会话通过手机自带的驱动绘制。可能会有问题,请发送会话日志。</string> + <string name="setup_bridge_safe">安全模式</string> + <string name="setup_bridge_safe_on">安全模式:开</string> + <string name="setup_bridge_safe_off">安全模式:关</string> + <string name="setup_bridge_safe_on_detail">兼容性最好。推荐新设备使用。</string> + <string name="setup_bridge_safe_off_detail">在此 GPU 通过检查的地方更快。</string> <string name="apps_search_hint">搜索应用</string> <string name="apps_no_match">没有与“%1$s”匹配的应用。</string> <string name="apps_add_widget">添加微件</string> @@ -3188,6 +3567,8 @@ <string name="desktop_restore_done_body">你添加的应用已重新安装。</string> <string name="desktop_restore_failed_title">部分软件无法恢复</string> <string name="desktop_restore_failed_body">请查看 ~/.cache/droiddeck/apt-restore.log,然后在 Konsole 中尝试 sudo apt install。</string> + <string name="gog_full_files">原生优化不可用。下载内容包含完整的替换文件。</string> + <string name="gog_recover">验证补丁结果</string> <string name="slow_usb_title">USB 连接速度慢</string> <string name="slow_usb_cable">%1$s 通过 %2$s 连接(%3$s Mbps,约 %4$d MB/s),其中的游戏加载会很慢。请使用 5 Gbps 或更快的 USB 3 数据线,尝试翻转 USB-C 插头,或使用更快的硬盘。</string> <string name="slow_usb_port">%1$s 通过 %2$s 连接(%3$s Mbps,约 %4$d MB/s)。此设备的 USB 接口无法更快,游戏加载会很慢。内部存储或 microSD 卡可能更快。</string> @@ -3198,4 +3579,52 @@ <string name="steam_import_names_more">%1$s 等另外 %2$d 款</string> <string name="steam_import_now">立即重启</string> <string name="steam_import_later">稍后</string> + <string name="gog_maintenance">管理 GOG 安装</string> + <string name="gog_check">检查更新</string> + <string name="gog_repair">验证/修复</string> + <string name="gog_patches">离线补丁</string> + <string name="gog_refresh">下载完整离线安装程序</string> + <string name="gog_update">更新到 %1$s</string> + <string name="gog_resume">继续 GOG 维护</string> + <string name="gog_open_patch">打开补丁安装程序</string> + <string name="gog_patch_in_session">请在 Linux 会话中完成或取消补丁安装程序。</string> + <string name="gog_patch_requirements">请选择适用于已安装版本和语言的补丁。受支持的源版本可能未列出。</string> + <string name="gog_no_patches">GOG 没有此游戏的独立 Windows 补丁。</string> + <string name="gog_managed_files">修改过的游戏文件可能会被替换。</string> + <string name="gog_patch_installer_note">安装程序会在你的 Linux 会话中打开。</string> + <string name="gog_download_label">下载</string> + <string name="gog_space_label">额外空间</string> + <string name="gog_space_estimate_label">预计空间</string> + <string name="gog_repair_action">修复文件</string> + <string name="gog_refresh_action">刷新安装</string> + <string name="gog_select_patch">选择</string> + <string name="stores_gamejolt_not_owned">不在你的 Game Jolt 库中</string> + <string name="stores_gamejolt_no_build">这个游戏没有 Windows 下载</string> + <string name="stores_gamejolt_no_exe">下载内容中未找到 Windows 游戏</string> + <string name="stores_gamejolt_no_game">在 Game Jolt 上找不到这款游戏</string> + <string name="stores_gamejolt_browse_failed">无法从 Game Jolt 加载游戏</string> + <string name="stores_gamejolt_download_failed">Game Jolt 返回 HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">无法从 Game Jolt 加载下载内容</string> + <string name="stores_gamejolt_build_open">在 Game Jolt 上打开</string> + <string name="stores_gamejolt_archive">不支持 %1$s 压缩包</string> + <string name="stores_gamejolt_extract_failed">无法解压下载内容(代码 %1$d)</string> + <string name="stores_gamejolt_download_unreachable">无法连接到 Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt 未提供下载链接</string> + <string name="stores_gamejolt_section_featured">精选</string> + <string name="stores_gamejolt_section_hot">热门</string> + <string name="stores_gamejolt_section_best">最佳</string> + <string name="stores_gamejolt_section_new">最新</string> + <string name="stores_gamejolt_price_under_30">30 美元以下</string> + <string name="stores_gamejolt_os_other">其他</string> + <string name="stores_gamejolt_maturity_everyone">全年龄</string> + <string name="stores_gamejolt_maturity_teen">青少年</string> + <string name="stores_gamejolt_maturity_adult">成人</string> + <string name="stores_gamejolt_status_complete">已完成</string> + <string name="stores_gamejolt_status_early">抢先体验</string> + <string name="stores_gamejolt_partners">合作伙伴游戏</string> + <string name="stores_gamejolt_filter_browser">浏览器</string> + <string name="stores_gamejolt_filter_maturity">内容分级</string> + <string name="stores_gamejolt_filter_status">状态</string> + <string name="stores_gamejolt_filter_partners">合作伙伴</string> + <string name="stores_gamejolt_followed">已关注的游戏</string> </resources> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index c7a9cfd669..d1024c1c57 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12 的 VKD3D 選項。nodxr 會停用光線追蹤;只在個別遊戲需要時使用。</string> <string name="game_env_proton_log">設為 1 以產生 Proton 診斷記錄。記錄可能會降低效能並佔用儲存空間。</string> <string name="game_env_wined3d">設為 1 以改用基於 OpenGL 的 WineD3D 代替 DXVK,用於 D3D9–11 兼容性測試。</string> + <string name="game_env_wined3d_renderer">DirectDraw、Direct3D 1-7 及透過 WineD3D 執行之遊戲的轉譯器。Vulkan 會略過 OpenGL-on-Zink 路徑,在 Adreno 上執行舊款 DirectDraw 和 Direct3D 7 遊戲時快得多。</string> + <string name="game_env_dxvk_d3d8">設定為 1 以透過 DXVK 而非 WineD3D 執行 Direct3D 8。在 Adreno 上的 AIO Graphics Test Direct3D 8 測試中速度較快。</string> <string name="game_env_no_ntsync">設為 1 讓此遊戲不使用 ntsync(droiddeck-ntsync 或內核驅動程式);有可用套件時會改用 droiddeck-esync,否則使用 droiddeck-fsync。</string> <string name="game_env_no_esync">設為 1 為此遊戲關閉 droiddeck-esync;會改用 droiddeck-fsync,如 fsync 亦已關閉則使用 droiddeck-ntsync。</string> <string name="game_env_no_fsync">設為 1 讓此遊戲不使用 droiddeck-fsync;有可用套件時會改用 droiddeck-esync,否則使用 droiddeck-ntsync。</string> <string name="game_env_fsync_first">設為 1 讓此遊戲使用 droiddeck-fsync;設為 0 則在有配合其 Proton 的套件時優先使用 droiddeck-esync。</string> <string name="game_env_xalia">設為 0 以為此遊戲停用 Proton 的控制器導覽輔助程式。</string> + <string name="game_env_anticheat_offline">預設為開啟。當遊戲支援離線遊玩時,以不載入反作弊的方式啟動 Easy Anti-Cheat 遊戲。關閉後會照常透過 Easy Anti-Cheat 啟動。需要 Easy Anti-Cheat 的線上模式仍然無法使用。</string> <string name="game_env_hud">D3D9–11 的 DXVK 疊加層。fps 會顯示幀率;不設定則隱藏。</string> <string name="game_env_dxvk_config">以分號分隔的 DXVK 設定。較新版本使用 dxvk.maxFrameRate 限制幀率;一般遊玩建議使用會話的幀率限制。</string> + <string name="game_env_cores">此遊戲使用的 CPU 核心,例如 0-4 或 0,2,4,用來取代會話的遊戲核心。核心越少,溫度越低。</string> <string name="game_env_vkd3d_limit">D3D12 幀率限制。0 表示不限制。</string> <string name="game_env_glthread">Mesa OpenGL 多線程。true 可能有助受 CPU 限制的 OpenGL 遊戲;請逐個遊戲測試。</string> <string name="sync_backend_title">Wine 同步</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX 可在此 ARM64 裝置上執行 x86 Linux 程式。「自動」會在程式為 x86 而設時使用 FEX。</string> <string name="app_fex_x86">%1$s,透過 FEX</string> <string name="app_fex_not_ready">此程式是為 %1$s 電腦而設,需透過 FEX 執行,但 FEX 尚未設定。請在登入狀態下開啟一次 Steam:DroidDeck 會讓它下載 FEX 及所需的 Steam Linux Runtime,之後便會開啟此程式。</string> + <string name="session_proot_missing">無法下載 DroidDeck 的 proot。請檢查連線後再試一次。會話未啟動,因為備用 proot 太慢,無法用來玩遊戲。</string> + <string name="session_directaudio_missing">無法下載 DirectAudio,因此本次會話的遊戲音訊會使用較慢的路徑。</string> <string name="session_end_program">此程式</string> <string name="session_end_steam_download">無法下載 Steam 用戶端。你的網絡或 VPN 可能封鎖了 Steam 的伺服器;請檢查連線後再試。</string> <string name="session_end_steam_setup">無法設定 Steam 用戶端。請檢查連線和可用儲存空間,然後再試。</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 控制器</string> <string name="mode_controller_note">Deck:提供快速存取按鈕和陀螺儀。Xbox 360:按 Guide+A 開啟快速存取。</string> <string name="mode_back">返回</string> + <string name="back_hold">長按返回鍵使用 Steam 快捷操作</string> + <string name="back_hold_hint">長按返回鍵開啟快速存取,或與其他按鍵組成 Steam 組合鍵。關閉後忽略長按;輕觸和輕觸兩下仍然有效。</string> + <string name="back_native_qam_hint">按住返回鍵 700 毫秒,或按住返回鍵並按下其他按鈕以使用 Steam 快速鍵。</string> + <string name="back_double_tap_window">連按兩下間隔</string> + <string name="back_tap_ms">%1$d 毫秒</string> + <string name="brightness_permission_title">允許控制亮度</string> + <string name="brightness_permission_text">在 DroidDeck 中設定亮度控制。</string> <string name="back_menu_then_qam">選單 → QAM</string> <string name="back_qam_then_menu">QAM → 選單</string> <string name="mode_session">會話</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam 正在下載時,延遲在背景暫停。</string> <string name="mode_suspend_note">「自動」會在背景時暫停,並在重新顯示時繼續;「手動」會等你按「繼續」;「從不」會保持執行。</string> <string name="mode_startup">啟動</string> - <string name="mode_steam_startup">隨 DroidDeck 啟動 Steam</string> - <string name="mode_steam_startup_hint">DroidDeck 啟動時開啟 Steam 會話。</string> + <string name="mode_startup_session">啟動時開啟</string> + <string name="mode_startup_session_hint">DroidDeck 啟動時開始此工作階段。</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">正在檢查發佈版本…</string> <string name="mode_decky_ready">可安裝 %1$s。</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">已是最新 · %1$s</string> <string name="mode_decky_loader">載入器</string> <string name="mode_decky_install_latest">安裝最新版本</string> + <string name="decky_channel">更新頻道</string> + <string name="decky_channel_hint">要安裝哪一種 Decky Loader 版本。Decky 本身的更新程式也會使用相同的頻道。</string> + <string name="decky_channel_stable">穩定版</string> + <string name="decky_channel_prerelease">預發佈版</string> + <string name="decky_channel_testing">測試版</string> + <string name="decky_channel_failed">無法儲存 Decky 更新頻道</string> <string name="mode_decky_on">隨 Steam 啟動。啟用時,此裝置上的其他應用程式可能可以控制 Steam。</string> <string name="mode_decky_off">已關閉。Steam 的遠端偵錯連接埠保持關閉。</string> <string name="mode_decky_remove_title">解除安裝 Decky Loader?</string> @@ -325,6 +344,8 @@ <string name="mode_mangoapp_hint">如果在 Deck 模式下遊戲當機或黑畫面,請關閉此項。下次會話生效。</string> <string name="mode_return_after_game">遊戲結束後返回 DroidDeck</string> <string name="mode_return_after_game_hint">從 DroidDeck 或其他啟動器啟動的遊戲關閉後,Steam 會正常退出(先完成雲端存檔同步),並返回啟動位置。關閉:留在 Steam 中。</string> + <string name="mode_shader_precache">著色器預先快取</string> + <string name="mode_shader_precache_hint">Steam 會為你的遊戲下載預先編譯的著色器並在背景處理,讓遊戲較不卡頓。關閉可節省流動數據用量、儲存空間和電量;遊戲則會改為在執行時編譯著色器。與 Steam 的「下載」>「著色器預先快取」為同一個設定。下次工作階段生效。</string> <string name="mode_steam_repair">修復 Steam 用戶端</string> <string name="mode_steam_repair_hint">下次啟動 Steam 時重新下載 Steam 用戶端。如果 Steam 一直停留在載入畫面,請使用此功能。遊戲、登入資料和設定都會保留。</string> <string name="mode_steam_repair_queued">下次啟動 Steam 時會重新下載 Steam 用戶端。</string> @@ -391,6 +412,8 @@ <string name="mode_directaudio_hint">繞過 PulseAudio 以減低延遲。</string> <string name="mode_mic">麥克風</string> <string name="mode_mic_hint">用於語音聊天。</string> + <string name="drawer_mic_hint">為此會話開啟或關閉麥克風收音。</string> + <string name="drawer_mic_failed">無法變更麥克風設定,請再試一次。</string> <string name="mode_network">網絡</string> <string name="mode_wifi_discovery">Wi-Fi 探索</string> <string name="mode_wifi_discovery_hint">在 Steam 中顯示 Wi-Fi 名稱和附近的網絡。</string> @@ -551,6 +574,16 @@ <string name="perf_gsrealtime">gamescope:即時 GPU 佇列</string> <string name="perf_gsrealtime_hint">優先處理合成器的 GPU 工作。可令幀間隔更平穩,但會犧牲少許遊戲效能。</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">記憶體</string> + <string name="perf_cap_off">關閉</string> + <string name="perf_cap_auto">驅動程式預設</string> + <string name="perf_zram_client">遊戲執行時壓縮 Steam</string> + <string name="perf_zram_client_hint">遊戲啟動 20 秒後,Steam 用戶端會被壓縮到 zRAM,為遊戲騰出更多記憶體,並在遊戲關閉時讀回。如果會話在遊戲啟動後不久就關閉,請關閉此選項。若超過上方的 RAM 上限,會話仍會壓縮 Steam。</string> + <string name="perf_ram_cap">RAM 上限</string> + <string name="perf_ram_cap_hint">在 Steam 用戶端執行時生效,無論是 Steam 模式或從桌面啟動。當會話的用量超過此值時,會先將 Steam、再將會話中其他受支援的程序壓縮到 zRAM。這是軟性上限:不會關閉任何程式,但在分頁讀回時遊戲可能會卡頓。</string> + <string name="perf_ram_cap_unavailable">需要 zRAM 交換空間,但此裝置沒有。</string> + <string name="perf_vram_cap">VRAM 上限</string> + <string name="perf_vram_cap_hint">DXVK 向 Direct3D 遊戲回報的顯示記憶體,讓遊戲以較少的量規劃紋理。遊戲本身的 DXVK 設定仍優先。下次會話生效。</string> <string name="perf_gpuclock">讓 GPU 保持最高頻率</string> <string name="perf_gpuclock_hint">只限 Adreno。減少卡頓,但更耗電、更發熱。</string> <string name="perf_fixes">會話修正</string> @@ -569,6 +602,8 @@ <string name="perf_fastpath">proot 快速路徑</string> <string name="perf_fastpath_needs_seccomp">需要 proot 的 seccomp 篩選器。</string> <string name="perf_fastpath_hint">檔案查找更快,卡頓更少。如果程式找不到其檔案,請關閉此項。</string> + <string name="perf_cursor_composite">在 gamescope 內繪製游標</string> + <string name="perf_cursor_composite_hint">由 Gamescope 自行繪製指標,而不交給 Android。如要用控制器操控游標,請開啟此項。在手機上關閉會較快。下次工作階段生效。</string> <string name="perf_identity">會話身分</string> <string name="perf_hostname">主機名稱</string> <string name="perf_hostname_hint">Steam 看到的此裝置名稱。留空則還原為 %1$s。</string> @@ -583,6 +618,8 @@ <string name="driver_delete_plain">其檔案會從應用程式中移除。</string> <string name="driver_delete_in_use">其檔案會被移除。由於正在使用中,會改用預設驅動程式。</string> <string name="drawer_page_display">顯示</string> + <string name="drawer_frame_limit">幀率限制</string> + <string name="drawer_frame_limit_note">限制此遊戲的幀率。若有能被此上限整除的螢幕更新率,顯示器會切換至該更新率;其他上限可能看起來不平順。Steam 遊戲請使用快速存取選單中 Steam 的幀率限制。</string> <string name="drawer_page_effects">效果</string> <string name="drawer_page_controls">控制</string> <string name="drawer_page_components">組件</string> @@ -614,8 +651,11 @@ <string name="hud_size_pill">膠囊</string> <string name="hud_size_minimal">極簡</string> <string name="hud_size_mega">超大</string> + <string name="hud_size_strip">橫條</string> <string name="hud_locked">鎖定位置</string> <string name="hud_locked_hint">拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。</string> + <string name="hud_snap">貼齊兩側</string> + <string name="hud_snap_hint">放開 HUD 後,它會移到螢幕較近的一側。輕甩可將它甩向該方向。</string> <string name="hud_group_look">外觀</string> <string name="hud_scale">螢幕顯示大小</string> <string name="hud_color_soft">柔和</string> @@ -664,7 +704,6 @@ <string name="hud_export_failed">無法儲存 HUD 報告。</string> <string name="hud_reset">重設 HUD 設定</string> <string name="hud_reset_button">重設</string> - <string name="hud_credit">FusionHUD,作者 The412Banner,github.com/The412Banner/FusionHUD (GPL-3.0)。</string> <string name="drawer_scaling">縮放模式</string> <string name="drawer_scaling_sharpness">縮放銳利度</string> <string name="drawer_effects">畫面效果</string> @@ -685,7 +724,7 @@ <string name="drawer_deband_strength">去色帶強度</string> <string name="drawer_brightness">亮度</string> <string name="drawer_contrast">對比度</string> - <string name="drawer_gamma">Gamma</string> + <string name="drawer_gamma">伽瑪</string> <string name="drawer_saturation">飽和度</string> <string name="drawer_fxaa">FXAA(邊緣平滑)</string> <string name="drawer_toon">卡通描邊</string> @@ -699,11 +738,17 @@ <string name="drawer_touch_auto">自動(%1$s)</string> <string name="drawer_keyboard">鍵盤</string> <string name="drawer_latency">延遲</string> + <string name="drawer_low_latency">低延遲模式</string> + <string name="drawer_low_latency_hint">會增加 CPU 和電池用量</string> <string name="drawer_low_latency_controller">低延遲控制器</string> <string name="drawer_low_latency_controller_hint">控制器以 1000 Hz 而非 250 Hz 回報。CPU 使用率略高。</string> <string name="drawer_low_latency_touch">低延遲觸控</string> <string name="drawer_low_latency_touch_hint">觸控略過幀合併,Steam 觸控以 1000 Hz 回報。CPU 使用率略高。</string> <string name="drawer_evdev_mouse">原生滑鼠通道</string> + <string name="drawer_relative_mouse">相對滑鼠</string> + <string name="drawer_relative_mouse_auto">自動</string> + <string name="drawer_relative_mouse_on">開</string> + <string name="drawer_relative_mouse_off">關</string> <string name="drawer_direct_cursor">游標</string> <string name="drawer_pc_keyboard">電腦鍵盤</string> <string name="drawer_android_keyboard">Android</string> @@ -790,6 +835,10 @@ <string name="setup_session">會話</string> <string name="setup_logs">會話記錄</string> <string name="setup_logs_hint">每次會話後儲存</string> + <string name="setup_game_debug_logs">遊戲偵錯記錄</string> + <string name="setup_game_debug_logs_hint">在下次啟動遊戲時加入 Proton、Wine 和圖形診斷資訊。可能降低效能並佔用更多儲存空間。</string> + <string name="setup_game_debug_logs_restart">重新啟動此會話以儲存遊戲偵錯記錄</string> + <string name="setup_logging_update_failed">無法更新記錄設定。請檢查開關後再試一次。</string> <string name="setup_agent_commands">偵錯工具</string> <string name="setup_latest_logs">最新的會話記錄</string> <string name="setup_saved_logs">已儲存的會話記錄</string> @@ -821,20 +870,22 @@ <string name="setup_home">用作主畫面</string> <string name="setup_home_on">DroidDeck 可用作主畫面應用程式</string> <string name="setup_home_off">DroidDeck 不會作為主畫面應用程式的選項</string> + <string name="setup_home_game_space_first">請在「新增遊戲」中將 DroidDeck 設為「包含」</string> <string name="setup_orientation">螢幕方向</string> + <string name="setup_launcher_orientation">啟動器方向</string> + <string name="setup_launcher_orientation_auto">跟隨裝置旋轉</string> + <string name="setup_orientation_portrait">直向</string> + <string name="setup_session_orientation">會話方向</string> + <string name="setup_session_orientation_hint">套用至 Steam、遊戲、桌面和控制器編輯器。解像度預設會隨會話旋轉;自訂的寬度和高度則維持輸入值。</string> <string name="setup_orientation_auto">自動橫向</string> <string name="setup_orientation_landscape">橫向</string> <string name="setup_orientation_reverse">反向橫向</string> <string name="setup_fullscreen">全螢幕</string> <string name="setup_fullscreen_on">隱藏 Android 狀態列和導覽列</string> <string name="setup_fullscreen_off">顯示 Android 狀態列和導覽列</string> - <string name="setup_dual_screen">雙屏</string> - <string name="setup_dual_screen_hint">自動:在內置第二塊螢幕的掌機上使用該螢幕。開啟:使用任何第二塊顯示器。關閉:所有內容只顯示在一塊螢幕上。</string> <string name="setup_dual_screen_auto">自動</string> <string name="setup_dual_screen_on">開啟</string> <string name="setup_dual_screen_off">關閉</string> - <string name="setup_dual_screen_menu">下屏選單</string> - <string name="setup_dual_screen_menu_hint">將各個分區和遊戲內選單移到第二塊螢幕並在那裡輸入,讓上屏保持完整畫面。L2 和 R2 切換分區。</string> <string name="setup_dual_screen_controls">遊戲中的下屏控制</string> <string name="setup_dual_screen_controls_hint">工作階段開始時在第二塊螢幕上開啟觸控板和鍵盤。</string> <string name="dual_typing_title">正在為上屏輸入</string> @@ -983,6 +1034,14 @@ <string name="gate_step1">開啟「系統設定」→「開發人員選項」→「無線偵錯」,並將其開啟</string> <string name="gate_step2">輕按「使用配對碼配對裝置」</string> <string name="gate_step3">在 DroidDeck 通知中輸入配對碼</string> + <string name="pairguide_build_number">在「關於手機」中輕按「版本號碼」7 次</string> + <string name="pairguide_wireless">開啟「無線偵錯」</string> + <string name="pairguide_pair">開啟「無線偵錯」,然後輕按「使用配對碼配對裝置」</string> + <string name="pairguide_child_process">開啟「停用對子處理過程的限制」</string> + <string name="pairguide_row_child_process">停用對子處理過程的限制</string> + <string name="pairguide_row_build_number">版本號碼</string> + <string name="pairguide_row_wireless">無線偵錯</string> + <string name="pairguide_row_pair">使用配對碼配對裝置</string> <string name="gate_waiting">正在等待配對彈出式視窗…</string> <string name="gate_code_needed">已找到彈出式視窗,請在通知中輸入其中的配對碼。</string> <string name="gate_status">狀態</string> @@ -1121,7 +1180,6 @@ <string name="games_never_played">從未玩過</string> <string name="games_runtime_busy_percent">運行環境繁忙 · %1$d%%</string> <string name="games_runtime_busy">運行環境繁忙</string> - <string name="games_runtime_first_play">首次開啟 Steam 時安裝運行環境</string> <string name="games_runtime_update">運行環境有可用更新</string> <string name="games_runtime_ready">● 運行環境已就緒</string> <string name="games_internal">內部儲存空間</string> @@ -1138,6 +1196,9 @@ <string name="gpu_hide_other">隱藏其他 GPU 的驅動程式</string> <string name="gpu_show_other">顯示其他 GPU 的驅動程式</string> <string name="gpu_advanced">進階</string> + <string name="gpu_ubwc_title">UBWC 相容性</string> + <string name="gpu_ubwc_hint">如果 Steam 或 Android 出現條紋或閃爍,請試試開啟或關閉。重新啟動 DroidDeck 後會套用到兩種驅動程式。</string> + <string name="gpu_ubwc_restart">重新啟動 DroidDeck 以套用。</string> <string name="gpu_set_with_display">與顯示驅動程式一併設定:%1$s 同時包含兩者。</string> <string name="gpu_set_with_runtime">與運行環境驅動程式一併設定:%1$s 同時包含兩者。</string> <string name="gpu_runtime_hint">供遊戲和桌面使用。</string> @@ -1246,10 +1307,15 @@ <string name="pip_auto">自動進入畫中畫</string> <string name="unfolded_controls">展開螢幕時的控制</string> <string name="unfolded_controls_hint">展開時,遊戲會顯示在 Steam Deck 觸控板和背面握把上方;摺疊時,遊戲會全螢幕顯示。</string> + <string name="unfolded_controls_with_controller">連接控制器時亦保留</string> + <string name="unfolded_controls_with_controller_hint">連接控制器時亦顯示這些觸控按鍵。</string> <string name="pip_suspended">已暫停</string> <string name="pip_not_ready">會話準備就緒後即可使用畫中畫。</string> <string name="pip_permission">請在 Android 設定中允許 DroidDeck 使用畫中畫。</string> <string name="pip_unavailable">Android 無法開啟畫中畫。</string> + <string name="game_more">更多</string> + <string name="game_edit_art">編輯圖片</string> + <string name="stores_in_steam_label">在 Steam 中</string> <string name="game_shortcut">捷徑</string> <string name="game_shortcut_add">加至主畫面</string> <string name="game_shortcut_choose">選擇遊戲</string> @@ -1273,6 +1339,10 @@ <string name="main_wait_runtime">請等待運行環境操作完成</string> <string name="main_wait_proton_install">請等待兼容性工具安裝完成</string> + <string name="load_compat_title">正在準備兼容工具</string> + <string name="load_compat_wait">正在等待兼容性設定完成</string> + <string name="load_compat_hint">設定完成後,會話就會啟動。</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">請等待桌面應用程式安裝完成</string> <string name="main_wait_install_game">請等待安裝完成後再啟動遊戲</string> <string name="main_saves_close_session">請先關閉 Steam 會話,以免遊戲存檔覆蓋匯入的內容</string> @@ -1305,6 +1375,9 @@ <string name="main_install_anyway">仍要安裝</string> <string name="main_remove_runtime_title">移除 Linux 運行環境</string> <string name="main_remove_runtime_text">此操作會刪除運行環境、其中的 Steam 用戶端,以及安裝在其中的所有遊戲。</string> + <string name="runtime_actions_title">Linux 運行環境</string> + <string name="runtime_actions_text">「修復」會重新安裝運行環境的系統檔案,並保留 Steam、遊戲和設定。桌面等額外元件會在下次使用時重新安裝。「移除」會刪除所有內容。</string> + <string name="runtime_repair">修復運行環境</string> <string name="main_applied">已套用:%1$s</string> <string name="android_app_open_failed_primary">無法在主螢幕開啟 %1$s</string> <string name="android_app_open_failed_on">無法在 %2$s 開啟 %1$s</string> @@ -1431,6 +1504,10 @@ <string name="session_runtime_catalog_unreachable">無法連接運行環境目錄。請檢查網絡連線,然後再按「開啟 Steam」。</string> <string name="session_runtime_install_failed">Linux 運行環境未能安裝。請在「設定」中檢查運行環境,然後再按「開啟 Steam」。</string> <string name="session_desktop_install_failed">桌面未能安裝(%1$s)。請檢查網絡連線,然後再按「桌面」。</string> + <string name="session_package_resume_failed">無法完成先前中斷的安裝(%1$s)。請檢查網絡連線和儲存空間,然後再試一次。</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Linux 運行環境已損壞:%1$d 個程式庫連結指向不存在的檔案(%2$s 等),通常是安裝中斷所致。修復會保留你的遊戲和設定。</item> + </plurals> <string name="session_ended_named">%1$s 意外停止。請在錯誤報告中附上記錄,或再試一次。</string> <string name="session_ended_program">程式意外停止。請在錯誤報告中附上記錄,或再試一次。</string> <string name="session_ended_desktop">桌面意外停止。請在錯誤報告中附上記錄,或再試一次。</string> @@ -1444,6 +1521,12 @@ <string name="mode_decky_plugins_hint">安裝插件 ZIP,在下次 Steam 會話使用。</string> <string name="mode_decky_plugin_downloading">正在下載…</string> <string name="mode_decky_plugin_install_zip">從 ZIP 安裝</string> + <string name="decky_zip_warning_title">安裝第三方插件</string> + <string name="decky_zip_warning_text">Decky Loader 團隊尚未審查此插件。它可能含有惡意軟件,例如竊取你的 Steam 帳戶或損害裝置的軟件。安裝此插件即表示你同意自行承擔裝置的一切風險。</string> + <string name="decky_zip_warning_continue">繼續</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">請稍候 %1$d 秒</item> + </plurals> <string name="store_cat_games">遊戲</string> <string name="store_cat_audio_video">音訊及影片</string> <string name="store_cat_graphics">圖形</string> @@ -1600,6 +1683,8 @@ <string name="fm_accept">接受</string> <string name="fm_decline">拒絕</string> <string name="fm_drive_not_readable">%1$s 已掛載,但目前無法讀取</string> + <string name="fm_drive_access_title">允許存取 %1$s</string> + <string name="fm_drive_access_text">Android 允許 DroidDeck 看到此磁碟,但不允許讀取。請為 DroidDeck 開啟「所有檔案存取權」,然後返回。</string> <string name="fm_list_view">清單檢視</string> <string name="fm_grid_view">格狀檢視</string> <string name="fm_search">搜尋</string> @@ -1670,6 +1755,89 @@ <string name="second_mode_keyboard_trackpad">鍵盤 + 觸控板</string> <string name="second_mode_terminal">終端機</string> <string name="second_mode_deck_controls">Deck 握把 + 觸控板</string> + <string name="second_mode_dashboard">儀表板</string> + <string name="bottom_dashboard_empty">目前沒有可顯示的內容。</string> + <string name="bottom_page_downloads">下載</string> + <string name="bottom_downloads_none">沒有進行中的下載。</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">正在下載著色器快取</string> + <string name="bottom_downloads_paused">已暫停</string> + <string name="bottom_downloads_queued">等待開始</string> + <string name="bottom_page_notifications">通知</string> + <string name="bottom_notifications_listener">DroidDeck 下方螢幕</string> + <string name="bottom_notifications_why">在遊玩時於此處顯示訊息和其他通知。通知只會顯示在這個螢幕上,不會儲存。Android 只會詢問一次:通知存取權頁面會在這個螢幕上開啟,在那裡開啟 DroidDeck 後,就會自動回到此頁面。</string> + <string name="bottom_notifications_allow">允許通知存取權</string> + <string name="bottom_notifications_none">沒有通知。</string> + <string name="bottom_notifications_count">%1$d 則通知</string> + <string name="bottom_notifications_clear">清除</string> + <string name="bottom_page_screenshots">螢幕截圖</string> + <string name="stats_fps_needs_hud">顯示 FPS 需要開啟 HUD</string> + <string name="stats_speed">速度</string> + <string name="stats_pedals">踏板</string> + <string name="stats_gforce">G 力</string> + <string name="stats_timing">計時</string> + <string name="stats_best_lap">最佳單圈</string> + <string name="stats_tires">輪胎 °C</string> + <string name="stats_trace">油門和剎車,最近 10 s</string> + <string name="stats_speed_chart">速度,%1$s</string> + <string name="stats_gear">檔位</string> + <string name="stats_steam_client_arm">Steam 用戶端 ARM</string> + <string name="stats_steam_client_x86">Steam 用戶端 x86</string> + <string name="stats_throttle">油門</string> + <string name="stats_brake">剎車</string> + <string name="stats_lights">儀表指示燈</string> + <string name="stats_lamp_shift">換檔</string> + <string name="stats_lamp_handbrake">手剎</string> + <string name="stats_lamp_pit">維修區限速</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">渦輪 %1$s bar</string> + <string name="stats_engine_temp">引擎 %1$s °C</string> + <string name="stats_oil_temp">機油 %1$s °C</string> + <string name="stats_power">能量分配器</string> + <string name="stats_fuel_t">燃料,t</string> + <string name="stats_fuel_main">主油箱 %1$s t</string> + <string name="stats_fuel_reserve">備用 %1$s t</string> + <string name="bottom_telemetry_send_title">傳送儀表板資料</string> + <string name="bottom_telemetry_send_auto">自動</string> + <string name="bottom_telemetry_send_auto_hint">為這裡列出的所有遊戲開啟,包括之後找到的遊戲。你關閉的遊戲會維持關閉。</string> + <string name="bottom_telemetry_send_note">這會變更遊戲本身的資料輸出設定。將在遊戲下次啟動時生效;關閉後會還原為原本的設定。</string> + <string name="bottom_telemetry_send_close">請先關閉 %1$s 再變更此項。</string> + <string name="bottom_telemetry_send_failed">無法變更 %1$s 的設定。</string> + <string name="bottom_telemetry_send_menu">%1$s:請在遊戲設定中開啟 %2$s,IP 設為 127.0.0.1,連接埠設為 %3$d。</string> + <string name="bottom_shots_where">儲存至 Pictures/DroidDeck。Steam 螢幕截圖也會顯示在這裡。</string> + <string name="bottom_shots_take">截取螢幕畫面</string> + <string name="bottom_shots_saved">已儲存螢幕截圖。</string> + <string name="bottom_shots_failed">無法截取螢幕畫面。</string> + <string name="bottom_shots_none">尚無螢幕截圖。</string> + <string name="bottom_page_chat">聊天和語音</string> + <string name="bottom_chat_why">遊戲在主螢幕上持續執行的同時,在此閱讀和回覆 Steam 聊天。會使用 Steam 目前登入的帳戶。</string> + <string name="bottom_chat_not_signed_in">Steam 目前還沒有可共用的網頁登入狀態,請在此登入一次。</string> + <string name="bottom_chat_stopped">DroidDeck 在背景執行時,Android 關閉了聊天頁面。回到 DroidDeck 後會重新開啟。</string> + <string name="bottom_chat_open">開啟 Steam 聊天</string> + <string name="bottom_chat_close">關閉聊天</string> + <string name="bottom_chat_mic_on">麥克風已開啟</string> + <string name="bottom_chat_mic_off">麥克風已關閉</string> + <string name="bottom_chat_mic_unavailable">此遊戲的麥克風已關閉。若要說話,請在 DroidDeck 的 Steam 設定(音訊)中開啟麥克風,然後重新啟動遊戲。</string> + <string name="bottom_chat_volume">音量 %1$d%%</string> + <string name="bottom_page_telemetry">遊戲內數據</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">電池</string> + <string name="bottom_telemetry_lap">圈數</string> + <string name="bottom_telemetry_position">名次</string> + <string name="bottom_telemetry_this_lap">本圈</string> + <string name="bottom_telemetry_last_lap">上一圈</string> + <string name="bottom_telemetry_fuel">燃料</string> + <string name="bottom_telemetry_cargo">貨物</string> + <string name="bottom_telemetry_pips">能量分配 SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">法律狀態</string> + <string name="bottom_telemetry_balance">餘額</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">連接埠 %1$d 正在接收資料(%2$d 個 %3$d 位元組的封包),但此頁面目前還無法讀取這種格式。</string> + <string name="bottom_telemetry_port_busy">其他程式已在使用連接埠 %1$s,因此該遊戲無法在此顯示。</string> <string name="rtinst_removing">正在移除 Linux 運行環境</string> <plurals name="rtinst_removing_entries"> @@ -1699,6 +1867,7 @@ <string name="flatpakmgr_not_ready">請先設定 Flatpak</string> <string name="flatpakmgr_starting">正在開始</string> <string name="flatpakmgr_exit_status">Flatpak 已結束,狀態為 %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s 是為 %2$s 建置的,DroidDeck 無法執行。這裡的 Flatpak 應用程式需要 ARM64 或 x86_64 版本。</string> <string name="flatpakmgr_installing">正在安裝 %1$s</string> <string name="flatpakmgr_updating">正在更新 %1$s</string> <string name="flatpakmgr_removing">正在移除 %1$s</string> @@ -1792,6 +1961,7 @@ <string name="adbpair_applying">正在套用設定…</string> <string name="adbpair_command_failed">無線偵錯指令失敗</string> <string name="adbpair_channel_name">無線偵錯設定</string> + <string name="adbpair_progress_channel_name">無線偵錯設定進度</string> <string name="adbpair_channel_description">在「系統設定」開啟時要求輸入無線偵錯配對碼</string> <string name="adbpair_title_pair">配對無線偵錯</string> <string name="adbpair_waiting_text">開啟無線偵錯,然後輕按「使用配對碼配對裝置」。</string> @@ -1997,6 +2167,7 @@ <string name="display_look_filter">%1$s 將縮放設為 %2$s。</string> <string name="display_match_screen">配合螢幕(%1$d×%2$d)</string> <string name="display_follow_screen">跟隨螢幕(摺疊或展開時調整大小)</string> + <string name="display_follow_screen_scaled">縮放 %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">顯示裝置詳情</string> <string name="device_info_hide">隱藏裝置詳情</string> @@ -2103,6 +2274,13 @@ <string name="stores_resume">繼續</string> <string name="stores_refresh">重新整理</string> <string name="stores_sort">排序</string> + <string name="setup_rail_labels">側邊欄標籤</string> + <string name="setup_rail_labels_hint">在側邊欄圖示下方顯示名稱。關閉可讓側邊欄更窄。</string> + <string name="library_display">顯示</string> + <string name="library_display_larger">較大卡片</string> + <string name="library_display_smaller">較小卡片</string> + <string name="library_display_title">顯示標題</string> + <string name="library_display_size">顯示大小</string> <string name="stores_sort_last_played">最近遊玩</string> <string name="stores_sort_recently_installed">最近安裝</string> <string name="stores_sort_title_asc">標題 A–Z</string> @@ -2229,6 +2407,9 @@ <string name="stores_download_manager">下載管理員</string> <string name="stores_parallel">同時下載數目</string> <string name="stores_install_where">安裝至</string> + <string name="stores_install_language">遊戲語言</string> + <string name="stores_install_language_hint">GOG 和 Epic 會安裝此語言。「系統」會跟隨應用程式語言。</string> + <string name="stores_install_language_system">系統</string> <string name="stores_install_title">安裝 %1$s:</string> <string name="stores_target_internal">內部儲存空間</string> <string name="stores_target_free">可用 %1$s</string> @@ -2267,6 +2448,9 @@ <string name="edit_target">目標</string> <string name="edit_start_in">開始位置</string> <string name="edit_launch_options">啟動選項</string> + <string name="edit_launch_options_steam_hint">與 Steam 的「內容」共用:在任一處更改,兩處都會更新。</string> + <string name="edit_launch_options_not_saved">無法將啟動選項儲存到 Steam。請再試一次。</string> + <string name="edit_launch_options_desktop">Steam 可能正在桌面會話中執行。請在 Steam 的「內容」中更改啟動選項,或先關閉該會話。</string> <string name="edit_artwork">圖片</string> <string name="edit_other_exe">其他 exe…</string> <string name="edit_remove">移除</string> @@ -2392,6 +2576,7 @@ <string name="setup_download_source_custom">自訂前綴</string> <string name="setup_download_mirror">站點</string> <string name="setup_download_prefix">前綴</string> + <string name="setup_download_proxy">HTTP Proxy</string> <string name="flathub_eyebrow">Linux 應用程式</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Linux 桌面的桌面應用程式,可從「桌面」開啟。</string> @@ -2530,6 +2715,22 @@ <string name="glasses_tracking_flat_hint">「自動」會令這款 2D 遊戲固定在視野中。如要使用頭部追蹤,請在「顯示」中選擇「虛擬螢幕」。</string> <string name="glasses_tracking_sbs_hint">頭部追蹤適用於虛擬螢幕或正在運行的 SteamVR 遊戲。</string> <string name="glasses_hardware">設備</string> + <string name="vr_controllers_tab">控制器</string> + <string name="vr_controllers_group">SteamVR 控制器</string> + <string name="vr_controllers_emulate">VR 中的控制器</string> + <string name="vr_controllers_emulate_hint">你的控制器所模擬的兩隻 VR 手。變更會即時生效,SteamVR 運行期間亦然。Joy-Con 和手部追蹤仍會接管各自對應的一側。</string> + <string name="vr_controllers_off">一般控制器</string> + <string name="vr_controllers_index">Valve Index 控制器</string> + <string name="vr_controllers_touch">Meta Quest 3 控制器</string> + <string name="vr_controllers_vive">HTC Vive 控制器</string> + <string name="vr_controllers_sticks">搖桿初始用途</string> + <string name="vr_controllers_sticks_hint">在 VR 中同時按下兩個搖桿即可切換。</string> + <string name="vr_controllers_sticks_game">在遊戲中移動</string> + <string name="vr_controllers_sticks_hands">移動雙手</string> + <string name="vr_controllers_buttons">按鈕</string> + <string name="vr_controllers_buttons_stick">扳機就是扳機,肩鍵為握持,A/B 和 X/Y 為各隻手的正面按鈕,按下搖桿即按下拇指搖桿,Guide 鍵開啟 SteamVR 選單。方向鍵上下可讓雙手拉近或推遠。</string> + <string name="vr_controllers_buttons_vive">搖桿作為觸控板使用;按 A/X 或按下搖桿即可按壓觸控板。扳機就是扳機,肩鍵為握持,Start 和 Select 為選單鍵,Guide 鍵開啟 SteamVR 選單。</string> + <string name="vr_controllers_buttons_off">不使用 VR 手。支援控制器的遊戲以及 SteamVR 選單會照常使用你的控制器。</string> <string name="glasses_brightness">亮度</string> <string name="glasses_volume">音量</string> <string name="glasses_sunblock">遮光</string> @@ -2587,6 +2788,12 @@ <string name="hand_camera_placement">相機位置</string> <string name="hand_camera_placement_hint">開始玩之前,請確認相機能看到你。</string> <string name="hand_camera_check">檢查</string> + <string name="tracking_pack_title">手部追蹤下載</string> + <string name="tracking_pack_hint">手部追蹤需要一次性下載 %1$s。</string> + <string name="tracking_pack_download">下載</string> + <string name="tracking_pack_retry">重試</string> + <string name="tracking_pack_downloading">正在下載手部追蹤… %1$d%%</string> + <string name="tracking_pack_failed">無法下載手部追蹤。請檢查網絡連線後再試一次。</string> <string name="hand_camera_check_title">相機位置</string> <string name="hand_camera_how_rear">將裝置立在距離 1.5 到 2 米、約胸口高度的地方,讓後置相機對著你。然後張開雙手走進畫面。</string> <string name="hand_camera_how_front">將裝置立在距離 1.5 到 2 米、約胸口高度的地方,讓螢幕對著你。然後張開雙手走進畫面。</string> @@ -2658,6 +2865,21 @@ <string name="storage_safe_hint">未使用的運行環境、殘留、舊記錄</string> <string name="storage_clean_up">清理…</string> <string name="storage_session_running">停止會話後才能清理或移除。容量仍會顯示。</string> + <string name="storage_default_group">安裝位置</string> + <string name="storage_default_title">預設儲存空間</string> + <string name="storage_default_hint">從商店新安裝的遊戲會安裝到所選位置。現有遊戲維持原位。Steam 收藏庫保有自己的設定。</string> + <string name="storage_default_ask">每次都詢問</string> + <string name="storage_default_ask_detail">每次安裝時選擇目標位置</string> + <string name="storage_default_internal">內部儲存空間</string> + <string name="storage_default_external">外部儲存空間</string> + <string name="storage_default_external_detail">%1$s · 可用 %2$s</string> + <string name="storage_default_external_missing">未連接</string> + <string name="storage_default_folder">資料夾 · %1$s</string> + <string name="storage_default_folder_free">可用 %1$s</string> + <string name="storage_default_folder_missing">未連接</string> + <string name="storage_default_choose_folder">選擇資料夾…</string> + <string name="storage_default_choose_folder_detail">使用 SD 卡或 USB 儲存裝置上的任何資料夾</string> + <string name="storage_default_note">遊戲會放在所選位置內的 Games 資料夾中。現有遊戲不會移動。</string> <string name="storage_where">空間去向</string> <string name="storage_games">Steam 遊戲</string> <string name="storage_game_data">遊戲資料</string> @@ -2779,6 +3001,9 @@ <string name="storage_data_installed">已安裝遊戲</string> <string name="storage_data_parts">前綴 %1$s · 著色器 %2$s · 工作坊 %3$s</string> <string name="storage_clear_shaders">清除著色器</string> + <string name="storage_reset_prefix">重設前綴</string> + <string name="storage_reset_prefix_title">要重設 %1$s 的前綴嗎?</string> + <string name="storage_reset_prefix_confirm">刪除位於 %2$s 中的 Wine 前綴(%1$s),並在下次啟動時重新建立。其中的存檔、設定和已安裝的可轉散發元件都會遺失;Steam Cloud 存檔仍保留在你的帳戶中。</string> <string name="storage_data_leftovers">已解除安裝遊戲</string> <string name="storage_steam_app">Steam 應用程式 %1$d</string> <string name="storage_leftover_unsure_detail">其前綴仍含檔案,其中可能有本機存檔</string> @@ -3077,6 +3302,113 @@ <string name="spatial_saved_views_hint">可以重新計算已儲存的視圖。開始新的校準以在當前追蹤座標系中捕獲。</string> <string name="spatial_model_checksum_error">手模型校驗與不匹配</string> <string name="spatial_opencv_load_error">OpenCV 無法載入</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">使用 Syncthing 同步</string> + <string name="sync_enable_hint">這是以 Syncthing-Fork 為基礎的 Syncthing 實作,可將 DroidDeck 內部檔案系統中的檔案與其他 Syncthing 實例同步。只適用於你存放在 DroidDeck 內部檔案系統中的檔案。</string> + <string name="sync_missing">此版本未包含 Syncthing。</string> + <string name="sync_starting">正在啟動 Syncthing</string> + <string name="sync_status_starting">正在啟動</string> + <string name="sync_status_up_to_date">已是最新</string> + <string name="sync_status_syncing">同步中</string> + <string name="sync_status_paused">已暫停</string> + <string name="sync_status_pausing">正在暫停</string> + <string name="sync_status_resuming">正在繼續</string> + <string name="sync_status_attention">需要處理</string> + <string name="sync_status_failed">Syncthing 已停止</string> + <string name="sync_failed_retry">再試一次</string> + <string name="sync_paused_wifi">已暫停,等待連接 Wi-Fi</string> + <string name="sync_paused_game">遊戲期間已暫停</string> + <string name="sync_summary">%1$d 個資料夾 · 已連接 %2$d/%3$d 部裝置</string> + <string name="sync_left">剩餘 %1$s</string> + <string name="sync_open_web_ui">開啟網頁介面</string> + <string name="sync_pause">暫停</string> + <string name="sync_resume">繼續</string> + <string name="sync_running">運行中</string> + <string name="sync_running_hint">關閉後將完全停止 Syncthing。</string> + <string name="sync_this_device">此裝置</string> + <string name="sync_device_id">裝置 ID</string> + <string name="sync_show_qr">顯示 QR 碼</string> + <string name="sync_advanced">進階</string> + <string name="sync_advanced_hint">連接埠、運行時機、重設</string> + <string name="sync_open">開啟</string> + <string name="sync_waiting">等待你處理</string> + <string name="sync_pending_device">%1$s 想要連接</string> + <string name="sync_pending_folder">%1$s 想要共用「%2$s」</string> + <string name="sync_pending_folder_hint">接受後即可選擇在 DroidDeck 中的儲存位置。</string> + <string name="sync_review">在網頁介面中檢視</string> + <string name="sync_folders">資料夾</string> + <string name="sync_no_folders">暫時沒有資料夾。</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">已是最新</string> + <string name="sync_folder_syncing">同步中 %1$d%%</string> + <string name="sync_folder_scanning">正在掃描</string> + <string name="sync_folder_paused">已暫停</string> + <string name="sync_folder_out_of_sync">未同步</string> + <string name="sync_folder_errors">%1$d 個檔案無法同步</string> + <string name="sync_folder_blocked">已封鎖</string> + <string name="sync_folder_blocked_hint">此資料夾位於 DroidDeck 的儲存空間之外,因此 DroidDeck 已將其暫停。若要同步 DroidDeck 以外的資料夾,請使用 Syncthing-Fork 應用程式。</string> + <string name="sync_remove_folder">從 Syncthing 移除</string> + <string name="sync_remove_folder_hint">移除後不會刪除任何檔案。</string> + <string name="sync_devices">裝置</string> + <string name="sync_no_devices">暫時沒有裝置。</string> + <string name="sync_connected">已連接</string> + <string name="sync_offline">離線</string> + <string name="sync_last_seen">上次在線:%1$s</string> + <string name="sync_device_id_title">此裝置的 ID</string> + <string name="sync_device_id_hint">在你的另一部裝置上,於 Syncthing 中新增裝置,然後掃描此 QR 碼或貼上 ID。接著在這裡的網頁介面中接受該裝置。</string> + <string name="sync_copy">複製</string> + <string name="sync_share">分享</string> + <string name="sync_done">完成</string> + <string name="sync_off_title">關閉 Syncthing?</string> + <string name="sync_off_body">Syncthing 會立即停止,並保持停止狀態,直至再次開啟為止。已同步的檔案會保留在原處。</string> + <string name="sync_off_forget">同時刪除 Syncthing 的設定</string> + <string name="sync_off_forget_hint">將移除此裝置的 ID、資料夾和裝置。再次開啟時會從頭開始。</string> + <string name="sync_turn_off">關閉</string> + <string name="sync_ports">連接埠</string> + <string name="sync_port_sync">同步</string> + <string name="sync_port_discovery">本地探索</string> + <string name="sync_repick">選擇新的連接埠</string> + <string name="sync_repick_hint">每次啟動時都會重新檢查。</string> + <string name="sync_repick_button">重新選擇</string> + <string name="sync_reset_group">重設</string> + <string name="sync_api_key">API 密鑰</string> + <string name="sync_regenerate">重新產生</string> + <string name="sync_reset">重設 Syncthing</string> + <string name="sync_reset_hint">將產生新的裝置 ID,並移除資料夾和裝置。DroidDeck 儲存空間中的檔案會保留。</string> + <string name="sync_reset_button">重設</string> + <string name="sync_reset_confirm_title">重設 Syncthing?</string> + <string name="sync_running_group">運行</string> + <string name="sync_run">運行時機</string> + <string name="sync_run_open">DroidDeck 開啟時</string> + <string name="sync_run_background">在背景運行</string> + <string name="sync_wifi_only">只限 Wi-Fi</string> + <string name="sync_pause_games">遊戲期間暫停</string> + <string name="sync_logs">記錄</string> + <string name="sync_logs_hint">此會話的 Syncthing 輸出</string> + <string name="sync_logs_share">分享</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">請先設定 Linux 運行環境。</string> + <string name="sync_accept">接受</string> + <string name="sync_accept_title">將「%1$s」儲存到</string> + <string name="sync_add_folder">新增資料夾</string> + <string name="sync_add_folder_hint">同步 DroidDeck 儲存空間中的資料夾</string> + <string name="sync_choose">選擇</string> + <string name="sync_add">新增</string> + <string name="sync_add_failed">無法新增該資料夾。</string> + <string name="sync_share_with">共用對象</string> + <string name="sync_share_none">暫時沒有裝置。你稍後可以從網頁介面共用此資料夾。</string> + <string name="sync_use_folder">使用此資料夾</string> + <string name="sync_new_folder">新資料夾</string> + <string name="sync_location_home">容器主目錄</string> + <string name="sync_location_sync">Sync 資料夾</string> + <string name="sync_location_shared">DroidDeck 共用儲存空間</string> + <string name="sync_location_card">%1$s 上的 DroidDeck</string> + <string name="sync_location_app">DroidDeck 應用程式資料</string> + <string name="sync_web_path_locked">新資料夾會儲存在 DroidDeck 的 Sync 資料夾中。若要同步其他 DroidDeck 資料夾,請在「Syncthing」分頁中使用「新增資料夾」。</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">重新載入</string> + <string name="sync_not_running">Syncthing 未在運行。</string> <string name="glasses_6dof">6DoF 虛擬螢幕</string> <string name="tracking_recovery_look">在光線充足的房間內緩慢環顧四周。\n不要遮擋追蹤攝影機,並面向家具等有明顯細節的物體。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> @@ -3107,6 +3439,12 @@ <string name="epic_client_open">開啟</string> <string name="epic_client_install">安裝</string> <string name="game_tab_about">關於</string> + <string name="game_resources_browser">在瀏覽器中開啟</string> + <string name="game_resource_guides">指南</string> + <string name="game_resource_protondb_detail">Linux / Proton 兼容性報告</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">適用於存檔儲存在 Steam 帳戶中的遊戲</string> + <string name="game_resource_search">網上搜尋</string> <string name="game_tab_install">安裝</string> <string name="game_install_location">位置</string> <string name="game_install_folder">資料夾</string> @@ -3123,6 +3461,11 @@ <string name="stores_eyebrow_pass">%1$s 可玩</string> <string name="stores_owned_in_library">收藏庫中已擁有的遊戲</string> <string name="library_filter_added">已加入</string> + <string name="library_filter">篩選</string> + <string name="library_filter_installed">僅限已安裝</string> + <string name="library_filter_all_owned">所有擁有的遊戲</string> + <string name="library_no_installed_matches">沒有符合這些篩選條件的已安裝遊戲。</string> + <string name="library_browse_owned">瀏覽擁有的遊戲</string> <string name="game_tab_launch">啟動</string> <string name="game_tab_saves_cloud">存檔及雲端</string> <string name="game_launch_shortcut">Steam 捷徑</string> @@ -3140,6 +3483,40 @@ <string name="stores_itch_update_replaced">開發者已將此版本替換為 %1$s。要更新到該版本嗎?</string> <string name="xbox_filter_cloud">雲端</string> <string name="stores_xbox_cloud_settings">雲端設定</string> + <string name="integration_title">Steam 整合</string> + <string name="integration_count">已開啟 %1$d/%2$d 項</string> + <string name="integration_set_up">設定</string> + <string name="integration_location">位置</string> + <string name="integration_app_info">應用程式資訊</string> + <string name="integration_wifi">Wi-Fi 名稱</string> + <string name="integration_brightness">亮度</string> + <string name="integration_home">將 DroidDeck 用作主畫面</string> + <string name="integration_shortcuts">系統按鍵</string> + <string name="integration_wifi_hint">在 Steam 中顯示網絡 · 需要位置存取權,絕不追蹤</string> + <string name="integration_wifi_on">網絡會顯示在 Steam 中</string> + <string name="integration_wifi_location_off">位置資訊已關閉</string> + <string name="integration_wifi_denied">位置存取遭拒 · 請在「應用程式資訊」中允許</string> + <string name="integration_brightness_hint">Steam 的滑桿會設定螢幕亮度</string> + <string name="integration_home_hint">在會話中,主畫面按鈕會開啟 Steam 選單</string> + <string name="integration_shortcuts_hint">Alt+Tab、Win 鍵和主頁鍵留在工作階段中</string> + <string name="integration_shortcuts_maybe_restricted">在 Android 中呈灰色?應用程式資訊 → ⋮ → 允許受限制的設定</string> + <string name="integration_shortcuts_restricted">已被 Android 封鎖 · 應用程式資訊 → ⋮ → 允許受限制的設定</string> + <string name="integration_shortcuts_service">DroidDeck 系統按鍵</string> + <string name="integration_shortcuts_service_description">讓 Alt+Tab、Win 鍵和主頁鍵在目前的 DroidDeck 工作階段中生效,而不是交給 Android。</string> + <string name="integration_brightness_needed">請在「初始設定 → Steam 整合」中開啟「亮度」</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK:自動</string> + <string name="setup_bridge_dxvk_proton">DXVK:Proton 內建</string> + <string name="setup_bridge_dxvk_auto_detail">此 GPU 的 Vulkan 版本對 Proton 內建的 DXVK 來說太舊時,改用較舊的 DXVK。</string> + <string name="setup_bridge_dxvk_proton_detail">每個 Proton 都使用內建的 DXVK,即使此 GPU 的 Vulkan 版本可能太舊。</string> + <string name="setup_gpu_bridge_off">Mali 橋接:關</string> + <string name="setup_gpu_bridge_on">Mali 橋接:開</string> + <string name="setup_gpu_bridge_detail">%1$s 不是 Adreno。實驗性 Vulkan 橋接已開啟:工作階段透過手機內建的驅動程式繪製。可能會有問題,請傳送工作階段記錄。</string> + <string name="setup_bridge_safe">安全模式</string> + <string name="setup_bridge_safe_on">安全模式:開</string> + <string name="setup_bridge_safe_off">安全模式:關</string> + <string name="setup_bridge_safe_on_detail">相容性最好。建議新裝置使用。</string> + <string name="setup_bridge_safe_off_detail">在此 GPU 通過檢查的地方較快。</string> <string name="apps_search_hint">搜尋應用程式</string> <string name="apps_no_match">沒有符合「%1$s」的應用程式。</string> <string name="apps_add_widget">新增小工具</string> @@ -3187,6 +3564,8 @@ <string name="desktop_restore_done_body">你加入的應用程式已重新安裝。</string> <string name="desktop_restore_failed_title">部分軟件無法還原</string> <string name="desktop_restore_failed_body">請查看 ~/.cache/droiddeck/apt-restore.log,然後在 Konsole 中嘗試 sudo apt install。</string> + <string name="gog_full_files">無法使用原生優化。下載內容包含完整的替換檔案。</string> + <string name="gog_recover">驗證修補結果</string> <string name="slow_usb_title">USB 連線速度慢</string> <string name="slow_usb_cable">%1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s),當中的遊戲載入會很慢。請使用 5 Gbps 或更快的 USB 3 線,嘗試反轉 USB-C 插頭,或使用更快的硬碟。</string> <string name="slow_usb_port">%1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s)。此裝置的 USB 埠無法更快,遊戲載入會很慢。內部儲存空間或 microSD 卡可能更快。</string> @@ -3197,4 +3576,55 @@ <string name="steam_import_names_more">%1$s 及另外 %2$d 款</string> <string name="steam_import_now">立即重新啟動</string> <string name="steam_import_later">稍後</string> + <string name="gog_maintenance">管理 GOG 安裝</string> + <string name="gog_check">檢查更新</string> + <string name="gog_repair">驗證/修復</string> + <string name="gog_patches">離線修補程式</string> + <string name="gog_refresh">下載完整離線安裝程式</string> + <string name="gog_update">更新至 %1$s</string> + <string name="gog_resume">繼續 GOG 維護</string> + <string name="gog_open_patch">開啟修補安裝程式</string> + <string name="gog_patch_in_session">請在 Linux 會話中完成或取消修補安裝程式。</string> + <string name="gog_patch_requirements">請選擇適用於已安裝版本和語言的修補程式。支援的來源版本可能未列出。</string> + <string name="gog_no_patches">GOG 沒有提供此遊戲的獨立 Windows 修補程式。</string> + <string name="gog_managed_files">修改過的遊戲檔案可能會被取代。</string> + <string name="gog_patch_installer_note">安裝程式會在你的 Linux 會話中開啟。</string> + <string name="gog_download_label">下載</string> + <string name="gog_space_label">額外空間</string> + <string name="gog_space_estimate_label">預估空間</string> + <string name="gog_repair_action">修復檔案</string> + <string name="gog_refresh_action">重新整理安裝</string> + <string name="gog_select_patch">選擇</string> + <string name="stores_gamejolt_not_owned">不在你的 Game Jolt 收藏庫中</string> + <string name="stores_gamejolt_no_build">這個遊戲沒有 Windows 下載</string> + <string name="stores_gamejolt_no_exe">下載內容中找不到 Windows 遊戲</string> + <string name="stores_gamejolt_no_game">在 Game Jolt 找不到這款遊戲</string> + <string name="stores_gamejolt_browse_failed">無法從 Game Jolt 載入遊戲</string> + <string name="stores_gamejolt_download_failed">Game Jolt 回應 HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">無法從 Game Jolt 載入下載內容</string> + <string name="stores_gamejolt_build_open">在 Game Jolt 開啟</string> + <string name="stores_gamejolt_archive">不支援 %1$s 壓縮檔</string> + <string name="stores_gamejolt_extract_failed">無法解壓下載內容(代碼 %1$d)</string> + <string name="stores_gamejolt_download_unreachable">無法連線至 Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt 沒有提供下載連結</string> + <string name="stores_gamejolt_section_featured">精選</string> + <string name="stores_gamejolt_section_hot">熱門</string> + <string name="stores_gamejolt_section_best">最佳</string> + <string name="stores_gamejolt_section_new">最新</string> + <string name="stores_gamejolt_price_under_30">30 美元或以下</string> + <string name="stores_gamejolt_os_other">其他</string> + <string name="stores_gamejolt_maturity_everyone">全年齡</string> + <string name="stores_gamejolt_maturity_teen">青少年</string> + <string name="stores_gamejolt_maturity_adult">成人</string> + <string name="stores_gamejolt_status_complete">已完成</string> + <string name="stores_gamejolt_status_early">搶先體驗</string> + <string name="stores_gamejolt_partners">合作夥伴遊戲</string> + <string name="stores_gamejolt_filter_browser">瀏覽器</string> + <string name="stores_gamejolt_filter_maturity">內容分級</string> + <string name="stores_gamejolt_filter_status">狀態</string> + <string name="stores_gamejolt_filter_partners">合作夥伴</string> + <string name="stores_gamejolt_followed">已追蹤的遊戲</string> + <string name="setup_gpu_bridged">GPU 透過 Mali 橋接</string> + <string name="gpuinfo_bridge">透過 Mali 橋接執行,使用手機內建的 Vulkan 驅動程式</string> + <string name="gpuinfo_bridge_off">關閉 Mali 橋接時不受支援:Turnip 需要 Adreno(Snapdragon)GPU</string> </resources> diff --git a/app/src/main/res/values-zh-rTW/gestures.xml b/app/src/main/res/values-zh-rTW/gestures.xml index 7841fe7b48..551fab20d8 100644 --- a/app/src/main/res/values-zh-rTW/gestures.xml +++ b/app/src/main/res/values-zh-rTW/gestures.xml @@ -71,7 +71,7 @@ <string name="gesture_key_backspace">退格</string> <string name="gesture_key_enter">Enter</string> <string name="gesture_key_tab">Tab</string> - <string name="gesture_key_space">Space</string> + <string name="gesture_key_space">空白鍵</string> <string name="gesture_key_delete">刪除</string> <string name="gesture_key_insert">插入</string> <string name="gesture_key_home">Home</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d8aba91922..3065f3a452 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -81,13 +81,17 @@ <string name="game_env_vkd3d_config">D3D12 的 VKD3D 選項。nodxr 會停用光線追蹤;僅在遊戲需要時使用。</string> <string name="game_env_proton_log">設定為 1 以產生 Proton 診斷日誌。記錄日誌可能降低效能並佔用儲存空間。</string> <string name="game_env_wined3d">設定為 1,使用基於 OpenGL 的 WineD3D 代替 DXVK,用於 D3D9–11 相容性測試。</string> + <string name="game_env_wined3d_renderer">DirectDraw、Direct3D 1-7 及透過 WineD3D 執行之遊戲的轉譯器。Vulkan 會略過 OpenGL-on-Zink 路徑,在 Adreno 上執行舊款 DirectDraw 和 Direct3D 7 遊戲時快得多。</string> + <string name="game_env_dxvk_d3d8">設定為 1 以透過 DXVK 而非 WineD3D 執行 Direct3D 8。在 Adreno 上的 AIO Graphics Test Direct3D 8 測試中速度較快。</string> <string name="game_env_no_ntsync">設為 1 可讓此遊戲不使用 ntsync(droiddeck-ntsync 或核心驅動程式);有對應套件時改用 droiddeck-esync,否則使用 droiddeck-fsync。</string> <string name="game_env_no_esync">設為 1 可為此遊戲關閉 droiddeck-esync;改用 droiddeck-fsync,若 fsync 也已關閉則使用 droiddeck-ntsync。</string> <string name="game_env_no_fsync">設為 1 可讓此遊戲不使用 droiddeck-fsync;有對應套件時改用 droiddeck-esync,否則使用 droiddeck-ntsync。</string> <string name="game_env_fsync_first">設為 1 讓此遊戲使用 droiddeck-fsync;設為 0 則在有適用其 Proton 的套件時優先使用 droiddeck-esync。</string> <string name="game_env_xalia">設定為 0,為此遊戲停用 Proton 的手把導覽輔助程式。</string> + <string name="game_env_anticheat_offline">預設為開啟。當遊戲支援離線遊玩時,以不載入反作弊的方式啟動 Easy Anti-Cheat 遊戲。關閉後會照常透過 Easy Anti-Cheat 啟動。需要 Easy Anti-Cheat 的線上模式仍然無法使用。</string> <string name="game_env_hud">D3D9–11 的 DXVK 重疊層。fps 顯示影格率;取消設定則隱藏重疊層。</string> <string name="game_env_dxvk_config">以分號分隔的 DXVK 設定。近期版本使用 dxvk.maxFrameRate 限制影格率;日常遊玩建議使用工作階段影格率限制器。</string> + <string name="game_env_cores">此遊戲使用的 CPU 核心,例如 0-4 或 0,2,4,用來取代工作階段的遊戲核心。核心越少,溫度越低。</string> <string name="game_env_vkd3d_limit">D3D12 影格率限制。0 表示停用限制。</string> <string name="game_env_glthread">Mesa OpenGL 多執行緒。對於 CPU 受限的 OpenGL 遊戲,true 可能有所幫助;請按遊戲分別測試。</string> <string name="sync_backend_title">Wine 同步</string> @@ -175,6 +179,8 @@ <string name="app_fex_hint">FEX 可在這部 ARM64 裝置上執行 x86 Linux 程式。「自動」會在程式為 x86 組建時使用 FEX。</string> <string name="app_fex_x86">透過 FEX 執行 %1$s</string> <string name="app_fex_not_ready">此程式是為 %1$s 電腦組建的,需透過 FEX 執行,但 FEX 尚未設定。請在登入狀態下開啟一次 Steam:DroidDeck 會讓它下載 FEX 和所需的 Steam Linux Runtime,之後就能開啟此程式。</string> + <string name="session_proot_missing">無法下載 DroidDeck 的 proot。請檢查連線後再試一次。工作階段未啟動,因為備用 proot 太慢,無法用來玩遊戲。</string> + <string name="session_directaudio_missing">無法下載 DirectAudio,因此本次工作階段的遊戲音訊會使用較慢的路徑。</string> <string name="session_end_program">此程式</string> <string name="session_end_steam_download">無法下載 Steam 用戶端。你的網路或 VPN 可能封鎖了 Steam 的伺服器;請檢查連線後再試一次。</string> <string name="session_end_steam_setup">無法設定 Steam 用戶端。請檢查連線和可用儲存空間,然後再試一次。</string> @@ -293,6 +299,13 @@ <string name="mode_controller_x360">Xbox 360 控制器</string> <string name="mode_controller_note">Deck:提供快速存取按鈕和陀螺儀。Xbox 360:使用 Guide+A 開啟快速存取。</string> <string name="mode_back">返回</string> + <string name="back_hold">長按返回鍵使用 Steam 快捷操作</string> + <string name="back_hold_hint">長按返回鍵開啟快速存取,或與其他按鍵組成 Steam 組合鍵。關閉後忽略長按;輕觸和輕觸兩下仍然有效。</string> + <string name="back_native_qam_hint">按住返回鍵 700 毫秒,或按住返回鍵並按下其他按鈕以使用 Steam 快速鍵。</string> + <string name="back_double_tap_window">連按兩下間隔</string> + <string name="back_tap_ms">%1$d 毫秒</string> + <string name="brightness_permission_title">允許控制亮度</string> + <string name="brightness_permission_text">在 DroidDeck 中設定亮度控制。</string> <string name="back_menu_then_qam">選單 → QAM</string> <string name="back_qam_then_menu">QAM → 選單</string> <string name="mode_session">工作階段</string> @@ -305,8 +318,8 @@ <string name="mode_background_downloads_hint">Steam 正在下載時,延後在背景暫停。</string> <string name="mode_suspend_note">「自動」會在背景時暫停,並在重新顯示時繼續。「手動」會等你點擊「繼續」。「從不」則會持續執行。</string> <string name="mode_startup">啟動</string> - <string name="mode_steam_startup">隨 DroidDeck 啟動 Steam</string> - <string name="mode_steam_startup_hint">DroidDeck 啟動時開啟 Steam 工作階段。</string> + <string name="mode_startup_session">啟動時開啟</string> + <string name="mode_startup_session_hint">DroidDeck 啟動時開始此工作階段。</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">正在檢查發行版本…</string> <string name="mode_decky_ready">已準備好安裝 %1$s。</string> @@ -316,6 +329,12 @@ <string name="mode_decky_current">已是最新 · %1$s</string> <string name="mode_decky_loader">載入器</string> <string name="mode_decky_install_latest">安裝最新版本</string> + <string name="decky_channel">更新頻道</string> + <string name="decky_channel_hint">要安裝哪一種 Decky Loader 版本。Decky 本身的更新程式也會使用相同的頻道。</string> + <string name="decky_channel_stable">穩定版</string> + <string name="decky_channel_prerelease">預先發行版</string> + <string name="decky_channel_testing">測試版</string> + <string name="decky_channel_failed">無法儲存 Decky 更新頻道</string> <string name="mode_decky_on">隨 Steam 啟動。啟用後,此裝置上的其他應用程式可能可以控制 Steam。</string> <string name="mode_decky_off">關閉。Steam 的遠端偵錯連接埠保持關閉。</string> <string name="mode_decky_remove_title">解除安裝 Decky Loader?</string> @@ -325,6 +344,8 @@ <string name="mode_mangoapp_hint">如果 Deck 模式下遊戲崩潰或黑畫面,請關閉此項。下次工作階段生效。</string> <string name="mode_return_after_game">遊戲結束後返回 DroidDeck</string> <string name="mode_return_after_game_hint">從 DroidDeck 或其他啟動器啟動的遊戲關閉後,Steam 會正常退出(先完成雲端存檔同步),並返回啟動位置。關閉:留在 Steam 中。</string> + <string name="mode_shader_precache">著色器預先快取</string> + <string name="mode_shader_precache_hint">Steam 會為你的遊戲下載預先編譯的著色器並在背景處理,讓遊戲較不卡頓。關閉可節省數據用量、儲存空間和電量;遊戲則會改為在執行時編譯著色器。與 Steam 的「下載」>「著色器預先快取」為同一個設定。下次工作階段生效。</string> <string name="mode_steam_repair">修復 Steam 用戶端</string> <string name="mode_steam_repair_hint">下次啟動 Steam 時重新下載 Steam 用戶端。如果 Steam 一直停在載入畫面,請使用此功能。遊戲、登入狀態和設定都會保留。</string> <string name="mode_steam_repair_queued">下次啟動 Steam 時會重新下載 Steam 用戶端。</string> @@ -391,6 +412,8 @@ <string name="mode_directaudio_hint">繞過 PulseAudio 以降低延遲。</string> <string name="mode_mic">麥克風</string> <string name="mode_mic_hint">用於語音聊天。</string> + <string name="drawer_mic_hint">為此工作階段開啟或關閉麥克風收音。</string> + <string name="drawer_mic_failed">無法變更麥克風設定,請再試一次。</string> <string name="mode_network">網路</string> <string name="mode_wifi_discovery">Wi-Fi 探索</string> <string name="mode_wifi_discovery_hint">在 Steam 中顯示 Wi-Fi 名稱和附近的網路。</string> @@ -551,6 +574,16 @@ <string name="perf_gsrealtime">gamescope:即時 GPU 佇列</string> <string name="perf_gsrealtime_hint">提高合成器 GPU 工作的優先順序。可能改善影格時間穩定性,但會佔用一部分遊戲效能。</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">記憶體</string> + <string name="perf_cap_off">關閉</string> + <string name="perf_cap_auto">驅動程式預設值</string> + <string name="perf_zram_client">遊戲執行時壓縮 Steam</string> + <string name="perf_zram_client_hint">遊戲啟動 20 秒後,Steam 用戶端會被壓縮到 zRAM,為遊戲騰出更多記憶體,並在遊戲關閉時讀回。如果工作階段在遊戲啟動後不久就關閉,請關閉此選項。若超過上方的 RAM 上限,工作階段仍會壓縮 Steam。</string> + <string name="perf_ram_cap">RAM 上限</string> + <string name="perf_ram_cap_hint">在 Steam 用戶端執行時生效,無論是 Steam 模式或從桌面啟動。當工作階段的用量超過此值時,會先將 Steam、再將工作階段中其他受支援的程序壓縮到 zRAM。這是軟性上限:不會關閉任何程式,但在分頁讀回時遊戲可能會卡頓。</string> + <string name="perf_ram_cap_unavailable">需要 zRAM 交換空間,但這部裝置沒有。</string> + <string name="perf_vram_cap">VRAM 上限</string> + <string name="perf_vram_cap_hint">DXVK 向 Direct3D 遊戲回報的顯示記憶體,讓遊戲以較少的量規劃紋理。遊戲本身的 DXVK 設定仍優先。下次工作階段生效。</string> <string name="perf_gpuclock">讓 GPU 保持最高頻率</string> <string name="perf_gpuclock_hint">僅適用於 Adreno。卡頓更少,但耗電和發熱更多。</string> <string name="perf_fixes">工作階段修復</string> @@ -569,6 +602,8 @@ <string name="perf_fastpath">proot 快速路徑</string> <string name="perf_fastpath_needs_seccomp">需要 proot 的 seccomp 篩選器。</string> <string name="perf_fastpath_hint">檔案尋找更快、卡頓更少。如果程式找不到檔案,請關閉此項。</string> + <string name="perf_cursor_composite">在 gamescope 內繪製游標</string> + <string name="perf_cursor_composite_hint">由 Gamescope 自行繪製指標,而不交給 Android。若要用手把控制游標,請開啟此項。在手機上關閉會比較快。下次工作階段生效。</string> <string name="perf_identity">工作階段身分</string> <string name="perf_hostname">主機名稱</string> <string name="perf_hostname_hint">Steam 看到的此裝置名稱。留空可還原為 %1$s。</string> @@ -583,6 +618,8 @@ <string name="driver_delete_plain">其檔案會從應用程式中移除。</string> <string name="driver_delete_in_use">其檔案會被移除。由於正在使用中,因此會改用預設驅動程式。</string> <string name="drawer_page_display">顯示</string> + <string name="drawer_frame_limit">影格率限制</string> + <string name="drawer_frame_limit_note">限制此遊戲的影格率。若有能被此上限整除的螢幕更新率,顯示器會切換至該更新率;其他上限可能看起來不平順。Steam 遊戲請使用快速存取選單中 Steam 的影格率限制。</string> <string name="drawer_page_effects">效果</string> <string name="drawer_page_controls">控制</string> <string name="drawer_page_components">元件</string> @@ -614,8 +651,11 @@ <string name="hud_size_pill">膠囊</string> <string name="hud_size_minimal">極簡</string> <string name="hud_size_mega">超大</string> + <string name="hud_size_strip">橫條</string> <string name="hud_locked">鎖定位置</string> <string name="hud_locked_hint">拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。</string> + <string name="hud_snap">貼齊兩側</string> + <string name="hud_snap_hint">放開 HUD 後,它會移到螢幕較近的一側。輕甩可將它甩向該方向。</string> <string name="hud_group_look">外觀</string> <string name="hud_scale">螢幕顯示大小</string> <string name="hud_color_soft">柔和</string> @@ -664,7 +704,6 @@ <string name="hud_export_failed">無法儲存 HUD 報告。</string> <string name="hud_reset">重設 HUD 設定</string> <string name="hud_reset_button">重設</string> - <string name="hud_credit">FusionHUD,作者 The412Banner,github.com/The412Banner/FusionHUD (GPL-3.0)。</string> <string name="drawer_scaling">縮放模式</string> <string name="drawer_scaling_sharpness">縮放銳利度</string> <string name="drawer_effects">畫面效果</string> @@ -699,11 +738,17 @@ <string name="drawer_touch_auto">自動(%1$s)</string> <string name="drawer_keyboard">鍵盤</string> <string name="drawer_latency">延遲</string> + <string name="drawer_low_latency">低延遲模式</string> + <string name="drawer_low_latency_hint">會增加 CPU 和電池用量</string> <string name="drawer_low_latency_controller">低延遲控制器</string> <string name="drawer_low_latency_controller_hint">控制器以 1000 Hz 而非 250 Hz 回報。CPU 使用率略高。</string> <string name="drawer_low_latency_touch">低延遲觸控</string> <string name="drawer_low_latency_touch_hint">觸控略過影格合併,Steam 觸控以 1000 Hz 回報。CPU 使用率略高。</string> <string name="drawer_evdev_mouse">原生滑鼠通道</string> + <string name="drawer_relative_mouse">相對滑鼠</string> + <string name="drawer_relative_mouse_auto">自動</string> + <string name="drawer_relative_mouse_on">開</string> + <string name="drawer_relative_mouse_off">關</string> <string name="drawer_direct_cursor">游標</string> <string name="drawer_pc_keyboard">電腦鍵盤</string> <string name="drawer_android_keyboard">Android</string> @@ -790,6 +835,10 @@ <string name="setup_session">工作階段</string> <string name="setup_logs">工作階段日誌</string> <string name="setup_logs_hint">每次工作階段結束後儲存</string> + <string name="setup_game_debug_logs">遊戲偵錯日誌</string> + <string name="setup_game_debug_logs_hint">在下次啟動遊戲時加入 Proton、Wine 和圖形診斷資訊。可能降低效能並佔用更多儲存空間。</string> + <string name="setup_game_debug_logs_restart">重新啟動此工作階段以儲存遊戲偵錯日誌</string> + <string name="setup_logging_update_failed">無法更新日誌設定。請檢查開關後再試一次。</string> <string name="setup_agent_commands">偵錯工具</string> <string name="setup_latest_logs">最新工作階段日誌</string> <string name="setup_saved_logs">已儲存的工作階段日誌</string> @@ -821,20 +870,22 @@ <string name="setup_home">用作主螢幕</string> <string name="setup_home_on">DroidDeck 可以作為主螢幕應用程式</string> <string name="setup_home_off">DroidDeck 不會作為主螢幕應用程式提供</string> + <string name="setup_home_game_space_first">請在「新增遊戲」中將 DroidDeck 設為「包含」</string> <string name="setup_orientation">螢幕方向</string> + <string name="setup_launcher_orientation">啟動器方向</string> + <string name="setup_launcher_orientation_auto">跟隨裝置旋轉</string> + <string name="setup_orientation_portrait">直向</string> + <string name="setup_session_orientation">工作階段方向</string> + <string name="setup_session_orientation_hint">套用至 Steam、遊戲、桌面和控制器編輯器。解析度預設會隨工作階段旋轉;自訂的寬度和高度則維持輸入值。</string> <string name="setup_orientation_auto">自動橫向</string> <string name="setup_orientation_landscape">橫向</string> <string name="setup_orientation_reverse">反向橫向</string> <string name="setup_fullscreen">全螢幕</string> <string name="setup_fullscreen_on">隱藏 Android 狀態列和導覽列</string> <string name="setup_fullscreen_off">顯示 Android 狀態列和導覽列</string> - <string name="setup_dual_screen">雙螢幕</string> - <string name="setup_dual_screen_hint">自動:在內建第二個螢幕的掌機上使用該螢幕。開啟:使用任何第二個顯示器。關閉:所有內容只顯示在一個螢幕上。</string> <string name="setup_dual_screen_auto">自動</string> <string name="setup_dual_screen_on">開啟</string> <string name="setup_dual_screen_off">關閉</string> - <string name="setup_dual_screen_menu">下螢幕選單</string> - <string name="setup_dual_screen_menu_hint">將各個區塊和遊戲內選單移到第二個螢幕並在那裡輸入,讓上螢幕保持完整畫面。L2 和 R2 切換區塊。</string> <string name="setup_dual_screen_controls">遊戲中的下螢幕控制</string> <string name="setup_dual_screen_controls_hint">工作階段開始時在第二個螢幕上開啟觸控板和鍵盤。</string> <string name="dual_typing_title">正在為上螢幕輸入</string> @@ -983,6 +1034,14 @@ <string name="gate_step1">開啟「Android 設定」→「開發人員選項」→「無線偵錯」,並將其開啟</string> <string name="gate_step2">點擊「使用配對碼配對裝置」</string> <string name="gate_step3">將配對碼輸入 DroidDeck 通知中</string> + <string name="pairguide_build_number">在「關於手機」中輕觸「版本號碼」7 次</string> + <string name="pairguide_wireless">開啟「無線偵錯」</string> + <string name="pairguide_pair">開啟「無線偵錯」,然後輕觸「使用配對碼配對裝置」</string> + <string name="pairguide_child_process">開啟「停止限制子處理程序」</string> + <string name="pairguide_row_child_process">停止限制子處理程序</string> + <string name="pairguide_row_build_number">版本號碼</string> + <string name="pairguide_row_wireless">無線偵錯</string> + <string name="pairguide_row_pair">使用配對碼配對裝置</string> <string name="gate_waiting">正在等待配對彈出視窗…</string> <string name="gate_code_needed">已找到彈出視窗。請將其中的配對碼輸入通知。</string> <string name="gate_status">狀態</string> @@ -1121,7 +1180,6 @@ <string name="games_never_played">從未執行</string> <string name="games_runtime_busy_percent">執行環境繁忙 · %1$d%%</string> <string name="games_runtime_busy">執行環境繁忙</string> - <string name="games_runtime_first_play">首次點擊「執行」時安裝執行環境</string> <string name="games_runtime_update">執行環境有可用更新</string> <string name="games_runtime_ready">● 執行環境已就緒</string> <string name="games_internal">內部儲存空間</string> @@ -1138,6 +1196,9 @@ <string name="gpu_hide_other">隱藏其他 GPU 的驅動程式</string> <string name="gpu_show_other">顯示其他 GPU 的驅動程式</string> <string name="gpu_advanced">進階</string> + <string name="gpu_ubwc_title">UBWC 相容性</string> + <string name="gpu_ubwc_hint">如果 Steam 或 Android 出現條紋或閃爍,請試試開啟或關閉。重新啟動 DroidDeck 後會套用到兩種驅動程式。</string> + <string name="gpu_ubwc_restart">重新啟動 DroidDeck 以套用。</string> <string name="gpu_set_with_display">與顯示驅動程式一起設定:%1$s 同時包含兩者。</string> <string name="gpu_set_with_runtime">與執行環境驅動程式一起設定:%1$s 同時包含兩者。</string> <string name="gpu_runtime_hint">供遊戲和桌面使用。</string> @@ -1246,10 +1307,15 @@ <string name="pip_auto">自動進入子母畫面</string> <string name="unfolded_controls">展開螢幕時的控制</string> <string name="unfolded_controls_hint">展開時,遊戲會顯示在 Steam Deck 觸控板和背面握把上方。摺疊時,遊戲以全螢幕顯示。</string> + <string name="unfolded_controls_with_controller">連接手把時也保留</string> + <string name="unfolded_controls_with_controller_hint">連接手把時也顯示這些觸控按鍵。</string> <string name="pip_suspended">已暫停</string> <string name="pip_not_ready">工作階段準備就緒後即可使用子母畫面。</string> <string name="pip_permission">請在 Android 設定中允許 DroidDeck 使用子母畫面。</string> <string name="pip_unavailable">Android 無法開啟子母畫面。</string> + <string name="game_more">更多</string> + <string name="game_edit_art">編輯圖片</string> + <string name="stores_in_steam_label">在 Steam 中</string> <string name="game_shortcut">捷徑</string> <string name="game_shortcut_add">新增至主螢幕</string> <string name="game_shortcut_choose">選擇遊戲</string> @@ -1273,6 +1339,10 @@ <string name="main_wait_runtime">請等待執行環境作業完成</string> <string name="main_wait_proton_install">請等待相容性工具安裝完成</string> + <string name="load_compat_title">正在準備相容工具</string> + <string name="load_compat_wait">正在等待相容性設定完成</string> + <string name="load_compat_hint">設定完成後,工作階段就會啟動。</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">請等待桌面應用程式安裝完成</string> <string name="main_wait_install_game">請等待安裝完成後再啟動遊戲</string> <string name="main_saves_close_session">請先關閉 Steam 工作階段,以免遊戲存檔覆蓋匯入的內容</string> @@ -1305,6 +1375,9 @@ <string name="main_install_anyway">仍要安裝</string> <string name="main_remove_runtime_title">移除 Linux 執行環境</string> <string name="main_remove_runtime_text">這會刪除執行環境、其中的 Steam 用戶端,以及安裝在其中的所有遊戲。</string> + <string name="runtime_actions_title">Linux 執行環境</string> + <string name="runtime_actions_text">「修復」會重新安裝執行環境的系統檔案,並保留 Steam、遊戲和設定。桌面等額外元件會在下次使用時重新安裝。「移除」會刪除所有內容。</string> + <string name="runtime_repair">修復執行環境</string> <string name="main_applied">已套用:%1$s</string> <string name="android_app_open_failed_primary">無法在主螢幕上開啟 %1$s</string> <string name="android_app_open_failed_on">無法在 %2$s 上開啟 %1$s</string> @@ -1431,6 +1504,10 @@ <string name="session_runtime_catalog_unreachable">無法連線到執行環境目錄。請檢查網路連線,然後再按一次「執行」。</string> <string name="session_runtime_install_failed">Linux 執行環境未能安裝。請在「設定」中檢查執行環境,然後再按一次「執行」。</string> <string name="session_desktop_install_failed">桌面未能安裝(%1$s)。請檢查網路連線,然後再按一次「桌面」。</string> + <string name="session_package_resume_failed">無法完成先前中斷的安裝(%1$s)。請檢查網路連線和儲存空間,然後再試一次。</string> + <plurals name="session_end_runtime_damaged"> + <item quantity="other">Linux 執行環境已損壞:%1$d 個程式庫連結指向不存在的檔案(%2$s 等),通常是安裝中斷所致。修復會保留你的遊戲和設定。</item> + </plurals> <string name="session_ended_named">%1$s 意外停止。請在錯誤報告中附上日誌,或再試一次。</string> <string name="session_ended_program">程式意外停止。請在錯誤報告中附上日誌,或再試一次。</string> <string name="session_ended_desktop">桌面意外停止。請在錯誤報告中附上日誌,或再試一次。</string> @@ -1444,6 +1521,12 @@ <string name="mode_decky_plugins_hint">安裝外掛程式 ZIP,供下次 Steam 工作階段使用。</string> <string name="mode_decky_plugin_downloading">正在下載…</string> <string name="mode_decky_plugin_install_zip">從 ZIP 安裝</string> + <string name="decky_zip_warning_title">安裝第三方外掛程式</string> + <string name="decky_zip_warning_text">Decky Loader 團隊尚未審查此外掛程式。它可能含有惡意軟體,例如竊取你的 Steam 帳戶或損害裝置的軟體。安裝此外掛程式即表示你同意自行承擔裝置的一切風險。</string> + <string name="decky_zip_warning_continue">繼續</string> + <plurals name="decky_zip_warning_wait"> + <item quantity="other">請稍候 %1$d 秒</item> + </plurals> <string name="store_cat_games">遊戲</string> <string name="store_cat_audio_video">影音</string> <string name="store_cat_graphics">圖形</string> @@ -1499,7 +1582,7 @@ <string name="pckb_key_ctrl">Ctrl</string> <string name="pckb_key_super">Super</string> <string name="pckb_key_alt">Alt</string> - <string name="pckb_key_space">Space</string> + <string name="pckb_key_space">空白鍵</string> <string name="pckb_key_altgr">AltGr</string> <string name="second_key_tab">Tab</string> <string name="second_key_on">%1$s ✓</string> @@ -1600,6 +1683,8 @@ <string name="fm_accept">接受</string> <string name="fm_decline">拒絕</string> <string name="fm_drive_not_readable">%1$s 已掛載,但目前無法讀取</string> + <string name="fm_drive_access_title">允許存取 %1$s</string> + <string name="fm_drive_access_text">Android 允許 DroidDeck 看到這個磁碟,但不允許讀取。請為 DroidDeck 開啟「所有檔案存取權」,然後返回。</string> <string name="fm_list_view">清單檢視</string> <string name="fm_grid_view">格狀檢視</string> <string name="fm_search">搜尋</string> @@ -1670,6 +1755,89 @@ <string name="second_mode_keyboard_trackpad">鍵盤 + 觸控板</string> <string name="second_mode_terminal">終端機</string> <string name="second_mode_deck_controls">Deck 握把 + 觸控板</string> + <string name="second_mode_dashboard">儀表板</string> + <string name="bottom_dashboard_empty">目前沒有可顯示的內容。</string> + <string name="bottom_page_downloads">下載</string> + <string name="bottom_downloads_none">沒有進行中的下載。</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">正在下載著色器快取</string> + <string name="bottom_downloads_paused">已暫停</string> + <string name="bottom_downloads_queued">等待開始</string> + <string name="bottom_page_notifications">通知</string> + <string name="bottom_notifications_listener">DroidDeck 底部螢幕</string> + <string name="bottom_notifications_why">在遊玩時於此處顯示訊息和其他通知。通知只會顯示在這個螢幕上,不會儲存。Android 只會詢問一次:通知存取權頁面會在這個螢幕上開啟,在那裡開啟 DroidDeck 後,就會自動回到此頁面。</string> + <string name="bottom_notifications_allow">允許通知存取權</string> + <string name="bottom_notifications_none">沒有通知。</string> + <string name="bottom_notifications_count">%1$d 則通知</string> + <string name="bottom_notifications_clear">清除</string> + <string name="bottom_page_screenshots">螢幕擷取畫面</string> + <string name="stats_fps_needs_hud">顯示 FPS 需要開啟 HUD</string> + <string name="stats_speed">速度</string> + <string name="stats_pedals">踏板</string> + <string name="stats_gforce">G 力</string> + <string name="stats_timing">計時</string> + <string name="stats_best_lap">最佳單圈</string> + <string name="stats_tires">輪胎 °C</string> + <string name="stats_trace">油門和煞車,最近 10 s</string> + <string name="stats_speed_chart">速度,%1$s</string> + <string name="stats_gear">檔位</string> + <string name="stats_steam_client_arm">Steam 用戶端 ARM</string> + <string name="stats_steam_client_x86">Steam 用戶端 x86</string> + <string name="stats_throttle">油門</string> + <string name="stats_brake">煞車</string> + <string name="stats_lights">儀表指示燈</string> + <string name="stats_lamp_shift">換檔</string> + <string name="stats_lamp_handbrake">手煞車</string> + <string name="stats_lamp_pit">維修區限速</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">渦輪 %1$s bar</string> + <string name="stats_engine_temp">引擎 %1$s °C</string> + <string name="stats_oil_temp">機油 %1$s °C</string> + <string name="stats_power">能量分配器</string> + <string name="stats_fuel_t">燃料,t</string> + <string name="stats_fuel_main">主油箱 %1$s t</string> + <string name="stats_fuel_reserve">備用 %1$s t</string> + <string name="bottom_telemetry_send_title">傳送儀表板資料</string> + <string name="bottom_telemetry_send_auto">自動</string> + <string name="bottom_telemetry_send_auto_hint">為這裡列出的所有遊戲開啟,包括之後找到的遊戲。你關閉的遊戲會維持關閉。</string> + <string name="bottom_telemetry_send_note">這會變更遊戲本身的資料輸出設定。將在遊戲下次啟動時生效;關閉後會還原為原本的設定。</string> + <string name="bottom_telemetry_send_close">請先關閉 %1$s 再變更此項。</string> + <string name="bottom_telemetry_send_failed">無法變更 %1$s 的設定。</string> + <string name="bottom_telemetry_send_menu">%1$s:請在遊戲設定中開啟 %2$s,IP 設為 127.0.0.1,連接埠設為 %3$d。</string> + <string name="bottom_shots_where">儲存至 Pictures/DroidDeck。Steam 螢幕擷取畫面也會顯示在這裡。</string> + <string name="bottom_shots_take">擷取螢幕畫面</string> + <string name="bottom_shots_saved">已儲存螢幕擷取畫面。</string> + <string name="bottom_shots_failed">無法擷取螢幕畫面。</string> + <string name="bottom_shots_none">尚無螢幕擷取畫面。</string> + <string name="bottom_page_chat">聊天和語音</string> + <string name="bottom_chat_why">遊戲在主螢幕上持續執行的同時,在此閱讀和回覆 Steam 聊天。會使用 Steam 目前登入的帳戶。</string> + <string name="bottom_chat_not_signed_in">Steam 目前還沒有可共用的網頁登入狀態,請在此登入一次。</string> + <string name="bottom_chat_stopped">DroidDeck 在背景執行時,Android 關閉了聊天頁面。回到 DroidDeck 後會重新開啟。</string> + <string name="bottom_chat_open">開啟 Steam 聊天</string> + <string name="bottom_chat_close">關閉聊天</string> + <string name="bottom_chat_mic_on">麥克風已開啟</string> + <string name="bottom_chat_mic_off">麥克風已關閉</string> + <string name="bottom_chat_mic_unavailable">此遊戲的麥克風已關閉。若要說話,請在 DroidDeck 的 Steam 設定(音訊)中開啟麥克風,然後重新啟動遊戲。</string> + <string name="bottom_chat_volume">音量 %1$d%%</string> + <string name="bottom_page_telemetry">遊戲內數據</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">電池</string> + <string name="bottom_telemetry_lap">圈數</string> + <string name="bottom_telemetry_position">名次</string> + <string name="bottom_telemetry_this_lap">本圈</string> + <string name="bottom_telemetry_last_lap">上一圈</string> + <string name="bottom_telemetry_fuel">燃料</string> + <string name="bottom_telemetry_cargo">貨物</string> + <string name="bottom_telemetry_pips">能量分配 SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">法律狀態</string> + <string name="bottom_telemetry_balance">餘額</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">連接埠 %1$d 正在接收資料(%2$d 個 %3$d 位元組的封包),但此頁面目前還無法讀取這種格式。</string> + <string name="bottom_telemetry_port_busy">其他程式已在使用連接埠 %1$s,因此該遊戲無法在此顯示。</string> <string name="rtinst_removing">正在移除 Linux 執行環境</string> <plurals name="rtinst_removing_entries"> @@ -1699,6 +1867,7 @@ <string name="flatpakmgr_not_ready">請先設定 Flatpak</string> <string name="flatpakmgr_starting">正在啟動</string> <string name="flatpakmgr_exit_status">Flatpak 已結束,狀態碼 %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s 是為 %2$s 建置的,DroidDeck 無法執行。這裡的 Flatpak 應用程式需要 ARM64 或 x86_64 版本。</string> <string name="flatpakmgr_installing">正在安裝 %1$s</string> <string name="flatpakmgr_updating">正在更新 %1$s</string> <string name="flatpakmgr_removing">正在移除 %1$s</string> @@ -1792,6 +1961,7 @@ <string name="adbpair_applying">正在套用設定…</string> <string name="adbpair_command_failed">無線偵錯指令失敗</string> <string name="adbpair_channel_name">無線偵錯設定</string> + <string name="adbpair_progress_channel_name">無線偵錯設定進度</string> <string name="adbpair_channel_description">在「Android 設定」開啟時要求輸入無線偵錯配對碼</string> <string name="adbpair_title_pair">配對無線偵錯</string> <string name="adbpair_waiting_text">開啟無線偵錯,然後點擊「使用配對碼配對裝置」。</string> @@ -1997,6 +2167,7 @@ <string name="display_look_filter">%1$s 將縮放設為 %2$s。</string> <string name="display_match_screen">符合螢幕(%1$d×%2$d)</string> <string name="display_follow_screen">跟隨螢幕(摺疊或展開時調整大小)</string> + <string name="display_follow_screen_scaled">縮放 %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">顯示裝置詳細資料</string> <string name="device_info_hide">隱藏裝置詳細資料</string> @@ -2103,6 +2274,13 @@ <string name="stores_resume">繼續</string> <string name="stores_refresh">重新整理</string> <string name="stores_sort">排序</string> + <string name="setup_rail_labels">側邊欄標籤</string> + <string name="setup_rail_labels_hint">在側邊欄圖示下方顯示名稱。關閉可讓側邊欄更窄。</string> + <string name="library_display">顯示</string> + <string name="library_display_larger">較大的卡片</string> + <string name="library_display_smaller">較小的卡片</string> + <string name="library_display_title">顯示標題</string> + <string name="library_display_size">顯示大小</string> <string name="stores_sort_last_played">最近遊玩</string> <string name="stores_sort_recently_installed">最近安裝</string> <string name="stores_sort_title_asc">標題 A–Z</string> @@ -2229,6 +2407,9 @@ <string name="stores_download_manager">下載管理員</string> <string name="stores_parallel">同時下載數</string> <string name="stores_install_where">安裝到</string> + <string name="stores_install_language">遊戲語言</string> + <string name="stores_install_language_hint">GOG 和 Epic 會安裝此語言。「系統」會跟隨應用程式語言。</string> + <string name="stores_install_language_system">系統</string> <string name="stores_install_title">安裝 %1$s:</string> <string name="stores_target_internal">內部</string> <string name="stores_target_free">可用 %1$s</string> @@ -2267,6 +2448,9 @@ <string name="edit_target">目標</string> <string name="edit_start_in">開始位置</string> <string name="edit_launch_options">啟動選項</string> + <string name="edit_launch_options_steam_hint">與 Steam 的「內容」共用:在任一處變更,兩處都會更新。</string> + <string name="edit_launch_options_not_saved">無法將啟動選項儲存至 Steam。請再試一次。</string> + <string name="edit_launch_options_desktop">Steam 可能正在桌面工作階段中執行。請在 Steam 的「內容」中變更啟動選項,或先關閉該工作階段。</string> <string name="edit_artwork">圖片</string> <string name="edit_other_exe">其他 exe…</string> <string name="edit_remove">移除</string> @@ -2392,6 +2576,7 @@ <string name="setup_download_source_custom">自訂前綴</string> <string name="setup_download_mirror">站點</string> <string name="setup_download_prefix">前綴</string> + <string name="setup_download_proxy">HTTP Proxy</string> <string name="flathub_eyebrow">LINUX 應用程式</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">適用於 Linux 桌面的應用程式,從「桌面」開啟。</string> @@ -2530,6 +2715,22 @@ <string name="glasses_tracking_flat_hint">「自動」會讓這款 2D 遊戲固定在視野中。如要使用頭部追蹤,請在「顯示」中選擇「虛擬螢幕」。</string> <string name="glasses_tracking_sbs_hint">頭部追蹤適用於虛擬螢幕或執行中的 SteamVR 遊戲。</string> <string name="glasses_hardware">設備</string> + <string name="vr_controllers_tab">控制器</string> + <string name="vr_controllers_group">SteamVR 控制器</string> + <string name="vr_controllers_emulate">VR 中的手把</string> + <string name="vr_controllers_emulate_hint">你的手把所模擬的兩隻 VR 手。變更會立即生效,SteamVR 執行時也一樣。Joy-Con 和手部追蹤仍會接管各自對應的一側。</string> + <string name="vr_controllers_off">一般手把</string> + <string name="vr_controllers_index">Valve Index 控制器</string> + <string name="vr_controllers_touch">Meta Quest 3 控制器</string> + <string name="vr_controllers_vive">HTC Vive 控制器</string> + <string name="vr_controllers_sticks">搖桿初始用途</string> + <string name="vr_controllers_sticks_hint">在 VR 中同時按下兩個搖桿即可切換。</string> + <string name="vr_controllers_sticks_game">在遊戲中移動</string> + <string name="vr_controllers_sticks_hands">移動雙手</string> + <string name="vr_controllers_buttons">按鈕</string> + <string name="vr_controllers_buttons_stick">扳機就是扳機,肩鍵為握持,A/B 和 X/Y 為各隻手的正面按鈕,按下搖桿即按下拇指搖桿,Guide 鍵開啟 SteamVR 選單。方向鍵上下可讓雙手拉近或推遠。</string> + <string name="vr_controllers_buttons_vive">搖桿作為觸控板使用;按 A/X 或按下搖桿即可按壓觸控板。扳機就是扳機,肩鍵為握持,Start 和 Select 為選單鍵,Guide 鍵開啟 SteamVR 選單。</string> + <string name="vr_controllers_buttons_off">不使用 VR 手。支援手把的遊戲以及 SteamVR 選單會照常使用你的手把。</string> <string name="glasses_brightness">亮度</string> <string name="glasses_volume">音量</string> <string name="glasses_sunblock">遮光</string> @@ -2587,6 +2788,12 @@ <string name="hand_camera_placement">相機位置</string> <string name="hand_camera_placement_hint">開始遊玩前,請確認相機能看到你。</string> <string name="hand_camera_check">檢查</string> + <string name="tracking_pack_title">手部追蹤下載</string> + <string name="tracking_pack_hint">手部追蹤需要一次性下載 %1$s。</string> + <string name="tracking_pack_download">下載</string> + <string name="tracking_pack_retry">重試</string> + <string name="tracking_pack_downloading">正在下載手部追蹤… %1$d%%</string> + <string name="tracking_pack_failed">無法下載手部追蹤。請檢查網路連線後再試一次。</string> <string name="hand_camera_check_title">相機位置</string> <string name="hand_camera_how_rear">將裝置立在距離 1.5 到 2 公尺、約胸口高度的地方,讓後置相機對著你。然後張開雙手走進畫面。</string> <string name="hand_camera_how_front">將裝置立在距離 1.5 到 2 公尺、約胸口高度的地方,讓螢幕對著你。然後張開雙手走進畫面。</string> @@ -2658,6 +2865,21 @@ <string name="storage_safe_hint">未使用的執行環境、殘留、舊日誌</string> <string name="storage_clean_up">清理…</string> <string name="storage_session_running">停止工作階段後才能清理或移除。容量仍會顯示。</string> + <string name="storage_default_group">安裝位置</string> + <string name="storage_default_title">預設儲存空間</string> + <string name="storage_default_hint">從商店新安裝的遊戲會安裝到所選位置。現有遊戲維持原位。Steam 收藏庫保有自己的設定。</string> + <string name="storage_default_ask">每次都詢問</string> + <string name="storage_default_ask_detail">每次安裝時選擇目標位置</string> + <string name="storage_default_internal">內部儲存空間</string> + <string name="storage_default_external">外部儲存空間</string> + <string name="storage_default_external_detail">%1$s · 可用 %2$s</string> + <string name="storage_default_external_missing">未連接</string> + <string name="storage_default_folder">資料夾 · %1$s</string> + <string name="storage_default_folder_free">可用 %1$s</string> + <string name="storage_default_folder_missing">未連接</string> + <string name="storage_default_choose_folder">選擇資料夾…</string> + <string name="storage_default_choose_folder_detail">使用 SD 卡或 USB 隨身碟上的任何資料夾</string> + <string name="storage_default_note">遊戲會放在所選位置內的 Games 資料夾中。現有遊戲不會移動。</string> <string name="storage_where">空間去向</string> <string name="storage_games">Steam 遊戲</string> <string name="storage_game_data">遊戲資料</string> @@ -2779,6 +3001,9 @@ <string name="storage_data_installed">已安裝遊戲</string> <string name="storage_data_parts">前綴 %1$s · 著色器 %2$s · 工作坊 %3$s</string> <string name="storage_clear_shaders">清除著色器</string> + <string name="storage_reset_prefix">重設前綴</string> + <string name="storage_reset_prefix_title">要重設 %1$s 的前綴嗎?</string> + <string name="storage_reset_prefix_confirm">刪除位於 %2$s 中的 Wine 前綴(%1$s),並在下次啟動時重新建立。其中的存檔、設定和已安裝的可轉散發套件都會遺失;Steam Cloud 存檔仍保留在你的帳戶中。</string> <string name="storage_data_leftovers">已解除安裝遊戲</string> <string name="storage_steam_app">Steam 應用程式 %1$d</string> <string name="storage_leftover_unsure_detail">其前綴仍含檔案,其中可能有本機存檔</string> @@ -3077,6 +3302,113 @@ <string name="spatial_saved_views_hint">可以重新計算已儲存的視圖。開始新的校準以在當前追蹤座標系中捕獲。</string> <string name="spatial_model_checksum_error">手模型校驗與不匹配</string> <string name="spatial_opencv_load_error">OpenCV 無法載入</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">使用 Syncthing 同步</string> + <string name="sync_enable_hint">這是以 Syncthing-Fork 為基礎的 Syncthing 實作,可將 DroidDeck 內部檔案系統中的檔案與其他 Syncthing 執行個體同步。僅適用於你存放在 DroidDeck 內部檔案系統中的檔案。</string> + <string name="sync_missing">此版本未包含 Syncthing。</string> + <string name="sync_starting">正在啟動 Syncthing</string> + <string name="sync_status_starting">正在啟動</string> + <string name="sync_status_up_to_date">已是最新</string> + <string name="sync_status_syncing">同步中</string> + <string name="sync_status_paused">已暫停</string> + <string name="sync_status_pausing">正在暫停</string> + <string name="sync_status_resuming">正在繼續</string> + <string name="sync_status_attention">需要處理</string> + <string name="sync_status_failed">Syncthing 已停止</string> + <string name="sync_failed_retry">再試一次</string> + <string name="sync_paused_wifi">已暫停,等待連上 Wi-Fi</string> + <string name="sync_paused_game">遊戲期間已暫停</string> + <string name="sync_summary">%1$d 個資料夾 · 已連線 %2$d/%3$d 部裝置</string> + <string name="sync_left">剩餘 %1$s</string> + <string name="sync_open_web_ui">開啟網頁介面</string> + <string name="sync_pause">暫停</string> + <string name="sync_resume">繼續</string> + <string name="sync_running">執行中</string> + <string name="sync_running_hint">關閉後將完全停止 Syncthing。</string> + <string name="sync_this_device">此裝置</string> + <string name="sync_device_id">裝置 ID</string> + <string name="sync_show_qr">顯示 QR 碼</string> + <string name="sync_advanced">進階</string> + <string name="sync_advanced_hint">連接埠、執行時機、重設</string> + <string name="sync_open">開啟</string> + <string name="sync_waiting">等待你處理</string> + <string name="sync_pending_device">%1$s 想要連線</string> + <string name="sync_pending_folder">%1$s 想要共用「%2$s」</string> + <string name="sync_pending_folder_hint">接受後即可選擇在 DroidDeck 中的儲存位置。</string> + <string name="sync_review">在網頁介面中檢視</string> + <string name="sync_folders">資料夾</string> + <string name="sync_no_folders">尚無資料夾。</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">已是最新</string> + <string name="sync_folder_syncing">同步中 %1$d%%</string> + <string name="sync_folder_scanning">正在掃描</string> + <string name="sync_folder_paused">已暫停</string> + <string name="sync_folder_out_of_sync">未同步</string> + <string name="sync_folder_errors">%1$d 個檔案無法同步</string> + <string name="sync_folder_blocked">已封鎖</string> + <string name="sync_folder_blocked_hint">此資料夾位於 DroidDeck 的儲存空間之外,因此 DroidDeck 已將其暫停。若要同步 DroidDeck 以外的資料夾,請使用 Syncthing-Fork 應用程式。</string> + <string name="sync_remove_folder">從 Syncthing 移除</string> + <string name="sync_remove_folder_hint">移除後不會刪除任何檔案。</string> + <string name="sync_devices">裝置</string> + <string name="sync_no_devices">尚無裝置。</string> + <string name="sync_connected">已連線</string> + <string name="sync_offline">離線</string> + <string name="sync_last_seen">上次上線:%1$s</string> + <string name="sync_device_id_title">此裝置的 ID</string> + <string name="sync_device_id_hint">在你的另一部裝置上,於 Syncthing 中新增裝置,然後掃描此 QR 碼或貼上 ID。接著在這裡的網頁介面中接受該裝置。</string> + <string name="sync_copy">複製</string> + <string name="sync_share">分享</string> + <string name="sync_done">完成</string> + <string name="sync_off_title">要關閉 Syncthing 嗎?</string> + <string name="sync_off_body">Syncthing 會立即停止,並維持停止狀態,直到再次開啟為止。已同步的檔案會保留在原處。</string> + <string name="sync_off_forget">同時刪除 Syncthing 的設定</string> + <string name="sync_off_forget_hint">將移除此裝置的 ID、資料夾和裝置。再次開啟時會從頭開始。</string> + <string name="sync_turn_off">關閉</string> + <string name="sync_ports">連接埠</string> + <string name="sync_port_sync">同步</string> + <string name="sync_port_discovery">本機探索</string> + <string name="sync_repick">選擇新的連接埠</string> + <string name="sync_repick_hint">每次啟動時都會重新檢查。</string> + <string name="sync_repick_button">重新選擇</string> + <string name="sync_reset_group">重設</string> + <string name="sync_api_key">API 金鑰</string> + <string name="sync_regenerate">重新產生</string> + <string name="sync_reset">重設 Syncthing</string> + <string name="sync_reset_hint">將產生新的裝置 ID,並移除資料夾和裝置。DroidDeck 儲存空間中的檔案會保留。</string> + <string name="sync_reset_button">重設</string> + <string name="sync_reset_confirm_title">要重設 Syncthing 嗎?</string> + <string name="sync_running_group">執行</string> + <string name="sync_run">執行時機</string> + <string name="sync_run_open">DroidDeck 開啟時</string> + <string name="sync_run_background">在背景執行</string> + <string name="sync_wifi_only">僅限 Wi-Fi</string> + <string name="sync_pause_games">遊戲期間暫停</string> + <string name="sync_logs">日誌</string> + <string name="sync_logs_hint">此工作階段的 Syncthing 輸出</string> + <string name="sync_logs_share">分享</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">請先設定 Linux 執行環境。</string> + <string name="sync_accept">接受</string> + <string name="sync_accept_title">將「%1$s」儲存到</string> + <string name="sync_add_folder">新增資料夾</string> + <string name="sync_add_folder_hint">同步 DroidDeck 儲存空間中的資料夾</string> + <string name="sync_choose">選擇</string> + <string name="sync_add">新增</string> + <string name="sync_add_failed">無法新增該資料夾。</string> + <string name="sync_share_with">共用對象</string> + <string name="sync_share_none">尚無裝置。你之後可以從網頁介面共用此資料夾。</string> + <string name="sync_use_folder">使用此資料夾</string> + <string name="sync_new_folder">新資料夾</string> + <string name="sync_location_home">容器家目錄</string> + <string name="sync_location_sync">Sync 資料夾</string> + <string name="sync_location_shared">DroidDeck 共用儲存空間</string> + <string name="sync_location_card">%1$s 上的 DroidDeck</string> + <string name="sync_location_app">DroidDeck 應用程式資料</string> + <string name="sync_web_path_locked">新資料夾會儲存在 DroidDeck 的 Sync 資料夾中。若要同步其他 DroidDeck 資料夾,請在「Syncthing」分頁中使用「新增資料夾」。</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">重新載入</string> + <string name="sync_not_running">Syncthing 未在執行。</string> <string name="glasses_6dof">6DoF 虛擬螢幕</string> <string name="tracking_recovery_look">在光線充足的房間內緩慢環顧四周。\n不要遮擋追蹤攝影機,並面向家具等有明顯細節的物體。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> @@ -3107,6 +3439,12 @@ <string name="epic_client_open">開啟</string> <string name="epic_client_install">安裝</string> <string name="game_tab_about">關於</string> + <string name="game_resources_browser">在瀏覽器中開啟</string> + <string name="game_resource_guides">指南</string> + <string name="game_resource_protondb_detail">Linux / Proton 相容性報告</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">適用於存檔儲存在 Steam 帳戶中的遊戲</string> + <string name="game_resource_search">網路搜尋</string> <string name="game_tab_install">安裝</string> <string name="game_install_location">位置</string> <string name="game_install_folder">資料夾</string> @@ -3123,6 +3461,11 @@ <string name="stores_eyebrow_pass">%1$s 可玩</string> <string name="stores_owned_in_library">收藏庫中已擁有的遊戲</string> <string name="library_filter_added">已加入</string> + <string name="library_filter">篩選</string> + <string name="library_filter_installed">僅限已安裝</string> + <string name="library_filter_all_owned">所有擁有的遊戲</string> + <string name="library_no_installed_matches">沒有符合這些篩選條件的已安裝遊戲。</string> + <string name="library_browse_owned">瀏覽擁有的遊戲</string> <string name="game_tab_launch">啟動</string> <string name="game_tab_saves_cloud">存檔與雲端</string> <string name="game_launch_shortcut">Steam 捷徑</string> @@ -3140,6 +3483,40 @@ <string name="stores_itch_update_replaced">開發者已將此版本替換為 %1$s。要更新到該版本嗎?</string> <string name="xbox_filter_cloud">雲端</string> <string name="stores_xbox_cloud_settings">雲端設定</string> + <string name="integration_title">Steam 整合</string> + <string name="integration_count">已開啟 %1$d/%2$d 項</string> + <string name="integration_set_up">設定</string> + <string name="integration_location">位置</string> + <string name="integration_app_info">應用程式資訊</string> + <string name="integration_wifi">Wi-Fi 名稱</string> + <string name="integration_brightness">亮度</string> + <string name="integration_home">將 DroidDeck 設為主畫面</string> + <string name="integration_shortcuts">系統按鍵</string> + <string name="integration_wifi_hint">在 Steam 中顯示網路 · 需要位置存取權,絕不追蹤</string> + <string name="integration_wifi_on">網路會顯示在 Steam 中</string> + <string name="integration_wifi_location_off">位置資訊已關閉</string> + <string name="integration_wifi_denied">位置存取遭拒 · 請在「應用程式資訊」中允許</string> + <string name="integration_brightness_hint">Steam 的滑桿會設定螢幕亮度</string> + <string name="integration_home_hint">在工作階段中,主畫面按鈕會開啟 Steam 選單</string> + <string name="integration_shortcuts_hint">Alt+Tab、Win 鍵和主畫面鍵留在工作階段中</string> + <string name="integration_shortcuts_maybe_restricted">在 Android 中呈灰色?應用程式資訊 → ⋮ → 允許受限制的設定</string> + <string name="integration_shortcuts_restricted">已被 Android 封鎖 · 應用程式資訊 → ⋮ → 允許受限制的設定</string> + <string name="integration_shortcuts_service">DroidDeck 系統按鍵</string> + <string name="integration_shortcuts_service_description">讓 Alt+Tab、Win 鍵和主畫面鍵在目前的 DroidDeck 工作階段中生效,而不是交給 Android。</string> + <string name="integration_brightness_needed">請在「初始設定 → Steam 整合」中開啟「亮度」</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK:自動</string> + <string name="setup_bridge_dxvk_proton">DXVK:Proton 內建</string> + <string name="setup_bridge_dxvk_auto_detail">此 GPU 的 Vulkan 版本對 Proton 內建的 DXVK 來說太舊時,改用較舊的 DXVK。</string> + <string name="setup_bridge_dxvk_proton_detail">每個 Proton 都使用內建的 DXVK,即使此 GPU 的 Vulkan 版本可能太舊。</string> + <string name="setup_gpu_bridge_off">Mali 橋接:關</string> + <string name="setup_gpu_bridge_on">Mali 橋接:開</string> + <string name="setup_gpu_bridge_detail">%1$s 不是 Adreno。實驗性 Vulkan 橋接已開啟:工作階段透過手機內建的驅動程式繪製。可能會有問題,請傳送工作階段記錄。</string> + <string name="setup_bridge_safe">安全模式</string> + <string name="setup_bridge_safe_on">安全模式:開</string> + <string name="setup_bridge_safe_off">安全模式:關</string> + <string name="setup_bridge_safe_on_detail">相容性最好。建議新裝置使用。</string> + <string name="setup_bridge_safe_off_detail">在此 GPU 通過檢查的地方較快。</string> <string name="apps_search_hint">搜尋應用程式</string> <string name="apps_no_match">沒有符合「%1$s」的應用程式。</string> <string name="apps_add_widget">新增小工具</string> @@ -3187,6 +3564,8 @@ <string name="desktop_restore_done_body">你加入的應用程式已重新安裝。</string> <string name="desktop_restore_failed_title">部分軟體無法還原</string> <string name="desktop_restore_failed_body">請查看 ~/.cache/droiddeck/apt-restore.log,然後在 Konsole 中嘗試 sudo apt install。</string> + <string name="gog_full_files">無法使用原生最佳化。下載內容包含完整的替換檔案。</string> + <string name="gog_recover">驗證修補結果</string> <string name="slow_usb_title">USB 連線速度慢</string> <string name="slow_usb_cable">%1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s),其中的遊戲載入會很慢。請使用 5 Gbps 或更快的 USB 3 傳輸線,試著翻轉 USB-C 插頭,或使用更快的硬碟。</string> <string name="slow_usb_port">%1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s)。此裝置的 USB 連接埠無法更快,遊戲載入會很慢。內部儲存空間或 microSD 卡可能更快。</string> @@ -3197,4 +3576,55 @@ <string name="steam_import_names_more">%1$s 及另外 %2$d 款</string> <string name="steam_import_now">立即重新啟動</string> <string name="steam_import_later">稍後</string> + <string name="gog_maintenance">管理 GOG 安裝</string> + <string name="gog_check">檢查更新</string> + <string name="gog_repair">驗證/修復</string> + <string name="gog_patches">離線修補程式</string> + <string name="gog_refresh">下載完整離線安裝程式</string> + <string name="gog_update">更新至 %1$s</string> + <string name="gog_resume">繼續 GOG 維護</string> + <string name="gog_open_patch">開啟修補安裝程式</string> + <string name="gog_patch_in_session">請在 Linux 工作階段中完成或取消修補安裝程式。</string> + <string name="gog_patch_requirements">請選擇適用於已安裝版本和語言的修補程式。支援的來源版本可能未列出。</string> + <string name="gog_no_patches">GOG 沒有提供這款遊戲的獨立 Windows 修補程式。</string> + <string name="gog_managed_files">修改過的遊戲檔案可能會被取代。</string> + <string name="gog_patch_installer_note">安裝程式會在你的 Linux 工作階段中開啟。</string> + <string name="gog_download_label">下載</string> + <string name="gog_space_label">額外空間</string> + <string name="gog_space_estimate_label">預估空間</string> + <string name="gog_repair_action">修復檔案</string> + <string name="gog_refresh_action">重新整理安裝</string> + <string name="gog_select_patch">選取</string> + <string name="stores_gamejolt_not_owned">不在你的 Game Jolt 收藏庫中</string> + <string name="stores_gamejolt_no_build">這個遊戲沒有 Windows 下載</string> + <string name="stores_gamejolt_no_exe">下載內容中找不到 Windows 遊戲</string> + <string name="stores_gamejolt_no_game">在 Game Jolt 找不到這款遊戲</string> + <string name="stores_gamejolt_browse_failed">無法從 Game Jolt 載入遊戲</string> + <string name="stores_gamejolt_download_failed">Game Jolt 回應 HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">無法從 Game Jolt 載入下載內容</string> + <string name="stores_gamejolt_build_open">在 Game Jolt 開啟</string> + <string name="stores_gamejolt_archive">不支援 %1$s 壓縮檔</string> + <string name="stores_gamejolt_extract_failed">無法解壓縮下載內容(代碼 %1$d)</string> + <string name="stores_gamejolt_download_unreachable">無法連線至 Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt 未提供下載連結</string> + <string name="stores_gamejolt_section_featured">精選</string> + <string name="stores_gamejolt_section_hot">熱門</string> + <string name="stores_gamejolt_section_best">最佳</string> + <string name="stores_gamejolt_section_new">最新</string> + <string name="stores_gamejolt_price_under_30">30 美元或以下</string> + <string name="stores_gamejolt_os_other">其他</string> + <string name="stores_gamejolt_maturity_everyone">全年齡</string> + <string name="stores_gamejolt_maturity_teen">青少年</string> + <string name="stores_gamejolt_maturity_adult">成人</string> + <string name="stores_gamejolt_status_complete">已完成</string> + <string name="stores_gamejolt_status_early">搶先體驗</string> + <string name="stores_gamejolt_partners">合作夥伴遊戲</string> + <string name="stores_gamejolt_filter_browser">瀏覽器</string> + <string name="stores_gamejolt_filter_maturity">內容分級</string> + <string name="stores_gamejolt_filter_status">狀態</string> + <string name="stores_gamejolt_filter_partners">合作夥伴</string> + <string name="stores_gamejolt_followed">已追蹤的遊戲</string> + <string name="setup_gpu_bridged">GPU 透過 Mali 橋接</string> + <string name="gpuinfo_bridge">透過 Mali 橋接執行,使用手機內建的 Vulkan 驅動程式</string> + <string name="gpuinfo_bridge_off">關閉 Mali 橋接時不受支援:Turnip 需要 Adreno(Snapdragon)GPU</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8515c297a6..21231e223b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,6 +31,10 @@ <string name="steamvr_recovery_restarting">Resetting graphics and reopening SteamVR…</string> <string name="steamvr_recovery_failed">DroidDeck could not restart automatically. Close the app completely, then reopen it.</string> <string name="app_name">DroidDeck</string> + <string name="steam_wall_label" translatable="false">DroidDeck Wall</string> + <string name="wall_settings_fps" translatable="false">Frame rate (fps)</string> + <string name="wall_settings_match" translatable="false">Match screen</string> + <string name="wall_settings_speed" translatable="false">Scroll speed</string> <string-array name="loading_hints"> <item>First run downloads Steam. This may take a few minutes.</item> <item>By default, leaving the app pauses Steam; it picks up where it left off when you come back.</item> @@ -323,6 +327,8 @@ <string name="mode_controller_x360">Xbox 360 controller</string> <string name="mode_controller_note">Deck: Quick Access button and gyro. Steam Controller: the same, with grip sense on the back buttons. DualShock 4 and DualSense: gyro, and the trackpads as their touchpad. Xbox 360: open Quick Access with Guide+A.</string> <string name="mode_back">Back</string> + <string name="back_hold">Hold Back for Steam shortcuts</string> + <string name="back_hold_hint">Holding Back opens Quick Access or makes Steam chords with other buttons. Turn off to ignore held Back; tap and double-tap still work.</string> <string name="back_native_qam_hint">Hold Back for 700 ms, or hold Back and press another button for Steam shortcuts.</string> <string name="back_double_tap_window">Double-tap window</string> <string name="back_tap_ms">%1$d ms</string> @@ -340,8 +346,8 @@ <string name="mode_background_downloads_hint">Delay background suspension while Steam is actively downloading.</string> <string name="mode_suspend_note">Auto pauses in the background and resumes when shown. Manual waits for Resume. Never keeps running.</string> <string name="mode_startup">Startup</string> - <string name="mode_steam_startup">Start Steam with DroidDeck</string> - <string name="mode_steam_startup_hint">Opens the Steam session when DroidDeck launches.</string> + <string name="mode_startup_session">Open at launch</string> + <string name="mode_startup_session_hint">Starts this session when DroidDeck launches.</string> <string name="mode_decky">Decky</string> <string name="mode_decky_checking">Checking for releases…</string> <string name="mode_decky_ready">Ready to install %1$s.</string> @@ -452,6 +458,22 @@ <string name="mode_storage_internal">Internal only</string> <string name="mode_storage_folder">Folder: %1$s</string> <string name="mode_second_library">Second library</string> + <string name="libraries_title">More Steam libraries</string> + <string name="libraries_hint">Folders Steam can install to and play from, each under its own name. Removing one keeps its games on disk.</string> + <string name="libraries_add">Add library</string> + <string name="libraries_rename">Rename</string> + <string name="libraries_rename_title">Library name</string> + <string name="libraries_pick">Choose a folder for the library</string> + <string name="libraries_full">At most %1$d added libraries</string> + <string name="libraries_overlap">That folder is already a library or inside one</string> + <string name="libraries_missing">%1$s · not available</string> + <string name="libraries_applies_next">Applies from the next Steam session</string> + <string name="libraries_found_hint">Found on this device · %1$s · %2$s</string> + <string name="libraries_add_found">Add</string> + <string name="libraries_access_title">Find libraries on internal storage</string> + <string name="libraries_access_hint">Allow all files access so DroidDeck can see Steam libraries other apps keep on internal storage</string> + <string name="libraries_access_allow">Allow</string> + <string name="libraries_used_inner">Added %1$s, the Steam library inside the folder you chose</string> <string name="mode_storage_note">Games that stream assets from SD or shared storage may stutter.</string> <string name="mode_storage_diagnostics">Storage diagnostics</string> <string name="mode_storage_diagnostics_hint">Record allocation results and sampled storage timings in Share logs. May slow installs while enabled. Applies next session.</string> @@ -675,8 +697,11 @@ <string name="hud_size_pill">Pill</string> <string name="hud_size_minimal">Minimal</string> <string name="hud_size_mega">Mega</string> + <string name="hud_size_strip">Strip</string> <string name="hud_locked">Lock in place</string> <string name="hud_locked_hint">Drag the HUD to move it; a long press locks or unlocks it. While it is locked, on-screen controls under it still work.</string> + <string name="hud_snap">Snap to sides</string> + <string name="hud_snap_hint">Let go of the HUD and it moves to the nearer side of the screen. A flick throws it that way.</string> <string name="hud_group_look">Look</string> <string name="hud_scale">Size on screen</string> <string name="hud_color_soft">Soft</string> @@ -725,7 +750,6 @@ <string name="hud_export_failed">Couldn\'t save the HUD report.</string> <string name="hud_reset">Reset HUD settings</string> <string name="hud_reset_button">Reset</string> - <string name="hud_credit">FusionHUD by The412Banner, github.com/The412Banner/FusionHUD (GPL-3.0).</string> <string name="drawer_scaling">Scaling mode</string> <string name="drawer_scaling_sharpness">Scaling sharpness</string> <string name="drawer_effects">Screen effects</string> @@ -791,6 +815,10 @@ <string name="drawer_low_latency_touch">Low-latency touch</string> <string name="drawer_low_latency_touch_hint">Touches skip frame batching; Steam touch controls at 1000 Hz. Slightly more CPU.</string> <string name="drawer_evdev_mouse">Raw mouse channel</string> + <string name="drawer_relative_mouse">Relative mouse</string> + <string name="drawer_relative_mouse_auto">Auto</string> + <string name="drawer_relative_mouse_on">On</string> + <string name="drawer_relative_mouse_off">Off</string> <string name="drawer_direct_cursor">Cursor</string> <string name="drawer_pc_keyboard">PC keyboard</string> <string name="drawer_android_keyboard">Android</string> @@ -852,6 +880,7 @@ <string name="setup_gpu_supported">Device supported</string> <string name="setup_gpu_untested">Untested GPU</string> <string name="setup_gpu_unsupported">GPU not supported</string> + <string name="setup_gpu_bridged">GPU via Mali bridge</string> <string name="setup_gpu_detail">%1$s · %2$s</string> <string name="setup_gpu_untested_detail">%1$s: %2$s</string> <string name="setup_gpu_unsupported_detail">Steam needs an Adreno driver; %1$s may show a black screen</string> @@ -916,6 +945,7 @@ <string name="setup_home">Use as Home screen</string> <string name="setup_home_on">DroidDeck can be the Home app</string> <string name="setup_home_off">DroidDeck is never offered as a Home app</string> + <string name="setup_home_game_space_first">In Add Games, set DroidDeck to Include</string> <string name="setup_orientation">Orientation</string> <string name="setup_launcher_orientation">Launcher orientation</string> <string name="setup_launcher_orientation_auto">Follow device rotation</string> @@ -928,15 +958,15 @@ <string name="setup_fullscreen">Fullscreen</string> <string name="setup_fullscreen_on">Hides the Android status and navigation bars</string> <string name="setup_fullscreen_off">Shows the Android status and navigation bars</string> - <string name="setup_dual_screen">Dual screen</string> - <string name="setup_dual_screen_hint">Automatic uses the second screen on handhelds with a built-in one. On uses any second display. Off keeps the launcher and games on one screen; you can still pick a second screen from the session menu.</string> + <string name="setup_dual_screen_launcher">Dual screen launcher</string> + <string name="setup_dual_screen_launcher_hint">Automatic puts the launcher sections (Steam, Library, Stores and the rest) on the second screen of handhelds with a built-in one. On uses any second display. Off keeps the launcher on one screen.</string> + <string name="setup_dual_screen_sessions">Dual screen sessions</string> + <string name="setup_dual_screen_sessions_hint">Automatic docks the in-game menu on the built-in second screen instead of a pop-over. On uses any second display. Off keeps the menu on the game screen; you can still pick a second screen from it.</string> <string name="setup_dual_screen_auto">Automatic</string> <string name="setup_dual_screen_on">On</string> <string name="setup_dual_screen_off">Off</string> - <string name="setup_dual_screen_menu">Bottom screen menu</string> - <string name="setup_dual_screen_menu_hint">Moves the sections and the in-game menu to the second screen and types there, so the top screen keeps the full view. L2 and R2 switch sections.</string> <string name="setup_dual_screen_controls">Bottom screen controls in games</string> - <string name="setup_dual_screen_controls_hint">Opens the trackpad and keyboard on the second screen when a session starts.</string> + <string name="setup_dual_screen_controls_hint">Opens a panel on the second screen when a session starts: the Deck buttons and trackpads with a Steam Deck or Steam Controller, otherwise the one you used last.</string> <string name="dual_typing_title">Typing on the top screen</string> <string name="dual_typing_done">Done</string> <string name="setup_default_home">Default Home app</string> @@ -1274,7 +1304,6 @@ <string name="games_never_played">Never played</string> <string name="games_runtime_busy_percent">Runtime busy · %1$d%%</string> <string name="games_runtime_busy">Runtime busy</string> - <string name="games_runtime_first_play">Runtime installs on first Play</string> <string name="games_runtime_update">Runtime update available</string> <string name="games_runtime_ready">● Runtime ready</string> <string name="games_internal">Internal storage</string> @@ -1376,6 +1405,15 @@ <string name="proton_cancel_queued">Cancel queued</string> <string name="pckb_android">Android keyboard</string> <string name="pckb_hide">Hide ✕</string> + <string name="pckb_size">Size on screen</string> + <string name="pckb_size_hint">Share of the screen the keyboard takes, header included.</string> + <string name="pckb_opacity">Opacity</string> + <string name="pckb_opacity_hint">Lower it to see the game behind the keyboard.</string> + <string name="pckb_hidden_keys">Hidden keys</string> + <string name="pckb_hidden_keys_hint">Keys you rarely use stay off the keyboard.</string> + <string name="pckb_group_function">Esc and function row</string> + <string name="pckb_group_nav">Ins / Del / Home / End / PgUp / PgDn</string> + <string name="pckb_group_arrows">Arrow keys</string> <string name="main_launch_named">Launch %1$s</string> <string name="main_choose_screen">Choose a screen. Secondary: %1$s.</string> <string name="main_secondary_gone">The secondary display is no longer available.</string> @@ -1793,6 +1831,8 @@ <string name="fm_accept">Accept</string> <string name="fm_decline">Decline</string> <string name="fm_drive_not_readable">%1$s is mounted but not readable right now</string> + <string name="fm_drive_access_title">Allow access to %1$s</string> + <string name="fm_drive_access_text">Android lets DroidDeck see this drive but not read it. Turn on All files access for DroidDeck, then come back.</string> <string name="fm_list_view">List view</string> <string name="fm_grid_view">Grid view</string> <string name="fm_search">Search</string> @@ -1875,6 +1915,124 @@ <string name="second_mode_keyboard_trackpad">Keyboard + trackpad</string> <string name="second_mode_terminal">Terminal</string> <string name="second_mode_deck_controls">Deck grips + trackpads</string> + <string name="second_mode_dashboard">Dashboard</string> + <string name="second_mode_desktop">Desktop</string> + <string name="bottom_desktop_start">Start the desktop</string> + <string name="bottom_desktop_title">Desktop · %1$s</string> + <string name="bottom_desktop_mode_trackpad">Trackpad</string> + <string name="bottom_desktop_mode_touch">Direct touch</string> + <string name="bottom_desktop_trackpad">Trackpad. Tap for direct touch</string> + <string name="bottom_desktop_direct_touch">Direct touch. Tap for trackpad</string> + <string name="bottom_desktop_starting">Starting the KDE desktop…</string> + <string name="bottom_desktop_ended">The desktop closed.</string> + <string name="bottom_desktop_failed">The desktop couldn\'t start. Its logs are in this session\'s bottom-desktop folder.</string> + <string name="bottom_desktop_off">The desktop is closed.</string> + <string name="bottom_dashboard_empty">Nothing to show here yet.</string> + <string name="swap_screens">Swap screens</string> + <string name="swap_screens_unavailable">The bottom screen is not free right now</string> + <string name="swap_game_screen_group">Game screen</string> + <string name="swap_game_screen">Show the game on</string> + <string name="swap_game_screen_top">Top screen</string> + <string name="swap_game_screen_bottom">Bottom screen</string> + <string name="bottom_page_downloads">Downloads</string> + <string name="bottom_downloads_none">No downloads running.</string> + <string name="bottom_downloads_steam">Steam</string> + <string name="bottom_downloads_shader">Downloading shader cache</string> + <string name="bottom_downloads_paused">Paused</string> + <string name="bottom_downloads_queued">Waiting to start</string> + <string name="bottom_page_notifications">Notifications</string> + <string name="bottom_notifications_listener">DroidDeck bottom screen</string> + <string name="bottom_notifications_why">Show messages and other notifications here while you play. They stay on this screen only and are not saved. Android asks once: its notification access page opens on this screen; turn DroidDeck on there and this page comes back by itself.</string> + <string name="bottom_notifications_allow">Allow notification access</string> + <string name="bottom_notifications_none">No notifications.</string> + <string name="bottom_notifications_count">%1$d notifications</string> + <string name="bottom_notifications_clear">Clear</string> + <string name="bottom_page_screenshots">Screenshots</string> + <string name="stats_fps_needs_hud">FPS needs the HUD on</string> + <string name="stats_speed">Speed</string> + <string name="stats_pedals">Pedals</string> + <string name="stats_gforce">G-force</string> + <string name="stats_timing">Timing</string> + <string name="stats_best_lap">Best lap</string> + <string name="stats_tires">Tires °C</string> + <string name="stats_trace">Throttle and brake, last 10 s</string> + <string name="stats_speed_chart">Speed, %1$s</string> + <string name="stats_gear">Gear</string> + <string name="stats_steam_client_arm">Steam Client ARM</string> + <string name="stats_steam_client_x86">Steam Client x86</string> + <string name="stats_throttle">Throttle</string> + <string name="stats_brake">Brake</string> + <string name="stats_lights">Dashboard</string> + <string name="stats_lamp_shift">Shift</string> + <string name="stats_lamp_handbrake">Handbrake</string> + <string name="stats_lamp_pit">Pit limiter</string> + <string name="stats_lamp_tc">TC</string> + <string name="stats_lamp_abs">ABS</string> + <string name="stats_turbo">Turbo %1$s bar</string> + <string name="stats_engine_temp">Engine %1$s °C</string> + <string name="stats_oil_temp">Oil %1$s °C</string> + <string name="stats_power">Power distributor</string> + <string name="stats_fuel_t">Fuel, t</string> + <string name="stats_fuel_main">Main %1$s t</string> + <string name="stats_fuel_reserve">Reserve %1$s t</string> + <string name="stats_hud_frametime">Frame time</string> + <string name="stats_hud_last_seconds">last %1$d s</string> + <string name="stats_hud_avg_frame">avg frame</string> + <string name="stats_hud_low">1 percent low</string> + <string name="stats_hud_slow_frames">frames over 33 ms</string> + <string name="stats_hud_per_minute">%1$d / min</string> + <string name="stats_hud_playing_for">Playing for %1$s</string> + <string name="stats_hud_core_group">%1$d cores, up to %2$s GHz</string> + <string name="stats_hud_core_group_unknown">%1$d cores</string> + <string name="stats_hud_game_cores">game</string> + <string name="stats_hud_fps_of">FPS of %1$d Hz</string> + <string name="stats_hud_red_mark">The red mark is where the HUD shows the temperature in red.</string> + <string name="stats_hud_whole_device">whole device</string> + <string name="stats_hud_battery_temp">battery</string> + <string name="bottom_telemetry_send_title">Send dashboard data</string> + <string name="bottom_telemetry_send_auto">Automatic</string> + <string name="bottom_telemetry_send_auto_hint">Turns it on for every game listed here, including games found later. Games you switch off stay off.</string> + <string name="bottom_telemetry_send_note">This changes the game\'s own data output setting. It takes effect the next time the game starts; turning it off puts the old setting back.</string> + <string name="bottom_telemetry_send_close">Close %1$s to change this.</string> + <string name="bottom_telemetry_send_failed">Could not change the settings of %1$s.</string> + <string name="bottom_telemetry_send_menu">%1$s: turn on %2$s in the game\'s settings with IP 127.0.0.1 and port %3$d.</string> + <string name="bottom_shots_where">Saved to Pictures/DroidDeck. Steam screenshots show here too.</string> + <string name="bottom_shots_take">Take screenshot</string> + <string name="bottom_shots_saved">Screenshot saved.</string> + <string name="bottom_shots_failed">Could not take a screenshot.</string> + <string name="bottom_shots_none">No screenshots yet.</string> + <string name="bottom_page_chat">Chat & voice</string> + <string name="bottom_chat_why">Read and answer Steam chat here while the game keeps running on the main screen. It uses the account Steam is signed in with.</string> + <string name="bottom_chat_not_signed_in">Steam has no web sign-in to share yet, so sign in here once.</string> + <string name="bottom_chat_stopped">Android closed the chat page while DroidDeck was in the background. It opens again when you come back to DroidDeck.</string> + <string name="bottom_chat_open">Open Steam Chat</string> + <string name="bottom_chat_close">Close chat</string> + <string name="bottom_chat_mic_on">Mic on</string> + <string name="bottom_chat_mic_off">Mic off</string> + <string name="bottom_chat_mic_unavailable">Mic is off for this game. To talk, turn on Microphone in DroidDeck\'s Steam settings (Audio) and start the game again.</string> + <string name="bottom_chat_volume">Volume %1$d%%</string> + <string name="bottom_page_telemetry">In-game stats</string> + <string name="bottom_hud_group">Bottom screen HUD</string> + <string name="bottom_strip_tabs">Strip on every tab</string> + <string name="bottom_strip_lows" formatted="false">1% and 0.1% lows</string> + <string name="bottom_strip_cpu_temp">CPU temperature</string> + <string name="bottom_telemetry_fps">FPS</string> + <string name="bottom_telemetry_cpu">CPU</string> + <string name="bottom_telemetry_gpu">GPU</string> + <string name="bottom_telemetry_battery">Battery</string> + <string name="bottom_telemetry_lap">Lap</string> + <string name="bottom_telemetry_position">Position</string> + <string name="bottom_telemetry_this_lap">This lap</string> + <string name="bottom_telemetry_last_lap">Last lap</string> + <string name="bottom_telemetry_fuel">Fuel</string> + <string name="bottom_telemetry_cargo">Cargo</string> + <string name="bottom_telemetry_pips">Pips SYS · ENG · WEP</string> + <string name="bottom_telemetry_legal">Legal state</string> + <string name="bottom_telemetry_balance">Balance</string> + <string name="bottom_telemetry_war_thunder">War Thunder</string> + <string name="bottom_telemetry_elite">Elite Dangerous</string> + <string name="bottom_telemetry_unknown_format">Port %1$d receives data (%2$d packets of %3$d bytes), but in a format this page cannot read yet.</string> + <string name="bottom_telemetry_port_busy">Another program already uses port %1$s, so that game cannot show here.</string> <string name="rtinst_removing">Removing Linux runtime</string> <plurals name="rtinst_removing_entries"> @@ -1905,6 +2063,7 @@ <string name="flatpakmgr_not_ready">Set up Flatpak first</string> <string name="flatpakmgr_starting">Starting</string> <string name="flatpakmgr_exit_status">Flatpak exited with status %1$d</string> + <string name="flatpakmgr_wrong_arch">%1$s is built for %2$s, which DroidDeck can\'t run. Flatpak apps here need an ARM64 or x86_64 build.</string> <string name="flatpakmgr_installing">Installing %1$s</string> <string name="flatpakmgr_updating">Updating %1$s</string> <string name="flatpakmgr_removing">Removing %1$s</string> @@ -2110,6 +2269,8 @@ <string name="gpuinfo_a850_experimental">Experimental Adreno 850 support: requires compatible experimental display and game drivers; not verified on this device</string> <string name="gpuinfo_below_tested">Below tested hardware (Adreno 725 and newer): it may not run</string> <string name="gpuinfo_unsupported">Not supported: DroidDeck needs an Adreno (Snapdragon) GPU</string> + <string name="gpuinfo_bridge">Runs through the Mali bridge, on the phone\'s own Vulkan driver</string> + <string name="gpuinfo_bridge_off">Not supported with the Mali bridge off: Turnip needs an Adreno (Snapdragon) GPU</string> <string name="turnip_rate_limited">GitHub\'s rate limit was hit - try again later</string> <string name="turnip_github_http">GitHub answered HTTP %1$d</string> @@ -2205,6 +2366,7 @@ <string name="display_look_filter">%1$s Sets scaling to %2$s.</string> <string name="display_match_screen">Match screen (%1$d×%2$d)</string> <string name="display_follow_screen">Follow screen (resizes when folded or unfolded)</string> + <string name="display_follow_screen_scaled">Scaled %1$s</string> <string name="mode_tab_steam">Steam</string> <string name="device_info_show">Show device details</string> <string name="device_info_hide">Hide device details</string> @@ -2507,6 +2669,9 @@ <string name="edit_target">Target</string> <string name="edit_start_in">Start in</string> <string name="edit_launch_options">Launch options</string> + <string name="edit_launch_options_steam_hint">Shared with Steam\'s Properties: a change in either one shows in both.</string> + <string name="edit_launch_options_not_saved">Could not save the launch options to Steam. Try again.</string> + <string name="edit_launch_options_desktop">Steam may be open in the desktop session. Change the launch options in its Properties, or close the session first.</string> <string name="edit_artwork">Artwork</string> <string name="edit_other_exe">Other exe…</string> <string name="edit_remove">Remove</string> @@ -3326,6 +3491,113 @@ <string name="spatial_saved_views_hint">Saved views can be recalculated. Start a new calibration to capture in the current tracking frame.</string> <string name="spatial_model_checksum_error">Hand model checksum mismatch</string> <string name="spatial_opencv_load_error">OpenCV could not load</string> + <string name="setup_tab_sync">Syncthing</string> + <string name="sync_group">Syncthing</string> + <string name="sync_enable">Sync with Syncthing</string> + <string name="sync_enable_hint">Based on Syncthing-Fork, this is a Syncthing implementation that lets you sync files in DroidDeck\'s internal file system with other Syncthing instances. This is only for files you are storing within DroidDeck\'s internal file system.</string> + <string name="sync_missing">This build doesn\'t include Syncthing.</string> + <string name="sync_starting">Starting Syncthing</string> + <string name="sync_status_starting">Starting</string> + <string name="sync_status_up_to_date">Up to date</string> + <string name="sync_status_syncing">Syncing</string> + <string name="sync_status_paused">Paused</string> + <string name="sync_status_pausing">Pausing</string> + <string name="sync_status_resuming">Resuming</string> + <string name="sync_status_attention">Needs attention</string> + <string name="sync_status_failed">Syncthing stopped</string> + <string name="sync_failed_retry">Try again</string> + <string name="sync_paused_wifi">Paused until Wi-Fi</string> + <string name="sync_paused_game">Paused during the game</string> + <string name="sync_summary">%1$d folders · %2$d of %3$d devices connected</string> + <string name="sync_left">%1$s left</string> + <string name="sync_open_web_ui">Open web UI</string> + <string name="sync_pause">Pause</string> + <string name="sync_resume">Resume</string> + <string name="sync_running">Running</string> + <string name="sync_running_hint">Turn off to stop Syncthing completely.</string> + <string name="sync_this_device">This device</string> + <string name="sync_device_id">Device ID</string> + <string name="sync_show_qr">Show QR</string> + <string name="sync_advanced">Advanced</string> + <string name="sync_advanced_hint">Ports, when to run, reset</string> + <string name="sync_open">Open</string> + <string name="sync_waiting">Waiting for you</string> + <string name="sync_pending_device">%1$s wants to connect</string> + <string name="sync_pending_folder">%1$s wants to share “%2$s”</string> + <string name="sync_pending_folder_hint">Accept to choose where it\'s saved in DroidDeck.</string> + <string name="sync_review">Review in web UI</string> + <string name="sync_folders">Folders</string> + <string name="sync_no_folders">No folders yet.</string> + <string name="sync_folder_detail">%1$s · %2$s</string> + <string name="sync_folder_up_to_date">Up to date</string> + <string name="sync_folder_syncing">Syncing %1$d%%</string> + <string name="sync_folder_scanning">Scanning</string> + <string name="sync_folder_paused">Paused</string> + <string name="sync_folder_out_of_sync">Out of sync</string> + <string name="sync_folder_errors">%1$d files couldn\'t sync</string> + <string name="sync_folder_blocked">Blocked</string> + <string name="sync_folder_blocked_hint">This folder is outside DroidDeck\'s storage, so DroidDeck paused it. To sync folders outside DroidDeck, use the Syncthing-Fork app.</string> + <string name="sync_remove_folder">Remove from Syncthing</string> + <string name="sync_remove_folder_hint">Removing it doesn\'t delete any files.</string> + <string name="sync_devices">Devices</string> + <string name="sync_no_devices">No devices yet.</string> + <string name="sync_connected">Connected</string> + <string name="sync_offline">Offline</string> + <string name="sync_last_seen">Last seen %1$s</string> + <string name="sync_device_id_title">This device\'s ID</string> + <string name="sync_device_id_hint">On your other device, add a device in Syncthing and scan this code or paste the ID. Then accept it here in the web UI.</string> + <string name="sync_copy">Copy</string> + <string name="sync_share">Share</string> + <string name="sync_done">Done</string> + <string name="sync_off_title">Turn off Syncthing?</string> + <string name="sync_off_body">Syncthing stops now and stays stopped until it\'s turned back on. Synced files stay where they are.</string> + <string name="sync_off_forget">Also delete Syncthing\'s config</string> + <string name="sync_off_forget_hint">Removes this device\'s ID, folders and devices. Turning it on again starts fresh.</string> + <string name="sync_turn_off">Turn off</string> + <string name="sync_ports">Ports</string> + <string name="sync_port_sync">Sync</string> + <string name="sync_port_discovery">Local discovery</string> + <string name="sync_repick">Pick new ports</string> + <string name="sync_repick_hint">Checked again on every start.</string> + <string name="sync_repick_button">Re-pick</string> + <string name="sync_reset_group">Reset</string> + <string name="sync_api_key">API key</string> + <string name="sync_regenerate">Regenerate</string> + <string name="sync_reset">Reset Syncthing</string> + <string name="sync_reset_hint">New device ID, folders and devices removed. Files in DroidDeck\'s storage are kept.</string> + <string name="sync_reset_button">Reset</string> + <string name="sync_reset_confirm_title">Reset Syncthing?</string> + <string name="sync_running_group">Running</string> + <string name="sync_run">Run</string> + <string name="sync_run_open">While DroidDeck is open</string> + <string name="sync_run_background">In the background</string> + <string name="sync_wifi_only">Wi-Fi only</string> + <string name="sync_pause_games">Pause during games</string> + <string name="sync_logs">Logs</string> + <string name="sync_logs_hint">Syncthing output for this session</string> + <string name="sync_logs_share">Share</string> + <string name="sync_notification_channel">Syncthing</string> + <string name="sync_needs_runtime">Set up the Linux runtime first.</string> + <string name="sync_accept">Accept</string> + <string name="sync_accept_title">Save “%1$s” to</string> + <string name="sync_add_folder">Add folder</string> + <string name="sync_add_folder_hint">Sync a folder in DroidDeck\'s storage</string> + <string name="sync_choose">Choose</string> + <string name="sync_add">Add</string> + <string name="sync_add_failed">The folder couldn\'t be added.</string> + <string name="sync_share_with">Share with</string> + <string name="sync_share_none">No devices yet. You can share this folder from the web UI later.</string> + <string name="sync_use_folder">Use this folder</string> + <string name="sync_new_folder">New folder</string> + <string name="sync_location_home">Container home</string> + <string name="sync_location_sync">Sync folder</string> + <string name="sync_location_shared">DroidDeck shared storage</string> + <string name="sync_location_card">DroidDeck on %1$s</string> + <string name="sync_location_app">DroidDeck app data</string> + <string name="sync_web_path_locked">New folders are saved in DroidDeck\'s Sync folder. To sync a different DroidDeck folder, use Add folder on the Syncthing tab.</string> + <string name="sync_web_title">Syncthing</string> + <string name="sync_web_reload">Reload</string> + <string name="sync_not_running">Syncthing isn\'t running.</string> <string name="session_end_steam_sigill">Steam stopped with an illegal instruction (SIGILL). This can be a CPU instruction compatibility problem or a client crash. Share the logs with your device details.</string> <string name="session_end_steam_try_x64">You can try Steam settings → Steam client → x86-64 (experimental). It needs an additional download and may run more slowly.</string> <string name="session_end_vulkan_device">The Linux graphics driver could not find a usable Vulkan device. Check that the selected Linux GPU driver supports this GPU.</string> @@ -3404,6 +3676,19 @@ <string name="stores_xbox_cloud_settings">Cloud settings</string> <string name="xbox_cloud_gaming" translatable="false">Xbox Cloud Gaming</string> <string name="xbox_filter_game_pass" translatable="false">Game Pass</string> + <string name="setup_gpu_bridge_off">Mali bridge: off</string> + <string name="setup_gpu_bridge_on">Mali bridge: on</string> + <string name="setup_bridge_safe">Safe mode</string> + <string name="setup_bridge_safe_on">Safe mode: on</string> + <string name="setup_bridge_safe_off">Safe mode: off</string> + <string name="setup_bridge_safe_on_detail">Most compatible. Recommended for a new device.</string> + <string name="setup_bridge_safe_off_detail">Faster where this GPU passed its checks.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatic</string> + <string name="setup_bridge_dxvk_proton">DXVK: Proton\'s own</string> + <string name="setup_bridge_dxvk_auto_detail">Uses an older DXVK where this GPU\'s Vulkan is too old for Proton\'s.</string> + <string name="setup_bridge_dxvk_proton_detail">Every Proton keeps its own DXVK, even where this GPU\'s Vulkan may be too old for it.</string> + <string name="setup_gpu_bridge_detail">%1$s is not an Adreno. The experimental Vulkan bridge is on: the session draws through the phone\'s own driver. Expect bugs; send the session logs.</string> <string name="integration_title">Steam integration</string> <string name="integration_count">%1$d of %2$d on</string> <string name="integration_set_up">Set up</string> @@ -3412,19 +3697,18 @@ <string name="integration_wifi">Wi-Fi names</string> <string name="integration_brightness">Brightness</string> <string name="integration_home">DroidDeck as Home</string> - <string name="integration_shortcuts">Home button shortcuts</string> + <string name="integration_shortcuts">System keys</string> <string name="integration_wifi_hint">Show networks in Steam · needs Location access, never tracked</string> <string name="integration_wifi_on">Networks show in Steam</string> <string name="integration_wifi_location_off">Location is off</string> <string name="integration_wifi_denied">Location denied · allow it in App info</string> <string name="integration_brightness_hint">Steam’s slider sets screen brightness</string> <string name="integration_home_hint">Home opens the Steam menu in a session</string> - <string name="integration_shortcuts_hint">Hold Home for Steam Guide chords</string> - <string name="integration_shortcuts_needs_home">Needs DroidDeck as Home</string> + <string name="integration_shortcuts_hint">Alt+Tab, Win key and Home button stay in the session</string> <string name="integration_shortcuts_maybe_restricted">Greyed out in Android? App info → ⋮ → Allow restricted settings</string> <string name="integration_shortcuts_restricted">Blocked by Android · App info → ⋮ → Allow restricted settings</string> - <string name="integration_shortcuts_service">DroidDeck Home button</string> - <string name="integration_shortcuts_service_description">Pass Home button presses to Steam Guide while a Steam session is focused and DroidDeck is the default Home app. Does not read screen content.</string> + <string name="integration_shortcuts_service">DroidDeck system keys</string> + <string name="integration_shortcuts_service_description">Keep Alt+Tab, the Win key and the Home button inside a focused DroidDeck session instead of Android.</string> <string name="integration_brightness_needed">Turn on Brightness in Setup → Steam integration</string> <string name="desktop_restore_title">Restoring your software</string> <string name="desktop_restore_body">Reinstalling the apps you added after a DroidDeck update.</string> @@ -3444,4 +3728,33 @@ <string name="steam_import_names_more">%1$s and %2$d more</string> <string name="steam_import_now">Restart now</string> <string name="steam_import_later">Later</string> + <string name="stores_gamejolt_not_owned">Not in your Game Jolt library</string> + <string name="stores_gamejolt_no_build">No Windows download for this game</string> + <string name="stores_gamejolt_no_exe">No Windows game found in the download</string> + <string name="stores_gamejolt_no_game">Could not find this game on Game Jolt</string> + <string name="stores_gamejolt_browse_failed">Could not load games from Game Jolt</string> + <string name="stores_gamejolt_download_failed">Game Jolt answered HTTP %1$d</string> + <string name="stores_gamejolt_pick_failed">Could not load the downloads from Game Jolt</string> + <string name="stores_gamejolt_build_open">Open on Game Jolt</string> + <string name="stores_gamejolt_download_unreachable">Could not reach Game Jolt</string> + <string name="stores_gamejolt_download_no_link">Game Jolt did not give a download link</string> + <string name="stores_gamejolt_archive">%1$s archives are not supported</string> + <string name="stores_gamejolt_extract_failed">Could not extract the download (exit %1$d)</string> + <string name="stores_gamejolt_section_featured">Featured</string> + <string name="stores_gamejolt_section_hot">Hot</string> + <string name="stores_gamejolt_section_best">Best</string> + <string name="stores_gamejolt_section_new">New</string> + <string name="stores_gamejolt_price_under_30">$30 or less</string> + <string name="stores_gamejolt_os_other">Other</string> + <string name="stores_gamejolt_maturity_everyone">All ages</string> + <string name="stores_gamejolt_maturity_teen">Teen</string> + <string name="stores_gamejolt_maturity_adult">Mature</string> + <string name="stores_gamejolt_status_complete">Complete</string> + <string name="stores_gamejolt_status_early">Early access</string> + <string name="stores_gamejolt_partners">Partner games</string> + <string name="stores_gamejolt_filter_browser">Browser</string> + <string name="stores_gamejolt_filter_maturity">Maturity</string> + <string name="stores_gamejolt_filter_status">Status</string> + <string name="stores_gamejolt_filter_partners">Partners</string> + <string name="stores_gamejolt_followed">Followed games</string> </resources> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 005841e7a1..ac0897739c 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -2,6 +2,7 @@ <resources> <style name="AppTheme" parent="@android:style/Theme.Material.NoActionBar"> <item name="android:colorBackground">#FF101418</item> + <item name="android:navigationBarColor">@android:color/black</item> </style> <style name="SessionTheme" parent="@android:style/Theme.Material.NoActionBar.Fullscreen"> <item name="android:windowBackground">@android:color/black</item> diff --git a/app/src/main/res/xml/home_button_service.xml b/app/src/main/res/xml/home_button_service.xml index 3b094dcd54..0c67e9effd 100644 --- a/app/src/main/res/xml/home_button_service.xml +++ b/app/src/main/res/xml/home_button_service.xml @@ -3,5 +3,5 @@ android:accessibilityFeedbackType="feedbackGeneric" android:accessibilityFlags="flagRequestFilterKeyEvents" android:canRequestFilterKeyEvents="true" - android:canRetrieveWindowContent="false" + android:canRetrieveWindowContent="true" android:description="@string/integration_shortcuts_service_description" /> diff --git a/app/src/main/res/xml/steam_wall_wallpaper.xml b/app/src/main/res/xml/steam_wall_wallpaper.xml new file mode 100644 index 0000000000..5a8b782465 --- /dev/null +++ b/app/src/main/res/xml/steam_wall_wallpaper.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<wallpaper xmlns:android="http://schemas.android.com/apk/res/android" + android:thumbnail="@drawable/steam_wall_thumb" + android:settingsActivity="com.droiddeck.launcher.wallpaper.WallpaperSettingsActivity" /> diff --git a/app/src/main/rust/stores/src/fetch_core.rs b/app/src/main/rust/stores/src/fetch_core.rs index f019734405..a0a4ac91ad 100644 --- a/app/src/main/rust/stores/src/fetch_core.rs +++ b/app/src/main/rust/stores/src/fetch_core.rs @@ -609,8 +609,6 @@ fn classify_reqwest_error(err: &reqwest::Error) -> FetchFailKind { } else if err.is_connect() { FetchFailKind::Connect } else if err.is_body() || err.is_decode() { - // A truncated or undecodable body comes from the CDN, not the request. Rest that host so - // the retry goes to another mirror instead of reading the same bad object again. FetchFailKind::ServerFault } else { FetchFailKind::Other @@ -1424,9 +1422,6 @@ impl FetchScheduler { }; h.samples = h.samples.saturating_add(1); h.consecutive_errors = 0; - // A success can belong to a request that was already in flight when another response from - // this host failed. Keep a server-fault cooldown until it expires instead of clearing it - // early and sending the retry straight back to the same mirror. if let Some(fault) = h.fault_until.filter(|until| *until > now) { h.cooldown_until = Some(h.cooldown_until.map_or(fault, |current| current.max(fault))); } else { diff --git a/app/src/main/rust/stores/src/fetch_tuning.rs b/app/src/main/rust/stores/src/fetch_tuning.rs index 5c380d537b..8a11c3dc04 100644 --- a/app/src/main/rust/stores/src/fetch_tuning.rs +++ b/app/src/main/rust/stores/src/fetch_tuning.rs @@ -68,8 +68,6 @@ pub const SERVER_EXPLORE_EVERY: u64 = 8; pub const NOMINAL_CHUNK_RESERVE_BYTES: u64 = 1024 * 1024; pub const RATE_LIMIT_COOLDOWN_MS: u64 = 5_000; -// Long enough that every retry of the item (5 attempts, at most ~4.5 s of backoff) goes to another -// mirror after this one served a truncated or undecodable body. pub const SERVER_FAULT_COOLDOWN_MS: u64 = 10_000; pub fn retry_backoff_millis(attempt: u32) -> u64 { diff --git a/app/src/test/cpp/viture_display_modes_test.cpp b/app/src/test/cpp/viture_display_modes_test.cpp index ea6ea54629..956e05fe74 100644 --- a/app/src/test/cpp/viture_display_modes_test.cpp +++ b/app/src/test/cpp/viture_display_modes_test.cpp @@ -1,4 +1,3 @@ -// Compile with the installed SDK's headers to verify the two mode vocabularies. #include "viture_protocol_public.h" #include "../../main/cpp/viture/display_modes.h" using namespace droiddeck::viture; diff --git a/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt b/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt new file mode 100644 index 0000000000..b45761eb9a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher + +import com.droiddeck.launcher.HomeApp.RecentsStep +import org.junit.Assert.assertEquals +import org.junit.Test + +class HomeRecentsTest { + @Test fun theLauncherHidesAVisibleTaskAndTakesItOver() { + assertEquals(RecentsStep.HIDE, HomeApp.recentsStep(hidden = true, owned = false, excluded = false)) + } + + @Test fun aTaskSomeoneElseExcludedIsNeverClaimedOrShown() { + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = true, owned = false, excluded = true)) + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = false, owned = false, excluded = true)) + } + + @Test fun onlyATaskTheLauncherHidItselfIsShownAgain() { + assertEquals(RecentsStep.SHOW, HomeApp.recentsStep(hidden = false, owned = true, excluded = true)) + assertEquals(RecentsStep.FORGET, HomeApp.recentsStep(hidden = false, owned = true, excluded = false)) + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = true, owned = true, excluded = true)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt index f625d6b41b..7fe76acc98 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt @@ -181,6 +181,32 @@ class AgentSecurityTest { assertEquals(listOf("TEST=old", "STICKY=1"), AgentEnv.beginSession(context)) } + @Test fun binaryOverridesPreserveTheRuntimeSearchPathForOneSession() { + AgentAccess.setCommandsEnabled(context, true) + File(AgentEnv.inbox(context).apply { mkdirs() }, "gamescope").writeText("test binary") + AgentEnv.override(context, "gamescope") + + val path = AgentEnv.beginSession(context).single { it.startsWith("PATH=") }.substringAfter('=') + assertEquals("/opt/droiddeck-agent/bin:" + LinuxRuntime.GUEST_PATH, path) + assertTrue(path.split(':').contains("/usr/games")) + assertTrue(path.split(':').contains("/usr/sbin")) + + AgentEnv.endSession(context) + assertTrue(AgentEnv.beginSession(context).none { it.startsWith("PATH=") }) + } + + @Test fun binaryOverridesKeepExplicitPathsAndPendingPathPrecedence() { + AgentAccess.setCommandsEnabled(context, true) + AgentEnv.set(context, listOf("PATH=/custom/persistent"), true) + AgentEnv.set(context, listOf("PATH=/custom/next:/usr/games"), false) + File(AgentEnv.inbox(context).apply { mkdirs() }, "gamescope").writeText("test binary") + AgentEnv.override(context, "gamescope") + + assertEquals("PATH=/opt/droiddeck-agent/bin:/custom/next:/usr/games", AgentEnv.beginSession(context).last()) + AgentEnv.endSession(context) + assertEquals(listOf("PATH=/custom/persistent"), AgentEnv.beginSession(context)) + } + @Test fun fastPathLibraryIsValidatedAndSelectedForOneSession() { AgentAccess.setCommandsEnabled(context, true) val source = File(AgentEnv.inbox(context).apply { mkdirs() }, "libblfastpath.so") diff --git a/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioTimingTest.kt b/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioTimingTest.kt new file mode 100644 index 0000000000..db52954f3c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioTimingTest.kt @@ -0,0 +1,17 @@ +package com.droiddeck.launcher.audio + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class DirectAudioTimingTest { + @Test + fun lowLatencyOutputKeepsTheDriverDefaults() { + assertTrue(DirectAudioTiming.environment(lowLatencyOutput = true).isEmpty()) + } + + @Test + fun outputWithoutLowLatencyGetsALongerPeriodAndBuffer() { + assertEquals(listOf("AUDIO_DIRECT_PERIOD_MS=20", "AUDIO_DIRECT_MS=60"), DirectAudioTiming.environment(lowLatencyOutput = false)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt index 9172c5a5c3..80c6ebd328 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt @@ -2,6 +2,9 @@ package com.droiddeck.launcher.core import android.content.Context import androidx.test.core.app.ApplicationProvider +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream import java.io.File import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -54,4 +57,35 @@ class AddonPackTest { installed("b".repeat(64)) assertFalse(AddonPack("sample", "", 0L, listOf("tool"), reuseDeviceCopy = false).installed(context)) } + + @Test fun localBuildInstallsTheBundledPackWithoutDownloading() { + val archive = tarZst("tool" to "x") + val pack = AddonPack("sample", Hashes.sha256(archive), archive.length(), listOf("tool"), bundle = { archive.inputStream() }) + + assertTrue(pack.await(context)) + assertEquals("x", pack.file(context, "tool").readText()) + } + + @Test fun bundledPackWithTheWrongDigestIsRejected() { + val archive = tarZst("tool" to "x") + val pack = AddonPack("sample", "a".repeat(64), archive.length(), listOf("tool"), + bundle = { archive.inputStream() }) + + val copy = File(context.cacheDir, "copy.tar.zst") + + assertFalse(pack.bundled(context, copy)) + assertFalse(copy.exists()) + } + + private fun tarZst(vararg files: Pair<String, String>): File = + File(context.cacheDir, "sample-${System.nanoTime()}.tar.zst").apply { + TarArchiveOutputStream(ZstdOutputStream(outputStream())).use { tar -> + for ((path, text) in files) { + val bytes = text.toByteArray() + tar.putArchiveEntry(TarArchiveEntry(path).apply { size = bytes.size.toLong() }) + tar.write(bytes) + tar.closeArchiveEntry() + } + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt b/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt index f0c1002eb0..f2ed52f7e3 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt @@ -17,11 +17,6 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test -/** - * A download that was cut off keeps its bytes, and a second call with `resume` asks for the rest - * with a Range header instead of starting again. The server is a plain socket so the first answer - * can promise the whole file and then hang up halfway. - */ class DownloaderResumeTest { private val data = ByteArray(300_000) { (it % 251).toByte() } private val cutAt = 100_000 @@ -43,11 +38,9 @@ class DownloaderResumeTest { try { while (!server.isClosed) { val socket = server.accept() - // the client may hang up on a body it refuses; that must not stop the server runCatching { handle(socket) } } } catch (_: Exception) { - // closed by tearDown } }.apply { isDaemon = true; start() } } @@ -72,7 +65,6 @@ class DownloaderResumeTest { val content = if (corrupt && "/corrupt" in path) ByteArray(data.size) else data val from = range?.removePrefix("bytes=")?.substringBefore('-')?.toIntOrNull() if (misbehave) { - // answers a Range request with a 206 that starts at 0, and serves plain requests whole val start = if (from == null) "200 OK" else "206 Partial Content" val extra = if (from == null) "" else "Content-Range: bytes 0-${data.size - 1}/${data.size}\r\n" out.write("HTTP/1.1 $start\r\n${extra}${validator}Content-Length: ${data.size}\r\nConnection: close\r\n\r\n".toByteArray()) @@ -89,7 +81,6 @@ class DownloaderResumeTest { out.write("HTTP/1.1 200 OK\r\n${validator}Content-Length: ${data.size}\r\nConnection: close\r\n\r\n".toByteArray()) out.write(content, 0, cutAt) out.flush() - // hang up with most of the promised body still unsent } else { val rest = data.size - from out.write(("HTTP/1.1 206 Partial Content\r\nContent-Range: bytes $from-${data.size - 1}/${data.size}\r\n" + @@ -187,7 +178,6 @@ class DownloaderResumeTest { val target = File(dir, "runtime.tar.zst") misbehave = true val polls = java.util.concurrent.atomic.AtomicInteger() - // candidate selection and attempt each check once before the request; later checks follow chunks val cancelled = java.util.function.BooleanSupplier { polls.incrementAndGet() > 2 } assertFalse(Downloader.downloadCandidates(first, listOf(first, second), target, true, null, cancelled, null)) assertEquals("a cancel must not fall back to the next source", listOf<String?>(null), requests.toList()) diff --git a/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationShortcutsTest.kt b/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationShortcutsTest.kt new file mode 100644 index 0000000000..961d3d25ab --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationShortcutsTest.kt @@ -0,0 +1,97 @@ +package com.droiddeck.launcher.core + +import android.app.Application +import android.content.ComponentName +import android.content.Intent +import android.content.pm.PackageManager +import android.provider.Settings +import androidx.test.core.app.ApplicationProvider +import com.droiddeck.launcher.input.HomeButtonService +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], application = Application::class) +class SteamIntegrationShortcutsTest { + private val context: Application = ApplicationProvider.getApplicationContext() + private val service = ComponentName(context, HomeButtonService::class.java) + + private fun listed() = context.packageManager.queryIntentServices( + Intent("android.accessibilityservice.AccessibilityService").setPackage(context.packageName), 0, + ).any { ComponentName(it.serviceInfo.packageName, it.serviceInfo.name) == service } + + private fun choose(value: String?) = + Settings.Secure.putString(context.contentResolver, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, value) + + @Test fun theShortcutsServiceIsHiddenUntilChosen() { + assertTrue(listed()) + assertFalse(SteamIntegration.shortcutsChosen(context)) + SteamIntegration.syncShortcutsListing(context) + assertFalse(listed()) + assertEquals(PackageManager.COMPONENT_ENABLED_STATE_DISABLED, context.packageManager.getComponentEnabledSetting(service)) + } + + @Test fun anUpdateKeepsAServiceTheUserAlreadyTurnedOn() { + choose(service.flattenToString()) + SteamIntegration.syncShortcutsListing(context) + assertTrue(listed()) + assertTrue(SteamIntegration.shortcutsChosen(context)) + } + + @Test fun openingShortcutSetupListsTheServiceAndBackingOutHidesItAgain() { + SteamIntegration.setShortcutsListed(context, true) + assertTrue(listed()) + SteamIntegration.syncShortcutsListing(context) + assertFalse(listed()) + assertEquals(PackageManager.COMPONENT_ENABLED_STATE_DISABLED, context.packageManager.getComponentEnabledSetting(service)) + } + + @Test fun aChosenServiceStaysListed() { + choose("other.app/.Reader:" + service.flattenToShortString()) + assertTrue(SteamIntegration.shortcutsChosen(context)) + SteamIntegration.syncShortcutsListing(context) + assertTrue(listed()) + choose(service.flattenToString()) + assertTrue(SteamIntegration.shortcutsChosen(context)) + choose("other.app/.Reader") + assertFalse(SteamIntegration.shortcutsChosen(context)) + SteamIntegration.syncShortcutsListing(context) + assertFalse(listed()) + } + + @Test fun anUpdateHidesAnUnchosenServiceWithoutOpeningDroidDeck() { + val replaced = Intent(Intent.ACTION_MY_PACKAGE_REPLACED).setPackage(context.packageName) + assertTrue(context.packageManager.queryBroadcastReceivers(replaced, 0) + .any { it.activityInfo.name == ShortcutsListingReceiver::class.java.name }) + assertTrue(listed()) + ShortcutsListingReceiver().onReceive(context, replaced) + assertFalse(listed()) + } + + @Test fun anUpdateLeavesAChosenServiceListed() { + choose(service.flattenToString()) + ShortcutsListingReceiver().onReceive(context, Intent(Intent.ACTION_MY_PACKAGE_REPLACED)) + assertTrue(listed()) + assertTrue(SteamIntegration.shortcutsChosen(context)) + } + + @Test fun otherBroadcastsChangeNothing() { + ShortcutsListingReceiver().onReceive(context, Intent(Intent.ACTION_BOOT_COMPLETED)) + assertTrue(listed()) + } + + @Test fun turningTheServiceOffInSettingsHidesItAtOnce() { + choose(service.flattenToString()) + val running = org.robolectric.Robolectric.buildService(HomeButtonService::class.java).create().get() + running.onUnbind(null) + assertTrue(listed()) + choose("") + running.onUnbind(null) + assertFalse(listed()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/files/AllFilesAccessTest.kt b/app/src/test/java/com/droiddeck/launcher/files/AllFilesAccessTest.kt new file mode 100644 index 0000000000..a5eba9c3e0 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/AllFilesAccessTest.kt @@ -0,0 +1,24 @@ +package com.droiddeck.launcher.files + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class AllFilesAccessTest { + @Test + fun androidTenAndOlderNeverAsks() { + assertFalse(AllFilesAccess.missing(sdk = 29) { false }) + } + + @Test + fun androidElevenAsksUntilGranted() { + assertTrue(AllFilesAccess.missing(sdk = 30) { false }) + assertFalse(AllFilesAccess.missing(sdk = 30) { true }) + } + + @Test + fun newerAndroidAsksUntilGranted() { + assertTrue(AllFilesAccess.missing(sdk = 35) { false }) + assertFalse(AllFilesAccess.missing(sdk = 35) { true }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt index 39591f21aa..5e8eed0c83 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt @@ -138,6 +138,19 @@ class AddedExesTest { SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") } + @Test fun aGroupFolderWithFoldersHoldingNoGameStillListsEachGame() { + val storage = visualNovels() + val vns = File(storage, "VNs") + File(vns, "steamapps/common").mkdirs() + File(vns, "Notes/readme.txt").apply { parentFile!!.mkdirs(); writeText("x") } + assertEquals(listOf("Albatross", "Angel Beats", "Rance 01", "Sayonara").map { File(vns, it).path }, + AddedGames.scan(app).map { it.folder.path }) + val pick = File(vns, "Rance 01/Rance01.exe") + assertEquals(pick.parentFile!!.path, result(AddedGames.addExe(app, pick)).folder.path) + assertEquals(4, AddedGames.scan(app).size) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + @Test fun anExePickedInAGroupFolderOnGameStorageIsItsOwnGame() { val storage = visualNovels() val vns = File(storage, "VNs") diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt index 473c43922a..cc8237af3d 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt @@ -24,12 +24,12 @@ class AddedGameArtFillTest { private val coverBytes = byteArrayOf(9, 9, 9) - private fun game(name: String, appId: Long, cover: Boolean = true, source: String = Library.ADDED): AddedGames.Game { + private fun game(name: String, appId: Long, cover: Boolean = true, source: String = Library.ADDED, storeId: String? = null): AddedGames.Game { val dir = tmp.newFolder(name) File(dir, "steam_appid.txt").writeText("504230") if (cover) File(dir, "cover.jpg").writeBytes(coverBytes) val exe = File(dir, "$name.exe").apply { writeText("x") } - return AddedGames.Game(dir, name, exe, "/g/$name.exe", "/g", appId, appId, emptyList(), source = source) + return AddedGames.Game(dir, name, exe, "/g/$name.exe", "/g", appId, appId, emptyList(), source = source, storeId = storeId) } private class Calls { @@ -154,6 +154,121 @@ class AddedGameArtFillTest { assertFalse(File(AddedGameArt.cacheDir(app, second), AddedGameArt.EXTRAS_TRIED).exists()) } + private fun steamFrom(asked: MutableList<String>, bytes: Byte, search: Int? = null, slotsAsked: MutableList<Set<Slot>> = ArrayList()) = AddedGameArt.Sources( + storeLogo = { false }, + steamSearch = { if (search == null) fail("searched although the game names its appid"); search }, + steam = { id, cache, slots -> + asked += id + slotsAsked += slots + slots.forEach { File(cache, steamNames.getValue(it)).writeBytes(byteArrayOf(bytes)) } + slots.isNotEmpty() + }, + sgdbGame = { _, _, _ -> null }, + sgdb = { _, _, _, _ -> false }, + ) + + @Test fun nameMatchedBattleNetArtIsForgottenOnce() { + val game = game("World of Warcraft: Forever", 9001, source = com.droiddeck.launcher.stores.Store.BATTLENET.id, storeId = "wow_forever") + val cache = AddedGameArt.cacheDir(app, game).apply { mkdirs() } + File(cache, "logo.png").writeBytes(byteArrayOf(1)) + File(cache, "p.jpg").writeBytes(byteArrayOf(3)) + File(cache, "sgdb-id").writeText("5") + assertTrue(AddedGameArt.forgetNameMatchedBattleNetArt(app, game)) + assertFalse(File(cache, "logo.png").isFile) + assertTrue(File(cache, "p.jpg").isFile) + assertFalse(File(cache, "sgdb-id").isFile) + File(cache, "logo.png").writeBytes(byteArrayOf(2)) + assertFalse(AddedGameArt.forgetNameMatchedBattleNetArt(app, game)) + assertTrue(File(cache, "logo.png").isFile) + } + + @Test fun battleNetArtFoundByItsSteamIdIsKept() { + val game = game("Call of Duty: Modern Warfare III", 9002, source = com.droiddeck.launcher.stores.Store.BATTLENET.id, storeId = "pinta") + val cache = AddedGameArt.cacheDir(app, game).apply { mkdirs() } + File(cache, "logo.png").writeBytes(byteArrayOf(1)) + assertFalse(AddedGameArt.forgetNameMatchedBattleNetArt(app, game)) + assertTrue(File(cache, "logo.png").isFile) + } + + @Test fun artOfTheAppTheFilesNamedBeforeIsFetchedAgain() { + val g = game("Peak", 0x8100000AL, cover = false) + File(g.folder, "steam_appid.txt").writeText("1029210") + val asked = ArrayList<String>() + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 1))) + File(g.folder, "steam_appid.txt").writeText("3527290") + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2))) + assertEquals(listOf("1029210", "3527290"), asked) + assertArrayEquals(byteArrayOf(2), File(AddedGameArt.cacheDir(app, g), "p.jpg").readBytes()) + assertFalse(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 3))) + assertEquals(2, asked.size) + } + + @Test fun aPictureTheUserChoseOutlivesTheChange() { + val g = game("Peak", 0x8100000BL, cover = false) + File(g.folder, "steam_appid.txt").writeText("1029210") + AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(ArrayList(), 1)) + val picked = File(tmp.root, "mine.jpg").apply { writeBytes(byteArrayOf(7)) } + assertTrue(AddedGameArt.store(AddedGameArt.cacheDir(app, g), Slot.COVER, AddedGameArt.Option(AddedGameArt.FILE, picked.path, picked.path))) + File(g.folder, "steam_appid.txt").writeText("3527290") + val asked = ArrayList<String>() + val slots = ArrayList<Set<Slot>>() + AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2, slotsAsked = slots)) + assertArrayEquals(byteArrayOf(7), AddedGameArt.resolve(app, g).portrait!!.readBytes()) + assertEquals(listOf("3527290"), asked) + assertEquals(listOf(setOf(Slot.WIDE, Slot.BACKGROUND, Slot.LOGO)), slots) + val cache = AddedGameArt.cacheDir(app, g) + assertArrayEquals(byteArrayOf(2), File(cache, "header.jpg").readBytes()) + assertArrayEquals(byteArrayOf(2), File(cache, "hero.jpg").readBytes()) + assertFalse(File(cache, AddedGameArt.REFETCH).exists()) + } + + private fun olderBuildsArt(g: AddedGames.Game, marker: String): File = AddedGameArt.cacheDir(app, g).apply { + mkdirs() + File(this, "steam-appid").writeText(marker) + steamNames.values.forEach { File(this, it).writeBytes(byteArrayOf(1)) } + } + + @Test fun anOlderBuildsSpacewarMarkerGoesWithItsArt() { + val g = game("Peak", 0x8100000DL, cover = false) + File(g.folder, "steam_appid.txt").writeText("480") + val cache = olderBuildsArt(g, "480") + val asked = ArrayList<String>() + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2, search = 3527290))) + assertEquals(listOf("3527290"), asked) + assertArrayEquals(byteArrayOf(2), File(cache, "p.jpg").readBytes()) + assertFalse(File(cache, "steam-appid").exists()) + } + + @Test fun anOlderBuildsMatchStaysWhileTheFilesNameNoApp() { + val g = game("Hades", 0x8100000EL, cover = false) + File(g.folder, "steam_appid.txt").delete() + val cache = olderBuildsArt(g, "1145360") + assertFalse(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(ArrayList(), 2))) + assertEquals("1145360", File(cache, "steam-appid").readText()) + assertArrayEquals(byteArrayOf(1), File(cache, "p.jpg").readBytes()) + } + + @Test fun anOlderBuildsMatchGivesWayToTheAppTheFilesName() { + val g = game("Peak", 0x8100000FL, cover = false) + File(g.folder, "steam_appid.txt").writeText("3527290") + val cache = olderBuildsArt(g, "1029210") + val asked = ArrayList<String>() + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2))) + assertEquals(listOf("3527290"), asked) + assertArrayEquals(byteArrayOf(2), File(cache, "p.jpg").readBytes()) + assertFalse(File(cache, "steam-appid").exists()) + } + + @Test fun filesThatStopNamingAnAppFallBackToTheGamesName() { + val g = game("Peak", 0x8100000CL, cover = false) + File(g.folder, "steam_appid.txt").writeText("1029210") + val asked = ArrayList<String>() + AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 1)) + File(g.folder, "steam_appid.txt").writeText("480") + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2, search = 3527290))) + assertEquals(listOf("1029210", "3527290"), asked) + } + @Test fun nothingIsFetchedWhenArtIsOff() { SessionPrefs.setAddedGamesArt(app, false) val calls = Calls() diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt index 095cf9a5c5..124940b918 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt @@ -66,6 +66,29 @@ class AddedGameArtLookupTest { assertEquals(SteamMatch.Certainty.NAME, match.certainty) } + @Test fun anEarlierBuildsSpacewarLookupIsNotAMatch() { + val dir = tmp.newFolder("Peak") + val exe = File(dir, "PEAK.exe").apply { writeText("x") } + val legacy = File(tmp.newFolder(), "steam-appid").apply { writeText("480") } + assertEquals(3527290, SteamMatch.resolve(app, dir.path, exe, "PEAK", legacy = legacy) { 3527290 }.appId) + } + + @Test fun aSavedSpacewarMatchIsNotAMatch() { + val dir = tmp.newFolder("Peak") + val exe = File(dir, "PEAK.exe").apply { writeText("x") } + SteamMatch.put(app, dir.path, SteamMatch.Match(480, SteamMatch.Certainty.NAME, "store search", System.currentTimeMillis())) + assertNull(SteamMatch.resolve(app, dir.path, exe, "PEAK").appId) + assertEquals(3527290, SteamMatch.resolve(app, dir.path, exe, "PEAK") { 3527290 }.appId) + } + + @Test fun aStoreSearchAnsweringSpacewarIsNoMatch() { + val dir = tmp.newFolder("Spacewar Fan Remake") + val exe = File(dir, "game.exe").apply { writeText("x") } + val match = SteamMatch.resolve(app, dir.path, exe, "Spacewar Fan Remake") { 480 } + assertNull(match.appId) + assertEquals(SteamMatch.Certainty.NONE, match.certainty) + } + @Test fun aStoreResultIsTakenOnlyWhenItsNameMatches() { assertNull(AddedGameArt.pickStoreResult("My Obscure Game", listOf("10" to "Totally Different", "11" to "Another One"))) assertEquals("20", AddedGameArt.pickStoreResult("Hades", listOf("19" to "Hades II Soundtrack Bundle Extra", "20" to "Hades"))) @@ -172,4 +195,9 @@ class AddedGameArtLookupTest { assertEquals("grids/game/5?dimensions=600x900&nsfw=false&humor=false", SteamGridDb.path(5, AddedGameArt.Slot.COVER)) assertEquals("grids/game/5?dimensions=460x215,920x430&nsfw=false&humor=false", SteamGridDb.path(5, AddedGameArt.Slot.WIDE)) } + + @Test fun anExactLookupDoesNotTakeTheBaseGameForASubtitledOne() { + assertNull(SteamGridDb.exactMatch("World of Warcraft: Forever", listOf(1 to "World of Warcraft"))) + assertEquals(2, SteamGridDb.exactMatch("World of Warcraft: Forever", listOf(1 to "World of Warcraft", 2 to "World of Warcraft: Forever"))) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesStoreScanTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesStoreScanTest.kt index 410d298acd..1c61034221 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesStoreScanTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesStoreScanTest.kt @@ -18,12 +18,12 @@ import org.robolectric.annotation.Config class AddedGamesStoreScanTest { private val app get() = RuntimeEnvironment.getApplication() - private fun install(store: Store, id: String, title: String, exe: String, launcher: Boolean = false): File { + private fun install(store: Store, id: String, title: String, exe: String, launcher: Boolean = false, workdir: String? = null): File { SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") val folder = File(StoreInstallRoot.storeDir(StoreInstallRoot.installRoot(app), store), StoreInstallRoot.folderName(title, id)) File(folder, exe).apply { parentFile!!.mkdirs(); writeText("game") } File(folder, "unins000.exe").writeText("uninstaller") - var sidecar = StoreGameSidecar(store, id, title, exe, args = if (launcher) listOf("-EpicPortal") else emptyList()) + var sidecar = StoreGameSidecar(store, id, title, exe, workdir = workdir, args = if (launcher) listOf("-EpicPortal") else emptyList()) if (launcher) sidecar = StoreLaunch.writeLauncher(folder, sidecar) sidecar.write(folder) return folder @@ -81,4 +81,39 @@ class AddedGamesStoreScanTest { assertTrue(listing.contains(StoreLaunch.LAUNCHER)) assertTrue(listing.contains("\"store\":\"${Store.EPIC.id}\"")) } + + // GOG runs a task from its declared working directory; the install root when it declares none. + @Test fun aTaskWorkingDirectoryBecomesTheShortcutsStartIn() { + val folder = install(Store.GOG, "1207658924", "Witcher Game", "System/witcher.exe", workdir = "System") + val game = AddedGames.scan(app).single { it.folder.absolutePath == folder.absolutePath } + assertTrue(game.guestDir.endsWith("/Witcher Game/System")) + } + + @Test fun anEmptyTaskWorkingDirectoryIsTheGameFolder() { + val folder = install(Store.GOG, "1207658924", "Witcher Game", "System/witcher.exe", workdir = "") + val game = AddedGames.scan(app).single { it.folder.absolutePath == folder.absolutePath } + assertEquals("/root/Games/Stores/GOG/Witcher Game", game.guestDir) + } + + @Test fun aSidecarWithoutATaskDirectoryStillStartsInTheExeFolder() { + val folder = install(Store.GOG, "7", "Old Game", "bin/old.exe") + val game = AddedGames.scan(app).single { it.folder.absolutePath == folder.absolutePath } + assertTrue(game.guestDir.endsWith("/Old Game/bin")) + } + + // A picked exe that is not the store's own keeps its own folder, not the task directory. + @Test fun aPickedExeOnAGogGameStartsInItsOwnFolder() { + val folder = install(Store.GOG, "1207658924", "Witcher Game", "System/witcher.exe", workdir = "") + val tool = File(folder, "Tools/Editor.exe").apply { parentFile!!.mkdirs(); writeText("tool") } + AddedExes.put(app, AddedExes.Entry(folder.path, tool.path, picked = true)) + val game = AddedGames.scan(app).single { it.folder.absolutePath == folder.absolutePath } + assertTrue(game.guestDir.endsWith("/Witcher Game/Tools")) + } + + @Test fun pickingTheStoresOwnExeKeepsTheTaskDirectory() { + val folder = install(Store.GOG, "1207658924", "Witcher Game", "System/witcher.exe", workdir = "") + AddedExes.put(app, AddedExes.Entry(folder.path, File(folder, "System/witcher.exe").path, picked = true)) + val game = AddedGames.scan(app).single { it.folder.absolutePath == folder.absolutePath } + assertEquals("/root/Games/Stores/GOG/Witcher Game", game.guestDir) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt index d67170d1e7..1bd80fea4b 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt @@ -31,8 +31,25 @@ class GameIdentifierTest { fun steamAppIdTxt_inSteamSettingsSubdir_isFound() { val dir = tmp.newFolder("Game") File(dir, "steam_settings").mkdirs() - File(dir, "steam_settings/steam_appid.txt").writeText("480") - assertEquals(480, GameIdentifier.identify(exeIn(dir)).appId) + File(dir, "steam_settings/steam_appid.txt").writeText("3527290") + assertEquals(3527290, GameIdentifier.identify(exeIn(dir)).appId) + } + + @Test + fun spacewarAppId_namesNoGame() { + val dir = tmp.newFolder("PEAK") + File(dir, "steam_appid.txt").writeText("480") + File(dir, "steam_emu.ini").writeText("[Settings]\nAppId=480\n") + assertNull(GameIdentifier.identify(exeIn(dir)).appId) + } + + @Test + fun spacewarAppId_fallsThroughToTheGamesOwnId() { + val dir = tmp.newFolder("PEAK") + File(dir, "steam_appid.txt").writeText("480") + File(dir, "steam_settings").mkdirs() + File(dir, "steam_settings/steam_appid.txt").writeText("3527290") + assertEquals(3527290, GameIdentifier.identify(exeIn(dir)).appId) } @Test @@ -44,6 +61,30 @@ class GameIdentifierTest { assertEquals(GameIdentifier.Source.STEAM_EMU_INI, id.source) } + @Test + fun spacewarManifest_namesNoGame() { + val steamapps = tmp.newFolder("steamapps") + File(steamapps, "appmanifest_480.acf").writeText(""""AppState" { "appid" "480" "name" "Spacewar" "installdir" "PEAK" }""") + val game = File(steamapps, "common/PEAK").apply { mkdirs() } + File(game, "steam_appid.txt").writeText("3527290") + val id = GameIdentifier.identify(exeIn(game, "PEAK.exe")) + assertEquals(3527290, id.appId) + assertEquals(GameIdentifier.Source.STEAM_APPID_TXT, id.source) + assertTrue(id.name != "Spacewar") + } + + @Test + fun spacewarManifest_leavesTheGamesOwnManifestForTheSameFolder() { + val steamapps = tmp.newFolder("steamapps") + File(steamapps, "appmanifest_480.acf").writeText(""""AppState" { "appid" "480" "name" "Spacewar" "installdir" "PEAK" }""") + File(steamapps, "appmanifest_3527290.acf").writeText(""""AppState" { "appid" "3527290" "name" "PEAK" "installdir" "PEAK" }""") + val game = File(steamapps, "common/PEAK").apply { mkdirs() } + val id = GameIdentifier.identify(exeIn(game, "PEAK.exe")) + assertEquals(3527290, id.appId) + assertEquals("PEAK", id.name) + assertEquals(GameIdentifier.Source.STEAM_MANIFEST_ACF, id.source) + } + @Test fun steamManifestAcf_matchedByInstalldir_givesAppIdAndName() { val steamapps = tmp.newFolder("steamapps") diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GamesFolderMigrationTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GamesFolderMigrationTest.kt index eb101d293c..4994b3aebf 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GamesFolderMigrationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GamesFolderMigrationTest.kt @@ -67,6 +67,105 @@ class GamesFolderMigrationTest { assertTrue(GameStorage.gamesFolderLibraries(app).isEmpty()) } + @Test fun aFolderOfGamesInAnOldGamesFolderBecomesOneEntryPerGame() { + val pc = tmp.newFolder("PC") + val rance = File(pc, "VNs/Rance 01"); exe(pc, "VNs/Rance 01/Rance01.exe") + val albatross = File(pc, "VNs/Albatross"); exe(pc, "VNs/Albatross/Albatross Log.exe") + File(pc, "VNs/steamapps").mkdirs() + val solo = File(pc, "Solo"); exe(pc, "Solo/Solo.exe") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + GamesFolderMigration.run(app) + assertEquals(setOf(albatross.path, rance.path, solo.path), AddedExes.list(app).map { it.folder }.toSet()) + assertEquals(setOf(albatross.path, rance.path, solo.path), AddedGames.scan(app).map { it.folder.path }.toSet()) + } + + @Test fun aRemovedOrAlreadyAddedFolderOfGamesKeepsItsState() { + val pc = tmp.newFolder("PC") + val gone = File(pc, "Gone"); exe(pc, "Gone/A/a.exe"); exe(pc, "Gone/B/b.exe") + val kept = File(pc, "Kept"); val keptExe = exe(pc, "Kept/A/a.exe"); exe(pc, "Kept/B/b.exe") + val store = File(pc, "Store"); exe(pc, "Store/Content/game.exe"); exe(pc, "Store/Tools/tool.exe") + StoreGameSidecar.file(store).writeText("""{"store":"gog","id":"2","title":"Store Game","exe":"Content/game.exe"}""") + val solo = File(pc, "Solo"); exe(pc, "Solo/Extras/viewer.exe"); exe(pc, "Solo/Content/solo.exe") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + SessionPrefs.setAddedGameRemoved(app, gone.path, true) + AddedExes.put(app, AddedExes.Entry(kept.path, keptExe.path)) + GamesFolderMigration.run(app) + val entries = AddedExes.list(app).map { it.folder }.toSet() + assertEquals(setOf(File(gone, "A").path, File(gone, "B").path, kept.path, solo.path), entries) + assertTrue(SessionPrefs.removedAddedGames(app).containsAll(listOf(File(gone, "A").path, File(gone, "B").path))) + assertEquals(setOf(kept.path, solo.path), AddedGames.scan(app).map { it.folder.path }.toSet()) + } + + @Test fun aGameSelectedOutsideTheRankedFoldersStaysListed() { + val pc = tmp.newFolder("PC") + val vns = File(pc, "VNs") + exe(pc, "VNs/A/a.exe"); exe(pc, "VNs/B/b.exe") + val pick = exe(pc, "VNs/C/helper.exe") + val loose = File(pc, "Loose"); exe(pc, "Loose/A/a.exe"); exe(pc, "Loose/B/b.exe") + val loosePick = exe(pc, "Loose/setup.exe") + val lib = File(pc, "Lib"); exe(pc, "Lib/A/a.exe"); exe(pc, "Lib/B/b.exe") + val libPick = exe(pc, "Lib/steamapps/common/Tool/helper.exe") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + SessionPrefs.setAddedGameExe(app, vns.path, pick.path) + SessionPrefs.setAddedGameExe(app, loose.path, loosePick.path) + SessionPrefs.setAddedGameExe(app, lib.path, libPick.path) + GamesFolderMigration.run(app) + val entries = AddedExes.list(app).associateBy { it.folder } + assertEquals(setOf(File(vns, "A").path, File(vns, "B").path, File(vns, "C").path, loose.path, lib.path), entries.keys) + assertEquals(libPick.path, entries.getValue(lib.path).exe) + assertEquals(pick.path, entries.getValue(File(vns, "C").path).exe) + assertTrue(entries.getValue(File(vns, "C").path).picked) + assertEquals(loosePick.path, entries.getValue(loose.path).exe) + val games = AddedGames.scan(app).associateBy { it.folder.path } + assertEquals(pick.path, games.getValue(File(vns, "C").path).exe.path) + assertEquals(loosePick.path, games.getValue(loose.path).exe.path) + } + + @Test fun aSplitFolderHandsItsSettingsToTheGameItLaunched() { + val pc = tmp.newFolder("PC") + val vns = File(pc, "VNs") + exe(pc, "VNs/Albatross/Albatross.exe") + val pick = exe(pc, "VNs/Rance 01/Rance01.exe") + File(pc, "VNs/Notes").mkdirs() + val plain = File(pc, "Plain"); exe(pc, "Plain/A/a.exe"); exe(pc, "Plain/B/b.exe") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + SessionPrefs.setAddedGameExe(app, vns.path, pick.path) + SessionPrefs.addedGameAppId(app, vns.path, 0x8111_2222L) + SessionPrefs.setAddedGameName(app, vns.path, "Rance") + SessionPrefs.setAddedGameLaunch(app, vns.path, "-windowed") + SessionPrefs.setAddedGameName(app, File(vns, "Rance 01").path, "Rance 01 Remake") + SessionPrefs.addedGameAppId(app, plain.path, 0x8333_4444L) + GamesFolderMigration.run(app) + val rance = File(vns, "Rance 01").path + val games = AddedGames.scan(app).associateBy { it.folder.path } + assertEquals(0x8111_2222L, games.getValue(rance).appId) + assertEquals("Rance 01 Remake", games.getValue(rance).name) + assertEquals("-windowed", games.getValue(rance).launchOptions) + assertEquals(pick.path, games.getValue(rance).exe.path) + assertTrue(games.getValue(File(vns, "Albatross").path).appId != 0x8111_2222L) + assertEquals("", SessionPrefs.addedGameLaunch(app, File(vns, "Albatross").path)) + assertEquals(0x8333_4444L, games.getValue(File(plain, "A").path).appId) + assertTrue(games.getValue(File(plain, "B").path).appId != 0x8333_4444L) + } + + @Test fun aSplitFolderKeepsTheExeItLaunchedWithoutAPick() { + val pc = tmp.newFolder("PC") + val vns = File(pc, "VNs") + val launched = exe(pc, "VNs/Rance/VNsPlayer.exe"); exe(pc, "VNs/Rance/Rance.exe") + val other = exe(pc, "VNs/Other/Other.exe") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + SessionPrefs.addedGameAppId(app, vns.path, 0x8555_6666L) + GamesFolderMigration.run(app) + val entries = AddedExes.list(app).associateBy { it.folder } + assertEquals(launched.path, entries.getValue(File(vns, "Rance").path).exe) + assertTrue(entries.getValue(File(vns, "Rance").path).picked) + assertFalse(entries.getValue(File(vns, "Other").path).picked) + val games = AddedGames.scan(app).associateBy { it.folder.path } + assertEquals(launched.path, games.getValue(File(vns, "Rance").path).exe.path) + assertEquals(0x8555_6666L, games.getValue(File(vns, "Rance").path).appId) + assertEquals(other.path, games.getValue(File(vns, "Other").path).exe.path) + } + @Test fun runningAgainChangesNothing() { val pc = tmp.newFolder("PC") exe(pc, "Alpha/Alpha.exe") diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt new file mode 100644 index 0000000000..46cdd111c5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt @@ -0,0 +1,163 @@ +package com.droiddeck.launcher.frontend + +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import java.io.File +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class SteamLaunchOptionsTest { + @get:Rule val tmp = TemporaryFolder() + + private fun config(apps: String) = listOf( + "\"UserLocalConfigStore\"", "{", "\t\"Software\"", "\t{", "\t\t\"Valve\"", "\t\t{", "\t\t\t\"Steam\"", "\t\t\t{", + apps, "\t\t\t}", "\t\t}", "\t}", "\t\"WebStorage\"", "\t{", "\t\t\"x\"\t\t\"1\"", "\t}", "}", "", + ).joinToString("\n") + + private fun apps(vararg lines: String) = (listOf("\t\t\t\t\"apps\"", "\t\t\t\t{") + lines + "\t\t\t\t}").joinToString("\n") + + private val sparking = arrayOf( + "\t\t\t\t\t\"1790600\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"LastPlayed\"\t\t\"1761897600\"", "\t\t\t\t\t\t\"LaunchOptions\"\t\t\"-dx11\"", "\t\t\t\t\t}", + ) + + @Test fun replacesTheOptionsSteamHas() { + val text = config(apps(*sparking)) + val updated = SteamLaunchOptions.withLaunchOptions(text, 1790600, "-dx12")!! + assertEquals(text.replace("\"-dx11\"", "\"-dx12\""), updated) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun addsOptionsToAGameThatHasNone() { + val text = config(apps("\t\t\t\t\t\"1790600\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"LastPlayed\"\t\t\"1761897600\"", "\t\t\t\t\t}")) + assertEquals(config(apps(*sparking)).replace("-dx11", "-vulkan"), SteamLaunchOptions.withLaunchOptions(text, 1790600, "-vulkan")) + } + + @Test fun addsTheGameAndTheAppsSectionWhenSteamHasNeither() { + val updated = SteamLaunchOptions.withLaunchOptions(config("\t\t\t\t\"language\"\t\t\"english\""), 1790600, "-dx11")!! + assertEquals( + config( + "\t\t\t\t\"language\"\t\t\"english\"\n" + + apps("\t\t\t\t\t\"1790600\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"LaunchOptions\"\t\t\"-dx11\"", "\t\t\t\t\t}"), + ), + updated, + ) + assertEquals("-dx11", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun quotesAndBackslashesAreEscapedAndReadBack() { + val options = "PROTON_LOG=1 %command% -path \"C:\\Games\\DB\"" + val updated = SteamLaunchOptions.withLaunchOptions(config(apps(*sparking)), 1790600, options)!! + assertEquals(true, updated.contains("\"PROTON_LOG=1 %command% -path \\\"C:\\\\Games\\\\DB\\\"\"")) + assertEquals(options, SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun emptyOptionsClearSteams() { + val updated = SteamLaunchOptions.withLaunchOptions(config(apps(*sparking)), 1790600, "")!! + assertEquals("", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun windowsLineEndsAreKept() { + val text = config("\t\t\t\t\"language\"\t\t\"english\"").replace("\n", "\r\n") + val updated = SteamLaunchOptions.withLaunchOptions(text, 1790600, "-dx11")!! + assertEquals(false, updated.replace("\r\n", "").contains('\n')) + assertEquals("-dx11", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun onlyTheGamesOwnSectionChanges() { + val other = arrayOf( + "\t\t\t\t\t\"7\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"1790600\"", "\t\t\t\t\t\t{", "\t\t\t\t\t\t\t\"LaunchOptions\"\t\t\"keep\"", "\t\t\t\t\t\t}", "\t\t\t\t\t}", + ) + val updated = SteamLaunchOptions.withLaunchOptions(config(apps(*other, *sparking)), 1790600, "-dx12")!! + assertEquals(true, updated.contains("\"keep\"")) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(updated, 1790600)) + assertNull(SteamLaunchOptions.launchOptions(config(apps(*other)), 1790600)) + } + + @Test fun otherFilesAreLeftAlone() { + assertNull(SteamLaunchOptions.withLaunchOptions("\"InstallConfigStore\"\n{\n}\n", 1790600, "-dx11")) + assertNull(SteamLaunchOptions.withLaunchOptions("", 1790600, "-dx11")) + assertNull(SteamLaunchOptions.launchOptions("", 1790600)) + } + + private fun steamHome(home: File = tmp.newFolder("Steam")): File = home.also { + File(home, "config").mkdirs() + File(home, "config/loginusers.vdf").writeText( + "\"users\"\n{\n\t\"76561198021239924\"\n\t{\n\t\t\"AccountName\"\t\t\"a\"\n\t\t\"MostRecent\"\t\t\"1\"\n\t}\n}\n") + } + + private fun localConfig(home: File, account: String) = File(home, "userdata/$account/config/localconfig.vdf").apply { parentFile!!.mkdirs() } + + @Test fun aChangeGoesToTheSignedInAccountOnly() { + val home = steamHome() + val signedIn = localConfig(home, "60974196").apply { writeText(config(apps(*sparking))) } + val other = localConfig(home, "123").apply { writeText(config("\t\t\t\t\"language\"\t\t\"english\"")) } + val untouched = other.readText() + assertTrue(SteamLaunchOptions.write(home, 1790600, "-dx12")) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(signedIn.readText(), 1790600)) + assertEquals(untouched, other.readText()) + assertFalse(File(signedIn.parentFile, "localconfig.vdf.staged").exists()) + } + + @Test fun whatSteamWroteLastIsWhatTheGameHas() { + val home = steamHome() + val config = localConfig(home, "60974196").apply { writeText(config(apps(*sparking))) } + assertTrue(SteamLaunchOptions.write(home, 1790600, "-dx12")) + config.writeText(SteamLaunchOptions.withLaunchOptions(config.readText(), 1790600, "-vulkan")!!) + assertEquals("-vulkan", SteamLaunchOptions.steam(home, 1790600)) + assertNull(SteamLaunchOptions.steam(home, 400)) + } + + private val app get() = RuntimeEnvironment.getApplication() + + private val written = ArrayList<File>() + + private fun sessionConfig(): File { + val home = steamHome(SessionPrefs.activeSteamRoot(app)) + return localConfig(home, "60974196").apply { writeText(config(apps(*sparking))) } + .also { written += it; written += File(home, "config/loginusers.vdf") } + } + + @After fun noSession() { + SessionState.running = false + SessionState.mode = SessionService.MODE_STEAM + written.forEach { it.delete() } + } + + @Test fun aValueChangedInSteamSinceItWasShownIsNotOverwritten() { + val config = sessionConfig() + assertEquals(SteamLaunchOptions.Saved.NO, SteamLaunchOptions.set(app, 1790600, "-dx12", shown = "-vulkan")) + assertEquals("-dx11", SteamLaunchOptions.launchOptions(config.readText(), 1790600)) + assertEquals(SteamLaunchOptions.Saved.YES, SteamLaunchOptions.set(app, 1790600, "-dx12", shown = "-dx11")) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(config.readText(), 1790600)) + } + + @Test fun aDesktopSessionLeavesTheFileToItsClient() { + val config = sessionConfig() + val before = config.readText() + SessionState.running = true + SessionState.mode = SessionService.MODE_DESKTOP + assertEquals(SteamLaunchOptions.Saved.DESKTOP, SteamLaunchOptions.set(app, 1790600, "-dx12", shown = "-dx11")) + assertEquals(before, config.readText()) + } + + @Test fun nothingIsWrittenWithoutASignedInAccountsConfig() { + assertFalse(SteamLaunchOptions.write(tmp.newFolder("NoSteam"), 1790600, "-dx11")) + val home = steamHome() + assertFalse(SteamLaunchOptions.write(home, 1790600, "-dx11")) + localConfig(home, "60974196").writeText("\"InstallConfigStore\"\n{\n}\n") + assertFalse(SteamLaunchOptions.write(home, 1790600, "-dx11")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesDisplayTest.kt index 923f988487..38ccf36492 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesDisplayTest.kt @@ -93,7 +93,6 @@ class GlassesDisplayTest { @Test fun gtMaxSmartGlassesEdidUsesTheSameOutputSelectionAsViture() { val panel = display("SmartGlasses", productName = "SmartGlasses", productId = "980") assertEquals(panel.displayId, Glasses.selectGlassesDisplay(listOf(panel), usbPresent = true)?.displayId) - // The display remains usable while USB control reconnects during a mode switch. assertEquals(panel.displayId, Glasses.selectGlassesDisplay(listOf(panel), usbPresent = false)?.displayId) } @@ -126,7 +125,6 @@ class GlassesDisplayTest { } } - // Robolectric exposes display names and flags, but has no product-metadata setter. @Implements(Display::class) class ProductMetadataDisplay : ShadowDisplay() { var productMetadata: DeviceProductInfo? = null diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuProjectionTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuProjectionTest.kt index d1cd22769a..0192d98405 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuProjectionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMenuProjectionTest.kt @@ -63,7 +63,6 @@ class GlassesMenuProjectionTest { private object GlassesMenuProjection { data class Uv(val x: Float, val y: Float) - // Row-major head-to-anchor rotation; +Y is up, -Z is forward, output UV starts at the top left. fun intersect(frame: GlassesMenuPose.Frame, rayX: Float, rayY: Float, eye: Float, halfWidth: Float, distance: Float, aspect: Float): Uv? { if (frame.rotation.size != 9 || frame.position.size != 3 || frame.rotation.any { !it.isFinite() } || diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesOutputHandoffTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesOutputHandoffTest.kt index e1258f4893..1669d236fe 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesOutputHandoffTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesOutputHandoffTest.kt @@ -30,7 +30,6 @@ class GlassesOutputHandoffTest { private lateinit var screen: GlassesScreen @Before fun setup() { - // Exercise the output lifecycle without starting the native Linux runtime. activity = Robolectric.buildActivity(SessionActivity::class.java).get() phone = SurfaceView(activity) ReflectionHelpers.setField(activity, "surfaceView", phone) @@ -46,7 +45,7 @@ class GlassesOutputHandoffTest { @Test fun selectingGlassesDoesNotHidePhoneOrClaimOutputBeforeAttachment() { assertFalse(active()) assertEquals(View.VISIBLE, phone.visibility) - attach(phone.holder) // A late phone callback must not complete the handoff. + attach(phone.holder) assertFalse(active()) assertEquals(View.VISIBLE, phone.visibility) } diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt index 4b5972ede3..5c4b38d23c 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt @@ -183,11 +183,11 @@ class GlassesRenderingTest { picture3d = GlassesSettings.PICTURE_SCREEN) for (state in listOf(ultra.copy(displayId = -1), GlassesState())) { val preview = GlassesRendering.cardboard(base, settings, state, false, true) - assertTrue(preview.enabled) // Published as headset proximity, preventing standby. + assertTrue(preview.enabled) assertTrue(preview.mono) assertEquals(Cardboard.SOURCE_SBS, preview.source) assertEquals(Cardboard.Viewer.NONE.id, preview.viewer) - assertTrue(preview.headTracking) // Phone preference, not dormant glasses settings. + assertTrue(preview.headTracking) assertFalse(base.enabled) assertSame(base, GlassesRendering.cardboard(base, settings, state, false, false)) } diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSteamVrTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSteamVrTest.kt index 02ab5aca8d..8d41753742 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSteamVrTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesSteamVrTest.kt @@ -251,8 +251,6 @@ class GlassesSteamVrTest { .set(activity, LoadingState(activity).apply { visible = false }) SessionState.steamVr = true SessionState.mode = SessionService.MODE_STEAM - // Hold the external worker so status transitions can be exercised - // without launching a Linux runtime from the host test process. val worker = SessionActivity::class.java.getDeclaredField("steamVrWorker") .apply { isAccessible = true }.get(null) as ThreadPoolExecutor val blocked = CountDownLatch(1) diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoCalibrationTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoCalibrationTest.kt index 996b8fa8c2..70ef3a2219 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoCalibrationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoCalibrationTest.kt @@ -115,8 +115,6 @@ class RayNeoCalibrationTest { val upright = RayNeoOrientationFilter(profile.rotationXDeg, profile.gtMaxAxes, saved) .update(sample(floatArrayOf(-0.02f, 8.819f, 4.106f), reading.gyroDps)) assertArrayEquals(floatArrayOf(1f, 0f, 0f, 0f), upright, 0.001f) - // This was the reported failure: the same physical pose cannot calibrate - // through the Max's permutation and 35-degree mounting correction. assertNull(finish(RayNeoCalibrationCollector(RayNeoSensorAxes(35f, true), 0), sample = reading)) } diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoLinkTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoLinkTest.kt index 832d220c7b..a880bf96f3 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoLinkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoLinkTest.kt @@ -102,7 +102,6 @@ class RayNeoLinkTest { val cmd = bytes[1].toInt() and 0xff commands += cmd if (gtTraffic && cmd in listOf(0, 1)) { - // Notifications and unrelated ACKs can precede the requested response. for (other in listOf(0x08, 6, 7, 0x50)) { responses += ByteArray(64).apply { this[0] = 0x99.toByte(); this[1] = 0xc8.toByte(); this[2] = 64 diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilterTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilterTest.kt index c05b7eb192..0dc767629d 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilterTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoOrientationFilterTest.kt @@ -79,8 +79,6 @@ class RayNeoOrientationFilterTest { val first = screen(filter.update(sample(0, level))) val ref = HeadPose.recenter(first) var q = FloatArray(4) - // Physical 30-degree turn over one second, through the complete shared - // VITURE conversion and recenter pipeline. GT signs match device captures. repeat(100) { i -> val a = Math.toRadians((i + 1) * 0.3) val accel = when (axis) { diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoProtocolTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoProtocolTest.kt index 0cf6663086..03fcd5bb51 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoProtocolTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RayNeoProtocolTest.kt @@ -116,7 +116,7 @@ class RayNeoProtocolTest { @Test fun tickWrapDoesNotIntroduceOrientationJump() { val filter = RayNeoOrientationFilter(0f) filter.update(sample(0xfffffff0L, 90f)) - val q = filter.update(sample(84, 90f)) // 100 ticks = 10ms across uint32 rollover. + val q = filter.update(sample(84, 90f)) assertEquals(kotlin.math.sin(Math.PI * 0.005).toFloat(), q[2], 1e-4f) } } diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/VitureSdkTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/VitureSdkTest.kt index 0bc140777e..3be90f93cd 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/VitureSdkTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/VitureSdkTest.kt @@ -71,8 +71,8 @@ class VitureSdkTest { val s = kotlin.math.sin(Math.PI / 12).toFloat() val c = kotlin.math.cos(Math.PI / 12).toFloat() for ((axis, expected) in listOf( - 2 to floatArrayOf(-0.5f, 0f, -0.8660254f), // Observed left turn: positive Y. - 1 to floatArrayOf(0f, 0.5f, -0.8660254f), // Observed upward look: positive X. + 2 to floatArrayOf(-0.5f, 0f, -0.8660254f), + 1 to floatArrayOf(0f, 0.5f, -0.8660254f), 3 to floatArrayOf(-0.5f, 0.8660254f, 0f), )) { val q = floatArrayOf(c, 0f, 0f, 0f).apply { this[axis] = s } @@ -84,7 +84,6 @@ class VitureSdkTest { @Test fun ultraOpenGlAxesMatchExistingGlassesHeadTracker() { val a = sqrt(0.5f) - // OpenGL Y yaw maps to NWU Z; OpenGL X pitch maps to negative NWU Y. assertArrayEquals(floatArrayOf(0f, 0f, a, a), VitureSdkPose.toGlasses(floatArrayOf(a, 0f, a, 0f), true), 0.00001f) assertArrayEquals(floatArrayOf(0f, -a, 0f, a), diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2ProtocolTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2ProtocolTest.kt index 95f0cfb551..993d33d82a 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2ProtocolTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/VitureV2ProtocolTest.kt @@ -1,5 +1,4 @@ -// Fixtures adapted from elasticjava/viture-v2, MIT, Copyright (c) 2026 Holger Bartnick. -// Source: ece8c30485f7d357fefa362ae74f3eabac9b3899; see docs/third-party/viture-v2/. +// Fixtures adapted from elasticjava/viture-v2, MIT, Copyright (c) 2026 Holger Bartnick. Source: ece8c30485f7d357fefa362ae74f3eabac9b3899; see docs/third-party/viture-v2/. package com.droiddeck.launcher.glasses import org.junit.Assert.assertArrayEquals diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/XrealOrientationFilterTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/XrealOrientationFilterTest.kt index 578d334a63..4aa94d69bc 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/XrealOrientationFilterTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/XrealOrientationFilterTest.kt @@ -63,10 +63,8 @@ class XrealOrientationFilterTest { @Test fun capturedNeutralGravityStartsUprightBeforeRecenter() { val pose = XrealOrientationFilter().update(sample(1000000, accel = Vec3(-0.0909f, -9.6529f, -1.0731f)))!! - // An upright start must not contain the previous approximately 180-degree - // pitch correction. Check before recenter can hide a mounting error. assertTrue(kotlin.math.abs(pose[3]) > 0.99f) val screen = matrix(pose) - assertTrue(screen[7] > 0.99f) // Screen up points toward shared world +Z. + assertTrue(screen[7] > 0.99f) } } diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/XrealProtocolTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/XrealProtocolTest.kt index 0deee75dd4..c84cd7cdba 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/XrealProtocolTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/XrealProtocolTest.kt @@ -93,7 +93,6 @@ class XrealProtocolTest { assertEquals(0x2822, XrealProtocol.read(requests).command) repeat(3) { assertEquals(0x275e, XrealProtocol.read(requests).command) } assertEquals(0, requests.available()) - // Actual 1S busy response remains an error, never a successful ack. assertFalse(XrealProtocol.acknowledged(byteArrayOf(0x22, 3, 8, 0x89.toByte(), 0x27))) } diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt index ba2a53f4ed..6ff43cb125 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt @@ -111,6 +111,9 @@ class DriverPairsTest { assertEquals(DriverPairs.ddTurnip("DD-Turnip-v1.0.0"), DriverPairs.recommendedKey(gpu(840), pairs)) assertEquals("other 8xx keep WinNative", DriverPairs.WN_BALANCED, DriverPairs.recommendedKey(gpu(830), pairs)) assertEquals(DriverPairs.WN_BALANCED, DriverPairs.recommendedKey(gpu(825), pairs)) - assertEquals(DriverPairs.BANNER, DriverPairs.recommendedKey(gpu(740), pairs)) + assertEquals(DriverPairs.ddTurnip("DD-Turnip-v1.0.0"), DriverPairs.recommendedKey(gpu(740), pairs)) + assertEquals(DriverPairs.ddTurnip("DD-Turnip-v1.0.0"), DriverPairs.recommendedKey(gpu(722), pairs)) + assertEquals(DriverPairs.BANNER_ONEUI, DriverPairs.recommendedKey(gpu(740, oneUi = true), pairs)) + assertEquals(DriverPairs.BANNER, DriverPairs.recommendedKey(gpu(650), pairs)) } } diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/GpuDetectionTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/GpuDetectionTest.kt index 9a22eb1fd4..7348210c9b 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/GpuDetectionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/GpuDetectionTest.kt @@ -28,7 +28,6 @@ class GpuDetectionTest { } @Test fun nonAdrenoRenderersAreNeverAdrenoWhateverNumberTheyCarry() { - // Xclipse (Exynos), Mali and Immortalis names; familyOf ignores the number off Adreno. assertEquals(Family.NOT_ADRENO, GpuInfo.familyOf(false, 0)) assertEquals(Family.NOT_ADRENO, GpuInfo.familyOf(false, GpuInfo.threeDigits("Samsung Xclipse 920"))) assertEquals(Family.NOT_ADRENO, GpuInfo.familyOf(false, GpuInfo.threeDigits("Xclipse 940"))) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLogTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLogTest.kt index e54564dbab..7a6daf4200 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/SteamVrDeviceLossLogTest.kt @@ -17,7 +17,7 @@ class SteamVrDeviceLossLogTest { assertFalse(log.poll()) file.appendText("-4\n") assertTrue(log.poll()) - assertTrue(log.poll()) // Keep pending until the activity is foreground. + assertTrue(log.poll()) } @Test fun onlyExplicitDeviceLossTriggersRecovery() { diff --git a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt new file mode 100644 index 0000000000..32c58a41f0 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt @@ -0,0 +1,231 @@ +package com.droiddeck.launcher.hud + +import android.graphics.Bitmap +import android.graphics.Canvas +import android.os.Looper +import android.os.SystemClock +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import android.widget.FrameLayout +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode +import java.io.ByteArrayOutputStream +import java.time.Duration +import java.util.Base64 +import kotlin.math.sqrt + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], qualifiers = "xhdpi") +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class DroidDeckHudPanelTest { + @Test fun minimalIsTheSizeTheHudStartsWith() { + assertEquals(DroidDeckHudSize.MINIMAL, DroidDeckHudSize.from(DroidDeckHudConfig.DEFAULTS["hudSize"])) + } + + @Test fun theHudStartsLocked() { + assertEquals("1", DroidDeckHudConfig.DEFAULTS["hudLocked"]) + } + + @Test fun everySizeDrawsTheDPanelWithEverythingInsideIt() { + val stats = FrameStats() + var now = 1_000_000_000L + repeat(2_000) { i -> + val frametime = if (i == 1_700) 25_600_000L else 2_850_000L + now += frametime + stats.add(frametime, now) + } + val snapshot = SNAPSHOT + for (size in DroidDeckHudSize.values()) { + if (size == DroidDeckHudSize.STRIP) continue + val view = DroidDeckHudView(RuntimeEnvironment.getApplication()) + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to size.token))) + view.setFrameStats(stats) + view.showForTest(snapshot, "DXVK", now) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + view.measure(unspecified, unspecified) + view.layout(0, 0, view.measuredWidth, view.measuredHeight) + val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888) + view.draw(Canvas(bitmap)) + + val png = ByteArrayOutputStream().also { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) } + println("DROIDDECKHUD-${size.token.uppercase()}-PNG ${Base64.getEncoder().encodeToString(png.toByteArray())}") + + val panel = view.panelForTest()!! + assertTrue("$size panel inside the view", + panel.left > 0f && panel.top > 0f && panel.right < view.width && panel.bottom < view.height) + view.graphForTest()?.let { graph -> + val r = view.panelRadiusForTest() + val d = maxOf(panel.top + r - graph.top, graph.bottom - (panel.bottom - r), 0f) + val edge = panel.right - r + sqrt(r * r - d * d) + assertTrue("$size graph clears the round side", graph.right <= edge) + } + } + } + + @Test fun stripIsOneLineAcrossTheParentWithTheClockOnTheRight() { + val app = RuntimeEnvironment.getApplication() + val parent = FrameLayout(app) + val view = DroidDeckHudView(app) + parent.addView(view, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + parent.measure(View.MeasureSpec.makeMeasureSpec(2400, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(1080, View.MeasureSpec.EXACTLY)) + parent.layout(0, 0, 2400, 1080) + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.STRIP.token) + + ("showBattery" to "1"))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + view.measure(unspecified, unspecified) + + assertTrue(view.isStrip) + assertEquals(2400, view.measuredWidth) + val lines = view.linesForTest() + assertEquals(lines.toString(), 1, lines.size) + val line = lines.single() + listOf("DXVK", "fps", "GPU", "CPU", "RAM", "BAT 79%").forEach { assertTrue(line, it in line) } + assertTrue(line, line.indexOf("DXVK") < line.indexOf("GPU") && line.indexOf("GPU") < line.indexOf("BAT")) + + val bitmap = Bitmap.createBitmap(view.measuredWidth, view.measuredHeight, Bitmap.Config.ARGB_8888) + view.layout(0, 0, view.measuredWidth, view.measuredHeight) + view.draw(Canvas(bitmap)) + val png = ByteArrayOutputStream().also { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) } + println("DROIDDECKHUD-STRIP-PNG ${Base64.getEncoder().encodeToString(png.toByteArray())}") + } + + @Test fun stripLeavesOffWhatNoLongerFitsBeforeTheClock() { + val app = RuntimeEnvironment.getApplication() + val parent = FrameLayout(app) + val view = DroidDeckHudView(app) + parent.addView(view, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + parent.measure(View.MeasureSpec.makeMeasureSpec(700, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.EXACTLY)) + parent.layout(0, 0, 700, 400) + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.STRIP.token))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + val line = view.linesForTest().single() + assertTrue(line, "fps" in line) + assertFalse(line, "BAT" in line) + } + + @Test fun stripFollowsTheHudScaleInHeightAndKeepsTheFullWidth() { + val app = RuntimeEnvironment.getApplication() + val parent = FrameLayout(app) + val view = DroidDeckHudView(app) + parent.addView(view, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + parent.measure(View.MeasureSpec.makeMeasureSpec(2400, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(1080, View.MeasureSpec.EXACTLY)) + parent.layout(0, 0, 2400, 1080) + fun at(scale: Int): Pair<Float, Float> { + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.STRIP.token) + + ("hudScale" to scale.toString()))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + view.measure(unspecified, unspecified) + view.layout(0, 0, view.measuredWidth, view.measuredHeight) + val bitmap = Bitmap.createBitmap(view.measuredWidth, view.measuredHeight, Bitmap.Config.ARGB_8888) + view.draw(Canvas(bitmap)) + val png = ByteArrayOutputStream().also { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) } + println("DROIDDECKHUD-STRIP$scale-PNG ${Base64.getEncoder().encodeToString(png.toByteArray())}") + return Pair(view.contentWidth, view.contentHeight) + } + val small = at(70); val big = at(150) + assertEquals(2400f, small.first); assertEquals(2400f, big.first) + assertEquals(big.second / small.second, 150f / 70f, 0.01f) + } + + @Test fun pillShowsEachBatteryPartOnItsOwnSwitch() { + fun pill(vararg settings: Pair<String, String>): List<String> { + val view = DroidDeckHudView(RuntimeEnvironment.getApplication()) + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.PILL.token) + settings)) + view.showForTest(SNAPSHOT, "DXVK", 0L) + return view.linesForTest() + } + val all = pill("showBattery" to "1") + assertTrue(all.toString(), all.any { "BAT 79% · 34°C · 16.0W" in it }) + assertEquals(all.toString(), 1, all.count { "BAT" in it }) + assertFalse(all.toString(), all.single { "RAM" in it }.contains("BAT")) + + val noMemory = pill("showBattery" to "1", "showRAM" to "0") + assertTrue(noMemory.toString(), noMemory.none { "RAM" in it }) + assertTrue(noMemory.toString(), noMemory.any { "BAT 79% · 34°C · 16.0W" in it }) + + val defaults = pill() + assertTrue(defaults.toString(), defaults.any { "BAT 34°C · 16.0W" in it }) + val wattsOnly = pill("showBatteryTemp" to "0") + assertTrue(wattsOnly.toString(), wattsOnly.any { "BAT 16.0W" in it }) + val nothing = pill("showBatteryTemp" to "0", "showPower" to "0") + assertTrue(nothing.toString(), nothing.none { "BAT" in it }) + } + + @Test fun aLockedHudLetsTouchesThroughOnlyWhereAControlTakesThem() { + val app = RuntimeEnvironment.getApplication() + var reached = 0 + val under = View(app).apply { + setOnTouchListener { _, e -> if (e.actionMasked == MotionEvent.ACTION_DOWN) reached++; true } + } + val hud = DroidDeckHudView(app) + val parent = FrameLayout(app) + parent.addView(under, FrameLayout.LayoutParams(2000, 2000)) + parent.addView(hud, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + var control = false + hud.passesTouchAt = { _, _ -> control } + val locks = ArrayList<Boolean>() + hud.setOnLockChangedListener { locks += it } + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "0"))) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val exactly = View.MeasureSpec.makeMeasureSpec(2000, View.MeasureSpec.EXACTLY) + parent.measure(exactly, exactly) + parent.layout(0, 0, 2000, 2000) + assertTrue(hud.width > 0 && hud.height > 0) + fun touch(holdMs: Long = 50L) { + val x = hud.width / 2f; val y = hud.height / 2f + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, x, y, 0).also { parent.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(holdMs)) + MotionEvent.obtain(down, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, x, y, 0).also { parent.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idle() + } + control = true + touch() + assertEquals("an unlocked HUD keeps the touch (tap, drag, long press)", 0, reached) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "1"))) + touch() + assertEquals("a locked HUD passes it to the control under it", 1, reached) + control = false + touch() + assertEquals("a locked HUD keeps a touch no control takes", 1, reached) + touch(holdMs = ViewConfiguration.getLongPressTimeout() + 300L) + assertEquals("a long press there unlocks it", listOf(false), locks) + } + + @Test fun aDockedHudIsJustTheFpsTabAndATapBringsItBack() { + val app = RuntimeEnvironment.getApplication() + val hud = DroidDeckHudView(app) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to "full") + ("hudDock" to "left"))) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + hud.measure(unspecified, unspecified) + hud.layout(0, 0, hud.measuredWidth, hud.measuredHeight) + assertEquals(DroidDeckHudDock.LEFT, hud.dock) + assertTrue("a tab, not the panel: ${hud.width}x${hud.height}", hud.width < 400 && hud.height < 200) + val docks = ArrayList<String>() + hud.setOnDockChangedListener { docks += it } + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, 5f, 5f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + MotionEvent.obtain(down, down + 40, MotionEvent.ACTION_UP, 5f, 5f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idle() + assertEquals("a locked, docked HUD still answers a tap", listOf("none"), docks) + } + + private companion object { + val SNAPSHOT = HudMetrics.Snapshot(64, 52, 3302, 1050, 89, 79, 10_800_000_000L, 16_000_000_000L, 67f, + 1_800_000_000L, HudMetrics.Battery(16f, false, 79, 34, null), + intArrayOf(91, 91, 48, 50, 48, 19, 17, 73), intArrayOf(2265, 2265, 3148, 3148, 3148, 2956, 2956, 3302), + 2_700_000_000L, 6_400_000_000L, 31_000L, 9_000L) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt index ac9348f527..724275fd35 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/FrameStatsTest.kt @@ -8,7 +8,6 @@ import org.junit.Test import kotlin.random.Random class FrameStatsTest { - /** MangoHud's update_hud_info_with_frametime and fps()/frame_timing(), line by line (overlay.cpp). */ private class Mango { val frametimeData = ArrayList<Float>(List(200) { 0f }) var lastPresentTime = 0L @@ -69,6 +68,30 @@ class FrameStatsTest { assertFalse(feed.poll(now + 1)) } + @Test fun slowFramesCountOnlyFramesOver33MsInTheWindow() { + val stats = FrameStats() + var now = 1_000_000_000L + for (ft in listOf(16_666_667L, 40_000_000L, 16_666_667L, 50_000_000L, 2_000_000_000L, 16_666_667L)) { + now += ft + stats.add(ft, now) + } + assertEquals(2, stats.slowFrames(now, 60_000_000_000L)) + assertEquals(0, stats.slowFrames(now + 120_000_000_000L, 60_000_000_000L)) + stats.reset() + assertEquals(0, stats.slowFrames(now, 60_000_000_000L)) + } + + @Test fun compositorFramesDoNotCountAsLiveGamescopeFrames() { + val feed = GameFrameFeed(java.io.File("/nonexistent/droiddeck-hud/frames")) + var now = 1_000_000_000L + assertFalse(feed.live) + feed.onCompositorFrame(now) + now += 16_666_667L + feed.onCompositorFrame(now) + feed.poll(now) + assertFalse(feed.live) + } + @Test fun aCompletedPeriodIsCountedWhenMangoHudWouldRedraw() { val stats = FrameStats() var now = 1_000_000_000L diff --git a/app/src/test/java/com/droiddeck/launcher/hud/FusionHudPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/FusionHudPanelTest.kt deleted file mode 100644 index 47c33a1f62..0000000000 --- a/app/src/test/java/com/droiddeck/launcher/hud/FusionHudPanelTest.kt +++ /dev/null @@ -1,148 +0,0 @@ -package com.droiddeck.launcher.hud - -import android.graphics.Bitmap -import android.graphics.Canvas -import android.graphics.Color -import android.os.Looper -import android.os.SystemClock -import android.view.MotionEvent -import android.view.View -import android.view.ViewConfiguration -import android.widget.FrameLayout -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertTrue -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment -import org.robolectric.Shadows.shadowOf -import org.robolectric.annotation.Config -import org.robolectric.annotation.GraphicsMode -import java.io.ByteArrayOutputStream -import java.time.Duration -import java.util.Base64 -import kotlin.math.roundToInt -import kotlin.math.sqrt - -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [33], qualifiers = "xhdpi") -@GraphicsMode(GraphicsMode.Mode.NATIVE) -class FusionHudPanelTest { - @Test fun minimalIsTheSizeTheHudStartsWith() { - assertEquals(FusionSize.MINIMAL, FusionSize.from(FusionHudConfig.DEFAULTS["hudSize"])) - } - - @Test fun theHudStartsLocked() { - assertEquals("1", FusionHudConfig.DEFAULTS["hudLocked"]) - } - - @Test fun everySizeDrawsTheDPanelWithEverythingInsideIt() { - val stats = FrameStats() - var now = 1_000_000_000L - repeat(2_000) { i -> - val frametime = if (i == 1_700) 25_600_000L else 2_850_000L - now += frametime - stats.add(frametime, now) - } - val snapshot = SNAPSHOT - for (size in FusionSize.values()) { - val view = FusionHudView(RuntimeEnvironment.getApplication()) - view.applyConfig(FusionHudConfig.encode(FusionHudConfig.DEFAULTS + ("hudSize" to size.token))) - view.setFrameStats(stats) - view.showForTest(snapshot, "DXVK", now) - val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) - view.measure(unspecified, unspecified) - view.layout(0, 0, view.measuredWidth, view.measuredHeight) - val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888) - view.draw(Canvas(bitmap)) - - val png = ByteArrayOutputStream().also { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) } - println("FUSIONHUD-${size.token.uppercase()}-PNG ${Base64.getEncoder().encodeToString(png.toByteArray())}") - - val panel = view.panelForTest()!! - assertTrue("$size panel inside the view", - panel.left > 0f && panel.top > 0f && panel.right < view.width && panel.bottom < view.height) - view.graphForTest()?.let { graph -> - val r = view.panelRadiusForTest() - val d = maxOf(panel.top + r - graph.top, graph.bottom - (panel.bottom - r), 0f) - val edge = panel.right - r + sqrt(r * r - d * d) - assertTrue("$size graph clears the round side", graph.right <= edge) - } - val orb = bitmap.getPixel(panel.left.roundToInt() + 1, panel.centerY().roundToInt()) - assertTrue("$size orb on the left side", Color.blue(orb) > 200 && Color.alpha(orb) > 200) - } - } - - @Test fun pillShowsEachBatteryPartOnItsOwnSwitch() { - fun pill(vararg settings: Pair<String, String>): List<String> { - val view = FusionHudView(RuntimeEnvironment.getApplication()) - view.applyConfig(FusionHudConfig.encode(FusionHudConfig.DEFAULTS + ("hudSize" to FusionSize.PILL.token) + settings)) - view.showForTest(SNAPSHOT, "DXVK", 0L) - return view.linesForTest() - } - val all = pill("showBattery" to "1") - assertTrue(all.toString(), all.any { "BAT 79% · 34°C · 16.0W" in it }) - assertEquals(all.toString(), 1, all.count { "BAT" in it }) - assertFalse(all.toString(), all.single { "RAM" in it }.contains("BAT")) - - val noMemory = pill("showBattery" to "1", "showRAM" to "0") - assertTrue(noMemory.toString(), noMemory.none { "RAM" in it }) - assertTrue(noMemory.toString(), noMemory.any { "BAT 79% · 34°C · 16.0W" in it }) - - val defaults = pill() - assertTrue(defaults.toString(), defaults.any { "BAT 34°C · 16.0W" in it }) - val wattsOnly = pill("showBatteryTemp" to "0") - assertTrue(wattsOnly.toString(), wattsOnly.any { "BAT 16.0W" in it }) - val nothing = pill("showBatteryTemp" to "0", "showPower" to "0") - assertTrue(nothing.toString(), nothing.none { "BAT" in it }) - } - - @Test fun aLockedHudLetsTouchesThroughOnlyWhereAControlTakesThem() { - val app = RuntimeEnvironment.getApplication() - var reached = 0 - val under = View(app).apply { - setOnTouchListener { _, e -> if (e.actionMasked == MotionEvent.ACTION_DOWN) reached++; true } - } - val hud = FusionHudView(app) - val parent = FrameLayout(app) - parent.addView(under, FrameLayout.LayoutParams(2000, 2000)) - parent.addView(hud, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) - var control = false - hud.passesTouchAt = { _, _ -> control } - val locks = ArrayList<Boolean>() - hud.setOnLockChangedListener { locks += it } - hud.applyConfig(FusionHudConfig.encode(FusionHudConfig.DEFAULTS + ("hudLocked" to "0"))) - hud.showForTest(SNAPSHOT, "DXVK", 0L) - val exactly = View.MeasureSpec.makeMeasureSpec(2000, View.MeasureSpec.EXACTLY) - parent.measure(exactly, exactly) - parent.layout(0, 0, 2000, 2000) - assertTrue(hud.width > 0 && hud.height > 0) - fun touch(holdMs: Long = 50L) { - val x = hud.width / 2f; val y = hud.height / 2f - val down = SystemClock.uptimeMillis() - MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, x, y, 0).also { parent.dispatchTouchEvent(it); it.recycle() } - shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(holdMs)) - MotionEvent.obtain(down, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, x, y, 0).also { parent.dispatchTouchEvent(it); it.recycle() } - shadowOf(Looper.getMainLooper()).idle() - } - control = true - touch() - assertEquals("an unlocked HUD keeps the touch (tap, drag, long press)", 0, reached) - hud.applyConfig(FusionHudConfig.encode(FusionHudConfig.DEFAULTS + ("hudLocked" to "1"))) - touch() - assertEquals("a locked HUD passes it to the control under it", 1, reached) - control = false - touch() - assertEquals("a locked HUD keeps a touch no control takes", 1, reached) - touch(holdMs = ViewConfiguration.getLongPressTimeout() + 300L) - assertEquals("a long press there unlocks it", listOf(false), locks) - } - - private companion object { - val SNAPSHOT = HudMetrics.Snapshot(64, 52, 3302, 1050, 89, 79, 10_800_000_000L, 16_000_000_000L, 67f, - 1_800_000_000L, HudMetrics.Battery(16f, false, 79, 34, null), - intArrayOf(91, 91, 48, 50, 48, 19, 17, 73), intArrayOf(2265, 2265, 3148, 3148, 3148, 2956, 2956, 3302), - 2_700_000_000L, 6_400_000_000L, 31_000L, 9_000L) - } -} diff --git a/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt index 246d972969..4de40ea2a2 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/MangoReadingsTest.kt @@ -18,12 +18,10 @@ class MangoReadingsTest { @Test fun cpuLoadFollowsMangoHudsFormulaAndTruncates() { val stat = File(tmp.root, "stat") val m = readings() - // user nice system idle iowait irq softirq steal guest guest_nice stat.writeText("cpu 1000 100 500 8000 400 50 50 0 200 0\ncpu0 500 50 250 4000 200 25 25 0 100 0\ncpu1 500 50 250 4000 200 25 25 0 100 0\nintr 0\n") m.cpu(stat) stat.writeText("cpu 1500 100 700 8600 500 60 70 10 300 0\ncpu0 900 50 400 4100 250 30 35 10 200 0\ncpu1 600 50 300 4500 250 30 35 0 100 0\nintr 0\n") val cpu = m.cpu(stat)!! - // busy = user-guest 400 + nice 0 + system+irq+softirq 230 + steal 10 + guest 100 = 740 of 1440 (idle+iowait 700) assertEquals((740 * 100f / 1440).toInt(), cpu.percent) assertEquals(51, cpu.percent) assertArrayEquals(intArrayOf(((300 + 165 + 10 + 100) * 100f / (300 + 165 + 10 + 100 + 150)).toInt(), ((100 + 65) * 100f / (100 + 65 + 550)).toInt()), cpu.perCore) diff --git a/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt index 5759556aea..db813c62df 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt @@ -240,6 +240,30 @@ class BackQamInputTest { assertTrue(taps.isEmpty()) } + @Test fun withHoldsOffTapsStillWorkButHoldsAndChordsDoNothing() { + val noHold = BackQamInput(changes::add, taps::add, holds = { false }) + fun press(action: Int) = noHold.onKeyEvent(KeyEvent(action, KeyEvent.KEYCODE_BACK), true) + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + advance(500) + assertEquals(listOf(false), taps) + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + assertEquals(listOf(false, true), taps) + taps.clear() + press(KeyEvent.ACTION_DOWN) + advance(2000) + assertTrue(press(KeyEvent.ACTION_UP)) + press(KeyEvent.ACTION_DOWN) + noHold.onChordInput() + press(KeyEvent.ACTION_UP) + advance(1000) + assertTrue(changes.isEmpty()) + assertTrue(taps.isEmpty()) + } + private fun advance(millis: Long) = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(millis)) private fun send(action: Int, repeat: Int = 0, device: Int = 4, enabled: Boolean = true) = diff --git a/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt new file mode 100644 index 0000000000..d9c959dae9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/BottomScreenGuestsTest.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.input + +import android.os.Looper +import android.view.accessibility.AccessibilityWindowInfo +import com.droiddeck.launcher.input.BottomScreenGuests.Top +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(manifest = Config.NONE) +class BottomScreenGuestsTest { + private val homes = setOf("com.android.launcher3", "com.retroidpocket.gamelauncher") + + @After fun clear() = DualScreen.setTaken(emptySet()) + + @Test fun onlyTheRetroidPocketDuoAndAynThorWatchTheirBottomScreen() { + assertTrue(BottomScreenGuests.supported("Retroid Pocket Duo", 36)) + assertTrue(BottomScreenGuests.supported(" retroid pocket duo ", 33)) + assertFalse(BottomScreenGuests.supported("Retroid Pocket Duo", 32)) + assertTrue(BottomScreenGuests.supported("AYN Thor", 33)) + assertTrue(BottomScreenGuests.supported("AYN Thor Max", 34)) + assertFalse(BottomScreenGuests.supported("AYN Odin 2", 36)) + assertFalse(BottomScreenGuests.supported("Pixel 8", 36)) + } + + @Test fun anyWindowButTheHomeScreenHoldsTheScreen() { + assertEquals(Top.HOME, BottomScreenGuests.classify("com.android.launcher3", homes)) + assertEquals(Top.GUEST, BottomScreenGuests.classify("com.android.chrome", homes)) + assertEquals(Top.GUEST, BottomScreenGuests.classify("com.retroidpocket.dualscreen.assistant", homes)) + assertEquals(Top.NONE, BottomScreenGuests.classify(null, homes)) + } + + @Test fun theWindowListDecidesWhenItSeesPastDroidDeck() { + assertEquals("com.android.chrome", BottomScreenGuests.holder("com.android.chrome", null, homes)) + assertEquals(null, BottomScreenGuests.holder("com.android.launcher3", "com.android.chrome", homes)) + } + + @Test fun anAppOpenedUnderDroidDeckHoldsTheScreenUntilTheListSeesIt() { + assertEquals("com.google.android.youtube", BottomScreenGuests.holder(null, "com.google.android.youtube", homes)) + assertEquals(null, BottomScreenGuests.holder(null, "com.android.launcher3", homes)) + assertEquals(null, BottomScreenGuests.holder(null, null, homes)) + } + + @Test fun keyboardsAndOverlaysNeverTakeTheScreen() { + assertTrue(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_INPUT_METHOD)) + assertTrue(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY)) + assertFalse(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_APPLICATION)) + assertFalse(BottomScreenGuests.ignorable(AccessibilityWindowInfo.TYPE_SYSTEM)) + } + + @Test fun listenersHearWhenTheScreenIsTakenAndFreed() { + var calls = 0 + val listener: () -> Unit = { calls++ } + DualScreen.watchTaken(listener) + DualScreen.setTaken(setOf(2)) + shadowOf(Looper.getMainLooper()).idle() + assertTrue(DualScreen.taken(2)) + assertFalse(DualScreen.taken(0)) + DualScreen.setTaken(setOf(2)) + DualScreen.setTaken(emptySet()) + shadowOf(Looper.getMainLooper()).idle() + assertFalse(DualScreen.taken(2)) + assertEquals(2, calls) + DualScreen.unwatchTaken(listener) + DualScreen.setTaken(setOf(2)) + shadowOf(Looper.getMainLooper()).idle() + assertEquals(2, calls) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt index dea92db54e..e50fcbadf4 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt @@ -29,9 +29,28 @@ class DualScreenTest { @Test fun knownModelsCountWhenTheTypeIsHidden() { assertTrue(DualScreen.isBuiltIn(null, "Retroid Pocket Duo")) assertTrue(DualScreen.isBuiltIn(null, " AYN Thor ")) + assertTrue(DualScreen.isBuiltIn(null, "AYN Thor Max")) assertFalse(DualScreen.isBuiltIn(null, "Pixel 8")) } + @Test fun aSecondPanelNeedsATouchscreenOfItsOwnSize() { + val top = 1920 to 1080 + val bottom = 1280 to 960 + assertTrue(DualScreen.hasOwnTouchPanel(bottom, top, listOf(1920 to 1080, 1280 to 960))) + assertTrue(DualScreen.hasOwnTouchPanel(bottom, top, listOf(1080 to 1920, 960 to 1280))) + assertTrue(DualScreen.hasOwnTouchPanel(bottom, top, listOf(1920 to 1080, 1279 to 959))) + assertFalse(DualScreen.hasOwnTouchPanel(bottom, top, listOf(1920 to 1080))) + assertFalse(DualScreen.hasOwnTouchPanel(bottom, top, emptyList())) + } + + @Test fun aPhantomPanelTheSizeOfTheMainScreenIsNotASecondScreen() { + val main = 1920 to 1080 + assertFalse(DualScreen.hasOwnTouchPanel(main, main, listOf(1920 to 1080))) + assertFalse(DualScreen.hasOwnTouchPanel(main, main, listOf(1080 to 1920))) + assertTrue(DualScreen.hasOwnTouchPanel(main, main, listOf(1920 to 1080, 1920 to 1080))) + assertTrue(DualScreen.hasOwnTouchPanel(main, null, listOf(1920 to 1080))) + } + @Test fun oneScreenDevicesGetNoSecondScreenInAnyMode() { for (mode in DualScreen.modes) { SessionPrefs.setDualScreenMode(context, mode) @@ -47,4 +66,19 @@ class DualScreenTest { SessionPrefs.setDualScreenMode(context, DualScreen.MODE_OFF) assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) } + + @Test fun launcherAndSessionsKeepSeparateModes() { + SessionPrefs.setDualScreenMode(context, DualScreen.MODE_OFF) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_AUTO, SessionPrefs.dualScreenSessionMode(context)) + SessionPrefs.setDualScreenSessionMode(context, DualScreen.MODE_ON) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_ON, SessionPrefs.dualScreenSessionMode(context)) + } + + @Test fun anOldDisabledMenuToggleTurnsBothOff() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().putBoolean("dualScreenLauncher", false).commit() + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenMode(context)) + assertEquals(DualScreen.MODE_OFF, SessionPrefs.dualScreenSessionMode(context)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/GesturePrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/GesturePrefsTest.kt index b210be520a..9f03811123 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/GesturePrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/GesturePrefsTest.kt @@ -10,6 +10,13 @@ import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) class GesturePrefsTest { + @Test fun relativeMouseModeSurvivesSerializationAndRejectsUnknownValues() { + val on = TouchGestureConfig(relativeMouseMode = TouchGestureConfig.RELATIVE_MOUSE_ON) + assertEquals(TouchGestureConfig.RELATIVE_MOUSE_ON, TouchGestureConfig.fromJson(on.toJson()).relativeMouseMode) + assertEquals(TouchGestureConfig.RELATIVE_MOUSE_AUTO, TouchGestureConfig.fromJson("""{"relativeMouseMode":9}""").relativeMouseMode) + assertEquals(TouchGestureConfig.RELATIVE_MOUSE_AUTO, TouchGestureConfig.fromJson("{}").relativeMouseMode) + } + @Test fun removedOptionsAreIgnoredWhenLoadingExistingSettings() { val old = """{"holdMouseButtonWhileTouchingEnabled":true,"holdMouseButtonWhileTouchingAction":"right_click", "showClickHighlight":true,"showCursorInTouchscreenMode":true,"tapAction":"key_E","longPressDelay":650}""" diff --git a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt index b584c20d1c..0888984c4a 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt @@ -4,19 +4,26 @@ import org.junit.Assert.assertEquals import org.junit.Test class SecondScreenModeTest { - @Test fun withNothingRememberedTheControllerPicksThePanel() { + @Test fun withNothingRememberedDeckPadsGetControlsAndOthersTheDashboard() { + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening(null, deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = false, dashboard = true)) + } + + @Test fun withNothingRememberedAndNoDashboardTheControllerPicksThePanel() { assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening(null, deckPad = true)) assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad = false)) } @Test fun thePanelTheUserPickedLastOpensAgain() { + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("keyboard-trackpad", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("deck-controls", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.TERMINAL, SecondScreenMode.opening("terminal", deckPad = true, dashboard = true)) assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("keyboard-trackpad", deckPad = true)) - assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("deck-controls", deckPad = true)) - assertEquals(SecondScreenMode.TERMINAL, SecondScreenMode.opening("terminal", deckPad = true)) } @Test fun deckControlsNeedTheDeckPad() { assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("deck-controls", deckPad = false)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("deck-controls", deckPad = false, dashboard = true)) } @Test fun customControlsReopenWithEitherControllerType() { @@ -26,7 +33,26 @@ class SecondScreenModeTest { } @Test fun anUnknownOrClosedChoiceFallsBackToTheDefault() { + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("none", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening("gone", deckPad = false, dashboard = true)) assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("none", deckPad = true)) assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("gone", deckPad = false)) } + + @Test fun theDashboardOpensAgainOnlyWhileItHasPages() { + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening("dashboard", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("dashboard", deckPad = true, dashboard = false)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("dashboard", deckPad = false)) + } + + @Test fun theDesktopOpensAgainOnlyWhileItCanRun() { + assertEquals(SecondScreenMode.DESKTOP, SecondScreenMode.opening("desktop", deckPad = true, dashboard = true, desktop = true)) + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("desktop", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("desktop", deckPad = false)) + } + + @Test fun withNothingRememberedTheDesktopIsNeverPicked() { + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = false, dashboard = true, desktop = true)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad = false, desktop = true)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt index 7e685a18e3..0d64771fe8 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt @@ -146,6 +146,19 @@ class SessionInputPointerTest { assertEquals(listOf(Triple(4, 1, 0)), CompositorShadow.events) } + @Test fun desktopRightCtrlUsesUpstreamAliasWithoutReleasingTheProfileHold() { + fun hardwareCtrl(down: Boolean) = ReflectionHelpers.callInstanceMethod<Unit>(activity, "sendGuestKey", + ReflectionHelpers.ClassParameter.from(Int::class.javaPrimitiveType, 97), + ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, down), + ReflectionHelpers.ClassParameter.from(Int::class.javaPrimitiveType, 8)) + output.key(29, true) + hardwareCtrl(true) + hardwareCtrl(false) + assertEquals(listOf(29 to 1), CompositorShadow.keys) + output.key(29, false) + assertEquals(listOf(29 to 1, 29 to 0), CompositorShadow.keys) + } + @Test fun routedMouseUsesRawBackendAndKeepsSharedButtonOwnership() { ReflectionHelpers.setField(activity, "mouseWriter", FakeInputWriter(activity.cacheDir.path, FakeInputWriter.MOUSE_SLOT)) ReflectionHelpers.setField(activity, "evdevMouseActive", true) diff --git a/app/src/test/java/com/droiddeck/launcher/input/SystemKeyCaptureTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SystemKeyCaptureTest.kt new file mode 100644 index 0000000000..f0562660ea --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/SystemKeyCaptureTest.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.input + +import android.view.KeyEvent +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner + +class SystemKeyCaptureTest { + @Test fun systemCombinationsAreCaptured() { + assertTrue(SystemKeyCapture.captures(KeyEvent.KEYCODE_META_LEFT, 0)) + assertTrue(SystemKeyCapture.captures(KeyEvent.KEYCODE_META_RIGHT, 0)) + assertTrue(SystemKeyCapture.captures(KeyEvent.KEYCODE_TAB, KeyEvent.META_ALT_ON or KeyEvent.META_ALT_LEFT_ON)) + assertTrue(SystemKeyCapture.captures(KeyEvent.KEYCODE_ESCAPE, KeyEvent.META_ALT_ON)) + assertTrue(SystemKeyCapture.captures(KeyEvent.KEYCODE_D, KeyEvent.META_META_ON)) + } + + @Test fun onlyTheEscapeScanCodeTurnsBackIntoEscape() { + assertTrue(GuestKeys.isKeyboardEscape(KeyEvent.KEYCODE_BACK, 1)) + assertFalse(GuestKeys.isKeyboardEscape(KeyEvent.KEYCODE_BACK, 158)) + assertFalse(GuestKeys.isKeyboardEscape(KeyEvent.KEYCODE_ESCAPE, 1)) + } + + @Test fun ordinaryKeysStayWithTheNormalPath() { + assertFalse(SystemKeyCapture.captures(KeyEvent.KEYCODE_TAB, 0)) + assertFalse(SystemKeyCapture.captures(KeyEvent.KEYCODE_A, 0)) + assertFalse(SystemKeyCapture.captures(KeyEvent.KEYCODE_F, KeyEvent.META_ALT_ON)) + assertFalse(SystemKeyCapture.captures(KeyEvent.KEYCODE_C, KeyEvent.META_CTRL_ON)) + } +} + +@RunWith(RobolectricTestRunner::class) +class SystemKeyCaptureHeldKeysTest { + private val sent = mutableListOf<Int>() + + private fun key(action: Int, repeat: Int = 0) = + KeyEvent(0L, 0L, action, KeyEvent.KEYCODE_META_LEFT, repeat) + + private fun attached(): Any = Any().also { + SystemKeyCapture.isKeyboard = { true } + SystemKeyCapture.attach(it, { true }) { event -> sent += event.action } + } + + @Test fun keyHeldThroughDetachIsReleasedOnceAndItsPhysicalReleaseIsConsumed() { + val owner = attached() + assertTrue(SystemKeyCapture.onKeyEvent(key(KeyEvent.ACTION_DOWN))) + SystemKeyCapture.detach(owner) + assertEquals(listOf(KeyEvent.ACTION_DOWN, KeyEvent.ACTION_UP), sent) + assertTrue(SystemKeyCapture.onKeyEvent(key(KeyEvent.ACTION_DOWN, repeat = 1))) + assertTrue(SystemKeyCapture.onKeyEvent(key(KeyEvent.ACTION_UP))) + assertEquals(2, sent.size) + assertFalse(SystemKeyCapture.onKeyEvent(key(KeyEvent.ACTION_UP))) + } + + @Test fun aKeyAlreadyHeldWhenCaptureStartsStaysWithAndroid() { + val owner = attached() + assertFalse(SystemKeyCapture.onKeyEvent(key(KeyEvent.ACTION_DOWN, repeat = 1))) + assertFalse(SystemKeyCapture.onKeyEvent(key(KeyEvent.ACTION_UP))) + SystemKeyCapture.detach(owner) + assertEquals(0, sent.size) + } + + @Test fun newPressAfterDetachIsNotSwallowed() { + val owner = attached() + SystemKeyCapture.onKeyEvent(key(KeyEvent.ACTION_DOWN)) + SystemKeyCapture.detach(owner) + assertFalse(SystemKeyCapture.onKeyEvent(key(KeyEvent.ACTION_DOWN))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt index 79c1398588..2b84e3ae4d 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt @@ -33,7 +33,9 @@ class TouchpadGesturesTest { override fun onScroll(dx: Float, dy: Float) { events += "scroll" } override fun onScrollEnd() { events += "scroll end" } override fun onZoom(steps: Int) { events += "zoom $steps" } + override fun onThreeFingerTap(): Boolean { events += "three tap"; return claimThreeTap } } + private var claimThreeTap = false @Before fun setUp() { touchpad = TouchpadGestures(SLOP, listener) @@ -50,7 +52,18 @@ class TouchpadGesturesTest { assertEquals(listOf("left down", "left up"), events) } - @Test fun threeFingerTapClicksTheMiddleButton() { + @Test fun threeFingerTapClicksTheMiddleButtonWhenUnclaimed() { + threeFingerTap() + assertEquals(listOf("three tap", "middle down", "middle up"), events) + } + + @Test fun claimedThreeFingerTapSkipsTheMiddleButton() { + claimThreeTap = true + threeFingerTap() + assertEquals(listOf("three tap"), events) + } + + private fun threeFingerTap() { touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) advance(10) touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (400f to 300f), 2 to (600f to 310f)) @@ -61,7 +74,6 @@ class TouchpadGesturesTest { touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 300f), 2 to (600f to 310f)) touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) advance(100) - assertEquals(listOf("middle down", "middle up"), events) } @Test fun desktopTwoFingerSlideScrollsSmoothlyAndStops() { diff --git a/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt index 5c49c5265a..a78cd7f0c4 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt @@ -738,7 +738,7 @@ class TouchscreenGesturesTest { @Test fun pinchReversalDoesNotConsumeOldDirectionRemainder() { startPinch() events.clear() - movePinch(4.5f) // Nine pixels toward zooming in, short of a step. + movePinch(4.5f) assertTrue(events.none { it.startsWith("wheel") }) for (i in 1..10) movePinch(4.5f - i * .5f) assertEquals(listOf("wheel 1"), events.filter { it.startsWith("wheel") }) @@ -794,16 +794,13 @@ class TouchscreenGesturesTest { override fun moveTo(x: Float, y: Float) { cachedX = x; clientX = x } override fun prepareRelativePan() { cachedX = 960f; clientX = 960f } override fun moveBy(dx: Float, dy: Float, relative: Boolean) { - // Before pointer lock, the compositor delivers an absolute - // position even when we inject a relative delta. The game - // only requests lock after seeing this first pan movement. cachedX += dx clientX = cachedX } override fun button(code: Int, down: Boolean) { if (code == 274) { middleDown = down - if (down) clientX = 960f // The client warps to the middle when pan starts. + if (down) clientX = 960f } } override fun key(code: Int, down: Boolean) {} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index a2c5e483bb..77800dc1e4 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -259,6 +259,78 @@ class BattleNetTest { BattleNet.hostFolder(context, "Z:/root/Games/Stores/Battle.net/Hearthstone/")) } + @Test fun wowForeverIsListedBesideRetailInTheSharedWorldOfWarcraftFolder() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + val wow = File(pfx, "drive_c/Program Files (x86)/World of Warcraft").apply { mkdirs() } + File(wow, "_retail_").mkdirs() + File(wow, "_forever_").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").writeBytes(message( + field(1, message(field(1, "wow"), field(2, "wow"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))), + field(1, message(field(1, "wow_forever"), field(2, "wowf"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))), + )) + val games = BattleNet.games(context) + assertEquals(listOf("WoW", "WoWF"), games.map { it.code }) + assertEquals(listOf(wow, File(wow, "_forever_")), games.map { it.folder }) + assertEquals("World of Warcraft: Forever", games[1].name) + assertEquals(2, games.map { it.folder.canonicalPath }.distinct().size) + val shortcut = BattleNet.shortcut(context, games[1])!! + assertTrue(shortcut.launchOptions.endsWith("--exec=\"launch WoWF\"")) + } + + @Test fun anInstallWithAnUnknownUidIsListedByItsProductCode() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + File(pfx, "drive_c/Games/World of Warcraft").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").writeBytes(message( + field(1, message(field(1, "wowf_live"), field(2, "wowf"), field(3, message(field(1, "C:/Games/World of Warcraft"))))), + field(1, message(field(1, "unknown_thing"), field(2, "nothing"), field(3, message(field(1, "C:/Games/World of Warcraft"))))), + )) + val games = BattleNet.games(context) + assertEquals(listOf("WoWF"), games.map { it.code }) + assertEquals("wowf_live", games[0].installUid) + assertEquals("wow_forever", games[0].uid) + assertEquals("WoWF", BattleNet.titleForProduct("WOWF")?.code) + assertEquals("WTCG", BattleNet.titleForProduct("wtcg")?.code) + assertNull(BattleNet.titleForProduct("")) + assertEquals(listOf(Triple("wowf_live", "C:/Games/World of Warcraft", "wowf")), + BattleNet.productDbInstalls(message(field(1, message(field(1, "wowf_live"), field(2, "wowf"), field(3, message(field(1, "C:/Games/World of Warcraft")))))))!! + .map { Triple(it.uid, it.path, it.product) }) + } + + @Test fun aGameKeepsTheFolderItWasListedWithWhenAnotherVersionComesOrGoes() { + val root = File(context.filesDir, "World of Warcraft").apply { mkdirs() } + val retailDir = File(root, "_retail_").apply { mkdirs() } + val foreverDir = File(root, "_forever_").apply { mkdirs() } + val wow = BattleNet.title("wow")!! + val forever = BattleNet.title("wow_forever")!! + val classic = BattleNet.title("wow_classic")!! + assertEquals(mapOf("WoWF" to root), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to null))) + assertEquals(mapOf("WoW" to root, "WoWF" to foreverDir), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWF" to (forever to root)), mapOf("WoW" to null, "WoWF" to null))) + assertEquals(mapOf("WoWF" to foreverDir), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to foreverDir.path))) + assertEquals(mapOf("WoW" to retailDir, "WoWC" to root), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWC" to (classic to root)), mapOf("WoW" to null, "WoWC" to root.path))) + assertEquals(mapOf("WoW" to root, "WoWC" to root), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWC" to (classic to root)), mapOf("WoW" to null, "WoWC" to null))) + assertEquals(mapOf("WoWF" to root), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to "/elsewhere"))) + } + + @Test fun theListedFolderIsRememberedAcrossScans() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + val wow = File(pfx, "drive_c/Program Files (x86)/World of Warcraft").apply { mkdirs() } + File(wow, "_forever_").mkdirs() + val db = File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").apply { parentFile!!.mkdirs() } + val retail = field(1, message(field(1, "wow"), field(2, "wow"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))) + val forever = field(1, message(field(1, "wow_forever"), field(2, "wowf"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))) + db.writeBytes(message(retail, forever)) + assertEquals(listOf(wow, File(wow, "_forever_")), BattleNet.games(context).map { it.folder }) + db.writeBytes(message(forever)) + assertEquals(listOf(File(wow, "_forever_")), BattleNet.games(context).map { it.folder }) + db.writeBytes(message(forever, retail)) + assertEquals(listOf(File(wow, "_forever_"), wow), BattleNet.games(context).map { it.folder }) + } + @Test fun aGamesShortcutHasBattleNetLaunchItInItsPrefix() { val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) @@ -291,6 +363,7 @@ class BattleNetTest { assertEquals(codes.distinct(), codes) assertTrue("Fen" in codes && "OSI" in codes && "WTCG" in codes) assertFalse(BattleNet.STORE.any { it.uid == "d3cn" || it.uid == "fen" }) + assertFalse(BattleNet.STORE.any { it.code == "WoWC" || it.code == "WoWF" }) assertEquals("fenris", BattleNet.STORE.first { it.code == "Fen" }.uid) assertTrue(BattleNet.STORE.all { it.uid.matches(Regex("[a-z0-9_]{1,32}")) }) val installed = listOf("fenris", "diablo3_enus", null) diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt index befb456056..a71063bf35 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt @@ -119,6 +119,27 @@ class BwrapSpawnerPlanTest { assertEquals("org.example.Game", plan.env["FLATPAK_ID"]) } + @Test fun sandboxesStartThroughTheirOwnEnvByDefault() { + val plan = BwrapSpawner.plan(RuntimeEnvironment.getApplication(), request(op("t" to "dir", "dest" to "/tmp")), dir) + assertEquals("/usr/bin/env", plan.envTool) + } + + @Test fun fexSandboxesStartThroughTheEnvTheyBringAndSkipArmPreloads() { + val context = RuntimeEnvironment.getApplication() + val rootfs = LinuxRuntime.rootDir(context) + val lib = File(rootfs, "usr/local/lib/libblsession.so").apply { parentFile?.mkdirs(); writeText("") } + val preload = File(rootfs, "etc/ld.so.preload").apply { parentFile?.mkdirs(); writeText("/usr/local/lib/libblsession.so\n") } + try { + val plan = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp")) + .put("envTool", "/run/droiddeck-fex/bin/env"), dir) + assertEquals("/run/droiddeck-fex/bin/env", plan.envTool) + assertFalse(plan.env.containsKey("LD_PRELOAD")) + assertFalse(plan.binds.any { it.guest.startsWith("/run/droiddeck-preload") }) + } finally { + listOf(lib, preload).forEach { it.delete() } + } + } + @Test fun sandboxedAppsSeeTheSessionsNetworkLink() { val context = RuntimeEnvironment.getApplication() val rootfs = LinuxRuntime.rootDir(context) diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt new file mode 100644 index 0000000000..ba2ddc2137 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopLanguageTest.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.runtime + +import java.util.Locale +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class DesktopLanguageTest { + private val sha = "a".repeat(64) + + @Test fun indexListsPacksAndSkipsMalformedLines() { + val index = DesktopLanguage.parseIndex("pt_BR $sha 1200\ntr $sha 900\nbad line\nxx short 5\n") + assertEquals(setOf("pt_BR", "tr"), index.keys) + assertTrue(DesktopLanguage.parseIndex("../../x $sha 5\n").isEmpty()) + assertEquals(1200L, index.getValue("pt_BR").size) + } + + @Test fun regionPackThenBareLanguage() { + assertEquals(listOf("pt_BR", "pt"), DesktopLanguage.candidates(Locale.forLanguageTag("pt-BR"))) + assertEquals(listOf("tr_TR", "tr"), DesktopLanguage.candidates(Locale.forLanguageTag("tr"))) + assertEquals(listOf("zh_HK", "zh_TW", "zh"), DesktopLanguage.candidates(Locale.forLanguageTag("zh-HK"))) + } + + @Test fun englishAndUnknownNeedNoPack() { + assertTrue(DesktopLanguage.candidates(Locale.forLanguageTag("en")).isEmpty()) + assertTrue(DesktopLanguage.candidates(Locale.forLanguageTag("sw")).isEmpty()) + } + + @Test fun packsLiveBesideTheKdeArchive() { + assertEquals("https://h/r/t/", DesktopLanguage.baseUrl("https://h/r/t/desktop-kde.tar.zst")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/FlatpakManagerArchTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/FlatpakManagerArchTest.kt new file mode 100644 index 0000000000..a7cd04c464 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/FlatpakManagerArchTest.kt @@ -0,0 +1,55 @@ +package com.droiddeck.launcher.runtime + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Before +import org.junit.Test +import java.io.File +import java.nio.file.Files + +class FlatpakManagerArchTest { + private lateinit var dir: File + + @Before fun setUp() { + dir = Files.createTempDirectory("flatpak-arch").toFile() + } + + @After fun tearDown() { + dir.deleteRecursively() + } + + private fun install(arch: String, branch: String) { + File(dir, "$arch/$branch/active").mkdirs() + } + + @Test fun armDevicesAlsoListX86Builds() { + assertEquals(listOf("aarch64", "x86_64"), FlatpakManager.arches("aarch64")) + assertEquals(listOf("x86_64"), FlatpakManager.arches("x86_64")) + } + + @Test fun anX86OnlyInstallIsFound() { + install("x86_64", "master") + val (arch, branch) = FlatpakManager.installedBranch(dir, "aarch64")!! + assertEquals("x86_64", arch) + assertEquals("master", branch.name) + } + + @Test fun theNativeBuildWinsWhenBothAreInstalled() { + install("x86_64", "master") + install("aarch64", "stable") + assertEquals("aarch64", FlatpakManager.installedBranch(dir, "aarch64")!!.first) + } + + @Test fun aBranchWithoutAnActiveDeployIsNotInstalled() { + File(dir, "x86_64/master").mkdirs() + assertNull(FlatpakManager.installedBranch(dir, "aarch64")) + } + + @Test fun x86BuildsOnArmLaunchWithTheirArch() { + val x86 = FlatpakManager.App("io.github.ebkr.r2modman", "r2modman", null, "master", null, "x86_64") + val arm = FlatpakManager.App("org.example.App", "App", null, "stable", null, "aarch64") + assertEquals(listOf("--arch=x86_64", "io.github.ebkr.r2modman"), FlatpakManager.launchArgs(x86, "aarch64")) + assertEquals(listOf("org.example.App"), FlatpakManager.launchArgs(arm, "aarch64")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt index 2c1d90ca0c..e403280417 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt @@ -29,7 +29,6 @@ class BootMovieLibraryTest { private fun movie(name: String) = File(movies, name).also { it.parentFile!!.mkdirs(); it.writeText("movie") } - /** A movie DroidDeck itself imported: kept in the library, copied into Steam's folder and noted in the list. */ private fun imported(title: String, source: String = BootMovieLibrary.SOURCE_IMPORT, repo: String? = null): String { val staged = File(BootMovieLibrary.libraryDir(app), ".t-${System.nanoTime()}-${Thread.currentThread().id}.staged").also { it.parentFile!!.mkdirs(); it.writeText("movie") } return BootMovieLibrary.commit(app, staged, title, source, repo)!! @@ -258,11 +257,9 @@ class BootMovieLibraryTest { steamPicks("b.webm") assertTrue(BootMovie.syncFromSteam(app)) assertEquals("file:b.webm", BootMovie.choice(app)) - // Picking another one here is not undone by the same Steam setting. BootMovie.select(app, "file:a.webm") assertFalse(BootMovie.syncFromSteam(app)) assertEquals("file:a.webm", BootMovie.choice(app)) - // A new pick inside Steam is adopted again. movie("c.webm") steamPicks("c.webm") assertTrue(BootMovie.syncFromSteam(app)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt new file mode 100644 index 0000000000..bafa252400 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt @@ -0,0 +1,25 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Test + +class BottomDesktopSizeTest { + @Test fun theDuosBottomPanelKeepsItsPixels() { + assertEquals(1280 to 848, desktopOutputSize(1280, 848, false, 720f)) + } + + @Test fun aLargerPanelRendersBelowItsResolution() { + assertEquals(826 to 646, desktopOutputSize(1240, 970, false, 720f)) + assertEquals(1280 to 644, desktopOutputSize(1920, 968, false, 720f)) + } + + @Test fun theTopScreenAfterASwapGetsItsOwnPixelsAndTheWideShape() { + assertEquals(1920 to 968, desktopOutputSize(1920, 968, true, 720f)) + assertEquals(1920 to 968, desktopOutputSize(1920, 969, true, 720f)) + } + + @Test fun noPanelNoSize() { + assertEquals(0 to 0, desktopOutputSize(0, 848, true, 720f)) + assertEquals(0 to 0, desktopOutputSize(1280, 0, false, 720f)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt new file mode 100644 index 0000000000..19046dc27b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt @@ -0,0 +1,38 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class BottomNotificationsTest { + private val own = "com.droiddeck.launcher" + + @Test fun messagesFromOtherAppsAreKept() { + assertTrue(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = false, title = "Kurt", text = "ready?")) + } + + @Test fun ownOngoingSummaryAndEmptyNotificationsAreSkipped() { + assertFalse(BottomNotifications.keep(own, own, ongoing = false, groupSummary = false, title = "Session", text = "running")) + assertFalse(BottomNotifications.keep(own, "com.spotify", ongoing = true, groupSummary = false, title = "Song", text = "Artist")) + assertFalse(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = true, title = "2 messages", text = "")) + assertFalse(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = false, title = " ", text = "")) + } + + @Test fun anUpdatedNotificationMovesToTheTopOnce() { + val list = mutableListOf( + BottomNotification("a", "App", "one", "", 1L), + BottomNotification("b", "App", "two", "", 2L), + ) + BottomNotifications.add(list, BottomNotification("b", "App", "two again", "", 3L)) + assertEquals(listOf("b", "a"), list.map { it.key }) + assertEquals("two again", list.first().title) + } + + @Test fun theListKeepsTheNewestThirty() { + val list = mutableListOf<BottomNotification>() + repeat(35) { BottomNotifications.add(list, BottomNotification("k$it", "App", "t$it", "", it.toLong())) } + assertEquals(30, list.size) + assertEquals("k34", list.first().key) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomScreenshotsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomScreenshotsTest.kt new file mode 100644 index 0000000000..0731f6b90e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BottomScreenshotsTest.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class BottomScreenshotsTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun fileNamesSortByTime() { + val name = BottomScreenshots.fileName(0L) + assertTrue(name, name.startsWith("DroidDeck_") && name.endsWith(".jpg")) + assertEquals(29, name.length) + } + + @Test fun steamScreenshotsAreFoundAndThumbnailsSkipped() { + val root = tmp.root + val shots = File(root, "root/.local/share/Steam/userdata/2932373/760/remote/220/screenshots") + File(shots, "thumbnails").mkdirs() + File(shots, "20261031010101_1.jpg").writeText("x") + File(shots, "thumbnails/20261031010101_1.jpg").writeText("x") + File(shots, "screenshots.vdf").writeText("x") + val x64 = File(root, "root/.droiddeck-x64/.local/share/Steam/userdata/2932373/760/remote/440/screenshots") + x64.mkdirs() + File(x64, "20261031020202_1.jpg").writeText("x") + val found = BottomScreenshots.steam(root).map { it.file!!.name }.sorted() + assertEquals(listOf("20261031010101_1.jpg", "20261031020202_1.jpg"), found) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/BridgeDxvkTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BridgeDxvkTest.kt new file mode 100644 index 0000000000..45afb7785c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BridgeDxvkTest.kt @@ -0,0 +1,267 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.gpu.AppVulkan +import com.droiddeck.launcher.gpu.GpuInfo +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream +import org.json.JSONObject +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class BridgeDxvkTest { + private val old = ComponentsManager.DXVK_FOR_VULKAN_1_1 + private val mid = ComponentsManager.DXVK_FOR_VULKAN_1_3_NO_INT64 + private lateinit var context: Context + + private val g710 = AppVulkan(1, 1, shaderInt64 = false, maxPushConstants = 128, source = "driver") + private val promoted = g710.copy(minor = 2, source = "bridge") + private val full = AppVulkan(1, 3, shaderInt64 = true, maxPushConstants = 256, source = "driver") + private val mali = GpuInfo("Mali-G710", 0, GpuInfo.Family.NOT_ADRENO, "", false) + + @Before fun setUp() { + context = RuntimeEnvironment.getApplication() + File(context.filesDir, "components").deleteRecursively() + LinuxRuntime.rootDir(context).deleteRecursively() + } + + @Test fun theNewestDxvkThatStartsIsChosen() { + assertEquals(old, ComponentsManager.bridgeDxvk(g710)?.file) + assertEquals(old, ComponentsManager.bridgeDxvk(promoted)?.file) + assertEquals(mid, ComponentsManager.bridgeDxvk(full.copy(shaderInt64 = false))?.file) + assertEquals(mid, ComponentsManager.bridgeDxvk(full.copy(maxPushConstants = 128))?.file) + assertNull(ComponentsManager.bridgeDxvk(full)) + assertNull(ComponentsManager.bridgeDxvk(full.copy(shaderInt64 = null, maxPushConstants = null))) + assertNull(ComponentsManager.bridgeDxvk(AppVulkan(1, 0, null, null, "driver"))) + assertNull(ComponentsManager.bridgeDxvk(null)) + assertEquals("Dxvk-Linux", ComponentsManager.bridgeDxvk(g710)?.release) + assertEquals("dxvk", ComponentsManager.bridgeDxvk(g710)?.comp) + } + + @Test fun theDriversLinesAreRead() { + val vk = AppVulkan.fromDriver(mapOf("device" to "Mali-G710 MC10", "api" to "1.1.177", "shader_int64" to "no", "max_push_constants" to "128")) + assertEquals(g710, vk) + assertNull(AppVulkan.fromDriver(mapOf("error" to "no Vulkan device"))) + assertNull(AppVulkan.fromDriver(mapOf("api" to "garbage"))) + val older = AppVulkan.fromDriver(mapOf("api" to "1.3.250"))!! + assertNull(older.shaderInt64) + assertNull(older.maxPushConstants) + } + + @Test fun theBridgesFileWinsForItsOwnGpuOnly() { + val text = "device=Mali-G710 MC10\napi=1.2.177\ndriver_api=1.1.177\npromotion=on\nshader_int64=0\nmax_push_constants=128\n" + val on = promoted.copy(source = "bridge, promoted") + assertEquals(on, AppVulkan.fromBridgeFile(text, "Mali-G710 MC10")) + assertEquals(on, AppVulkan.fromBridgeFile(text, null)) + assertEquals(on, AppVulkan.fromBridgeFile(text, "Mali-G710 MC10", "1.1.177")) + assertNull(AppVulkan.fromBridgeFile(text, "Mali-G720 Immortalis MC12")) + assertNull(AppVulkan.fromBridgeFile("device=x\n", null)) + } + + @Test fun withoutPromotionOnTheDriversVersionCounts() { + val g710File = g710.copy(source = "bridge") + val off = "device=Mali-G710 MC10\napi=1.1.177\ndriver_api=1.1.177\npromotion=off\nshader_int64=0\nmax_push_constants=128\n" + assertEquals(g710File, AppVulkan.fromBridgeFile(off, "Mali-G710 MC10", "1.1.177")) + val old = "device=Mali-G710 MC10\napi=1.3.177\ndriver_api=1.1.177\nshader_int64=0\nmax_push_constants=128\n" + assertEquals(g710File, AppVulkan.fromBridgeFile(old, "Mali-G710 MC10")) + assertNull(AppVulkan.fromBridgeFile(off, "Mali-G710 MC10", "1.3.212")) + } + + @Test fun anAdrenoSessionIsNotTouched() { + proton("proton-exp") + assertNull(run(g710, bridge = false)) + } + + @Test fun aShippedDxvk3IsReplacedOnAVulkan11Phone() { + proton("proton-exp") + proton("ge") + val applied = mutableListOf<String>() + val result = run(g710, applyAuto = { id, file -> applied += "$id $file"; "swapped $id" }) + assertEquals(listOf("ge $old", "proton-exp $old"), applied.sorted()) + assertTrue(result!!.startsWith("Vulkan 1.1, shaderInt64 no, push constants 128 (driver): DXVK $old")) + } + + @Test fun thePlayersOwnChoiceIsKept() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", "dxvk-3.1-linux.wcp").put("protonVersion", "experimental-11")) + assertNull(run(g710)) + assertNull(run(full)) + } + + @Test fun anAutomaticChoiceFollowsTheDevice() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", mid).put("protonVersion", "experimental-11").put("auto", true)) + val applied = mutableListOf<String>() + run(g710, applyAuto = { id, file -> applied += "$id $file"; "swapped" }) + assertEquals(listOf("proton-exp $old"), applied) + + writeState("proton-exp", JSONObject().put("file", old).put("protonVersion", "experimental-11").put("auto", true)) + assertNull(run(g710)) + val undone = mutableListOf<String>() + run(full, undoAuto = { id, comp -> undone += "$id $comp"; "undone" }) + assertEquals(listOf("proton-exp dxvk"), undone) + } + + @Test fun theSwapAndItsUndoReachTheProton() { + proton("proton-exp") + val d3d11 = File(protonDir("proton-exp"), "files/lib/wine/dxvk/aarch64-windows/d3d11.dll") + writePackage(old, "DXVK 1.10.3") + val auto: (String, String) -> String = { id, file -> ComponentsManager.swap(context, id, file, auto = true) } + val undo: (String, String) -> String = { id, comp -> ComponentsManager.undoAutoChoice(context, id, comp) } + + assertNotNull(run(g710, applyAuto = auto, undoAuto = undo)) + assertEquals("DXVK 1.10.3", d3d11.readText()) + val entry = state().getJSONObject("active").getJSONObject("proton-exp").getJSONObject("dxvk") + assertEquals(old, entry.getString("file")) + assertTrue(entry.getBoolean("auto")) + assertNull(run(g710, applyAuto = auto, undoAuto = undo)) + + run(full, applyAuto = auto, undoAuto = undo) + assertEquals("bundled DXVK experimental-11", d3d11.readText()) + assertNull(state().getJSONObject("active").optJSONObject("proton-exp")?.optJSONObject("dxvk")) + } + + @Test fun aFailedDetectionKeepsTheLastAutomaticChoice() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", old).put("protonVersion", "experimental-11").put("auto", true)) + assertNull(run(null)) + assertEquals(old, state().getJSONObject("active").getJSONObject("proton-exp").getJSONObject("dxvk").getString("file")) + } + + @Test fun oneProtonFailingDoesNotStopTheOthers() { + proton("ge") + proton("proton-exp") + val applied = mutableListOf<String>() + val result = run(g710, applyAuto = { id, file -> if (id == "ge") error("disk full"); applied += "$id $file"; "swapped $id" }) + assertEquals(listOf("proton-exp $old"), applied) + assertTrue(result!!, result.contains("disk full") && result.contains("swapped proton-exp")) + } + + @Test fun aChoiceWhoseSavedCopyIsGoneIsKept() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", old).put("label", "DXVK 1.10.3").put("protonVersion", "experimental-11").put("auto", true)) + val result = run(full, undoAuto = { id, comp -> ComponentsManager.undoAutoChoice(context, id, comp) }) + assertTrue(result!!, result.contains("its own copy is gone")) + assertEquals(old, state().getJSONObject("active").getJSONObject("proton-exp").getJSONObject("dxvk").getString("file")) + } + + @Test fun aProtonUpdateWithNoRuleLeftJustForgetsTheChoice() { + proton("proton-exp", "experimental-12") + writeState("proton-exp", JSONObject().put("file", old).put("protonVersion", "experimental-11").put("auto", true)) + run(full, undoAuto = { id, comp -> ComponentsManager.undoAutoChoice(context, id, comp) }) + assertNull(state().getJSONObject("active").optJSONObject("proton-exp")?.optJSONObject("dxvk")) + assertEquals("bundled DXVK experimental-12", File(protonDir("proton-exp"), "files/lib/wine/dxvk/aarch64-windows/d3d11.dll").readText()) + } + + @Test fun thePlayerCanKeepProtonsOwnDxvk() { + proton("proton-exp") + assertNull("nothing chosen when declined", run(g710, keep = true)) + writeState("proton-exp", JSONObject().put("file", old).put("protonVersion", "experimental-11").put("auto", true)) + val undone = mutableListOf<String>() + run(g710, keep = true, undoAuto = { id, comp -> undone += "$id $comp"; "undone" }) + assertEquals("an earlier automatic choice goes back", listOf("proton-exp dxvk"), undone) + } + + @Test fun turningTheBridgeOffRestoresProtonsOwn() { + proton("proton-exp") + val d3d11 = File(protonDir("proton-exp"), "files/lib/wine/dxvk/aarch64-windows/d3d11.dll") + writePackage(old, "DXVK 1.10.3") + val auto: (String, String) -> String = { id, file -> ComponentsManager.swap(context, id, file, auto = true) } + val undo: (String, String) -> String = { id, comp -> ComponentsManager.undoAutoChoice(context, id, comp) } + run(g710, applyAuto = auto, undoAuto = undo) + assertEquals("DXVK 1.10.3", d3d11.readText()) + run(null, bridge = false, applyAuto = auto, undoAuto = undo) + assertEquals("bundled DXVK experimental-11", d3d11.readText()) + assertNull(state().getJSONObject("active").optJSONObject("proton-exp")?.optJSONObject("dxvk")) + } + + @Test fun turningTheBridgeOffKeepsThePlayersOwnChoice() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", "dxvk-3.1-linux.wcp").put("protonVersion", "experimental-11")) + assertNull(run(g710, bridge = false)) + assertNull(run(g710, keep = true)) + } + + @Test fun aQueuedAutomaticSwapIsDroppedWhenTheBridgeIsOff() { + proton("proton-exp") + val f = File(context.filesDir, "components/state.json") + f.parentFile!!.mkdirs() + f.writeText(JSONObject().put("active", JSONObject()) + .put("queued", JSONObject().put("proton-exp", JSONObject() + .put("dxvk", JSONObject().put("kind", "package").put("file", old).put("auto", true)) + .put("vkd3d", JSONObject().put("kind", "package").put("file", "vkd3d-x.wcp")))).toString()) + assertNull(run(null, bridge = false)) + val q = state().getJSONObject("queued").getJSONObject("proton-exp") + assertFalse(q.has("dxvk")) + assertTrue("the player's own queued swap stays", q.has("vkd3d")) + } + + @Test fun whenAutomaticChoicesAreUndone() { + val rule = ComponentsManager.bridgeDxvk(g710) + assertTrue(ComponentsManager.autoDxvkUndoWanted(false, false, null, null)) + assertTrue(ComponentsManager.autoDxvkUndoWanted(true, true, g710, null)) + assertTrue(ComponentsManager.autoDxvkUndoWanted(true, false, full, null)) + assertFalse("failed detection keeps it", ComponentsManager.autoDxvkUndoWanted(true, false, null, null)) + assertFalse(ComponentsManager.autoDxvkUndoWanted(true, false, g710, rule)) + } + + private fun run( + vk: AppVulkan?, + bridge: Boolean = true, + keep: Boolean = false, + applyAuto: (String, String) -> String = { id, file -> error("apply $id $file") }, + undoAuto: (String, String) -> String = { id, comp -> error("undo $id $comp") }, + ) = ComponentsManager.ensureForcedPackages( + context, mali, + lookup = { file, release -> ComponentsManager.CatalogItem(file, "dxvk", release, "https://example.invalid/$file", 4, "sha256:" + "ab".repeat(32)) }, + fetch = {}, + apply = { id, file -> error("non-automatic apply $id $file") }, + vulkan = vk, bridgeSession = bridge, applyAuto = applyAuto, undoAuto = undoAuto, keepProtonDxvk = keep, + ) + + private fun protonDir(name: String) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/common/$name") + + private fun proton(name: String, version: String = "experimental-11") { + val dir = protonDir(name) + File(dir, "files/lib/wine").mkdirs() + File(dir, "proton").writeText("#!/bin/sh\n") + File(dir, "version").writeText("1 $version\n") + File(dir, "files/lib/wine/dxvk/aarch64-windows/d3d11.dll").apply { + parentFile!!.mkdirs() + writeText("bundled DXVK $version") + } + } + + private fun state() = JSONObject(File(context.filesDir, "components/state.json").readText()) + + private fun writeState(protonId: String, dxvk: JSONObject) { + val f = File(context.filesDir, "components/state.json") + f.parentFile!!.mkdirs() + f.writeText(JSONObject().put("active", JSONObject().put(protonId, JSONObject().put("dxvk", dxvk))) + .put("queued", JSONObject()).toString()) + } + + private fun writePackage(file: String, d3d11: String) { + val dest = File(context.filesDir, "components/packages/$file") + dest.parentFile!!.mkdirs() + TarArchiveOutputStream(ZstdOutputStream(dest.outputStream())).use { tar -> + fun put(name: String, bytes: ByteArray) { + tar.putArchiveEntry(TarArchiveEntry(name).apply { size = bytes.size.toLong() }) + tar.write(bytes) + tar.closeArchiveEntry() + } + put("./profile.json", JSONObject().put("type", "DXVK-Linux").put("versionName", file.removeSuffix(".wcp")).toString().toByteArray()) + put("./files/lib/wine/dxvk/aarch64-windows/d3d11.dll", d3d11.toByteArray()) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt index 8fbb0bacd5..5dbd3163fb 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt @@ -55,11 +55,9 @@ class ComponentsNightlyCatalogTest { val nVkEc = item("DD-vkd3d-proton-arm64ec-3.0.1+455-nightly.wcp", "vkd3d", n) val pairs = ComponentsManager.nightlyPairs(listOf(dxvk, ec, gpl, fex, vk) + others + listOf(nDxvk, nEc, nGpl, nFex, nVk, nVkEc)) assertEquals(mapOf(dxvk to nDxvk, ec to nEc, gpl to nGpl, fex to nFex, vk to nVk), pairs) - // Two nightlies for one stable build: the newer one wins. val nDxvkNewer = item("DD-dxvk-3.1.1+154-nightly.wcp", "dxvk", n) assertEquals(mapOf(dxvk to nDxvkNewer), ComponentsManager.nightlyPairs(listOf(dxvk, nDxvkNewer, nDxvk))) assertEquals(mapOf(dxvk to nDxvkNewer), ComponentsManager.nightlyPairs(listOf(dxvk, nDxvk, nDxvkNewer))) - // A nightly of a version with no stable build pairs with nothing. assertEquals(emptyMap<Any, Any>(), ComponentsManager.nightlyPairs(listOf(item("dxvk-3.1-linux.wcp", "dxvk", "Dxvk-Linux"), nDxvk))) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/DesktopLocaleTest.kt b/app/src/test/java/com/droiddeck/launcher/session/DesktopLocaleTest.kt new file mode 100644 index 0000000000..91cff65994 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/DesktopLocaleTest.kt @@ -0,0 +1,51 @@ +package com.droiddeck.launcher.session + +import com.droiddeck.launcher.core.AppLanguage +import java.util.Locale +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class DesktopLocaleTest { + private fun lang(tag: String) = DesktopLocale.lang(Locale.forLanguageTag(tag)) + + @Test fun appLanguagesMapToGlibcLocales() { + assertEquals("en_US.UTF-8", lang("en")) + assertEquals("tr_TR.UTF-8", lang("tr")) + assertEquals("pt_BR.UTF-8", lang("pt-BR")) + assertEquals("pt_PT.UTF-8", lang("pt-PT")) + assertEquals("es_MX.UTF-8", lang("es-419")) + assertEquals("zh_CN.UTF-8", lang("zh-CN")) + assertEquals("zh_TW.UTF-8", lang("zh-TW")) + assertEquals("zh_HK.UTF-8", lang("zh-HK")) + } + + @Test fun chineseScriptBeatsRegion() { + assertEquals("zh_CN.UTF-8", lang("zh-Hans-HK")) + assertEquals("zh_TW.UTF-8", lang("zh-Hant-CN")) + assertEquals("zh_TW.UTF-8", lang("zh-MO")) + assertEquals("zh_HK:zh_TW:zh", DesktopLocale.language(Locale.forLanguageTag("zh-HK"))) + } + + @Test fun systemRegionsSurvive() { + assertEquals("en_GB.UTF-8", lang("en-GB")) + assertEquals("fr_CA.UTF-8", lang("fr-CA")) + assertEquals("de_DE.UTF-8", lang("de-XX")) + } + + @Test fun everyAppLanguageHasALocale() { + AppLanguage.supported.forEach { assertTrue(it, lang(it) != DesktopLocale.DEFAULT) } + } + + @Test fun unknownLanguagesFallBack() { + assertEquals(DesktopLocale.DEFAULT, lang("sw")) + } + + @Test fun languageListPrefersTheRegionThenTheLanguage() { + assertEquals("pt_BR:pt", DesktopLocale.language(Locale.forLanguageTag("pt-BR"))) + assertEquals("tr_TR:tr", DesktopLocale.language(Locale.forLanguageTag("tr"))) + assertEquals("en_US", DesktopLocale.language(Locale.forLanguageTag("en"))) + assertNull(DesktopLocale.language(Locale.forLanguageTag("sw"))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt index ba026b4742..241d815459 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt @@ -36,7 +36,6 @@ class ForcedPackageTest { ComponentsManager.unpackedCacheKey(filename) fail("Expected cache traversal name to be rejected: $filename") } catch (_: IllegalArgumentException) { - // Expected: the derived path would be a dot segment. } } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameTelemetryTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameTelemetryTest.kt new file mode 100644 index 0000000000..ebbd21b66e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GameTelemetryTest.kt @@ -0,0 +1,223 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.nio.ByteBuffer +import java.nio.ByteOrder + +class GameTelemetryTest { + private fun packet(size: Int, fill: ByteBuffer.() -> Unit): ByteArray = + ByteBuffer.allocate(size).order(ByteOrder.LITTLE_ENDIAN).apply(fill).array() + + @Test fun codemastersFloatsBecomeADash() { + val data = packet(264) { + putFloat(7 * 4, 25f) + putFloat(29 * 4, 0.8f) + putFloat(31 * 4, 0.1f) + putFloat(33 * 4, 3f) + putFloat(36 * 4, 1f) + putFloat(37 * 4, 650f) + putFloat(63 * 4, 800f) + putFloat(45 * 4, 30f) + putFloat(46 * 4, 60f) + } + val t = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, data, data.size)!! + assertEquals(90f, t.speedKmh!!, 0.01f) + assertEquals("3", t.gear) + assertEquals(6500f, t.rpm!!, 0.01f) + assertEquals(8000f, t.maxRpm!!, 0.01f) + assertEquals(2, t.lap) + assertEquals(0.5f, t.fuel!!, 0.001f) + } + + @Test fun codemastersShortPacketFromDirtShowdown() { + val data = packet(152) { + putFloat(1 * 4, 80.085f) + putFloat(7 * 4, 10.739f) + putFloat(29 * 4, 0.816f) + putFloat(33 * 4, 1f) + putFloat(37 * 4, 827.531f) + } + val t = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, data, data.size)!! + assertEquals(38.66f, t.speedKmh!!, 0.01f) + assertEquals("1", t.gear) + assertEquals(8275.31f, t.rpm!!, 0.01f) + assertEquals(0.816f, t.throttle!!, 0.001f) + assertEquals(1, t.lap) + assertEquals(80.085f, t.currentLapS!!, 0.001f) + assertNull(t.maxRpm) + assertNull(t.laps) + assertNull(t.position) + assertNull(t.fuel) + assertNull(t.lastLapS) + } + + @Test fun codemastersReverseAndNeutral() { + fun gear(g: Float) = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, packet(264) { putFloat(33 * 4, g) }, 264)!!.gear + assertEquals("N", gear(0f)) + assertEquals("R", gear(-1f)) + assertEquals("R", gear(10f)) + } + + @Test fun forzaHorizonDashSitsTwelveBytesLater() { + val dash = 232 + 12 + val data = packet(324) { + putInt(0, 1) + putFloat(8, 8000f) + putFloat(16, 5000f) + putFloat(dash + 12, 50f) + put(dash + 71, 255.toByte()) + put(dash + 75, 4) + putShort(dash + 68, 2) + put(dash + 70, 5) + } + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!! + assertEquals(180f, t.speedKmh!!, 0.01f) + assertEquals("4", t.gear) + assertEquals(1f, t.throttle!!, 0.001f) + assertEquals(3, t.lap) + assertEquals(5, t.position) + } + + @Test fun forzaMotorsportDashFollowsTheSled() { + val data = packet(311) { + putInt(0, 1) + putFloat(232 + 12, 10f) + put(232 + 75, 0) + } + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!! + assertEquals(36f, t.speedKmh!!, 0.01f) + assertEquals("R", t.gear) + } + + @Test fun forzaInMenusHasNoDash() { + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, packet(324) {}, 324)!! + assertNull(t.speedKmh) + } + + @Test fun outGaugeGearsAreShiftedByOne() { + val data = packet(96) { + put(10, 3) + putFloat(12, 20f) + putFloat(16, 4000f) + } + val t = GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, data, data.size)!! + assertEquals("2", t.gear) + assertEquals(72f, t.speedKmh!!, 0.01f) + assertEquals(4000f, t.rpm!!, 0.01f) + } + + @Test fun listensOnIpv4Loopback() { + assertTrue(GameTelemetry.LISTEN_ADDRESS is java.net.Inet4Address) + assertEquals("127.0.0.1", GameTelemetry.LISTEN_ADDRESS.hostAddress) + } + + @Test fun shortPacketsAreIgnored() { + assertNull(GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, ByteArray(148), 148)) + assertNull(GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, ByteArray(40), 40)) + assertNull(GameTelemetry.parse(1234, ByteArray(400), 400)) + } + + @Test fun codemastersGForceAndSteering() { + val data = packet(152) { + putFloat(30 * 4, -0.5f) + putFloat(33 * 4, 2f) + putFloat(34 * 4, 1.2f) + putFloat(35 * 4, -0.8f) + } + val t = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, data, data.size)!! + assertEquals(-0.5f, t.steer!!, 1e-4f) + assertEquals(1.2f, t.gLat!!, 1e-4f) + assertEquals(-0.8f, t.gLon!!, 1e-4f) + } + + @Test fun forzaReadsBestLapSteeringGForceAndTires() { + val dash = 232 + val data = packet(311) { + putInt(0, 1) + putFloat(20, 9.81f) + putFloat(28, -4.905f) + putFloat(dash + 24, 212f) + putFloat(dash + 28, 32f) + putFloat(dash + 32, 194f) + putFloat(dash + 36, 176f) + putFloat(dash + 52, 81.5f) + put(dash + 75, 3) + put(dash + 76, (-127).toByte()) + } + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!! + assertEquals(1f, t.gLat!!, 1e-3f) + assertEquals(-0.5f, t.gLon!!, 1e-3f) + assertEquals(listOf(100f, 0f, 90f, 80f), t.tireTempsC!!.map { Math.round(it).toFloat() }) + assertEquals(81.5f, t.bestLapS!!, 1e-4f) + assertEquals(-1f, t.steer!!, 1e-4f) + } + + @Test fun forzaWithoutTireDataLeavesThemOut() { + val data = packet(311) { putInt(0, 1); put(232 + 75, 2) } + assertNull(GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!!.tireTempsC) + } + + @Test fun outGaugeReadsTurboTemperaturesAndLights() { + val data = packet(92) { + put(10, 3) + putFloat(20, 0.8f) + putFloat(24, 92f) + putFloat(36, 104f) + putInt(40, GameTelemetry.DL_SHIFT or GameTelemetry.DL_ABS or GameTelemetry.DL_HANDBRAKE) + putInt(44, GameTelemetry.DL_SHIFT or GameTelemetry.DL_ABS) + } + val t = GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, data, data.size)!! + assertEquals(0.8f, t.turboBar!!, 1e-4f) + assertEquals(92f, t.engineTempC!!, 1e-4f) + assertEquals(104f, t.oilTempC!!, 1e-4f) + assertEquals(GameTelemetry.DL_SHIFT or GameTelemetry.DL_ABS, t.lights) + } + + @Test fun outGaugeZeroFieldsStayHidden() { + val t = GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, packet(92) { put(10, 2) }, 92)!! + assertNull(t.turboBar) + assertNull(t.engineTempC) + assertNull(t.lights) + } +} + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class GameStatusFilesTest { + @Test fun warThunderShowsNumbersOnlyDuringAMatch() { + assertEquals(emptyList<Pair<String, String>>(), GameStatusFiles.warThunder("""{"valid": false}""")) + val rows = GameStatusFiles.warThunder("""{"valid": true, "H, m": 1520, "TAS, km/h": 512.4, "name": "x"}""") + assertEquals(listOf("H, m" to "1520", "TAS, km/h" to "512.4"), rows) + } + + @Test fun warThunderKeepsEveryNumberForTheFlightLayout() { + val json = buildString { + append("{\"valid\": true") + for (i in 0 until 20) append(", \"k$i\": $i") + append(", \"IAS, km/h\": 512, \"throttle 1, %\": 110}") + } + val rows = GameStatusFiles.warThunder(json) + assertEquals(22, rows.size) + assertTrue(com.droiddeck.launcher.ui.FlightLabels.drawable(rows)) + assertEquals("110", rows.toMap()["throttle 1, %"]) + } + + @Test fun eliteAtTheMenusShowsNothing() { + assertNull(GameStatusFiles.elite("""{"timestamp": "2026-10-31T02:00:00Z", "event": "Status", "Flags": 0}""")) + } + + @Test fun eliteInFlight() { + val e = GameStatusFiles.elite("""{"Flags": 16777240, "Pips": [4, 8, 0], "Fuel": {"FuelMain": 16.0, "FuelReservoir": 0.43}, + "Cargo": 2.0, "LegalState": "Clean", "Balance": 1234567}""")!! + assertEquals(16.0, e.fuelMain!!, 0.001) + assertEquals(listOf(4, 8, 0), e.pips) + assertEquals("Clean", e.legal) + assertEquals(1234567L, e.balance) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameThreadHintsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameThreadHintsTest.kt index 16f5d7d2cd..8233957e2a 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/GameThreadHintsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/GameThreadHintsTest.kt @@ -9,9 +9,7 @@ class GameThreadHintsTest { @Test fun `a thread joins above 60 percent and leaves under 15`() { assertEquals(emptySet<Int>(), GameThreadHints.pick(emptySet(), mapOf(1 to 0.55))) assertEquals(setOf(1), GameThreadHints.pick(emptySet(), mapOf(1 to 0.68))) - // Faster where it was moved, or capped by the display, it stays boosted at 25%... assertEquals(setOf(1), GameThreadHints.pick(setOf(1), mapOf(1 to 0.25))) - // ...and is let go once it idles. assertEquals(emptySet<Int>(), GameThreadHints.pick(setOf(1), mapOf(1 to 0.1))) } @@ -28,8 +26,8 @@ class GameThreadHintsTest { assertTrue(GameThreadHints.holdsPace(119.0, 120.0)) assertTrue(GameThreadHints.holdsPace(60.5, 120.0)) assertTrue(GameThreadHints.holdsPace(30.0, 120.0)) - assertFalse(GameThreadHints.holdsPace(92.0, 120.0)) // falling behind: boost + assertFalse(GameThreadHints.holdsPace(92.0, 120.0)) assertFalse(GameThreadHints.holdsPace(105.0, 120.0)) - assertFalse(GameThreadHints.holdsPace(3.0, 120.0)) // headless or loading: boost + assertFalse(GameThreadHints.holdsPace(3.0, 120.0)) } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/GpuLayerLoadTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GpuLayerLoadTest.kt new file mode 100644 index 0000000000..996035e31f --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GpuLayerLoadTest.kt @@ -0,0 +1,114 @@ +package com.droiddeck.launcher.session + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class GpuLayerLoadTest { + @get:Rule val tmp = TemporaryFolder() + private var now = 0L + private fun load(dir: File) = GpuStatsComponent.LayerLoad(dir, clock = { now }) + private fun write(dir: File, pid: Int, busyNs: Long) = File(dir, "$pid").writeText("%20d %-32s\n".format(busyNs, "game")) + + @Test fun busyTimeOfAllProcessesOverWallTime() { + val dir = tmp.newFolder("gpu-load") + val load = load(dir) + write(dir, 100, 1_000_000_000L) + write(dir, 200, 5_000_000_000L) + now = 10_000_000_000L + assertNull(load.percent()) + write(dir, 100, 1_300_000_000L) + write(dir, 200, 5_100_000_000L) + now += 1_000_000_000L + assertEquals(40L, load.percent()) + } + + @Test fun aNewProcessStartsFromItsOwnTotalAndAGoneOneStopsCounting() { + val dir = tmp.newFolder("gpu-load") + val load = load(dir) + write(dir, 100, 2_000_000_000L) + now = 1L + load.percent() + File(dir, "100").delete() + write(dir, 300, 9_000_000_000L) + now += 500_000_000L + assertEquals(0L, load.percent()) + write(dir, 300, 9_250_000_000L) + now += 500_000_000L + assertEquals(50L, load.percent()) + } + + @Test fun capsAtFullAndIgnoresOtherFiles() { + val dir = tmp.newFolder("gpu-load") + val load = load(dir) + File(dir, "on").createNewFile() + write(dir, 1, 0L) + write(dir, 2, 0L) + now = 1L + load.percent() + write(dir, 1, 900_000_000L) + write(dir, 2, 900_000_000L) + now += 1_000_000_000L + assertEquals(100L, load.percent()) + } + + @Test fun theOnFlagFollowsTheHudAndHidingDropsTheBaseline() { + val dir = tmp.newFolder("gpu-load") + val load = load(dir) + load.wanted(true) + assertTrue(File(dir, "on").exists()) + write(dir, 1, 100L) + now = 1L + load.percent() + load.wanted(false) + assertFalse(File(dir, "on").exists()) + load.wanted(true) + now += 1_000L + assertNull(load.percent()) + } + + @Test fun theCompositorsOwnGpuTimeAddsToTheGames() { + val dir = tmp.newFolder("gpu-load") + var compositor: Long? = 7_000_000_000L + val load = GpuStatsComponent.LayerLoad(dir, clock = { now }, extra = { compositor }) + write(dir, 100, 1_000_000_000L) + now = 1L + assertNull(load.percent()) + write(dir, 100, 1_600_000_000L) + compositor = 7_150_000_000L + now += 1_000_000_000L + assertEquals(75L, load.percent()) + compositor = null + write(dir, 100, 1_900_000_000L) + now += 1_000_000_000L + assertEquals(30L, load.percent()) + } + + @Test fun onlyTheCompositorCountsWhenNoGameReportsYet() { + val dir = File(tmp.root, "never-created") + var compositor = 0L + val load = GpuStatsComponent.LayerLoad(dir, clock = { now }, extra = { compositor }) + now = 1L + load.percent() + compositor = 200_000_000L + now += 1_000_000_000L + assertEquals(20L, load.percent()) + } + + @Test fun compositorTimingFollowsTheHudOnlyOnChanges() { + val dir = tmp.newFolder("gpu-load") + val calls = mutableListOf<Boolean>() + val load = GpuStatsComponent.LayerLoad(dir, clock = { now }, onWanted = { calls += it }) + load.wanted(true) + load.wanted(true) + load.wanted(false) + load.wanted(true) + load.clear() + assertEquals(listOf(true, false, true, false), calls) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/GpuMemstoreLoadTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GpuMemstoreLoadTest.kt new file mode 100644 index 0000000000..f0d7478d81 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GpuMemstoreLoadTest.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class GpuMemstoreLoadTest { + private var busy = 0L + private var samples = 0L + private var moves = 0L + private var available = true + private val load = GpuStatsComponent.MemstoreLoad { if (available) longArrayOf(busy, samples, moves) else null } + + private fun tick(newSamples: Long, newBusy: Long, newMoves: Long = 1) { + samples += newSamples + busy += newBusy + moves += newMoves + } + + @Test fun notTrustedUntilNewWorkIsSeen() { + assertNull(load.percent()) + tick(500, 400, newMoves = 0) + assertNull(load.percent()) + assertFalse(load.working) + tick(500, 300) + assertEquals(70L, load.percent()) + assertTrue(load.working) + } + + @Test fun givesUpWhenTheTimestampsNeverMove() { + load.percent() + repeat(10) { + tick(500, 250, newMoves = 0) + assertNull(load.percent()) + } + assertTrue(load.failed) + tick(500, 250) + assertNull(load.percent()) + assertFalse(load.working) + } + + @Test fun averagesOverTheLastTwoReads() { + load.percent() + tick(500, 500) + assertEquals(100L, load.percent()) + tick(500, 0) + assertEquals(50L, load.percent()) + tick(500, 0, newMoves = 0) + assertEquals(0L, load.percent()) + } + + @Test fun pausingStartsANewWindow() { + load.percent() + tick(500, 500) + load.percent() + load.pause() + tick(0, 0, newMoves = 0) + assertNull(load.percent()) + tick(500, 100) + assertEquals(20L, load.percent()) + } + + @Test fun noReadingWithoutNewSamplesOrCounts() { + load.percent() + tick(500, 100) + load.percent() + assertNull(load.percent()) + available = false + tick(500, 100) + assertNull(load.percent()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/GpuReaderStatusTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GpuReaderStatusTest.kt new file mode 100644 index 0000000000..c7e6867cca --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GpuReaderStatusTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.session + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Test + +class GpuReaderStatusTest { + @After fun reset() { + KgslBusy.status = "not tried" + KgslClock.status = "not tried" + } + + @Test fun emptyWhereTheReadersWereNotNeeded() { + assertEquals("", GpuStatsComponent.readerStatus()) + } + + @Test fun namesBothReaders() { + KgslBusy.status = "per-context stamps (hardware-scheduled kernel)" + KgslClock.status = "working (680 MHz at start)" + assertEquals( + "kgsl memstore per-context stamps (hardware-scheduled kernel); GPU cycle counter working (680 MHz at start)", + GpuStatsComponent.readerStatus(), + ) + } + + @Test fun rangeCheckFailureIsNamed() { + assertEquals("sample out of range", KgslErrors.describe(KgslClock.RANGE_CHECK_FAILED)) + assertEquals("no error code", KgslErrors.describe(0)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/GpuStatsBindsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GpuStatsBindsTest.kt new file mode 100644 index 0000000000..4343683f35 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GpuStatsBindsTest.kt @@ -0,0 +1,27 @@ +package com.droiddeck.launcher.session + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class GpuStatsBindsTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun feedsWithNoValueYetAreStillBound() { + val dir = tmp.newFolder("kgsl-3d0") + GpuStatsComponent.createMissing(listOf(File(dir, "perf_now"), File(dir, "cur_freq"))) + val binds = GpuStatsComponent(dir, tmp.root).binds() + assertTrue(binds.contains(File(dir, "perf_now").path + ":" + GpuStatsComponent.MSM_LOAD)) + assertTrue(binds.contains(File(dir, "cur_freq").path + ":" + GpuStatsComponent.MSM_CLOCK)) + } + + @Test fun aWrittenValueIsKept() { + val dir = tmp.newFolder("kgsl-3d0") + File(dir, "cur_freq").writeText("586000000 \n") + GpuStatsComponent.createMissing(listOf(File(dir, "cur_freq"))) + assertEquals("586000000 \n", File(dir, "cur_freq").readText()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt b/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt index 824888822a..c2d0ca8356 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt @@ -17,6 +17,16 @@ class OutputPacingTest { assertEquals(30, SessionPrefs.compositorFpsLimit(60, 30)) } + @Test fun pictureInPictureHoldsTheSessionToThirty() { + assertEquals(SessionPrefs.PIP_FPS, SessionPrefs.compositorFpsLimit(0, pip = true)) + assertEquals(SessionPrefs.PIP_FPS, SessionPrefs.compositorFpsLimit(0, 60, pip = true)) + assertEquals(20, SessionPrefs.compositorFpsLimit(0, 20, pip = true)) + } + + @Test fun pictureInPictureKeepsTheGlassesRate() { + assertEquals(60, SessionPrefs.compositorFpsLimit(60, pip = true)) + } + @Test fun mirroringKeepsTheGlassesRate() { assertEquals(60, SessionPrefs.compositorFpsLimit(60)) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/OverlayShownTest.kt b/app/src/test/java/com/droiddeck/launcher/session/OverlayShownTest.kt new file mode 100644 index 0000000000..75675376ef --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/OverlayShownTest.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.session + +import java.io.File +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class OverlayShownTest { + @get:Rule val tmp = TemporaryFolder() + + private fun config(name: String, text: String, modified: Long) = + File(tmp.root, "tmp").apply { mkdirs() }.resolve(name).apply { writeText(text); setLastModified(modified) } + + @Test fun noConfigIsHidden() { + assertFalse(OverlayShown.check(tmp.root)) + } + + @Test fun mangohudConfigFollowsNoDisplay() { + val f = config("mangohud.abcdefgh", "no_display\n", 1_000_000L) + assertFalse(OverlayShown.check(tmp.root)) + f.writeText("preset=3\n") + assertTrue(OverlayShown.check(tmp.root)) + } + + @Test fun steamSessionConfigFollowsNoDisplay() { + val f = config("droiddeck-mangohud.conf", "no_display\n", 1_000_000L) + assertFalse(OverlayShown.check(tmp.root)) + f.writeText("preset=3\n") + assertTrue(OverlayShown.check(tmp.root)) + } + + @Test fun newestConfigWins() { + config("mangohud.abcdefgh", "no_display\n", 1_000_000L) + config("droiddeck-mangohud.conf", "preset=3\n", 2_000_000L) + assertTrue(OverlayShown.check(tmp.root)) + config("mangohud.abcdefgh", "no_display\n", 3_000_000L) + assertFalse(OverlayShown.check(tmp.root)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt index 5d51028b05..82512c0b91 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt @@ -4,6 +4,8 @@ import org.junit.Assert.* import org.junit.Test class SessionDisplayTest { + private val scaledFollow = listOf("follow/1.5", "follow/2", "follow/2.5", "follow/3", "follow/4") + @Test fun portraitPresetsSwapTheOutputAndRetainTheResolutionCap() { assertEquals(720 to 1280, SessionDisplay.resolveChoice(1920 to 1080, "720p", portrait = true)) assertEquals(900 to 1600, SessionDisplay.resolveChoice(1080 to 1920, "900p", portrait = true)) @@ -40,13 +42,13 @@ class SessionDisplayTest { @Test fun optionsListTheHeightsThePanelCanShowThenThePanel() { val thor = SessionDisplay.resolutionOptions(1920 to 1080) - assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), thor) - assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), + assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, thor) + assertEquals(listOf("720p", "900p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, SessionDisplay.resolutionOptions(2400 to 1080)) - assertEquals(listOf("720p", "900p", "1080p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), + assertEquals(listOf("720p", "900p", "1080p", SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, SessionDisplay.resolutionOptions(3120 to 1440)) val small = SessionDisplay.resolutionOptions(1280 to 720) - assertEquals(listOf(SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN), small) + assertEquals(listOf(SessionDisplay.MATCH_SCREEN, SessionDisplay.FOLLOW_SCREEN) + scaledFollow, small) assertEquals(1280 to 720, SessionDisplay.resolveChoice(1280 to 720, SessionDisplay.MATCH_SCREEN)) assertEquals(2560 to 1440, SessionDisplay.resolveChoice(2560 to 1440, SessionDisplay.MATCH_SCREEN)) } @@ -105,6 +107,31 @@ class SessionDisplayTest { assertNull(SessionDisplay.followSize(640, 360)) } + @Test fun scaledFollowDividesTheWindowAndStaysEven() { + assertEquals(1260 to 540, SessionDisplay.resolveChoice(1080 to 2520, "follow/2")) + assertEquals(540 to 1260, SessionDisplay.resolveChoice(2520 to 1080, "follow/2", portrait = true)) + assertEquals(1092 to 984, SessionDisplay.followSize(2185, 1969, scale = 2f)) + assertEquals(656 to 728, SessionDisplay.followSize(1968, 2184, scale = 3f)) + assertNull(SessionDisplay.followSize(640, 360, scale = 2f)) + assertEquals(720 to 1600, SessionDisplay.resolveChoice(2400 to 1080, "follow/1.5", portrait = true)) + assertEquals(1600 to 720, SessionDisplay.resolveChoice(1080 to 2400, "follow/1.5")) + assertNull(SessionDisplay.followScale("follow/1.0")) + } + + @Test fun onlyKnownFollowChoicesCountAsFollow() { + assertEquals(1f, SessionDisplay.followScale(SessionDisplay.FOLLOW_SCREEN)) + assertEquals(3f, SessionDisplay.followScale("follow/3")) + assertEquals(1.3f, SessionDisplay.followScale("follow/1.3")) + assertEquals(1.3f, SessionDisplay.followScale("follow/1.26")) + assertEquals("follow/1.3", SessionDisplay.followScaled(1.3f)) + assertEquals("follow/2", SessionDisplay.followScaled(2f)) + assertNull(SessionDisplay.followScale("follow/1")) + assertNull(SessionDisplay.followScale("follow/x")) + assertNull(SessionDisplay.followScale("follow/9")) + assertNull(SessionDisplay.followScale("720p")) + assertFalse(SessionDisplay.isFollow(SessionDisplay.MATCH_SCREEN)) + } + @Test fun aPhoneCanFollowTheShortGameAreaAboveItsControls() { assertNull(SessionDisplay.followSize(720, 404)) assertEquals(720 to 404, SessionDisplay.followSize(720, 404, controlsBelow = true)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt index 674f6211e8..ff7fd95108 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt @@ -27,7 +27,6 @@ class SessionLogShareZipTest { val earlySecret = "early-sessionid-abcdef123456" val trailingSecret = "late-refresh-token-abcdef123456" try { - // One long line exercises the streaming limit; the final ordinary line must still be redacted. raw.bufferedWriter().use { out -> out.write("sessionid=$earlySecret") val chunk = "x".repeat(8192) @@ -40,7 +39,6 @@ class SessionLogShareZipTest { ZipFile(zip).use { archive -> val entry = archive.getEntry("${session.name}/steam-42.log")!! archive.getInputStream(entry).use { input -> - // Only inspect the bounded scrubbed prefix: the pre-fix raw archive is over 64 MiB. val expected = "${com.droiddeck.launcher.core.LogRedactor.OVERSIZED_LINE}\n" val prefix = ByteArray(expected.toByteArray(StandardCharsets.UTF_8).size) var offset = 0 @@ -74,7 +72,6 @@ class SessionLogShareZipTest { "Authorization: Bearer abc.def.ghi\n" + "kept: EResult 5, app 1086940, steamapps/common/Game\n" ) - // StoreLogFiles.prune, started by App.onCreate, deletes a stores log named for a day over a week old. val storesLog = "stores-" + SimpleDateFormat("yyyy-MM-dd", Locale.US).format(Date()) + ".log" File(logs, "stores").apply { mkdirs() }.resolve(storesLog).writeText("epic: f_token=zzzzzzzz12 window 32\n") File(logs, SessionPaths.TOOLS_DIR).apply { mkdirs() }.resolve("flatpak-install.log").writeText("== install\nCookie: steamLoginSecure=76561198000000000%7C%7Ceyabc\n") diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt index 02b38143ee..230eb1f12e 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.session import java.io.File +import java.nio.ByteBuffer +import java.nio.ByteOrder import java.util.concurrent.AbstractExecutorService import java.util.concurrent.RejectedExecutionException import java.util.concurrent.TimeUnit @@ -86,6 +88,105 @@ class SessionSuspendControllerTest { assertTrue(disabled.pagedOut.isEmpty()) } + @Test fun resumeReadsThePagedOutMemoryBack() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + val resumed = fixture.signals.drop(before) + assertEquals(listOf(GAME), resumed.filter { it.signal == URG }.map { it.pid }) + assertTrue(resumed.indexOfLast { it.signal == CONT } < resumed.indexOfFirst { it.signal == URG }) + assertEquals("0", fixture.control.readText()) + assertEquals(listOf(Triple(1, 0L, 3_000_000L)), fixture.pagedIn) + assertTrue(fixture.game.threads.all { it.state == 'S' }) + val again = fixture.signals.size + fixture.controller.freeze { assertTrue(it) } + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(again).any { it.signal == URG }) + assertEquals(1, fixture.pagedIn.size) + } + + @Test fun noReadBackAfterAFreezeWithoutPageOut() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.controller.freeze { assertTrue(it) } + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.any { it.signal == URG }) + assertTrue(fixture.pagedIn.isEmpty()) + } + + @Test fun readBackIsSkippedWhenAvailableMemoryCannotTakeIt() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.availableKb = 3_500_000L + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals("1", fixture.control.readText()) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun readBackNeedsTwiceTheSwapAvailable() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.availableKb = 5_500_000L + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun readBackKeepsATenthOfMemTotalAvailable() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.totalKb = 40_000_000L + fixture.availableKb = 6_500_000L + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun noReadBackWithARamCap() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.readBackAllowed = false + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals("1", fixture.control.readText()) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun cancelledFreezeReadsBackWhatThePageOutAlreadyMoved() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.afterSleep = { if (fixture.now >= 200 && fixture.signals.none { it.signal == STOP }) fixture.controller.cancelFreeze() } + fixture.controller.freeze(pageOut = true) { assertFalse(it) } + assertFalse(fixture.signals.any { it.signal == STOP }) + assertEquals(2, fixture.signals.count { it.signal == URG }) + assertEquals("0", fixture.control.readText()) + assertEquals(1, fixture.pagedIn.single().first) + assertEquals(0L, fixture.pagedIn.single().second) + assertTrue(fixture.pagedIn.single().third > 0L) + } + + @Test fun cancelledFreezeLeavesAPendingPageOutHandlerReadingBack() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.handlerStalls = true + fixture.afterSleep = { if (fixture.now >= 500) fixture.controller.cancelFreeze() } + fixture.controller.freeze(pageOut = true) { assertFalse(it) } + assertEquals(2, fixture.signals.count { it.signal == URG }) + assertEquals("0", fixture.control.readText()) + assertEquals(Triple(1, 0L, 0L), fixture.pagedIn.single()) + } + @Test fun cpuMustBeStableAcrossTwoCompleteSnapshots() { val fixture = fixture(17) var changes = 0 @@ -168,6 +269,40 @@ class SessionSuspendControllerTest { assertFalse(fixture.signals.drop(before).any { it.pid == helper.pid }) } + @Test fun frozenTimeIsAddedToTheGuestClockBeforeItContinues() { + val fixture = fixture(17) + fixture.clock.writeBytes(shift(5_000_000L)) + fixture.controller.freeze { assertTrue(it) } + fixture.now += 90_000L + fixture.controller.resume { assertTrue(it) } + val expected = 5_000_000L + 90_000L * 1_000_000L + assertEquals(expected, fixture.clockAtContinue) + assertEquals(expected, shift(fixture.clock)) + fixture.controller.resume { assertTrue(it) } + assertEquals(expected, shift(fixture.clock)) + fixture.controller.freeze { assertTrue(it) } + fixture.now += 1_000L + fixture.controller.closeAndResume {} + assertEquals(expected + 1_000L * 1_000_000L, shift(fixture.clock)) + } + + @Test fun rolledBackFreezeLeavesTheGuestClockAlone() { + val fixture = fixture(17) + fixture.clock.writeBytes(shift(0L)) + fixture.neverStop = true + fixture.controller.freeze { assertFalse(it) } + fixture.controller.resume { } + assertEquals(0L, shift(fixture.clock)) + } + + @Test fun missingClockFileIsNotCreated() { + val fixture = fixture(17) + fixture.controller.freeze { assertTrue(it) } + fixture.now += 5_000L + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.clock.exists()) + } + @Test fun timeoutRollsBackAllKnownProcessesAndAudio() { val fixture = fixture(17) fixture.neverStop = true @@ -312,6 +447,10 @@ class SessionSuspendControllerTest { assertEquals(0, fixture.audioSuspends) } + private fun shift(value: Long) = ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).putLong(value).array() + + private fun shift(file: File) = ByteBuffer.wrap(file.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long + private fun fixture(count: Int, executor: QueueExecutor = InlineExecutor()) = Fixture(temporary.newFolder(), temporary.newFolder(), count, executor) @@ -337,10 +476,17 @@ class SessionSuspendControllerTest { var rootGone = false var afterSleep: (() -> Unit)? = null val control = File(tmp, ".bl-zram") + val clock = File(tmp, ".bl-clock") + var clockAtContinue: Long? = null val pagedOut = mutableListOf<Triple<Int, Long, Long>>() + val pagedIn = mutableListOf<Triple<Int, Long, Long>>() + var availableKb = 8_000_000L + var totalKb = 16_000_000L + var readBackAllowed = true private var gameResidentKb = 4_000_000L private var gameSwapKb = 0L private var pagingOut = false + private var pagingIn = false var unacknowledged = -1 var handlerStalls = false var handlerReplaced = false @@ -349,10 +495,14 @@ class SessionSuspendControllerTest { { rootPid }, { helpers }, { audioSuspends++ }, { audioResumes++ }, proc, ::signal, ::threadSignal, ::sleep, { now }, executor, zramControl = control, + clockControl = clock, + nowNanos = { now * 1_000_000L }, pagedOut = { processes, unacknowledged, resident, swap, _, _ -> pagedOut += Triple(processes, resident, swap) this.unacknowledged = unacknowledged }, + readBackAllowed = { readBackAllowed }, + pagedIn = { processes, swap, swapBefore, _, _ -> pagedIn += Triple(processes, swap, swapBefore) }, ) init { sync() } @@ -367,8 +517,11 @@ class SessionSuspendControllerTest { it.state !in listOf('T', 't', 'Z', 'X') && !(neverStop && it == game.threads.last()) }?.state = 't' } else if (signal == URG) { - pagingOut = true + if (control.readText() == "0") { pagingOut = false; pagingIn = true } else pagingOut = true } else if (signal == CONT) { + if (clockAtContinue == null && clock.isFile) { + clockAtContinue = ByteBuffer.wrap(clock.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long + } continuing = true if (!(pid == GAME && blockGameContinue)) group.threads.forEach { if (it.state != 'Z') it.state = 'S' } } @@ -398,6 +551,12 @@ class SessionSuspendControllerTest { pagingOut = false } } + if (pagingIn) { + val moved = minOf(gameSwapKb, 1_000_000L) + gameSwapKb -= moved + gameResidentKb += moved + if (gameSwapKb == 0L) pagingIn = false + } if (root.threads.first().state != 'T' && !continuing) game.threads.forEach { if (it.state != 'Z') { it.state = 'S'; it.cpu++ } } @@ -406,6 +565,7 @@ class SessionSuspendControllerTest { } fun sync() { + File(proc, "meminfo").writeText("MemTotal:\t$totalKb kB\nMemFree:\t1000 kB\nMemAvailable:\t$availableKb kB\n") for (group in groups) { val dir = File(proc, group.pid.toString()) if (group == root && rootGone) { dir.deleteRecursively(); continue } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt index 3dd09ddd82..3975d38a8d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt @@ -46,8 +46,8 @@ class SettingsResetTest { SessionPrefs.setHudShowGraph(app, false) SessionPrefs.setHudColor(app, "amber") SessionPrefs.setHudOpacity(app, 40) - SessionPrefs.setFusionHudConfig(app, "hudSize=mega,showFPSGraph=0") - SessionPrefs.setFusionHudPosition(app, 120f, 40f) + SessionPrefs.setDroidDeckHudConfig(app, "hudSize=mega,showFPSGraph=0") + SessionPrefs.setDroidDeckHudPosition(app, 120f, 40f) ControllerPrefs.setOpacity(app, 40) AppUiPrefs.setScale(app, 150) FrameGen.set(app, FrameGen.Mode(FrameGen.ENGINE_DDFG, 3)) @@ -72,8 +72,8 @@ class SettingsResetTest { assertTrue(SessionPrefs.hudShowGraph(app)) assertEquals(SessionPrefs.HUD_COLOR_MINT, SessionPrefs.hudColor(app)) assertEquals(SessionPrefs.HUD_OPACITY_DEFAULT, SessionPrefs.hudOpacity(app)) - assertNull(SessionPrefs.fusionHudConfig(app)) - assertNull(SessionPrefs.fusionHudPosition(app)) + assertNull(SessionPrefs.droidDeckHudConfig(app)) + assertNull(SessionPrefs.droidDeckHudPosition(app)) assertEquals(100, ControllerPrefs.read(app).opacity) assertEquals(AppUiPrefs.DEFAULT_SCALE, AppUiPrefs.scale(app)) assertEquals(FrameGen.Mode.OFF.engine, FrameGen.engine(app)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt new file mode 100644 index 0000000000..b4d8d81f83 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ShaderPrecachePrefsTest { + private val context: Context get() = RuntimeEnvironment.getApplication() + + @Before fun reset() { + context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + SessionPrefs.steamRoot(context, SessionPrefs.steamClientArch(context)).deleteRecursively() + } + + @Test fun clientWithoutConfigStartsWithPrecachingOff() { + assertEquals(false, SessionPrefs.pendingShaderPrecache(context)) + assertEquals(false, SessionPrefs.shaderPrecache(context)) + } + + @Test fun existingConfigKeepsTheClientsChoice() { + val config = SessionPrefs.steamRoot(context, SessionPrefs.steamClientArch(context)).resolve("config/config.vdf") + config.parentFile!!.mkdirs() + config.writeText("\"InstallConfigStore\" {}") + assertNull(SessionPrefs.pendingShaderPrecache(context)) + assertEquals(true, SessionPrefs.shaderPrecache(context)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/StatsLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/session/StatsLayoutTest.kt new file mode 100644 index 0000000000..8d2f97ae3e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/StatsLayoutTest.kt @@ -0,0 +1,65 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Test + +class StatsLayoutTest { + @Test fun unknownIdsFallBackToTheDefaults() { + assertEquals(StatsStrip.LINE, StatsStrip.from(null)) + assertEquals(StatsStrip.LINE, StatsStrip.from("gone")) + assertEquals(StatsStrip.PANEL, StatsStrip.from("panel")) + assertEquals(StatsStrip.RINGS, StatsStrip.from("rings")) + assertEquals(StatsDash.AUTO, StatsDash.from("gone")) + assertEquals(StatsDash.TRACE, StatsDash.from("trace")) + } + + @Test fun tappingTheStripCyclesThroughEveryStyle() { + assertEquals(StatsStrip.PANEL, StatsStrip.LINE.next()) + assertEquals(StatsStrip.TILES, StatsStrip.PANEL.next()) + assertEquals(StatsStrip.RINGS, StatsStrip.TILES.next()) + assertEquals(StatsStrip.LINE, StatsStrip.RINGS.next()) + } + + @Test fun stripNumbersStartWithEverythingButTheGpuTemperature() { + assertEquals(StripMetric.entries.toSet() - StripMetric.GPU_TEMP, StripMetric.parse(null)) + } + + @Test fun stripNumbersSurviveSavingAndSkipUnknownIds() { + val picked = setOf(StripMetric.GPU, StripMetric.RAM, StripMetric.CLOCK) + assertEquals(picked, StripMetric.parse(StripMetric.encode(picked))) + assertEquals(setOf(StripMetric.CPU), StripMetric.parse("cpu,gone, ")) + assertEquals(emptySet<StripMetric>(), StripMetric.parse("")) + } + + @Test fun autoPicksTheDashByTheGamesFormat() { + assertEquals(StatsDash.SPEEDOMETER, StatsDash.AUTO.resolve("Codemasters")) + assertEquals(StatsDash.CIRCUIT, StatsDash.AUTO.resolve("Forza")) + assertEquals(StatsDash.DIALS, StatsDash.AUTO.resolve("OutGauge")) + assertEquals(StatsDash.TRACE, StatsDash.TRACE.resolve("Forza")) + } + + @Test fun tappingTheDashMovesOnFromTheOneOnScreen() { + assertEquals(StatsDash.CIRCUIT, StatsDash.tapped(StatsDash.SPEEDOMETER)) + assertEquals(StatsDash.SPEEDOMETER, StatsDash.tapped(StatsDash.GLANCE)) + assertEquals(StatsDash.SPEEDOMETER, StatsDash.tapped(StatsDash.AUTO)) + } + + @Test fun automaticSpeedUnitsFollowTheRegion() { + assertEquals(SpeedUnit.MPH, SpeedUnit.AUTO.resolve("US")) + assertEquals(SpeedUnit.MPH, SpeedUnit.AUTO.resolve("gb")) + assertEquals(SpeedUnit.KMH, SpeedUnit.AUTO.resolve("DE")) + assertEquals(SpeedUnit.KMH, SpeedUnit.AUTO.resolve("")) + assertEquals(SpeedUnit.KMH, SpeedUnit.KMH.resolve("US")) + assertEquals(SpeedUnit.MPH, SpeedUnit.MPH.resolve("DE")) + } + + @Test fun speedUnitsCycleAndConvert() { + assertEquals(SpeedUnit.AUTO, SpeedUnit.from(null)) + assertEquals(SpeedUnit.MPH, SpeedUnit.from("mph")) + assertEquals(SpeedUnit.KMH, SpeedUnit.AUTO.next()) + assertEquals(SpeedUnit.MPH, SpeedUnit.KMH.next()) + assertEquals(SpeedUnit.AUTO, SpeedUnit.MPH.next()) + assertEquals(62.1f, 100f * SpeedUnit.MPH.perKmh, 0.05f) + assertEquals(100f, 100f * SpeedUnit.KMH.perKmh, 0f) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadsTest.kt new file mode 100644 index 0000000000..ff6e7a4ae9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadsTest.kt @@ -0,0 +1,62 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class SteamDownloadsTest { + private fun manifest(flags: Long, done: Long, total: Long) = """ + "AppState" + { + "appid" "220" + "name" "Half-Life 2" + "StateFlags" "$flags" + "BytesToDownload" "$total" + "BytesDownloaded" "$done" + } + """.trimIndent() + + @Test fun anAppUnfinishedInBothSteamHomesIsListedOnce() { + val arm = SteamDownload("220", "Half-Life 2", 10L, 100L) + val x86 = SteamDownload("220", "Half-Life 2", 60L, 100L) + val other = SteamDownload("440", "Team Fortress 2", 5L, 50L) + assertEquals(listOf(x86, other), SteamDownloads.onePerApp(listOf(arm, x86, other))) + } + + @Test fun anInstalledGameIsNotADownload() { + assertNull(SteamDownloads.fromManifest("220", "Half-Life 2", manifest(4, 100, 100))) + } + + @Test fun aRunningUpdateShowsItsBytes() { + val d = SteamDownloads.fromManifest("220", "Half-Life 2", manifest(1026, 40, 100))!! + assertEquals(40L, d.done) + assertEquals(100L, d.total) + } + + @Test fun aPausedUpdateSaysSo() { + assertTrue(SteamDownloads.fromManifest("220", "Half-Life 2", manifest(514, 40, 100))!!.paused) + } + + @Test fun anUpdateNotSizedYetIsStillListed() { + assertEquals(0L, SteamDownloads.fromManifest("220", "Half-Life 2", manifest(6, 0, 0))!!.total) + } + + @Test fun onlyShaderUpdatesStillRunningCount() { + val log = sequenceOf( + "[2026-10-30 06:33:02] AppID 220 Shader update changed : Running Update,Downloading,", + "[2026-10-30 06:33:02] AppID 440 Shader update changed : Running Update,", + "[2026-10-30 06:33:03] AppID 440 Shader update changed : None", + "[2026-10-30 06:33:03] AppID 570 App update changed : Running Update,", + ) + assertEquals(listOf("220"), SteamDownloads.runningShaderUpdates(log)) + } + + @Test fun aClientRestartForgetsOlderShaderUpdates() { + val log = sequenceOf( + "[2026-10-30 06:33:02] AppID 220 Shader update changed : Running Update,", + "[2026-10-30 07:00:00] Client version: 1761000000", + ) + assertEquals(emptyList<String>(), SteamDownloads.runningShaderUpdates(log)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamGameProcessTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamGameProcessTest.kt new file mode 100644 index 0000000000..7a1723b95f --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamGameProcessTest.kt @@ -0,0 +1,38 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SteamGameProcessTest { + @get:Rule val tmp = TemporaryFolder() + + private fun cmdline(vararg args: String) = args.joinToString("\u0000", postfix = "\u0000").toByteArray() + + @Test fun theSessionsOwnSearchesAreNotAGame() { + assertFalse(SteamGameProcess.matches(cmdline("pgrep", "-a", "-f", "SteamLaunch AppId=[0-9]"))) + assertFalse(SteamGameProcess.matches(cmdline("pgrep", "-f", "reaper SteamLaunch"))) + assertFalse(SteamGameProcess.matches(cmdline("pgrep", "-f", "reaper SteamLaunch AppId=976310( |$)"))) + assertFalse(SteamGameProcess.matches(cmdline("sh", "-c", "pgrep -f 'proton waitforexitandrun'"))) + assertFalse(SteamGameProcess.matches(cmdline("/usr/bin/steam", "steam://rungameid/976310"))) + } + + @Test fun steamsReaperAndProtonAreAGame() { + assertTrue(SteamGameProcess.matches(cmdline("/root/.local/share/Steam/steamrtarm64/reaper", "SteamLaunch", "AppId=976310", "--", + "/root/.local/share/Steam/compatibilitytools.d/droiddeck-proton-arm64/proton", "waitforexitandrun", "MK11.exe"))) + assertTrue(SteamGameProcess.matches(cmdline("python3", "/proton", "waitforexitandrun", "game.exe"))) + } + + @Test fun runningLooksAtEveryProcess() { + val proc = tmp.newFolder("proc") + fun process(pid: String, vararg args: String) = File(proc, pid).apply { mkdirs() }.resolve("cmdline").writeBytes(cmdline(*args)) + process("100", "pgrep", "-a", "-f", "SteamLaunch AppId=[0-9]") + process("self", "reaper", "SteamLaunch", "AppId=1") + assertFalse(SteamGameProcess.running(proc)) + process("200", "reaper", "SteamLaunch", "AppId=976310", "--", "proton", "waitforexitandrun", "MK11.exe") + assertTrue(SteamGameProcess.running(proc)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamIdleSleepTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamIdleSleepTest.kt new file mode 100644 index 0000000000..05fc9c2a6b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamIdleSleepTest.kt @@ -0,0 +1,56 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SteamIdleSleepTest { + @get:Rule val temp = TemporaryFolder() + + private val keys = listOf( + "IdleSuspendBatterySeconds", "IdleSuspendACSeconds", + ) + + private fun home(vararg steamBody: String): File = temp.newFolder().also { + File(it, "config").mkdirs() + File(it, "config/config.vdf").writeText( + "\"InstallConfigStore\"\n{\n\t\"Software\"\n\t{\n\t\t\"Valve\"\n\t\t{\n\t\t\t\"Steam\"\n\t\t\t{\n" + + steamBody.joinToString("") + "\t\t\t}\n\t\t}\n\t}\n}\n", + ) + } + + private fun text(home: File) = File(home, "config/config.vdf").readText() + private fun value(text: String, key: String) = Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) + + @Test fun freshClientGetsBothSleepTimersDisabled() { + val home = home() + assertTrue(SessionFiles.disableIdleSleep(home)) + keys.forEach { assertEquals(it, "0", value(text(home), it)) } + } + + @Test fun existingSleepTimersAreReplacedBesideTheOtherSettings() { + val home = home( + "\t\t\t\t\"system\"\n\t\t\t\t{\n\t\t\t\t\t\"IdleSuspendACSeconds\"\t\t\"900\"\n" + + "\t\t\t\t\t\"IdleScreensaverACSeconds\"\t\t\"300\"\n\t\t\t\t\t\"IdleBacklightDimBatterySeconds\"\t\t\"120\"\n\t\t\t\t}\n", + ) + assertTrue(SessionFiles.disableIdleSleep(home)) + keys.forEach { assertEquals(it, "0", value(text(home), it)) } + assertEquals("300", value(text(home), "IdleScreensaverACSeconds")) + assertEquals("120", value(text(home), "IdleBacklightDimBatterySeconds")) + } + + @Test fun aChoiceMadeInSteamIsResetAtTheNextSession() { + val home = home() + SessionFiles.disableIdleSleep(home) + File(home, "config/config.vdf").writeText(text(home).replace("\"IdleSuspendACSeconds\"\t\t\"0\"", "\"IdleSuspendACSeconds\"\t\t\"600\"")) + assertTrue(SessionFiles.disableIdleSleep(home)) + assertEquals("0", value(text(home), "IdleSuspendACSeconds")) + } + + @Test fun clientWithoutAConfigIsRetriedNextSession() { + val home = temp.newFolder() + assertFalse(SessionFiles.disableIdleSleep(home)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt new file mode 100644 index 0000000000..5a3fdb26c8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt @@ -0,0 +1,132 @@ +package com.droiddeck.launcher.session + +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.frontend.Library +import java.io.File +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class SteamLibrariesTest { + private val app get() = RuntimeEnvironment.getApplication() + @get:Rule val tmp = TemporaryFolder() + + private fun added(path: String, label: String = File(path).name): SteamLibraries.Entry = + (SteamLibraries.add(app, path, label) as SteamLibraries.AddResult.Added).entry + + @Test fun addedLibrariesGetStableMountsThatSurviveRenameAndRemoval() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val docs = added(tmp.newFolder("Documents").path, "Docs") + val usb = added(tmp.newFolder("USB").path) + assertEquals(listOf("/mnt/droiddeck-lib/1", "/mnt/droiddeck-lib/2"), SteamLibraries.list(app).map { it.guest }) + assertTrue(File(docs.path, "steamapps").isDirectory) + + SteamLibraries.rename(app, docs.id, "My \"Docs\"") + assertEquals("My Docs", SteamLibraries.list(app).first().label) + assertEquals("/mnt/droiddeck-lib/1", SteamLibraries.list(app).first().guest) + + SteamLibraries.remove(app, docs.id) + assertEquals(listOf(usb.id), SteamLibraries.list(app).map { it.id }) + assertTrue(File(docs.path, "steamapps").isDirectory) + assertEquals("3", added(tmp.newFolder("Again").path).id) + } + + @Test fun overlappingFoldersAndAFifthLibraryAreRefused() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val games = tmp.newFolder("Games") + added(games.path) + assertTrue(SteamLibraries.add(app, games.path) is SteamLibraries.AddResult.Refused) + assertTrue(SteamLibraries.add(app, File(games, "inner").apply { mkdirs() }.path) is SteamLibraries.AddResult.Refused) + repeat(SteamLibraries.MAX - 1) { added(tmp.newFolder("L$it").path) } + assertTrue(SteamLibraries.add(app, tmp.newFolder("Full").path) is SteamLibraries.AddResult.Refused) + } + + @Test fun addedLibrariesAreListedMappedAndKeepGamesFoldersFromDoubling() { + val pc = tmp.newFolder("PC") + File(pc, "steamapps").mkdirs() + File(pc, "steamapps/appmanifest_220.acf").writeText("x") + SessionPrefs.setAddedGamesDirs(app, listOf(pc.path)) + val lib = added(pc.path, "PC") + assertTrue(GameStorage.gamesFolderLibraries(app).isEmpty()) + assertEquals(1, Library.steamLibraries(app, "arm64").count { it.first == pc }) + assertTrue(Library.steamLibraries(app, "x86_64").any { it.first == File(pc, GameStorage.X64_CARD_DIR) }) + assertEquals(File(pc, "steamapps/common"), AddedGames.hostPath(app, "${lib.guest}/steamapps/common")) + val docs = added(tmp.newFolder("Documents").path) + assertEquals("${docs.guest}/steamapps", AddedGames.guestPath(app, File(docs.path, "steamapps"))) + val nested = File(pc, "Other").apply { mkdirs() } + SteamLibraries.remove(app, lib.id) + assertTrue(SteamLibraries.add(app, nested.path) is SteamLibraries.AddResult.Refused) + } + + private fun library(dir: File): File = dir.apply { File(this, "steamapps").mkdirs(); File(this, "steamapps/appmanifest_220.acf").writeText("x") } + + @Test fun pickingTheFolderAboveALibraryAddsTheLibraryInside() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val app2 = tmp.newFolder("OtherApp") + library(File(app2, "Steam")) + val entry = (SteamLibraries.add(app, app2.path) as SteamLibraries.AddResult.Added).entry + assertEquals(File(app2, "Steam").path, entry.path) + assertEquals("OtherApp", entry.label) + val empty = tmp.newFolder("Empty") + assertEquals(empty.path, (SteamLibraries.add(app, empty.path) as SteamLibraries.AddResult.Added).entry.path) + } + + @Test fun scanLooksTwoLevelsDownAndSkipsHiddenAndAppFolders() { + val volume = tmp.newFolder("volume") + val shallow = library(File(volume, "SteamLibrary")) + val deep = library(File(volume, "Some App/Steam")) + library(File(volume, "Android/data/x")) + library(File(volume, ".hidden/Steam")) + library(File(volume, "a/b/c")) + val withGames = SteamLibraries.candidates(volume, 2).filter { SteamLibraries.gameCount(it) > 0 } + assertEquals(setOf(shallow, deep), withGames.toSet()) + } + + private fun depotInstall(common: File, name: String, complete: Boolean = true): File = File(common, name).apply { + File(this, ".DepotDownloader").mkdirs() + File(this, ".DepotDownloader/depot.config").writeText("""{"installedManifestIDs":{"43":99}}""") + File(this, "$name.exe").writeBytes(ByteArray(4)) + if (complete) File(this, ".download_complete").writeText("") + } + + @Test fun finishedDownloadsWithoutManifestsCountAsGames() { + val steam = File(tmp.newFolder("card"), "Other/Steam") + val common = File(steam, "steamapps/common").apply { mkdirs() } + assertEquals(0, SteamLibraries.gameCount(steam)) + val done = depotInstall(common, "Done") + depotInstall(common, "Partial", complete = false) + depotInstall(common, "Managed") + File(steam, "steamapps/appmanifest_42.acf").writeText("\"AppState\"\n{\n\t\"installdir\"\t\t\"Managed\"\n}\n") + val migrated = File(common, "Migrated").apply { + File(this, ".DepotDownloader/completed").mkdirs() + File(this, ".DepotDownloader/completed/43_99.manifest").writeBytes(ByteArray(4)) + File(this, ".download_complete").writeText("") + } + assertEquals(listOf(done, migrated), SteamLibraries.depotInstalls(common)) + assertEquals(3, SteamLibraries.gameCount(steam)) + assertEquals(steam, SteamLibraries.innerLibrary(steam.parentFile)) + } + + @Test fun addedLibrariesImportFinishedDownloadsWithoutManifests() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val steam = tmp.newFolder("Steam") + val game = depotInstall(File(steam, "steamapps/common"), "Game") + val lib = added(steam.path) + val scanned = AddedGames.scan(app).single() + assertEquals(game, scanned.folder) + assertEquals("${lib.guest}/steamapps/common/Game", AddedGames.guestPath(app, scanned.folder)) + } + + @Test fun unreadableOrInvalidEntriesAreDropped() { + assertTrue(SteamLibraries.parse("{oops").isEmpty()) + assertEquals(listOf("2"), SteamLibraries.parse("""[{"id":"../x","path":"/a"},{"id":"2","path":"/b","label":""}]""").map { it.id }) + assertEquals("b", SteamLibraries.parse("""[{"id":"2","path":"/b","label":""}]""").single().label) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamUiPacingTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamUiPacingTest.kt deleted file mode 100644 index 239d52e985..0000000000 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamUiPacingTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.droiddeck.launcher.session - -import org.junit.Assert.assertEquals -import org.junit.Test - -class SteamUiPacingTest { - @Test fun aSixtyOrNinetyHertzScreenIsLeftUncapped() { - assertEquals(0, SessionPrefs.steamUiFpsLimit(60f)) - assertEquals(0, SessionPrefs.steamUiFpsLimit(59.94f)) - assertEquals(0, SessionPrefs.steamUiFpsLimit(90f)) - } - - @Test fun fasterScreensGetAnEvenDivisorOfTheirRefresh() { - assertEquals(60, SessionPrefs.steamUiFpsLimit(120f)) - assertEquals(60, SessionPrefs.steamUiFpsLimit(119.99f)) - assertEquals(60, SessionPrefs.steamUiFpsLimit(120.00001f)) - assertEquals(72, SessionPrefs.steamUiFpsLimit(144.00002f)) - assertEquals(82, SessionPrefs.steamUiFpsLimit(165f)) - assertEquals(61, SessionPrefs.steamUiFpsLimit(185.00002f)) - assertEquals(60, SessionPrefs.steamUiFpsLimit(240f)) - } -} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamWebLoginTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamWebLoginTest.kt new file mode 100644 index 0000000000..0b8fadada9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamWebLoginTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class SteamWebLoginTest { + private fun hex(s: String) = ByteArray(s.length / 2) { s.substring(it * 2, it * 2 + 2).toInt(16).toByte() } + + @Test fun chromiumV10ValuesDecrypt() { + val encrypted = hex("7631300b9cf0a6eee9cf1aaac601b85ca37cf9fe9e67078564f0e05835ae2aa3d9b0ab") + assertEquals("0123456789abcdef01234567", SteamWebLogin.decrypt(encrypted, hostHashed = false)) + } + + @Test fun newerStoresDropTheHostHash() { + val encrypted = hex("7631304d4114329f1e692e807b8b044d67460f5e14d92ffb48b9f83be318ebd0d84c727674aea32f351b8a33c8aa42553dfeb5") + assertEquals("hello", SteamWebLogin.decrypt(encrypted, hostHashed = true)) + } + + @Test fun otherFormatsAreSkipped() { + assertNull(SteamWebLogin.decrypt("v11garbage".toByteArray(), hostHashed = false)) + assertNull(SteamWebLogin.decrypt(ByteArray(2), hostHashed = false)) + } + + @Test fun theSignInIsSentTheWaySteamPagesSendIt() { + assertEquals("steamLoginSecure=76561190000000000%7C%7Ca.b.c; Path=/; Secure; HttpOnly", + SteamWebLogin.header("steamLoginSecure", "76561190000000000||a.b.c", httpOnly = true)) + assertEquals("sessionid=0123; Path=/; Secure", SteamWebLogin.header("sessionid", "0123", httpOnly = false)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/TelemetryOutputTest.kt b/app/src/test/java/com/droiddeck/launcher/session/TelemetryOutputTest.kt new file mode 100644 index 0000000000..248b4a1792 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/TelemetryOutputTest.kt @@ -0,0 +1,115 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class TelemetryOutputTest { + @get:Rule val tmp = TemporaryFolder() + + private val showdown = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<hardware_settings_config>\n" + + "\t<audio mono=\"false\" />\n\t<motion enabled=\"true\" ip=\"dbox\" port=\"20777\" delay=\"1\" extradata=\"0\" />\n" + + "</hardware_settings_config>\n" + + @Test fun turningOnPointsTheMotionLineHereAndKeepsTheRest() { + val on = TelemetryOutput.turnedOn(showdown)!! + assertTrue(on.contains("<motion enabled=\"true\" ip=\"127.0.0.1\" port=\"20777\" delay=\"1\" extradata=\"3\" />")) + assertEquals(showdown.replace("ip=\"dbox\"", "ip=\"127.0.0.1\"").replace("extradata=\"0\"", "extradata=\"3\""), on) + assertTrue(TelemetryOutput.pointsHere(TelemetryOutput.element(on)!!.value)) + assertFalse(TelemetryOutput.pointsHere(TelemetryOutput.element(showdown)!!.value)) + } + + @Test fun theUdpLineWinsOverTheMotionLineAndLongerTagsAreIgnored() { + val xml = "<x><motion_platform><dbox enabled=\"true\" /></motion_platform>" + + "<motion enabled=\"true\" ip=\"dbox\" port=\"20777\" />" + + "<udp enabled=\"false\" extradata=\"0\" ip=\"127.0.0.1\" port=\"20777\" delay=\"1\" /></x>" + assertTrue(TelemetryOutput.element(xml)!!.value.startsWith("<udp ")) + val on = TelemetryOutput.turnedOn(xml)!! + assertTrue(on.contains("<udp enabled=\"true\" extradata=\"3\" ip=\"127.0.0.1\" port=\"20777\" delay=\"1\" />")) + assertTrue(on.contains("<motion enabled=\"true\" ip=\"dbox\" port=\"20777\" />")) + assertNull(TelemetryOutput.element("<x><motion_platform enabled=\"true\" /></x>")) + } + + @Test fun turningOffPutsTheOriginalLineBackOrSwitchesItOff() { + val on = TelemetryOutput.turnedOn(showdown)!! + assertEquals(showdown, TelemetryOutput.turnedOff(on, showdown)) + assertTrue(TelemetryOutput.turnedOff(on, null)!!.contains("<motion enabled=\"false\" ip=\"127.0.0.1\"")) + } + + @Test fun missingAttributesAreAdded() { + assertEquals("<udp enabled=\"true\" ip=\"127.0.0.1\" />", TelemetryOutput.withAttr("<udp enabled=\"true\" />", "ip", "127.0.0.1")) + assertEquals("<udp a=\"1\" port=\"20777\">", TelemetryOutput.withAttr("<udp a=\"1\">", "port", "20777")) + assertTrue(TelemetryOutput.pointsHere("<udp enabled=\"true\" ip=\"127.0.0.1\" port=\"20777\" />")) + } + + @Test fun scanFindsTheGameAndARoundTripRestoresTheFile() { + val compatdata = tmp.newFolder("steamapps", "compatdata") + val config = configFile(compatdata, "2848447563", "DiRT Showdown") + config.writeText(showdown) + configFile(compatdata, "12345", "Some Other Game").writeText("<hardware_settings_config />") + + val games = TelemetryOutput.scan(listOf(compatdata)) + assertEquals(listOf("DiRT Showdown"), games.map { it.name }) + assertEquals("2848447563", games[0].prefixId) + assertFalse(games[0].on) + + assertTrue(TelemetryOutput.set(games[0], true)) + assertTrue(File(config.path + TelemetryOutput.ORIGINAL_SUFFIX).isFile) + assertTrue(TelemetryOutput.scan(listOf(compatdata))[0].on) + + assertTrue(TelemetryOutput.set(games[0], false)) + assertEquals(showdown, config.readText()) + assertFalse(File(config.path + TelemetryOutput.ORIGINAL_SUFFIX).exists()) + assertFalse(TelemetryOutput.scan(listOf(compatdata))[0].on) + } + + @Test fun theRunningGameIsMatchedByItsPrefixId() { + assertTrue(TelemetryOutput.isRunning("2848447563", "2848447563")) + assertTrue(TelemetryOutput.isRunning("-1446519733", "2848447563")) + assertFalse(TelemetryOutput.isRunning("2848447563", "690790")) + assertFalse(TelemetryOutput.isRunning("2848447563", null)) + assertTrue(TelemetryOutput.isRunning("2848447563", "program:/games/x.exe")) + } + + @Test fun automaticSkipsGamesThatAreOnSwitchedOffOrRunning() { + val f = File("x") + val dirt4 = TelemetryOutput.Game("DiRT 4", "421020", f, on = false) + val rally = TelemetryOutput.Game("DiRT Rally 2.0", "690790", f, on = false) + val grid = TelemetryOutput.Game("GRID", "703860", f, on = true) + val games = listOf(dirt4, rally, grid) + assertEquals(listOf(dirt4, rally), TelemetryOutput.automaticTargets(games, emptySet(), null)) + assertEquals(listOf(rally), TelemetryOutput.automaticTargets(games, setOf("421020/DiRT 4"), null)) + assertEquals(listOf(dirt4), TelemetryOutput.automaticTargets(games, emptySet(), "690790")) + assertEquals("690790/DiRT Rally 2.0", TelemetryOutput.key(rally)) + } + + @Test fun switchingAutomaticOffRestoresOnlyGamesDroidDeckChanged() { + val compatdata = tmp.newFolder("steamapps", "compatdata") + val changed = configFile(compatdata, "2848447563", "DiRT Showdown").apply { writeText(showdown) } + val own = configFile(compatdata, "690790", "DiRT Rally 2.0") + .apply { writeText("<x><udp enabled=\"true\" ip=\"127.0.0.1\" port=\"20777\" /></x>") } + assertTrue(TelemetryOutput.set(TelemetryOutput.scan(listOf(compatdata)).first { it.name == "DiRT Showdown" }, true)) + val targets = TelemetryOutput.restoreTargets(TelemetryOutput.scan(listOf(compatdata)), null) + assertEquals(listOf(changed), targets.map { it.file }) + assertTrue(own.isFile) + assertTrue(TelemetryOutput.restoreTargets(TelemetryOutput.scan(listOf(compatdata)), "2848447563").isEmpty()) + } + + @Test fun automaticTurnsOnDirt3AndShowdownLikeTheOtherGames() { + val f = File("x") + val showdownGame = TelemetryOutput.Game("DiRT Showdown", "2848447563", f, on = false) + val dirt3 = TelemetryOutput.Game("DiRT3", "321040", f, on = false) + val rally = TelemetryOutput.Game("DiRT Rally 2.0", "690790", f, on = false) + assertEquals(listOf(showdownGame, dirt3, rally), TelemetryOutput.automaticTargets(listOf(showdownGame, dirt3, rally), emptySet(), null)) + assertEquals(listOf(rally), TelemetryOutput.automaticTargets(listOf(showdownGame, dirt3, rally), setOf("2848447563/DiRT Showdown", "321040/DiRT3"), null)) + } + + private fun configFile(compatdata: File, id: String, game: String): File = + File(compatdata, "$id/pfx/drive_c/users/steamuser/Documents/My Games/$game/hardwaresettings/hardware_settings_config.xml") + .apply { parentFile!!.mkdirs() } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreCatalogPatchTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreCatalogPatchTest.kt index e545cc77d1..e3b91ff6fe 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreCatalogPatchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreCatalogPatchTest.kt @@ -4,7 +4,6 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertSame import org.junit.Test -/** Filling a grid one card at a time: what is on screen stays put, what is new lands where its title belongs. */ class StoreCatalogPatchTest { private fun item(id: String, title: String, image: String? = null) = CatalogItem(Store.GOG, id, title, imageUrl = image, owned = true) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreGameSidecarTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreGameSidecarTest.kt index b7ad90b56d..b4217895c2 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreGameSidecarTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreGameSidecarTest.kt @@ -124,6 +124,25 @@ class StoreGameSidecarTest { assertFalse(text.contains("DD_AUTH")) } + @Test fun aWorkingDirectoryTravelsWithTheSidecar() { + val root = StoreGameSidecar(Store.GOG, "1207658924", "The Witcher", "System/witcher.exe", workdir = "") + assertTrue(root.toJson().has("workdir")) + assertEquals("", StoreGameSidecar.parse(root.toJson().toString())!!.workdir) + assertEquals("bin", StoreGameSidecar.parse(root.copy(workdir = "bin").toJson().toString())!!.workdir) + assertNull(StoreGameSidecar.parse(root.copy(workdir = null).toJson().toString())!!.workdir) + assertNull(StoreGameSidecar.parse("""{"store":"gog","id":"1","title":"T","exe":"game.exe"}""")!!.workdir) + assertNull(StoreGameSidecar.parse("""{"store":"gog","id":"1","title":"T","exe":"game.exe","workdir":"../x"}""")!!.workdir) + } + + @Test fun theLauncherCdsIntoTheTaskWorkingDirectory() { + assertTrue(StoreLaunch.launcherText(sample.copy(exe = "System/witcher.exe", workdir = "")) + .contains("cd /d \"%~dp0\"\r\n")) + assertTrue(StoreLaunch.launcherText(sample.copy(exe = "bin/x64/game.exe", workdir = "bin/x64")) + .contains("cd /d \"%~dp0bin\\x64\"\r\n")) + assertTrue(StoreLaunch.launcherText(sample.copy(exe = "bin/game.exe", workdir = null)) + .contains("cd /d \"%~dp0bin\"\r\n")) + } + @Test fun epicLauncherPrefersTheClientsArguments() { val text = StoreLaunch.launcherText(sample.copy(exe = "Binaries/Win64/Celeste.exe")) val lines = text.split("\r\n") diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt index 126001797d..c368ca082b 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt @@ -138,6 +138,32 @@ class StoreInstallRootTest { assertTrue(File(LinuxRuntime.rootDir(app), xodusRoot.second.removePrefix("/")).isDirectory) } + @Test fun xodusRootsKeepEveryOtherStoreRootAtTheSameGuestPath() { + val card = File(app.filesDir, "card2").apply { mkdirs() } + val library = File(app.filesDir, "card/steam").apply { mkdirs() } + File(library, "Games").mkdirs() + SessionPrefs.setDefaultStorageFolder(app, card.path, "Card 2") + SessionPrefs.setGameStorage(app, library.path, "Card") + + val xodus = StoreInstallRoot.externalRootsForXodus(app) + assertTrue(xodus.containsAll(StoreInstallRoot.externalRoots(app))) + assertTrue(xodus.any { it.first.absolutePath == File(library, "Games").absolutePath }) + } + + @Test fun theSteamLibraryGetsItsOwnGuestPathWhenItSharesACardWithAnotherStoreRoot() { + val card = File(app.filesDir, "same-card/Games") + val library = File(app.filesDir, "same-card/steam/Games") + val base = "/mnt/droiddeck-stores/ABCD-1234" + + val roots = StoreInstallRoot.withSelectedLibrary(listOf(card to base), library, base) + assertEquals(2, roots.map { it.second }.distinct().size) + assertEquals(base, roots.single { it.first == card }.second) + assertTrue(roots.single { it.first == library }.second.startsWith("$base-")) + assertEquals("${roots.single { it.first == library }.second}/Xbox/Doom", + StoreInstallRoot.externalGuestPath(File(library, "Xbox/Doom"), roots)) + assertEquals(roots, StoreInstallRoot.withSelectedLibrary(roots, library, base)) + } + @Test fun externalStoreBindsCreateGuestTargetsAndSkipUnavailableVolumes() { val host = File(app.filesDir, "card/Games").apply { mkdirs() } val guestRoot = "/mnt/droiddeck-stores/card" @@ -175,6 +201,15 @@ class StoreInstallRootTest { assertTrue(StoreInstallRoot.unfinished(app).none { it.folder.absolutePath == half.absolutePath }) } + @Test fun aGameBeingUpdatedIsNotAnUnfinishedInstallForAnyStore() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + for (store in listOf(Store.EPIC, Store.ITCH, Store.XBOX, Store.AMAZON)) { + val folder = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), store), StoreInstallRoot.folderName("Updating", "u1")).apply { mkdirs() } + StoreGameSidecar(store, "u1", "Updating", "Updating.exe", state = StoreGameSidecar.STATE_UPDATING).write(folder) + assertTrue(StoreInstallRoot.unfinished(app).none { it.folder.absolutePath == folder.absolutePath }) + } + } + @Test fun theScratchCacheIsPrivateAndNamedSafely() { val dir = StoreInstallRoot.scratchDir(app, Store.EPIC, "a/b:c") assertTrue(dir.absolutePath.startsWith(app.cacheDir.absolutePath)) @@ -263,4 +298,9 @@ class StoreInstallRootTest { assertFalse(StoreInstallRoot.insufficientSpace(1L, 1L)) assertFalse(StoreInstallRoot.insufficientSpace(0L, 0L)) } + + @Test fun itchKeepsTheFolderItsGamesWereInstalledInWhateverItsDisplayName() { + assertEquals("itch", StoreInstallRoot.storeDir(File("/games"), Store.ITCH).name) + assertEquals("Game Jolt", StoreInstallRoot.storeDir(File("/games"), Store.GAMEJOLT).name) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt index 415c6c7cfe..b94b93c909 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.stores.battlenet import org.junit.Assert.assertEquals import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue import org.junit.Test class BlizzardArtTest { @@ -27,4 +28,23 @@ class BlizzardArtTest { assertNull(BlizzardArt.imageUrl("""<meta property="og:image" content="https://example.com/art.png">""")) assertNull(BlizzardArt.imageUrl("""\"imageUrl\":\"//catalog.blzstatic.com//ff9/a-prod-thumb_bundle.jpg\"""")) } + + @Test fun everyChosenImageComesFromBlizzardsHosts() { + BlizzardArt.KEY_ART.values.forEach { assertTrue(it, BlizzardArt.allowed(it)) } + } + + @Test fun everyChosenImageBelongsToAKnownTitle() { + val codes = com.droiddeck.launcher.runtime.BattleNet.TITLES.map { it.code }.toSet() + BlizzardArt.KEY_ART.keys.forEach { assertTrue(it, it in codes) } + } + + @Test fun classicVariantsShareTheClassicArtTitle() { + val battleNet = com.droiddeck.launcher.runtime.BattleNet + val era = battleNet.TITLES.first { it.uid == "wow_classic_era" } + assertEquals("wow_classic", battleNet.artTitle(era).uid) + } + + @Test fun worldOfWarcraftForeverUsesItsOwnArt() { + assertTrue("WoW_Forever" in BlizzardArt.KEY_ART.getValue("WoWF")) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRetryTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRetryTest.kt index 879e8de91d..0729991784 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRetryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadQueueRetryTest.kt @@ -75,7 +75,6 @@ class DownloadQueueRetryTest { DownloadQueue.clear(app, item.key) assertNull(DownloadQueue.entry(item.key)) - // A card resume (including the restored paused path) must retain its real target. val card = File(app.filesDir, "retry-card").apply { mkdirs() } SessionPrefs.setGameStorage(app, card.path, "Card") val target = File(card, "Games") diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowseTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowseTest.kt new file mode 100644 index 0000000000..97b90c6da2 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBrowseTest.kt @@ -0,0 +1,36 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.junit.Assert.assertEquals +import org.junit.Test + +class GameJoltBrowseTest { + private fun qs(query: GameJoltQuery = GameJoltQuery(), page: Int = 1) = GameJoltBrowse.queryString(query, page) + + @Test fun theDefaultQueryAsksForTheFeaturedSectionByName() { + assertEquals("section=featured", qs()) + } + + @Test fun sectionsPriceAndPagesUseTheSiteNames() { + assertEquals("section=hot", qs(GameJoltQuery(section = GameJoltBrowse.SECTION_HOT))) + assertEquals("section=featured&f_price=5-less&page=3", qs(GameJoltQuery(price = GameJoltBrowse.PRICE_UNDER_5), 3)) + assertEquals("section=featured&f_price=free", qs(GameJoltQuery(price = GameJoltBrowse.PRICE_FREE))) + } + + @Test fun listFiltersKeepTheSiteOrderWhateverTheSelectionOrder() { + assertEquals("section=featured&f_os%5B%5D=windows&f_os%5B%5D=linux", qs(GameJoltQuery(os = setOf("linux", "windows")))) + assertEquals("section=featured&f_browser%5B%5D=html&f_maturity%5B%5D=everyone&f_status%5B%5D=complete&f_partners%5B%5D=partners", + qs(GameJoltQuery(browser = setOf("html"), maturity = setOf("everyone"), status = setOf("complete"), partners = true))) + } + + @Test fun devlogGamesAreNeverAskedFor() { + assertEquals(setOf("complete", "wip"), GameJoltBrowse.effective(GameJoltQuery(), true).status) + assertEquals(setOf("complete", "wip"), GameJoltBrowse.effective(GameJoltQuery(status = setOf("devlog")), true).status) + assertEquals(setOf("wip"), GameJoltBrowse.effective(GameJoltQuery(status = setOf("wip", "devlog")), false).status) + assertEquals("section=featured&f_status%5B%5D=complete&f_status%5B%5D=wip", qs(GameJoltBrowse.effective(GameJoltQuery(), true).copy(maturity = emptySet()))) + } + + @Test fun tagsAreSluggedAndRepeatable() { + assertEquals("co-op", GameJoltBrowse.tagSlug(" Co-Op ")) + assertEquals("section=featured&tag=action&tag=co-op", qs(GameJoltQuery(tags = listOf("Action", "co op")))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuildsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuildsTest.kt new file mode 100644 index 0000000000..7f20f12fd7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltBuildsTest.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltBuildsTest { + private fun build(id: Int, pkg: Int, release: Int, name: String, vararg flags: String) = JSONObject() + .put("id", id).put("game_package_id", pkg).put("game_release_id", release) + .put("primary_file", JSONObject().put("filename", name).put("filesize", 100)) + .also { b -> flags.forEach { b.put(it, true) } } + + private fun payload(vararg builds: JSONObject) = JSONObject() + .put("packages", JSONArray().put(JSONObject().put("id", 1).put("title", "Main"))) + .put("releases", JSONArray().put(JSONObject().put("id", 10).put("published_on", 100).put("version_number", "1.0")).put(JSONObject().put("id", 11).put("published_on", 200).put("version_number", "1.1"))) + .put("builds", JSONArray(builds.toList())) + .put("launchOptions", JSONArray()) + + @Test fun onlyTheNewestReleaseOfAPackageIsKept() { + val list = GameJoltBuilds.parse(payload(build(1, 1, 10, "old.zip", "os_windows"), build(2, 1, 11, "new.zip", "os_windows"))) + assertEquals(listOf("2"), list.map { it.id }) + assertEquals("1.1", list.first().version) + } + + @Test fun windowsBuildsAreInstallableAndSortFirst() { + val list = GameJoltBuilds.parse(payload(build(1, 1, 11, "game-linux.zip", "os_linux"), build(2, 1, 11, "game-win.zip", "os_windows"))) + assertEquals(listOf("2", "1"), list.map { it.id }) + assertTrue(list[0].installable) + assertFalse(list[1].installable) + } + + @Test fun aBuildWithoutAnOsFlagIsWeb() { + assertEquals(setOf("web"), GameJoltBuilds.platforms(JSONObject())) + assertEquals(setOf("windows", "osx"), GameJoltBuilds.platforms(JSONObject().put("os_windows", true).put("os_mac", true))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollectionsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollectionsTest.kt new file mode 100644 index 0000000000..0e8e1d1ee4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltCollectionsTest.kt @@ -0,0 +1,28 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltCollectionsTest { + @Test fun playlistsBecomeCollectionsByIdAndName() { + val list = JSONArray() + .put(JSONObject().put("id", 7).put("name", "test list")) + .put(JSONObject().put("id", 0).put("name", "no id")) + .put(JSONObject().put("id", 9).put("name", "")) + val parsed = GameJoltCollections.parse(list) + assertEquals(listOf("playlist:7"), parsed.map { it.id }) + assertEquals(listOf("test list"), parsed.map { it.title }) + } + + @Test fun eachCollectionHasItsOwnGameListEndpoint() { + assertEquals("/web/library/games/followed/@some+one", GameJoltCollections.path(GameJoltCollections.FOLLOWED, "some one")) + assertEquals("/web/library/games/playlist/7", GameJoltCollections.path("playlist:7", "x")) + assertNull(GameJoltCollections.path("playlist:abc", "x")) + assertNull(GameJoltCollections.path("other", "x")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricingTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricingTest.kt new file mode 100644 index 0000000000..48c2f85024 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltPricingTest.kt @@ -0,0 +1,52 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltPricingTest { + private fun pricing(amount: Long, promotional: Boolean = false, currency: Any = JSONObject.NULL) = + JSONObject().put("amount", amount).put("promotional", promotional).put("currency_code", currency) + + private fun sellable(vararg pricings: JSONObject) = JSONObject().put("type", "paid").put("pricings", JSONArray(pricings.toList())) + + @Test fun aRegularPriceIsShownInDollars() { + val price = GameJoltPricing.of(sellable(pricing(99)))!! + assertEquals("$0.99", price.final) + assertEquals("", price.original) + assertEquals(0, price.discount) + } + + @Test fun aPromotionalPriceBesideTheRegularOneIsASale() { + val price = GameJoltPricing.of(sellable(pricing(500), pricing(350, promotional = true)))!! + assertEquals("$3.50", price.final) + assertEquals("$5.00", price.original) + assertEquals(30, price.discount) + } + + @Test fun aPromotionalPriceAloneShowsNoDiscount() { + val price = GameJoltPricing.of(sellable(pricing(350, promotional = true)))!! + assertEquals("$3.50", price.final) + assertEquals("", price.original) + assertEquals(0, price.discount) + } + + @Test fun aPromotionalPriceNotBelowTheRegularOneIsNotASale() { + val price = GameJoltPricing.of(sellable(pricing(500), pricing(500, promotional = true)))!! + assertEquals("", price.original) + assertEquals(0, price.discount) + } + + @Test fun aGameWithoutPricingsHasNoPrice() { + assertNull(GameJoltPricing.of(sellable())) + assertNull(GameJoltPricing.of(null)) + } + + @Test fun anotherCurrencyIsNamed() { + assertEquals("1.50 EUR", GameJoltPricing.of(sellable(pricing(150, currency = "EUR")))!!.final) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdatesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdatesTest.kt new file mode 100644 index 0000000000..109da6c362 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gamejolt/GameJoltUpdatesTest.kt @@ -0,0 +1,63 @@ +package com.droiddeck.launcher.stores.gamejolt + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class GameJoltUpdatesTest { + private fun build(id: String, pkg: String, stamp: String, windows: Boolean = true, name: String = "game.zip") = + GameJoltBuild(id, pkg, "Main", "1.0", name, 100L, stamp, if (windows) setOf("windows") else setOf("linux"), "", "") + + @Test fun aNewerReleaseOfTheSamePackageIsAnUpdate() { + val update = GameJoltUpdates.evaluate(listOf(build("20", "1", "200", name = "new.zip")), "10", "1", "100")!! + assertEquals("20", update.buildId) + assertEquals("new.zip", update.filename) + assertFalse(update.replaced) + } + + @Test fun theInstalledBuildIsNotAnUpdate() { + assertNull(GameJoltUpdates.evaluate(listOf(build("10", "1", "100")), "10", "1", "100")) + } + + @Test fun anOlderBuildIsNotAnUpdate() { + assertNull(GameJoltUpdates.evaluate(listOf(build("5", "1", "50")), "10", "1", "100")) + } + + @Test fun theSameReleaseTimeWithAHigherBuildIdIsAnUpdate() { + assertEquals("11", GameJoltUpdates.evaluate(listOf(build("11", "1", "100")), "10", "1", "100")?.buildId) + } + + @Test fun otherPackagesDoNotCount() { + assertEquals("30", GameJoltUpdates.evaluate(listOf(build("40", "2", "900"), build("30", "1", "300")), "10", "1", "100")?.buildId) + } + + @Test fun aRemovedPackageFallsBackToTheNewPreferredBuildAndSaysSo() { + val update = GameJoltUpdates.evaluate(listOf(build("40", "2", "900")), "10", "1", "100")!! + assertEquals("40", update.buildId) + assertTrue(update.replaced) + } + + @Test fun nonWindowsBuildsAreNeverOffered() { + assertNull(GameJoltUpdates.evaluate(listOf(build("40", "1", "900", windows = false)), "10", "1", "100")) + } + + @Test fun nothingToCompareMeansNoUpdate() { + assertNull(GameJoltUpdates.evaluate(null, "10", "1", "100")) + assertNull(GameJoltUpdates.evaluate(listOf(build("40", "1", "900")), "", "1", "100")) + } + + @Test fun foundUpdatesSurviveEncodingAndDropEntriesWithoutABuild() { + val saved = GameJoltUpdates.encode(mapOf("gamejolt:1" to GameJoltUpdate("20", "200", "new.zip", true))) + val back = GameJoltUpdates.decode(saved).getValue("gamejolt:1") + assertEquals("20", back.buildId) + assertEquals("200", back.stamp) + assertEquals("new.zip", back.filename) + assertTrue(back.replaced) + assertEquals(emptyMap<String, GameJoltUpdate>(), GameJoltUpdates.decode("""{"gamejolt:1":{"stamp":"1"}}""")) + assertEquals(emptyMap<String, GameJoltUpdate>(), GameJoltUpdates.decode("not json")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogGameExeTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogGameExeTest.kt new file mode 100644 index 0000000000..fab1177b04 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogGameExeTest.kt @@ -0,0 +1,339 @@ +package com.droiddeck.launcher.stores.gog + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class GogGameExeTest { + private fun withFolder(block: (File) -> Unit) { + val root = kotlin.io.path.createTempDirectory("gog-exe").toFile() + try { + block(root) + } finally { + root.deleteRecursively() + } + } + + private fun File.exe(path: String, size: Int = 1024) { + val file = File(this, path) + file.parentFile?.mkdirs() + file.writeBytes(ByteArray(size)) + } + + // #680: Blood Omen installs dxconfig.exe next to kain.exe, and the config tool won. + @Test fun theGameExecutableWinsOverTheConfigToolInTheSameFolder() { + withFolder { root -> + root.exe("dxconfig.exe") + root.exe("kain.exe", 4096) + assertEquals("kain.exe", GogDownloadManager.pickExe(root, null, null, "Blood Omen: Legacy of Kain")) + } + } + + @Test fun aConfigToolInTheGameFolderIsNeverTheFoundExecutable() { + withFolder { root -> + root.exe("dxconfig.exe") + root.exe("bin/kain.exe", 4096) + assertEquals("bin/kain.exe", GogDownloadManager.pickExe(root, null, null, "Blood Omen: Legacy of Kain")) + } + } + + @Test fun theLauncherInTheGameRootLosesToTheGameExecutable() { + withFolder { root -> + root.exe("Launcher.exe") + root.exe("bin/witcher2.exe", 4096) + assertEquals( + "bin/witcher2.exe", + GogDownloadManager.pickExe(root, null, null, "The Witcher 2: Assassins of Kings Enhanced Edition"), + ) + } + } + + @Test fun theInstallerHintWinsOverTheSearch() { + withFolder { root -> + root.exe("dxconfig.exe") + root.exe("bin/game.exe", 4096) + assertEquals("bin/game.exe", GogDownloadManager.pickExe(root, null, "bin/game.exe", "Blood Omen: Legacy of Kain")) + } + } + + @Test fun aFolderWithoutAGameExecutableYieldsNoPath() { + withFolder { root -> + root.exe("redist/vcredist_x64.exe") + assertEquals("", GogDownloadManager.pickExe(root, null, null, "Blood Omen: Legacy of Kain")) + } + } + + @Test fun theManifestsGameTaskIsTheExecutable() { + withFolder { root -> + root.exe("dxconfig.exe") + root.exe("bin/omen.exe", 4096) + File(root, "goggame-1207659641.info").writeText( + """{"gameId":"1207659641","playTasks":[ + {"category":"tool","path":"dxconfig.exe","type":"FileTask"}, + {"category":"game","isPrimary":true,"path":"bin\\omen.exe","type":"FileTask"}, + {"category":"document","path":"manual.pdf","type":"FileTask"} + ]}""", + ) + assertEquals("bin/omen.exe", GogDownloadManager.pickExe(root, "1207659641", null, "Blood Omen: Legacy of Kain")) + } + } + + @Test fun aManifestWithOnlyAToolTaskLeavesTheSearchInCharge() { + withFolder { root -> + root.exe("dxconfig.exe") + root.exe("kain.exe", 4096) + File(root, "goggame-1207659641.info") + .writeText("""{"playTasks":[{"category":"tool","path":"dxconfig.exe","type":"FileTask"}]}""") + assertEquals("kain.exe", GogDownloadManager.pickExe(root, null, null, "Blood Omen: Legacy of Kain")) + } + } + + @Test fun aManifestPathOutsideTheGameFolderIsIgnored() { + withFolder { root -> + root.exe("kain.exe", 4096) + val outside = File(root.parentFile, "outside-${System.nanoTime()}.exe").apply { writeBytes(ByteArray(8)) } + try { + File(root, "goggame-1207659641.info").writeText( + """{"playTasks":[{"category":"game","isPrimary":true,"path":"../${outside.name}","type":"FileTask"}]}""", + ) + assertEquals("kain.exe", GogDownloadManager.pickExe(root, null, null, "Blood Omen: Legacy of Kain")) + } finally { + outside.delete() + } + } + } + + @Test fun aPrimaryLauncherTaskIsTheGameOfLauncherGames() { + withFolder { root -> + root.exe("run.exe") + root.exe("game.exe", 4096) + File(root, "goggame-7.info").writeText( + """{"playTasks":[ + {"category":"launcher","isPrimary":true,"path":"run.exe","type":"FileTask"}, + {"category":"game","path":"game.exe","type":"FileTask"} + ]}""", + ) + assertEquals("run.exe", GogDownloadManager.pickExe(root, "7", null, "Some Game")) + } + } + + @Test fun aPrimaryGameTaskBeatsAPrimaryLauncherTask() { + withFolder { root -> + root.exe("run.exe") + root.exe("game.exe", 4096) + File(root, "goggame-7.info").writeText( + """{"playTasks":[ + {"category":"launcher","isPrimary":true,"path":"run.exe","type":"FileTask"}, + {"category":"game","isPrimary":true,"path":"game.exe","type":"FileTask"} + ]}""", + ) + assertEquals("game.exe", GogDownloadManager.pickExe(root, "7", null, "Some Game")) + } + } + + @Test fun theProductsOwnManifestDecidesOverADlcManifest() { + withFolder { root -> + root.exe("base.exe") + root.exe("dlc.exe", 4096) + File(root, "goggame-7.info") + .writeText("""{"playTasks":[{"category":"game","isPrimary":true,"path":"base.exe","type":"FileTask"}]}""") + File(root, "goggame-9.info") + .writeText("""{"playTasks":[{"category":"game","isPrimary":true,"path":"dlc.exe","type":"FileTask"}]}""") + assertEquals("base.exe", GogDownloadManager.pickExe(root, "7", null, "Some Game")) + } + } + + @Test fun aDlcManifestSuppliesTheGameWhenTheProductsOwnHasNone() { + withFolder { root -> + root.exe("dxconfig.exe") + root.exe("dlc.exe", 4096) + File(root, "goggame-7.info") + .writeText("""{"playTasks":[{"category":"tool","path":"dxconfig.exe","type":"FileTask"}]}""") + File(root, "goggame-9.info") + .writeText("""{"playTasks":[{"category":"game","isPrimary":true,"path":"dlc.exe","type":"FileTask"}]}""") + assertEquals("dlc.exe", GogDownloadManager.pickExe(root, "7", null, "Some Game")) + } + } + + @Test fun theManifestBeatsTheInstallerHint() { + withFolder { root -> + root.exe("dxconfig.exe") + root.exe("kain.exe", 4096) + File(root, "goggame-7.info") + .writeText("""{"playTasks":[{"category":"game","isPrimary":true,"path":"kain.exe","type":"FileTask"}]}""") + assertEquals( + "kain.exe", + GogDownloadManager.pickExe(root, "7", "dxconfig.exe", "Blood Omen: Legacy of Kain"), + ) + } + } + + // #694: the GOG build's temp executable is its Galaxy support installer, not the game. + @Test + fun theGalaxySupportInstallerIsNeverTheGame() { + withFolder { root -> + root.exe("galaxy_the_witcher_enhanced_edition_2.1.0.15.exe", 1_300_000) + root.exe("launcher.exe") + root.exe("register.exe") + root.exe("System/witcher.exe", 4096) + assertEquals( + "System/witcher.exe", + GogDownloadManager.pickExe( + root, + "1207658924", + "galaxy_the_witcher_enhanced_edition_2.1.0.15.exe", + "The Witcher: Enhanced Edition", + ), + ) + } + } + + @Test + fun aManifestThatNamesTheGalaxySupportInstallerIsIgnored() { + withFolder { root -> + root.exe("galaxy_the_witcher_enhanced_edition_2.1.0.15.exe", 1_300_000) + root.exe("System/witcher.exe", 4096) + File(root, "goggame-1207658924.info").writeText( + """{"playTasks":[{"category":"game","isPrimary":true,"path":"galaxy_the_witcher_enhanced_edition_2.1.0.15.exe","type":"FileTask"}]}""", + ) + assertEquals( + "System/witcher.exe", + GogDownloadManager.pickExe(root, "1207658924", null, "The Witcher: Enhanced Edition"), + ) + } + } + + // GOG's own sample manifest files the Configuration Tool as a non-primary launcher task. + @Test + fun aNonPrimaryLauncherTaskIsNotTheGame() { + withFolder { root -> + root.exe("Config2_DX9.exe") + root.exe("ed6_win2_DX9.exe", 4096) + File(root, "goggame-1207658924.info").writeText( + """{"playTasks":[ + {"category":"launcher","name":"Configuration Tool","path":"Config2_DX9.exe","type":"FileTask"}, + {"category":"game","path":"ed6_win2_DX9.exe","type":"FileTask"} + ]}""", + ) + assertEquals( + "ed6_win2_DX9.exe", + GogDownloadManager.pickExe(root, "1207658924", null, "The Legend of Heroes: Trails in the Sky SC"), + ) + } + } + + @Test + fun aLoneNonPrimaryLauncherLeavesTheSearchInCharge() { + withFolder { root -> + root.exe("Config2_DX9.exe") + root.exe("ed6_win2_DX9.exe", 4096) + File(root, "goggame-1207658924.info").writeText( + """{"playTasks":[{"category":"launcher","path":"Config2_DX9.exe","type":"FileTask"}]}""", + ) + assertEquals( + "ed6_win2_DX9.exe", + GogDownloadManager.pickExe(root, "1207658924", null, "The Legend of Heroes: Trails in the Sky SC"), + ) + } + } + + @Test + fun theSupportInstallerHintIsSkippedWhateverItsFolder() { + withFolder { root -> + root.exe("support/galaxy_setup.exe", 1_300_000) + root.exe("System/witcher.exe", 4096) + assertEquals( + "System/witcher.exe", + GogDownloadManager.pickExe( + root, + "1207658924", + "support/galaxy_setup.exe", + "The Witcher: Enhanced Edition", + ), + ) + assertEquals( + "System/witcher.exe", + GogDownloadManager.pickExe( + root, + "1207658924", + "support\\galaxy_setup.exe", + "The Witcher: Enhanced Edition", + ), + ) + } + } + + @Test + fun anInstallerHintOutsideTheGameFolderIsIgnored() { + withFolder { root -> + root.exe("game.exe", 4096) + val outside = File(root.parentFile, "outside-${System.nanoTime()}.exe").apply { writeBytes(ByteArray(8)) } + try { + assertEquals( + "game.exe", + GogDownloadManager.pickExe(root, "7", "../${outside.name}", "Some Game"), + ) + } finally { + outside.delete() + } + } + } + + // GOG runs a task from the install root unless it declares a working directory. + @Test + fun aTaskWithoutAWorkingDirectoryRunsFromTheGameFolder() { + withFolder { root -> + root.exe("System/witcher.exe", 4096) + File(root, "goggame-1207658924.info").writeText( + """{"playTasks":[{"category":"game","isPrimary":true,"path":"System\\witcher.exe","type":"FileTask"}]}""", + ) + val task = GogDownloadManager.pickTask(root, "1207658924", null, "The Witcher: Enhanced Edition") + assertEquals("System/witcher.exe", task.path) + assertEquals("", task.workDir) + } + } + + @Test + fun aDeclaredWorkingDirectoryIsKept() { + withFolder { root -> + root.exe("bin/x64/game.exe", 4096) + File(root, "goggame-7.info").writeText( + """{"playTasks":[{"category":"game","isPrimary":true,"path":"bin\\x64\\game.exe","workingDir":"bin\\x64","type":"FileTask"}]}""", + ) + val task = GogDownloadManager.pickTask(root, "7", null, "Some Game") + assertEquals("bin/x64/game.exe", task.path) + assertEquals("bin/x64", task.workDir) + } + } + + @Test + fun aWorkingDirectoryThatLeavesTheGameFolderFallsBackToTheRoot() { + withFolder { root -> + root.exe("game.exe", 4096) + File(root, "goggame-7.info").writeText( + """{"playTasks":[{"category":"game","isPrimary":true,"path":"game.exe","workingDir":"../other","type":"FileTask"}]}""", + ) + assertEquals("", GogDownloadManager.pickTask(root, "7", null, "Some Game").workDir) + } + } + + // GOG manifests use doubled separators (The Witcher 3: "bin//x64//witcher3.exe"); the sidecar + // parser rejects empty path components, so both values must be collapsed before they are stored. + @Test + fun duplicateSeparatorsInTaskValuesAreCollapsed() { + withFolder { root -> + root.exe("System/witcher.exe", 4096) + File(root, "goggame-1207658924.info").writeText( + """{"playTasks":[{"category":"game","isPrimary":true,"path":"System//witcher.exe","workingDir":"System//","type":"FileTask"}]}""", + ) + val task = GogDownloadManager.pickTask(root, "1207658924", null, "The Witcher: Enhanced Edition") + assertEquals("System/witcher.exe", task.path) + assertEquals("System", task.workDir) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogListingTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogListingTest.kt index 0c6502e939..5aace971f6 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogListingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogListingTest.kt @@ -7,7 +7,6 @@ import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -/** The account listing: everything the tab needs to draw a library before a product is asked about. */ @RunWith(RobolectricTestRunner::class) @Config(sdk = [33]) class GogListingTest { diff --git a/app/src/test/java/com/droiddeck/launcher/sync/SyncSnapshotTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncSnapshotTest.kt new file mode 100644 index 0000000000..5416bc3048 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncSnapshotTest.kt @@ -0,0 +1,52 @@ +package com.droiddeck.launcher.sync + +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class SyncSnapshotTest { + private fun folder(state: String = "idle", global: Long = 100, need: Long = 0, blocked: Boolean = false, paused: Boolean = false, errors: Int = 0) = + SyncFolder("id", "Saves", "/p", paused, blocked, state, global, need, errors, emptyList()) + + private fun snapshot(vararg folders: SyncFolder) = SyncSnapshot("me", folders.toList(), emptyList(), emptyList(), emptyList(), 0, 0) + + @Test + fun syncingReportsPercentOfActiveFolders() { + val s = snapshot(folder("syncing", global = 1000, need = 360), folder()) + assertTrue(s.syncing) + assertEquals(64, s.percent) + assertEquals(360, s.needBytes) + } + + @Test + fun blockedOrFailingFoldersNeedAttention() { + assertTrue(snapshot(folder(blocked = true, paused = true)).needsAttention) + assertTrue(snapshot(folder(errors = 2)).needsAttention) + assertTrue(snapshot(folder("idle", need = 5)).needsAttention) + assertFalse(snapshot(folder(paused = true, errors = 2)).needsAttention) + } + + @Test + fun unreadableFolderStatusShowsAsError() { + val config = JSONObject("""{"id":"saves","label":"Saves","path":"/p","paused":false,"devices":[{"deviceID":"DEV1"}]}""") + val f = SyncthingParse.folder(config, SyncthingParse.unreadableStatus(), blocked = false, names = mapOf("DEV1" to "Desktop PC")) + assertEquals("error", f.state) + assertTrue(f.errors > 0) + assertTrue(f.outOfSync) + assertFalse(f.syncing) + assertEquals(listOf("Desktop PC"), f.sharedWith) + assertTrue(snapshot(f).needsAttention) + } + + @Test + fun parsesPendingFoldersWithDeviceNames() { + val json = JSONObject("""{"emu":{"offeredBy":{"DEV1":{"label":"Emulation saves","time":"2026-01-01T00:00:00Z"}}}}""") + val pending = SyncthingParse.pendingFolders(json, mapOf("DEV1" to "Desktop PC")) + assertEquals(listOf(SyncPendingFolder("emu", "Emulation saves", "Desktop PC", "DEV1")), pending) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/sync/SyncthingConfigTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingConfigTest.kt new file mode 100644 index 0000000000..4d51bde19f --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingConfigTest.kt @@ -0,0 +1,83 @@ +package com.droiddeck.launcher.sync + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SyncthingConfigTest { + @get:Rule val tmp = TemporaryFolder() + + private val generated = """ + <configuration version="51"> + <folder id="abc" label="Camera" path="/storage/emulated/0/DCIM" type="sendreceive"> + <paused>false</paused> + </folder> + <folder id="def" label="Saves" path="/data/user/0/app/Sync/saves" type="sendreceive"> + <paused>false</paused> + </folder> + <device id="PEER" name="Desktop" compression="metadata"> + <address>dynamic</address> + <paused>false</paused> + </device> + <gui enabled="true" tls="true" debugging="false"> + <address>127.0.0.1:8384</address> + <user>droiddeck</user> + <apikey>key123</apikey> + </gui> + <options> + <listenAddress>default</listenAddress> + <localAnnouncePort>21027</localAnnouncePort> + <urAccepted>0</urAccepted> + <startBrowser>true</startBrowser> + </options> + <defaults> + <folder id="" label="" path="~" type="sendreceive"></folder> + </defaults> + </configuration> + """.trimIndent() + + private val ports = SyncthingPorts(22100, 21127) + + @Test + fun pausesDisallowedFoldersBeforeLaunch() { + val out = SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync") { !it.startsWith("/storage/emulated/0/DCIM") } + val camera = out.substringAfter("id=\"abc\"").substringBefore("</folder>") + val saves = out.substringAfter("id=\"def\"").substringBefore("</folder>") + assertTrue(camera.contains("<paused>true</paused>")) + assertTrue(saves.contains("<paused>false</paused>")) + } + + @Test + fun pausesDevicesBeforeLaunchWhenPolicyRequires() { + val paused = SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync", pauseDevices = true) { true } + assertTrue(paused.substringAfter("id=\"PEER\"").substringBefore("</device>").contains("<paused>true</paused>")) + val open = SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync", pauseDevices = false) { true } + assertTrue(open.substringAfter("id=\"PEER\"").substringBefore("</device>").contains("<paused>false</paused>")) + } + + @Test + fun replacesConfigFileWithoutLeavingStagedCopy() { + val dir = tmp.newFolder() + val file = File(dir, "config.xml").apply { writeText(generated) } + SyncthingConfig.apply(file, ports, File("/data/st/gui.sock"), File("/ext/Sync"), false) { true } + assertEquals(SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync") { true }, file.readText()) + assertEquals(listOf("config.xml"), dir.list()!!.toList()) + } + + @Test + fun applyIsStable() { + val once = SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync") { true } + assertEquals(once, SyncthingConfig.apply(once, ports, "/data/st/gui.sock", "/ext/Sync") { true }) + } + + @Test + fun guiListensOnlyOnPrivateSocket() { + val gui = SyncthingConfig.apply(generated, ports, "/data/st/gui.sock", "/ext/Sync") { true }.substringAfter("<gui").substringBefore("</gui>") + assertTrue(gui.contains("<address>/data/st/gui.sock</address>")) + assertTrue(gui.contains("<unixSocketPermissions>600</unixSocketPermissions>")) + assertTrue(gui.contains("tls=\"false\"")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/sync/SyncthingGuardTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingGuardTest.kt new file mode 100644 index 0000000000..94d7f15849 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingGuardTest.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.sync + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File +import java.nio.file.Files + +class SyncthingGuardTest { + @get:Rule val tmp = TemporaryFolder() + + private fun setup(): Triple<SyncthingGuard, File, File> { + val data = tmp.newFolder("data") + val external = tmp.newFolder("external") + val home = File(external, "Sync").apply { mkdirs() } + val config = File(data, "files/syncthing").apply { mkdirs() } + return Triple(SyncthingGuard(home, listOf(data, external), listOf(config)), data, external) + } + + @Test + fun allowsFoldersInsideAppStorage() { + val (guard, data, external) = setup() + assertTrue(guard.allows(File(external, "Sync/Game saves").path)) + assertTrue(guard.allows(File(data, "files/linux/home").path)) + assertTrue(guard.allows("~/Shared")) + assertTrue(guard.allows(external.path)) + } + + @Test + fun blocksFoldersOutsideAppStorage() { + val (guard, _, _) = setup() + assertFalse(guard.allows(tmp.newFolder("DCIM").path)) + assertFalse(guard.allows("/storage/emulated/0/Download")) + assertFalse(guard.allows("")) + assertFalse(guard.allows("relative/path")) + } + + @Test + fun blocksSyncthingsOwnConfig() { + val (guard, data, _) = setup() + assertFalse(guard.allows(File(data, "files/syncthing").path)) + assertFalse(guard.allows(File(data, "files/syncthing/keys").path)) + } + + @Test + fun blocksFoldersHoldingSyncthingsConfig() { + val (guard, data, _) = setup() + assertFalse(guard.allows(data.path)) + assertFalse(guard.allows(File(data, "files").path)) + } + + @Test + fun blocksSiblingWithSharedPrefix() { + val (guard, _, external) = setup() + assertFalse(guard.allows(external.path + "-other")) + } + + @Test + fun blocksSymlinkPointingOutside() { + val (guard, _, external) = setup() + val outside = tmp.newFolder("outside") + val link = File(external, "Sync/link") + Files.createSymbolicLink(link.toPath(), outside.toPath()) + assertFalse(guard.allows(link.path)) + assertFalse(guard.allows(File(link, "child").path)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/sync/SyncthingHttpTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingHttpTest.kt new file mode 100644 index 0000000000..1efb0d919f --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingHttpTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.sync + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import java.io.ByteArrayOutputStream + +class SyncthingHttpTest { + private fun response(raw: String) = SyncthingHttp.readResponse(raw.byteInputStream(Charsets.ISO_8859_1)) + + @Test + fun readsContentLengthBody() { + assertEquals(200 to """{"ping":"pong"}""", response("HTTP/1.1 200 OK\r\nContent-Length: 15\r\n\r\n{\"ping\":\"pong\"}")) + } + + @Test + fun readsChunkedBody() { + assertEquals(403 to "CSRF Error", response("HTTP/1.1 403 Forbidden\r\nTransfer-Encoding: chunked\r\n\r\n4\r\nCSRF\r\n6\r\n Error\r\n0\r\n\r\n")) + } + + @Test + fun writesOneShotRequest() { + val out = ByteArrayOutputStream() + SyncthingHttp.writeRequest(out, "POST", "/rest/system/pause", listOf("X-API-Key" to "k"), null) + val text = out.toString("ISO-8859-1") + assertTrue(text.startsWith("POST /rest/system/pause HTTP/1.1\r\n")) + assertTrue(text.contains("Connection: close\r\n")) + assertTrue(text.endsWith("X-API-Key: k\r\nContent-Length: 0\r\n\r\n")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/sync/SyncthingPortsTest.kt b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingPortsTest.kt new file mode 100644 index 0000000000..3bb8017bbd --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/sync/SyncthingPortsTest.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.sync + +import org.junit.Assert.assertEquals +import org.junit.Test + +class SyncthingPortsTest { + @Test + fun skipsBusyPorts() { + val busy = setOf(22100, 21127) + val picked = SyncthingPortPicker.pick({ it !in busy }, { it !in busy }) + assertEquals(SyncthingPorts(22101, 21128), picked) + } + + @Test(expected = IllegalStateException::class) + fun failsWhenNoPortIsFree() { + SyncthingPortPicker.pick({ false }, { true }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AppThemeTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AppThemeTest.kt new file mode 100644 index 0000000000..172b9dc197 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/AppThemeTest.kt @@ -0,0 +1,25 @@ +package com.droiddeck.launcher.ui + +import android.graphics.Color +import android.view.ContextThemeWrapper +import com.droiddeck.launcher.R +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34]) +class AppThemeTest { + @Test fun theNavigationBarIsOpaqueAndDarkSoNothingLightShowsThroughIt() { + val themed = ContextThemeWrapper(RuntimeEnvironment.getApplication(), R.style.AppTheme) + val attrs = themed.obtainStyledAttributes(intArrayOf(android.R.attr.navigationBarColor)) + val color = attrs.getColor(0, Color.TRANSPARENT) + attrs.recycle() + assertEquals(0xFF, Color.alpha(color)) + assertTrue(Color.luminance(color) < 0.1f) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomChatPageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomChatPageTest.kt new file mode 100644 index 0000000000..34df15ff0a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomChatPageTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class BottomChatPageTest { + @Test fun steamSitesOpenOthersDoNot() { + assertTrue(steamChatAllows("steamcommunity.com")) + assertTrue(steamChatAllows("login.steampowered.com")) + assertTrue(steamChatAllows("steam-chat.com")) + assertTrue(steamChatAllows("community.cloudflare.steamstatic.com")) + assertFalse(steamChatAllows("steamcommunity.com.example.net")) + assertFalse(steamChatAllows("evilsteamcommunity.com")) + assertFalse(steamChatAllows(null)) + } + + @Test fun chatFitScriptUsesADotDecimalInEveryLocale() { + val before = java.util.Locale.getDefault() + try { + java.util.Locale.setDefault(java.util.Locale.GERMANY) + val js = steamChatFitScript(821, 0.75f) + assertTrue(js.contains("m.content='width=821, initial-scale=0.75'")) + assertTrue(js.contains("s.textContent='$STEAM_CHAT_FIT_CSS'")) + assertFalse(STEAM_CHAT_FIT_CSS.contains('\'')) + } finally { + java.util.Locale.setDefault(before) + } + } + + @Test fun theGroupChatListLeavesRoomForTheOnlineFriends() { + assertTrue(STEAM_CHAT_FIT_CSS.contains(".ChatRoomList_Empty{display:none!important}")) + assertTrue(STEAM_CHAT_FIT_CSS.contains(".chatRoomListContainer{height:auto!important;max-height:25vh!important}")) + assertTrue(STEAM_CHAT_FIT_CSS.contains(".chat_main>:has(~.chat_main_flex){display:none!important}")) + } + + @Test fun desktopAgentKeepsTheWebViewChromeVersion() { + val ua = desktopUserAgent("Mozilla/5.0 (Linux; Android 15; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/141.0.7390.122 Mobile Safari/537.36") + assertEquals("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.7390.122 Safari/537.36", ua) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt new file mode 100644 index 0000000000..90f39c2c5a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt @@ -0,0 +1,63 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class BottomDashboardTest { + @Test fun theRememberedPageOpensAgain() { + assertEquals("shots", pickBottomPage("shots", listOf("downloads", "shots"))) + } + + @Test fun aGoneOrMissingPageFallsBackToTheFirst() { + assertEquals("downloads", pickBottomPage("gone", listOf("downloads", "shots"))) + assertEquals("downloads", pickBottomPage(null, listOf("downloads", "shots"))) + assertNull(pickBottomPage("shots", emptyList())) + } + + @Test fun withNothingPickedTheStatsOpen() { + val ids = listOf("telemetry", "downloads", "notifications", "screenshots", "chat") + assertEquals("telemetry", pickBottomPage(null, ids)) + assertEquals("telemetry", pickBottomPage("gone", ids)) + assertEquals("chat", pickBottomPage("chat", ids)) + assertEquals("telemetry", pickBottomPage("telemetry", ids)) + assertEquals("screenshots", pickBottomPage("screenshots", ids)) + } + + @Test fun aGameStartShowsTheInGameStats() { + assertEquals("telemetry", pageForGameStart(listOf("telemetry", "downloads", "chat"))) + assertNull(pageForGameStart(listOf("downloads", "chat"))) + } +} + +class BottomDownloadsRateTest { + @Test fun rateIsBytesPerSecondBetweenReads() { + assertEquals(1_000_000L, downloadRate(0L, 0L, 2_000_000L, 2_000L)) + } + + @Test fun noMovementOrARestartIsZero() { + assertEquals(0L, downloadRate(500L, 0L, 500L, 2_000L)) + assertEquals(0L, downloadRate(500L, 0L, 100L, 2_000L)) + assertEquals(0L, downloadRate(-1L, 0L, 100L, 2_000L)) + } +} + +class BottomTelemetryLapTimeTest { + @Test fun lapTimesReadAsMinutesSecondsMillis() { + assertEquals("1:23.456", lapTime(83.456f)) + assertEquals("0:05.000", lapTime(5f)) + } + + @Test fun eachSessionStartsWithoutAPickedTab() { + SessionBottomTab.pick("2026-11-01-01-steam", "screenshots") + assertEquals("screenshots", SessionBottomTab.picked("2026-11-01-01-steam")) + assertNull(SessionBottomTab.picked("2026-11-01-02-steam")) + assertNull(SessionBottomTab.picked(null)) + assertEquals("telemetry", pickBottomPage(SessionBottomTab.picked("2026-11-01-02-steam"), listOf("telemetry", "chat", "screenshots"))) + } + + @Test fun theStripNamesTheSteamClient() { + assertEquals(com.droiddeck.launcher.R.string.stats_steam_client_x86, steamClientLabel("x86_64")) + assertEquals(com.droiddeck.launcher.R.string.stats_steam_client_arm, steamClientLabel("arm64")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt new file mode 100644 index 0000000000..42922163a8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Test + +class BottomDesktopFitTest { + @Test fun aDesktopOfThePanelsShapeFillsThePanel() { + assertEquals(1280 to 870, fitDesktop(1280, 870, 1280, 870)) + assertEquals(1280 to 870, fitDesktop(1280, 870, 1278, 868)) + } + + @Test fun aDesktopOfAnotherShapeIsFittedNotStretched() { + val (w, h) = fitDesktop(1920, 1016, 1280, 870) + assertEquals(1016, h) + assertEquals(1494, w) + } + + @Test fun nothingToFitLeavesThePanelSize() { + assertEquals(1920 to 1016, fitDesktop(1920, 1016, 0, 0)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomScreenBarTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomScreenBarTest.kt new file mode 100644 index 0000000000..97389fa285 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomScreenBarTest.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.ui.test.onNodeWithContentDescription +import androidx.compose.ui.test.performClick +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], qualifiers = "w640dp-h480dp-land", application = android.app.Application::class) +class BottomScreenBarTest { + @get:Rule val compose = createRobolectricComposeRule() + private val context = RuntimeEnvironment.getApplication() + + @After fun reset() { + SessionState.mode = SessionService.MODE_DESKTOP + } + + @Test fun steamSessionsGetSteamAndQuickAccess() { + SessionState.mode = SessionService.MODE_STEAM + var steam = 0 + var qam = 0 + val model = sessionBarModel("Trackpad", {}, {}, { steam++ }, { qam++ }) + assertNotNull(model.onSteam) + assertNotNull(model.onQam) + model.onSteam?.invoke() + model.onQam?.invoke() + assertEquals(1, steam) + assertEquals(1, qam) + } + + @Test fun otherSessionsLeaveSteamOut() { + SessionState.mode = SessionService.MODE_DESKTOP + val model = sessionBarModel("Trackpad", {}, {}, {}, {}) + assertNull(model.onSteam) + assertNull(model.onQam) + } + + @Test fun everyButtonOnTheBarReachesItsAction() { + var closes = 0 + var menus = 0 + var steam = 0 + var qam = 0 + var keyboard = 0 + compose.setContent { + DroidDeckTheme { + BottomScreenBar(BottomBarModel("Trackpad", { closes++ }, { menus++ }, { steam++ }, { qam++ }, + listOf(BarExtra(context.getString(R.string.second_show_keyboard), icon = R.drawable.ic_bottom_keyboard) { keyboard++ }))) + } + } + for (label in listOf(R.string.common_close, R.string.touch_droiddeck_menu, R.string.drawer_steam_menu, R.string.drawer_open_qam, + R.string.second_show_keyboard)) { + compose.onNodeWithContentDescription(context.getString(label)).performClick() + } + compose.waitForIdle() + assertEquals(listOf(1, 1, 1, 1, 1), listOf(closes, menus, steam, qam, keyboard)) + } + + @Test fun aBarWithoutMenuOrSteamShowsOnlyClose() { + compose.setContent { + DroidDeckTheme { BottomScreenBar(BottomBarModel("Terminal", {}, null, null, null)) } + } + compose.onNodeWithContentDescription(context.getString(R.string.common_close)).assertExists() + compose.onNodeWithContentDescription(context.getString(R.string.touch_droiddeck_menu)).assertDoesNotExist() + compose.onNodeWithContentDescription(context.getString(R.string.drawer_steam_menu)).assertDoesNotExist() + compose.onNodeWithContentDescription(context.getString(R.string.drawer_open_qam)).assertDoesNotExist() + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt new file mode 100644 index 0000000000..35f2c8cf09 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class BuildWatermarkTest { + @Test + fun stableAndPreviewBuildsHaveNoWatermark() { + assertNull(BuildWatermark.lines(pr = 0, ci = true, commit = "abcdef0123", title = "", branch = "")) + } + + @Test + fun prBuildShowsNumberHashAndTitle() { + assertEquals( + listOf("PR-1234 | abcdef0", "Fix: foo the bar"), + BuildWatermark.lines(pr = 1234, ci = true, commit = "abcdef0123", title = "Fix: foo the bar", branch = "x"), + ) + } + + @Test + fun longTitlesTruncateAtEightyCharacters() { + val lines = BuildWatermark.lines(pr = 7, ci = true, commit = "abcdef0", title = "a".repeat(120), branch = "")!! + assertEquals(80, lines[1].length) + assertEquals('…', lines[1].last()) + } + + @Test + fun localBuildShowsBranch() { + assertEquals( + listOf("LOCAL | abcdef0", "feat/thing"), + BuildWatermark.lines(pr = 0, ci = false, commit = "abcdef0123", title = "", branch = "feat/thing"), + ) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt index 4c3244eb2a..91fc516361 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt @@ -1,6 +1,6 @@ package com.droiddeck.launcher.ui -import android.app.Activity +import androidx.activity.ComponentActivity import android.view.MotionEvent import android.view.View import android.view.ViewGroup @@ -26,7 +26,7 @@ import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @Config(sdk = [34], shadows = [JoyConPadTest.RecordingWriter::class]) class DeckControlsPanelOwnershipTest { - private val controller = Robolectric.buildActivity(Activity::class.java).setup() + private val controller = Robolectric.buildActivity(ComponentActivity::class.java).setup() private val activity = controller.get() private val root = FrameLayout(activity) private val bridge = PadBridge(File(activity.cacheDir, "panel-ownership")) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt index 4aa3a03276..45f6566977 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelTest.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.ui +import android.content.ComponentName import android.view.MotionEvent +import androidx.activity.ComponentActivity import android.view.View import com.droiddeck.launcher.input.JoyConPadTest import com.droiddeck.launcher.input.PadBridge @@ -9,8 +11,10 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.Robolectric import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import java.nio.file.Files @@ -22,14 +26,15 @@ class DeckControlsPanelTest { val directory = Files.createTempDirectory("deck-panel").toFile() try { SessionState.deckPad = false - // No pad: the Deck layouts (trackpads, grips). A pad without Deck controls: the gamepad layout - // (sticks, d-pad, face buttons). + val app = RuntimeEnvironment.getApplication() + shadowOf(app.packageManager).addActivityIfNotPresent(ComponentName(app, ComponentActivity::class.java)) + val activity = Robolectric.buildActivity(ComponentActivity::class.java).setup().get() for (pad in listOf(null, PadBridge(directory))) for (portraitDock in listOf(false, true)) { val name = "pad=${pad != null} portraitDock=$portraitDock" - val panel = DeckControlsPanel(RuntimeEnvironment.getApplication(), onClose = {}, onSteamMenu = {}, onQam = {}, + val panel = DeckControlsPanel(activity, onClose = {}, onSteamMenu = {}, onQam = {}, pad = pad, portraitDock = portraitDock) + activity.setContentView(panel) assertEquals(name, pad == null, panel.deckControls) - // The portrait dock sits under a portrait game; its gamepad layout needs a tall panel. val (w, h) = if (portraitDock) 720 to 1000 else 1200 to 480 panel.measure(View.MeasureSpec.makeMeasureSpec(w, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(h, View.MeasureSpec.EXACTLY)) @@ -41,7 +46,6 @@ class DeckControlsPanelTest { val down = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, x.toFloat(), y.toFloat(), 0) assertEquals("$name ($x, $y)", expected, panel.dispatchTouchEvent(down)) down.recycle() - // Cancel rather than lift, so no button fires its action. MotionEvent.obtain(0L, 1L, MotionEvent.ACTION_CANCEL, x.toFloat(), y.toFloat(), 0).also { panel.dispatchTouchEvent(it); it.recycle() } if (expected) taken++ else missed++ } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt index 010c66cabd..016a932c1a 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt @@ -2,6 +2,9 @@ package com.droiddeck.launcher.ui import org.junit.After import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner @@ -29,4 +32,53 @@ class DualScreenPanelOwnerTest { DualScreenPanel.hide(10) assertEquals(-1, DualScreenPanel.shownOn) } + + @Test fun aPausedLauncherIsOnlyBroughtBackWhenThePanelTookFocusItself() { + DualScreenPanel.show(app, 2, 10) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + DualScreenPanel.ownerPaused(10, true) + assertNull(DualScreenPanel.focusTask(fromPanel = false)) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) + DualScreenPanel.ownerPaused(10, false) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + } + + @Test fun anAppTheLauncherOpenedKeepsItsScreenEvenAfterABottomScreenTouch() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.yieldTo(10, true) + DualScreenPanel.ownerPaused(10, true) + assertNull(DualScreenPanel.focusTask(fromPanel = true)) + DualScreenPanel.yieldTo(10, false) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) + } + + @Test fun aScreenFromAnotherAppKeepsTheTopScreenAfterABottomScreenTouch() { + DualScreenPanel.show(app, 2, 10) + assertTrue(DualScreenPanel.opensOutside("com.droiddeck.launcher", "com.android.packageinstaller")) + DualScreenPanel.yieldTo(10, true) + DualScreenPanel.ownerPaused(10, true) + assertNull(DualScreenPanel.focusTask(fromPanel = true)) + DualScreenPanel.ownerPaused(10, false) + DualScreenPanel.yieldTo(10, false) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) + } + + @Test fun droidDecksOwnScreensAndUnresolvedIntentsDoNotYield() { + assertFalse(DualScreenPanel.opensOutside("com.droiddeck.launcher", "com.droiddeck.launcher")) + assertFalse(DualScreenPanel.opensOutside("com.droiddeck.launcher", null)) + } + + @Test fun anotherTasksPauseDoesNotStopThePanelReturningFocus() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.ownerPaused(11, true) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + } + + @Test fun aNewPanelForgetsThatTheLastLauncherWasPaused() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.ownerPaused(10, true) + DualScreenPanel.hide() + DualScreenPanel.show(app, 2, 10) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt new file mode 100644 index 0000000000..04ff32d59c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class GameScreenSwapTest { + private fun wanted( + requested: Boolean = true, + activityStarted: Boolean = true, + sessionEnded: Boolean = false, + inPip: Boolean = false, + glassesOutput: Boolean = false, + bottomScreenFree: Boolean = true, + ) = GameScreenSwap.wanted(requested, activityStarted, sessionEnded, inPip, glassesOutput, bottomScreenFree) + + @Test fun thePickedSwapPutsTheGameOnTheBottomScreen() { + assertTrue(wanted()) + } + + @Test fun withoutAPickTheGameStaysOnTop() { + assertFalse(wanted(requested = false)) + } + + @Test fun theGameComesBackToTheTopWhenTheSessionIsHiddenOrEnds() { + assertFalse(wanted(activityStarted = false)) + assertFalse(wanted(sessionEnded = true)) + assertFalse(wanted(inPip = true)) + } + + @Test fun glassesAndAHeldBottomScreenWin() { + assertFalse(wanted(glassesOutput = true)) + assertFalse(wanted(bottomScreenFree = false)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/HistoryTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/HistoryTest.kt new file mode 100644 index 0000000000..0e4fef58d9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/HistoryTest.kt @@ -0,0 +1,33 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Test + +class HistoryTest { + @Test fun theSpanIsTheTimeTheKeptReadingsCover() { + val h = History(3) + h.add(1f, 1_000L) + h.add(2f, 1_500L) + assertEquals(1, h.spanSeconds()) + h.add(3f, 2_000L) + h.add(4f, 4_000L) + assertEquals(listOf(2f, 3f, 4f), h.snapshot()) + assertEquals(3, h.spanSeconds()) + } + + @Test fun aHistoryThatStopsBeingFedKeepsItsSpan() { + val h = History(4) + h.add(1f, 10_000L) + h.add(2f, 20_000L) + assertEquals(10, h.spanSeconds()) + assertEquals(10, h.spanSeconds()) + } + + @Test fun readingsWithoutATimeHaveNoSpan() { + val h = History(2) + h.add(1f) + assertEquals(0, h.spanSeconds()) + assertEquals(0, History(2).spanSeconds()) + assertEquals(0, History(2).apply { add(1f, 5_000L) }.spanSeconds()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt index d703d09bec..7674ab242d 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt @@ -87,6 +87,11 @@ class LibraryEntriesTest { assertEquals(listOf("epic", "gog", "battlenet"), librarySources(entries, listOf("missing", "epic", "epic", "amazon"))) } + @Test fun aSignedInStoreWithNoGamesKeepsItsPlaceInTheStoreOrder() { + val entries = listOf("steam", "xbox").map { LibraryEntry(it, it, it, null, null, true) } + assertEquals(listOf("steam", "xbox", "itch", "gamejolt"), librarySources(entries, listOf("xbox", "itch", "gamejolt"), setOf("itch", "gamejolt"))) + } + @Test fun gameKeysNameEitherAnAppOrAStoreProduct() { GameRef.parse("app:440").let { assertEquals(440, it.appId); assertNull(it.store) } GameRef.parse("app:-12").let { assertEquals(-12, it.appId) } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt index 10d02afbfb..9265eb297d 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt @@ -24,6 +24,7 @@ import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionState import org.junit.After import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Rule @@ -74,9 +75,32 @@ class SessionSecondScreenTest { compose.onNodeWithText(context.getString(R.string.second_mode_keyboard_trackpad)).assertDoesNotExist() } - @Test fun desktopTrackpadOmitsSteamShortcuts() = checkShortcuts(steam = false) - - @Test fun steamTrackpadKeepsWorkingSteamShortcuts() = checkShortcuts(steam = true) + @Test fun provisionalBottomScreenPanelSettlesOnlyOnceTheSessionIsInFront() { + SessionState.mode = SessionService.MODE_STEAM + val previousMode = SessionState.secondScreenMode + val previousProvisional = SessionState.secondScreenProvisional + SessionState.secondScreenMode = SecondScreenMode.NONE + try { + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + val pip: MutableState<Boolean> = ReflectionHelpers.getField(activity, "pipUi\$delegate") + fun settle() = ReflectionHelpers.callInstanceMethod<Unit>(activity, "settleDualScreenControls") + SessionState.secondScreenProvisional = true + ReflectionHelpers.setField(activity, "started", true) + pip.value = true + settle() + assertTrue(SessionState.secondScreenProvisional) + pip.value = false + ReflectionHelpers.setField(activity, "started", false) + settle() + assertTrue(SessionState.secondScreenProvisional) + ReflectionHelpers.setField(activity, "started", true) + settle() + assertFalse(SessionState.secondScreenProvisional) + } finally { + SessionState.secondScreenMode = previousMode + SessionState.secondScreenProvisional = previousProvisional + } + } @Test fun trackpadTapUsesPositionLeftByAnotherPointerSource() { val activity = Robolectric.buildActivity(SessionActivity::class.java).get() @@ -89,7 +113,7 @@ class SessionSecondScreenTest { try { panel.create() panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD) - val trackpad = descendants(panel.window!!.decorView).first { it.javaClass.simpleName == "TrackpadView" } + val trackpad = descendants(panel.window!!.decorView).first { it is SessionTrackpadView } trackpad.layout(0, 0, 1000, 600) for (next in listOf(Offset(0.2f, 0.7f), Offset(0.8f, 0.1f))) { position = next @@ -103,25 +127,26 @@ class SessionSecondScreenTest { } finally { panel.closeControls() } } - @Test fun trackpadMenuButtonOnlyAppearsWhenTheMenuCanMove() { + @Test fun terminalOpenedBeforeItWasReadyIsRetriedButOtherPanelsAreLeftAlone() { SessionState.mode = SessionService.MODE_STEAM val activity = Robolectric.buildActivity(SessionActivity::class.java).get() val display = activity.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY) - val label = context.getString(R.string.touch_droiddeck_menu) - for (movable in listOf(false, true)) { - var menus = 0 - val panel = SecondScreenPresentation(activity, display, { _, _, _, _ -> }, { _, _ -> }, {}, - {}, {}, {}, onMenu = if (movable) ({ menus++ }) else null) - try { - panel.create() - panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD) - val buttons = descendants(panel.window!!.decorView).filter { it.contentDescription == label }.toList() - assertEquals(if (movable) 1 else 0, buttons.size) - buttons.forEach { it.performClick() } - assertEquals(if (movable) 1 else 0, menus) - } finally { - panel.closeControls() - } + val panel = SecondScreenPresentation(activity, display, { _, _, _, _ -> }, { _, _ -> }, {}, {}, {}, {}) + try { + panel.show() + panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD) + val root = panel.window!!.decorView + val trackpad = descendants(root).toList() + panel.retryTerminal() + assertEquals(trackpad, descendants(root).toList()) + panel.showMode(SecondScreenMode.TERMINAL) + val notReady = context.getString(R.string.second_terminal_not_ready) + val before = descendants(root).filter { (it as? TextView)?.text == notReady }.single() + panel.retryTerminal() + val after = descendants(root).filter { (it as? TextView)?.text == notReady }.single() + assertTrue(before !== after) + } finally { + panel.closeControls() } } @@ -219,38 +244,12 @@ class SessionSecondScreenTest { SessionDrawer(true, SessionDrawerPage.SECOND_SCREEN, false, {}, actions(steam, displays) { selected += it }) } } - for (mode in listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL)) { + val modes = listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.CUSTOM_CONTROLS, SecondScreenMode.TERMINAL) + for (mode in modes) { compose.onNodeWithText(context.getString(mode.label)).performScrollTo().assertIsDisplayed().performClick() } compose.onNodeWithText(context.getString(SecondScreenMode.DECK_CONTROLS.label)).assertDoesNotExist() - assertEquals(listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL), selected) - } - - private fun checkShortcuts(steam: Boolean) { - SessionState.mode = if (steam) SessionService.MODE_STEAM else SessionService.MODE_DESKTOP - val activity = Robolectric.buildActivity(SessionActivity::class.java).get() - val display = activity.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY) - var menus = 0 - var qams = 0 - val panel = SecondScreenPresentation(activity, display, { _, _, _, _ -> }, { _, _ -> }, {}, - { menus++ }, { qams++ }, {}) - try { - panel.create() - panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD) - val buttons = descendants(panel.window!!.decorView).filterIsInstance<TextView>().filter { it.isClickable }.toList() - assertTrue(buttons.any { it.text == context.getString(R.string.second_show_keyboard) }) - val shortcuts = buttons.filter { it.text == "STEAM" || it.text == "•••" } - if (steam) { - assertEquals(2, shortcuts.size) - shortcuts.forEach { it.performClick() } - assertEquals(1, menus) - assertEquals(1, qams) - } else { - assertTrue(shortcuts.isEmpty()) - } - } finally { - panel.closeControls() - } + assertEquals(modes, selected) } private fun descendants(view: View): Sequence<View> = sequence { diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt index b11fbd2fe1..807b729f6d 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt @@ -53,11 +53,8 @@ class SteamIntegrationGroupTest { compose.onNodeWithText("3 of 4 on").assertExists() } - @Test fun shortcutsWaitForHome() { + @Test fun shortcutsDoNotNeedHome() { show() - compose.onNodeWithTag("integration-action-shortcuts").assertIsNotEnabled() - compose.onNodeWithText("Needs DroidDeck as Home").assertExists() - compose.runOnIdle { state.value = state.value.copy(home = true) } compose.onNodeWithTag("integration-action-shortcuts").assertIsEnabled() } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt index 482e584f39..d8f5793973 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt @@ -37,6 +37,34 @@ class StepOutTest { assertEquals(300f, b.bottom, 0.5f) } + @Test fun aLeftMenuWithRoomStaysLeft() { + assertEquals(StepSide.Left, fitStepSide(StepSide.Left, Rect(1900f, 20f, 1980f, 80f), hostWidth = 2400f, wanted = 840f)) + } + + @Test fun aLeftMenuNearTheLeftEdgeOpensRight() { + assertEquals(StepSide.Right, fitStepSide(StepSide.Left, Rect(300f, 20f, 420f, 80f), hostWidth = 1080f, wanted = 840f)) + } + + @Test fun aRightMenuNearTheRightEdgeOpensLeft() { + assertEquals(StepSide.Left, fitStepSide(StepSide.Right, Rect(900f, 20f, 1000f, 80f), hostWidth = 1080f, wanted = 840f)) + } + + @Test fun aSqueezedMenuKeepsItsSideWhenTheOtherSideIsNarrower() { + assertEquals(StepSide.Left, fitStepSide(StepSide.Left, Rect(600f, 20f, 700f, 80f), hostWidth = 1080f, wanted = 840f)) + } + + @Test fun theOutlineReachFollowsTheChosenSide() { + val wide = Rect(600f, 20f, 700f, 80f) + assertEquals(600f to 300f, stepReach(StepSide.Left, wide, hostWidth = 1080f, width = 400)) + assertEquals(700f to 1000f, stepReach(StepSide.Right, wide, hostWidth = 1080f, width = 400)) + } + + @Test fun theOutlineReachStaysInsideTheHost() { + val near = Rect(100f, 20f, 200f, 80f) + assertEquals(100f to 0f, stepReach(StepSide.Left, near, hostWidth = 1080f, width = 400)) + assertEquals(200f to 1080f, stepReach(StepSide.Right, near, hostWidth = 1080f, width = 1200)) + } + @Test fun aClosedOutlineIsJustThePill() { val path = Path() stepPathRight(path, pill, right = pill.right, bottom = pill.bottom, pullTop = pill.bottom + 6f, box = 16f, fillet = 10f, pillCorner = 12f) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StripFitTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StripFitTest.kt new file mode 100644 index 0000000000..6d9aed0a17 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/StripFitTest.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertArrayEquals +import org.junit.Test + +class StripFitTest { + @Test fun everythingFitsOnAWideLine() { + assertArrayEquals(booleanArrayOf(true, true, true), fitByPriority(intArrayOf(10, 20, 30), intArrayOf(0, 1, 2), 5, 100)) + } + + @Test fun theLeastImportantItemsAreLeftOutFirst() { + assertArrayEquals(booleanArrayOf(true, false, true), fitByPriority(intArrayOf(10, 20, 30), intArrayOf(0, 2, 1), 5, 60)) + } + + @Test fun anItemThatDoesNotFitEndsTheLine() { + assertArrayEquals(booleanArrayOf(true, false, false), fitByPriority(intArrayOf(10, 50, 5), intArrayOf(0, 1, 2), 2, 40)) + } + + @Test fun equalPrioritiesKeepTheirOrder() { + assertArrayEquals(booleanArrayOf(true, true, false), fitByPriority(intArrayOf(10, 10, 10), intArrayOf(0, 0, 0), 0, 25)) + } + + @Test fun nothingFitsInNoRoom() { + assertArrayEquals(booleanArrayOf(false, false), fitByPriority(intArrayOf(10, 10), intArrayOf(0, 1), 0, 5)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/TrackingRecoveryViewTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/TrackingRecoveryViewTest.kt index 3275e622f2..c921d73703 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/TrackingRecoveryViewTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/TrackingRecoveryViewTest.kt @@ -78,7 +78,6 @@ class TrackingRecoveryViewTest { difference+=abs(((actual ushr 16) and 255)-((reference ushr 16) and 255)) } } - // Native text rasterization can round a translated glyph edge differently. assertTrue("Eye at x=$x changed $changed pixels",changed<pixels/1000) assertTrue("Eye at x=$x has different content",difference.toDouble()/(pixels*3)<0.1) } diff --git a/artwork/boot-animation-source/embed_sound.py b/artwork/boot-animation-source/embed_sound.py index 7354e3c326..18bc9c7d2c 100644 --- a/artwork/boot-animation-source/embed_sound.py +++ b/artwork/boot-animation-source/embed_sound.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Embed droiddeck-boot-sound.wav into droiddeck-boot.html (MP3, base64) for the preview page.""" import base64, re, subprocess from pathlib import Path here = Path(__file__).parent diff --git a/artwork/boot-animation-source/render.py b/artwork/boot-animation-source/render.py index 66a32dbcd6..2f4643ad0f 100644 --- a/artwork/boot-animation-source/render.py +++ b/artwork/boot-animation-source/render.py @@ -1,15 +1,4 @@ #!/usr/bin/env python3 -"""Render the DroidDeck boot animation to .webm (Steam) or .mp4 (H.264). - -Usage: python3 render.py [WIDTH] [HEIGHT] [FPS] [OUT] [light|dark] - python3 render.py 1280 720 30 droiddeck-boot.webm - python3 render.py 1920 1080 60 droiddeck-boot.mp4 - python3 render.py 1280 720 30 droiddeck-boot-dark.webm dark - -Needs: pip install playwright && playwright install chromium, plus ffmpeg with libvpx. -The animation is drawn by droiddeck-boot.html (same folder); each frame gets real -motion blur (180-degree shutter, up to 48 sub-frames when things move fast). -""" import base64, os, shutil, subprocess, sys, tempfile, time from pathlib import Path from playwright.sync_api import sync_playwright diff --git a/artwork/boot-animation-source/sound.py b/artwork/boot-animation-source/sound.py index 6919dfbc9d..b0a7d6c641 100644 --- a/artwork/boot-animation-source/sound.py +++ b/artwork/boot-animation-source/sound.py @@ -1,18 +1,4 @@ #!/usr/bin/env python3 -"""DroidDeck boot animation: procedural sound design. - -Every sound is synthesized (no samples) and placed on the exact physics events the animation -engine reports (events.json, exported by events.py). Key: D major. - - legs (arch) lands on a muted D - ball lands on A, the second bounce a quieter echo - bowl lands on F# - balancing silence - jump silence - lock a soft landing in the same voice, then all those notes together as the D chord - -Usage: python3 sound.py [events.json] [out.wav] -""" import json, sys import numpy as np from scipy import signal @@ -32,7 +18,6 @@ D3, A3, D4, E4, Fs4, A4, B4, Cs5, D5, E5, Fs5, A5, D6 = [hz(n) for n in (50, 57, def tt(dur): return np.arange(int(dur * SR)) / SR def edge(x, a_ms=1.0, r_ms=4.0): - """Click-free start and end.""" na, nr = max(1, int(a_ms * SR / 1000)), max(1, int(r_ms * SR / 1000)) x[:na] *= np.sin(np.linspace(0, np.pi / 2, na)) ** 2 x[-nr:] *= np.cos(np.linspace(0, np.pi / 2, nr)) ** 2 @@ -51,7 +36,6 @@ def modal(freqs, decays, amps, dur): return y def glide(f0, f1, tau, dur): - """Sine whose pitch moves exponentially from f0 to f1.""" t = tt(dur); f = f1 + (f0 - f1) * np.exp(-t / tau) return np.sin(2 * np.pi * np.cumsum(f) / SR) @@ -69,7 +53,6 @@ def put(t0, st, gain=1.0): j = min(N, i + st.shape[1]); MIX[:, i:j] += gain * st[:, :j - i] def wood(amp, f0=520, size=1.0, thump=0.0, dur=.35): - """Hard wood / toy-block clack. thump adds body for heavy landings.""" r = [1, 1.93, 2.81, 4.13, 5.62] y = modal([f0 * k for k in r], [s * size for s in (.055, .034, .022, .014, .009)], [1, .55, .42, .26, .16], dur) y += .7 * noise_burst(dur, 1400, 7500, .0035) @@ -77,7 +60,6 @@ def wood(amp, f0=520, size=1.0, thump=0.0, dur=.35): return edge(y * amp) def bonk(amp, f): - """Hollow rubber ball on a board: round pitched body, soft click, tiny board knock.""" d = .42; t = tt(d) y = glide(f * 1.28, f, .018, d) * np.exp(-t / (.09 + .05 * amp)) y += .22 * glide(f * 2.45, f * 2.3, .02, d) * np.exp(-t / .035) @@ -87,7 +69,6 @@ def bonk(amp, f): return edge(y * amp, a_ms=.6) def bowl_ring(amp, f=A4, dur=2.4, dscale=1.0): - """Struck metal bowl: inharmonic partials, each split in two for the slow beating shimmer.""" t = tt(dur); y = np.zeros_like(t) for k, dec, a, beat in zip((1, 2.71, 5.12, 8.21), tuple(d * dscale for d in (1.25, .62, .3, .15)), (1, .45, .24, .12), (.9, 1.7, 2.6, 3.1)): for s in (-1, 1): @@ -107,7 +88,6 @@ def marimba(f, amp, damp=1.0): return edge(y * amp, a_ms=1.5, r_ms=40) def svf_whoosh(env, fc, q=.9): - """Noise through a band-pass whose centre follows fc(t): air moving past a spinning piece.""" x = rng.standard_normal(len(env)); y = np.zeros_like(x); ic1 = ic2 = 0.0 for i in range(len(x)): g = np.tan(np.pi * min(fc[i], SR * .45) / SR); k = 1 / q @@ -117,7 +97,6 @@ def svf_whoosh(env, fc, q=.9): return y * env def epiano(f, amp, dur=2.8, decay=1.5): - """FM electric piano: bright tine at the strike that mellows as the index falls.""" t = tt(dur) idx = 1.7 * np.exp(-t / .22) + .22 y = np.sin(2 * np.pi * f * t + idx * np.sin(2 * np.pi * f * t)) @@ -125,7 +104,6 @@ def epiano(f, amp, dur=2.8, decay=1.5): return edge(y * np.exp(-t / decay) * amp, a_ms=3, r_ms=60) def tock(f, amp, decay=.42, sub=0.0): - """A landing as a muted note in the chord's own FM e-piano voice: felt contact, no pitch bend.""" d = 1.5; t = tt(d) idx = 1.3 * np.exp(-t / .07) + .18 y = np.sin(2 * np.pi * f * t + idx * np.sin(2 * np.pi * f * t)) * np.exp(-t / decay) diff --git a/docs/agent-control.md b/docs/agent-control.md index 5dc16253ed..ff7d1bb493 100644 --- a/docs/agent-control.md +++ b/docs/agent-control.md @@ -26,7 +26,7 @@ and reports every run. Player controls and observations work over authorized ADB on any build: `state`, `start`, `stop`, `resume`, `wait`, `launch`, `quit`, `focus`, `input`, `ui`, `logs`, `screenshot`, `record`, `pacing`, -`displays`, `wake`, `glasses` (except `glasses raw`), and `access`. +`thermal`, `displays`, `wake`, `glasses` (except `glasses raw`), and `access`. **Setup > Diagnostics > Debugging tools** is off by default in every build, including debug builds. It enables `run`, `guest`, `cdp`, all `env` operations, `override`, `prefs`, and `glasses raw`. The @@ -39,6 +39,21 @@ Disabling the toggle clears queued and persistent agent environment settings and overrides. Disabled settings cannot apply at the next session start. Already running commands and effects already applied to a session are not undone; stop and restart that session to discard them. +Program overrides prepend their directory to the normal session PATH, including `/usr/games` +where Ubuntu installs `gamescopereaper`. An explicit `PATH=...` environment entry replaces that +default. If an old persistent PATH hides runtime tools, inspect `tools/droiddeckctl env list` +and correct only PATH with `env set --persistent`, which preserves other persistent entries. +For example, to restore the normal runtime search path: + +```sh +tools/droiddeckctl env set --persistent 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' +``` + +Retain any custom directories you still need alongside these runtime directories, then restart +the session. `env clear persistent` removes **all** persistent environment settings, not just +PATH; there is no single-entry clear operation. Before clearing that scope, record any other +entries you want to keep and reapply them afterward. + Authorized command execution runs inside the runtime containing Steam's saved login. CDP evaluates JavaScript in the authenticated Steam client, and preferences can contain private values. These capabilities remain unrestricted when enabled: the toggle is an explicit opt-in, not credential @@ -125,6 +140,8 @@ tools/droiddeckctl screenshot ./screen.png --display 4 tools/droiddeckctl xr-frame ./xr-capture tools/droiddeckctl record ./clip.mp4 --seconds 8 --display 0 tools/droiddeckctl pacing --seconds 30 +tools/droiddeckctl thermal +tools/droiddeckctl wait cool --below 38 --timeout 900 tools/droiddeckctl displays tools/droiddeckctl wake @@ -162,6 +179,11 @@ the present-to-present histogram and the share of intervals off the usual cadenc counter counts frames handed over, not frames shown, so it can read 60 while one frame in four stays on screen for two refreshes. +`thermal` reports the battery temperature (`dumpsys battery`), the thermal status +(`dumpsys thermalservice`, 0 NONE to 6 SHUTDOWN) and each CPU policy's `scaling_max_freq` against +its `cpuinfo_max_freq`, with `capped` when the first is lower. `wait cool --below <°C>` polls it +every 10 s until the battery is under that temperature, so runs being compared start equally cool. + `input` needs a session that has drawn its first frame. Pad input goes through the session screen's virtual pad, the same one the on-screen controls drive, so games that ignore touch still respond. `launch`, `quit` and `cdp` need a Steam session; `focus` and `wait focused` need gamescope (every diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index ba435af2c8..fafc802f9d 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -52,6 +52,23 @@ environment entries and is intentionally narrower than **Reset game profile**. Values are literal strings, with no shell expansion; quotes are only needed when the consuming program expects them. +## Saved compatibility mappings + +The file-backed `steam-compatibility` writer applies planned changes in a batch, +rather than searching and copying the mapping for each game. This covers retired +DroidDeck-Proton replacements, default/tool changes and the x86-64 client's Proton +repointing. It does not change the planner, manual choices, native/FEX routing, +locking or atomic file publication. Unchanged files are still not rewritten. + +Existing entry fields and duplicate entries are preserved, with the same first-match +updates and reverse insertion order as the single-game writer. Single changes keep +that writer's original path. This reduces bulk configuration work, not steady-state +game rendering cost; large-library timings depend on the device and the number of +entries actually changed. + +Run the batch/reference and work-budget regressions with +`python3 -m unittest discover -s tools/tests -p test_steam_compat_mapping.py`. + ## Game debug logs Under **Setup > Diagnostics**, enable **Session logs** and **Game debug logs** @@ -113,6 +130,13 @@ same WSI layer, and with eight images and no frame limit it drew flat out (about 240 frames a second at 120 Hz) and heated the device. Values set in the launch options or the environment editor are kept. +DOOM (2016) is the exception (`DOOMx64vk.exe` beside the launched program, which +is `DOOMx64.exe` for a GOG install). It asks for exactly two images and stops with +`FATAL ERROR: getSwapchainImagesKHR failed with error (VK_SUCCESS)` when it gets +more, so its fix removes both variables, also from its launch options, and sets +`vk_x11_strict_image_count=true`, the option Mesa's driconf gives the game. A +per-game value in the environment editor still wins. + ## Defaults and available suggestions The initial configuration enables Mesa shader caching with diff --git a/docs/development/gamejolt-store.md b/docs/development/gamejolt-store.md new file mode 100644 index 0000000000..ae8ca0f456 --- /dev/null +++ b/docs/development/gamejolt-store.md @@ -0,0 +1,66 @@ +# Game Jolt store + +The Game Jolt Store tab mirrors the itch.io one: browse, search, game page, build picker, installs, library, collections and updates. + +## Sign-in + +Game Jolt shows the normal sign-in card until an account is signed in. Signing in opens +`StoreLoginActivity` on `https://gamejolt.com/login` (`GameJoltLogin`). The flow is not a token redirect: +Game Jolt is a single-page site, so `StoreLoginActivity.Client.doUpdateVisitedHistory` also reports +navigations, and any gamejolt.com page outside the sign-in, sign-up and legal paths counts as signed in. +`finish` reads the WebView cookies, asks `/web/search/games?q=a` for the top-level `user`, and stores +the cookie header and the user through `GameJoltAuth` (encrypted, `StoreAccounts`). The log names the +cookies and the user keys, never their values. + +## Data + +`GameJoltApi` talks to `https://gamejolt.com/site-api/web/...` with the stored cookies. Games come back as +`{payload, user}`; `GameJoltCatalog` turns a game into a `CatalogItem` (paid only when `sellable.type` is +`paid`). + +Browse queries (`GameJoltBrowse.queryString`): `section=` is always sent first (featured, hot, best, new). +Game Jolt answers 404 to any browse request without it, even an empty one. The rest are `tag=`, `f_price=`, +and `f_os[]`, `f_browser[]`, `f_maturity[]`, `f_status[]`, `f_partners[]`, `page=`. Every page logs its query, +status and game count. The filters are drop-down menus (`BrowseDropdown`, shared with the itch bar). Devlog games have no playable +copy, so the status filter only offers complete and early access, and a browse always asks for those two. With mature +content off, `adult` is stripped from the query, including a stored one. + +## Prices + +`GameJoltPricing.of` reads `sellable.pricings[]` (amounts in cents). The promotional entry is the current price +and the regular entry the original, only when the original is higher; the percent uses integer math. USD (or no +currency) formats as `$12.34`, another currency as `12.34 EUR`. `CatalogItem` carries `finalPrice`, +`originalPrice` and `discountPercent`, so tiles and the game page show prices and sale badges. + +## Library and collections + +`GameJoltLibrary.sync` fetches `/web/library/games/owned/@<user>` (paged, at most every ten minutes, forced by +the refresh action) and merges the games into the store library as owned. `GameJoltCollections` lists the +read-only collections: followed games (`/web/library/games/followed/@<user>`) and the account's playlists +(`/web/library/games/playlist/<id>`). The Library page shows them through the same `CollectionsButton` as itch. +Ownership comes from `sellables[0].is_owned`; `packages[0].is_game_owner` is not reliable. Library chips list a store when it has games in +the list; a signed-in Itch.io or Game Jolt account keeps its chip, in store order, so its collections stay reachable. + +## Builds and installs + +`GameJoltBuilds.parse` reads the overview payload, keeps the newest release of each package and marks +Windows builds installable. The picker (`GameJoltBuildPicker`) installs Windows builds of free games and of paid games the account owns; +Linux builds say "Not supported yet" and everything else, including paid games not owned, opens the Game Jolt page. +`GameJoltInstaller` asks `builds/get-download-url/<id>` for a signed link on every attempt, resumes with +`Range`, unpacks through `StoreArchiveUnpacker` (shared with itch) and picks the launch option or an exe. +An update downloads again and merges through `ItchStaging`, like itch. + +## Updates + +`GameJoltUpdates` works like `ItchUpdates` (see `itch-updates.md`). The install record keeps the release +`published_on` as `installVersion` and `gameId`, `buildId` and `packageId` in `extra`. `evaluate` compares them +with the current builds: a newer release of the same package is an update; if the package is gone, the first +installable Windows build is offered as a replaced build. The automatic check runs when the Game Jolt Library +source opens, at most every six hours, one game per second. A Check for updates button on an installed game's page +checks that game only. Updates stage through `ItchStaging` and the safe folder. Uninstalling or finishing an +install clears the record. Install folders use `Store.folder`, so the Itch.io display name never moves them. + +## Controller + +The menus, chips and buttons are the shared components (`MenuItem`, `AnchoredMenu`, `ValueChip`, `BrowseChip`, +`IconAction`) that already take focus and confirm from a controller. The first menu entry takes initial focus. diff --git a/docs/development/steam-game-imports.md b/docs/development/steam-game-imports.md index 78ae2cc110..04065e3a55 100644 --- a/docs/development/steam-game-imports.md +++ b/docs/development/steam-game-imports.md @@ -7,7 +7,9 @@ importer as Added Games. Existing Steam manifests are preserved. `droiddeck-steam-games watch` runs beside the client. It identifies a game by an existing manifest's install directory, a `steam_appid.txt` beside the game or selected executable, or a unique normalized title from Steam's store search with an explicit -country. Matching also accepts the terminal Windows Edition and INTERGRADE suffixes; +country. A `steam_appid.txt` naming 480 (Spacewar, the Steamworks SDK sample that Steam +emulators and multiplayer fixes use in place of the game) identifies nothing; the +launcher's artwork matching ignores it too. Matching also accepts the terminal Windows Edition and INTERGRADE suffixes; multiple matches still remain unresolved. Artwork's fuzzy matching is deliberately not used for identity. Ambiguous or unresolved titles remain non-Steam games. @@ -32,7 +34,8 @@ internal Steam library and writes an installed manifest with `Universe=1` and `StateFlags=4`. Steam ignores manifests without the universe field. A manifest without installed depots makes Steam verify every file, so the importer carries the build another client recorded: WinNative's `.winnative-steam/steamapps` manifest beside the game folder, -or a completed download's `.DepotDownloader/depot.config` depot manifest IDs. Steam then +or a completed download's depot manifest IDs from `.DepotDownloader/depot.config` or, when +that file is gone, the `<depot>_<gid>.manifest` names in `.DepotDownloader/completed`. Steam then only downloads what changed since that build. Bare manifests from earlier imports are upgraded while Steam has not touched them. Without either record Steam still verifies. WinNative's manifest also identifies the folder without a store lookup. Steam updates and uninstall @@ -42,6 +45,13 @@ the earlier importer are migrated, with the matching source symlink still presen registration fails, the game remains a shortcut. Once Steam takes over an install, manage it in Steam; forgetting an Added Games folder only removes its shortcuts. +An import is undone (its symlink and manifest, never the folder) when the folder was +imported as Spacewar, or when a snapshot of the folder's current files names another app. +The folder is then imported as that app if the account owns it, else it is a shortcut +again. A failed title lookup undoes nothing. The launcher likewise drops artwork it +fetched for the app the files named before and fetches it again; pictures the user chose +are kept. + The account's `.droiddeck-routes.json` maps shortcut IDs to real Steam app IDs so the Android launcher uses the same title and Proton prefix as Steam. Other accounts do not inherit those routes. Managed shortcuts are replaced; user-created shortcuts and diff --git a/docs/development/stores.md b/docs/development/stores.md index 1209b7c478..5d11e48b65 100644 --- a/docs/development/stores.md +++ b/docs/development/stores.md @@ -233,6 +233,30 @@ picker. Its launcher sets five FuelPump variables frozen at install time: `FUEL_ `AMAZON_GAMES_FUEL_DISPLAY_NAME` (the account name, `Player` without one). No Amazon Games SDK files are deployed into the prefix and `fuel.json` `PostInstall` steps are not run. +GOG's registry data reaches the prefix before Proton starts: a `goggame-<id>.script` install action +with `setRegistry` becomes a `.reg` import through the game's own Proton (`reg.exe import /reg:32`), +once per script revision - `.droiddeck-gog-registry` in the prefix holds the import's hash - and a +failed import is retried on the next launch. GOG completes some installs by running a support +installer from the game folder (the script's `Execute` action); under ARM64 FEX that 32-bit +self-extractor stops at "Path not found", so the values it installs are applied from +`GOG_INSTALL_REGISTRY` in `droiddeck-store-launch` instead: The Witcher: Enhanced Edition's +`HKLM\Software\CD Projekt Red\The Witcher` block and its text/voice languages (#694), without which +`witcher.exe` exits during startup. The language comes from the installed product's +`goggame-<id>.info`, and a script's own `setRegistry` entries always win over the built-in table. + +A GOG game's exe comes from its own manifest first: `goggame-<id>.info`'s play task in category +`game` (`isPrimary` first), or a primary `launcher` task for launcher games, whose `path` stays +inside the folder; any other `goggame-*.info` in the folder supplies the task only when the +product's own has none. The task's `workingDir` becomes the shortcut's Start In, and the install root +when the task declares none - GOG's own default, and what a game in a subfolder such as +`System/witcher.exe` needs to find its `Data` folder. Else the product's `temp_executable`, else a +score over the folder's `.exe` files - a word of the game's title in the name first (Blood Omen's +`kain.exe` over its `dxconfig.exe`), config and tool names (`config`, `settings`, `launcher`, +`editor`, `crashreport`, …) last, shallower and bigger ahead on a tie. GOG's `galaxy_*.exe` support +installer is never the game, whatever the manifest or the temp executable says: The Witcher ships it +beside `launcher.exe` and its own `temp_executable` names it, and starting it runs the same 32-bit +installer that fails under ARM64 with "Path not found" (issue #694). + A game's web links reach Android: `droiddeck-store-launch` sets the prefix's `HKCU\Software\Wine\WineBrowser` `Browsers` to `/usr/local/bin/droiddeck-open-url`, which is also `xdg-open` first on the game's PATH, and hands http(s) addresses to the app, which opens them in diff --git a/docs/development/unified-input-proposal.md b/docs/development/unified-input-proposal.md index d7094fadc1..ac9390c326 100644 --- a/docs/development/unified-input-proposal.md +++ b/docs/development/unified-input-proposal.md @@ -23,7 +23,9 @@ should not dictate which actions it can perform. The model separates three concerns: -- **Source role:** physical, primary screen or secondary screen. +- **Source role:** physical controller, game overlay (primary) or auxiliary panel + (secondary). Swapping the game and auxiliary panel between displays preserves + the panel's role and bindings. - **Profile:** the actions assigned to controls in each role. Game and Desktop are the two editable built-in profiles. Auto selects by session mode; explicit selection supports a game running inside a desktop session. @@ -111,6 +113,13 @@ wholesale. Upstream subsequently merged #1202; the October 30 integration retain its global physical shortcuts, saved assignments and configuration UI alongside the profile bindings. +The November 4 integration reuses upstream's common bottom-screen bar, extracted +trackpad/terminal panels and screen-swap presentation. Custom controls coexist +with the dashboard and KDE desktop panels. Routed on-screen stick updates retain +upstream's throttled visual redraws without deferring pad publication. Upstream +hardware-key translation and mouse capture use the existing output ownership and +release capture while the input-profile editor is open. + Explicit captured bindings in the active profile take precedence over a global physical shortcut for the same key. Otherwise the global shortcut precedes the default Back/QAM handling and logical controller routing. A consumed shortcut diff --git a/docs/development/unified-input-validation.md b/docs/development/unified-input-validation.md index 925511bc1c..8417218821 100644 --- a/docs/development/unified-input-validation.md +++ b/docs/development/unified-input-validation.md @@ -216,6 +216,37 @@ This run compiles Android Java/Kotlin and resources. A new APK build, Thor test and latency measurement were not performed for this merge; the full release build remains an upstream CI check. +### Upstream PC input and bottom-screen integration (2026-11-04 UTC) + +Merged upstream `f0052415` without rewriting the published branch. The merge +retains the common bottom-screen bar, dashboard, KDE desktop panel, game-screen +swap, hardware mouse/keyboard fixes and on-screen stick redraw optimization. +Custom controls use the same bar and preserve their secondary-source bindings +when the game and panel swap displays. Pointer handoff now lives in upstream's +shared `SessionTrackpadView`, used in either display arrangement. + +Physical/IME key translation reuses `GuestKeys`, including keyboard Escape scan +codes and the Desktop right-Ctrl alias, while preserving shared key ownership. +The input-profile editor releases upstream's hardware mouse capture. Routed +on-screen stick movement uses the same redraw throttling as the native overlay; +pad publication remains synchronous, and mapped cursor frame updates keep their +existing cadence mechanism. + +The pointer-handoff regression now exercises the extracted trackpad view. Menu +tests cover the custom panel alongside upstream's panel choices. A new ownership +regression checks that releasing a hardware right-Ctrl alias cannot release Ctrl +still held by the active profile. Panel teardown tests now use `ComponentActivity` +to supply the lifecycle required by upstream's Compose bar. + +The complete `:app:testDebugUnitTest` run passes **3,281 tests across 464 suites, +zero failures/errors/skips**, using Java 17, NDK `28.2.13676358` and +`-PskipRust=true`. Upstream's pinned MaliBridge submodule is initialized and its +required Android server build also succeeds. The PR diff passes +`git diff --check origin/main`. + +No new APK installation, Thor regression pass or latency measurement was performed +for this merge. The earlier device measurements do not validate this exact tree. + ## Manual AYN Thor results The user performed the following checks in the installed candidate. The desktop diff --git a/docs/images/droiddeck-hud-v25-terraria.png b/docs/images/droiddeck-hud-v25-terraria.png new file mode 100644 index 0000000000..2739bf5902 Binary files /dev/null and b/docs/images/droiddeck-hud-v25-terraria.png differ diff --git a/docs/media/steam-to-desktop.gif b/docs/media/steam-to-desktop.gif new file mode 100644 index 0000000000..f190e0cad3 Binary files /dev/null and b/docs/media/steam-to-desktop.gif differ diff --git a/docs/openmali/README.md b/docs/openmali/README.md new file mode 100644 index 0000000000..0760cf2ec9 --- /dev/null +++ b/docs/openmali/README.md @@ -0,0 +1,244 @@ +# openMali 工作区记录 + +> 本文件记录 2026-10-31 ~ 2026-11-01 在本机与小米平板上的 MaliBridge + DroidDeck 0.6.7 合并、构建、调试和性能测试结果。 +> 这是本地工程记录,不是上游发布文档。未特别说明的 APK 均为 testkey 签名。 + +## 1. 目标与结论 + +- 目标:把 MaliBridge v0.5.4.2 的 Mali GPU 支持合并进 DroidDeck 0.6.7 主线,构建可安装 APK,并在平板上进入桌面、跑通 Steam 和性能测试。 +- 已做到: + - 0.6.7 + MaliBridge v0.5.4.2 的合并包可安装。 + - Ubuntu rc4 运行时 + 内置最新 proot + KWin Zink/Mali 桥接,成功进入 KDE 桌面。 + - Steam 客户端下载/更新 100% 完成,进入 Steam 大屏幕登录页(二维码/账号密码)。 + - 完成 CPU、GPU、IO、内存、温度基线测试。 +- 关键结论:Mali 桥接本身没有成为瓶颈;真正的问题集中在 **运行时 DNS、proot 与 KWin 渲染栈**。当前 rc4 + packaged proot + render-node 是已验证可用的组合。 + +## 2. 设备与环境 + +- 设备:Xiaomi M367FC,SoC xring_o3_asic,GPU Mali-G2-Ultra-NX MC16,Android 17,内核 6.18.21。 +- CPU:10 核;内存 15.7 GB;存储 229 GB;屏幕 3408x2272;120 Hz。 +- Mali 驱动:ARM proprietary,Vulkan 1.4.345;桥接暴露 1.4.341。 +- 新 App:com.droiddeck.launcher,DroidDeck 0.6.7,versionCode 25(0.6.7-dnsfix-v25),testkey。 +- 旧 App:com.droiddeck.launcher.mali,DroidDeck-MaliBridge v0.5.4.2,versionCode 5042;保留用于对比,桌面可用。 + +## 3. 关键路径 + +- 新工程:/home/g/openMali/DroidDeck +- MaliBridge 子模块:/home/g/openMali/DroidDeck/external/MaliBridge,v0.5.4.2,提交 95a1e60 +- 合并基线:main 69ffc096,tag mali-0.6.7-v0.5.4.2 +- 旧版源码:/home/g/openMali/reference/mali0542-src +- 旧版 APK:/home/g/openMali/reference/DroidDeck-MaliBridge-v0.5.4.2.apk +- 最终 APK:/home/g/openMali/output/DroidDeck-0.6.7-Mali-rc4.apk +- 基准/参考工具:/home/g/openMali/reference/vkbridge-bench,/home/g/openMali/reference/oldapk + +## 4. 已验证的修改 + +### 4.1 运行时与 proot + +- 运行时 catalog 从 Debian linuxfs.json(r9) 切到 Ubuntu: + - app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java + - CATALOG_URL = .../linuxfs-ubuntu.json +- 实际安装:ubuntu-r1-rc4;运行时约 3 GB;桌面栈另下载约 898 MB。 +- APK 不再排除 proot,改为内置最新官方 pack: + - pack-proot-172bb48b00150b42 + - 压缩包 SHA-256:172bb48b00150b4292ba171089abecdf7243c06edddd68bf42dddb8c5bb24e4e + - app/src/main/jniLibs/arm64-v8a/libproot.so(246,512 B) + - app/src/main/jniLibs/arm64-v8a/libproot-loader.so(18,136 B) + - app/build.gradle 移除 libproot.so / libproot-loader.so 的 excludes +- LinuxRuntime: + - 优先使用 nativeLibraryDir 中的 packaged proot/loader。 + - 新增 PROOT_PACKAGED 来源;isInstalled 接受 packaged proot。 + - prootSource 显示 packaged;ProotFastPath 只允许 PROOT_PACK,因此当前 fast path 关闭。 +- 旧 r9 + 旧 session/helper/host 的 0.6.7 组合已尝试但放弃: + - KWin 曾能打开 3408x2272 窗口,但新 host 不显示、会话不稳定。 + - 该路线不作为最终方案。 + +### 4.2 proot fast path 实验 + +- 临时允许 packaged proot 走 fast path,实测反而更慢: + - fast path off(当前):sha256 256 MB 207 ms,gzip -1 405 ms,read 3.9 GB/s。 + - fast path on:sha256 259 ms,gzip 461 ms,read 3.8 GB/s。 +- 结论:该 pack 的 fast path 对 CPU/IO 是负优化,已恢复默认关闭;源码 ProotFastPath 也恢复为只允许 PROOT_PACK。 + +### 4.3 桌面 / KWin / Mali 桥接 + +- tools/linuxfs/desktop/droiddeck-desktop 的 KWin OpenGL 分支: + - 设置 KWIN_COMPOSE=O2、MESA_LOADER_DRIVER_OVERRIDE=zink、GALLIUM_DRIVER=zink、LIBGL_KOPPER_DRI2=true。 + - KWIN_RENDER_NODES 自动选择 /dev/dri/renderD0、/dev/dri/renderD307 或任意 /dev/dri/renderD*。 + - 在平板上实际使用 /dev/dri/renderD307(由 /dev/mali0 绑定)。 +- /usr/share/droiddeck/kwin-compositor 为 opengl。 +- 效果: + - DroidDeckWayland 日志出现 [window] opened KDE Wayland Compositor 1280x720。 + - host 统计出现 GPU frames,不再出现 kwin software fallback / black picture。 + - KDE 桌面、任务栏、应用菜单正常。 +- 分辨率: + - displayResolution.lxqt 设为 720p(1280x720)。 + - 720p 与 900p 的 vkgears 都是约 119.8 FPS,说明 GPU 已到 120 Hz 上限;720p 只减少缩放/带宽。 +- Steam 大屏幕模式: + - app 的“游玩 Steam”使用 gamescope/Big Picture。 + - DroidDeckWayland 日志:Steam 大屏幕模式 1280x720,86.4 fps,875 GPU frames。 + - 可用 Steam 登录页。 + +### 4.4 UI / 桥接文案 + +- GpuInfo 恢复 bridge-aware supportText(bridge),新增 gpuinfo_bridge / gpuinfo_bridge_off 字符串。 +- DeviceInfo / DeviceReport / DriverMenus 使用当前 Mali 桥接状态显示支持文案。 +- LinuxRuntime 恢复 bridgeStandIn 的 DRM render node 回退逻辑。 +- 注意:Setup 顶部仍可能显示“GPU 不受支持”的旧标签(GpuDriversState 的 unsupported 标志),但下方已显示“实验性 Vulkan 桥接已开启”,桥接实际工作正常。 + +## 5. DNS 与 Steam + +### 5.1 根因 + +- guest /etc/resolv.conf 被写成: + - 1.1.1.1 + - 8.8.8.8 + - 2001:4860:4860::8888 +- 当前网络下这些公共 DNS 解析超时: + - curl: (28) Resolving timed out after 10001 milliseconds +- 设备实际 WiFi DNS 是 192.168.1.1;guest 改用该 DNS 后: + - getent 能解析 client-update.steamstatic.com。 + - curl -I https://client-update.steamstatic.com/steam_client_linuxarm64 返回 200。 +- 结论:Steam 下载失败是 DNS,不是 Steam/GPU/代理。 + +### 5.2 已修复:App 自动获取本地 DNS + +- 修改 app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt: + - 新增 localDnsServers(),用 ConnectivityManager.allNetworks 遍历 WiFi/Ethernet 网络(排除 VPN)。 + - 收集这些网络的 DNS,并把默认路由 gateway 作为本地 DNS 兜底。 + - 私有地址(192.168/10.x)和 IPv4 优先。 + - writeResolver 的顺序:当前 active network DNS + localDnsServers() + 公共 DNS 兜底。 +- 验证(2026-11-01,dnsfix APK): + - logcat:LinuxNetworkLink: resolver: 192.168.1.1 8.8.8.8 1.1.1.1 2001:4860:4860::8888 + - guest /etc/resolv.conf 第一行是 nameserver 192.168.1.1。 + - getent hosts store.steampowered.com 正常;curl -I https://store.steampowered.com 返回 200。 + - 旧 guest DNS 守护 /root/.config/plasma-workspace/env/01-dns-guard.sh 已删除;没有守护进程仍正常。 +- 说明:localDnsServers() 只取 WiFi/Ethernet 的 DNS,网关排在各 DNS 之后;active network 是 VPN 时不追加本地 DNS,只用 VPN 自己的 DNS。 + +### 5.3 Steam 客户端修复 + +- Steam 主程序下载后权限为 666: + - /root/.local/share/Steam/steamrtarm64/steam + - 需 chmod +x;更新后变为 700 也可执行。 +- 需要数据目录软链接: + - /root/.steam/steam -> /root/.local/share/Steam + - /root/.steam/root -> /root/.local/share/Steam +- stale pid: + - /root/.steam/steam.pid 可能残留已死 PID,导致 “Steam is already running”;启动前删除。 +- 不要在 Konsole 里用桌面 UI 方式启动 steam: + - 会走 Xwayland/CEF,遇到 XRRGetOutputInfo() is not available / 无窗口。 + - 应从 DroidDeck 的“游玩 Steam”启动 Big Picture/gamescope。 +- 已验证(2026-11-01): + - Steam 客户端更新 575,927 KB 到 100%。 + - Big Picture 已登录,库中显示 Shadow of the Tomb Raider 等游戏。 + - 32 位 steamrtarm32/steam-runtime-launcher-service 缺失的日志仍会出现,但 Big Picture 可用;游戏启动尚未验证。 + +## 6. 性能测试 + +### 6.1 存储 IO + +| 路径 | 写 | 读 | +|---|---:|---:| +| Android /data/local/tmp | 1.0 GB/s | 4.7 GB/s | +| Android /sdcard | 0.94 GB/s | 4.3 GB/s | +| Guest proot(fast path off) | 1.2 GB/s | 3.9 GB/s | + +Guest 读取比 host 低约 17%,是 proot 路径开销;写入不慢。 + +### 6.2 CPU + +| 项目 | Host | Guest | +|---|---:|---:| +| sha256 256 MB 单线程 | 267 ms | 207 ms | +| sha256 4x256 MB 4 线程 | 256 ms(约 4 GB/s 聚合) | 216 ms(约 4.7 GB/s 聚合) | +| gzip -1 256 MB | 307 ms | 405 ms(+32%) | + +注意:host/guest 的 sha256 实现不同,不能直接比较;gzip 更接近,proot 下约慢 30%。 + +### 6.3 GPU + +- vkgears:119.86 FPS(600 帧/5 秒),720p 与 900p 基本一致,已到 120 Hz 上限。 +- 早期桥接基准:128 MiB copy 20.5 GB/s;空 submit 约 70 µs;4 KiB copy+submit 约 285 µs。 +- Steam Big Picture:1280x720,约 86.4 fps,875 GPU frames。 +- vkcube 在纹理路径触发断言(demo_prepare_texture_image),属于桥接兼容性问题,不是性能问题。 + +### 6.4 温度 / 内存 + +- CPU 29–33 °C,GPU 31–46.5 °C,Thermal Status 0,无节流。 +- 电池约 28 °C,64%。 +- 内存:15.7 GB 总,约 8.3 GB 已用,7.1 GB 可用,swap 约 2.6 GB。 +- 没有内存告急,但 swap 偏高;游戏前可重启/关闭后台。 + +### 6.5 v25 复测(2026-11-01 18:32) + +环境:DroidDeck v25;GPU/IO 在 lxqt 桌面 1920x1080@120 测,CPU 分别测桌面和 Steam 会话;游戏 FPS 取自 Terraria 世界内 HUD。Thermal Status 0,CPU 32.8 °C,GPU max 34.8–46.5 °C,电池 31.8 °C / 92%。 + +| 项目 | v25 实测 | 说明 | +|---|---:|---| +| sha256 256 MB 单线程 | 桌面 283–322 ms;Steam 219–241 ms | Steam 会话约 230 ms,接近此前 207 ms | +| gzip -1 256 MB | 桌面 514–534 ms;Steam 355–357 ms | Steam 会话约 356 ms;此前约 405 ms | +| sha256 4×256 MB | Steam 222–269 ms;桌面 262–275 ms | 4 线程 | +| Host /data/local/tmp O_DIRECT | 写 1060 / 读 1450 MB/s | 绕过 page cache | +| Guest /root ext4 | 写 876 / 读 2337 MB/s | fdatasync;O_DIRECT 写 1270 MB/s | +| Guest /root/Storage | 写 920 / 读 3029 MB/s | 读受 page cache 影响 | +| vkgears 1280x720 | 115.8 FPS,p50 111.1,p99 25 ms | 4 秒采样 | +| vkgears 1920x1080 | 113.2 FPS,p99 31 ms | 2 秒采样 | +| Terraria 1280x720@120 | 59.9 FPS,AVG 49.3,1% 22.7 | HUD;CPU 36% / 2668 MHz / 33 °C,GPU 1% | +| 内存 | 总 15.7 GB,可用 8.7 GB | Guest 已用 6.7 GB,swap 2.2 GB | + +结论:GPU 与之前 119.86 FPS 基本一致(低约 3–4%),Terraria 稳定 60 FPS;IO 正常;测试期间无热节流。CPU 在 Steam 会话约 230 ms / 356 ms,接近或优于此前 207 ms / 405 ms;桌面会话因升频状态较低,v25 无 CPU 回归。 + +## 7. 构建与安装 + +- 构建: + - cd /home/g/openMali/DroidDeck + - ./gradlew :app:assembleRelease -PndkVersion=27.3.13750724 +- 修改 runtime inputs 后先记录: + - python3 tools/release/runtime_inputs.py record +- APK(DNS 自动修复 + GPU 状态文案 + HUD/CPU 温度 + mscoree 兜底,当前安装): + - /home/g/openMali/output/DroidDeck-0.6.7-Mali-rc4-dnsfix-v25.apk + - 76 MB;versionCode 25;versionName 0.6.7-dnsfix-v25 + - SHA-256 9808a8ab17f2d9a39e0b3abc9a05c2ee1c07ec7f4ac7cfa77866b2229fb6eb82 + - 上一版保留:v24(SHA-256 56b0ab03c0120c2a7a6ad0e4ed8d30a748021d7fe9e99a13b60f62a41e13b5e0)、v23(SHA-256 b0fadc5c...)、v22(SHA-256 69cd4f5f...)、v21(SHA-256 508294a6...)、v20(SHA-256 afd1ce12...)、v19(SHA-256 f63f4eae...)、v18(SHA-256 cc469703...)、v16 DroidDeck-0.6.7-Mali-rc4-dnsfix.apk(SHA-256 6c5f8c1f...)和 DroidDeck-0.6.7-Mali-rc4.apk(无 App 内 DNS 修复,SHA-256 c58fcc58...)。 + - testkey 签名;官方 release 私钥不在本机。 +- MIUI 安装: + - 对已安装的旧包,adb push + adb shell pm install -r 可更新。 + - 对全新安装,MIUI 会报 INSTALL_FAILED_USER_RESTRICTED;需用文件管理器打开 APK,走 PackageInstaller,并在“是否允许 Shell 安装应用”点允许。 + - 官方 0.6.9 是 release key,testkey 包不能就地升级/降级;必须完整卸载,App 数据会被清空。 + +## 8. 当前安装状态 + +- com.droiddeck.launcher:0.6.7-dnsfix-v25(versionCode 25,testkey),2026-11-01 18:25 就地更新安装,App 数据保留。 +- GPU 状态:Setup 概览显示“GPU 通过 Mali 桥接”,绿色通过;不再显示“GPU 不受支持”。实现为 FrontEndSetup 的 gpuOk 包含 s.vkBridge,并新增 setup_gpu_bridged 文案。 +- 修复“清数据重启后 GPU 菜单消失”:showChecks 默认值从 false 改为 s.vkBridge;桥接开启时详情默认展开,GPU 行直接可见。已在 pm clear 后重新启动验证。 +- HUD:XRing/Mali 的 GPU load/clock/temp/thermal sysfs 对普通 App 拒绝访问,日志为 thermal zones 0、gpu load none、kgsl gpubusy refused。v21 在无数据时隐藏 GPU 统计行、VRAM=0 时隐藏 VRAM,只保留 GPU 型号;真正 GPU% / 温度 / 共享显存需要 root 或厂商遥测。 +- HUD 分辨率/卡死:v22 的 RES 不再用 Android displayMetrics 兜底,改用会话逻辑分辨率;桌面模式隐藏游戏 HUD,Steam/游戏模式显示。实测 Steam 下 HUD 为 RES 1280x720 @ 120Hz、FPS 42.8 / AVG 53.0。 +- CPU 温度/频率:v23 增加 USB/adb 辅助的 CPU 温度输入(/sdcard/DroidDeck/cpu-temp,由开发者在主机侧每 2 秒写入 cpu_therm,仓库不附带该脚本);v24 把 HUD 的 CPU 行顺序改为“占用 → 频率 → 温度”,Full/Mega/Tiles 三种布局都生效。 +- 安装方式:官方 0.6.9(release key)与 testkey 不兼容,完整卸载 0.6.9 后通过 PackageInstaller 安装;App 数据已被清空,当前是全新状态(首次启动显示配置页)。 +- DNS 自动修复已在 APK 内;运行时 ubuntu-r1-rc4、Mali 桥接、proot、桌面需要重新下载/配置;此前 Steam Big Picture 和 1280x720 KWin 已验证,但当前新数据需重新登录。 +- com.droiddeck.launcher.mali:旧 0.5.4.2 仍安装,桌面可用,用于对比。 +- 注意:Steam chmod/软链接/pid 清理仍是 guest 运行时修改;清除 App 数据或重装运行时会丢失。 +- Terraria 1.4.5.8 启动修复(2026-11-01):`dotnet40` 组件把 `WINEDLLOVERRIDES` 设为 `mscoree=n`,但该组件没有原生 `mscoree.dll`,Wine 报 `mscoree.dll not found` 后直接退出。v25 的 `droiddeck-wincomponents` 对 `mscoree=n` 自动追加 builtin 回退(`mscoree=n,b`);`dotnet40` 仍启用时,Terraria 已稳定进入世界并显示 HUD。 + +## 9. 已知问题 / 下一步 + +1. DNS 自动修复已完成(见 5.2);仍需在不同 WiFi/无 WiFi 环境下回归,确认 localDnsServers 的回退行为。 +2. Steam 桌面 UI 在 Xwayland 下仍可能无窗口;继续使用“游玩 Steam”/Big Picture,不要用 Konsole 直接 steam。 +3. Steam 32 位组件 steamrtarm32 / steam-runtime-launcher-service 缺失;Big Picture 可用。Terraria 1.4.5.8 已进入世界,其他游戏仍待验证。 +4. vkcube 纹理断言是桥接兼容性 bug,可单独排查。 +5. 真实游戏帧率/Proton/DXVK 尚未测试;当前性能数据主要是桌面、vkgears、IO/CPU。 +6. 仍是 testkey;如需官方升级安装,需要官方 release keystore。 +7. 官方 0.6.9 与 testkey 不兼容:只能完整卸载后安装,App 数据会丢;官方 APK 备份在 /tmp/installed-069.apk(宿主)和 /sdcard/Download/DroidDeck-0.6.9.apk(平板),回滚同样要先卸载。 +8. HUD 的 Mali GPU load/temp/VRAM 受驱动 sysfs 权限限制;除非 root/厂商接口,普通 App 无法获取。v21 已移除误导性的 GPU - 和 VRAM 0.0,保留 GPU 型号。 + +## 10. 已放弃 / 不再使用 + +- r9 + 旧 session/helper/host 组合:KWin 窗口不稳定/黑屏,放弃。 +- proot fast path:实测负优化,关闭。 +- 代理强制给 Steam:本地 DNS 直连更稳定;Steam 更新器对 proxy 环境并不可靠。 + +## 截图 + +Terraria 1.4.5.8 在 DroidDeck v25 + Mali 桥接 + Wine Mono 下进入世界。HUD 的 CPU 行是“占用 → 频率 → 温度”: + +![DroidDeck v25 HUD / Terraria](../images/droiddeck-hud-v25-terraria.png) diff --git a/docs/quest.md b/docs/quest.md index 2f7da2e80c..6f69d06cd2 100644 --- a/docs/quest.md +++ b/docs/quest.md @@ -41,9 +41,18 @@ Both the Android driver wrapper and the Linux session preload use `tools/quest/kgsl_compat.c`. Successful legacy allocation/free calls are unchanged. Only `EACCES`/`EPERM` failures retry through `GPUOBJ_ALLOC`, `GPUOBJ_INFO` and `GPUOBJ_FREE`. The Android wrapper depends on the original -bundled Turnip binary. Unhandled controller ioctls forward to the next +bundled Turnip binary. Quest's SELinux policy also denies `CMDSTREAM_READTIMESTAMP_CTXTID`, which Mesa 26's Turnip +needs to wait on timeline semaphores; the adapter answers it from the last submitted timestamp +and a zero-timeout `WAITTIMESTAMP`. Unhandled controller ioctls forward to the next preload hook rather than skipping it with a raw syscall. +The Ubuntu runtime's Turnip polls timeline points with +`CMDSTREAM_READTIMESTAMP_CTXTID` and reports any failure as `VK_ERROR_UNKNOWN`, +which aborted gamescope with `vk.WaitSemaphores` result -13 on Quest. The Linux +preload (`tools/linuxfs/preload/kgslpoll.c`) answers a failed read from one +millisecond `WAITTIMESTAMP` calls over the context's submitted timestamps, and +logs refused KGSL ioctls to `session.log` as `[QuestKGSL] ioctl 0x.. refused`. + `tools/build_local.sh` and CI build the wrapper from source using the pinned Android NDK; the normal preload builds include the shared Linux adapter. Runtime input verification checks the resulting driver archive and invalidates diff --git a/docs/releases/0.6.9.md b/docs/releases/0.6.9.md new file mode 100644 index 0000000000..1b6a6c5cf5 --- /dev/null +++ b/docs/releases/0.6.9.md @@ -0,0 +1,86 @@ +# DroidDeck 0.6.9 + +<p align="center"><a href="https://discord.gg/JRGAvawjsm"><img src="https://img.shields.io/badge/Discord-Join%20the%20community-5865F2?logo=discord&logoColor=white" alt="Join the DroidDeck Discord"></a></p> + +<!-- Maintainer check: Steam, Proton downloads and the games themselves come from Valve and the stores and are not part of DroidDeck; the intro below only claims DroidDeck's own code and the packs it builds. --> + +**DroidDeck is 100% open source. No ads. No telemetry. No source withheld.** + +Since 0.6.7, **5 people** sent **60 pull requests**. 30% of the pull requests came from the community. Thank you to everyone who sent code, translations, device testing and bug reports. This is a bug fix release: most of it fixes what you reported after 0.6.7. + +Fittingly for 0.6.9, the top and bottom screens on the Pocket Duo and AYN Thor have finally stopped fighting for dominance and learned to work together. + +**0.6.9 in 30 seconds** + +- **Dual-screen handhelds** like the Retroid Pocket Duo and AYN Thor no longer show “DroidDeck isn’t responding”, no longer jump back over other apps, and keep the bottom-screen panel you picked +- **Steam stops restarting at every start** to import added games, and asks first +- **Steam’s UI runs at the full refresh rate again**, with the heat fix kept, and a session left in picture-in-picture drops to **30 fps** to save battery +- **Cutscenes play again** with DroidDeck-Proton, and the **x86-64 Steam client** starts again on the Ubuntu runtime +- **Windows components survive runtime updates**, and the **Linux runtime updates by itself** +- **Xbox games run from their own folder** again, so Doom 64 and Unity games start +- **Banking apps** open again: Android listed DroidDeck’s optional Home button accessibility service even while it was off, which some banking apps block. It never reads your screen +- New: **controller button shortcuts**, **launch options for Steam games** in DroidDeck, a **frame limit for games started without Steam**, and a **DroidDeck HUD** you can pinch to resize and dock as an FPS tab + +### Features + +- Added **controller button shortcuts**: physical buttons can open Steam, Quick Access or DroidDeck’s menus, set per controller, with a reset. Buttons you leave unassigned work as before. Find them in Setup > Controller > Button mapping. (@jmarti326, [#1202](https://github.com/Droid-Deck/DroidDeck/pull/1202)) + + <img src="media/0.6.9/controller-shortcuts.jpg" width="50%" alt="Button mapping on a Retroid Pocket Duo with the new Physical button shortcuts group: Steam menu, Open Quick Access Menu and DroidDeck menu, each set to Default"> +- Added **launch options for Steam games** to a game’s Edit screen (the pencil on its page), so you can set options such as `-dx11` without opening Steam. They are the same launch options as in Steam’s Properties: a change in either one shows in both. (@K11MCH1, [#1888](https://github.com/Droid-Deck/DroidDeck/pull/1888)) +- Added a **Frame limit** for games started without Steam, on the Display page of the session drawer: Off, 30, 40, 45, 60, 90 or 120 fps. It applies live and lasts for the session. Steam games keep Steam’s own Frame Limit. (@xXJSONDeruloXx, [#1813](https://github.com/Droid-Deck/DroidDeck/pull/1813)) +- The HUD is now **DroidDeck HUD**. **Pinch with two fingers to resize it** from 50% to 200%, and **drag it past a screen edge to dock it as a small FPS tab**. (@xXJSONDeruloXx, [#1868](https://github.com/Droid-Deck/DroidDeck/pull/1868)) +- **x86_64 Flatpak apps run through FEX**. The r2modman bundle starts and loads its list of 334 games on a RedMagic Astra 2, and Flathub installs fall back to an app’s x86_64 build when it has no ARM one. A bundle built for an architecture DroidDeck cannot run is refused with a clear message before it downloads. (@maxjivi05, [#1875](https://github.com/Droid-Deck/DroidDeck/pull/1875), [#1873](https://github.com/Droid-Deck/DroidDeck/pull/1873)) +- The **Linux runtime updates by itself** when a new one is out, never during a game or desktop session. (@maxjivi05, [#1787](https://github.com/Droid-Deck/DroidDeck/pull/1787)) +- **itch.io updates download as patches** for games with butler builds, instead of the whole game again. (@FX192, [#1829](https://github.com/Droid-Deck/DroidDeck/pull/1829)) +- The desktop’s fastfetch shows the **DroidDeck mark** as its logo. (@xXJSONDeruloXx, [#1778](https://github.com/Droid-Deck/DroidDeck/pull/1778)) + +### Improvements + +- **.NET games start faster**: they keep the FEX preset’s multiblock setting, so Stardew Valley starts in **45 s instead of 85 s** on the Retroid Pocket Duo. (@maxjivi05, [#1880](https://github.com/Droid-Deck/DroidDeck/pull/1880)) +- On low-memory devices, **Battle.net is compressed with the Steam client** while one of its games runs. Battle.net.exe alone used 345 MB on the Retroid Pocket Duo. (@maxjivi05, [#1882](https://github.com/Droid-Deck/DroidDeck/pull/1882)) +- Steam’s **Sleep after** timers start every session as Disabled, since Android decides when the device sleeps. New Steam installs start with **shader pre-caching off**. (@xXJSONDeruloXx, [#1848](https://github.com/Droid-Deck/DroidDeck/pull/1848), [#1861](https://github.com/Droid-Deck/DroidDeck/pull/1861)) +- The Library starts with **portrait covers** on new installs, and the Steam home drops its “Runtime installs on first Play” chip. Your saved layout is kept. (@xXJSONDeruloXx, [#1857](https://github.com/Droid-Deck/DroidDeck/pull/1857), [#1854](https://github.com/Droid-Deck/DroidDeck/pull/1854)) +- A **USB drive that is mounted but unreadable**, as on some Samsung phones, now explains itself and opens the All files access page, from the side rail too. (@maxjivi05, [#1872](https://github.com/Droid-Deck/DroidDeck/pull/1872)) +- **Translations:** every string added since the last pass is in all 32 languages. (@maxjivi05, [#1855](https://github.com/Droid-Deck/DroidDeck/pull/1855)) +- **Building and testing DroidDeck:** test and local builds show a faint PR, commit and title watermark, and the required-check tests match the CI gate. (@xXJSONDeruloXx, @maxjivi05, [#1863](https://github.com/Droid-Deck/DroidDeck/pull/1863), [#1864](https://github.com/Droid-Deck/DroidDeck/pull/1864), [#1866](https://github.com/Droid-Deck/DroidDeck/pull/1866), [#1874](https://github.com/Droid-Deck/DroidDeck/pull/1874)) + +### Fixed + +- Fixed **“DroidDeck isn’t responding” on dual-screen handhelds** when input reached the bottom screen or the bottom screen took focus, which stopped controller navigation and RB/LB on the Stores tab. Seen on the AYN Thor and Retroid Pocket Duo. (@maxjivi05, [#1806](https://github.com/Droid-Deck/DroidDeck/pull/1806), [#1871](https://github.com/Droid-Deck/DroidDeck/pull/1871)) +- Fixed **dual-screen handhelds** taking over other apps: DroidDeck no longer jumps back over apps opened from outside it, such as iisu, an app sent to the Primary screen stays in front, the update install prompt survives a bottom-screen tap, and the home launcher stays out of Recents. (@maxjivi05, @xXJSONDeruloXx, [#1828](https://github.com/Droid-Deck/DroidDeck/pull/1828), [#1797](https://github.com/Droid-Deck/DroidDeck/pull/1797), [#1893](https://github.com/Droid-Deck/DroidDeck/pull/1893)) +- Fixed the **bottom screen**: it keeps the panel you picked, such as Trackpad or Terminal, across games, keeps DroidDeck’s controls up while a game loads, keeps the manual second-screen option when Dual screen is Off, and the Stop button no longer wraps letter by letter on the AYN Thor. (@maxjivi05, @xXJSONDeruloXx, [#1803](https://github.com/Droid-Deck/DroidDeck/pull/1803), [#1840](https://github.com/Droid-Deck/DroidDeck/pull/1840), [#1777](https://github.com/Droid-Deck/DroidDeck/pull/1777), [#1805](https://github.com/Droid-Deck/DroidDeck/pull/1805)) +- Fixed the **AYN Odin 2, Odin 2 Mini and Odin 2 Portal** losing their side rail and Back menu: Automatic dual screen now needs a real second touchscreen. On Meta Quest the launcher opens as a landscape window. (@maxjivi05, [#1801](https://github.com/Droid-Deck/DroidDeck/pull/1801), [#1893](https://github.com/Droid-Deck/DroidDeck/pull/1893)) +- Fixed **games launched from a frontend** such as Cocoon or iisu sitting on the home screen instead of starting. (@maxjivi05, @xXJSONDeruloXx, [#1789](https://github.com/Droid-Deck/DroidDeck/pull/1789), [#1844](https://github.com/Droid-Deck/DroidDeck/pull/1844)) +- Fixed **Steam restarting within seconds of every start** to import added games, which cut off game shortcuts. DroidDeck now asks with Restart now or Later. (@maxjivi05, [#1795](https://github.com/Droid-Deck/DroidDeck/pull/1795)) +- Fixed **Steam’s UI lag and heat** since 0.6.7 while keeping it at the panel’s full refresh rate, and a session left in **picture-in-picture** now draws at 30 fps, which saved about 1 W on a RedMagic Astra 2. (@maxjivi05, [#1809](https://github.com/Droid-Deck/DroidDeck/pull/1809), [#1841](https://github.com/Droid-Deck/DroidDeck/pull/1841), [#1842](https://github.com/Droid-Deck/DroidDeck/pull/1842)) +- Fixed the **performance HUD** turning itself on: it is off by default again, and your own choice is kept. (@maxjivi05, [#1807](https://github.com/Droid-Deck/DroidDeck/pull/1807)) +- Fixed **cutscenes and in-game videos** with DroidDeck-Proton: Resident Evil Revelations no longer waits forever on a loading screen and Kingdom Hearts HD 1.5+2.5 no longer crashes at cutscenes. (@maxjivi05, [#1823](https://github.com/Droid-Deck/DroidDeck/pull/1823)) +- Fixed the **Ubuntu runtime** without the desktop installed: the x86-64 Steam client starts again and survives its first self-update, ARMSX2, melonDS and Cemu start, and Steam’s Browse buttons, smart-card and speech support and GPU info in Steam work. (@maxjivi05, [#1825](https://github.com/Droid-Deck/DroidDeck/pull/1825), [#1793](https://github.com/Droid-Deck/DroidDeck/pull/1793), [#1802](https://github.com/Droid-Deck/DroidDeck/pull/1802)) +- Fixed **Windows components** (DirectX, Visual C++, XAudio, PhysX and more) disappearing after a runtime update. Lost ones are downloaded again, missing parts of bundles are reinstalled, and a launch waits for the restore. (@maxjivi05, [#1786](https://github.com/Droid-Deck/DroidDeck/pull/1786), [#1788](https://github.com/Droid-Deck/DroidDeck/pull/1788)) +- Fixed **Xbox games** running from the drive root: Doom 64, Unity games and AI: The Somnium Files start again. (@maxjivi05, [#1804](https://github.com/Droid-Deck/DroidDeck/pull/1804)) +- Fixed **Battle.net**: games install to Android storage, microSD cards and USB SSDs without the “logging on as an administrator” error, and its windows scale to screens above 1080p instead of opening tiny. (@maxjivi05, [#1791](https://github.com/Droid-Deck/DroidDeck/pull/1791), [#1832](https://github.com/Droid-Deck/DroidDeck/pull/1832)) +- Fixed **Mortal Kombat 11** and other games with a launch-option picker being closed while the picker was open. (@maxjivi05, [#1869](https://github.com/Droid-Deck/DroidDeck/pull/1869)) +- Fixed a **three-finger tap pasting clipboard text** in touchpad mode, the default for desktop sessions and Steam’s desktop UI. It now opens the keyboard there too, as in every other touch mode. (@xXJSONDeruloXx, [#1903](https://github.com/Droid-Deck/DroidDeck/pull/1903)) +- Fixed **DirectAudio crackling** on devices where Android refuses low-latency output, such as the AYN Thor. (@maxjivi05, [#1862](https://github.com/Droid-Deck/DroidDeck/pull/1862)) +- Fixed **banking apps** such as UBS refusing to open while DroidDeck 0.6.7 was installed. Nothing was wrong with your device or your accounts. 0.6.7 added an optional **accessibility service for Home button shortcuts** (Setup > Steam integration > Home button shortcuts), which lets you hold Home for Steam Guide chords. It only listens for button presses, and it cannot see your screen or read anything in other apps. Even when you never turned it on, Android listed it as installed, and some banking apps block any app outside the Play Store that has an accessibility service able to read button presses, to be safe. DroidDeck now only lists the service while you have it turned on in Android’s Accessibility settings, so banking apps open normally. If you use Home button shortcuts, the service stays on and those banking apps will still see it, because that is how accessibility services work. (@maxjivi05, [#1824](https://github.com/Droid-Deck/DroidDeck/pull/1824)) +- Fixed **added games showing up as Spacewar**: a game whose `steam_appid.txt` says 480, as Steam emulators and multiplayer fixes write it, such as PEAK, is no longer imported into Steam as Spacewar. An earlier import is undone, your game folder is left untouched, and a game whose Steam app ID changes follows it, with its art fetched again. (@K11MCH1, [#1896](https://github.com/Droid-Deck/DroidDeck/pull/1896)) +- Fixed **folders of games on game storage**, such as Rance 01, showing as one combined game, and adding a game changing another game’s exe. (@maxjivi05, [#1810](https://github.com/Droid-Deck/DroidDeck/pull/1810), [#1822](https://github.com/Droid-Deck/DroidDeck/pull/1822)) +- Fixed **Linux games on an NTFS USB drive** closing after about 14 seconds on their first start. (@maxjivi05, [#1850](https://github.com/Droid-Deck/DroidDeck/pull/1850)) +- Fixed **itch.io games** whose download is an archive inside an archive, such as Voices of the Void. (@maxjivi05, [#1800](https://github.com/Droid-Deck/DroidDeck/pull/1800)) +- Fixed the **Steam and desktop clock** staying on GMT instead of the Android time zone, and **Teardown** dropping to 30 fps under a Steam frame limit. (@maxjivi05, [#1790](https://github.com/Droid-Deck/DroidDeck/pull/1790)) +- Fixed Steam’s **Add a Non-Steam Game > Browse** button in the desktop session when another app holds port 8080 and Decky is on. (@maxjivi05, [#1798](https://github.com/Droid-Deck/DroidDeck/pull/1798)) +- Fixed **desktop video wallpapers** racing ahead after DroidDeck comes back from the background, and the Library’s Filter, Sort, Display and Collections menus being cut off in portrait. (@maxjivi05, [#1833](https://github.com/Droid-Deck/DroidDeck/pull/1833), [#1827](https://github.com/Droid-Deck/DroidDeck/pull/1827)) + +### Community + +DroidDeck is built in the open by the people who use it. These are everyone whose code is in 0.6.9: + +| Contributor | Pull requests | +|---|---| +| @maxjivi05 | 42: dual screens, Steam restarts and refresh rate, Ubuntu runtime, Windows components, Xbox, Battle.net, Flatpak through FEX and more | +| @xXJSONDeruloXx | 14: DroidDeck HUD, frame limit without Steam, frontend launches, touchpad keyboard tap, Steam defaults, Library covers and more | +| @K11MCH1 | 2: launch options for Steam games, Spacewar imports | +| @jmarti326 | [#1202](https://github.com/Droid-Deck/DroidDeck/pull/1202): controller button shortcuts | +| @FX192 | [#1829](https://github.com/Droid-Deck/DroidDeck/pull/1829): itch.io patch updates | + +[Full changelog](https://github.com/Droid-Deck/DroidDeck/compare/0.6.7...0.6.9) diff --git a/docs/releases/media/0.6.9/controller-shortcuts.jpg b/docs/releases/media/0.6.9/controller-shortcuts.jpg new file mode 100644 index 0000000000..1916d51f9d Binary files /dev/null and b/docs/releases/media/0.6.9/controller-shortcuts.jpg differ diff --git a/docs/smart-glasses-support.md b/docs/smart-glasses-support.md index 19f59c2009..0446bdb34e 100644 --- a/docs/smart-glasses-support.md +++ b/docs/smart-glasses-support.md @@ -50,6 +50,10 @@ DroidDeck saves separate **2D resolution**, **3D resolution**, and **VR resoluti In **Automatic** picture mode, ordinary flat content is duplicated in full into both eyes on an SBS display. **Virtual screen** adds a configurable screen plane and tracking. **Side-by-side game** is for content that already contains separate eye images. SteamVR uses its direct stereo view and field-of-view control. +With **game on glasses** the compositor draws the guest pointer into its own scene as the last blended draw and mirrors it into both eyes for a side-by-side picture, while the phone stops drawing its Compose cursor. Over the app's own UI — the drawer, the PC keyboard, the achievements panel, PiP controls and the phone panel shown while the glasses have the picture — Android's pointer returns instead, so those controls are still clickable with a mouse. + +The pointer is left out of the picture when it cannot be drawn where the game is: while a game holds the pointer lock (it draws its own), and for a game the compositor cannot import — an AHardwareBuffer-only surface, or HDR frames it has no texture for. Those games stay on their own display layer, because composing the scene would drop the game itself. An importable HDR game that would otherwise stay on its own layer is composed through the screen swapchain, so there the pointer does fit. + ## Setup and app-wide behavior 1. Connect the glasses through a compatible video/data connection. Accept USB access when requested. For XREAL 1S, Android must also expose the glasses' USB-Ethernet network; the app leaves Steam's Internet connection on its normal network. diff --git a/docs/third-party/malibridge/NOTICE b/docs/third-party/malibridge/NOTICE new file mode 100644 index 0000000000..6f8ab48c28 --- /dev/null +++ b/docs/third-party/malibridge/NOTICE @@ -0,0 +1,21 @@ +MaliBridge +Copyright (C) 2026 ASEbrahim and MaliBridge contributors +https://github.com/ASEbrahim/MaliBridge + +MaliBridge is free software: you can redistribute it and/or modify it under the terms of the GNU +General Public License as published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. See LICENSE. + +Additional terms under section 7 of the GNU GPL version 3: + +1. Attribution (section 7(b)). Anyone who conveys MaliBridge, or a work based on it, in source or + object form must keep the notice "MaliBridge by ASEbrahim" with a link to + https://github.com/ASEbrahim/MaliBridge in the conveyed work's documentation, and, where the + work has a user interface that shows credits, licences or an "about" screen, in that screen. + +2. Names (section 7(e)). This licence grants no right to use the name "MaliBridge" or the + author's name to name or promote a modified version. A modified version must be marked as + changed and must not be presented as MaliBridge or as the author's work. + +Third-party components keep their own licences and notices (third_party/ and the files that name +them). diff --git a/docs/third-party/malibridge/README.md b/docs/third-party/malibridge/README.md new file mode 100644 index 0000000000..97882e8a6e --- /dev/null +++ b/docs/third-party/malibridge/README.md @@ -0,0 +1,33 @@ +# MaliBridge by ASEbrahim + +MaliBridge by ASEbrahim: https://github.com/ASEbrahim/MaliBridge +(GPL-3.0-or-later with the additional terms in NOTICE here, copied unchanged from the project). + +DroidDeck builds MaliBridge from the `external/MaliBridge` submodule, pinned at 48477fe +(v0.5.4) and not modified. Its Vulkan ICD runs inside the Linux runtime and forwards each call +over a Unix socket to its server, which runs in the app on the phone's own Vulkan driver. +DroidDeck uses it only on a GPU without Adreno's KGSL; an Adreno keeps Turnip. + +The DroidDeck side of the bridge (the Setup switches, the server's start and session wiring, the +Mali render node stand-in, the compositor's AHardwareBuffer import off Adreno, the Steam web helper +layout, the socket wait and the DXVK choice for older Vulkan drivers) is Ahmad Sayed Alsayed +Ebrahim's (ASEbrahim) work from https://github.com/ASEbrahim/DroidDeck, kept under their name in +this repository's history. + +MaliBridge's own credits, in its README, include: + +- Vulkan-Headers 1.4.341 (Khronos Group), Apache-2.0 OR MIT: https://github.com/KhronosGroup/Vulkan-Headers +- Arm's HWCPipe (MIT), whose counter layouts its GPU counter reader follows: https://github.com/ARM-software/HWCPipe +- bcdec by Sergii Kudlai, MIT or Unlicense: https://github.com/iOrange/bcdec +- etc2_encode by Lee Gao, MIT: https://github.com/leegao/etc2_encode +- Lee Gao's Mali findings and SPIRV-Tools MaliOptimizationBarrierPass (Apache-2.0): + https://github.com/leegao/SPIRV-Tools, and compat_layer (MIT): https://github.com/leegao/compat_layer +- Julius Pinsker's bionic-vulkan-wrapper PR #228 (MIT) +- David Cimo's droiddeck-mali (GPL-3.0): https://github.com/DavidCimo/droiddeck-mali +- The412Banner's Mali compatibility layer and testing on the DroidDeck branch `test/non-adreno-all` +- taowen's libhybris `arlinux` branch (Apache-2.0): https://github.com/taowen/libhybris/tree/arlinux +- GameNative (GPL-3.0), wallentx's placed-memory layer for DroidDeck (MIT), Arm's published errata, + ANGLE's Mali workarounds, and design notes from Winlator's Vortek + +Each keeps its own licence and notice in the submodule (`third_party/` and the files that name +them). diff --git a/external/MaliBridge b/external/MaliBridge new file mode 160000 index 0000000000..95a1e600a5 --- /dev/null +++ b/external/MaliBridge @@ -0,0 +1 @@ +Subproject commit 95a1e600a51299294e06bb09db2db8cc509fe6a3 diff --git a/tools/aaudio-sink/android-volume.h b/tools/aaudio-sink/android-volume.h index 0e71caf65b..3ab4d9d0c6 100644 --- a/tools/aaudio-sink/android-volume.h +++ b/tools/aaudio-sink/android-volume.h @@ -45,7 +45,6 @@ static void android_volume_set(pa_sink *sink) { unsigned requested = PA_MIN(pa_cvolume_max(&sink->real_volume), PA_VOLUME_NORM); level = ((uint64_t)requested * maximum + PA_VOLUME_NORM / 2) / PA_VOLUME_NORM; pa_cvolume_set(&sink->real_volume, sink->sample_spec.channels, (uint64_t)level * PA_VOLUME_NORM / maximum); - /* Android applies media gain to both PulseAudio and DirectAudio streams. */ pa_cvolume_reset(&sink->soft_volume, sink->sample_spec.channels); android_volume_request(sink, "volume", level); } @@ -88,7 +87,6 @@ static void android_volume_refresh(pa_mainloop_api *api, pa_time_event *event, c pa_xfree(mute_request); pa_xfree(processing); pa_xfree(mute_processing); - /* A held volume key steps Android every ~50 ms; sampling at 100 ms hands Steam uneven multi-step jumps. */ unsigned delay_ms = ANDROID_VOLUME_IDLE_MS; if (bridge->active_ticks) { bridge->active_ticks--; diff --git a/tools/build_local.sh b/tools/build_local.sh index 608b664d70..93ffd51fd6 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -41,11 +41,15 @@ if [[ ! -x "${java_dir}/bin/java" ]]; then echo "Java 17 not found at ${java_dir}; set JAVA_HOME." >&2 exit 1 fi +if [[ ! -f "${repo_root}/external/MaliBridge/scripts/build-client-linux.sh" ]]; then + echo "external/MaliBridge is empty; run: git submodule update --init" >&2 + exit 1 +fi if ! command -v docker >/dev/null 2>&1; then echo "Docker is required to cross-compile the glibc ARM64 preload libraries." >&2 exit 1 fi -for tool in curl tar zstd shasum unzip python3; do +for tool in curl tar zstd shasum unzip python3 go; do if ! command -v "${tool}" >/dev/null 2>&1; then echo "${tool} is required to build the CI-equivalent APK." >&2 exit 1 @@ -86,8 +90,6 @@ trap 'exit 143' TERM cache_dir=${DROIDDECK_BUILD_CACHE:-"${HOME}/.cache/droiddeck-build"} mkdir -p "${cache_dir}" -# Steps whose output depends only on tracked sources are kept per input hash in the -# shared cache, so a rerun or a fresh worktree copies them instead of rebuilding. inputs_hash() { (cd "${repo_root}" && { printf '%s\n' "$1"; shift; find "$@" -type f ! -name '*.pyc' | LC_ALL=C sort | xargs shasum -a 256; }) \ | shasum -a 256 | cut -d' ' -f1 @@ -105,7 +107,6 @@ save_step() { part=$(mktemp -d "${stored}.part.XXXXXX") (cd "$3" && tar -cf - .) | tar -xf - -C "${part}" touch "${part}/.complete" - # Another checkout may have published the same key meanwhile; its copy is equivalent. if [[ -e "${stored}" ]]; then rm -rf "${part}"; else mv "${part}" "${stored}" || rm -rf "${part}"; fi } @@ -114,9 +115,10 @@ image_id=$(docker image inspect --format '{{.Id}}' "${image_name}") rm -rf -- "${linuxfs_dir}" mkdir -p "${linuxfs_dir}" +git_common=$(git -C "${repo_root}" rev-parse --path-format=absolute --git-common-dir) docker run --rm --platform "${docker_platform}" \ --user "$(id -u):$(id -g)" \ - -v "${repo_root}:/src" -w /src "${image_name}" bash -lc ' + -v "${repo_root}:/src" -v "${git_common}:${git_common}" -w /src "${image_name}" bash -lc ' set -euo pipefail d=app/src/main/assets/linuxfs mkdir -p "$d" @@ -138,6 +140,7 @@ docker run --rm --platform "${docker_platform}" \ -o "$d/libssbs.so" tools/linuxfs/ssbs/ssbs_adapter.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$d/libssbs.so" mkdir -p "$d/usr/local/bin" + external/MaliBridge/scripts/build-client-linux.sh "$d" aarch64-linux-gnu-gcc aarch64-linux-gnu-gcc -O2 -Wall -Wextra -o "$d/usr/local/bin/droiddeck-clipboard" tools/linuxfs/clipboard/clipboard.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$d/usr/local/bin/droiddeck-clipboard" for script in tools/linuxfs/overlay/usr/local/bin/droiddeck-* tools/linuxfs/overlay/usr/local/bin/steam-compatibility; do @@ -161,7 +164,7 @@ x86_key=$(inputs_hash bullseye tools/linuxfs/build-x86-preloads.sh tools/linuxfs x86_stage="${staging_dir}/x86-preloads" if restore_step x86-preloads "${x86_key}" "${linuxfs_dir}"; then :; else docker run --rm --platform linux/amd64 \ - -v "${repo_root}:/src" -w /src public.ecr.aws/docker/library/debian:bullseye bash -c ' + -v "${repo_root}:/src" -v "${git_common}:${git_common}" -w /src public.ecr.aws/docker/library/debian:bullseye bash -c ' set -euo pipefail printf "deb http://archive.debian.org/debian bullseye main\ndeb http://archive.debian.org/debian-security bullseye-security main\n" > /etc/apt/sources.list apt-get -o Acquire::Check-Valid-Until=false update -qq @@ -181,6 +184,13 @@ if ! restore_step vr "${vr_key}" "${vr_out}"; then save_step vr "${vr_key}" "${vr_out}" fi +gpuload_out="${linuxfs_dir}/usr/local/lib/droiddeck-gpuload" +gpuload_key=$(inputs_hash "${image_id} ${ndk_version} ${VK_INCLUDE:-}" tools/gpuload) +if ! restore_step gpuload "${gpuload_key}" "${gpuload_out}"; then + DROIDDECK_BUILD_IMAGE="${image_name}" "${repo_root}/tools/gpuload/build.sh" "${gpuload_out}" + save_step gpuload "${gpuload_key}" "${gpuload_out}" +fi + github_repo=${DROIDDECK_GITHUB_REPOSITORY:-} if [[ -z "${github_repo}" ]]; then origin_url=$(git -C "${repo_root}" remote get-url origin) @@ -337,6 +347,27 @@ else (cd "${proot_out}" && shasum -a 256 libproot.so libproot-loader.so > .proot-outputs) fi +syncthing_src="${repo_root}/tools/syncthing/syncthing-android/syncthing/src/github.com/syncthing/syncthing" +git -C "${repo_root}" submodule update --init --recursive tools/syncthing/syncthing-android +syncthing_inputs=$(printf '%s\n' "$(cd "${repo_root}" && shasum -a 256 tools/syncthing/build.sh \ + tools/syncthing/syncthing-android/gradle/libs.versions.toml)" \ + "$(git -C "${syncthing_src}" rev-parse HEAD)" \ + "$(git -C "${syncthing_src}" diff --binary HEAD | shasum -a 256)" \ + "$(cd "${syncthing_src}" && git ls-files -z --others --exclude-standard | xargs -0 shasum -a 256)" \ + "${ndk_version}" | shasum -a 256 | cut -d' ' -f1) +if [[ -f "${proot_out}/libsyncthingnative.so" \ + && "$(cat "${proot_out}/.syncthing-inputs" 2>/dev/null)" = "${syncthing_inputs}" ]]; then + echo "syncthing: sources unchanged, keeping ${proot_out}/libsyncthingnative.so" +else + syncthing_stage="${staging_dir}/syncthing" + if ! restore_step syncthing "${syncthing_inputs}" "${syncthing_stage}"; then + "${repo_root}/tools/syncthing/build.sh" "${syncthing_stage}" + save_step syncthing "${syncthing_inputs}" "${syncthing_stage}" + fi + install -m755 "${syncthing_stage}/libsyncthingnative.so" "${proot_out}/" + echo "${syncthing_inputs}" > "${proot_out}/.syncthing-inputs" +fi + bundle_dir="${staging_dir}/pulseaudio-bundle" mkdir -p "${bundle_dir}" zstd -dc "${bundle_asset}" | tar -xf - -C "${bundle_dir}" diff --git a/tools/cardboard/test_cardboard_params.c b/tools/cardboard/test_cardboard_params.c index 8b284cf6ac..e1f761c1e2 100644 --- a/tools/cardboard/test_cardboard_params.c +++ b/tools/cardboard/test_cardboard_params.c @@ -45,8 +45,6 @@ int main(void) { cardboard_push_constants(&q, pose, 0, 0, 0, 0, pc); CHECK(isfinite(pc[17]) && isfinite(pc[19])); - // Narrow optical profiles and the lower SteamVR slider values must reach - // the projection unchanged, rather than all becoming a 30-degree view. const float glasses_fovs[] = {22.0f, 23.3f, 24.0f, 25.8f, 29.0f}; for (unsigned i = 0; i < sizeof(glasses_fovs) / sizeof(glasses_fovs[0]); i++) { q.fov_deg = glasses_fovs[i]; diff --git a/tools/check_glasses_menu_shader.py b/tools/check_glasses_menu_shader.py index 1b775b3e33..45ed20677b 100644 --- a/tools/check_glasses_menu_shader.py +++ b/tools/check_glasses_menu_shader.py @@ -156,7 +156,6 @@ def main(): read(0,0,width,height,0x1908,0x1401,actual) samples = [] for x, y in coords: - # Readback is GL bottom-up; coordinates below are image top-left. offset = ((height-1-y)*width+x)*4 rgb = list(actual[offset:offset+3]) eye = 0 if mono or x < width/2 else 1 diff --git a/tools/comet/build-local.sh b/tools/comet/build-local.sh index 9adc9549d4..e9487e5635 100644 --- a/tools/comet/build-local.sh +++ b/tools/comet/build-local.sh @@ -6,7 +6,8 @@ image=${DROIDDECK_BUILD_IMAGE} platform=${DROIDDECK_DOCKER_PLATFORM} rust_cache="${HOME}/.cache/droiddeck-comet-rust${platform#linux/amd64}" rust_cache=${rust_cache/\/arm64/-arm64} -docker run --rm --platform "$platform" -v "$repo:/src" \ +git_common=$(git -C "$repo" rev-parse --path-format=absolute --git-common-dir) +docker run --rm --platform "$platform" -v "$repo:/src" -v "$git_common:$git_common" \ -v "${rust_cache}:/rust" -w /src \ -e CARGO_HOME=/rust/cargo -e RUSTUP_HOME=/rust/rustup "$image" bash -lc ' set -euo pipefail diff --git a/tools/components/preloads.py b/tools/components/preloads.py index 5f16610c3f..808d510463 100644 --- a/tools/components/preloads.py +++ b/tools/components/preloads.py @@ -1,4 +1,3 @@ -"""Reuse reviewed preload snapshots; changed snapshots must prove their main-build origin.""" import argparse import gzip import http.client @@ -147,7 +146,6 @@ def producer_sources(group, commit, root=ROOT): name = 'arm64-preloads' if group == 'arm64' else 'x86-preloads' patterns = definitions[name]['source_inputs'] else: - # Older approved builds kept ARM64 commands inline, before the Vulkan/VR build. if group == 'arm64': text = run('git', 'show', f'{commit}:.github/workflows/build.yml', root=root).decode() text = text[text.index(' aarch64-linux-gnu-g++ -shared'):] diff --git a/tools/components/prepare.py b/tools/components/prepare.py index 064b452bee..122ba98c94 100644 --- a/tools/components/prepare.py +++ b/tools/components/prepare.py @@ -1,4 +1,3 @@ -"""One entry point for runtime recipes, cache identities and verified job handoff.""" import argparse import hashlib import json @@ -35,6 +34,9 @@ def identity(name, root=ROOT): for name_ in sorted(set(paths)): if '__pycache__' in name_ or name_.endswith(('.pyc', '.md')): continue + if (root / name_).is_dir(): + values[name_] = subprocess.check_output(['git', 'ls-files', '--stage', '--', name_], cwd=root, text=True).split()[1] + continue content = (root / name_).read_bytes() if b'\0' not in content: content = content.replace(b'\r\n', b'\n') diff --git a/tools/components/recipes.json b/tools/components/recipes.json index 602fb379ec..88ae5b79d6 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -14,6 +14,7 @@ "tools/msitools", "tools/pipewire", "tools/vr", + "tools/gpuload", "app/src/main/cpp/waylandcomp/generated", "app/src/main/cpp/waylandcomp/src/headpose_shm.h", "app/src/main/cpp/waylandcomp/src/spatialpose_shm.h", @@ -21,7 +22,8 @@ ], "outputs": [ "app/src/main/assets/linuxfs/usr/local/bin/gamescope", - "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/bin/linuxarm64/driver_droiddeck.so" + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/bin/linuxarm64/driver_droiddeck.so", + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so" ], "ndk": true, "packages": [ @@ -222,5 +224,35 @@ "cmake", "xz-utils" ] + }, + "vkbridge": { + "script": "tools/components/recipes/vkbridge.sh", + "inputs": [ + "external/MaliBridge", + "tools/components/recipes/vkbridge.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/usr/local/lib/vkbridge/libvulkan_droidbridge.so", + "app/src/main/assets/linuxfs/usr/local/share/vkbridge/droidbridge_icd.json", + "app/src/main/assets/linuxfs/usr/local/bin/droiddeck-vkbridge-smoke" + ], + "packages": [ + "gcc-aarch64-linux-gnu" + ] + }, + "dirt-ws2": { + "script": "tools/components/recipes/dirt-ws2.sh", + "inputs": [ + "tools/dirt-ws2", + "tools/components/recipes/dirt-ws2.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-dirt/ws2_32.dll" + ], + "packages": [ + "clang", + "lld", + "llvm" + ] } } diff --git a/tools/components/recipes/dirt-ws2.sh b/tools/components/recipes/dirt-ws2.sh new file mode 100644 index 0000000000..77a4070884 --- /dev/null +++ b/tools/components/recipes/dirt-ws2.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +set -euo pipefail +bash tools/dirt-ws2/build.sh app/src/main/assets/linuxfs/usr/local/lib/droiddeck-dirt diff --git a/tools/components/recipes/runtime.sh b/tools/components/recipes/runtime.sh index 92bcaad6c9..aa5273d270 100644 --- a/tools/components/recipes/runtime.sh +++ b/tools/components/recipes/runtime.sh @@ -4,6 +4,8 @@ D=app/src/main/assets/linuxfs mkdir -p "$D" VK_INCLUDE=$(ls -d "${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) \ tools/vr/build.sh --native "$D/usr/local/lib/droiddeck-vr" +VK_INCLUDE=$(ls -d "${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT}}"/toolchains/llvm/prebuilt/*/sysroot/usr/include | head -1) \ + tools/gpuload/build.sh --native "$D/usr/local/lib/droiddeck-gpuload" for script in tools/linuxfs/overlay/usr/local/bin/droiddeck-* tools/linuxfs/overlay/usr/local/bin/steam-compatibility; do install -Dm644 "$script" "$D/usr/local/bin/$(basename "$script")" done diff --git a/tools/components/recipes/vkbridge.sh b/tools/components/recipes/vkbridge.sh new file mode 100644 index 0000000000..10b4b521c8 --- /dev/null +++ b/tools/components/recipes/vkbridge.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +test -f external/MaliBridge/scripts/build-client-linux.sh +bash external/MaliBridge/scripts/build-client-linux.sh app/src/main/assets/linuxfs aarch64-linux-gnu-gcc diff --git a/tools/deploy_fast.py b/tools/deploy_fast.py index 259dc89cbe..958ac3051f 100644 --- a/tools/deploy_fast.py +++ b/tools/deploy_fast.py @@ -63,7 +63,6 @@ def graft_targets(): def changed_paths(donor_commit): - """Return {path: status} for the checkout, uncommitted and untracked files included.""" changes = {} fields = git('diff', '--name-status', '-z', '--no-renames', donor_commit).decode().split('\0') for status, path in zip(fields[0::2], fields[1::2]): @@ -74,7 +73,6 @@ def changed_paths(donor_commit): def classify(changes, targets, donor_entries): - """Split changes into grafts {path: asset}, ignored paths and blockers {path: reason}.""" grafts, ignored, blocked = {}, [], {} for path, status in sorted(changes.items()): if is_ignored(path): @@ -96,7 +94,6 @@ def helper_bytes(path): def graft(donor, replacements, output): - """Copy the donor with entries replaced, dropping its signature so it can be re-signed.""" with ZipFile(donor) as source, ZipFile(output, 'w') as target: for info in source.infolist(): name = info.filename @@ -200,7 +197,6 @@ def pwsh(): def signing_env(): - """The .signing.env build_local.sh uses: the override, else the checkout's own, else the main checkout's.""" common = Path(git('rev-parse', '--path-format=absolute', '--git-common-dir').decode().strip()) for candidate in (os.environ.get('DROIDDECK_SIGNING_ENV'), ROOT / '.signing.env', common.parent / '.signing.env'): if candidate and Path(candidate).is_file(): @@ -218,7 +214,6 @@ def sign_with_env(env_file, unsigned, signed): build_tools = sorted(complete, key=version_key, reverse=True) if not build_tools: raise Refused('no build-tools with aapt, zipalign and apksigner under ' + str(sdk_root() / 'build-tools')) - # BUILD_TOOLS is assigned after the env file is sourced so the file cannot replace the chosen SDK. script = 'set -a; cd "$(dirname "$1")"; . "$1"; set +a; BUILD_TOOLS="$5" exec "$2" "$3" standard "$4"' result = subprocess.run(['bash', '-c', script, 'sign', str(env_file), str(ROOT / 'tools/release/sign-apk.sh'), str(unsigned), str(signed), str(build_tools[0].parent.resolve())], @@ -230,7 +225,6 @@ def sign_with_env(env_file, unsigned, signed): def sign(unsigned, signed): if not SIGNER.is_file() and (env_file := signing_env()): return sign_with_env(env_file, unsigned, signed) - # Microsoft Store Python virtualizes AppData for child processes too and hides the signer; use a python.org install. def quoted(value): return "'" + str(value).replace("'", "''") + "'" command = (f"if (-not (Test-Path -LiteralPath {quoted(SIGNER)})) {{ Write-Error 'Local signer not found'; exit 1 }}; " diff --git a/tools/desktop-kde/closure.py b/tools/desktop-kde/closure.py index 2c74e299fa..73d3781a45 100755 --- a/tools/desktop-kde/closure.py +++ b/tools/desktop-kde/closure.py @@ -1,11 +1,4 @@ #!/usr/bin/env python3 -"""The packages the KDE desktop package ships: the dependency closure of the seeds over Arch Linux -ARM's extracted repository databases, minus what the runtime already has at a version that serves. - - closure.py <db dir with x_core, x_extra, x_alarm> <runtime-packages.txt> <seeds.txt> - -Prints one "repo/filename sha256" per package to ship (the sha256 the repository database gives). -""" import collections import os import re @@ -107,7 +100,6 @@ def main(): providers[pname].append((name, pver or pkgs[name]["version"])) def resolve(dep): - """The package to take for a dependency string, and whether the runtime's copy serves.""" name, op, want = parse_dep(dep) if name in runtime and satisfies(runtime[name], op, want): return name, True diff --git a/tools/desktop-kde/patches/0002-select-explicit-nested-render-node.patch b/tools/desktop-kde/patches/0002-select-explicit-nested-render-node.patch index 369ce1a56a..8c0b8cccb2 100644 --- a/tools/desktop-kde/patches/0002-select-explicit-nested-render-node.patch +++ b/tools/desktop-kde/patches/0002-select-explicit-nested-render-node.patch @@ -1,13 +1,12 @@ --- a/src/backends/wayland/wayland_backend.cpp +++ b/src/backends/wayland/wayland_backend.cpp -@@ -455,6 +455,20 @@ +@@ -455,6 +455,19 @@ if (WaylandClient::LinuxDmabufV1 *dmabuf = m_display->linuxDmabuf()) { m_renderDevice = GpuManager::self()->compatibleRenderDevice(dmabuf->mainDevice()); + if (!m_renderDevice && qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE")) { + const auto nodes = GpuManager::splitPathList(qEnvironmentVariable("KWIN_RENDER_NODES")); + const auto &devices = GpuManager::self()->renderDevices(); -+ // Android's KGSL host cannot name a DRM device in its dmabuf feedback. + if (nodes.size() == 1) { + for (const auto &device : devices) { + if (device->path() == nodes.constFirst()) { diff --git a/tools/desktop-kde/removal-manifests.py b/tools/desktop-kde/removal-manifests.py index 1089f9421d..1e90796972 100644 --- a/tools/desktop-kde/removal-manifests.py +++ b/tools/desktop-kde/removal-manifests.py @@ -1,15 +1,4 @@ #!/usr/bin/env python3 -"""Generate removal inventories from checksum-pinned published archives. - -Usage: removal-manifests.py <LXQt tar.zst> <KDE r1 tar.zst> <KDE r2 tar.zst> - <emulators tar.zst> <verified KDE package cache> <output dir> - <verified LXQt package cache> - removal-manifests.py --add <KDE tar.zst> <tag> <sha256> <verified KDE package cache> <output dir> -Removal includes desktop applications/themes and our overlay, not their shared dependencies. -The KDE cache is verified against the published desktop-kde.packages.txt before use. -The LXQt cache contains the signed application packages listed by desktop.packages.txt; -verify their Arch Linux ARM Build System signatures before generating the inventory. -""" import gzip import hashlib import json diff --git a/tools/device-smoke.sh b/tools/device-smoke.sh index 80a8838050..479088937b 100755 --- a/tools/device-smoke.sh +++ b/tools/device-smoke.sh @@ -1,26 +1,31 @@ #!/usr/bin/env bash -# Smoke test of a DroidDeck build on a real device, over plain adb (no python, no root). -# -# What it does, in order, and restores afterwards: -# 1. prints the device (model, Android, kernel, page size, SoC); -# 2. installs --apk when given and launches the app; -# 3. checks that the app starts and that nothing in the crash buffer belongs to it; -# 4. changes the display density and the window size and checks the app keeps its process -# (and does not recreate the activity that is on top); -# 5. on a foldable cycles the device state (half-opened, and with --closed also closed) through -# `cmd device_state`, then puts the original state back; -# 6. reads the newest session folder of a debug build: first frame, last frame rate, the -# memory page size, the proot that session ran, and the last process exits. -# -# Usage: tools/device-smoke.sh [--serial SERIAL] [--apk FILE] [--pkg PACKAGE] -# [--no-density] [--no-size] [--no-fold] [--closed] -# Exit status: 0 when no check failed, 1 when one did, 2 for a usage or device problem. -# -# Not a replacement for tools/droiddeck-scenario, which drives a game through the agent bridge; -# this covers what that does not: display changes and foldable states. set -u export MSYS_NO_PATHCONV=1 MSYS2_ARG_CONV_EXCL='*' +usage() { + cat <<'EOF' +Smoke test of a DroidDeck build on a real device, over plain adb (no python, no root). + +What it does, in order, and restores afterwards: + 1. prints the device (model, Android, kernel, page size, SoC); + 2. installs --apk when given and launches the app; + 3. checks that the app starts and that nothing in the crash buffer belongs to it; + 4. changes the display density and the window size and checks the app keeps its process + (and does not recreate the activity that is on top); + 5. on a foldable cycles the device state (half-opened, and with --closed also closed) through + `cmd device_state`, then puts the original state back; + 6. reads the newest session folder of a debug build: first frame, last frame rate, the + memory page size, the proot that session ran, and the last process exits. + +Usage: tools/device-smoke.sh [--serial SERIAL] [--apk FILE] [--pkg PACKAGE] + [--no-density] [--no-size] [--no-fold] [--closed] +Exit status: 0 when no check failed, 1 when one did, 2 for a usage or device problem. + +Not a replacement for tools/droiddeck-scenario, which drives a game through the agent bridge; +this covers what that does not: display changes and foldable states. +EOF +} + pkg=com.droiddeck.launcher serial=${ANDROID_SERIAL:-} apk= @@ -39,7 +44,7 @@ while [ $# -gt 0 ]; do --no-size) do_size=0 ;; --no-fold) do_fold=0 ;; --closed) do_closed=1 ;; - -h|--help) sed -n '2,22p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;; + -h|--help) usage; exit 0 ;; *) echo "unknown option: $1" >&2; exit 2 ;; esac shift @@ -96,7 +101,6 @@ restore_size() { echo "$current" | grep -q 'Physical size:' || return 1 [ "$(echo "$current" | wm_override size)" = "$override_size" ] } -# An override that was already in place (a test lab pins one) is put back; otherwise the request is cancelled. restore_fold() { if [ -n "$pre_override" ]; then sh_ cmd device_state state "$pre_override" >/dev/null; else sh_ cmd device_state state reset >/dev/null; fi; } restore() { @@ -133,7 +137,7 @@ app_crashes() { pat=$(printf '%s' "$pkg" | sed 's/[.[\*^$]/\\&/g') printf '%s\n' "$out" | grep -c -E "(Process: |Cmdline: |>>> )$pat([ ,<:]|$)" || true } -relaunches_of() { # $1 = activity class fragment +relaunches_of() { sh_ logcat -b events -d 2>/dev/null | grep -E 'wm_(relaunch|destroy|create)_activity' | grep -c "$1" } @@ -214,7 +218,7 @@ if [ "$do_size" = 1 ]; then phys=$(echo "$size_snapshot" | sed -n 's/.*Physical size: \([0-9]*\)x\([0-9]*\).*/\1 \2/p' | head -1) set -- $phys if [ -n "${1:-}" ]; then - w=$(( ($2 * 2 / 3) / 2 * 2 )); h=$1 # a narrower, taller window, like a cover screen + w=$(( ($2 * 2 / 3) / 2 * 2 )); h=$1 pid0=$(app_pid) size_changed=1 wm_status=0 @@ -250,7 +254,7 @@ if [ "$do_fold" = 1 ]; then else id_of() { echo "$states" | sed -n "s/.*identifier=\([0-9]*\), name='$1'.*/\1/p" | head -1; } half=$(id_of HALF_OPENED); closed=$(id_of CLOSED) - cycle() { # $1 name $2 id + cycle() { pid0=$(app_pid) fold_changed=1 sh_ cmd device_state state "$2" >/dev/null; sleep 8 diff --git a/tools/directaudio/sink/da_relay_proto.h b/tools/directaudio/sink/da_relay_proto.h index 351cdfb607..2207ae9296 100644 --- a/tools/directaudio/sink/da_relay_proto.h +++ b/tools/directaudio/sink/da_relay_proto.h @@ -1,49 +1,10 @@ -/* DirectAudio relay - the contract between the driver and the relay helper. - * +/* * Copyright 2026 The412Banner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * - * WHY THIS EXISTS. The driver's whole premise is an in-process AAudio client: - * the guest's WASAPI buffers are mixed and handed to Android's audio server - * from inside the game, no daemon in the path. That is only possible when the - * game process is a bionic process. Under a glibc runtime (the Linux Steam - * client, where the game runs inside a proot'd Arch rootfs on Valve's own - * ARM64 Proton) libaaudio cannot be loaded at all: it is a bionic library and - * the rootfs's dynamic linker does not know how to bring it into a glibc - * process. The game side therefore has to stop at a boundary it CAN cross, and - * the only thing both worlds agree on is the kernel: a unix socket, a memfd and - * a futex word. - * - * SHAPE. One helper process (directaudio-relay, bionic, links libaaudio) runs - * on the Android side and listens on a unix socket. Each game process that - * needs audio connects once, sends its launch config (the same knobs the - * in-process build reads from BANNER_AUDIO_DIRECT_*), and gets back one or two - * shared rings (memfds passed with SCM_RIGHTS): - * - * render ring game (producer) -> helper (consumer) -> AAudio OUTPUT - * capture ring helper (producer, AAudio INPUT) -> game (consumer) - * - * The driver keeps its mixer and its per-voice WASAPI rings exactly as in the - * in-process build; what used to be the AAudio data callback is now a pump - * thread that keeps the render ring topped up, and the capture callback is a - * pump that drains the capture ring into the capture voices. Everything that - * needs an AAudioStream (open, adaptive buffer growth and decay, route-change - * reopen, the stalled-callback watchdog, the live-config mailbox) moves to the - * helper unchanged in spirit. - * - * COST. One extra hand-off: the ring. The helper's callback pulls a burst from - * the ring, so the ring must hold at least one burst at every callback; the - * driver keeps DA_RING_TARGET_BURSTS bursts queued and the helper raises that - * target when a callback finds the ring short. Everything else - the AAudio - * buffer, AudioFlinger's own latency - is what the in-process build pays too. - * - * WIRE FORMAT. Fixed-width, native-endian, same-machine only. The two sides are - * different libcs but the same CPU, so no marshalling beyond fixed-size structs. - * Bump DA_RELAY_VERSION on any layout change; the helper refuses a mismatch. */ #ifndef DA_RELAY_PROTO_H #define DA_RELAY_PROTO_H @@ -52,34 +13,20 @@ #include <stddef.h> #define DA_RELAY_VERSION 1 -#define DA_RING_MAGIC 0x44415247u /* 'DARG' */ -#define DA_HELLO_MAGIC 0x44414831u /* 'DAH1' */ -#define DA_ACK_MAGIC 0x44414131u /* 'DAA1' */ +#define DA_RING_MAGIC 0x44415247u +#define DA_HELLO_MAGIC 0x44414831u +#define DA_ACK_MAGIC 0x44414131u -/* Socket path. The driver reads BANNER_AUDIO_DIRECT_RELAY; when unset it falls - * back to $XDG_RUNTIME_DIR/DA_RELAY_DEFAULT_NAME, which a host that already - * hands its runtime dir into the session gets for free. */ #define DA_RELAY_ENV "BANNER_AUDIO_DIRECT_RELAY" #define DA_RELAY_DEFAULT_NAME "directaudio-relay" -/* Both rings carry float32 interleaved stereo. The render ring is always - * 48 kHz (the mixer's output rate); the capture ring runs at whatever rate the - * input stream was granted, published in da_ring.rate, and the driver resamples - * per voice as the in-process build already does. */ #define DA_RING_RATE 48000 #define DA_RING_CHANNELS 2 -/* Render ring sizing. Capacity is the ceiling adaptive growth can reach; the - * initial target is what the driver keeps queued. Two bursts: the helper's - * callback consumes one burst and wakes the pump, which then has a full burst - * period to refill before the next callback. */ #define DA_RING_CAP_MS 250 #define DA_RING_TARGET_BURSTS 2 #define DA_RING_MAX_TARGET_MS 100 -/* Capture ring: 200 ms is far more than a game ever leaves queued; on overrun - * the helper drops the newest block, matching the in-process "guest is not - * draining" behaviour of dropping data rather than blocking the mic thread. */ #define DA_CAPTURE_RING_MS 200 enum da_ring_state @@ -93,35 +40,27 @@ struct da_ring { uint32_t magic; uint32_t version; - uint32_t cap_frames; /* ring capacity in frames */ - uint32_t rate; /* frames per second of the data in this ring */ - uint32_t channels; /* DA_RING_CHANNELS */ + uint32_t cap_frames; + uint32_t rate; + uint32_t channels; uint32_t _pad0; - /* Single producer, single consumer; monotonic frame totals, wrap-safe with - * unsigned arithmetic. Producer writes widx with RELEASE after the data; - * consumer writes ridx with RELEASE after it has copied the data out. */ volatile uint32_t widx; volatile uint32_t ridx; - /* Futex word the CONSUMER of a render ring / PRODUCER of a capture ring - * bumps after each block, so the other side can sleep on it instead of - * polling. Waiters always use a timeout, so a missed wake only costs one - * period. */ volatile uint32_t wake; - volatile uint32_t quit; /* either side: tear down */ - volatile uint32_t state; /* enum da_ring_state, helper-owned */ + volatile uint32_t quit; + volatile uint32_t state; - /* Render ring only, helper-owned, read by the driver: */ - volatile int32_t target_frames; /* keep at least this many queued */ - volatile int32_t hw_buf_frames; /* AAudio buffer size right now (get_latency) */ - volatile int32_t hw_burst; /* frames per burst of the output stream */ - volatile uint32_t underruns; /* callbacks that found fewer than they needed */ - volatile uint32_t cb_count; /* data callbacks so far (liveness) */ + volatile int32_t target_frames; + volatile int32_t hw_buf_frames; + volatile int32_t hw_burst; + volatile uint32_t underruns; + volatile uint32_t cb_count; uint32_t _pad1[3]; - float data[]; /* cap_frames * channels */ + float data[]; }; static inline size_t da_ring_bytes(uint32_t cap_frames) @@ -141,62 +80,52 @@ static inline uint32_t da_ring_space(const struct da_ring *r) return r->cap_frames - da_ring_avail(r); } -/* ---- wire messages ------------------------------------------------------- */ - -#define DA_HELLO_MIC 0x01u /* also open an INPUT stream + capture ring */ -#define DA_HELLO_EXCLUSIVE 0x02u /* AAUDIO_SHARING_MODE_EXCLUSIVE requested */ +#define DA_HELLO_MIC 0x01u +#define DA_HELLO_EXCLUSIVE 0x02u #define DA_HELLO_ADAPTIVE 0x04u #define DA_HELLO_DECAY 0x08u #define DA_HELLO_WATCHDOG 0x10u -/* First message on a fresh connection, driver -> helper. Mirrors the launch - * config the in-process build derives from BANNER_AUDIO_DIRECT_* so a preset - * means the same thing under both runtimes. */ struct da_hello { - uint32_t magic; /* DA_HELLO_MAGIC */ - uint32_t version; /* DA_RELAY_VERSION */ - uint32_t flags; /* DA_HELLO_* */ - int32_t perf; /* 0 NONE, 1 LOW_LATENCY, 2 POWER_SAVING (host convention) */ - int32_t target_ms; /* AAudio buffer, ms; 0 = use target_frames or the default */ - int32_t max_ms; /* adaptive ceiling, ms; 0 = max_frames or the default */ - int32_t target_frames; /* frame forms, used only when the ms forms are 0 */ + uint32_t magic; + uint32_t version; + uint32_t flags; + int32_t perf; + int32_t target_ms; + int32_t max_ms; + int32_t target_frames; int32_t max_frames; - uint32_t stall_ms; /* watchdog: callback silent this long => rebuild */ - uint32_t quiet_ms; /* decay pacing, see the driver */ + uint32_t stall_ms; + uint32_t quiet_ms; uint32_t punish_ms; uint32_t max_backoff; - int32_t pid; /* the game process, for the log */ - uint32_t log; /* BANNER_AUDIO_DIRECT_LOG */ - char runtime_path[256]; /* BANNER_AUDIO_DIRECT_RUNTIME mailbox, "" = none */ - char name[64]; /* process name, for the log */ + int32_t pid; + uint32_t log; + char runtime_path[256]; + char name[64]; }; -#define DA_ACK_MIC_FAILED 0x01u /* mic asked for, input stream would not open */ +#define DA_ACK_MIC_FAILED 0x01u -/* Reply, helper -> driver, followed by SCM_RIGHTS carrying the ring fds: - * fd[0] = render ring, fd[1] = capture ring (present iff in_cap_frames > 0). */ struct da_ack { - uint32_t magic; /* DA_ACK_MAGIC */ - int32_t status; /* 0 = ok, else an AAudio error code (negative) */ - int32_t rate; /* output stream rate (48000) */ - int32_t burst; /* output frames per burst */ - int32_t buf_frames; /* output buffer size as opened */ - int32_t out_cap_frames; /* render ring capacity */ - int32_t in_cap_frames; /* capture ring capacity, 0 = no capture ring */ - int32_t in_rate; /* rate of the capture ring's data */ - uint32_t flags; /* DA_ACK_* */ + uint32_t magic; + int32_t status; + int32_t rate; + int32_t burst; + int32_t buf_frames; + int32_t out_cap_frames; + int32_t in_cap_frames; + int32_t in_rate; + uint32_t flags; uint32_t _pad; }; -/* Subsequent messages, driver -> helper, on the same socket. The helper never - * writes after the ack; everything it has to say is in the ring header. EOF on - * the socket is how the helper learns the game is gone. */ enum da_msg_type { - DA_MSG_MIC_START = 1, /* first capture voice started: make the mic hot */ - DA_MSG_MIC_STOP = 2, /* last capture voice gone: stop (keep open) */ + DA_MSG_MIC_START = 1, + DA_MSG_MIC_STOP = 2, DA_MSG_PING = 3, }; @@ -206,4 +135,4 @@ struct da_msg int32_t arg; }; -#endif /* DA_RELAY_PROTO_H */ +#endif diff --git a/tools/directaudio/sink/module-directaudio-native-sink.c b/tools/directaudio/sink/module-directaudio-native-sink.c index 3b6e5f6c9c..3311fe0ed7 100644 --- a/tools/directaudio/sink/module-directaudio-native-sink.c +++ b/tools/directaudio/sink/module-directaudio-native-sink.c @@ -1,24 +1,5 @@ /* - * module-directaudio-native-sink: a PulseAudio 13 sink that is DirectAudio's AAudio engine, - * in-process. For the native Linux Steam client on Android (DroidDeck, Bannerlator's Linux - * session), whose sound can only ever reach a PulseAudio daemon: this module is where that - * daemon's mixed output meets Android, one step away from AudioFlinger, with the same engine the - * game driver has - adaptive device buffer that grows a burst on every xrun, optional decay with a - * remembered floor, a primed ring with fades instead of clicks, route-change / error reopen on a - * fresh stream, and a stall watchdog. - * - * It is the relay helper's per-client OUTPUT engine (directaudio-relay.c) with the socket and the - * shared-memory ring replaced by a ring in this process, fed by the sink's IO thread exactly as - * module-directaudio-sink feeds the relay. Compared with that module there is no second process - * and no 40 ms proot safety margin: the ring here only has to cover the IO thread's own - * scheduling jitter, so it starts at two bursts and grows only if a callback finds it short. - * - * The daemon must run on the Android side (the host app's process), not inside proot, for AAudio - * to be reachable at all - which is where both host apps already run it. - * - * Field fixes carried from the relay (MaxsTechReview, Droid-Deck/DroidDeck#338): prime before - * playing, fade on an underrun, one consumer per ring across a reopen, a device buffer of at - * least two bursts. + * Derived from the AAudio engine of DirectAudio's relay helper (directaudio-relay.c) by The412Banner. * * SPDX-License-Identifier: LGPL-2.1-or-later */ @@ -52,7 +33,7 @@ #include <pulsecore/thread-mq.h> #include <pulsecore/thread.h> -#include "da_relay_proto.h" /* struct da_ring + the ring helpers; nothing of the socket protocol */ +#include "da_relay_proto.h" PA_MODULE_AUTHOR("The412Banner"); PA_MODULE_DESCRIPTION("Android audio output: DirectAudio's AAudio engine, in-process"); @@ -77,7 +58,6 @@ PA_MODULE_USAGE( #define WATCHDOG_TICK_USEC (1 * PA_USEC_PER_SEC) #define AUDIO_NICE (-16) -/* ---- tunables: the in-process driver's, same defaults ----------------------- */ #define DA_KNEE 0.75f #define DA_DEFAULT_MS 12 #define DA_DEFAULT_MAX_MS 100 @@ -112,17 +92,14 @@ struct userdata { pa_sample_spec ss; size_t frame_size; - /* configuration */ aaudio_performance_mode_t perf; int32_t target_ms, max_ms, ring_ms; bool adaptive, decay, limiter, watchdog_on; - /* the ring: this process's, same layout as the relay's so the engine is shared */ struct da_ring *ring; int32_t burst; int32_t ring_max_target; - /* the one OUTPUT stream and its adaptive state (the relay's struct client, minus the socket) */ AAudioStream *aq; pthread_mutex_t lock; int32_t last_xrun; @@ -134,7 +111,6 @@ struct userdata { int suspended; volatile int dead; - /* what the IO thread last logged, so engine changes made on the AAudio thread get a line */ int32_t seen_target, seen_hw_buf; uint32_t seen_underruns; pa_usec_t next_watchdog, settled_at, stats_at; @@ -152,8 +128,6 @@ static uint64_t now_ns(void) { static void request_reopen(struct userdata *u, const char *why); -/* ---- the engine: the relay's out_cb / open_output / reopen / watchdog, on a local ring ---- */ - static void fade(float *p, uint32_t frames, int in) { uint32_t i, ch; @@ -165,8 +139,6 @@ static void fade(float *p, uint32_t frames, int in) { } } -/* The driver's soft-knee limiter: below DA_KNEE the signal is untouched, so ordinary material is - * bit-identical; above it a smooth knee folds the overshoot back under full scale. */ static void limit(float *p, uint32_t samples) { uint32_t i; @@ -193,7 +165,6 @@ static aaudio_data_callback_result_t out_cb(AAudioStream *aq, void *user, void * int fade_in = 0, short_read = 0, starving = 0; uint64_t now; - /* Only the promoted stream reads the ring; an outgoing one during a reopen plays silence. */ if ((live && aq != live) || __atomic_exchange_n(&u->consuming, 1, __ATOMIC_ACQUIRE)) { memset(out, 0, (size_t) frames * DA_RING_CHANNELS * sizeof(float)); return AAUDIO_CALLBACK_RESULT_CONTINUE; @@ -248,8 +219,6 @@ static aaudio_data_callback_result_t out_cb(AAudioStream *aq, void *user, void * __atomic_add_fetch(&u->cb_count, 1, __ATOMIC_SEQ_CST); __atomic_store_n(&r->cb_count, u->cb_count, __ATOMIC_RELAXED); - /* The ring's own adaptive step: a short ring means the IO thread did not get scheduled in - * time - an xrun one stage earlier - so keep one more burst queued. Only grows. */ if (short_read) __atomic_add_fetch(&r->underruns, 1, __ATOMIC_RELAXED); if ((short_read || starving) && u->adaptive) { @@ -262,8 +231,6 @@ static aaudio_data_callback_result_t out_cb(AAudioStream *aq, void *user, void * __atomic_store_n(&r->target_frames, want, __ATOMIC_RELEASE); } - /* The device buffer: grow a burst per xrun; decay a burst after a quiet spell, never below - * the floor a punished decay taught us. */ if (u->adaptive) { int32_t xruns = AAudioStream_getXRunCount(aq); int32_t burst = AAudioStream_getFramesPerBurst(aq); @@ -312,8 +279,6 @@ static void out_error_cb(AAudioStream *aq, void *user, aaudio_result_t error) { if (aq != __atomic_load_n(&u->aq, __ATOMIC_SEQ_CST)) return; if (__atomic_load_n(&u->suspended, __ATOMIC_SEQ_CST)) return; - /* A disconnected stream (headphones plugged or unplugged, a Bluetooth route coming or going) - * can never be restarted: it has to be closed and a new one opened on the current route. */ if (error != AAUDIO_ERROR_DISCONNECTED && error != AAUDIO_ERROR_INVALID_STATE && error != AAUDIO_ERROR_INVALID_HANDLE && @@ -322,8 +287,6 @@ static void out_error_cb(AAudioStream *aq, void *user, aaudio_result_t error) { request_reopen(u, "stream error"); } -/* 48 kHz / float / stereo, buffer from the ms form rounded up to a burst and never below two, - * capacity from the ceiling. The ring target floor is two bursts or ring_ms, whichever is more. */ static aaudio_result_t open_output(struct userdata *u, AAudioStream **out) { AAudioStreamBuilder *builder = NULL; AAudioStream *aq = NULL; @@ -446,7 +409,6 @@ static void request_reopen(struct userdata *u, const char *why) { } } -/* Ticked once a second from the IO thread: a callback silent for a second is a dead stream. */ static void watchdog(struct userdata *u) { uint64_t now = now_ns(), last_cb, prev_tick; unsigned int cb; @@ -484,13 +446,10 @@ static void close_output(struct userdata *u) { AAudioStream_requestStop(aq); AAudioStream_close(aq); } - /* A reopen still in flight sees u->dead and stops; give it a moment to let go of u. */ while (__atomic_load_n(&u->reopen_running, __ATOMIC_SEQ_CST)) usleep(10000); } -/* ---- the PulseAudio side: module-directaudio-sink's producer, on the local ring ---- */ - static pa_usec_t frames_to_usec(const struct userdata *u, int64_t frames) { return (pa_usec_t) (frames * (int64_t) PA_USEC_PER_SEC / (int64_t) u->ss.rate); } @@ -528,7 +487,6 @@ static void produce(struct userdata *u, uint32_t frames) { __atomic_store_n(&r->widx, w + frames, __ATOMIC_RELEASE); } -/* Tops the ring up to the engine's target and narrates what the engine changed. */ static void service_ring(struct userdata *u) { struct da_ring *r = u->ring; uint32_t avail, space; @@ -587,8 +545,6 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse return pa_sink_process_msg(o, code, data, offset, chunk); } -/* A started AAudio stream keeps audioserver's AudioMix wake lock held, so the device never - * suspends while the session sleeps: stop it, and the IO thread's timer, until the sink reopens. */ static int sink_set_state_in_io_thread_cb(pa_sink *s, pa_sink_state_t new_state, pa_suspend_cause_t new_suspend_cause) { struct userdata *u = s->userdata; aaudio_result_t res = AAUDIO_OK; @@ -629,9 +585,6 @@ static void thread_func(void *userdata) { for (;;) { int ret; - /* Half a burst between visits, never blocking on the stream: clients' audio reaches this - * thread as messages pa_rtpoll_run handles, and a thread stuck in a write or a wait lets - * them run dry (the crackle #338 fixed). */ if (!u->suspended) { service_ring(u); pa_rtpoll_set_timer_relative(u->rtpoll, PA_MAX(frames_to_usec(u, u->burst) / 2, PA_USEC_PER_MSEC)); @@ -719,7 +672,6 @@ int pa__init(pa_module *m) { pthread_mutex_init(&u->lock, NULL); pa_channel_map_init_stereo(&map); - /* The ring: the relay's layout in this process's memory. */ cap_frames = DA_RING_CAP_MS_LOCAL * DA_RING_RATE / 1000; u->ring = pa_xmalloc0(da_ring_bytes(cap_frames)); u->ring->magic = DA_RING_MAGIC; @@ -774,8 +726,6 @@ int pa__init(pa_module *m) { pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); pa_sink_set_rtpoll(u->sink, u->rtpoll); pa_sink_set_max_request(u->sink, (size_t) u->ring->target_frames * u->frame_size); - /* What clients should keep queued on their side: the ring's starting target plus the device - * buffer. Grows are reported live through GET_LATENCY. */ pa_sink_set_fixed_latency(u->sink, frames_to_usec(u, (int64_t) u->ring->target_frames + u->base_buf_frames)); if (!(u->thread = pa_thread_new("directaudio-native-sink", thread_func, u))) { diff --git a/tools/dirt-ws2/README.md b/tools/dirt-ws2/README.md new file mode 100644 index 0000000000..14f02478f1 --- /dev/null +++ b/tools/dirt-ws2/README.md @@ -0,0 +1,19 @@ +# DiRT 3 / DiRT Showdown ws2_32 stand-in + +DiRT 3 (`dirt3_game.exe`) and DiRT Showdown (`showdown.exe`, `showdown_avx.exe`) close their motion telemetry UDP +socket at the end of a race, and when leaving Joyride, but keep calling `sendto()` on it. `sendto()` fails with +WSAENOTSOCK and the game stops with "sendto failed with error 10038". The same happens on Windows. + +`ws2_32.dll` here is a 32-bit stand-in: every export jumps to the same-ordinal export of Wine's own `ws2_32.dll`; +only a `sendto()` that fails with 10038 reports 0 bytes sent instead. Same behaviour as +[DiRTTelemetryErrorFix](https://github.com/RoccoC/DiRTTelemetryErrorFix) by RoccoC (MIT), based on the original fix +by Carsten Gottschling. + +Wine loads `ws2_32` as a KnownDLL, so a copy beside the game is ignored. `droiddeck-game-env` puts the stand-in in +place of the prefix's `syswow64/ws2_32.dll` for these games while their telemetry output is on, adds +`WINEDLLOVERRIDES=ws2_32=n,b`, and puts Wine's file back when the game exits. It skips the swap when the game's +Proton already has the fix in its own `ws2_32.dll` (DroidDeck-Proton patch +`dirt-telemetry-sendto-closed-socket.patch`). + +`build.sh OUT` builds it with clang, lld and llvm-dlltool and checks its exports against `ws2_32-exports.txt` +(taken from Wine 11's `ws2_32.dll`). diff --git a/tools/dirt-ws2/build.sh b/tools/dirt-ws2/build.sh new file mode 100755 index 0000000000..67a1b3be00 --- /dev/null +++ b/tools/dirt-ws2/build.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +mkdir -p "$1" +out=$(cd "$1" && pwd) +work=$(mktemp -d) +trap 'rm -rf "$work"' EXIT + +tool() { + local found + found=$(command -v "$1" || ls /usr/lib/llvm-*/bin/"$1" 2>/dev/null | sort -V | tail -n1 || true) + [ -n "$found" ] || { echo "dirt-ws2: $1 not found" >&2; exit 1; } + echo "$found" +} +clang=$(tool clang) +dlltool=$(tool llvm-dlltool) +tool ld.lld > /dev/null + +python3 "$here/gen.py" generate "$here" "$work" +"$dlltool" -m i386 -k -d "$here/kernel32.def" -l "$work/libkernel32.a" +"$clang" --target=i686-w64-mingw32 -O2 -Wall -Wextra -Werror -ffreestanding -fno-stack-protector -fno-builtin \ + -nostdlib -shared -fuse-ld=lld -o "$work/ws2_32.dll" "$here/ws2_32.c" "$work/thunks.c" "$work/ws2_32.def" \ + -L"$work" -lkernel32 -Wl,--entry,DllMain@12 -Wl,--no-insert-timestamp +python3 "$here/gen.py" verify "$here" "$work/ws2_32.dll" +install -m 644 "$work/ws2_32.dll" "$out/ws2_32.dll" diff --git a/tools/dirt-ws2/gen.py b/tools/dirt-ws2/gen.py new file mode 100644 index 0000000000..02743506ff --- /dev/null +++ b/tools/dirt-ws2/gen.py @@ -0,0 +1,69 @@ +import struct +import sys +from pathlib import Path + + +def exports_list(src): + rows = [] + for line in (Path(src) / 'ws2_32-exports.txt').read_text().splitlines(): + ordinal, name = line.split() + rows.append((int(ordinal), name)) + return rows + + +def generate(src, out): + rows = exports_list(src) + passed = [(o, n) for o, n in rows if n != 'sendto'] + c = ['/* Generated by tools/dirt-ws2/gen.py. */', + 'const unsigned short dirtfix_ordinals[%d] = {%s};' % (len(passed), ', '.join(str(o) for o, _ in passed)), + 'const unsigned int dirtfix_count = %d;' % len(passed), + 'void *dirtfix_real[%d];' % len(passed), + '__asm__(".text\\n"'] + for i, (o, _) in enumerate(passed): + c.append(' ".globl _dirtfix_t%d\\n_dirtfix_t%d:\\n\\tjmp *_dirtfix_real+%d\\n"' % (o, o, 4 * i)) + c.append(');') + (Path(out) / 'thunks.c').write_text('\n'.join(c) + '\n') + d = ['LIBRARY ws2_32.dll', 'EXPORTS'] + d += [' %s=%s @%d' % (n, 'dirtfix_sendto@24' if n == 'sendto' else 'dirtfix_t%d' % o, o) for o, n in rows] + (Path(out) / 'ws2_32.def').write_text('\n'.join(d) + '\n') + + +def pe_exports(path): + data = Path(path).read_bytes() + pe = struct.unpack_from('<I', data, 0x3c)[0] + machine, sections = struct.unpack_from('<HH', data, pe + 4) + optional_size = struct.unpack_from('<H', data, pe + 20)[0] + optional = pe + 24 + export_rva = struct.unpack_from('<I', data, optional + 96)[0] + table = [struct.unpack_from('<IIII', data, optional + optional_size + 40 * i + 8) for i in range(sections)] + + def offset(rva): + for size, address, raw_size, raw in table: + if address <= rva < address + max(size, raw_size): + return rva - address + raw + raise ValueError('RVA %#x outside the sections' % rva) + + base, functions, names, function_rva, name_rva, ordinal_rva = struct.unpack_from('<IIIIII', data, offset(export_rva) + 16) + named = {} + for i in range(names): + text = struct.unpack_from('<I', data, offset(name_rva) + 4 * i)[0] + index = struct.unpack_from('<H', data, offset(ordinal_rva) + 2 * i)[0] + named[index] = data[offset(text):].split(b'\0')[0].decode() + result = [(base + i, named.get(i)) for i in range(functions) if struct.unpack_from('<I', data, offset(function_rva) + 4 * i)[0]] + return machine, result + + +def verify(src, dll): + machine, found = pe_exports(dll) + if machine != 0x14c: + sys.exit('%s is not a 32-bit x86 DLL (machine %#x)' % (dll, machine)) + expected = exports_list(src) + if found != expected: + sys.exit('%s exports differ from ws2_32-exports.txt: %d found, %d expected' % (dll, len(found), len(expected))) + if b'droiddeck-dirt-ws2_32' not in Path(dll).read_bytes(): + sys.exit('%s lacks the stand-in marker' % dll) + print('%s: %d exports match, marker present' % (dll, len(found))) + + +if __name__ == '__main__': + {'generate': generate, 'verify': verify}[sys.argv[1]](sys.argv[2], sys.argv[3]) diff --git a/tools/dirt-ws2/kernel32.def b/tools/dirt-ws2/kernel32.def new file mode 100644 index 0000000000..edab133164 --- /dev/null +++ b/tools/dirt-ws2/kernel32.def @@ -0,0 +1,7 @@ +LIBRARY kernel32.dll +EXPORTS + LoadLibraryW@4 + GetProcAddress@8 + GetSystemDirectoryW@8 + GetEnvironmentVariableW@12 + GetFileAttributesW@4 diff --git a/tools/dirt-ws2/ws2_32-exports.txt b/tools/dirt-ws2/ws2_32-exports.txt new file mode 100644 index 0000000000..e8e5555898 --- /dev/null +++ b/tools/dirt-ws2/ws2_32-exports.txt @@ -0,0 +1,135 @@ +1 accept +2 bind +3 closesocket +4 connect +5 getpeername +6 getsockname +7 getsockopt +8 htonl +9 htons +10 ioctlsocket +11 inet_addr +12 inet_ntoa +13 listen +14 ntohl +15 ntohs +16 recv +17 recvfrom +18 select +19 send +20 sendto +21 setsockopt +22 shutdown +23 socket +24 FreeAddrInfoEx +25 FreeAddrInfoExW +26 FreeAddrInfoW +27 GetAddrInfoExCancel +28 GetAddrInfoExOverlappedResult +29 GetAddrInfoExW +30 GetAddrInfoW +31 GetHostNameW +32 GetNameInfoW +33 InetNtopW +34 InetPtonW +35 WSApSetPostRoutine +36 WPUCompleteOverlappedRequest +37 WSAAccept +38 WSAAddressToStringA +39 WSAAddressToStringW +40 WSACloseEvent +41 WSAConnect +42 WSAConnectByNameA +43 WSAConnectByNameW +44 WSACreateEvent +45 WSADuplicateSocketA +46 WSADuplicateSocketW +47 WSAEnumNameSpaceProvidersA +48 WSAEnumNameSpaceProvidersW +49 WSAEnumNetworkEvents +50 WSAEnumProtocolsA +51 gethostbyaddr +52 gethostbyname +53 getprotobyname +54 getprotobynumber +55 getservbyname +56 getservbyport +57 gethostname +58 WSAEnumProtocolsW +59 WSAEventSelect +60 WSAGetOverlappedResult +61 WSAGetQOSByName +62 WSAGetServiceClassInfoA +63 WSAGetServiceClassInfoW +64 WSAGetServiceClassNameByClassIdA +65 WSAGetServiceClassNameByClassIdW +66 WSAHtonl +67 WSAHtons +68 WSAInstallServiceClassA +69 WSAInstallServiceClassW +70 WSAIoctl +71 WSAJoinLeaf +72 WSALookupServiceBeginA +73 WSALookupServiceBeginW +74 WSALookupServiceEnd +75 WSALookupServiceNextA +76 WSALookupServiceNextW +77 WSANSPIoctl +78 WSANtohl +79 WSANtohs +80 WSAPoll +81 WSAProviderConfigChange +82 WSARecv +83 WSARecvDisconnect +84 WSARecvFrom +85 WSARemoveServiceClass +86 WSAResetEvent +87 WSASend +88 WSASendDisconnect +89 WSASendMsg +90 WSASendTo +91 WSASetEvent +92 WSASetServiceA +93 WSASetServiceW +94 WSASocketA +95 WSASocketW +96 WSAStringToAddressA +97 WSAStringToAddressW +98 WSAWaitForMultipleEvents +99 WSCDeinstallProvider +100 WSCEnableNSProvider +101 WSAAsyncSelect +102 WSAAsyncGetHostByAddr +103 WSAAsyncGetHostByName +104 WSAAsyncGetProtoByNumber +105 WSAAsyncGetProtoByName +106 WSAAsyncGetServByPort +107 WSAAsyncGetServByName +108 WSACancelAsyncRequest +109 WSASetBlockingHook +110 WSAUnhookBlockingHook +111 WSAGetLastError +112 WSASetLastError +113 WSACancelBlockingCall +114 WSAIsBlocking +115 WSAStartup +116 WSACleanup +117 WSCEnumProtocols +118 WSCEnumProtocols32 +119 WSCGetApplicationCategory +120 WSCGetProviderInfo +121 WSCGetProviderPath +122 WSCInstallNameSpace +123 WSCInstallProvider +124 WSCSetApplicationCategory +125 WSCUnInstallNameSpace +126 WSCUpdateProvider +127 WSCWriteNameSpaceOrder +128 WSCWriteProviderOrder +129 freeaddrinfo +130 getaddrinfo +131 getnameinfo +132 inet_ntop +133 inet_pton +151 __WSAFDIsSet +500 WEP diff --git a/tools/dirt-ws2/ws2_32.c b/tools/dirt-ws2/ws2_32.c new file mode 100644 index 0000000000..fcad74b854 --- /dev/null +++ b/tools/dirt-ws2/ws2_32.c @@ -0,0 +1,95 @@ +/* Same behaviour as DiRTTelemetryErrorFix by RoccoC (MIT), based on the fix by Carsten Gottschling. */ + +typedef unsigned short WCHAR; +typedef unsigned long DWORD; +typedef unsigned int UINT; +typedef unsigned int UINT_PTR; +typedef int BOOL; +typedef void *HMODULE; +#define WINAPI __attribute__((stdcall)) +#define WSAENOTSOCK 10038 +#define ORDINAL(n) ((const char *)(UINT_PTR)(n)) + +__attribute__((dllimport)) HMODULE WINAPI LoadLibraryW(const WCHAR *name); +__attribute__((dllimport)) void *WINAPI GetProcAddress(HMODULE module, const char *name); +__attribute__((dllimport)) UINT WINAPI GetSystemDirectoryW(WCHAR *buffer, UINT size); +__attribute__((dllimport)) DWORD WINAPI GetEnvironmentVariableW(const WCHAR *name, WCHAR *buffer, DWORD size); +__attribute__((dllimport)) DWORD WINAPI GetFileAttributesW(const WCHAR *name); + +__attribute__((used)) const char dirtfix_marker[] = "droiddeck-dirt-ws2_32"; + +extern const unsigned short dirtfix_ordinals[]; +extern const unsigned int dirtfix_count; +extern void *dirtfix_real[]; + +static int (WINAPI *real_sendto)(UINT_PTR, const char *, int, int, const void *, int); +static int (WINAPI *real_WSAGetLastError)(void); +static void (WINAPI *real_WSASetLastError)(int); + +int WINAPI dirtfix_sendto(UINT_PTR s, const char *buf, int len, int flags, const void *to, int tolen) +{ + int ret = real_sendto(s, buf, len, flags, to, tolen); + if (ret == -1 && real_WSAGetLastError() == WSAENOTSOCK) + { + real_WSASetLastError(0); + return 0; + } + return ret; +} + +static void append(WCHAR *dst, const char *src) +{ + while (*dst) dst++; + while ((*dst++ = (WCHAR)(unsigned char)*src++)); +} + +static void append_number(WCHAR *dst, UINT n) +{ + char digits[12]; + int i = 11; + + digits[i] = 0; + do digits[--i] = (char)('0' + n % 10); while (n /= 10); + append(dst, digits + i); +} + +static HMODULE load_wine_ws2_32(HMODULE self) +{ + WCHAR name[24], path[600]; + HMODULE real; + UINT n, d; + + for (d = 0; d < 16; d++) + { + name[0] = 0; + append(name, "WINEDLLDIR"); + append_number(name, d); + n = GetEnvironmentVariableW(name, path, 500); + if (!n || n >= 500) continue; + if (path[0] == '\\' && path[1] == '?' && path[2] == '?' && path[3] == '\\') path[1] = '\\'; + append(path, "\\i386-windows\\ws2_32.dll"); + if (GetFileAttributesW(path) == (DWORD)-1) continue; + if ((real = LoadLibraryW(path)) && real != self) return real; + } + n = GetSystemDirectoryW(path, 280); + if (!n || n >= 280) return 0; + path[n] = 0; + append(path, "\\ws2_32.dll"); + real = LoadLibraryW(path); + return real != self ? real : 0; +} + +BOOL WINAPI DllMain(HMODULE self, DWORD reason, void *reserved) +{ + HMODULE real; + UINT i; + + (void)reserved; + if (reason != 1) return 1; + if (!(real = load_wine_ws2_32(self))) return 0; + for (i = 0; i < dirtfix_count; i++) dirtfix_real[i] = GetProcAddress(real, ORDINAL(dirtfix_ordinals[i])); + real_sendto = GetProcAddress(real, ORDINAL(20)); + real_WSAGetLastError = GetProcAddress(real, ORDINAL(111)); + real_WSASetLastError = GetProcAddress(real, ORDINAL(112)); + return real_sendto && real_WSAGetLastError && real_WSASetLastError; +} diff --git a/tools/docker_platform.sh b/tools/docker_platform.sh index e7f34e5612..4d4744875d 100644 --- a/tools/docker_platform.sh +++ b/tools/docker_platform.sh @@ -1,4 +1,3 @@ -# Sourced by the build scripts: picks the Docker platform and the matching cross-build image. docker_platform=${DROIDDECK_DOCKER_PLATFORM:-} if [[ -z "${docker_platform}" ]]; then case "$(uname -m)" in arm64|aarch64) docker_platform=linux/arm64 ;; *) docker_platform=linux/amd64 ;; esac diff --git a/tools/docker_preflight.py b/tools/docker_preflight.py index eddd6206a4..65322fd611 100644 --- a/tools/docker_preflight.py +++ b/tools/docker_preflight.py @@ -1,4 +1,3 @@ -"""Check the engine before modifying build assets; never rebuild for a daemon error.""" import os from pathlib import Path import subprocess @@ -18,7 +17,7 @@ if __name__ == '__main__': sys.exit('Docker is unavailable: ' + engine.stderr.strip()) image = run('image', 'inspect', sys.argv[1]) if image.returncode: - if 'No such image' not in image.stderr and 'image not known' not in image.stderr: # Docker, Podman + if 'No such image' not in image.stderr and 'image not known' not in image.stderr: sys.exit('Cannot inspect the build image: ' + image.stderr.strip()) repo = Path(__file__).resolve().parents[1] subprocess.run(['docker', 'build', '--platform', os.environ.get('DROIDDECK_DOCKER_PLATFORM', 'linux/amd64'), '-t', sys.argv[1], diff --git a/tools/droiddeck-scenario b/tools/droiddeck-scenario index b4590b02fe..8b238ef80d 100755 --- a/tools/droiddeck-scenario +++ b/tools/droiddeck-scenario @@ -146,7 +146,6 @@ class Runner: log.append(entry) def evidence(self, folder: Path) -> dict: - """What a failed run leaves behind: the screen, gamescope's focus, the session's logs.""" found = {} for name, action in ( ("screenshot", lambda: ctl.screenshot(self.adb, self.serial, str(folder / "failure.png"), None)), diff --git a/tools/droiddeckctl b/tools/droiddeckctl index b3a6c2d5b7..47abef41e5 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -24,7 +24,6 @@ from adb_device import DeviceResolutionError, resolve_serial from proot_profile import report as proot_profile_report -# tools/release/variants.txt: the same app also ships as other packages (e.g. com.antutu.benchmark.full). PACKAGE = os.environ.get("DROIDDECK_PACKAGE", "com.droiddeck.launcher") AUTHORITY = f"content://{PACKAGE}.agent" PACKAGE_NAME = re.compile(r"[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)+") @@ -115,7 +114,6 @@ def provider_call(adb: str, serial: str, method: str, arg: str | None = None, re def checked(response: dict, default_code: str) -> dict: - """A provider or guest answer, raised as a ControlError when it carries ok: false.""" if response.get("ok") is False: error = response.get("error", {}) raise ControlError(error.get("message", default_code), error.get("code", default_code)) @@ -166,7 +164,6 @@ def get_state(adb: str, serial: str) -> dict: def wait_until(adb: str, serial: str, describe: str, done, timeout: float, poll: float = 1.0) -> dict: - """Poll state until done(state) is true. A failed session ends the wait at once.""" deadline = time.monotonic() + timeout while True: state = get_state(adb, serial) @@ -203,8 +200,6 @@ def wait_for_phase(adb: str, serial: str, wanted: str, timeout: float) -> dict: def focused(state: dict, app_id: int | None) -> bool: - """The game has focus the way a player sees it: gamescope focuses it and it is in the list the - Steam client orders the base layer from. app_id None means any game (not the client).""" focus = state.get("session", {}).get("focus") or {} current = focus.get("focusedApp") if app_id is None: @@ -232,7 +227,6 @@ def add_serial(response: dict, serial: str) -> dict: def displays(adb: str, serial: str) -> list[dict]: - """Logical displays with the SurfaceFlinger (physical) id screencap and screenrecord want.""" result = run_adb(adb, serial, "shell", "dumpsys", "display", timeout=30) text = result.stdout.decode(errors="replace") devices = dict(re.findall(r'DisplayDeviceInfo\{"([^"]+)": uniqueId="local:(\d+)"', text)) @@ -300,14 +294,6 @@ def record(adb: str, serial: str, path: str, seconds: float, display: int | None def pacing_summary(text: str, package: str = PACKAGE) -> dict: - """What reached the panel, from a `dumpsys SurfaceFlinger --timestats -dump`. - - The game is on the compositor's own layer (droiddeck_wayland_game) when it has one, otherwise on - the session's SurfaceView. SurfaceFlinger keeps one record per layer AND refresh rate, so a panel - that switches between 60 and 120 Hz mid-capture splits the same layer into several records: they - are summed. A game's own fps counter does not show any of this - it counts frames handed over, not - frames shown, and 60 handed over can be 48 on screen with one in four held for two refreshes. - """ records = {"game": [], "surface": []} for part in re.split(r"^displayRefreshRate = ", text, flags=re.M)[1:]: rate = re.match(r"(\d+)", part) @@ -329,7 +315,6 @@ def pacing_summary(text: str, package: str = PACKAGE) -> dict: for ms, count in bins.items(): histogram[ms] = histogram.get(ms, 0) + count if bins: - # SurfaceFlinger bins by whole milliseconds, so one cadence spans two buckets (16.7 ms: 16 and 17). mode = max(bins, key=bins.get) off += sum(count for ms, count in bins.items() if abs(ms - mode) > 1) intervals = sum(histogram.values()) @@ -346,7 +331,6 @@ def pacing_summary(text: str, package: str = PACKAGE) -> dict: def pacing(adb: str, serial: str, seconds: float) -> dict: - """Frames on screen and their intervals over `seconds`, from SurfaceFlinger's timestats.""" seconds = max(1.0, min(600.0, seconds)) timestats = ("shell", "dumpsys", "SurfaceFlinger", "--timestats") try: @@ -378,6 +362,50 @@ def pacing(adb: str, serial: str, seconds: float) -> dict: return {"ok": True, "command": "pacing", "seconds": round(elapsed, 1), **summary} +THERMAL_STATUS = ["NONE", "LIGHT", "MODERATE", "SEVERE", "CRITICAL", "EMERGENCY", "SHUTDOWN"] +CPUFREQ = "/sys/devices/system/cpu/cpufreq" + + +def thermal_summary(battery: str, service: str, cpufreq: str) -> dict: + tenths = re.search(r"^\s*temperature:\s*(-?\d+)", battery, re.M) + status = re.search(r"^\s*Thermal Status:\s*(\d+)", service, re.M) + level = int(status.group(1)) if status else None + cpu: dict[str, dict] = {} + for policy, name, khz in re.findall(r"/(policy\d+)/(scaling_max_freq|cpuinfo_max_freq):(\d+)", cpufreq): + cpu.setdefault(policy, {})["maxKHz" if name == "scaling_max_freq" else "hardwareMaxKHz"] = int(khz) + for limits in cpu.values(): + if "maxKHz" in limits and "hardwareMaxKHz" in limits: + limits["capped"] = limits["maxKHz"] < limits["hardwareMaxKHz"] + return { + "batteryC": int(tenths.group(1)) / 10 if tenths else None, + "status": level, + "statusName": THERMAL_STATUS[level] if level is not None and level < len(THERMAL_STATUS) else None, + "cpu": dict(sorted(cpu.items(), key=lambda item: int(item[0][6:]))), + } + + +def thermal(adb: str, serial: str) -> dict: + def shell(*command: str) -> str: + return run_adb(adb, serial, "shell", *command).stdout.decode(errors="replace") + summary = thermal_summary(shell("dumpsys", "battery"), shell("dumpsys", "thermalservice"), + shell("grep", ".", f"{CPUFREQ}/policy*/scaling_max_freq", f"{CPUFREQ}/policy*/cpuinfo_max_freq")) + return {"ok": True, "command": "thermal", **summary} + + +def wait_cool(adb: str, serial: str, below: float, timeout: float) -> dict: + started = time.monotonic() + while True: + reading = thermal(adb, serial) + if reading["batteryC"] is None: + raise ControlError("dumpsys battery reports no temperature", "THERMAL_FAILED") + if reading["batteryC"] < below: + return {**reading, "command": "wait", "waitedSeconds": round(time.monotonic() - started, 1)} + remaining = started + timeout - time.monotonic() + if remaining <= 0: + raise ControlError(f"Battery still at {reading['batteryC']:g} °C after {timeout:g} s, wanted below {below:g}", + "TIMEOUT") + time.sleep(min(10.0, remaining)) + def start_session(adb: str, serial: str, request: dict) -> dict: if request.get("mode") == "run": @@ -487,7 +515,6 @@ def xr_capture(adb: str, serial: str, destination: Path, timeout: float) -> dict except (OSError, EOFError, zlib.error) as error: raise ControlError('Incomplete compressed XR image', 'XR_CAPTURE_FAILED') from error images[eye] = xr_ppm_to_png(pixels, linear=eye == 'source' and metadata.get('sourceColorSpace') == 'linear') - # Detect overlapping captures before publishing images with another request's metadata. check = run_adb(adb, serial, 'shell', 'cat', remote + '.json') try: unchanged = json.loads(check.stdout).get('id') == token @@ -548,6 +575,10 @@ def execute(args: argparse.Namespace, adb: str, serial: str) -> dict: "sessionId": session.get("id"), "phase": session.get("phase")}, serial) if command == "wait": + if args.phase == "cool": + if args.below is None: + raise ControlError("wait cool needs --below <°C>", "INVALID_ARGUMENTS") + return add_serial(wait_cool(adb, serial, args.below, args.timeout), serial) if args.phase == "focused": if args.app_id is None: raise ControlError("wait focused needs an app id", "INVALID_ARGUMENTS") @@ -721,6 +752,9 @@ def execute(args: argparse.Namespace, adb: str, serial: str) -> dict: if command == "pacing": return add_serial(pacing(adb, serial, args.seconds), serial) + if command == "thermal": + return add_serial(thermal(adb, serial), serial) + if command == "wake": run_adb(adb, serial, "shell", "input", "keyevent", "KEYCODE_WAKEUP") run_adb(adb, serial, "shell", "wm", "dismiss-keyguard") @@ -756,9 +790,10 @@ def build_parser() -> argparse.ArgumentParser: run.add_argument("program") run.add_argument("arguments", nargs=argparse.REMAINDER) - wait = commands.add_parser("wait", help="wait for a session phase, or for a game to have focus") - wait.add_argument("phase", choices=["ready", "idle", "failed", "focused", "game"]) + wait = commands.add_parser("wait", help="wait for a session phase, for a game to have focus, or for the battery to cool") + wait.add_argument("phase", choices=["ready", "idle", "failed", "focused", "game", "cool"]) wait.add_argument("app_id", nargs="?", type=int, help="with focused: the Steam app id") + wait.add_argument("--below", type=float, help="with cool: the battery temperature to get under, in °C") wait.add_argument("--timeout", type=float, default=90) stop = commands.add_parser("stop", help="stop the session and wait for IDLE") @@ -923,6 +958,7 @@ def build_parser() -> argparse.ArgumentParser: pace = commands.add_parser("pacing", help="frames that reached the screen and their intervals (SurfaceFlinger)") pace.add_argument("--seconds", type=float, default=30) + commands.add_parser("thermal", help="battery temperature, thermal status and CPU frequency caps") commands.add_parser("displays", help="the device's displays and their capture ids") commands.add_parser("wake", help="wake the device and dismiss the keyguard") return parser @@ -961,7 +997,7 @@ def main(argv: list[str] | None = None) -> int: args = build_parser().parse_args(argv) serial = None try: - if not PACKAGE_NAME.fullmatch(PACKAGE): # it reaches the device shell through `am start` and `content call` + if not PACKAGE_NAME.fullmatch(PACKAGE): raise ControlError(f"DROIDDECK_PACKAGE is not an Android package name: {PACKAGE!r}", "INVALID_REQUEST") if args.command == "proot-profile" and args.profile_op == "report": if args.limit < 1: diff --git a/tools/fex/build-in-arch.sh b/tools/fex/build-in-arch.sh index ce5f68ceb2..66d2c2a4ea 100755 --- a/tools/fex/build-in-arch.sh +++ b/tools/fex/build-in-arch.sh @@ -1,6 +1,4 @@ #!/usr/bin/bash -# Runs inside an Arch Linux ARM container (menci/archlinuxarm:base-devel) on an arm64 runner. Arch Linux ARM ships -# no FEX package and FEX publishes no Linux binaries. set -euxo pipefail VERSION=${FEX_VERSION:-FEX-2610} WORK=/work @@ -10,7 +8,6 @@ grep -q '^DisableSandbox' /etc/pacman.conf || sed -i 's/^\[options\]/[options]\n mv /etc/pacman.d/mirrorlist.new /etc/pacman.d/mirrorlist pacman -Syu --noconfirm --needed git zstd binutils cmake ninja clang lld llvm python squashfs-tools file patchelf xxhash -# The x86 sysroot is Arch x86_64 and multilib i686 packages unpacked by pacman, never run: no scriptlets or signature checks. THUNKS=${FEX_THUNKS:-0} X86ROOT=$WORK/x86root if [ "$THUNKS" = 1 ]; then @@ -40,15 +37,12 @@ fi rm -rf fex-src out && git clone -q --depth 1 --branch "$VERSION" --recurse-submodules --shallow-submodules https://github.com/FEX-Emu/FEX.git fex-src for p in tools/fex/patches/*.patch; do patch -d fex-src -p1 --no-backup-if-mismatch < "$p"; done -# FEX's x86 toolchain files assume an x86 build machine; here the guest thunks need the x86 sysroot too. -# Arch's clang adds stack protection; its canary load in a guest thunk's prologue clobbered r11 (the host function). if [ "$THUNKS" = 1 ]; then for t in fex-src/Data/CMake/toolchain_x86_64.cmake fex-src/Data/CMake/toolchain_x86_32.cmake; do printf '\nif (X86_DEV_ROOTFS AND NOT X86_DEV_ROOTFS STREQUAL "/")\n set(CMAKE_SYSROOT "${X86_DEV_ROOTFS}")\nendif()\n' >> "$t" printf '\nset(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-stack-protector")\nset(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-stack-protector")\n' >> "$t" done fi -# TUNE_CPU none: the default (native) would tune for the runner's Neoverse cores, not the device. cmake -S fex-src -B fex-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DUSE_LINKER=lld \ @@ -60,8 +54,6 @@ cmake -S fex-src -B fex-build -G Ninja \ ninja -C fex-build DESTDIR="$WORK/out" ninja -C fex-build install install -Dm755 /usr/bin/unsquashfs out/usr/local/bin/unsquashfs -# The Linux runtime has no xxhash and no ld.so.cache: the library goes beside libFEXCore and the programs -# that need it find it through RUNPATH. install -Dm644 "$(readlink -f /usr/lib/libxxhash.so.0)" out/usr/local/lib/libxxhash.so.0 bundled=$(cd out/usr/local/lib && ls -- *.so* | sort -u) for f in out/usr/local/bin/*; do @@ -70,7 +62,6 @@ for f in out/usr/local/bin/*; do readelf -d "$f" | awk '/NEEDED/ { gsub(/[\[\]]/, "", $5); print $5 }' | grep -qxF "$bundled" \ && patchelf --set-rpath '$ORIGIN/../lib' "$f" done -# Every NEEDED soname must resolve in a stock guest: bundled here or provided by the runtime (runtime-libs.txt). for f in out/usr/local/bin/* out/usr/local/lib/*.so* out/usr/local/lib/fex-emu/HostThunks*/*.so; do [ -f "$f" ] && file "$f" | grep -q ELF || continue readelf -d "$f" | awk '/NEEDED/ { gsub(/[\[\]]/, "", $5); print $5 }' diff --git a/tools/fex/patches/0001-openat2-enosys-fallback.patch b/tools/fex/patches/0001-openat2-enosys-fallback.patch index d7914133ed..af0af4fa14 100644 --- a/tools/fex/patches/0001-openat2-enosys-fallback.patch +++ b/tools/fex/patches/0001-openat2-enosys-fallback.patch @@ -10,7 +10,7 @@ index 7172460..2c80dca 100644 #include <linux/openat2.h> #include <fcntl.h> #include <filesystem> -@@ -632,6 +633,163 @@ static bool ShouldSkipOpenInEmu(int flags) { +@@ -632,6 +633,157 @@ static bool ShouldSkipOpenInEmu(int flags) { return false; } @@ -26,19 +26,15 @@ index 7172460..2c80dca 100644 + return Result; +} + -+// openat2() with RESOLVE_IN_ROOT, walked one component at a time: PRoot has no openat2 and fails it with ENOSYS. -+// DirFD is AT_FDCWD only for thunk overlays, which never resolve in the root. +static int OpenatWithoutOpenat2(int DirFD, const char* Pathname, int Flags, uint32_t Mode) { + if (DirFD == AT_FDCWD) { + return ::syscall(SYSCALL_DEF(openat), DirFD, Pathname, Flags, Mode); + } + -+ // The kernel's MAXSYMLINKS. + constexpr uint32_t MaxSymlinks = 40; + uint32_t Symlinks {}; + std::optional<dev_t> RootDev {}; + -+ // O_NOFOLLOW and O_CREAT | O_EXCL leave a final symlink alone, unless a trailing slash follows it. + const bool NoFollow = (Flags & O_NOFOLLOW) || (Flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL); + + char Resolved[PATH_MAX]; @@ -116,7 +112,6 @@ index 7172460..2c80dca 100644 + } + + if (Buffer.st_dev != *RootDev && IsOnProcFS(DirFD, Resolved)) { -+ // Only procfs has magic links. RESOLVE_IN_ROOT fails them with EXDEV and the callers then open without it. + return ::syscall(SYSCALL_DEF(openat), DirFD, Pathname, Flags, Mode); + } + @@ -145,7 +140,6 @@ index 7172460..2c80dca 100644 + } + + if (Last) { -+ // openat reports on the final component, which O_CREAT may create. + ResolvedLen = CandidateLen; + if (TrailingSlash) { + Resolved[ResolvedLen++] = '/'; @@ -174,7 +168,7 @@ index 7172460..2c80dca 100644 bool FileManager::ReplaceEmuFd(int fd, int flags, uint32_t mode) { char Tmp[PATH_MAX + 1]; -@@ -678,6 +836,8 @@ uint64_t FileManager::Open(const char* pathname, int flags, uint32_t mode) { +@@ -678,6 +830,8 @@ uint64_t FileManager::Open(const char* pathname, int flags, uint32_t mode) { // This means a magic symlink (/proc/foo) was involved. In this case we // just punt and do the access without RESOLVE_IN_ROOT. fd = ::syscall(SYSCALL_DEF(openat), Path.FD, Path.Path, flags, mode); @@ -183,7 +177,7 @@ index 7172460..2c80dca 100644 } } -@@ -931,6 +1091,8 @@ uint64_t FileManager::Openat([[maybe_unused]] int dirfs, const char* pathname, i +@@ -931,6 +1085,8 @@ uint64_t FileManager::Openat([[maybe_unused]] int dirfs, const char* pathname, i // This means a magic symlink (/proc/foo) was involved. In this case we // just punt and do the access without RESOLVE_IN_ROOT. fd = ::syscall(SYSCALL_DEF(openat), Path.FD, Path.Path, flags, mode); @@ -192,7 +186,7 @@ index 7172460..2c80dca 100644 } } -@@ -967,6 +1129,8 @@ uint64_t FileManager::Openat2(int dirfs, const char* pathname, FEX::HLE::open_ho +@@ -967,6 +1123,8 @@ uint64_t FileManager::Openat2(int dirfs, const char* pathname, FEX::HLE::open_ho // This means a magic symlink (/proc/foo) was involved. In this case we // just punt and do the access without RESOLVE_IN_ROOT. fd = ::syscall(SYSCALL_DEF(openat2), Path.FD, Path.Path, how, usize); diff --git a/tools/fex/patches/0003-allocator32-map32bit-exhaustion.patch b/tools/fex/patches/0003-allocator32-map32bit-exhaustion.patch index 923d68789b..2d9f0a1728 100644 --- a/tools/fex/patches/0003-allocator32-map32bit-exhaustion.patch +++ b/tools/fex/patches/0003-allocator32-map32bit-exhaustion.patch @@ -26,11 +26,10 @@ index 60b0ef1..4a94009 100644 using FindHandler = uint64_t (MemAllocator32Bit::*)(uint64_t Start, size_t Pages) const; FindHandler FindPageRangePtr {}; }; -@@ -132,6 +135,37 @@ uint64_t MemAllocator32Bit::FindPageRange_TopDown(uint64_t Start, size_t Pages) +@@ -132,6 +135,36 @@ uint64_t MemAllocator32Bit::FindPageRange_TopDown(uint64_t Start, size_t Pages) return 0; } -+// Marks each run of host mappings that overlaps the range as used, in full. Returns false if none overlaps. +bool MemAllocator32Bit::SetHostMappedPages(uint64_t PageAddr, size_t PagesLength) { + const int MapsFD = ::open("/proc/self/maps", O_RDONLY | O_CLOEXEC); + if (MapsFD == -1) { @@ -64,7 +63,7 @@ index 60b0ef1..4a94009 100644 void* MemAllocator32Bit::Mmap(void* addr, size_t length, int prot, int flags, int fd, off_t offset) { std::scoped_lock<std::mutex> lk {AllocMutex}; size_t PagesLength = FEXCore::AlignUp(length, FEXCore::Utils::FEX_PAGE_SIZE) >> FEXCore::Utils::FEX_PAGE_SHIFT; -@@ -175,11 +209,17 @@ void* MemAllocator32Bit::Mmap(void* addr, size_t length, int prot, int flags, in +@@ -175,11 +208,16 @@ void* MemAllocator32Bit::Mmap(void* addr, size_t length, int prot, int flags, in auto AllocateNoHint = [&]() -> void* { bool Wrapped = false; @@ -74,7 +73,6 @@ index 60b0ef1..4a94009 100644 // Linear range scan uint64_t LowerPage = (this->*FindPageRangePtr)(BottomPage, PagesLength); if (LowerPage == 0) { -+ // A second scan from the start found nothing either: the range is full, as the kernel would say. + if (Restarted) { + return reinterpret_cast<void*>(-ENOMEM); + } @@ -82,15 +80,12 @@ index 60b0ef1..4a94009 100644 // Try again but this time from the start BottomPage = Map32Bit ? LastKeyLocation32Bit : LastKeyLocation; LowerPage = (this->*FindPageRangePtr)(BottomPage, PagesLength); -@@ -206,7 +246,17 @@ restart: { +@@ -206,7 +244,14 @@ restart: { return (void*)(uintptr_t)-errno; } else { // Try again - if (SearchDown) { + if (Map32Bit) { -+ // MAP_32BIT from a 64-bit guest, whose other mappings bypass this allocator: once Counter-Strike 2 had reserved the -+ // low 2GB, stepping one page at a time scanned for ever. Record what the host holds there and rescan the range, or -+ // move past it if that mapping is gone. + const bool Marked = SetHostMappedPages(LowerPage, PagesLength); + if (SearchDown) { + BottomPage = Marked ? UpperPage - 1 : LowerPage - 1; diff --git a/tools/gamescope/PATCHES.md b/tools/gamescope/PATCHES.md index 32317c4fa6..fc3b1b481e 100644 --- a/tools/gamescope/PATCHES.md +++ b/tools/gamescope/PATCHES.md @@ -209,3 +209,60 @@ the connector's windows (`mangoapp_nudge_app_frame`). With `DROIDDECK_HUD_FRAMES sets `/run/droiddeck-hud/frames`), gamescope maps that file and writes the same commits of connector 0, whether or not a mangoapp runs, plus the focused pid, output size, refresh, Steam focus and engine name. The layout is in the comment above `droiddeck_hud_frames_map`; the app reads it in `hudframes.c`. + +## 0126 steamcompmgr: a topmost focus window keeps other processes' windows beneath it + +EA games on Steam start through the EA app. Its Steam launcher (`EASteamLauncher.exe`) shows the +game's splash as a layered tool window, and the EA app (`EADesktop.exe`, another process) opens its +sign-in window `WS_EX_TOPMOST`. gamescope took the splash as the sign-in's override window, so it was +painted over most of the sign-in and became gamescope's keyboard focus window (Burnout Paradise +Remastered, `gamescopectl focus_info`). On Windows a topmost window stays above every window that is neither topmost nor +owned by it, so a window from another process that is neither is no longer an override candidate for +a topmost focus window. Both windows' pids must be known; gamescope keeps -1 when XRes cannot name the +client, which says nothing about the process. Same-process popups, topmost popups (WebView2 and CEF menus) and windows +transient for the focus window are unchanged. gamescope read `_WINE_HWND_EXSTYLE` only from a +PropertyNotify, and it listens for those from map on, so the style Wine sets before mapping a window +was never known; `map_win` now reads it with the other properties, which the layered-launcher and +Xalia rules rely on too. `tools/tests/test_gamescope_override_stacking.py` compiles the rule from +this patch. + +## 0127 steamcompmgr: a three way relative mouse switch + +`relative_mouse` is read where the decision is made: 0 leaves it to the rule below, 1 forces relative +motion for the focused game except Steam's own windows and composites the cursor, 2 never goes relative. +For games that confine a visible cursor and warp it, which the automatic rule cannot see. + +## 0128 steamcompmgr: a hidden cursor under any pointer constraint is relative + +The rule only counted a lock with a cursor position hint. A game that hides the cursor and confines the +pointer through a grab (Wine's ClipCursor) has a constraint with no hint, so the nested pointer stayed +absolute, the constraint held the X pointer still and no raw motion was produced: the camera froze. + +## 0129 steamcompmgr, wayland: release a pointer lock at the game's pointer + +A game can move the X pointer while it holds the lock (Wine's ClipCursor recentres it), and the nested host +never hears about it. On unlock the host's next absolute motion dropped the pointer back at its old position, +often near a corner. The unlock now sends the X pointer as a cursor position hint and commits it first. A cursor +forced On by `relative_mouse` also stays visible while idle, since the host cursor is hidden during the lock. + +## 0130 steamcompmgr: fit the X screen to a larger fullscreen window + +A game can open a fullscreen window larger than its X screen (Valheim at 1366x768 on 1280x720). The X server +keeps the pointer inside the screen, so the outer part of the window could not be reached and motion past the +edge had to be undone. The server's mode now follows such a window, and returns once the focused window fits, +focus moves to Steam or no window has focus. + +## 0131 steamcompmgr, wlserver: follow a game's pointer warps + +Under a nested host the seat's absolute position came from the host, so a game that warped a visible X pointer +to the screen centre read the distance back to the host's position on the next motion, and the view spun. When +the X pointer stays far from the seat position while input moves, gamescope takes the host's lock and applies +each frame's motion to the X pointer itself until the game stops warping. Absolute motion also sends relative +motion, as a real compositor does, so XInput2 raw motion reaches games that read only that. A touch moves the +pointer without relative motion, so tapping the screen does not turn the camera. + +## 0132 sdl, steamcompmgr: follow a game's window mode +With `--follow-game-window-mode`, the outer window of a nested SDL gamescope follows the focused game window. A window +asking for `_NET_WM_STATE_FULLSCREEN`, or a Steam game covering the X screen without minimise or maximise functions or +decorations in `_MOTIF_WM_HINTS`, makes the outer window fullscreen on the desktop. Anything else makes it a normal window of the +game window's size, or a maximised one when that size does not fit the desktop with its title bar and panel. A change is applied only when the wanted mode changes, so a manual resize or Super+F stays. diff --git a/tools/gamescope/build-in-arch.sh b/tools/gamescope/build-in-arch.sh index ba3b1605db..dbf323136f 100755 --- a/tools/gamescope/build-in-arch.sh +++ b/tools/gamescope/build-in-arch.sh @@ -49,7 +49,6 @@ tar --use-compress-program=unzstd -xf "$PKG" -C out --strip-components=2 usr/bin mv out/gamescope out/usr/local/bin/gamescope chmod 755 out/usr/local/bin/gamescope strip --strip-unneeded out/usr/local/bin/gamescope || true -# The WSI layer carries patches too (0117); the runtime's stock copy is replaced. mkdir -p out/usr/lib tar --use-compress-program=unzstd -xf "$PKG" -C out usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so strip --strip-unneeded out/usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so || true diff --git a/tools/gamescope/patches/0116-release-cursor-shm-buffers.patch b/tools/gamescope/patches/0116-release-cursor-shm-buffers.patch index 03b4d7fd0c..a68ac91333 100644 --- a/tools/gamescope/patches/0116-release-cursor-shm-buffers.patch +++ b/tools/gamescope/patches/0116-release-cursor-shm-buffers.patch @@ -1,12 +1,9 @@ --- a/src/wlserver.cpp +++ b/src/wlserver.cpp -@@ -203,6 +203,12 @@ +@@ -203,6 +203,9 @@ } void xwayland_surface_commit(struct wlr_surface *wlr_surface) { -+ // Cursor surfaces never acquire an X11/xdg window association. Keeping their -+ // commits in g_PendingCommits pins every old SHM buffer until the cursor -+ // surface is destroyed. X11 cursor images are handled by MouseCursor. + if ( wlr_surface->role && strcmp( wlr_surface->role->name, "wl_pointer-cursor" ) == 0 ) + return; + diff --git a/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch b/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch index 7ce0ec48d1..9ee156d8a3 100644 --- a/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch +++ b/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch @@ -9,12 +9,10 @@ #include <sys/stat.h> // For limiter file. #include <time.h> -@@ -476,6 +478,34 @@ +@@ -476,6 +478,32 @@ // Cached for comparison. std::optional<VkRect2D> cachedWindowRect; -+ // canBypassXWayland costs several X round trips; at present time it is refreshed at most -+ // every DROIDDECK_WSI_BYPASS_CHECK_MS (default 0 = every present; DroidDeck's Performance mode sets 100). + std::optional<bool> presentBypass; + bool presentBypassHdr = false; + uint64_t presentBypassNs = 0; @@ -44,7 +42,7 @@ bool isWayland() const { // Is native Wayland? return connection == nullptr; -@@ -1597,7 +1627,7 @@ +@@ -1597,7 +1625,7 @@ continue; } diff --git a/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch b/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch index 78f2837ca6..c55ae86430 100644 --- a/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch +++ b/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch @@ -2,13 +2,10 @@ diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope index ea4ba84..46d086c 100644 --- a/layer/VkLayer_FROG_gamescope_wsi.cpp +++ b/layer/VkLayer_FROG_gamescope_wsi.cpp -@@ -201,6 +201,13 @@ namespace GamescopeWSILayer { +@@ -201,6 +201,10 @@ namespace GamescopeWSILayer { return s_minImageCount; } -+ // The raised count keeps an uncapped game drawing while gamescope turns its buffers around. -+ // Under the frame limiter's FIFO the extra images only queue frames ahead of the screen, -+ // so a limited swapchain gets the default count. + static uint32_t getMinImageCount(bool forcingFifo) { + return forcingFifo ? std::min(getMinImageCount(), 3u) : getMinImageCount(); + } @@ -16,7 +13,7 @@ index ea4ba84..46d086c 100644 static bool getEnsureMinImageCount() { static bool s_ensureMinImageCount = []() -> bool { if (auto ensure = parseEnv<bool>("GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT")) { -@@ -984,7 +991,7 @@ namespace GamescopeWSILayer { +@@ -984,7 +988,7 @@ namespace GamescopeWSILayer { pSurfaceCapabilities->currentExtent = rect->extent; } @@ -25,7 +22,7 @@ index ea4ba84..46d086c 100644 return VK_SUCCESS; } -@@ -1027,7 +1034,7 @@ namespace GamescopeWSILayer { +@@ -1027,7 +1031,7 @@ namespace GamescopeWSILayer { pSurfaceCapabilities->surfaceCapabilities.currentExtent = rect->extent; } @@ -34,7 +31,7 @@ index ea4ba84..46d086c 100644 return VK_SUCCESS; } -@@ -1305,7 +1312,7 @@ namespace GamescopeWSILayer { +@@ -1305,7 +1309,7 @@ namespace GamescopeWSILayer { uint32_t minImageCount = swapchainInfo.minImageCount; if (getEnsureMinImageCount()) @@ -43,12 +40,10 @@ index ea4ba84..46d086c 100644 swapchainInfo.minImageCount = minImageCount; fprintf(stderr, "[Gamescope WSI] Creating swapchain for xid: 0x%0x - oldSwapchain: %p - provided minImageCount: %u - minImageCount: %u - format: %s - colorspace: %s - flip: %s\n", -@@ -1627,6 +1634,13 @@ namespace GamescopeWSILayer { +@@ -1627,6 +1631,11 @@ namespace GamescopeWSILayer { continue; } -+ // Other apps keep their swapchain when the limiter changes; ask them to recreate it so -+ // the image count follows the limiter as well. + if (!frameLimiterAware && gamescopeSwapchain->forceFifo != forceFifo && + getMinImageCount(true) != getMinImageCount(false) && + !(gamescopeSurface->flags & GamescopeLayerClient::Flag::NoSuboptimal)) diff --git a/tools/gamescope/patches/0120-nested-refresh-follows-host.patch b/tools/gamescope/patches/0120-nested-refresh-follows-host.patch index 83ed73b74b..a2b8464404 100644 --- a/tools/gamescope/patches/0120-nested-refresh-follows-host.patch +++ b/tools/gamescope/patches/0120-nested-refresh-follows-host.patch @@ -2,13 +2,10 @@ diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp index 40164ba..1b85e63 100644 --- a/src/Backends/WaylandBackend.cpp +++ b/src/Backends/WaylandBackend.cpp -@@ -1698,6 +1698,52 @@ namespace gamescope +@@ -1698,6 +1698,46 @@ namespace gamescope } } -+ // -r sets the refresh gamescope starts with. With GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST=1 a refresh -+ // the host compositor reports later replaces it, so pacing and the frame limiter follow a panel -+ // switched to another mode during the session. + static bool NestedRefreshFollowsHost() + { + static const bool s_bFollow = [] @@ -19,9 +16,6 @@ index 40164ba..1b85e63 100644 + return s_bFollow; + } + -+ // A mode switch on the host can report a passing rate for a few frames (72 Hz between 144 and -+ // 120 on an AYANEO Pocket FIT); a new rate is taken once it has been reported for 300 ms. -+ // Until then gamescope keeps presenting, so a still screen also gets the feedback that takes it. + static bool HostRefreshChanged( int32_t nRefreshmHz, uint64_t ulPresentedNs ) + { + static int32_t s_nPendingmHz = 0; @@ -55,7 +49,7 @@ index 40164ba..1b85e63 100644 void CWaylandPlane::UpdateVRRRefreshRate() { if ( m_pParent ) -@@ -1724,6 +1770,7 @@ namespace gamescope +@@ -1724,6 +1764,7 @@ namespace gamescope // TODO(strategy): We should pick the largest refresh rate. xdg_log.infof( "Changed refresh to: %.3fhz", ConvertmHzToHz( (float) nLargestRefreshRateMhz ) ); g_nOutputRefresh = nLargestRefreshRateMhz; @@ -63,7 +57,7 @@ index 40164ba..1b85e63 100644 } } -@@ -1794,10 +1841,11 @@ namespace gamescope +@@ -1794,10 +1835,11 @@ namespace gamescope if ( uRefreshCycle ) { int32_t nRefresh = RefreshCycleTomHz( uRefreshCycle ); @@ -76,11 +70,10 @@ index 40164ba..1b85e63 100644 } m_pConnector->SetHostCompositorIsCurrentlyVRR( false ); -@@ -2636,6 +2684,9 @@ namespace gamescope +@@ -2636,6 +2678,8 @@ namespace gamescope } void CWaylandBackend::Wayland_Output_Mode( wl_output *pOutput, uint32_t uFlags, int32_t nWidth, int32_t nHeight, int32_t nRefresh ) { -+ // The followed rate comes from presentation feedback, so a still screen presents once for it. + if ( NestedRefreshFollowsHost() && m_pOutputs[ pOutput ].nRefresh != nRefresh ) + force_repaint(); m_pOutputs[ pOutput ].nRefresh = nRefresh; @@ -90,12 +83,11 @@ diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp index 6c9299d..5fb9086 100644 --- a/src/steamcompmgr.cpp +++ b/src/steamcompmgr.cpp -@@ -9254,6 +9254,15 @@ void update_vrr_atoms(xwayland_ctx_t *root_ctx, bool force, bool* needs_flush = +@@ -9254,6 +9254,14 @@ void update_vrr_atoms(xwayland_ctx_t *root_ctx, bool force, bool* needs_flush = g_nCurrentRefreshRate_CachedValue = g_nOutputRefresh; if (needs_flush) *needs_flush = true; + -+ // Steam reads the display's refresh rates from gamescope_control when it binds; send them again. + if ( !force ) + { + wlserver_lock(); diff --git a/tools/gamescope/patches/0121-override-content-skip-toplevel-walk.patch b/tools/gamescope/patches/0121-override-content-skip-toplevel-walk.patch index 016ae5af37..a7624b4024 100644 --- a/tools/gamescope/patches/0121-override-content-skip-toplevel-walk.patch +++ b/tools/gamescope/patches/0121-override-content-skip-toplevel-walk.patch @@ -11,12 +11,10 @@ index 9a027a2..e6d8e31 100644 }; std::mutex g_wlserver_xdg_shell_windows_lock; -@@ -800,6 +802,20 @@ static void gamescope_swapchain_destroy_co( struct wl_resource *resource ); +@@ -800,6 +802,18 @@ static void gamescope_swapchain_destroy_co( struct wl_resource *resource ); void gamescope_xwayland_server_t::handle_override_window_content( struct wl_client *client, struct wl_resource *gamescope_swapchain_resource, struct wlr_surface *surface, uint32_t x11_window ) { -+ // The WSI layer sends this on every present. Finding the top level walks the X tree with a -+ // round trip per level, so a swapchain repeating the same window skips it for 100 ms. + const uint64_t ulNow = get_time_in_nanos(); + if ( gamescope_swapchain_resource ) + { @@ -32,7 +30,7 @@ index 9a027a2..e6d8e31 100644 x11_window = x11_find_toplevel_for_xid( this->ctx->dpy, x11_window ); wlserver_x11_surface_info *x11_surface = lookup_x11_surface_info_from_xid( this, x11_window ); -@@ -813,7 +829,11 @@ void gamescope_xwayland_server_t::handle_override_window_content( struct wl_clie +@@ -813,7 +827,11 @@ void gamescope_xwayland_server_t::handle_override_window_content( struct wl_clie if ( content_overrides.count( x11_window ) ) { if ( content_overrides[x11_window]->gamescope_swapchain == gamescope_swapchain_resource ) @@ -44,7 +42,7 @@ index 9a027a2..e6d8e31 100644 #ifdef GAMESCOPE_SWAPCHAIN_DEBUG wl_log.infof( "handle_override_window_content: (2) DESTROYING x11_window: 0x%x old_swapchain: %p new_swapchain: %p", x11_window, content_overrides[x11_window]->gamescope_swapchain, gamescope_swapchain_resource ); #endif -@@ -830,6 +850,8 @@ void gamescope_xwayland_server_t::handle_override_window_content( struct wl_clie +@@ -830,6 +848,8 @@ void gamescope_xwayland_server_t::handle_override_window_content( struct wl_clie co->surface = surface; co->x11_window = x11_window; co->gamescope_swapchain = gamescope_swapchain_resource; diff --git a/tools/gamescope/patches/0122-wayland-wake-after-host-events.patch b/tools/gamescope/patches/0122-wayland-wake-after-host-events.patch index 0be39bf16c..b33cef1b63 100644 --- a/tools/gamescope/patches/0122-wayland-wake-after-host-events.patch +++ b/tools/gamescope/patches/0122-wayland-wake-after-host-events.patch @@ -2,12 +2,11 @@ diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp index 1b85e63..370661d 100644 --- a/src/Backends/WaylandBackend.cpp +++ b/src/Backends/WaylandBackend.cpp -@@ -2977,6 +2977,9 @@ namespace gamescope +@@ -2977,6 +2977,8 @@ namespace gamescope LogDisplayError( "Failed to read events on input thread", m_pBackend->GetDisplay() ); abort(); } + -+ // Reading also queues releases and presentation feedback for steamcompmgr. + nudge_steamcompmgr(); } } diff --git a/tools/gamescope/patches/0124-commit-done-at-import.patch b/tools/gamescope/patches/0124-commit-done-at-import.patch index 9ac818e4eb..9adfdf9114 100644 --- a/tools/gamescope/patches/0124-commit-done-at-import.patch +++ b/tools/gamescope/patches/0124-commit-done-at-import.patch @@ -36,12 +36,11 @@ index 22aa907..0aef598 100644 void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, steamcompmgr_win_t *w, ResListEntry_t& reslistentry) { struct wlr_buffer *buf = reslistentry.buf; -@@ -8602,7 +8629,11 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st +@@ -8602,7 +8629,10 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st struct wlr_dmabuf_attributes dmabuf = {0}; if ( wlr_buffer_get_dmabuf( buf, &dmabuf ) ) { - fence = dup( dmabuf.fd[0] ); -+ // A finished buffer needs no fence of its own. + if ( cv_commit_ready_check && commit_fence_ready_now( dmabuf.fd[0] ) ) + bKnownReady = true; + else @@ -49,7 +48,7 @@ index 22aa907..0aef598 100644 } else { -@@ -8610,11 +8641,22 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st +@@ -8610,11 +8640,22 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st } } @@ -72,12 +71,11 @@ index 22aa907..0aef598 100644 else g_ImageWaiter.AddWaitable( newCommit.get() ); } -@@ -9400,6 +9442,13 @@ void steamcompmgr_check_xdg(bool vblank, uint64_t vblank_idx) +@@ -9400,6 +9441,12 @@ void steamcompmgr_check_xdg(bool vblank, uint64_t vblank_idx) } check_new_xdg_res(); + -+ // Commits marked done at import: handle them now rather than on the next wake. FIFO commits still wait for a vblank. + if ( s_bXdgCommitsDoneAtImport ) + { + s_bXdgCommitsDoneAtImport = false; @@ -86,12 +84,11 @@ index 22aa907..0aef598 100644 } void update_edid_prop() -@@ -10512,6 +10561,14 @@ steamcompmgr_main(int argc, char **argv) +@@ -10512,6 +10559,13 @@ steamcompmgr_main(int argc, char **argv) gamescope_xwayland_server_t *server = NULL; for (size_t i = 0; (server = wlserver_get_xwayland_server(i)); i++) check_new_xwayland_res(server->ctx.get()); + -+ // Commits marked done at import: handle them now rather than on the next wake. FIFO commits still wait for a vblank. + if ( s_bXwaylandCommitsDoneAtImport ) + { + s_bXwaylandCommitsDoneAtImport = false; diff --git a/tools/gamescope/patches/0125-droiddeck-hud-frame-times.patch b/tools/gamescope/patches/0125-droiddeck-hud-frame-times.patch index 8fdbbf824c..2fec1e7d2f 100644 --- a/tools/gamescope/patches/0125-droiddeck-hud-frame-times.patch +++ b/tools/gamescope/patches/0125-droiddeck-hud-frame-times.patch @@ -69,11 +69,10 @@ index 0aef598..1473148 100644 gamescope::ConVar<bool> cv_commit_ready_check( "commit_ready_check", true, "Check a new commit's fence at import; a finished frame is marked done in the same pass instead of through the image waiter." ); // Set when update_wayland_res marks a commit done itself, so the main loop handles it in the same pass. -@@ -8519,6 +8522,16 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st +@@ -8519,6 +8522,15 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st uMangoMsgType = pMangoFocus->externalOverlayWindow->uMangoappMsgType; } -+ // The commits the typed stream of connector 0 counts, whether or not a mangoapp runs. + bool bDroidDeckHudFrame = false; + if ( pUpscaleFocus && !w->isSteamStreamingClient ) + bDroidDeckHudFrame = pUpscaleFocus->ulVirtualFocusKey == 0; @@ -86,7 +85,7 @@ index 0aef598..1473148 100644 bool bValidPreemptiveScale = reslistentry.pAcquirePoint && pUpscaleFocus && cv_upscale_preemptive; bool bPreemptiveUpscale = bValidPreemptiveScale && newCommit->ShouldPreemptivelyUpscale( pUpscaleFocus->eUpscaleFilter, pUpscaleFocus->eUpscaleScaler ); -@@ -8650,7 +8663,7 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st +@@ -8650,7 +8662,7 @@ void update_wayland_res(const std::shared_ptr<CommitDoneList_t> &doneCommits, st gpuvis_trace_printf( "pushing wait for commit %lu win %lx", newCommit->commitID, w->type == steamcompmgr_win_type_t::XWAYLAND ? w->xwayland().id : 0 ); { @@ -95,18 +94,10 @@ index 0aef598..1473148 100644 if ( bKnownReady ) { newCommit->Signal(); -@@ -9865,6 +9878,109 @@ static void publish_mangoapp_connector_snapshots() +@@ -9865,6 +9877,100 @@ static void publish_mangoapp_connector_snapshots() } } -+// DroidDeck's own HUD reads the frame times DroidDeck's mangoapp shows from a shared file named by -+// DROIDDECK_HUD_FRAMES, also while no mangoapp runs. That mangoapp (Valve's 20260902.1 build) reads the -+// field at byte 16 of each message as its frame time, which is app_frametime_ns here: one time per -+// signalled commit of the connector's windows (mangoapp_nudge_app_frame). The file gets the same commits -+// of connector 0. Little-endian: 0 magic, 4 version, 8 capacity, 12 pid, 16 frames written (u64), -+// 24 info sequence (odd while the info is written), 28 output width, 32 height, 36 refresh mHz, 40 Steam -+// focused, 44 engine (40 bytes), then from 128 one { frametime ns, monotonic time ns } pair per frame, -+// a ring of capacity. +static constexpr uint32_t k_uDroidDeckHudFramesMagic = 0x46484444; +static constexpr uint32_t k_uDroidDeckHudFramesVersion = 1; +static constexpr uint32_t k_uDroidDeckHudFramesCapacity = 1024; @@ -157,7 +148,6 @@ index 0aef598..1473148 100644 + return droiddeck_hud_frames_map() != nullptr; +} + -+// Signal() runs on the image waiter thread or, for a frame finished at import, on steamcompmgr's. +void droiddeck_hud_app_frame( uint64_t ulNow ) +{ + std::unique_lock lock( s_DroidDeckHudFramesMutex ); @@ -205,7 +195,7 @@ index 0aef598..1473148 100644 // mangohudctl posts one control message for every instance to act on. static void relay_mangoapp_control() { -@@ -10843,6 +10959,7 @@ steamcompmgr_main(int argc, char **argv) +@@ -10843,6 +10949,7 @@ steamcompmgr_main(int argc, char **argv) publish_mangoapp_snapshot(); publish_mangoapp_connector_snapshots(); diff --git a/tools/gamescope/patches/0126-topmost-focus-outranks-other-process-override.patch b/tools/gamescope/patches/0126-topmost-focus-outranks-other-process-override.patch new file mode 100644 index 0000000000..543705b5d4 --- /dev/null +++ b/tools/gamescope/patches/0126-topmost-focus-outranks-other-process-override.patch @@ -0,0 +1,43 @@ +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -4220,6 +4220,21 @@ static bool is_same_app_override_decorat + ( candidate->hwndStyleEx & uDecorationStyle ) == uDecorationStyle; + } + ++// Windows keeps a topmost window above every window that is neither topmost nor owned by it, ++// so another process's splash cannot cover a topmost sign-in (the EA app's, over its Steam launcher). ++static bool is_stacked_below_focus( steamcompmgr_win_t *candidate, steamcompmgr_win_t *focus ) ++{ ++ if ( candidate->pid <= 0 || focus->pid <= 0 || candidate->pid == focus->pid || ++ !candidate->hasHwndStyleEx || !focus->hasHwndStyleEx ) ++ return false; ++ ++ if ( candidate->type == steamcompmgr_win_type_t::XWAYLAND && focus->type == steamcompmgr_win_type_t::XWAYLAND && ++ candidate->xwayland().transientFor == focus->xwayland().id ) ++ return false; ++ ++ return ( focus->hwndStyleEx & WS_EX_TOPMOST ) && !( candidate->hwndStyleEx & WS_EX_TOPMOST ); ++} ++ + static bool is_good_override_candidate( steamcompmgr_win_t *override, steamcompmgr_win_t* focus ) + { + // Some Chrome/Edge dropdowns (ie. FH5 xbox login) will automatically close themselves if you +@@ -4235,6 +4250,9 @@ static bool is_good_override_candidate( + if ( is_same_app_override_decoration( override, focus ) ) + return false; + ++ if ( is_stacked_below_focus( override, focus ) ) ++ return false; ++ + if ( override->pid != focus->pid && !windows_share_app( override, focus ) ) + return false; + +@@ -5836,6 +5854,7 @@ map_win(xwayland_ctx_t* ctx, Window id, + w->isSteamStreamingClient = get_prop(ctx, w->xwayland().id, ctx->atoms.steamStreamingClientAtom, 0); + w->isSteamStreamingClientVideo = get_prop(ctx, w->xwayland().id, ctx->atoms.steamStreamingClientVideoAtom, 0); + w->steamAppID = get_prop(ctx, w->xwayland().id, ctx->atoms.gameAtom, 0); ++ w->hwndStyleEx = get_prop(ctx, w->xwayland().id, ctx->atoms.wineHwndStyleEx, 0, &w->hasHwndStyleEx); + + if ( steamMode == true ) + { diff --git a/tools/gamescope/patches/0127-relative-mouse-convar.patch b/tools/gamescope/patches/0127-relative-mouse-convar.patch new file mode 100644 index 0000000000..d0fccec25a --- /dev/null +++ b/tools/gamescope/patches/0127-relative-mouse-convar.patch @@ -0,0 +1,30 @@ +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -3062,8 +3062,13 @@ + #endif + + gamescope::ConVar<int> cv_cursor_composite{ "cursor_composite", 1, "0 = Never composite a cursor. 1 = Composite cursor when not nested. 2 = Always composite a cursor manually" }; ++static gamescope::ConVar<int> cv_relative_mouse( "relative_mouse", 0, ++"0 = Leave it to the game and the nested hints. 1 = Send host pointer motion as relative movement, for games that confine the cursor and warp it back to read movement. 2 = Never go relative." ); + bool ShouldDrawCursor() + { ++ if ( cv_relative_mouse.Get() == 1 ) ++ return true; ++ + global_focus_t *pFocus = GetCurrentFocus(); + gamescope::INestedHints *pNestedHints = pFocus ? pFocus->GetNestedHints() : nullptr; + return gamescope::CursorShouldBeComposited( cv_cursor_composite.Get(), g_bForceRelativeMouse, +@@ -10810,7 +10815,12 @@ + + const bool bExcludedAppId = uAppId && gamescope::Algorithm::Contains( s_uRelativeMouseFilteredAppids, uAppId ); + +- const bool bRelativeMouseMode = bImageEmpty && bHasPointerConstraint && !bExcludedAppId; ++ const int nRelativeMouse = cv_relative_mouse.Get(); ++ const bool bForcedRelativeMouse = nRelativeMouse == 1 && !window_is_steam( pPaintFocus->inputFocusWindow ); ++ ++ const bool bRelativeMouseMode = nRelativeMouse == 2 ++ ? false ++ : ( bForcedRelativeMouse || ( bImageEmpty && bHasPointerConstraint && !bExcludedAppId ) ); + + pPaintFocus->GetNestedHints()->SetRelativeMouseMode( bRelativeMouseMode ); + } diff --git a/tools/gamescope/patches/0128-relative-mouse-any-constraint.patch b/tools/gamescope/patches/0128-relative-mouse-any-constraint.patch new file mode 100644 index 0000000000..a7e60f3b8d --- /dev/null +++ b/tools/gamescope/patches/0128-relative-mouse-any-constraint.patch @@ -0,0 +1,12 @@ +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -10804,7 +10804,8 @@ + ( pPaintFocus->cursor && pPaintFocus->cursor->imageEmpty() ) && + ( !window_is_steam( pPaintFocus->inputFocusWindow ) ); + +- const bool bHasPointerConstraint = pPaintFocus->cursor && pPaintFocus->cursor->IsConstrained(); ++ const bool bHasPointerConstraint = pPaintFocus->cursor && ++ ( pPaintFocus->cursor->IsConstrained() || wlserver.HasMouseConstraint() ); + + uint32_t uAppId = pPaintFocus->inputFocusWindow + ? pPaintFocus->inputFocusWindow->appID diff --git a/tools/gamescope/patches/0129-release-lock-at-the-game-pointer.patch b/tools/gamescope/patches/0129-release-lock-at-the-game-pointer.patch new file mode 100644 index 0000000000..3cf32b6c88 --- /dev/null +++ b/tools/gamescope/patches/0129-release-lock-at-the-game-pointer.patch @@ -0,0 +1,145 @@ +diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp +index 953765a..572fb0e 100644 +--- a/src/Backends/WaylandBackend.cpp ++++ b/src/Backends/WaylandBackend.cpp +@@ -464,6 +464,7 @@ namespace gamescope + + virtual void SetCursorImage( std::shared_ptr<INestedHints::CursorInfo> info ) override; + virtual void SetRelativeMouseMode( bool bRelative ) override; ++ virtual void SetCursorPositionHint( double flX, double flY ) override; + virtual void SetVisible( bool bVisible ) override; + virtual void SetTitle( std::shared_ptr<std::string> szTitle ) override; + virtual void SetIcon( std::shared_ptr<std::vector<uint32_t>> uIconPixels ) override; +@@ -719,6 +720,7 @@ namespace gamescope + + void SetCursorImage( std::shared_ptr<INestedHints::CursorInfo> info ); + void SetRelativeMouseMode( wl_surface *pSurface, bool bRelative ); ++ void SetCursorPositionHint( wl_fixed_t fSurfaceX, wl_fixed_t fSurfaceY ); + void UpdateCursor(); + + friend CWaylandConnector; +@@ -1270,6 +1272,16 @@ namespace gamescope + // TODO: Do more tracking across multiple connectors, and activity here if we ever want to use this. + m_pBackend->SetRelativeMouseMode( m_Planes[0].GetSurface(), bRelative ); + } ++ void CWaylandConnector::SetCursorPositionHint( double flX, double flY ) ++ { ++ auto oState = m_Planes[0].GetCurrentState(); ++ if ( !oState || !oState->uFractionalScale ) ++ return; ++ ++ const double flSurfaceX = ( flX * g_nOutputWidth - oState->nDestX ) * 120.0 / oState->uFractionalScale; ++ const double flSurfaceY = ( flY * g_nOutputHeight - oState->nDestY ) * 120.0 / oState->uFractionalScale; ++ m_pBackend->SetCursorPositionHint( wl_fixed_from_double( flSurfaceX ), wl_fixed_from_double( flSurfaceY ) ); ++ } + void CWaylandConnector::SetVisible( bool bVisible ) + { + if ( m_bVisible == bVisible ) +@@ -2484,6 +2496,15 @@ namespace gamescope + + UpdateCursor(); + } ++ void CWaylandBackend::SetCursorPositionHint( wl_fixed_t fSurfaceX, wl_fixed_t fSurfaceY ) ++ { ++ if ( !m_pLockedPointer ) ++ return; ++ ++ zwp_locked_pointer_v1_set_cursor_position_hint( m_pLockedPointer, fSurfaceX, fSurfaceY ); ++ wl_surface_commit( m_pLockedSurface ); ++ } ++ + void CWaylandBackend::SetRelativeMouseMode( wl_surface *pSurface, bool bRelative ) + { + if ( !m_pPointer ) +diff --git a/src/backend.h b/src/backend.h +index d264917..37b936e 100644 +--- a/src/backend.h ++++ b/src/backend.h +@@ -271,6 +271,7 @@ namespace gamescope + + virtual void SetCursorImage( std::shared_ptr<CursorInfo> info ) = 0; + virtual void SetRelativeMouseMode( bool bRelative ) = 0; ++ virtual void SetCursorPositionHint( double flX, double flY ) {} + virtual void SetVisible( bool bVisible ) = 0; + virtual void SetTitle( std::shared_ptr<std::string> szTitle ) = 0; + virtual void SetIcon( std::shared_ptr<std::vector<uint32_t>> uIconPixels ) = 0; +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +index f1346e5..2c92afe 100644 +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -2078,6 +2078,18 @@ void MouseCursor::UpdatePosition() + } + } + ++void MouseCursor::QueryRootPosition( int *pX, int *pY ) ++{ ++ Window root_ret, child_ret; ++ int win_x = 0, win_y = 0; ++ unsigned int mask; ++ *pX = m_x; ++ *pY = m_y; ++ XQueryPointer( m_ctx->dpy, DefaultRootWindow( m_ctx->dpy ), &root_ret, &child_ret, pX, pY, &win_x, &win_y, &mask ); ++} ++ ++static bool relative_mouse_forced(); ++ + void MouseCursor::checkSuspension() + { + getTexture(); +@@ -2085,7 +2097,12 @@ void MouseCursor::checkSuspension() + if ( ShouldDrawCursor() ) + { + const bool suspended = int64_t( get_time_in_nanos() ) - int64_t( wlserver.ulLastMovedCursorTime ) > int64_t( cursorHideTime ); +- if (!wlserver.bCursorHidden && suspended) { ++ if ( relative_mouse_forced() && wlserver.bCursorHidden ) ++ { ++ wlserver.bCursorHidden = false; ++ hasRepaintNonBasePlane = true; ++ } ++ if (!wlserver.bCursorHidden && suspended && !relative_mouse_forced()) { + wlserver.bCursorHidden = true; + + steamcompmgr_win_t *window = m_ctx->focus.inputFocusWindow; +@@ -3064,6 +3081,11 @@ static void paint_pipewire() + gamescope::ConVar<int> cv_cursor_composite{ "cursor_composite", 1, "0 = Never composite a cursor. 1 = Composite cursor when not nested. 2 = Always composite a cursor manually" }; + static gamescope::ConVar<int> cv_relative_mouse( "relative_mouse", 0, + "0 = Leave it to the game and the nested hints. 1 = Send host pointer motion as relative movement, for games that confine the cursor and warp it back to read movement. 2 = Never go relative." ); ++static bool relative_mouse_forced() ++{ ++ return cv_relative_mouse.Get() == 1; ++} ++ + bool ShouldDrawCursor() + { + if ( cv_relative_mouse.Get() == 1 ) +@@ -10828,6 +10850,18 @@ steamcompmgr_main(int argc, char **argv) + ? false + : ( bForcedRelativeMouse || ( bImageEmpty && bHasPointerConstraint && !bExcludedAppId ) ); + ++ static bool s_bRelativeMouseMode = false; ++ if ( s_bRelativeMouseMode && !bRelativeMouseMode && pPaintFocus->cursor && ++ g_nOutputWidth && g_nOutputHeight && focusedWindowScaleX > 0.0f && focusedWindowScaleY > 0.0f ) ++ { ++ int nRootX, nRootY; ++ pPaintFocus->cursor->QueryRootPosition( &nRootX, &nRootY ); ++ pPaintFocus->GetNestedHints()->SetCursorPositionHint( ++ ( nRootX / focusedWindowScaleX - focusedWindowOffsetX ) / g_nOutputWidth, ++ ( nRootY / focusedWindowScaleY - focusedWindowOffsetY ) / g_nOutputHeight ); ++ } ++ s_bRelativeMouseMode = bRelativeMouseMode; ++ + pPaintFocus->GetNestedHints()->SetRelativeMouseMode( bRelativeMouseMode ); + } + +diff --git a/src/steamcompmgr.hpp b/src/steamcompmgr.hpp +index 7a7119f..ff54d8e 100644 +--- a/src/steamcompmgr.hpp ++++ b/src/steamcompmgr.hpp +@@ -85,6 +85,7 @@ public: + } + + void UpdatePosition(); ++ void QueryRootPosition( int *pX, int *pY ); + + bool isHidden() { return wlserver.bCursorHidden || m_imageEmpty; } + bool imageEmpty() const { return m_imageEmpty; } diff --git a/tools/gamescope/patches/0130-fit-x-screen-to-larger-fullscreen-window.patch b/tools/gamescope/patches/0130-fit-x-screen-to-larger-fullscreen-window.patch new file mode 100644 index 0000000000..48f3b399f2 --- /dev/null +++ b/tools/gamescope/patches/0130-fit-x-screen-to-larger-fullscreen-window.patch @@ -0,0 +1,94 @@ +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +index 2c92afe..17bae3a 100644 +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -4662,6 +4662,49 @@ static void set_wm_state( xwayland_ctx_t *ctx, Window win, uint32_t state ) + sizeof(wmState) / sizeof(wmState[0])); + } + ++static void ++fit_root_to_focus_window( xwayland_ctx_t *ctx ) ++{ ++ steamcompmgr_win_t *w = ctx->focus.focusWindow; ++ const bool bGame = w && !window_is_steam( w ); ++ const int nWindowX = bGame ? w->xwayland().a.x : 0; ++ const int nWindowY = bGame ? w->xwayland().a.y : 0; ++ const int nWindowWidth = bGame ? w->xwayland().a.width : 0; ++ const int nWindowHeight = bGame ? w->xwayland().a.height : 0; ++ const int nBaseWidth = ctx->nFitRestoreWidth ? ctx->nFitRestoreWidth : ctx->root_width; ++ const int nBaseHeight = ctx->nFitRestoreWidth ? ctx->nFitRestoreHeight : ctx->root_height; ++ const bool bCoversBase = nWindowX == 0 && nWindowY == 0 && nWindowWidth >= nBaseWidth && nWindowHeight >= nBaseHeight; ++ const bool bPlausible = nWindowWidth <= 8192 && nWindowHeight <= 8192; ++ ++ int nWidth = 0; ++ int nHeight = 0; ++ if ( bGame && bCoversBase && bPlausible && ( nWindowWidth > nBaseWidth || nWindowHeight > nBaseHeight ) ) ++ { ++ if ( !ctx->nFitRestoreWidth ) ++ { ++ ctx->nFitRestoreWidth = ctx->root_width; ++ ctx->nFitRestoreHeight = ctx->root_height; ++ } ++ nWidth = nWindowWidth; ++ nHeight = nWindowHeight; ++ } ++ else if ( ctx->nFitRestoreWidth && nWindowWidth <= ctx->nFitRestoreWidth && nWindowHeight <= ctx->nFitRestoreHeight ) ++ { ++ nWidth = ctx->nFitRestoreWidth; ++ nHeight = ctx->nFitRestoreHeight; ++ ctx->nFitRestoreWidth = 0; ++ ctx->nFitRestoreHeight = 0; ++ } ++ ++ if ( !nWidth || ( nWidth == ctx->root_width && nHeight == ctx->root_height ) ) ++ return; ++ ++ ctx->bFitPending = true; ++ wlserver_lock(); ++ wlserver_set_xwayland_server_mode( ctx->xwayland_server->get_index(), nWidth, nHeight, g_nOutputRefresh ); ++ wlserver_unlock(); ++} ++ + void xwayland_ctx_t::DetermineAndApplyFocus( const std::vector< steamcompmgr_win_t* > &vecPossibleFocusWindows ) + { + xwayland_ctx_t *ctx = this; +@@ -4736,6 +4779,8 @@ void xwayland_ctx_t::DetermineAndApplyFocus( const std::vector< steamcompmgr_win + inputFocus = ctx->focus.focusWindow; + } + ++ fit_root_to_focus_window( ctx ); ++ + if ( ctx->focus.focusWindow ) + { + if ( prevFocusWindow != ctx->focus.focusWindow ) +@@ -5001,7 +5046,7 @@ void xwayland_ctx_t::DetermineAndApplyFocus( const std::vector< steamcompmgr_win + fs_width = ctx->root_width * steam_height_scale; + } + +- if ( w->GetGeometry().nWidth != fs_width || w->GetGeometry().nHeight != fs_height || globalScaleRatio != 1.0f ) ++ if ( !ctx->bFitPending && ( w->GetGeometry().nWidth != fs_width || w->GetGeometry().nHeight != fs_height || globalScaleRatio != 1.0f ) ) + XResizeWindow(ctx->dpy, ctx->focus.focusWindow->xwayland().id, fs_width, fs_height); + } + else +@@ -6232,6 +6277,7 @@ configure_win(xwayland_ctx_t *ctx, XConfigureEvent *ce) + { + if (ce->window == ctx->root) + { ++ ctx->bFitPending = false; + ctx->root_width = ce->width; + ctx->root_height = ce->height; + MakeFocusDirty(); +diff --git a/src/xwayland_ctx.hpp b/src/xwayland_ctx.hpp +index 3a75650..15c2e6b 100644 +--- a/src/xwayland_ctx.hpp ++++ b/src/xwayland_ctx.hpp +@@ -87,6 +87,9 @@ struct xwayland_ctx_t final : public gamescope::IWaitable + Window ourWindow; + + focus_t focus; ++ int nFitRestoreWidth = 0; ++ int nFitRestoreHeight = 0; ++ bool bFitPending = false; + Window currentKeyboardFocusWindow; + Window focusControlWindow; + diff --git a/tools/gamescope/patches/0131-follow-game-pointer-warps.patch b/tools/gamescope/patches/0131-follow-game-pointer-warps.patch new file mode 100644 index 0000000000..9bbc592f54 --- /dev/null +++ b/tools/gamescope/patches/0131-follow-game-pointer-warps.patch @@ -0,0 +1,216 @@ +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +index 17bae3a..c468fb3 100644 +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -32,6 +32,7 @@ + #include "backend.h" + #include "gamescope_shared.h" + #include "xwayland_ctx.hpp" ++#include <cmath> + #include <X11/X.h> + #include <X11/Xlib.h> + #include <X11/Xcursor/Xcursor.h> +@@ -2088,6 +2089,7 @@ void MouseCursor::QueryRootPosition( int *pX, int *pY ) + XQueryPointer( m_ctx->dpy, DefaultRootWindow( m_ctx->dpy ), &root_ret, &child_ret, pX, pY, &win_x, &win_y, &mask ); + } + ++static bool s_bFollowClientPointer = false; + static bool relative_mouse_forced(); + + void MouseCursor::checkSuspension() +@@ -3083,12 +3085,89 @@ static gamescope::ConVar<int> cv_relative_mouse( "relative_mouse", 0, + "0 = Leave it to the game and the nested hints. 1 = Send host pointer motion as relative movement, for games that confine the cursor and warp it back to read movement. 2 = Never go relative." ); + static bool relative_mouse_forced() + { +- return cv_relative_mouse.Get() == 1; ++ return cv_relative_mouse.Get() == 1 || s_bFollowClientPointer; ++} ++ ++static void update_client_pointer_follow( global_focus_t *pFocus, bool bAllowed ) ++{ ++ static int s_nAwayFrames = 0; ++ static int s_nQuietFrames = 0; ++ static uint64_t s_ulLastAway = 0; ++ static double s_flLastX = 0.0; ++ static double s_flLastY = 0.0; ++ ++ int nRootX = 0; ++ int nRootY = 0; ++ if ( bAllowed && pFocus->cursor ) ++ pFocus->cursor->QueryRootPosition( &nRootX, &nRootY ); ++ else ++ bAllowed = false; ++ ++ wlserver_lock(); ++ const double flX = wlserver.mouse_surface_cursorx; ++ const double flY = wlserver.mouse_surface_cursory; ++ if ( !bAllowed ) ++ { ++ s_nAwayFrames = 0; ++ s_bFollowClientPointer = false; ++ wlserver.bFollowClientPointer = false; ++ } ++ else if ( !s_bFollowClientPointer ) ++ { ++ const bool bMoved = flX != s_flLastX || flY != s_flLastY; ++ if ( bMoved && ( std::abs( nRootX - flX ) > 48.0 || std::abs( nRootY - flY ) > 48.0 ) ) ++ { ++ const uint64_t ulNow = get_time_in_nanos(); ++ if ( ulNow - s_ulLastAway > 500'000'000ul ) ++ s_nAwayFrames = 0; ++ s_ulLastAway = ulNow; ++ s_nAwayFrames++; ++ } ++ ++ if ( s_nAwayFrames >= 3 ) ++ { ++ s_nAwayFrames = 0; ++ s_nQuietFrames = 0; ++ s_bFollowClientPointer = true; ++ wlserver.bFollowClientPointer = true; ++ wlserver.flFollowDX = 0.0; ++ wlserver.flFollowDY = 0.0; ++ wlserver_mousewarp( nRootX, nRootY, 0, true ); ++ } ++ } ++ else ++ { ++ const bool bWarped = std::abs( nRootX - flX ) > 2.0 || std::abs( nRootY - flY ) > 2.0; ++ const double flDX = std::trunc( wlserver.flFollowDX ); ++ const double flDY = std::trunc( wlserver.flFollowDY ); ++ if ( bWarped ) ++ s_nQuietFrames = 0; ++ else if ( flDX != 0.0 || flDY != 0.0 ) ++ s_nQuietFrames++; ++ ++ if ( flDX != 0.0 || flDY != 0.0 || bWarped ) ++ { ++ wlserver.flFollowDX -= flDX; ++ wlserver.flFollowDY -= flDY; ++ wlserver_mousewarp( nRootX, nRootY, 0, true ); ++ if ( flDX != 0.0 || flDY != 0.0 ) ++ wlserver_mousewarp( nRootX + flDX, nRootY + flDY, 0, true ); ++ } ++ ++ if ( s_nQuietFrames >= 60 ) ++ { ++ s_bFollowClientPointer = false; ++ wlserver.bFollowClientPointer = false; ++ } ++ } ++ s_flLastX = wlserver.mouse_surface_cursorx; ++ s_flLastY = wlserver.mouse_surface_cursory; ++ wlserver_unlock(); + } + + bool ShouldDrawCursor() + { +- if ( cv_relative_mouse.Get() == 1 ) ++ if ( relative_mouse_forced() ) + return true; + + global_focus_t *pFocus = GetCurrentFocus(); +@@ -10892,9 +10971,15 @@ steamcompmgr_main(int argc, char **argv) + const int nRelativeMouse = cv_relative_mouse.Get(); + const bool bForcedRelativeMouse = nRelativeMouse == 1 && !window_is_steam( pPaintFocus->inputFocusWindow ); + ++ if ( vblank ) ++ { ++ update_client_pointer_follow( pPaintFocus, ++ nRelativeMouse != 2 && !bExcludedAppId && !bHasPointerConstraint && !window_is_steam( pPaintFocus->inputFocusWindow ) ); ++ } ++ + const bool bRelativeMouseMode = nRelativeMouse == 2 + ? false +- : ( bForcedRelativeMouse || ( bImageEmpty && bHasPointerConstraint && !bExcludedAppId ) ); ++ : ( bForcedRelativeMouse || s_bFollowClientPointer || ( bImageEmpty && bHasPointerConstraint && !bExcludedAppId ) ); + + static bool s_bRelativeMouseMode = false; + if ( s_bRelativeMouseMode && !bRelativeMouseMode && pPaintFocus->cursor && +diff --git a/src/wlserver.cpp b/src/wlserver.cpp +index 5733871..cc75f8a 100644 +--- a/src/wlserver.cpp ++++ b/src/wlserver.cpp +@@ -1,3 +1,4 @@ ++#include <cmath> + #include <xkbcommon/xkbcommon-keysyms.h> + #define _GNU_SOURCE 1 + +@@ -3086,6 +3087,16 @@ void wlserver_mousemotion( double dx, double dy, uint32_t time ) + + wlserver_perform_rel_pointer_motion( dx, dy ); + ++ if ( wlserver.bFollowClientPointer ) ++ { ++ wlserver.flFollowDX += dx; ++ wlserver.flFollowDY += dy; ++ wlserver.ulLastMovedCursorTime = get_time_in_nanos(); ++ wlserver.bCursorHidden = !wlserver.bCursorHasImage; ++ wlr_seat_pointer_notify_frame( wlserver.wlr.seat ); ++ return; ++ } ++ + if ( !wlserver_apply_constraint( &dx, &dy ) ) + { + wlr_seat_pointer_notify_frame( wlserver.wlr.seat ); +@@ -3110,10 +3121,18 @@ void wlserver_mousemotion( double dx, double dy, uint32_t time ) + wlr_seat_pointer_notify_frame( wlserver.wlr.seat ); + } + +-void wlserver_mousewarp( double x, double y, uint32_t time, bool bSynthetic ) ++void wlserver_mousewarp( double x, double y, uint32_t time, bool bSynthetic, bool bFromTouch ) + { + assert( wlserver_is_lock_held() ); + ++ if ( !bSynthetic && wlserver.bFollowClientPointer ) ++ return; ++ ++ const double flStepX = x - wlserver.mouse_surface_cursorx; ++ const double flStepY = y - wlserver.mouse_surface_cursory; ++ if ( !bSynthetic && !bFromTouch && ( flStepX != 0.0 || flStepY != 0.0 ) && std::abs( flStepX ) < 256.0 && std::abs( flStepY ) < 256.0 ) ++ wlserver_perform_rel_pointer_motion( flStepX, flStepY ); ++ + wlserver.mouse_surface_cursorx = x; + wlserver.mouse_surface_cursory = y; + +@@ -3304,7 +3323,7 @@ void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time, bool + { + g_bPendingTouchMovement = true; + +- wlserver_mousewarp( tx, ty, time, false ); ++ wlserver_mousewarp( tx, ty, time, false, !bAlwaysWarpCursor ); + } + } + +@@ -3352,7 +3371,7 @@ void wlserver_touchdown( double x, double y, int touch_id, uint32_t time, gamesc + + if ( eMode != gamescope::TouchClickModes::Trackpad ) + { +- wlserver_mousewarp( tx, ty, time, false ); ++ wlserver_mousewarp( tx, ty, time, false, true ); + } + + uint32_t button = TouchClickModeToLinuxButton( eMode ); +diff --git a/src/wlserver.hpp b/src/wlserver.hpp +index 79a0723..ca8d015 100644 +--- a/src/wlserver.hpp ++++ b/src/wlserver.hpp +@@ -168,6 +168,9 @@ struct wlserver_t { + uint64_t ulLastMovedCursorTime = 0; + bool bCursorHidden = true; + bool bCursorHasImage = true; ++ bool bFollowClientPointer = false; ++ double flFollowDX = 0.0; ++ double flFollowDY = 0.0; + + bool button_held[ WLSERVER_BUTTON_COUNT ]; + std::set <uint32_t> touch_down_ids; +@@ -271,7 +274,7 @@ void wlserver_clear_dropdowns(); + void wlserver_notify_dropdown( struct wlr_surface *wlrsurface, int nX, int nY ); + void wlserver_mousemotion( double x, double y, uint32_t time ); + void wlserver_mousehide(); +-void wlserver_mousewarp( double x, double y, uint32_t time, bool bSynthetic ); ++void wlserver_mousewarp( double x, double y, uint32_t time, bool bSynthetic, bool bFromTouch = false ); + void wlserver_mousebutton( int button, bool press, uint32_t time ); + void wlserver_mousewheel( double x, double y, uint32_t time ); + bool wlserver_input_held(); diff --git a/tools/gamescope/patches/0132-follow-game-window-mode.patch b/tools/gamescope/patches/0132-follow-game-window-mode.patch new file mode 100644 index 0000000000..c0fb8e2c13 --- /dev/null +++ b/tools/gamescope/patches/0132-follow-game-window-mode.patch @@ -0,0 +1,254 @@ +diff --git a/src/Backends/SDLBackend.cpp b/src/Backends/SDLBackend.cpp +index 58af150..b050183 100644 +--- a/src/Backends/SDLBackend.cpp ++++ b/src/Backends/SDLBackend.cpp +@@ -51,6 +51,7 @@ namespace gamescope + GAMESCOPE_SDL_EVENT_VISIBLE, + GAMESCOPE_SDL_EVENT_GRAB, + GAMESCOPE_SDL_EVENT_CURSOR, ++ GAMESCOPE_SDL_EVENT_WINDOW_MODE, + + GAMESCOPE_SDL_EVENT_COUNT, + }; +@@ -114,6 +115,7 @@ namespace gamescope + virtual void SetCursorImage( std::shared_ptr<INestedHints::CursorInfo> info ) override; + virtual void SetRelativeMouseMode( bool bRelative ) override; + virtual void SetVisible( bool bVisible ) override; ++ virtual void SetWindowMode( bool bFullscreen, int nWidth, int nHeight ) override; + virtual void SetTitle( std::shared_ptr<std::string> szTitle ) override; + virtual void SetIcon( std::shared_ptr<std::vector<uint32_t>> uIconPixels ) override; + virtual void SetSelection( std::shared_ptr<std::string> szContents, GamescopeSelection eSelection ) override; +@@ -179,6 +181,7 @@ namespace gamescope + void SetCursorImage( std::shared_ptr<INestedHints::CursorInfo> info ); + void SetRelativeMouseMode( bool bRelative ); + void SetVisible( bool bVisible ); ++ void SetWindowMode( bool bFullscreen, int nWidth, int nHeight ); + void SetTitle( std::shared_ptr<std::string> szTitle ); + void SetIcon( std::shared_ptr<std::vector<uint32_t>> uIconPixels ); + void SetSelection( std::shared_ptr<std::string> szContents, GamescopeSelection eSelection ); +@@ -193,6 +196,12 @@ namespace gamescope + bool m_bShown = false; + CSDLConnector m_Connector; // Window. + uint32_t m_uUserEventIdBase = 0u; ++ std::atomic<bool> m_bWantFullscreen = { false }; ++ std::atomic<int> m_nWantWidth = { 0 }; ++ std::atomic<int> m_nWantHeight = { 0 }; ++ bool m_bAppliedFullscreen = false; ++ int m_nAppliedWidth = 0; ++ int m_nAppliedHeight = 0; + std::vector<const char *> m_pszInstanceExtensions; + + std::thread m_SDLThread; +@@ -372,6 +381,10 @@ namespace gamescope + { + m_pBackend->SetVisible( bVisible ); + } ++ void CSDLConnector::SetWindowMode( bool bFullscreen, int nWidth, int nHeight ) ++ { ++ m_pBackend->SetWindowMode( bFullscreen, nWidth, nHeight ); ++ } + void CSDLConnector::SetTitle( std::shared_ptr<std::string> szTitle ) + { + m_pBackend->SetTitle( std::move( szTitle ) ); +@@ -544,6 +557,13 @@ namespace gamescope + m_bApplicationVisible = bVisible; + PushUserEvent( GAMESCOPE_SDL_EVENT_VISIBLE ); + } ++ void CSDLBackend::SetWindowMode( bool bFullscreen, int nWidth, int nHeight ) ++ { ++ m_bWantFullscreen = bFullscreen; ++ m_nWantWidth = nWidth; ++ m_nWantHeight = nHeight; ++ PushUserEvent( GAMESCOPE_SDL_EVENT_WINDOW_MODE ); ++ } + void CSDLBackend::SetTitle( std::shared_ptr<std::string> szTitle ) + { + m_pApplicationTitle = szTitle; +@@ -894,6 +914,38 @@ namespace gamescope + } + } + } ++ else if ( event.type == GetUserEventIndex( GAMESCOPE_SDL_EVENT_WINDOW_MODE ) ) ++ { ++ const bool bFullscreen = m_bWantFullscreen; ++ const int nWidth = bFullscreen ? 0 : m_nWantWidth.load(); ++ const int nHeight = bFullscreen ? 0 : m_nWantHeight.load(); ++ ++ if ( bFullscreen != m_bAppliedFullscreen || nWidth != m_nAppliedWidth || nHeight != m_nAppliedHeight ) ++ { ++ m_bAppliedFullscreen = bFullscreen; ++ m_nAppliedWidth = nWidth; ++ m_nAppliedHeight = nHeight; ++ g_bFullscreen = bFullscreen; ++ SDL_SetWindowFullscreen( m_Connector.GetSDLWindow(), bFullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0 ); ++ if ( !bFullscreen ) ++ { ++ static constexpr int k_nDesktopChromeHeight = 96; ++ ++ SDL_Rect usable = {}; ++ const int nDisplay = SDL_GetWindowDisplayIndex( m_Connector.GetSDLWindow() ); ++ const bool bKnown = SDL_GetDisplayUsableBounds( nDisplay, &usable ) == 0; ++ if ( bKnown && ( nWidth > usable.w || nHeight + k_nDesktopChromeHeight > usable.h ) ) ++ { ++ SDL_MaximizeWindow( m_Connector.GetSDLWindow() ); ++ } ++ else ++ { ++ SDL_RestoreWindow( m_Connector.GetSDLWindow() ); ++ SDL_SetWindowSize( m_Connector.GetSDLWindow(), nWidth, nHeight ); ++ } ++ } ++ } ++ } + else if ( event.type == GetUserEventIndex( GAMESCOPE_SDL_EVENT_TITLE ) ) + { + std::shared_ptr<std::string> pAppTitle = m_pApplicationTitle; +diff --git a/src/backend.h b/src/backend.h +index 37b936e..fbfa7c7 100644 +--- a/src/backend.h ++++ b/src/backend.h +@@ -273,6 +273,7 @@ namespace gamescope + virtual void SetRelativeMouseMode( bool bRelative ) = 0; + virtual void SetCursorPositionHint( double flX, double flY ) {} + virtual void SetVisible( bool bVisible ) = 0; ++ virtual void SetWindowMode( bool bFullscreen, int nWidth, int nHeight ) {} + virtual void SetTitle( std::shared_ptr<std::string> szTitle ) = 0; + virtual void SetIcon( std::shared_ptr<std::vector<uint32_t>> uIconPixels ) = 0; + virtual void SetSelection( std::shared_ptr<std::string> szContents, GamescopeSelection eSelection ) = 0; +diff --git a/src/main.cpp b/src/main.cpp +index eef4264..8f0ddd3 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -73,6 +73,7 @@ const struct option *gamescope_options = (struct option[]){ + { "rt", no_argument, nullptr, 0 }, + { "prefer-vk-device", required_argument, 0 }, + { "expose-wayland", no_argument, 0 }, ++ { "follow-game-window-mode", no_argument, 0 }, + { "mouse-sensitivity", required_argument, nullptr, 's' }, + { "mangoapp", no_argument, nullptr, 0 }, + { "adaptive-sync", no_argument, nullptr, 0 }, +@@ -700,6 +701,7 @@ static void UpdateCompatEnvVars() + int g_nPreferredOutputWidth = 0; + int g_nPreferredOutputHeight = 0; + bool g_bExposeWayland = false; ++bool g_bFollowGameWindowMode = false; + const char *g_sOutputName = nullptr; + bool g_bDebugLayers = false; + bool g_bForceDisableColorMgmt = false; +@@ -838,6 +840,8 @@ int main(int argc, char **argv) + cv_adaptive_sync = true; + } else if (strcmp(opt_name, "expose-wayland") == 0) { + g_bExposeWayland = true; ++ } else if (strcmp(opt_name, "follow-game-window-mode") == 0) { ++ g_bFollowGameWindowMode = true; + } else if (strcmp(opt_name, "backend") == 0) { + eCurrentBackend = parse_backend_name( optarg ); + } else if (strcmp(opt_name, "cursor-scale-height") == 0) { +diff --git a/src/main.hpp b/src/main.hpp +index b2a169f..48929f2 100644 +--- a/src/main.hpp ++++ b/src/main.hpp +@@ -134,6 +134,7 @@ extern int g_upscaleFilterSharpness; + extern bool g_bBorderlessOutputWindow; + + extern bool g_bExposeWayland; ++extern bool g_bFollowGameWindowMode; + + extern bool g_bRt; + +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +index c468fb3..3188b74 100644 +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -4741,6 +4741,54 @@ static void set_wm_state( xwayland_ctx_t *ctx, Window win, uint32_t state ) + sizeof(wmState) / sizeof(wmState[0])); + } + ++static bool ++window_offers_frame_controls( xwayland_ctx_t *ctx, steamcompmgr_win_t *w ) ++{ ++ static constexpr unsigned long k_ulMotifFunctions = 1ul << 0; ++ static constexpr unsigned long k_ulMotifMinimize = 1ul << 3; ++ static constexpr unsigned long k_ulMotifMaximize = 1ul << 4; ++ static constexpr unsigned long k_ulMotifDecorations = 1ul << 1; ++ ++ Atom type; ++ int format; ++ unsigned long nitems; ++ unsigned long bytesAfter; ++ unsigned char *data = nullptr; ++ if ( XGetWindowProperty( ctx->dpy, w->xwayland().id, ctx->atoms.motifWMHintsAtom, 0, 3, false, ++ AnyPropertyType, &type, &format, &nitems, &bytesAfter, &data ) != Success ) ++ return false; ++ ++ bool bControls = false; ++ if ( data && format == 32 && nitems >= 3 ) ++ { ++ const long *hints = (const long *)data; ++ bControls = ( ( hints[0] & k_ulMotifFunctions ) && ( hints[1] & ( k_ulMotifMinimize | k_ulMotifMaximize ) ) ) || ++ ( ( hints[0] & k_ulMotifDecorations ) && hints[2] ); ++ } ++ if ( data ) ++ XFree( data ); ++ return bControls; ++} ++ ++static void ++apply_game_window_mode( global_focus_t *pFocus ) ++{ ++ static constexpr int k_nSmallestFollowedWindow = 64; ++ ++ steamcompmgr_win_t *w = pFocus->focusWindow; ++ if ( !g_bFollowGameWindowMode || !pFocus->GetNestedHints() || !w || w->type != steamcompmgr_win_type_t::XWAYLAND ) ++ return; ++ ++ xwayland_ctx_t *ctx = w->xwayland().ctx; ++ const XWindowAttributes &a = w->xwayland().a; ++ if ( a.width < k_nSmallestFollowedWindow || a.height < k_nSmallestFollowedWindow ) ++ return; ++ ++ const bool bCoversScreen = a.x == 0 && a.y == 0 && a.width >= ctx->root_width && a.height >= ctx->root_height; ++ const bool bFullscreen = w->isFullscreen || ( w->appID && bCoversScreen && !window_offers_frame_controls( ctx, w ) ); ++ pFocus->GetNestedHints()->SetWindowMode( bFullscreen, a.width, a.height ); ++} ++ + static void + fit_root_to_focus_window( xwayland_ctx_t *ctx ) + { +@@ -5739,6 +5787,7 @@ determine_and_apply_focus( global_focus_t *pFocus ) + if ( pFocus->focusWindow ) + { + pFocus->GetNestedHints()->SetVisible( true ); ++ apply_game_window_mode( pFocus ); + if ( previousLocalFocus.focusWindow != pFocus->focusWindow ) + { + pFocus->GetNestedHints()->SetTitle( pFocus->focusWindow->title ); +@@ -7083,6 +7132,8 @@ static inline float santitize_float( float f ) + static void + handle_property_notify(xwayland_ctx_t *ctx, XPropertyEvent *ev) + { ++ if (ev->atom == ctx->atoms.motifWMHintsAtom) ++ MakeFocusDirty(); + /* check if Trans property was changed */ + if (ev->atom == ctx->atoms.opacityAtom) + { +@@ -9216,6 +9267,7 @@ void init_xwayland_ctx(uint32_t serverId, gamescope_xwayland_server_t *xwayland_ + ctx->atoms.winNormalAtom = XInternAtom(ctx->dpy, "_NET_WM_WINDOW_TYPE_NORMAL", false); + ctx->atoms.sizeHintsAtom = XInternAtom(ctx->dpy, "WM_NORMAL_HINTS", false); + ctx->atoms.netWMStateFullscreenAtom = XInternAtom(ctx->dpy, "_NET_WM_STATE_FULLSCREEN", false); ++ ctx->atoms.motifWMHintsAtom = XInternAtom(ctx->dpy, "_MOTIF_WM_HINTS", false); + ctx->atoms.netActiveWindowAtom = XInternAtom(ctx->dpy, "_NET_ACTIVE_WINDOW", false); + ctx->atoms.netWMStateAtom = XInternAtom(ctx->dpy, "_NET_WM_STATE", false); + ctx->atoms.WMTransientForAtom = XInternAtom(ctx->dpy, "WM_TRANSIENT_FOR", false); +diff --git a/src/xwayland_ctx.hpp b/src/xwayland_ctx.hpp +index 15c2e6b..525b155 100644 +--- a/src/xwayland_ctx.hpp ++++ b/src/xwayland_ctx.hpp +@@ -128,6 +128,7 @@ struct xwayland_ctx_t final : public gamescope::IWaitable + Atom winNormalAtom; + Atom sizeHintsAtom; + Atom netWMStateFullscreenAtom; ++ Atom motifWMHintsAtom; + Atom netActiveWindowAtom; + Atom netWMStateAtom; + Atom WMTransientForAtom; diff --git a/tools/gamescope/release.env b/tools/gamescope/release.env index a73f1985b8..a5633d960d 100644 --- a/tools/gamescope/release.env +++ b/tools/gamescope/release.env @@ -1,3 +1,3 @@ GAMESCOPE_REPO=Droid-Deck/DroidDeck-Components -GAMESCOPE_TAG=gamescope-3.16.29-p19 -GAMESCOPE_SHA256=e7333c6a2b95708b199c2c5bd0973e3f0e711e2dc746950cc648c2515ea2926b +GAMESCOPE_TAG=gamescope-3.16.29-p21 +GAMESCOPE_SHA256=c34d2728eb31a5ded35e5cb874e68dd4932a7fba4bcce5f99edf654108f97018 diff --git a/tools/gpuload/build.sh b/tools/gpuload/build.sh new file mode 100755 index 0000000000..b2729de7fe --- /dev/null +++ b/tools/gpuload/build.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash +# Builds VK_LAYER_DROIDDECK_gpu_load for the arm64 guest: tools/gpuload/build.sh [--native] OUT +# OUT gets libVkLayer_droiddeck_gpuload.so and its implicit-layer manifest. +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +repo=$(cd "$here/../.." && pwd) +. "$repo/tools/docker_platform.sh" + +native=0 +if [ "${1:-}" = --native ]; then native=1; shift; fi +out=${1:?usage: tools/gpuload/build.sh [--native] OUT} +case "$out" in /*) ;; *) out="$PWD/$out" ;; esac + +vkinc=${VK_INCLUDE:-} +if [ -z "$vkinc" ]; then + ndks=("${NDK:-}" "${ANDROID_NDK_HOME:-}" "${ANDROID_NDK_LATEST_HOME:-}") + sdk_ndks=("${ANDROID_HOME:-$HOME/Library/Android/sdk}"/ndk/*) + for ((i = ${#sdk_ndks[@]} - 1; i >= 0; i--)); do ndks+=("${sdk_ndks[i]}"); done + for ndk in "${ndks[@]}"; do + [ -n "$ndk" ] && [ -d "$ndk" ] || continue + for cand in "$ndk"/toolchains/llvm/prebuilt/*/sysroot/usr/include; do + if [ -f "$cand/vulkan/vk_layer.h" ]; then vkinc=$cand; break 2; fi + done + done +fi +[ -n "$vkinc" ] && [ -f "$vkinc/vulkan/vulkan_core.h" ] || { echo "tools/gpuload/build.sh: no Vulkan headers (set VK_INCLUDE)" >&2; exit 1; } + +work="$repo/build/gpuload" +rm -rf "$work" && mkdir -p "$work/include" "$work/out" +cp -R "$vkinc/vulkan" "$work/include/" +if [ -d "$vkinc/vk_video" ]; then cp -R "$vkinc/vk_video" "$work/include/"; fi + +cmd=(sh -c ' + set -e + cc -std=c11 -O2 -Wall -Wextra -Werror -Itools/gpuload/src -o build/gpuload/test_gpuload_busy tools/gpuload/tests/test_gpuload_busy.c + build/gpuload/test_gpuload_busy + cc -std=c11 -O2 -Wall -Wextra -Werror -Ibuild/gpuload/include -Itools/gpuload/src -o build/gpuload/test_gpuload_ring tools/gpuload/tests/test_gpuload_ring.c + build/gpuload/test_gpuload_ring + aarch64-linux-gnu-gcc -std=c11 -shared -fPIC -O2 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers \ + -fvisibility=hidden -pthread -Wl,-z,defs -Ibuild/gpuload/include -Itools/gpuload/src \ + -o build/gpuload/out/libVkLayer_droiddeck_gpuload.so tools/gpuload/src/vk_layer_droiddeck_gpuload.c + aarch64-linux-gnu-strip --strip-unneeded build/gpuload/out/libVkLayer_droiddeck_gpuload.so') +if [ "$native" = 1 ]; then + (cd "$repo" && "${cmd[@]}") +else + docker run --rm --platform "${DROIDDECK_DOCKER_PLATFORM:-linux/amd64}" --user "$(id -u):$(id -g)" -v "$repo:/src" -w /src \ + "${DROIDDECK_BUILD_IMAGE:-droiddeck-local-cross:24.04-v3}" "${cmd[@]}" +fi + +cp "$here/layer/VK_LAYER_DROIDDECK_gpu_load.json" "$work/out/" +mkdir -p "$out" +cp "$work/out/libVkLayer_droiddeck_gpuload.so" "$work/out/VK_LAYER_DROIDDECK_gpu_load.json" "$out/" +echo "built $out" diff --git a/tools/gpuload/layer/VK_LAYER_DROIDDECK_gpu_load.json b/tools/gpuload/layer/VK_LAYER_DROIDDECK_gpu_load.json new file mode 100644 index 0000000000..9fa67bc631 --- /dev/null +++ b/tools/gpuload/layer/VK_LAYER_DROIDDECK_gpu_load.json @@ -0,0 +1,20 @@ +{ + "file_format_version": "1.2.0", + "layer": { + "name": "VK_LAYER_DROIDDECK_gpu_load", + "type": "GLOBAL", + "library_path": "/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so", + "api_version": "1.3.0", + "implementation_version": "1", + "description": "Times this process's GPU work for DroidDeck's HUD where Android hides the GPU load; idle unless a HUD is shown", + "functions": { + "vkNegotiateLoaderLayerInterfaceVersion": "DroidDeckGpuLoad_NegotiateLoaderLayerInterfaceVersion" + }, + "enable_environment": { + "DROIDDECK_GPU_LOAD": "1" + }, + "disable_environment": { + "DROIDDECK_GPU_LOAD_DISABLE": "1" + } + } +} diff --git a/tools/gpuload/src/gpuload_busy.h b/tools/gpuload/src/gpuload_busy.h new file mode 100644 index 0000000000..e5a47fb136 --- /dev/null +++ b/tools/gpuload/src/gpuload_busy.h @@ -0,0 +1,22 @@ +// Busy-time bookkeeping shared by VK_LAYER_DROIDDECK_gpu_load and DroidDeck's compositor, kept free of Vulkan so it +// can be tested on its own. +#ifndef DROIDDECK_GPULOAD_BUSY_H +#define DROIDDECK_GPULOAD_BUSY_H + +#include <stdint.h> + +// GPU ticks between the timestamp written before a batch and the one written after it. Batches on one queue run one +// after the other, so these add up without overlap. Ticks are never compared across batches: on Adreno the always-on +// counter behind the timestamps restarts when the GPU powers down between batches (seen on the Retroid Pocket Duo). +// Anything backwards or longer than max_ticks is a bogus pair and counts as nothing. +static inline uint64_t gpuload_interval(uint64_t start, uint64_t end, uint64_t max_ticks) { + return end > start && end - start <= max_ticks ? end - start : 0; +} + +// A timestamp query slot is reused once its end is available; until the GPU runs the slot's reset again the +// query still shows the previous end, so a result equal to the last one harvested is the old one. +static inline int gpuload_result_is_new(uint64_t start_avail, uint64_t end_avail, uint64_t end, uint64_t last_end) { + return start_avail && end_avail && end != last_end; +} + +#endif diff --git a/tools/gpuload/src/gpuload_ring.h b/tools/gpuload/src/gpuload_ring.h new file mode 100644 index 0000000000..58f6abcb70 --- /dev/null +++ b/tools/gpuload/src/gpuload_ring.h @@ -0,0 +1,215 @@ +// Timestamp ring shared by VK_LAYER_DROIDDECK_gpu_load (guest) and DroidDeck's compositor (app): each submit batch +// that has command buffers gets one of the ring's command buffers in front (resets a query pair, writes a TOP_OF_PIPE +// timestamp) and one behind (BOTTOM_OF_PIPE timestamp). Finished pairs are read back without waiting. +// The start timestamp sits after the batch's semaphore waits only because Turnip and Qualcomm's driver on kgsl hold a +// whole batch until its waits signal; a driver that starts TOP_OF_PIPE work earlier would count the wait as busy. +// Callers serialize access to one ring (a queue's submits are externally synchronized anyway). +#ifndef DROIDDECK_GPULOAD_RING_H +#define DROIDDECK_GPULOAD_RING_H + +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <vulkan/vulkan.h> + +#include "gpuload_busy.h" + +#define GPULOAD_RING 64 + +typedef VkResult(VKAPI_PTR *gpuload_set_data_fn)(VkDevice device, void *object); + +struct gpuload_vk { + VkDevice device; + PFN_vkCreateCommandPool create_pool; + PFN_vkDestroyCommandPool destroy_pool; + PFN_vkAllocateCommandBuffers alloc_cmds; + PFN_vkBeginCommandBuffer begin; + PFN_vkEndCommandBuffer end; + PFN_vkCmdResetQueryPool cmd_reset; + PFN_vkCmdWriteTimestamp cmd_timestamp; + PFN_vkCreateQueryPool create_queries; + PFN_vkDestroyQueryPool destroy_queries; + PFN_vkGetQueryPoolResults results; + gpuload_set_data_fn set_data; // a layer must give the loader every command buffer it allocates; NULL elsewhere + double period_ns; + uint64_t max_ticks; +}; + +struct gpuload_slot { + VkCommandBuffer start, end; + uint64_t last_end; +}; + +struct gpuload_ring { + int state; // 0 not set up, 1 timing, -1 cannot time + VkCommandPool pool; + VkQueryPool queries; + uint64_t mask; + uint32_t next, oldest, inflight; + struct gpuload_slot slot[GPULOAD_RING]; +}; + +#define GPULOAD_LONGEST_BATCH_NS 2000000000.0 + +static inline void gpuload_vk_period(struct gpuload_vk *v, float timestamp_period) { + v->period_ns = timestamp_period; + v->max_ticks = timestamp_period > 0 ? (uint64_t)(GPULOAD_LONGEST_BATCH_NS / timestamp_period) : 0; +} + +static inline int gpuload_vk_complete(const struct gpuload_vk *v) { + return v->device && v->create_pool && v->destroy_pool && v->alloc_cmds && v->begin && v->end && v->cmd_reset && + v->cmd_timestamp && v->create_queries && v->destroy_queries && v->results && v->period_ns > 0; +} + +static inline void gpuload_ring_release(struct gpuload_ring *r, const struct gpuload_vk *v) { + if (r->queries) v->destroy_queries(v->device, r->queries, NULL); + if (r->pool) v->destroy_pool(v->device, r->pool, NULL); + r->queries = VK_NULL_HANDLE; + r->pool = VK_NULL_HANDLE; + r->next = r->oldest = r->inflight = 0; +} + +static inline int gpuload_ring_record(struct gpuload_ring *r, const struct gpuload_vk *v, uint32_t i) { + const VkCommandBufferBeginInfo begin = {.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO}; + struct gpuload_slot *s = &r->slot[i]; + if (v->begin(s->start, &begin) != VK_SUCCESS) return 0; + v->cmd_reset(s->start, r->queries, 2 * i, 2); + v->cmd_timestamp(s->start, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, r->queries, 2 * i); + if (v->end(s->start) != VK_SUCCESS) return 0; + if (v->begin(s->end, &begin) != VK_SUCCESS) return 0; + v->cmd_timestamp(s->end, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, r->queries, 2 * i + 1); + return v->end(s->end) == VK_SUCCESS; +} + +// Sets the ring up for a queue of this family; returns 1 when it can time it (r->state says the same afterwards). +static inline int gpuload_ring_setup(struct gpuload_ring *r, const struct gpuload_vk *v, uint32_t family, + uint32_t timestamp_bits) { + r->state = -1; + if (!timestamp_bits || !gpuload_vk_complete(v)) return 0; + r->mask = timestamp_bits >= 64 ? ~0ull : (1ull << timestamp_bits) - 1; + const VkCommandPoolCreateInfo pool = {.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, .queueFamilyIndex = family}; + const VkQueryPoolCreateInfo queries = {.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO, + .queryType = VK_QUERY_TYPE_TIMESTAMP, .queryCount = 2 * GPULOAD_RING}; + VkCommandBuffer cmds[2 * GPULOAD_RING]; + if (v->create_pool(v->device, &pool, NULL, &r->pool) != VK_SUCCESS) { r->pool = VK_NULL_HANDLE; goto fail; } + if (v->create_queries(v->device, &queries, NULL, &r->queries) != VK_SUCCESS) { r->queries = VK_NULL_HANDLE; goto fail; } + const VkCommandBufferAllocateInfo alloc = {.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, .commandPool = r->pool, + .level = VK_COMMAND_BUFFER_LEVEL_PRIMARY, .commandBufferCount = 2 * GPULOAD_RING}; + if (v->alloc_cmds(v->device, &alloc, cmds) != VK_SUCCESS) goto fail; + for (uint32_t i = 0; i < 2 * GPULOAD_RING; i++) + if (v->set_data && v->set_data(v->device, cmds[i]) != VK_SUCCESS) goto fail; + for (uint32_t i = 0; i < GPULOAD_RING; i++) { + r->slot[i].start = cmds[2 * i]; + r->slot[i].end = cmds[2 * i + 1]; + r->slot[i].last_end = 0; + if (!gpuload_ring_record(r, v, i)) goto fail; + } + r->next = r->oldest = r->inflight = 0; + r->state = 1; + return 1; +fail: + gpuload_ring_release(r, v); + r->state = -1; + return 0; +} + +// Nanoseconds of GPU time in the batches that finished since the last call. Slots are taken in ring order and a +// queue runs its batches in order, so the oldest slot finishes first. +static inline uint64_t gpuload_ring_harvest(struct gpuload_ring *r, const struct gpuload_vk *v) { + uint64_t ticks = 0; + while (r->inflight) { + struct gpuload_slot *s = &r->slot[r->oldest]; + uint64_t q[4] = {0, 0, 0, 0}; + VkResult res = v->results(v->device, r->queries, 2 * r->oldest, 2, sizeof(q), q, 2 * sizeof(uint64_t), + VK_QUERY_RESULT_64_BIT | VK_QUERY_RESULT_WITH_AVAILABILITY_BIT); + if (res != VK_SUCCESS && res != VK_NOT_READY) break; + uint64_t start = q[0] & r->mask, end = q[2] & r->mask; + if (!gpuload_result_is_new(q[1], q[3], end, s->last_end)) break; + s->last_end = end; + r->oldest = (r->oldest + 1) % GPULOAD_RING; + r->inflight--; + ticks += gpuload_interval(start, end, v->max_ticks); + } + return (uint64_t)((double)ticks * v->period_ns); +} + +static inline int gpuload_plain_batch(const void *next) { + for (const VkBaseInStructure *s = (const VkBaseInStructure *)next; s; s = s->pNext) { + if (s->sType == VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO) return 0; + if (s->sType == VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO && ((const VkProtectedSubmitInfo *)s)->protectedSubmit) + return 0; + } + return 1; +} + +static inline struct gpuload_slot *gpuload_ring_take(struct gpuload_ring *r) { + if (r->inflight >= GPULOAD_RING) return NULL; + struct gpuload_slot *s = &r->slot[r->next]; + r->next = (r->next + 1) % GPULOAD_RING; + r->inflight++; + return s; +} + +// Gives back the slots of a submit that failed. +static inline void gpuload_ring_unwind(struct gpuload_ring *r, uint32_t used) { + r->next = (r->next + GPULOAD_RING - used) % GPULOAD_RING; + r->inflight -= used; +} + +// A copy of the batches with the ring's command buffers around each one that has command buffers (free() it after +// the submit), or NULL to submit the originals. *used counts the slots taken, for gpuload_ring_unwind. +static inline VkSubmitInfo *gpuload_ring_wrap(struct gpuload_ring *r, uint32_t count, const VkSubmitInfo *infos, + uint32_t *used) { + *used = 0; + size_t cmds = 0; + for (uint32_t i = 0; i < count; i++) cmds += infos[i].commandBufferCount + 2; + VkSubmitInfo *mine = (VkSubmitInfo *)malloc(count * sizeof(*mine) + cmds * sizeof(VkCommandBuffer)); + if (!mine) return NULL; + VkCommandBuffer *list = (VkCommandBuffer *)(mine + count); + for (uint32_t i = 0; i < count; i++) { + uint32_t n = infos[i].commandBufferCount; + mine[i] = infos[i]; + if (!n || !gpuload_plain_batch(infos[i].pNext)) continue; + struct gpuload_slot *s = gpuload_ring_take(r); + if (!s) continue; + list[0] = s->start; + memcpy(list + 1, infos[i].pCommandBuffers, n * sizeof(VkCommandBuffer)); + list[n + 1] = s->end; + mine[i].pCommandBuffers = list; + mine[i].commandBufferCount = n + 2; + list += n + 2; + (*used)++; + } + return mine; +} + +static inline VkSubmitInfo2 *gpuload_ring_wrap2(struct gpuload_ring *r, uint32_t count, const VkSubmitInfo2 *infos, + uint32_t *used) { + *used = 0; + size_t cmds = 0; + for (uint32_t i = 0; i < count; i++) cmds += infos[i].commandBufferInfoCount + 2; + VkSubmitInfo2 *mine = (VkSubmitInfo2 *)malloc(count * sizeof(*mine) + cmds * sizeof(VkCommandBufferSubmitInfo)); + if (!mine) return NULL; + VkCommandBufferSubmitInfo *list = (VkCommandBufferSubmitInfo *)(mine + count); + for (uint32_t i = 0; i < count; i++) { + uint32_t n = infos[i].commandBufferInfoCount; + mine[i] = infos[i]; + if (!n || (infos[i].flags & VK_SUBMIT_PROTECTED_BIT) || !gpuload_plain_batch(infos[i].pNext)) continue; + struct gpuload_slot *s = gpuload_ring_take(r); + if (!s) continue; + memset(&list[0], 0, sizeof(list[0])); + list[0].sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO; + list[0].commandBuffer = s->start; + memcpy(list + 1, infos[i].pCommandBufferInfos, n * sizeof(VkCommandBufferSubmitInfo)); + memset(&list[n + 1], 0, sizeof(list[n + 1])); + list[n + 1].sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO; + list[n + 1].commandBuffer = s->end; + mine[i].pCommandBufferInfos = list; + mine[i].commandBufferInfoCount = n + 2; + list += n + 2; + (*used)++; + } + return mine; +} + +#endif diff --git a/tools/gpuload/src/vk_layer_droiddeck_gpuload.c b/tools/gpuload/src/vk_layer_droiddeck_gpuload.c new file mode 100644 index 0000000000..ef58bef6db --- /dev/null +++ b/tools/gpuload/src/vk_layer_droiddeck_gpuload.c @@ -0,0 +1,410 @@ +// VK_LAYER_DROIDDECK_gpu_load: this process's GPU busy time for the HUD where Android keeps the GPU load from apps +// (kgsl sysfs SELinux-blocked, perfcounter reads refused while /sys/class/kgsl/kgsl-3d0/perfcounter is 0). +// The process total in nanoseconds goes to $DROIDDECK_GPU_LOAD_DIR/<pid>; nothing is timed while +// $DROIDDECK_GPU_LOAD_DIR/on is missing (the app removes it while no HUD is shown). +#define _GNU_SOURCE +#include <vulkan/vulkan.h> +#include <vulkan/vk_layer.h> + +#include <errno.h> +#include <fcntl.h> +#include <pthread.h> +#include <stdatomic.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> +#include <time.h> +#include <unistd.h> + +#include "gpuload_ring.h" + +#define EXPORT __attribute__((visibility("default"))) +#define MAX_FAMILIES 32 +#define WANTED_CHECK_NS 500000000ull +#define WRITE_EVERY_NS 100000000ull + +static const char *g_dir; + +static void say(const char *what) { + // FEX leaves program_invocation_short_name empty for x86 programs. + fprintf(stderr, "[droiddeck-gpu-load] %s (pid %d): %s\n", program_invocation_short_name, (int)getpid(), what); +} + +__attribute__((constructor)) static void init(void) { + const char *dir = getenv("DROIDDECK_GPU_LOAD_DIR"); + g_dir = dir && *dir ? dir : NULL; +} + +static uint64_t now_ns(void) { + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return (uint64_t)ts.tv_sec * 1000000000ull + (uint64_t)ts.tv_nsec; +} + +struct inst { + struct inst *next_in_list; + VkInstance handle; + PFN_vkGetInstanceProcAddr gipa; + PFN_vkDestroyInstance destroy; + PFN_vkGetPhysicalDeviceProperties props; + PFN_vkGetPhysicalDeviceQueueFamilyProperties families; +}; + +struct dev { + struct dev *next_in_list; + VkDevice handle; + PFN_vkGetDeviceProcAddr gdpa; + PFN_vkDestroyDevice destroy; + PFN_vkGetDeviceQueue get_queue; + PFN_vkGetDeviceQueue2 get_queue2; + PFN_vkQueueSubmit submit; + PFN_vkQueueSubmit2 submit2; + PFN_vkQueueSubmit2 submit2_khr; + struct gpuload_vk vk; + uint32_t family_count; + uint32_t timestamp_bits[MAX_FAMILIES]; +}; + +struct queue { + struct queue *next_in_list; + VkQueue handle; + struct dev *dev; + uint32_t family; + uint32_t epoch; + struct gpuload_ring ring; +}; + +static pthread_mutex_t g_lock = PTHREAD_MUTEX_INITIALIZER; +static struct inst *g_insts; +static struct dev *g_devs; +static struct queue *g_queues; + +static void *key(const void *obj) { return *(void *const *)obj; } + +static struct inst *inst_for(const void *obj) { + struct inst *r; + pthread_mutex_lock(&g_lock); + for (r = g_insts; r && key(r->handle) != key(obj); r = r->next_in_list) {} + pthread_mutex_unlock(&g_lock); + return r; +} + +static struct dev *dev_for(const void *obj) { + struct dev *r; + pthread_mutex_lock(&g_lock); + for (r = g_devs; r && key(r->handle) != key(obj); r = r->next_in_list) {} + pthread_mutex_unlock(&g_lock); + return r; +} + +static struct queue *queue_for(VkQueue handle) { + struct queue *r; + pthread_mutex_lock(&g_lock); + for (r = g_queues; r && r->handle != handle; r = r->next_in_list) {} + pthread_mutex_unlock(&g_lock); + return r; +} + +static void note_queue(struct dev *d, VkQueue handle, uint32_t family) { + if (!handle || queue_for(handle)) return; + struct queue *q = calloc(1, sizeof(*q)); + if (!q) return; + q->handle = handle; + q->dev = d; + q->family = family; + pthread_mutex_lock(&g_lock); + q->next_in_list = g_queues; + g_queues = q; + pthread_mutex_unlock(&g_lock); +} + +// ---- process total --------------------------------------------------------------------------------------------- + +static _Atomic uint64_t g_busy_ns; +static _Atomic uint64_t g_wanted_at; +static _Atomic int g_wanted; +static _Atomic uint32_t g_epoch = 1; // bumped each time the HUD comes back +static pthread_mutex_t g_write_lock = PTHREAD_MUTEX_INITIALIZER; +static uint64_t g_written_at; +static int g_fd = -1; +static pid_t g_fd_pid; +static int g_announced; + +static int wanted(uint64_t now) { + uint64_t at = atomic_load(&g_wanted_at); + if (at && now - at < WANTED_CHECK_NS) return atomic_load(&g_wanted); + atomic_store(&g_wanted_at, now); + char path[512]; + snprintf(path, sizeof(path), "%s/on", g_dir); + int on = access(path, F_OK) == 0; + if (on && !atomic_exchange(&g_wanted, on)) atomic_fetch_add(&g_epoch, 1); + if (!on) atomic_store(&g_wanted, 0); + return on; +} + +static void publish(uint64_t now) { + if (pthread_mutex_trylock(&g_write_lock)) return; + if (now - g_written_at >= WRITE_EVERY_NS) { + g_written_at = now; + pid_t pid = getpid(); + struct stat st; + // The app deletes files that stopped changing; a forked child needs its own. + if (g_fd >= 0 && (g_fd_pid != pid || fstat(g_fd, &st) || st.st_nlink == 0)) { close(g_fd); g_fd = -1; } + if (g_fd < 0) { + char path[512]; + snprintf(path, sizeof(path), "%s/%d", g_dir, (int)pid); + g_fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644); + g_fd_pid = pid; + } + if (g_fd >= 0) { + char line[80]; + int n = snprintf(line, sizeof(line), "%20llu %-32.32s\n", (unsigned long long)atomic_load(&g_busy_ns), + program_invocation_short_name); + if (pwrite(g_fd, line, (size_t)n, 0) != n) { close(g_fd); g_fd = -1; } + } + } + pthread_mutex_unlock(&g_write_lock); +} + +// The queue to time this submit on, or NULL to pass it through. +static struct queue *measuring(VkQueue handle) { + if (!g_dir) return NULL; + struct queue *q = queue_for(handle); + if (!q) return NULL; + uint64_t now = now_ns(); + if (!wanted(now)) return NULL; + struct dev *d = q->dev; + if (q->ring.state == 0) { + uint32_t bits = q->family < d->family_count ? d->timestamp_bits[q->family] : 0; + if (gpuload_ring_setup(&q->ring, &d->vk, q->family, bits)) { + if (!__atomic_exchange_n(&g_announced, 1, __ATOMIC_RELAXED)) say("timing this process's GPU work for the HUD"); + } else { + say(bits ? "cannot set up GPU timing on this queue" : "this queue family has no timestamps"); + } + q->epoch = atomic_load(&g_epoch); + } + if (q->ring.state != 1) return NULL; + uint64_t ns = gpuload_ring_harvest(&q->ring, &d->vk); + uint32_t epoch = atomic_load(&g_epoch); + if (q->epoch == epoch) atomic_fetch_add(&g_busy_ns, ns); + else q->epoch = epoch; // timed before the HUD went away + publish(now); + return q; +} + +static VkResult VKAPI_CALL QueueSubmit(VkQueue queue, uint32_t count, const VkSubmitInfo *infos, VkFence fence) { + struct dev *d = dev_for(queue); + if (!d) return VK_ERROR_DEVICE_LOST; + struct queue *q = count ? measuring(queue) : NULL; + uint32_t used = 0; + VkSubmitInfo *mine = q ? gpuload_ring_wrap(&q->ring, count, infos, &used) : NULL; + VkResult r = d->submit(queue, count, mine ? mine : infos, fence); + if (mine && r != VK_SUCCESS) gpuload_ring_unwind(&q->ring, used); + free(mine); + return r; +} + +static VkResult submit2(PFN_vkQueueSubmit2 next, VkQueue queue, uint32_t count, const VkSubmitInfo2 *infos, VkFence fence) { + struct queue *q = count ? measuring(queue) : NULL; + uint32_t used = 0; + VkSubmitInfo2 *mine = q ? gpuload_ring_wrap2(&q->ring, count, infos, &used) : NULL; + VkResult r = next(queue, count, mine ? mine : infos, fence); + if (mine && r != VK_SUCCESS) gpuload_ring_unwind(&q->ring, used); + free(mine); + return r; +} + +static VkResult VKAPI_CALL QueueSubmit2(VkQueue queue, uint32_t count, const VkSubmitInfo2 *infos, VkFence fence) { + struct dev *d = dev_for(queue); + return d ? submit2(d->submit2, queue, count, infos, fence) : VK_ERROR_DEVICE_LOST; +} + +static VkResult VKAPI_CALL QueueSubmit2KHR(VkQueue queue, uint32_t count, const VkSubmitInfo2 *infos, VkFence fence) { + struct dev *d = dev_for(queue); + return d ? submit2(d->submit2_khr, queue, count, infos, fence) : VK_ERROR_DEVICE_LOST; +} + +static void VKAPI_CALL GetDeviceQueue(VkDevice device, uint32_t family, uint32_t index, VkQueue *out) { + struct dev *d = dev_for(device); + if (!d) return; + d->get_queue(device, family, index, out); + if (out && *out) note_queue(d, *out, family); +} + +static void VKAPI_CALL GetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *out) { + struct dev *d = dev_for(device); + if (!d) return; + d->get_queue2(device, info, out); + if (out && *out) note_queue(d, *out, info->queueFamilyIndex); +} + +// ---- instance and device --------------------------------------------------------------------------------------- + +static VkResult VKAPI_CALL CreateInstance(const VkInstanceCreateInfo *ci, const VkAllocationCallbacks *alloc, VkInstance *out) { + VkLayerInstanceCreateInfo *link = (VkLayerInstanceCreateInfo *)ci->pNext; + while (link && !(link->sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO && link->function == VK_LAYER_LINK_INFO)) + link = (VkLayerInstanceCreateInfo *)link->pNext; + if (!link) return VK_ERROR_INITIALIZATION_FAILED; + PFN_vkGetInstanceProcAddr next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr; + link->u.pLayerInfo = link->u.pLayerInfo->pNext; + PFN_vkCreateInstance create = (PFN_vkCreateInstance)next_gipa(VK_NULL_HANDLE, "vkCreateInstance"); + if (!create) return VK_ERROR_INITIALIZATION_FAILED; + struct inst *in = calloc(1, sizeof(*in)); + if (!in) return VK_ERROR_OUT_OF_HOST_MEMORY; + VkResult r = create(ci, alloc, out); + if (r != VK_SUCCESS) { free(in); return r; } + in->handle = *out; + in->gipa = next_gipa; + in->destroy = (PFN_vkDestroyInstance)next_gipa(*out, "vkDestroyInstance"); + in->props = (PFN_vkGetPhysicalDeviceProperties)next_gipa(*out, "vkGetPhysicalDeviceProperties"); + in->families = (PFN_vkGetPhysicalDeviceQueueFamilyProperties)next_gipa(*out, "vkGetPhysicalDeviceQueueFamilyProperties"); + pthread_mutex_lock(&g_lock); + in->next_in_list = g_insts; + g_insts = in; + pthread_mutex_unlock(&g_lock); + return VK_SUCCESS; +} + +static void VKAPI_CALL DestroyInstance(VkInstance instance, const VkAllocationCallbacks *alloc) { + struct inst *in = inst_for(instance); + if (!in) return; + PFN_vkDestroyInstance destroy = in->destroy; + pthread_mutex_lock(&g_lock); + for (struct inst **p = &g_insts; *p; p = &(*p)->next_in_list) + if (*p == in) { *p = in->next_in_list; break; } + pthread_mutex_unlock(&g_lock); + free(in); + if (destroy) destroy(instance, alloc); +} + +static VkLayerDeviceCreateInfo *device_chain(const VkDeviceCreateInfo *ci, VkLayerFunction function) { + VkLayerDeviceCreateInfo *c = (VkLayerDeviceCreateInfo *)ci->pNext; + while (c && !(c->sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO && c->function == function)) + c = (VkLayerDeviceCreateInfo *)c->pNext; + return c; +} + +static VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice pd, const VkDeviceCreateInfo *ci, const VkAllocationCallbacks *alloc, + VkDevice *out) { + VkLayerDeviceCreateInfo *link = device_chain(ci, VK_LAYER_LINK_INFO); + if (!link) return VK_ERROR_INITIALIZATION_FAILED; + VkLayerDeviceCreateInfo *callback = device_chain(ci, VK_LOADER_DATA_CALLBACK); + PFN_vkGetInstanceProcAddr next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr; + PFN_vkGetDeviceProcAddr next_gdpa = link->u.pLayerInfo->pfnNextGetDeviceProcAddr; + link->u.pLayerInfo = link->u.pLayerInfo->pNext; + struct inst *in = inst_for(pd); + PFN_vkCreateDevice create = (PFN_vkCreateDevice)next_gipa(in ? in->handle : VK_NULL_HANDLE, "vkCreateDevice"); + if (!create) return VK_ERROR_INITIALIZATION_FAILED; + struct dev *d = calloc(1, sizeof(*d)); + if (!d) return VK_ERROR_OUT_OF_HOST_MEMORY; + VkResult r = create(pd, ci, alloc, out); + if (r != VK_SUCCESS) { free(d); return r; } + d->handle = *out; + d->gdpa = next_gdpa; +#define LOAD(field, type, name) d->field = (type)next_gdpa(*out, name) + LOAD(destroy, PFN_vkDestroyDevice, "vkDestroyDevice"); + LOAD(get_queue, PFN_vkGetDeviceQueue, "vkGetDeviceQueue"); + LOAD(get_queue2, PFN_vkGetDeviceQueue2, "vkGetDeviceQueue2"); + LOAD(submit, PFN_vkQueueSubmit, "vkQueueSubmit"); + LOAD(submit2, PFN_vkQueueSubmit2, "vkQueueSubmit2"); + LOAD(submit2_khr, PFN_vkQueueSubmit2, "vkQueueSubmit2KHR"); + LOAD(vk.create_pool, PFN_vkCreateCommandPool, "vkCreateCommandPool"); + LOAD(vk.destroy_pool, PFN_vkDestroyCommandPool, "vkDestroyCommandPool"); + LOAD(vk.alloc_cmds, PFN_vkAllocateCommandBuffers, "vkAllocateCommandBuffers"); + LOAD(vk.begin, PFN_vkBeginCommandBuffer, "vkBeginCommandBuffer"); + LOAD(vk.end, PFN_vkEndCommandBuffer, "vkEndCommandBuffer"); + LOAD(vk.cmd_reset, PFN_vkCmdResetQueryPool, "vkCmdResetQueryPool"); + LOAD(vk.cmd_timestamp, PFN_vkCmdWriteTimestamp, "vkCmdWriteTimestamp"); + LOAD(vk.create_queries, PFN_vkCreateQueryPool, "vkCreateQueryPool"); + LOAD(vk.destroy_queries, PFN_vkDestroyQueryPool, "vkDestroyQueryPool"); + LOAD(vk.results, PFN_vkGetQueryPoolResults, "vkGetQueryPoolResults"); +#undef LOAD + d->vk.device = *out; + d->vk.set_data = callback ? (gpuload_set_data_fn)callback->u.pfnSetDeviceLoaderData : NULL; + if (in && in->props && in->families) { + VkPhysicalDeviceProperties props; + in->props(pd, &props); + gpuload_vk_period(&d->vk, props.limits.timestampPeriod); + uint32_t n = 0; + in->families(pd, &n, NULL); + VkQueueFamilyProperties families[MAX_FAMILIES]; + if (n > MAX_FAMILIES) n = MAX_FAMILIES; + in->families(pd, &n, families); + d->family_count = n; + for (uint32_t i = 0; i < n; i++) d->timestamp_bits[i] = families[i].timestampValidBits; + } + // Without the loader callback our command buffers would lack the loader's dispatch pointer. + if (!d->vk.set_data) d->family_count = 0; + pthread_mutex_lock(&g_lock); + d->next_in_list = g_devs; + g_devs = d; + pthread_mutex_unlock(&g_lock); + return VK_SUCCESS; +} + +static void VKAPI_CALL DestroyDevice(VkDevice device, const VkAllocationCallbacks *alloc) { + struct dev *d = dev_for(device); + if (!d) return; + struct queue *mine = NULL; + pthread_mutex_lock(&g_lock); + for (struct queue **p = &g_queues; *p;) { + struct queue *q = *p; + if (q->dev == d) { *p = q->next_in_list; q->next_in_list = mine; mine = q; } else p = &q->next_in_list; + } + for (struct dev **p = &g_devs; *p; p = &(*p)->next_in_list) + if (*p == d) { *p = d->next_in_list; break; } + pthread_mutex_unlock(&g_lock); + while (mine) { + struct queue *q = mine; + mine = q->next_in_list; + gpuload_ring_release(&q->ring, &d->vk); + free(q); + } + PFN_vkDestroyDevice destroy = d->destroy; + free(d); + if (destroy) destroy(device, alloc); +} + +// ---- dispatch -------------------------------------------------------------------------------------------------- + +EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckGpuLoad_GetDeviceProcAddr(VkDevice device, const char *name); + +static PFN_vkVoidFunction device_hook(struct dev *d, const char *name) { + if (!g_dir) return NULL; + if (!strcmp(name, "vkGetDeviceQueue") && d->get_queue) return (PFN_vkVoidFunction)GetDeviceQueue; + if (!strcmp(name, "vkGetDeviceQueue2") && d->get_queue2) return (PFN_vkVoidFunction)GetDeviceQueue2; + if (!strcmp(name, "vkQueueSubmit") && d->submit) return (PFN_vkVoidFunction)QueueSubmit; + if (!strcmp(name, "vkQueueSubmit2") && d->submit2) return (PFN_vkVoidFunction)QueueSubmit2; + if (!strcmp(name, "vkQueueSubmit2KHR") && d->submit2_khr) return (PFN_vkVoidFunction)QueueSubmit2KHR; + return NULL; +} + +EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckGpuLoad_GetInstanceProcAddr(VkInstance instance, const char *name) { + if (!strcmp(name, "vkCreateInstance")) return (PFN_vkVoidFunction)CreateInstance; + if (!strcmp(name, "vkDestroyInstance")) return (PFN_vkVoidFunction)DestroyInstance; + if (!strcmp(name, "vkCreateDevice")) return (PFN_vkVoidFunction)CreateDevice; + if (!strcmp(name, "vkGetInstanceProcAddr")) return (PFN_vkVoidFunction)DroidDeckGpuLoad_GetInstanceProcAddr; + if (!strcmp(name, "vkGetDeviceProcAddr")) return (PFN_vkVoidFunction)DroidDeckGpuLoad_GetDeviceProcAddr; + if (!instance) return NULL; + struct inst *in = inst_for(instance); + return in ? in->gipa(instance, name) : NULL; +} + +EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckGpuLoad_GetDeviceProcAddr(VkDevice device, const char *name) { + if (!strcmp(name, "vkGetDeviceProcAddr")) return (PFN_vkVoidFunction)DroidDeckGpuLoad_GetDeviceProcAddr; + if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)DestroyDevice; + struct dev *d = dev_for(device); + if (!d) return NULL; + PFN_vkVoidFunction mine = device_hook(d, name); + return mine ? mine : d->gdpa(device, name); +} + +EXPORT VKAPI_ATTR VkResult VKAPI_CALL DroidDeckGpuLoad_NegotiateLoaderLayerInterfaceVersion(VkNegotiateLayerInterface *v) { + if (v->loaderLayerInterfaceVersion > 2) v->loaderLayerInterfaceVersion = 2; + v->pfnGetInstanceProcAddr = DroidDeckGpuLoad_GetInstanceProcAddr; + v->pfnGetDeviceProcAddr = DroidDeckGpuLoad_GetDeviceProcAddr; + v->pfnGetPhysicalDeviceProcAddr = NULL; + return VK_SUCCESS; +} diff --git a/tools/gpuload/tests/test_gpuload_busy.c b/tools/gpuload/tests/test_gpuload_busy.c new file mode 100644 index 0000000000..706580e90b --- /dev/null +++ b/tools/gpuload/tests/test_gpuload_busy.c @@ -0,0 +1,24 @@ +#include <assert.h> +#include <stdio.h> + +#include "gpuload_busy.h" + +int main(void) { + const uint64_t max = 1000; + assert(gpuload_interval(10, 20, max) == 10); + // Each batch counts on its own, even when the counter restarted in between (later batch has smaller ticks). + assert(gpuload_interval(900000, 900400, max) == 400); + assert(gpuload_interval(50, 350, max) == 300); + // Backwards, empty or too long: nothing. + assert(gpuload_interval(60, 50, max) == 0); + assert(gpuload_interval(70, 70, max) == 0); + assert(gpuload_interval(100, 100 + max + 1, max) == 0); + assert(gpuload_interval(100, 100 + max, max) == max); + // Query results: both halves available and an end that differs from the last harvested one. + assert(gpuload_result_is_new(1, 1, 500, 400)); + assert(!gpuload_result_is_new(1, 1, 400, 400)); + assert(!gpuload_result_is_new(1, 0, 500, 400)); + assert(!gpuload_result_is_new(0, 1, 500, 400)); + puts("test_gpuload_busy: ok"); + return 0; +} diff --git a/tools/gpuload/tests/test_gpuload_ring.c b/tools/gpuload/tests/test_gpuload_ring.c new file mode 100644 index 0000000000..4c5bc13950 --- /dev/null +++ b/tools/gpuload/tests/test_gpuload_ring.c @@ -0,0 +1,96 @@ +#include <assert.h> +#include <stdint.h> +#include <stdio.h> + +#include "gpuload_ring.h" + +// A fake device: query results come from this table, [start, start available, end, end available] per slot. +static uint64_t g_result[GPULOAD_RING][4]; +static uintptr_t g_next_handle = 0x1000; + +static VkResult VKAPI_CALL create_pool(VkDevice d, const VkCommandPoolCreateInfo *ci, const VkAllocationCallbacks *a, VkCommandPool *out) { + (void)d; (void)ci; (void)a; *out = (VkCommandPool)(g_next_handle++); return VK_SUCCESS; +} +static void VKAPI_CALL destroy_pool(VkDevice d, VkCommandPool p, const VkAllocationCallbacks *a) { (void)d; (void)p; (void)a; } +static VkResult VKAPI_CALL alloc_cmds(VkDevice d, const VkCommandBufferAllocateInfo *ai, VkCommandBuffer *out) { + (void)d; + for (uint32_t i = 0; i < ai->commandBufferCount; i++) out[i] = (VkCommandBuffer)(g_next_handle++); + return VK_SUCCESS; +} +static VkResult VKAPI_CALL begin(VkCommandBuffer c, const VkCommandBufferBeginInfo *bi) { (void)c; (void)bi; return VK_SUCCESS; } +static VkResult VKAPI_CALL end(VkCommandBuffer c) { (void)c; return VK_SUCCESS; } +static void VKAPI_CALL cmd_reset(VkCommandBuffer c, VkQueryPool q, uint32_t first, uint32_t n) { (void)c; (void)q; (void)first; (void)n; } +static void VKAPI_CALL cmd_timestamp(VkCommandBuffer c, VkPipelineStageFlagBits s, VkQueryPool q, uint32_t i) { (void)c; (void)s; (void)q; (void)i; } +static VkResult VKAPI_CALL create_queries(VkDevice d, const VkQueryPoolCreateInfo *ci, const VkAllocationCallbacks *a, VkQueryPool *out) { + (void)d; (void)a; assert(ci->queryCount == 2 * GPULOAD_RING); *out = (VkQueryPool)(g_next_handle++); return VK_SUCCESS; +} +static void VKAPI_CALL destroy_queries(VkDevice d, VkQueryPool q, const VkAllocationCallbacks *a) { (void)d; (void)q; (void)a; } +static VkResult VKAPI_CALL results(VkDevice d, VkQueryPool q, uint32_t first, uint32_t n, size_t size, void *data, + VkDeviceSize stride, VkQueryResultFlags flags) { + (void)d; (void)q; (void)size; + assert(n == 2 && stride == 2 * sizeof(uint64_t) && (flags & VK_QUERY_RESULT_WITH_AVAILABILITY_BIT)); + uint64_t *out = data; + for (int k = 0; k < 4; k++) out[k] = g_result[first / 2][k]; + return out[1] && out[3] ? VK_SUCCESS : VK_NOT_READY; +} + +static void finish(uint32_t slot, uint64_t start, uint64_t end) { + g_result[slot][0] = start; g_result[slot][1] = 1; g_result[slot][2] = end; g_result[slot][3] = 1; +} + +int main(void) { + struct gpuload_vk v = { + .device = (VkDevice)(uintptr_t)1, .create_pool = create_pool, .destroy_pool = destroy_pool, .alloc_cmds = alloc_cmds, + .begin = begin, .end = end, .cmd_reset = cmd_reset, .cmd_timestamp = cmd_timestamp, + .create_queries = create_queries, .destroy_queries = destroy_queries, .results = results, + }; + struct gpuload_ring r = {0}; + assert(!gpuload_ring_setup(&r, &v, 0, 64) && r.state == -1); // no timestamp period yet + gpuload_vk_period(&v, 52.083f); + assert(!gpuload_ring_setup(&r, &v, 0, 0) && r.state == -1); // family without timestamps + assert(gpuload_ring_setup(&r, &v, 0, 64) && r.state == 1); + + VkCommandBuffer app[2] = {(VkCommandBuffer)(uintptr_t)0xa1, (VkCommandBuffer)(uintptr_t)0xa2}; + VkProtectedSubmitInfo prot = {.sType = VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO, .protectedSubmit = VK_TRUE}; + VkSubmitInfo batches[3] = { + {.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, .commandBufferCount = 2, .pCommandBuffers = app}, + {.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO}, // semaphores only + {.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO, .pNext = &prot, .commandBufferCount = 1, .pCommandBuffers = app}, + }; + uint32_t used = 0; + VkSubmitInfo *mine = gpuload_ring_wrap(&r, 3, batches, &used); + assert(mine && used == 1 && r.inflight == 1); + assert(mine[0].commandBufferCount == 4 && mine[0].pCommandBuffers[0] == r.slot[0].start && + mine[0].pCommandBuffers[1] == app[0] && mine[0].pCommandBuffers[2] == app[1] && + mine[0].pCommandBuffers[3] == r.slot[0].end); + assert(mine[1].commandBufferCount == 0 && mine[2].commandBufferCount == 1 && mine[2].pCommandBuffers == app); + free(mine); + + assert(gpuload_ring_harvest(&r, &v) == 0 && r.inflight == 1); // not finished yet + finish(0, 1000, 1192); // 192 ticks = 10 us + assert(gpuload_ring_harvest(&r, &v) == 9999 && r.inflight == 0); + + // A failed submit gives its slot back. + mine = gpuload_ring_wrap(&r, 1, batches, &used); + assert(used == 1 && r.inflight == 1); + gpuload_ring_unwind(&r, used); + assert(r.inflight == 0 && r.next == 1); + free(mine); + + // Fill the ring: the 65th batch goes out untimed. + for (int i = 0; i < GPULOAD_RING; i++) { mine = gpuload_ring_wrap(&r, 1, batches, &used); assert(used == 1); free(mine); } + mine = gpuload_ring_wrap(&r, 1, batches, &used); + assert(used == 0 && mine[0].commandBufferCount == 2); + free(mine); + + // Slot 0 comes round again: until the GPU resets it, it still shows the old pair, which must not count twice. + // Slots 1..63 finish after a counter restart (smaller ticks than slot 0's old pair); each still counts. + for (uint32_t s = 1; s < GPULOAD_RING; s++) finish(s, 10 * s, 10 * s + 4); + assert(gpuload_ring_harvest(&r, &v) == (uint64_t)(63 * 4 * 52.083f) && r.inflight == 1 && r.oldest == 0); + finish(0, 5, 9); + assert(gpuload_ring_harvest(&r, &v) == (uint64_t)(4 * 52.083f) && r.inflight == 0); + + gpuload_ring_release(&r, &v); + puts("test_gpuload_ring: ok"); + return 0; +} diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index 30e95c70ec..799a3dee80 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -31,6 +31,13 @@ export BL_DESKTOP=1 ln -sf /usr/local/bin/droiddeck-steam-launch /usr/local/bin/steamdeck-steam 2>/dev/null ln -sf /usr/local/bin/droiddeck-steam-shim /usr/local/bin/steam 2>/dev/null python3 /usr/local/bin/droiddeck-desktop-games 2>&1 | sed 's/^/[games] /' +# startplasma applies this file over the session environment, and keeps what an earlier session wrote. +kwriteconfig6 --file plasma-localerc --group Formats --key LANG "${LANG:-C.UTF-8}" +if [ -n "${LANGUAGE:-}" ]; then + kwriteconfig6 --file plasma-localerc --group Translations --key LANGUAGE "$LANGUAGE" +else + kwriteconfig6 --file plasma-localerc --group Translations --key LANGUAGE --delete +fi cat > /usr/share/applications/droiddeck-steam-x64.desktop <<'ENTRY' [Desktop Entry] Type=Application @@ -107,8 +114,10 @@ fi if [ "$(cat /usr/share/droiddeck/kwin-compositor 2>/dev/null)" = opengl ]; then unset LIBGL_ALWAYS_SOFTWARE QT_QUICK_BACKEND export KWIN_COMPOSE=O2 MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink LIBGL_KOPPER_DRI2=true - if [ -z "${KWIN_RENDER_NODES:-}" ] && [ -c /dev/dri/renderD0 ]; then - export KWIN_RENDER_NODES=/dev/dri/renderD0 + if [ -z "${KWIN_RENDER_NODES:-}" ]; then + for node in /dev/dri/renderD0 /dev/dri/renderD307 /dev/dri/renderD*; do + if [ -c "$node" ]; then export KWIN_RENDER_NODES="$node"; break; fi + done fi mkdir -p /run/droiddeck/kwin printf '#!/bin/sh\nGALLIUM_THREAD=0 exec /usr/bin/kwin_wayland "$@"\n' > /run/droiddeck/kwin/kwin_wayland @@ -119,7 +128,7 @@ echo "== droiddeck-desktop: Plasma on $WAYLAND_DISPLAY" dbus-run-session -- startplasma-wayland rc=$? echo "== droiddeck-desktop: Plasma ended ($rc)" -if [ "$rc" -eq 0 ]; then +if [ "$rc" -eq 0 ] && [ -z "${BL_BOTTOM_DESKTOP:-}" ]; then /usr/local/bin/droiddeck-steam-launch bigpicture sleep 30 fi diff --git a/tools/linuxfs/desktop/droiddeck-desktop-gpu b/tools/linuxfs/desktop/droiddeck-desktop-gpu index 419636e530..061d646208 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop-gpu +++ b/tools/linuxfs/desktop/droiddeck-desktop-gpu @@ -19,7 +19,6 @@ def enabled(): def main_group(text): - """The [Desktop Entry] group's lines, and everything after it.""" lines = text.splitlines() start = next((i for i, l in enumerate(lines) if l.strip() == "[Desktop Entry]"), None) if start is None: @@ -56,8 +55,6 @@ def chromium_exec(exec_line): def gpu_exec(exec_line): - """The Exec that runs a program on the GPU; a Flatpak app goes through its launcher, which - keeps it on gamescope's X server instead of the desktop's Wayland socket.""" if exec_line.startswith("/usr/bin/flatpak run ") or exec_line.startswith("flatpak run "): exec_line = "/usr/local/bin/droiddeck-flatpak-run " + exec_line.split(" run ", 1)[1] return "droiddeck-gpu " + exec_line diff --git a/tools/linuxfs/desktop/droiddeck-gpu b/tools/linuxfs/desktop/droiddeck-gpu index f759d3ad01..886f0d0a0e 100644 --- a/tools/linuxfs/desktop/droiddeck-gpu +++ b/tools/linuxfs/desktop/droiddeck-gpu @@ -10,7 +10,7 @@ window=0 if [ "${BL_DESKTOP_GPU_WINDOW:-1}" != 0 ] && [ -n "${WAYLAND_DISPLAY:-}" ] && [ "$WAYLAND_DISPLAY" != wayland-0 ]; then window=1 parent=$WAYLAND_DISPLAY - args=(--backend sdl --expose-wayland -W "$width" -H "$height" -w "$width" -h "$height") + args=(--backend sdl --expose-wayland --follow-game-window-mode -W "$width" -H "$height" -w "$width" -h "$height") else args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$width" -h "$height") fi diff --git a/tools/linuxfs/fex/vulkanpin.c b/tools/linuxfs/fex/vulkanpin.c index 45aeb9edb0..4ab28afe4c 100644 --- a/tools/linuxfs/fex/vulkanpin.c +++ b/tools/linuxfs/fex/vulkanpin.c @@ -19,7 +19,6 @@ typedef struct { typedef VkResult (*Enumerate)(const char *, unsigned int *, VkExtensionProperties *); typedef Function (*ProcAddr)(void *, const char *); -/* The driver cannot enumerate devices for an instance with VK_KHR_display, and gamescope's WSI layer aborts on that. */ static const char *const hidden_extensions[] = { "VK_KHR_display", "VK_KHR_get_display_properties2", diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract b/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract index 217878a368..f055affe67 100755 --- a/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract @@ -1,7 +1,4 @@ #!/bin/sh -# Runs DroidDeck's bundled innoextract with its own boost libraries. The guest's -# env -i startup has no LD_LIBRARY_PATH, and the rootfs must not grow a second -# copy of boost for the installer fallback. LD_LIBRARY_PATH=/usr/local/lib/droiddeck-inno export LD_LIBRARY_PATH exec /usr/local/lib/droiddeck-inno/innoextract "$@" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent index 5e335c313b..234be2f001 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent @@ -1,22 +1,4 @@ #!/usr/bin/python3 -"""The guest side of the agent bridge (docs/agent-control.md). - -Started by droiddeck-session inside the session, so whatever it runs has the session's own -environment: DISPLAY, the games' Xwayland, XDG_RUNTIME_DIR, and the preloads every guest process -gets - which is what lets it reach the Steam client's DevTools port, open to guest processes only. - -The app talks to it through files under $BL_LAUNCH_DIR/agent (the session root, the same path on -both sides): - - req/<id>.json a request the app wrote (tmp + rename) - resp/<id>.json the answer, written the same way - hello.json this daemon is up: pid, version, what it can do - focus.json gamescope's focus and every server's top-level windows, rewritten on change - cdp-port the client's DevTools port, written by droiddeck-session - -Requests: ping, exec, focus, cdp, quit. Each answer is {"ok": true, ...} or -{"ok": false, "error": {"code", "message"}}. -""" import base64 import json @@ -72,7 +54,6 @@ class AgentError(Exception): class X: - """One connection to an Xwayland server. The rootfs has xprop but no python X library.""" def __init__(self, display): num = display.lstrip(":").split(".")[0] @@ -116,7 +97,6 @@ class X: return buf def request(self, data): - """Send one request and return its reply, or None for an X error (a window that went).""" self.s.sendall(data) while True: head = self._read(32) @@ -186,7 +166,6 @@ class X: def windows(x): - """Top-level windows that are mapped or carry an app id: what gamescope picks focus from.""" out = [] for win in x.children(x.root): attrs = x.attributes(win) @@ -230,9 +209,6 @@ def displays(): def focus_snapshot(): - """gamescope's focus as Steam sees it (root properties on the client's server) and every - server's windows. GAMESCOPE_FOCUSABLE_WINDOWS is the list the client orders the base layer - from: a game missing there stays behind the client however healthy its window looks.""" shown = displays() if not shown: raise AgentError("NO_DISPLAY", "This session has no X display") @@ -349,7 +325,6 @@ def tag_game_windows(snap, proc=Path("/proc")): def vr_scene_app(path=Path('/run/droiddeck/droiddeck-steamvr/scene-focus.json'), proc=Path('/proc')): - """Only a live SteamVR scene with its dashboard hidden may claim game focus.""" try: state = json.loads(path.read_text()) server, scene = int(state['serverPid']), int(state['scenePid']) @@ -385,8 +360,6 @@ class VrSceneFocus: class FocusWatcher(threading.Thread): - """Rewrites focus.json when gamescope's focus properties change, and every few seconds when - the windows do (a window can change without any root property moving).""" def __init__(self, path): super().__init__(daemon=True, name="focus") @@ -450,7 +423,6 @@ class FocusWatcher(threading.Thread): class WebSocket: - """A minimal RFC 6455 client: text frames out, text frames in. Enough for CDP.""" def __init__(self, url, timeout): target = urllib.parse.urlsplit(url) @@ -887,11 +859,6 @@ def steam_selection(agent_dir, timeout=5): def steam_shortcut_app_id(game_id): - """Return the 32-bit app id in Steam's shortcut CGameID form, or None for other ids. - - DroidDeck's shortcut IDs are `(appid << 32) | 0x02000000`. The URL still needs that full - CGameID for RunGame; the app-details API separately needs the unsigned 32-bit app id. - """ if not isinstance(game_id, str) or not game_id.isascii() or not game_id.isdigit(): return None try: @@ -907,7 +874,6 @@ def steam_shortcut_app_id(game_id): def wait_for_steam_shortcut_overview(agent_dir, game_id, timeout=45): - """Wait until Steam can map a shortcut CGameID to its 32-bit app overview.""" app_id = steam_shortcut_app_id(game_id) if app_id is None: return {"supported": False, "ready": False} @@ -962,8 +928,6 @@ def steam_shortcut_state(agent_dir, game_id, timeout=6): def game_pids(app_id): - """Our processes started for this Steam app (Steam sets SteamAppId / SteamGameId in their - environment, and Proton's wine processes inherit it).""" wanted = [("SteamAppId=%s" % app_id).encode(), ("SteamGameId=%s" % app_id).encode()] me = os.getpid() pids = [] @@ -1022,8 +986,6 @@ VR_ACTIONS = ("status", "install", "start", "stop") def steamvr(req): - """Cardboard mode's SteamVR: a fixed helper with four actions, unlike exec (no command line from - the request). install downloads 571 MB, so it runs detached and status reports it.""" action = req.get("action", "status") if action not in VR_ACTIONS: raise AgentError("INVALID_REQUEST", "vr action must be one of " + ", ".join(VR_ACTIONS)) @@ -1244,11 +1206,10 @@ def main(argv): if len(argv) != 2 or not argv[1].isascii() or not argv[1].isdecimal(): print("usage: droiddeck-agent --steam-supports-vr <appid>", file=sys.stderr) return 2 - # Optional-VR games (Thumper, VRChat) carry vr_supported without vr_only. expression = ("(o => o ? (o.vr_supported === true || o.vr_only === true) : null)" "(window.appStore?.GetAppOverviewByGameID?.(%s))" % json.dumps(argv[1])) value = None - deadline = time.monotonic() + 12 # Steam's UI is busiest while a game starts. + deadline = time.monotonic() + 12 while value is None and time.monotonic() < deadline: try: value = cdp_eval(Path(base) / "agent", expression, await_promise=False, timeout=8).get("value") diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 3e70593909..0f78812eac 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -52,7 +52,7 @@ CLIENT_WAIT = 300 GAME_GRACE = 15 LAUNCH_WAIT = 15 LAUNCH_ASKS = 3 -CLIENT_PATH = re.compile(r"[a-z]:\\(program files \(x86\)|programdata)\\battle\.net\\") +CLIENT_PATH = re.compile(r"[a-z]:\\(program files \(x86\)\\battle\.net\\([^\\]+$|battle\.net\.\d+\\)|programdata\\battle\.net\\)") IDLE = {"agent.exe", "conhost.exe", "explorer.exe", "lsass.exe", "plugplay.exe", "rpcss.exe", "services.exe", "start.exe", "steam.exe", "svchost.exe", "tabtip.exe", "winedevice.exe", "wineserver"} NOT_GAME = IDLE | {"rundll32.exe", "wineboot.exe", "winemenubuilder.exe"} @@ -322,7 +322,14 @@ def wallpaper_bmp(width, height): def reg_value(reg, key, name, value): - line = '"%s"="%s"' % (name, value.replace("\\", "\\\\").replace('"', '\\"')) + return reg_line(reg, key, name, '"%s"="%s"' % (name, value.replace("\\", "\\\\").replace('"', '\\"'))) + + +def reg_dword(reg, key, name, number): + return reg_line(reg, key, name, '"%s"=dword:%08x' % (name, number)) + + +def reg_line(reg, key, name, line): try: with open(reg, encoding="utf-8", errors="replace") as f: rows = f.read().splitlines() @@ -347,6 +354,16 @@ def desktop_size(): return 1280, 720 +def desktop_dpi(): + width, height = desktop_size() + return 96 * max(4, int(min(width / 1920.0, height / 1080.0) * 4)) // 4 + + +def dpi(root): + reg = os.path.join(prefix(root), "pfx", "user.reg") + return os.path.isfile(reg) and reg_dword(reg, DESKTOP_KEY, "LogPixels", desktop_dpi()) + + def wallpaper(root): width, height = desktop_size() shrink = min(1.0, WALLPAPER_MAX[0] / width, WALLPAPER_MAX[1] / height) @@ -492,6 +509,10 @@ def configure(root, library=None): wallpaper(root) except OSError as error: say("Battle.net's desktop wallpaper not set: %s" % error) + try: + dpi(root) + except OSError as error: + say("Battle.net's desktop scale not set: %s" % error) wow_settings(root) if change == "first": say("wrote Battle.net's first config: hardware acceleration off, streaming off, closing itself as it launches a game, " diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-bottom-desktop b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bottom-desktop new file mode 100755 index 0000000000..2c19c23bed --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bottom-desktop @@ -0,0 +1,51 @@ +#!/bin/bash +# KDE Plasma on a dual-screen handheld's bottom screen, next to the session on the top one. +set -u +export HOME=${HOME:-/root} +if [ -n "${BL_DEBUG_DIR:-}" ]; then + mkdir -p "$BL_DEBUG_DIR" 2>/dev/null || true + exec >>"$BL_DEBUG_DIR/bottom-desktop.log" 2>&1 +fi +echo "== droiddeck-bottom-desktop $(date -u '+%Y-%m-%d %H:%M:%S UTC') ${BL_WIDTH:-?}x${BL_HEIGHT:-?} beside a ${BL_TOP_SESSION:-?} session" +[ -x /usr/local/bin/droiddeck-desktop ] || { echo "== the desktop package is not installed"; exit 66; } + +# Launch requests would reach the top session's watcher and could replace it. +unset BL_LAUNCH_DIR BL_LOG +export BL_BOTTOM_DESKTOP=1 + +for _ in $(seq 1 100); do + wayland-info >/dev/null 2>&1 && break + sleep 0.1 +done + +if command -v dbus-daemon >/dev/null 2>&1 && command -v droiddeck-netmanager >/dev/null 2>&1 \ + && ! pgrep -f 'dbus-daemon --config-file=/usr/local/share/droiddeck/system-bus.conf' >/dev/null 2>&1; then + mkdir -p /run/dbus /usr/local/share/droiddeck + cat > /usr/local/share/droiddeck/system-bus.conf <<'BUSCONF' +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <type>system</type> + <listen>unix:path=/run/dbus/system_bus_socket</listen> + <auth>EXTERNAL</auth> + <servicedir>/usr/share/droiddeck/system-services</servicedir> + <policy context="default"> + <allow user="*"/> + <allow own="*"/> + <allow send_destination="*"/> + <allow receive_sender="*"/> + </policy> +</busconfig> +BUSCONF + rm -f /run/dbus/system_bus_socket + dbus-daemon --config-file=/usr/local/share/droiddeck/system-bus.conf --nofork --nopidfile & + for _ in $(seq 1 50); do + [ -S /run/dbus/system_bus_socket ] && break + sleep 0.1 + done + [ -S /run/dbus/system_bus_socket ] && droiddeck-login1 --with-netmanager & +fi + +# The game on the top screen keeps the CPU first. +renice -n 5 $$ >/dev/null 2>&1 || true +exec /usr/local/bin/droiddeck-desktop diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap index d209ae16dd..13dafc0ba2 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap @@ -6,6 +6,7 @@ import os import signal import socket import struct +import subprocess import sys SOCKET_FILE = "/etc/droiddeck/bwrap-socket" @@ -23,6 +24,11 @@ def socket_name(): SOCKET = socket_name() +FEX_DIR = "/run/droiddeck-fex" +OWN_FEX = "/usr/local" +X86_MACHINES = (3, 62) +ARM_LIBS = "/usr/lib/aarch64-linux-gnu" +ARM_LOADER = "/usr/lib/ld-linux-aarch64.so.1" VERSION = "bubblewrap 0.11.0 (droiddeck)" NO_ARG = { @@ -62,7 +68,6 @@ def fd_path(fd): def expand(argv): - """argv with every --args FD replaced by the NUL-separated arguments read from FD.""" out = [] i = 0 while i < len(argv): @@ -91,6 +96,7 @@ class Spec: self.lock_files = [] self.command = [] self.argv0 = None + self.env_tool = None def parse(argv): @@ -181,7 +187,6 @@ def real(path): def remaps_nothing(s): - """True when every path in the sandbox is what it is out here already.""" for op in s.ops: t = op["t"] if t == "bind": @@ -217,6 +222,134 @@ def host_path(s, path): return path +def sandbox_link(s, path): + for op in reversed(s.ops): + if op.get("dest", "").rstrip("/") != path: + continue + if op["t"] == "symlink": + return op["target"] + if op["t"] == "bind": + return None + break + here = sandbox_source(s, path) + return os.readlink(here) if os.path.islink(here) else None + + +def sandbox_source(s, path): + for op in reversed(s.ops): + if op["t"] != "bind": + continue + dest = op["dest"].rstrip("/") + if path == dest or path.startswith(dest + "/"): + return real(op["src"]).rstrip("/") + path[len(dest):] + return path + + +def sandbox_file(s, path): + parts = [p for p in path.split("/") if p] + done = "/" + hops = 0 + i = 0 + while i < len(parts): + step = os.path.join(done, parts[i]) + link = sandbox_link(s, step) + if link is None: + done = step + i += 1 + continue + hops += 1 + if hops > 40: + return None + base = "/" if link.startswith("/") else done + parts = [p for p in os.path.normpath(os.path.join(base, link)).split("/") if p] + parts[i + 1:] + done = "/" + i = 0 + here = sandbox_source(s, done) + return here if os.path.isfile(here) else None + + +def program_path(s, program): + if "/" in program: + return os.path.normpath(os.path.join(s.cwd or "/", program)) + for folder in s.env.get("PATH", "/usr/bin:/bin").split(":"): + if not folder: + continue + candidate = os.path.normpath(os.path.join(s.cwd or "/", folder, program)) + if sandbox_file(s, candidate): + return candidate + return None + + +def machine(s, path, depth=0): + here = sandbox_file(s, path) + if here is None: + return None + try: + with open(here, "rb") as f: + head = f.read(256) + except OSError: + return None + if head[:4] == b"\x7fELF" and len(head) >= 20: + return struct.unpack("<H" if head[5] == 1 else ">H", head[18:20])[0] + if head[:2] == b"#!" and depth < 4: + words = head[2:].split(b"\n")[0].split() + if words: + return machine(s, words[0].decode("utf-8", "replace"), depth + 1) + return None + + +def own_fex(): + return all(os.access(os.path.join(OWN_FEX, "bin", name), os.X_OK) for name in ("FEX", "FEXServer")) \ + and os.path.isfile(os.path.join(OWN_FEX, "lib", "libxxhash.so.0")) + + +def fex_ready(): + if own_fex(): + return True + try: + subprocess.call([os.path.join(OWN_FEX, "bin", "droiddeck-fex-update")], stdout=sys.stderr) + except OSError: + return False + return own_fex() + + +def start_fex_server(): + try: + subprocess.Popen([os.path.join(OWN_FEX, "bin", "FEXServer"), "-p", "30"], stdin=subprocess.DEVNULL, + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, start_new_session=True) + except OSError as e: + sys.stderr.write("bwrap: could not start FEXServer: %s\n" % e) + + +def through_fex(s): + program = program_path(s, s.command[0]) + if program is None or machine(s, program) not in X86_MACHINES: + return False + if not fex_ready(): + sys.stderr.write("bwrap: %s is an x86 program and FEX is not installed\n" % program) + return False + for src, dest in ((os.path.join(OWN_FEX, "bin", "FEX"), FEX_DIR + "/bin/FEX"), + (os.path.join(OWN_FEX, "bin", "FEXServer"), FEX_DIR + "/bin/FEXServer"), + (os.path.join(OWN_FEX, "lib", "libxxhash.so.0"), FEX_DIR + "/lib/libxxhash.so.0"), + ("/usr/bin/env", FEX_DIR + "/bin/env"), + (ARM_LIBS, ARM_LIBS), + (real(ARM_LOADER), ARM_LOADER)): + s.ops.append({"t": "bind", "src": src, "dest": dest, "try": False, "ro": True}) + data = s.env.get("XDG_CACHE_HOME") or "/tmp" + s.env["FEX_APP_CONFIG_LOCATION"] = FEX_DIR + "/config/" + s.env["FEX_APP_DATA_LOCATION"] = data + "/droiddeck-fex/" + s.env["FEX_APP_CACHE_LOCATION"] = data + "/droiddeck-fex/cache/" + for name in ("FEX_ROOTFS", "FEX_THUNKHOSTLIBS", "FEX_THUNKGUESTLIBS", "FEX_THUNKCONFIG", "FEX_PORTABLE", + "GLIBC_TUNABLES", "MESA_LOADER_DRIVER_OVERRIDE", "GALLIUM_DRIVER", "VK_ICD_FILENAMES", + "VK_DRIVER_FILES"): + s.env.pop(name, None) + s.command = [FEX_DIR + "/bin/FEX", program] + s.command[1:] + s.argv0 = None + s.env_tool = FEX_DIR + "/bin/env" + start_fex_server() + return True + + def hold_locks(s): for path in s.lock_files: try: @@ -290,6 +423,8 @@ def run_by_app(s): if s.argv0: argv[0] = s.argv0 request = {"argv": argv, "env": s.env, "cwd": s.cwd or "/", "ops": ops} + if s.env_tool: + request["envTool"] = s.env_tool sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) try: sock.connect(SOCKET) @@ -333,8 +468,9 @@ def main(): hold_locks(s) if remaps_nothing(s): run_here(s) - else: - run_by_app(s) + return + through_fex(s) + run_by_app(s) if __name__ == "__main__": diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks index 28bdd8ac54..5cbf57b4aa 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Expose available Steam libraries in Dolphin, retaining the old PCManFM bookmark.""" import hashlib import json import os @@ -13,6 +12,7 @@ import xml.etree.ElementTree as ET LIBRARY = Path("/mnt/droiddeck-sd") +ADDED = Path("/mnt/droiddeck-lib") URI = "file:///mnt/droiddeck-sd" KDE_OWNER = "http://www.kde.org" MARK = "DroidDeckSteamLibrary" @@ -43,7 +43,7 @@ def steam_libraries(home, data): if not isinstance(path, str): continue path = Path(re.sub(r'\\(["\\])', r'\1', path)) - managed = path == LIBRARY or path.is_relative_to(home / "Games") + managed = path == LIBRARY or path.is_relative_to(home / "Games") or path.is_relative_to(ADDED) if selected is not None and managed and path not in selected: continue if path == LIBRARY and selected is None and not os.environ.get("BL_LIBRARY_LABEL"): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games index fe1cf0d971..f49a90dd70 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games @@ -54,7 +54,6 @@ def icon_for(appid): def client_entries(): - """App ids the client already wrote a menu entry for.""" found = set() if not os.path.isdir(APPS_DIR): return found diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index 7db59b048c..bf18c79d3c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -329,7 +329,6 @@ def mirror(source, provider, name, target): def build_rootfs(base, provider): - """The runtime with glibc and libstdc++ taken from a newer one, which FEX's GL and Vulkan thunks are built against.""" base_files, provider_files = os.path.join(base, "files"), os.path.join(provider, "files") rootfs = os.path.join(STATE, "rootfs") stamp = "%d\n%s\n%s%s\n%s" % (ROOTFS_LAYOUT, os.path.realpath(base), read_text(os.path.join(base_files, MARKER)) or "", @@ -431,8 +430,6 @@ def link_steam_sdk(): def link_guest_sdk(root): - # Proton's lsteamclient only looks in $HOME/.steam/sdk64; on ARM Steam that is the arm64 client, so - # the x86 runtime gets its own link, which FEX resolves before the host path. for sdk, candidates in (("sdk64", ("linux64", "ubuntu12_64")), ("sdk32", ("linux32", "ubuntu12_32"))): want = "x86_64" if sdk == "sdk64" else "i386" directory = next((os.path.join(STEAM_ROOT, candidate) for candidate in candidates @@ -612,17 +609,13 @@ def guest_environment(fex, env): result["FEX_APP_CONFIG_LOCATION"] = CONFIG_DIR + "/" result["FEX_APP_DATA_LOCATION"] = data + "/" result["FEX_APP_CACHE_LOCATION"] = CACHE_DIR + "/" - # Valve's FEX-Emu binds its server socket under $STEAM_COMPAT_DATA_PATH/fex-emu whatever FEX_APP_DATA_LOCATION or - # FEX_SERVERSOCKETPATH say, and sun_path is 108 bytes: compatdata under the app's data folder is too long. if result.get("STEAM_COMPAT_DATA_PATH"): short = data if data != DATA_DIR else "/tmp/fex" os.makedirs(short, exist_ok=True) result["STEAM_COMPAT_DATA_PATH"] = short result.setdefault("FEX_SILENTLOG", "0") result.setdefault("FEX_OUTPUTLOG", "stderr") - # The session's tunables are for the host libc; an x86 ld.so copying them under FEX fails in sbrk. result.pop("GLIBC_TUNABLES", None) - # Mono's incremental Boehm collector corrupts its heap under FEX, so Unity games crash at their first collections. result.setdefault("GC_DISABLE_INCREMENTAL", "1") if fex["portable"]: result["FEX_PORTABLE"] = "1" @@ -713,7 +706,6 @@ def launch(command, env, mode, decide=None): folder = decide if decide and os.path.isdir(decide) else os.path.dirname(program) if thunks == "on" and x86_64 and os.path.isfile(os.path.join(PRELOADS, "x86_64", VULKAN_PIN)) \ and vulkan_thunk_loads(fex, folder): - # Any LD_AUDIT module makes Mono's garbage collector crash under FEX, so the Vulkan thunk is pinned by search path. guest["LD_LIBRARY_PATH"] = ":".join(["/usr/" + VULKAN_PIN_DIR] + split_paths(guest.get("LD_LIBRARY_PATH"))) thunks = "on, its own Vulkan loader too" say("running %s with %s (runtime %s, thunks %s)" % (program, fex["bin"], guest.get("FEX_ROOTFS", "none"), thunks)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update index 3611978f54..d88a4a97e9 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update @@ -3,7 +3,6 @@ FEX_TAG=fex-2610-r5 FEX_SHA256=0fc1ca2ba13817ad70d1ea157119a75c9c02446b57d166e6d676cce0807c19c4 FEX_URL=https://github.com/Droid-Deck/DroidDeck-Components/releases/download/$FEX_TAG/fex.tzst -# Whether every program in the FEX tree at $1 finds its libraries (r4 did not without libxxhash). fex_loads() { local b out for b in FEX FEXServer unsquashfs; do @@ -13,8 +12,6 @@ fex_loads() { done } -# Installs one FEX build only once its archive matches the sha256 and it loads. The files it replaces are kept -# until the installed copy loads too, and put back otherwise; the tag is written last. fex_install() { local tag=$1 sha=$2 urls=$3 dst=/ tmp u f tmp=$(mktemp -d) @@ -54,8 +51,6 @@ fex_install() { return 1 } -# The build DroidDeck-Components' fex.json names (the app passes it as BL_FEX_*) comes first, then a working -# installed one, then FEX_TAG above. Sets FEX_NOW and FEX_FROM. fex_ready() { local have ok= have=$(cat /usr/local/share/fex-emu/.droiddeck-tag 2>/dev/null || true) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak index d91cae6ad3..8c23140efa 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak @@ -1,7 +1,15 @@ #!/usr/bin/python3 import json import os +import re +import shutil +import signal +import socket +import subprocess import sys +import tempfile +import time +import urllib.parse os.environ.setdefault("FLATPAK_BWRAP", "/usr/local/bin/droiddeck-bwrap") @@ -11,13 +19,25 @@ gi.require_version("Flatpak", "1.0") from gi.repository import Flatpak, Gio, GLib REMOTE = "flathub" +SYSTEM_BUS = "/run/dbus/system_bus_socket" +BUS_COMMANDS = ("install", "install-bundle", "uninstall", "update", "prune") +BUS_CONFIG = """<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <type>system</type> + <listen>unix:path=%s</listen> + <auth>EXTERNAL</auth> + <policy context="default"> + <allow user="*"/> + <allow own="*"/> + <allow send_destination="*"/> + <allow receive_sender="*"/> + </policy> +</busconfig> +""" def prepare_rootfs(): - """Some runtimes (KDE 6.10) ship etc/resolv.conf as a link to /run/host/monitor/resolv.conf. - Deploying one, Flatpak removes that link only if GIO reports it existing, and GIO follows it: - dangling here, it was left in place and making Flatpak's own link failed ("File exists"). - With the target present in the rootfs the link resolves and the deploy goes through.""" target = "/run/host/monitor/resolv.conf" try: if not os.path.exists(target): @@ -33,6 +53,116 @@ def prepare_rootfs(): emit(e="warning", message="could not prepare %s: %s" % (target, err)) +def bus_reachable(path): + if isinstance(path, tuple): + try: + socket.create_connection(path, timeout=1).close() + return True + except (OSError, ValueError): + return False + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + try: + sock.connect(path) + return True + except OSError: + return False + finally: + sock.close() + + +def system_bus_paths(): + address = os.environ.get("DBUS_SYSTEM_BUS_ADDRESS", "") + if not address: + return [SYSTEM_BUS] + paths = [] + for entry in filter(None, address.split(";")): + found = None + kind, _, params = entry.partition(":") + values = dict(part.partition("=")[::2] for part in params.split(",")) + if kind == "unix": + if values.get("path"): + found = urllib.parse.unquote_to_bytes(values["path"]) + elif values.get("abstract"): + found = b"\0" + urllib.parse.unquote_to_bytes(values["abstract"]) + elif kind == "tcp": + port = urllib.parse.unquote(values.get("port", "")) + digits = port.lstrip("0") + if not re.fullmatch(r"[0-9]+", port, re.ASCII) or not 0 < len(digits) <= 5 or int(digits) > 65535: + continue + found = (urllib.parse.unquote(values.get("host", "localhost")), int(digits)) + if found is None: + return None + paths.append(found) + return paths + + +def system_bus_reachable(): + paths = system_bus_paths() + return paths is None or any(bus_reachable(path) for path in paths) + + +def stop_system_bus(bus): + if not bus: + return + proc, work, conf, path = bus + if proc.poll() is None: + proc.terminate() + try: + proc.wait(timeout=5) + except subprocess.TimeoutExpired: + proc.kill() + proc.wait() + remove_bus_files(work, conf, path) + + +def remove_bus_files(work, conf, path): + for name in (path, conf): + try: + os.unlink(name) + except OSError: + pass + try: + os.rmdir(work) + except OSError: + pass + + +def private_system_bus(): + if system_bus_reachable(): + return None + daemon = shutil.which("dbus-daemon") + if not daemon: + emit(e="warning", message="no system bus and no dbus-daemon to start one") + return None + try: + work = tempfile.mkdtemp(prefix="droiddeck-flatpak-bus-") + except OSError as err: + emit(e="warning", message="could not start a private system bus: %s" % err) + return None + conf = os.path.join(work, "bus.conf") + path = os.path.join(work, "bus") + try: + with open(conf, "w") as f: + f.write(BUS_CONFIG % path) + proc = subprocess.Popen([daemon, "--config-file=" + conf, "--nofork", "--nopidfile"], + stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + except OSError as err: + remove_bus_files(work, conf, path) + emit(e="warning", message="could not start a private system bus: %s" % err) + return None + bus = (proc, work, conf, path) + for _ in range(50): + if bus_reachable(path) or proc.poll() is not None: + break + time.sleep(0.1) + if not bus_reachable(path): + stop_system_bus(bus) + emit(e="warning", message="the private system bus did not start") + return None + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=" + path + return bus + + def emit(**kw): sys.stdout.write(json.dumps(kw) + "\n") sys.stdout.flush() @@ -43,7 +173,6 @@ def installation(): def app_ref(inst, app_id): - """The installed ref of an app, or None.""" for ref in inst.list_installed_refs_by_kind(Flatpak.RefKind.APP, None): if ref.get_name() == app_id: return ref @@ -109,21 +238,31 @@ def run(t, state, report_done=True): return 0 +def arches(): + native = Flatpak.get_default_arch() + return [native, "x86_64"] if native == "aarch64" else [native] + + def install(app_id): inst = installation() - arch = Flatpak.get_default_arch() if app_ref(inst, app_id) is not None: emit(e="done", note="already installed") return 0 - branch, last = None, None - for candidate in ("stable", "master"): - try: - branch = inst.fetch_remote_ref_sync(REMOTE, Flatpak.RefKind.APP, app_id, arch, candidate, None).get_branch() + arch, branch, last = None, None, None + for candidate_arch in arches(): + for candidate in ("stable", "master"): + try: + branch = inst.fetch_remote_ref_sync(REMOTE, Flatpak.RefKind.APP, app_id, candidate_arch, candidate, + None).get_branch() + arch = candidate_arch + break + except GLib.Error as err: + last = err + if branch is not None: break - except GLib.Error as err: - last = err if branch is None: - emit(e="error", message="%s is not on Flathub for %s (%s)" % (app_id, arch, last.message if last else "no branch")) + emit(e="error", message="%s is not on Flathub for %s (%s)" % (app_id, " or ".join(arches()), + last.message if last else "no branch")) return 1 t, state = transaction(inst) t.add_install(REMOTE, "app/%s/%s/%s" % (app_id, arch, branch), None) @@ -137,14 +276,18 @@ def install(app_id): def install_bundle(path): - """A single-file bundle (flatpak build-bundle), for apps Flathub does not carry.""" inst = installation() bundle = Gio.File.new_for_path(path) try: - app_id = Flatpak.BundleRef.new(bundle).get_name() + ref = Flatpak.BundleRef.new(bundle) + app_id = ref.get_name() except GLib.Error as err: emit(e="error", message="%s is not a Flatpak bundle (%s)" % (os.path.basename(path), err.message)) return 1 + if ref.get_arch() not in arches(): + emit(e="error", code="arch", id=app_id, arch=ref.get_arch(), + message="%s is built for %s, not %s" % (app_id, ref.get_arch(), " or ".join(arches()))) + return 1 if app_ref(inst, app_id) is not None: emit(e="done", id=app_id, note="already installed") return 0 @@ -242,6 +385,16 @@ def main(): cmd, args = sys.argv[1], sys.argv[2:] if cmd in ("install", "install-bundle", "update"): prepare_rootfs() + bus = private_system_bus() if cmd in BUS_COMMANDS else None + if bus: + signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit(128 + signum)) + try: + return command(cmd, args) + finally: + stop_system_bus(bus) + + +def command(cmd, args): if cmd == "install" and args: return install(args[0]) if cmd == "install-bundle" and args: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 696a955811..90651a3467 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -4,6 +4,7 @@ import json import os import re import runpy +import signal import subprocess import sys import tempfile @@ -34,12 +35,10 @@ DOTNET_FEX = { "FEX_MEMCPYSETTSOENABLED": "1", "FEX_HALFBARRIERTSOENABLED": "1", "FEX_X87REDUCEDPRECISION": "0", - "FEX_MULTIBLOCK": "0", } def game_files(exe): - """Lower-cased names of the files next to the game's executable and one directory below.""" names = set() folder = os.path.dirname(exe) try: @@ -58,7 +57,6 @@ def game_files(exe): class Game: - """What a fix gets to look at: the executable, its launch arguments and the files beside it.""" def __init__(self, exe, args): self.exe = exe @@ -85,7 +83,7 @@ def is_godot(game): @fix def dotnet_memory_ordering(game): if "coreclr.dll" in game.files: - return DOTNET_FEX, [], ".NET runtime: FEX with full TSO and without multiblock" + return DOTNET_FEX, [], ".NET runtime: FEX with full TSO" @fix @@ -109,9 +107,6 @@ def godot_sentry(game): @fix def d3dgear_hook(game): - """D3DGear's capture DLL left beside a game (The Crew 2) is loaded by it and hooks the DXGI swapchain; - under Wine the hook faults over a thousand times within seconds and the game never presents again: - black screen while the sound keeps playing.""" if "d3dgear64.dll" in game.files: return {"WINEDLLOVERRIDES": "d3dgear64=d"}, [], "D3DGear capture hook off (it stops the game drawing)" @@ -124,13 +119,22 @@ def deep_rock_gdk_raytracing(game): @fix def arkham_city_x87(game): - """Batman: Arkham City (BatmanAC.exe, also started through BmLauncher.exe beside it) leans on x87 - and stops with Unreal's "Fatal error!" right after start when FEX reduces its precision.""" if "batmanac.exe" in game.files: return {"FEX_X87REDUCEDPRECISION": "0"}, [], "Batman: Arkham City: FEX with full x87 precision" +@fix +def doom_2016_swapchain_images(game): + if "doomx64vk.exe" in game.files and game.stem in ("doomx64", "doomx64vk"): + images = { + "GAMESCOPE_WSI_MIN_IMAGE_COUNT": None, + "GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT": None, + "vk_x11_strict_image_count": "true", + } + return images, [], "DOOM (2016): the swapchain keeps the image count the game asks for" + + @fix def teardown_vsync(game): if game.stem == "teardown": @@ -143,6 +147,12 @@ def protonfixes_off(game): return {"PROTONFIXES_DISABLE": "1"}, [], "umu-protonfixes off (its ALSA audio and VC++ installer steps fail here)" +@fix +def little_nightmares_threads(game): + if game.stem == "littlenightmares": + return {"PROTONFIXES_DISABLE": "1"}, [], "Little Nightmares: umu-protonfixes off (its -onethread puts the game and renderer on one thread)" + + @fix def caravan_sandwitch_feature_level(game): if "caravansandwitch.exe" in game.files or game.stem == "caravansandwitch-win64-shipping": @@ -151,8 +161,6 @@ def caravan_sandwitch_feature_level(game): @fix def robocop_rogue_city_feature_level(game): - """vkd3d-proton turns mesh shaders off on Adreno, but 12_2 still advertises them, and UE5 then builds mesh - pipelines with no pipeline layout that crash Turnip on launch.""" if "robocop.exe" in game.files or game.stem == "robocop-win64-shipping": return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "RoboCop: Rogue City: D3D12 feature level 12_1" @@ -172,10 +180,6 @@ def cyberpunk_feature_level(game): return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "Cyberpunk 2077: D3D12 feature level 12_1" def skip_red_launcher(command): - """Cyberpunk 2077's prelauncher opens REDlauncher, a Qt WebEngine window that hands over to the - game half a minute later and then stays up beside it, well over a core busy for as long as the - game runs. The game is started itself instead; the prelauncher's own --launcher-skip started it - twice.""" if len(command) > 2 and os.path.basename(command[2]).lower() == "redprelauncher.exe": game = os.path.join(os.path.dirname(command[2]), "bin", "x64", "Cyberpunk2077.exe") if os.path.isfile(game): @@ -239,8 +243,60 @@ def ubisoft_overlay_off(env): print("droiddeck-game-env: Ubisoft Connect overlay left as is (%s)" % error, file=sys.stderr) +PZ_JVM_FLAGS = ("-XX:+UseG1GC", "-XX:TieredStopAtLevel=1") + + +def zomboid_vm_args(args): + updated = [arg for arg in args if not re.fullmatch(r"-XX:\+Use\w*GC", arg) or arg == "-XX:+UseG1GC"] + for flag in PZ_JVM_FLAGS: + if flag not in updated: + updated.append(flag) + return updated + + +def zomboid_rewrite(node): + changed = False + if isinstance(node, dict): + for key, value in node.items(): + if key == "vmArgs" and isinstance(value, list) and all(isinstance(arg, str) for arg in value): + updated = zomboid_vm_args(value) + if updated != value: + node[key] = updated + changed = True + elif isinstance(value, dict): + changed |= zomboid_rewrite(value) + return changed + + +def project_zomboid_jvm(command): + if len(command) <= 2: + return + exe = Path(command[2]) + if not exe.stem.lower().startswith("projectzomboid"): + return + settings = exe.with_suffix(".json") + try: + with settings.open(encoding="utf-8-sig") as source: + data = json.load(source) + if not zomboid_rewrite(data): + return + handle, staged = tempfile.mkstemp(prefix=".droiddeck-", dir=settings.parent) + try: + with os.fdopen(handle, "w", encoding="utf-8") as target: + json.dump(data, target, indent=4) + target.write("\n") + os.chmod(staged, settings.stat().st_mode & 0o7777) + os.replace(staged, settings) + except BaseException: + os.unlink(staged) + raise + print("droiddeck-game-env: Project Zomboid: G1 garbage collector and C1 JIT only (ZGC overheats and stalls here)", + file=sys.stderr) + except (OSError, ValueError, AttributeError) as error: + print("droiddeck-game-env: Project Zomboid JVM settings left as is (%s)" % error, file=sys.stderr) + + def offline_without_anticheat(command, env): - """Start the configured game executable when the player opts into launching without EAC.""" if (env.get("DROIDDECK_ANTICHEAT_OFFLINE") != "1" or len(command) <= 2 or command[1] != "waitforexitandrun" or not re.fullmatch(r"start_protected_game(?:_?x64|_?64)?\.exe", @@ -258,7 +314,6 @@ def offline_without_anticheat(command, env): game = os.path.join(folder, relative) if os.path.isabs(relative) or relative.startswith("..") or not os.path.isfile(game): return command - # Resolve symlinks before accepting an executable inside the game directory. root = os.path.realpath(folder) if os.path.commonpath((root, os.path.realpath(game))) != root: return command @@ -269,7 +324,6 @@ def offline_without_anticheat(command, env): def engine_fixes(exe, args): - """Environment and extra arguments a game needs because of what it is built with.""" game = Game(exe, args) env, extra, notes = {}, [], [] for check in FIXES: @@ -285,7 +339,6 @@ def engine_fixes(exe, args): def win_components(compat, app_id): - """The game's Windows components put into its prefix; returns their WINEDLLOVERRIDES entries.""" if not compat: return "" try: @@ -312,7 +365,6 @@ def game_gpu(env): def vram_cap(env): - """Puts the session's VRAM cap ahead of the game's own DXVK settings, so a game profile can still raise it.""" value = env.get("BL_VRAM_MB", "") if not re.fullmatch(r"[1-9][0-9]{0,6}", value): return env @@ -324,7 +376,6 @@ def vram_cap(env): def parse_cores(text): - """CPU numbers from a list such as "0-3,6"; None when the text is not one.""" cores = set() for part in text.replace(" ", "").split(","): match = re.fullmatch(r"(\d{1,3})(?:-(\d{1,3}))?", part) @@ -347,7 +398,6 @@ def online_cores(): def game_cores(env): - """Pins the game to the cores its profile names, in place of the session's game cores.""" text = env.get("DROIDDECK_GAME_CORES", "").strip() if not text: return @@ -364,7 +414,6 @@ def game_cores(env): def core_speeds(cores, root="/sys/devices/system/cpu"): - """Each core's capacity, else its top clock; None when some core reports neither.""" for name in ("cpu_capacity", "cpufreq/cpuinfo_max_freq"): speeds = {} for core in cores: @@ -379,14 +428,12 @@ def core_speeds(cores, root="/sys/devices/system/cpu"): def fastest_first(cores): - """The cores, fastest first; cores of equal or unknown speed keep their numeric order.""" cores = sorted(cores) speeds = core_speeds(cores) return sorted(cores, key=lambda core: -speeds[core]) if speeds else cores def proton_cpu_limit(command, env): - """This game's entry in Proton's own default_cpu_limit list: a core count, another value such as "P" as text, or None.""" app_id = env.get("SteamGameId", "") if not command or not app_id.isdigit(): return None @@ -406,7 +453,6 @@ def proton_cpu_limit(command, env): def cpu_topology(env, command=()): - """Windows sees the game's cores fastest first, so a thread a game pins to CPU 0 runs on the fastest core.""" if "PROTON_CPU_TOPOLOGY" in env: return if "WINE_CPU_TOPOLOGY" in env: @@ -439,9 +485,6 @@ def cpu_topology(env, command=()): def gl_vsync(env): - """OpenGL stops waiting for each screen refresh; Steam's Frame Limit still holds the game through gamescope.""" - # Wine asks for interval 1 on every GL window, and WineD3D's front-buffer drawing (DirectDraw, - # Direct3D 1-7) never lowers it, so those games ran at the refresh rate with no limit set. if "vblank_mode" in env or game_id(env) is None: return False env["vblank_mode"] = "0" @@ -488,6 +531,39 @@ def apply_config(env, config, app_id, fixes=None): return result +def render_path_defaults(command, env): + if len(command) < 3 or command[1] != "waitforexitandrun" or Path(command[2]).name.lower() != "spintires.exe": + return None + own = env.get("DXVK_CONFIG", "") + if re.search(r"(?:^|;)\s*dxvk\.tilerMode\s*=", own) or env.get("DXVK_CONFIG_FILE"): + return None + if Path("dxvk.conf").is_file() or Path(command[2]).with_name("dxvk.conf").is_file(): + return None + driver = env.get("VK_DRIVER_FILES", env.get("VK_ICD_FILENAMES", "")) + if Path(driver).parent.name != "DD-Turnip_v0.4.0": + return None + try: + if Path("/sys/class/kgsl/kgsl-3d0/gpu_model").read_text().strip() != "Adreno722": + return None + with open(driver, encoding="utf-8") as source: + library = json.load(source)["ICD"]["library_path"] + if Path(library).name != "libvulkan_freedreno.so": + return None + except (OSError, ValueError, KeyError, TypeError): + return None + own = own.strip().rstrip(";").strip() + env["DXVK_CONFIG"] = own + "; dxvk.tilerMode = False" if own else "dxvk.tilerMode = False" + return "Spintires: DXVK tiler heuristics off on Adreno 722" + + +def bridge_feature_level(env): + if env.get("BL_VKBRIDGE") != "1" or env.get("VKD3D_FEATURE_LEVEL") not in ("12_1", "12_2"): + return None + was = env["VKD3D_FEATURE_LEVEL"] + env["VKD3D_FEATURE_LEVEL"] = "12_0" + return "Mali bridge: VKD3D_FEATURE_LEVEL %s capped at 12_0 (no ray tracing or mesh shaders)" % was + + GAME_DEBUG_CHANNELS = ( "timestamp", "pid", "tid", "seh", "unwind", "threadname", "debugstr", "loaddll", "mscoree", ) @@ -495,7 +571,6 @@ WINE_DEBUG_SELECTOR = re.compile(r"(?:(trace|warn|err|fixme))?([+-])([A-Za-z_][A def game_debug_channels(*values): - """Normalize Wine selectors, retaining custom channels before required diagnostics.""" selectors = {} for value in values: if not isinstance(value, str) or "\0" in value or len(value) > 8192: @@ -506,8 +581,6 @@ def game_debug_channels(*values): if match is None: continue key = (match[1] or "", match[3]) - # Move the last value to the end: global +/-all and per-class selectors - # have ordered semantics, so replacing a value in its old position is wrong. selectors.pop(key, None) selectors[key] = part for channel in GAME_DEBUG_CHANNELS: @@ -521,7 +594,6 @@ def game_debug_channels(*values): def apply_game_debug_logs(env, config, debug_dir): - """Apply app-owned diagnostics to a real game, without editing its launch command.""" if not isinstance(config, dict) or config.get("version") != 1 or config.get("gameDebugLogs") is not True: return env if (not isinstance(debug_dir, str) or "\0" in debug_dir or len(debug_dir) > 8192 @@ -593,10 +665,6 @@ SSBS_LIB = "/usr/local/lib/libssbs.so" def force_ssbs(command, env): - """DROIDDECK_FORCE_SSBS=1 (a game's or the shared environment): preload libssbs.so into this - Proton's Wine, which then keeps PSTATE.SSBS set across signal returns - speculative store - bypass stays allowed, as force_ssbs.diff does inside a rebuilt ntdll. ARM64 Protons only: the - library is aarch64 and only arm64 Wine has the signal path it fixes.""" if env.get("DROIDDECK_FORCE_SSBS", "").lower() not in ("1", "on", "true", "yes"): return env proton = os.path.dirname(command[0]) if command else "" @@ -617,10 +685,6 @@ EVALUATOR_SCRIPT = re.compile(r"(?:^|[\\/])evaluatorscript_[0-9]+\.vdf$", re.IGN def mark_install_scripts(command, env): - """The client is about to run a game's install scripts (iscriptevaluator.exe): mark every process - in them but a Vulkan runtime installer as already run first, so no redistributable installer - starts - on first launch the shared ones may still be downloading, and on ARM64 Proton the VC++ - ones stop with an error.""" if not any(arg.lower().replace("\\", "/").endswith("iscriptevaluator.exe") for arg in command): return [] root = env.get("BL_X64_STEAM_ROOT") or env.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or str(Path.home() / ".local/share/Steam") @@ -727,7 +791,198 @@ def record_install_scripts(digest, env): print("droiddeck-game-env: install scripts not recorded (%s)" % error, file=sys.stderr) -def start(launch, launch_env, digest): +def directaudio_settings(env): + if "directaudio" not in env.get("WINE_AUDIO_DRIVER", "").split(","): + return env + for name, value in list(env.items()): + if name.startswith("AUDIO_DIRECT_"): + env["BANNER_" + name] = value + return env + + +DIRT_GAMES = {"dirt3_game": "dirt3", "showdown": "dirtshowdown", "showdown_avx": "dirtshowdown"} +DIRT_WS2 = "/usr/local/lib/droiddeck-dirt/ws2_32.dll" +DIRT_MARKER = b"droiddeck-dirt-ws2_32" +DIRT_FIXED = "showdown_avx.exe".encode("utf-16-le") +DIRT_SAVED = ".droiddeck-original" + + +def dirt_telemetry_on(prefix, game): + try: + folders = [f for f in (Path(prefix) / "pfx/drive_c/users/steamuser/Documents/My Games").iterdir() + if f.name.lower().replace(" ", "") == game] + except OSError: + return False + for folder in folders: + try: + text = (folder / "hardwaresettings/hardware_settings_config.xml").read_text(encoding="latin-1") + except OSError: + continue + for tag in ("udp", "motion"): + element = re.search(r"<%s\s[^>]*>" % tag, text) + if element: + attrs = dict(re.findall(r'\s(\w+)="([^"]*)"', element.group(0))) + return attrs.get("enabled") == "true" and attrs.get("ip", "").lower() not in ("", "dbox") + return False + + +def proton_ws2(proton): + return Path(proton).parent / "files/lib/wine/i386-windows/ws2_32.dll" + + +def proton_has_dirt_fix(proton): + try: + return DIRT_FIXED in proton_ws2(proton).read_bytes() + except OSError: + return False + + +WINE_DLL_DIRS = ("/lib/wine/i386-windows", "/lib/wine/x86_64-windows", "/lib/wine/aarch64-windows", "/lib/wine", + "/lib/wine/fakedlls", "/lib64/wine", "/lib64/wine/fakedlls", "/lib64/wine/x86_64-windows") + + +def is_wine_dll_link(path): + try: + return os.path.islink(path) and os.path.dirname(os.readlink(path)).endswith(WINE_DLL_DIRS) + except OSError: + return False + + +def prefix_ws2(prefix): + return Path(prefix) / "pfx/drive_c/windows/syswow64/ws2_32.dll" + + +def is_dirt_stand_in(path): + try: + return not path.is_symlink() and DIRT_MARKER in path.read_bytes() + except OSError: + return False + + +def dirt_ws2_wanted(command, env): + prefix = env.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") + if len(command) < 3 or not prefix or not os.path.isfile(DIRT_WS2): + return None + game = DIRT_GAMES.get(os.path.splitext(os.path.basename(command[2]))[0].lower()) + if not game or not dirt_telemetry_on(prefix, game) or proton_has_dirt_fix(command[0]): + return None + return prefix if os.path.lexists(prefix_ws2(prefix)) else None + + +def swap_dirt_ws2(prefix): + target = prefix_ws2(prefix) + saved = target.with_name(target.name + DIRT_SAVED) + data = Path(DIRT_WS2).read_bytes() + if not is_dirt_stand_in(target): + if os.path.lexists(saved): + os.unlink(saved) + os.replace(target, saved) + staged = target.with_name(target.name + ".droiddeck-tmp") + staged.write_bytes(data) + os.replace(staged, target) + + +def restore_dirt_ws2(prefix, proton): + target = prefix_ws2(prefix) + saved = target.with_name(target.name + DIRT_SAVED) + own = proton_ws2(proton) + had_saved = os.path.lexists(saved) + if had_saved: + if os.path.lexists(target) and not is_dirt_stand_in(target): + os.unlink(saved) + return False + if not own.is_file() or not is_wine_dll_link(saved) or os.path.realpath(saved) == os.path.realpath(own): + os.replace(saved, target) + return True + os.unlink(saved) + if own.is_file() and (is_dirt_stand_in(target) or (had_saved and not os.path.lexists(target))): + link = target.with_name(target.name + ".droiddeck-tmp") + if os.path.lexists(link): + os.unlink(link) + os.symlink(own, link) + os.replace(link, target) + return True + return False + + +EGO_RESTRICTIONS = "system/hardware_settings_restrictions.xml" +EGO_CORE_RULE = re.compile(r'[ \t]*<restrict_if name="cores" op="(int_[a-z]+)" value="(\d+)">.*?</restrict_if>[ \t]*\r?\n', re.S) +EGO_OPS = {"int_eq": int.__eq__, "int_ne": int.__ne__, "int_ge": int.__ge__, "int_gt": int.__gt__, + "int_le": int.__le__, "int_lt": int.__lt__} + + +def windows_core_count(env): + count = (env.get("WINE_CPU_TOPOLOGY") or "").split(":", 1)[0] + return int(count) if count.isascii() and count.isdigit() and int(count) > 0 else None + + +def ego_core_plan(command, env): + count = windows_core_count(env) + if not count or len(command) < 3: + return None + folder = Path(command[2]).parent + path = folder / EGO_RESTRICTIONS + try: + raw = path.read_bytes() + except OSError: + return None + text = raw.decode("latin-1") + start, end = text.find("<cpu>"), text.find("</cpu>") + if start < 0 or end < start: + return None + rules = list(EGO_CORE_RULE.finditer(text, start, end)) + if not rules or any(EGO_OPS.get(rule.group(1), lambda a, b: True)(count, int(rule.group(2))) for rule in rules): + return None + smaller = [rule for rule in rules if rule.group(1) == "int_eq" and int(rule.group(2)) < count] + if not smaller: + return None + source = max(smaller, key=lambda rule: int(rule.group(2))) + worker_map = re.search(r'workerMapFile="([^"]+)"', source.group(0)) + if worker_map and not (folder / worker_map.group(1)).is_file(): + return None + plan = source.group(0).replace('value="%s"' % source.group(2), 'value="%d"' % count, 1) + saved = path.with_name(path.name + DIRT_SAVED) + if not os.path.lexists(saved): + saved.write_bytes(raw) + handle, staged = tempfile.mkstemp(prefix=path.name + ".", suffix=".droiddeck-tmp", dir=str(path.parent)) + try: + with os.fdopen(handle, "wb") as out: + out.write((text[:source.end()] + plan + text[source.end():]).encode("latin-1")) + os.replace(staged, path) + except BaseException: + if os.path.lexists(staged): + os.unlink(staged) + raise + return "%s had no thread plan for %d cores; added a copy of its %s-core plan" % (EGO_RESTRICTIONS, count, source.group(2)) + + +def wait_forwarding_signals(process): + def forward(signum, frame): + try: + process.send_signal(signum) + except OSError: + pass + + previous = {signum: signal.signal(signum, forward) for signum in (signal.SIGTERM, signal.SIGINT, signal.SIGHUP)} + try: + code = process.wait() + finally: + for signum, handler in previous.items(): + signal.signal(signum, handler) + return 128 - code if code < 0 else code + + +def start(launch, launch_env, digest, after=None): + if after: + process = subprocess.Popen(launch, env=launch_env) + try: + return wait_forwarding_signals(process) + finally: + try: + after() + except OSError as error: + print("droiddeck-game-env: DiRT telemetry fix: prefix ws2_32 not put back (%s); the next launch does it" % error, + file=sys.stderr) if digest: code = subprocess.run(launch, env=launch_env, check=False).returncode if code == 0: @@ -752,6 +1007,7 @@ def main(): except OSError: digest = None app_id = game_id(env) + dirt_prefix = None if app_id: gl_default = gl_vsync(env) waiting = len(command) > 1 and command[1] == "waitforexitandrun" @@ -761,6 +1017,7 @@ def main(): if waiting: command = skip_red_launcher(command) ubisoft_overlay_off(env) + project_zomboid_jvm(command) fixes, extra, notes = engine_fixes(command[2], command[3:]) if len(command) > 2 else ({}, [], []) if not gl_default: fixes.pop("vblank_mode", None) @@ -771,6 +1028,10 @@ def main(): if components: own = fixes.get("WINEDLLOVERRIDES") fixes["WINEDLLOVERRIDES"] = components + ";" + own if own else components + dirt_prefix = dirt_ws2_wanted(command, env) + if dirt_prefix: + own = fixes.get("WINEDLLOVERRIDES") + fixes["WINEDLLOVERRIDES"] = own + ";ws2_32=n,b" if own else "ws2_32=n,b" path = Path.home() / ".config/droiddeck/game-environment.json" config = {} try: @@ -797,11 +1058,25 @@ def main(): if app_id and len(command) > 1 and command[1] == "waitforexitandrun": command = offline_without_anticheat(command, env) if mic_enabled == "0": - env["BANNER_AUDIO_DIRECT_MIC"] = "0" + env["AUDIO_DIRECT_MIC"] = "0" + env = directaudio_settings(env) env = vram_cap(env) + note = render_path_defaults(command, env) if app_id else None + if note: + print("droiddeck-game-env: " + note, file=sys.stderr) + note = bridge_feature_level(env) + if note: + print("droiddeck-game-env: " + note, file=sys.stderr) env = force_ssbs(command, env) game_cores(env) cpu_topology(env, command) + if app_id and len(command) > 2 and command[1] == "waitforexitandrun": + try: + note = ego_core_plan(command, env) + except OSError as error: + note = "no thread plan added for this core count (%s)" % error + if note: + print("droiddeck-game-env: " + note, file=sys.stderr) try: xbox = runpy.run_path(str(Path(__file__).with_name("droiddeck-xbox"))) except Exception as error: @@ -814,16 +1089,45 @@ def main(): return 1 if xbox_result is not None: return xbox_result + after = None + prefix = env.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") + if app_id and prefix and len(command) > 1 and command[1] == "waitforexitandrun": + try: + if dirt_prefix: + after = lambda: restore_dirt_ws2(dirt_prefix, command[0]) + swap_dirt_ws2(dirt_prefix) + print("droiddeck-game-env: DiRT telemetry fix: ws2_32 stand-in in the prefix until the game exits", + file=sys.stderr) + elif restore_dirt_ws2(prefix, command[0]): + print("droiddeck-game-env: DiRT telemetry fix: put the prefix's own ws2_32 back", file=sys.stderr) + except OSError as error: + print("droiddeck-game-env: DiRT telemetry fix not applied (%s)" % error, file=sys.stderr) + if after: + after = None + try: + restore_dirt_ws2(dirt_prefix, command[0]) + except OSError as undo: + print("droiddeck-game-env: DiRT telemetry fix: prefix ws2_32 not put back (%s); Wine uses its own copy " + "and the next launch puts the file back" % undo, file=sys.stderr) sync = load_sync() launch, launch_env = select_sync(command, env, sync) if launch[0] != command[0]: try: - return start(launch, launch_env, digest) + return start(launch, launch_env, digest, after) except OSError as error: print("droiddeck-game-env: %s could not start (%s); stock launch" % (launch[0], error), file=sys.stderr) launch, launch_env = command, without_pack(launch_env, env) record_stock(sync, launch, launch_env) - return start(launch, launch_env, digest) + try: + return start(launch, launch_env, digest, after) + except OSError: + if after: + try: + after() + except OSError as error: + print("droiddeck-game-env: DiRT telemetry fix: prefix ws2_32 not put back (%s); the next launch does it" % error, + file=sys.stderr) + raise if __name__ == "__main__": diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance index 4a56fd1226..1fc6e0f37e 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gog-maintenance @@ -1,5 +1,4 @@ #!/usr/bin/python3 -"""GOG patch installers and the lease shared by maintenance and game launches.""" import fcntl import errno import json @@ -133,7 +132,6 @@ def runner(folder, appid, game, graphical=False): base = desktop_environment(os.environ) if graphical else dict(os.environ) env = run["environment"](base, target, tool, root, window=base.get("BL_DESKTOP") == "1") env["DROIDDECK_GOG_MAINTENANCE"] = "1" - # Installer copy routines use x87 integer loads/stores; reduced precision corrupts paths (FEX #5827). env["FEX_X87REDUCEDPRECISION"] = "0" env.pop("BL_STORE_EXIT", None) return str(Path(tool) / command), env, target.compatdata diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window index 0c1c9818f6..5fc4e20a02 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window @@ -1,5 +1,4 @@ #!/usr/bin/python3 -"""Let GTK draw close buttons inside gamescope, which supplies no window decorations.""" import ctypes as c import os import signal diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime b/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime index c96aa283bb..4f110cfbc6 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime @@ -85,7 +85,7 @@ def connect(): def main(): launch = os.environ.get("BL_LAUNCH_DIR", "") - report = Report(os.path.join(launch, "agent") if launch else "") + report = Report(os.environ.get("BL_IME_DIR") or (os.path.join(launch, "agent") if launch else "")) conn = Connection(connect()) conn.send(DISPLAY_ID, 1, struct.pack("<I", REGISTRY_ID)) contexts = {} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-launcher-cores b/tools/linuxfs/overlay/usr/local/bin/droiddeck-launcher-cores index 3ea0c56811..034a910b0c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-launcher-cores +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-launcher-cores @@ -1,20 +1,4 @@ #!/usr/bin/python3 -"""Holds a game launcher's hidden web interface on one slow core while something else has focus. - -Rockstar's launcher keeps drawing its Chromium interface (SocialClubHelper.exe: a renderer, and a -GPU process compositing through DXVK) for as long as it runs, hidden behind the game too, and at a -higher priority than the game's (Wine passes Chromium's on: the GPU process ran at nice -10). With -Red Dead Redemption 2 in front on the RedMagic that was 1.3 to 2.5 cores under FEX, on a phone -already held back by its temperature, for a page nobody sees. Held, riding at the throttle limit -went from 46.5 to 48.7 fps, 1% lows from 27.5 to 32.6. So while the focused window belongs to -anything but the launcher, every helper thread runs on one core of the slowest cluster at nice 19; -when the launcher's own window has focus again (signing in, the game closed) each thread gets its -own mask and priority back. Stopping the helpers instead would not hold: proot, the tracer of every -guest process, resumes a stopped tracee. - -Focus comes from droiddeck-agent's focus.json (the path is the argument), which the agent rewrites -whenever gamescope's focus changes. droiddeck-session starts this for Steam sessions; -BL_LAUNCHER_CORES=0 leaves the launchers alone.""" import json import os import signal @@ -35,7 +19,6 @@ def log(message): def image(proc, pid): - """A process's program as Wine names it (argv[0]), lower case with backslashes, or None.""" try: with open(proc / str(pid) / "cmdline", "rb") as stream: first = stream.read(4096).split(b"\0", 1)[0] @@ -56,7 +39,6 @@ def tasks(proc, pid): class Cores: - """The kernel calls, apart so a test can stand in for them.""" def own(self): return os.sched_getaffinity(0) @@ -81,8 +63,6 @@ class Holder: self.core = None def slow_core(self): - """The last core of the slowest cluster the session has - not of the game's cores, which - the launcher inherits when BL_GAME_CPUS is set: the core the game misses least.""" def top(cpu): try: return int((self.cpufreq / f"cpu{cpu}/cpufreq/cpuinfo_max_freq").read_text()) @@ -98,8 +78,6 @@ class Holder: yield int(name) def hold(self): - """Every helper thread onto the slow core at NICE: new ones, and held ones the program has - moved since (Chromium sets its threads' priorities, and Wine passes that on).""" if self.core is None: self.core = self.slow_core() hold = ({self.core}, NICE) @@ -125,8 +103,6 @@ class Holder: return None def release(self): - """Every held thread back to its own mask and priority; one started during the hold gets - what its process had.""" for pid, before in self.held.items(): default = before.get(pid) or self.first() for tid in tasks(self.proc, pid): @@ -141,7 +117,6 @@ class Holder: def focused(snapshot): - """(app id, pid) of the window gamescope has focused, from droiddeck-agent's snapshot.""" window = snapshot.get("focusedWindow") for entry in snapshot.get("focusableWindows") or []: if entry.get("window") == window: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-login1 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-login1 index 5c04842c00..3ac444d6e8 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-login1 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-login1 @@ -1,10 +1,4 @@ #!/usr/bin/python3 -"""Steam's login1 sleep notifications, backed by DroidDeck's session pause. - -Android owns device power. Suspend here pauses the guest through SessionService; -the app's Resume action thaws it and completes PrepareForSleep(false). Steam -must see this service before startup or it can stay black after its idle timer. -""" import importlib.machinery import importlib.util import os diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-msi-install b/tools/linuxfs/overlay/usr/local/bin/droiddeck-msi-install index 87e741c461..681cf4031b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-msi-install +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-msi-install @@ -1,32 +1,4 @@ #!/usr/bin/python3 -"""Installs a Windows Installer package (.msi) the way Wine's own msiexec would, without running it. - -droiddeck-msi-install <package.msi | installer.exe> <component dir> -droiddeck-msi-install --unpack <archive | installer.exe | cabinet> <dir> - -A .msi is a database: which files go to which folder, which registry values to write, which .NET -and side-by-side assemblies to register. This reads those tables (msiinfo), unpacks the package's -cabinets (cabextract, which knows every compression a cabinet can use) and lays the result out -for droiddeck-wincomponents, which puts it into a game's prefix at launch: - - <component dir>/drive_c/... the files, at the paths they get on 64-bit Windows - <component dir>/registry.json the registry values, in the view (32/64-bit) Windows uses - -An installer .exe is opened the same way when it is a wrapper around packages: a WiX bundle -(Visual C++ 2012 and later, the .NET Core and 5+ runtimes: the packages sit in a cabinet the -bundle's own header locates, named in its manifest), a self-extracting cabinet (Visual C++ 2005 -to 2010) or a self-extracting 7-Zip archive (.NET Framework 4.0 to 4.8). The packages inside are -laid out one after the other into the same component dir; the 32- and 64-bit ones both, an ARM64 -one never. An .exe that is its own setup program (NSIS, InnoSetup) holds no package: an error says so. - -What a package does by running its own code (custom actions such as DXSETUP, self-registering -DLLs) cannot be done this way; each is named in the notes, so nothing is left out silently. - ---unpack opens an archive or installer for the caller to take files out of (cabextract for a -cabinet or self-extracting cabinet, 7-Zip for the rest) and prints the files it found. - -Prints "progress <text>" lines while it works and ends with "result <json>": the counts and notes. -""" import json import os import re @@ -47,7 +19,6 @@ SKIP_PLATFORMS = ("arm64", "arm") def tool_env(): - """The environment the tools run in: their own libraries (libmsi, libgsf, libgcab) beside them.""" env = dict(os.environ) env["LD_LIBRARY_PATH"] = ":".join(p for p in (str(TOOLS), env.get("LD_LIBRARY_PATH", "")) if p) return env @@ -95,7 +66,6 @@ class MsiError(Exception): def progress(text, fraction=None): - """A progress line: "progress <text>", or "progress NN% <text>" when how far along is known.""" if fraction is None: print("progress " + text, flush=True) else: @@ -103,7 +73,6 @@ def progress(text, fraction=None): class Span: - """The slice of the whole job one package's progress maps into (a wrapper runs several).""" def __init__(self, lo=0.0, hi=1.0): self.lo, self.hi = lo, hi @@ -137,7 +106,6 @@ class Package: self.summary[name.strip().lower()] = value.strip() def table(self, name): - """The table's rows as dicts by column name; an absent table has none.""" if name in self._tables: return self._tables[name] rows = [] @@ -158,7 +126,6 @@ class Package: def long_name(value): - """A Directory/File name column: "short|long", the long one when there are two.""" return value.split("|")[-1] @@ -176,7 +143,6 @@ KEYWORDS = {"not", "and", "or", "xor", "eqv", "imp"} class Conditions: - """Windows Installer's condition language, enough of it for what packages ask at install time.""" def __init__(self, props, feature_state=None, component_state=None): self.props = props @@ -318,7 +284,6 @@ class Conditions: def win_to_rel(path): - """C:\\windows\\x\\ -> drive_c/windows/x; None for a path off drive C or a folder left out.""" if not path: return None match = re.match(r"^[Cc]:\\?(.*)$", path) @@ -341,7 +306,6 @@ def clean_version(version): def clr_version(path): - """The .NET runtime an assembly was built for ("v4.0.30319"), from its metadata header.""" try: data = Path(path).read_bytes() except OSError: @@ -389,7 +353,6 @@ class Installer: return 3 if name in self.included_components else -1 def directory(self, key): - """The folder a Directory key resolves to, as drive_c/..., or None when it is left out.""" if key in self._resolving: return None value = self.props.get(key) @@ -414,7 +377,6 @@ class Installer: return parent + "/" + default def format(self, text): - """Formatted text: [Property], [Folder], [#file], [$component], [%env], [\\x], [~].""" if not text: return text @@ -449,7 +411,6 @@ class Installer: def run_set_actions(self): - """The property/folder-setting custom actions, in sequence order; the rest go to the notes.""" actions = {row["Action"]: row for row in self.pkg.table("CustomAction")} sequence = {} for table in ("InstallUISequence", "InstallExecuteSequence"): @@ -506,7 +467,6 @@ class Installer: self.included_components.add(name) def assemblies(self): - """Component -> where its files go when it is a global assembly (the GAC or winsxs).""" names = {} for row in self.pkg.table("MsiAssemblyName"): names.setdefault(row["Component_"], {})[row["Name"].lower()] = row["Value"] @@ -535,7 +495,6 @@ class Installer: @staticmethod def sxs_names(ident): - """Wine's winsxs names for a side-by-side assembly: its folder and, for a policy, the policy folder.""" arch = ident.get("processorarchitecture", "x86").lower() or "x86" name = ident.get("name", "").lower() token = ident.get("publickeytoken", "").lower() @@ -548,7 +507,6 @@ class Installer: return "assembly", "%s_%s_%s_%s_none_deadbeef" % (arch, name, token, version), version def unpack(self, work): - """Every cabinet in the package, unpacked; returns File key -> unpacked file.""" found = {} media = [row for row in self.pkg.table("Media") if row.get("Cabinet", "")] for index, row in enumerate(media): @@ -656,7 +614,6 @@ class Installer: self.registry.append({"hive": hive, "key": key, "name": name, "type": kind, "data": data}) def registry_data(self, raw): - """A Registry table Value: (type, data) as droiddeck-wincomponents writes them.""" if raw is None or raw == "": return "sz", "" if raw.startswith("#x") or raw.startswith("#X"): @@ -773,7 +730,6 @@ class Installer: def sibling(path, name): - """A file next to [path] called [name], whatever its case; None when there is none.""" folder = path.parent candidate = folder / name if candidate.is_file(): @@ -786,7 +742,6 @@ def sibling(path, name): def kind_of(path): - """What a file is by its first bytes: msi, exe, cab or other.""" with open(path, "rb") as source: head = source.read(8) if head.startswith(MSI_MAGIC): @@ -806,9 +761,6 @@ def run_tool(args, timeout=1800): def burn_containers(data): - """A WiX bundle's containers as (offset, size) pairs: the .wixburn section of the stub names - their sizes; each is a cabinet laid out after the stub, found by its header since signing can - move them. None when the file is no bundle.""" try: pe = struct.unpack_from("<I", data, 0x3C)[0] if data[pe:pe + 4] != b"PE\0\0": @@ -845,8 +797,6 @@ def burn_containers(data): def unpack_burn(path, dest, containers): - """Unpacks a bundle's containers into [dest] and gives the payloads the names its manifest - lists (a9 -> packages/vcRuntimeMinimum_amd64/vc_runtimeMinimum_x64.msi).""" data = path.read_bytes() names = {} for index, (start, size) in enumerate(containers): @@ -877,8 +827,6 @@ def unpack_burn(path, dest, containers): def unpack_installer(path, dest): - """Opens an installer or archive into [dest]: a bundle by its header, a cabinet (or - self-extracting one) with cabextract, anything else with 7-Zip.""" kind = kind_of(path) if kind == "exe": containers = burn_containers(path.read_bytes()) @@ -900,7 +848,6 @@ def unpack_installer(path, dest): def packages_in(root): - """The Windows Installer packages an unpacked installer holds, shallowest first, by name.""" found = [] for entry in sorted(root.rglob("*")): if entry.is_file() and kind_of(entry) == "msi": @@ -910,11 +857,6 @@ def packages_in(root): def choose_packages(found, root): - """Which packages make up the install: the ones at the top of the installer (a bundle keeps - each in its own folder, so there every level counts), for the x86 and x64 platforms. The .NET - Framework 4.5+ installers carry a complete product (netfx_Full_*) beside the 4.0 parts they - patch (netfx_Core_*, netfx_Extended_*) and per-Windows-version copies in NetFx* folders: the - complete product wins, the copies are left out.""" if not found: return [] depth = min(len(entry.relative_to(root).parts) for entry in found) @@ -933,7 +875,6 @@ def choose_packages(found, root): def install_wrapper(path, out): - """Lays out every package inside an installer wrapper; the result is the sum of them.""" total = {"product": "", "version": "", "counts": {"files": 0, "assemblies": 0, "registry": 0}, "notes": [], "packages": []} with tempfile.TemporaryDirectory(dir=str(out.parent), prefix=".unpack-") as work: dest = Path(work) / "x" @@ -968,9 +909,6 @@ NESTED_SUFFIXES = (".7z", ".zip", ".cab", ".exe", ".msi", ".rar", ".xz", ".gz", def open_nested(dest, depth=0): - """Archives inside an unpacked installer (QuickTime's cabinets, an NSIS pack's payloads) are - opened in place, one "<name>.nested" folder per archive, two levels deep: the same layout the - component recordings (winlator-contents tools/snapshot/record.py) map their file sources to.""" if depth > 1: return 0 opened = 0 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open index 2fc023e041..0edd302123 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open @@ -1,19 +1,4 @@ #!/usr/bin/python3 -"""Runs a program from the desktop: a Windows program through the Proton Steam has chosen, a Linux -program (x86 ones under FEX), an AppImage, or a script (under FEX beside x86 programs, as a game's -start script is). Shared storage is noexec: FEX runs x86 programs there where they lie (libblsession's -noexec.c), while a native one is copied - alone into the cache, or with its folder by the app once (as -Add an app does) when that holds native programs or libraries. A Steam library's games are Steam's. - - droiddeck-open [--window | --terminal] FILE [ARGS...] the file manager's Run entries - droiddeck-open --exec FILE [ARGS...] an exec the kernel refused (libblsession) - droiddeck-open --install the Run entries and default handlers - -The desktop composites in software, so a program started from it runs on the GPU in a window of its -own (droiddeck-gpu), as the menu's games do: --window keeps it on the desktop's software drawing -instead, --terminal runs it in Konsole. A plain script stays on the desktop, and an exec whose output is read (a terminal, -a pipe, a file) stays where it was started. -""" import fcntl import hashlib import os @@ -120,7 +105,6 @@ def for_x86(script): def runnable(path): - """The program itself, or a copy in the cache of a native one on noexec storage.""" if not noexec(path) or machine(head(path)) in EMULATED: return path st = os.stat(path) @@ -141,7 +125,6 @@ def runnable(path): def appimage(path): - """The image unpacked once into the cache, laid out as droiddeck-appimage-run expects.""" st = os.stat(path) real = os.path.realpath(path) key = hashlib.sha1(("%s\0%d\0%d" % (real, st.st_size, st.st_mtime_ns)).encode("utf-8")).hexdigest()[:16] @@ -150,7 +133,6 @@ def appimage(path): def once(key, make): - """[make]() for [key] one start at a time: a second start waits for the first, then finds it done.""" locks = os.path.join(CACHE, "locks") os.makedirs(locks, exist_ok=True) with open(os.path.join(locks, key), "w") as lock: @@ -203,8 +185,6 @@ def import_of(key, what): def imported(what, real, key, name): - """[real] added by the app instead, as Add an app adds it (to the menu too): an AppImage whose hard - links (sharun's) only the app's own proot can make, or a folder of native programs off noexec storage.""" launch = os.environ.get("BL_LAUNCH_DIR") if not launch or not os.path.isdir(launch): raise RuntimeError("%s cannot run from here; add it in DroidDeck with Add an app." % name) @@ -235,9 +215,6 @@ def imported(what, real, key, name): def game_folder(path): - """The folder of [path] when it runs only from a copy: on noexec storage, holding native programs or - libraries (besides [path]) that it starts or loads. Not the storage itself, one of Android's folders - or a Steam library.""" real = os.path.realpath(path) folder = os.path.dirname(real) if in_steam_library(real) or not noexec(folder): @@ -263,12 +240,10 @@ def game_folder(path): def in_steam_library(path): - """Whether [path] is in a Steam library: its games are Steam's to start, never copied in.""" return "steamapps" in os.path.realpath(path).lower().split(os.sep) def storage_root(folder): - """The top of the storage [folder] is on: the last folder above it on the same file system.""" top = folder try: dev = os.stat(folder).st_dev @@ -280,7 +255,6 @@ def storage_root(folder): def copied_in(path): - """The app's copy of [path]'s folder, added (once) for it.""" real = os.path.realpath(path) key = hashlib.sha1(("folder\0%s" % real).encode("utf-8")).hexdigest()[:16] name = os.path.basename(os.path.dirname(real)) @@ -288,7 +262,6 @@ def copied_in(path): def steam_title(path): - """The Steam game [path] is the program of: Steam starts it, with the client most games need.""" try: run = runpy.run_path(PROTON_RUN) root = os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or run["STEAM_ROOT"] @@ -299,7 +272,6 @@ def steam_title(path): def command(path, args, what, window=False, appid=None): - """(command, working directory) that runs [path] in place.""" folder = os.path.dirname(path) if what == "steam": return [STEAM_LAUNCH, "desktop", appid], folder @@ -321,7 +293,6 @@ def on_desktop(env): def unattended(env): - """Nobody reads the output: it goes to /dev/null or the desktop's log, as from Dolphin or the menu.""" try: out = os.fstat(1) except OSError: @@ -337,7 +308,6 @@ def unattended(env): def placed(cmd, what, mode, env): - """[cmd] where it shows: on the GPU from the desktop, else where it was started.""" if mode == "terminal" and what not in ("windows", "steam") and shutil.which("konsole"): return ["konsole", "--hold", "-e"] + cmd if mode == "window" or what in ("script", "steam") or not on_desktop(env): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open-url b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open-url index 8908335191..c83dcfbc8e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open-url +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open-url @@ -1,11 +1,4 @@ #!/usr/bin/python3 -"""A game's web links to Android: Wine's winebrowser starts this (named as the browser in the -prefix's HKCU\\Software\\Wine\\WineBrowser, and as xdg-open first on a game's PATH), and an -http(s) address goes to the app, which opens it in Android's browser - so an EOS sign-in step or a -store page can be finished on the phone. Anything else goes on to the system's own xdg-open. - -The session channel is $BL_LAUNCH_DIR/stores; Wine may not pass that variable on to what it -starts, so droiddeck-proton also leaves it in LAUNCH_DIR_FILE.""" import json import os @@ -25,7 +18,6 @@ def hand_over(url, launch_dir): def where(url): - """scheme://host only, for the log: no path, no query.""" from urllib.parse import urlsplit try: u = urlsplit(url) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-pad-defaults b/tools/linuxfs/overlay/usr/local/bin/droiddeck-pad-defaults index 04966c4b2c..7d28a5d288 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-pad-defaults +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-pad-defaults @@ -89,7 +89,6 @@ def rpcs3_shader_mode(): def ini_section(lines, name): - """(start, end) line indices of [name]'s body, or None.""" start = None for i, l in enumerate(lines): t = l.strip() @@ -102,9 +101,6 @@ def ini_section(lines, name): def patch_ini_section(path, section, body, what, needle="SDL-", require=None, done="Player 1 on the controller"): - """Add body's lines to [section] of an ini the emulator wrote itself, unless the section - already binds a controller (needle). Missing file: nothing - the emulator writes its own - defaults on first run and this runs again.""" if not os.path.isfile(path): return with open(path, encoding="utf-8", errors="replace") as f: @@ -178,7 +174,6 @@ def ini_get(path, section, key): def ini_set(path, section, key, value): - """Sets one key (the first of that name) in [section], adding either as needed.""" with open(path, encoding="utf-8", errors="replace") as f: lines = f.read().splitlines() span = ini_section(lines, section) @@ -440,9 +435,6 @@ def armsx2(): def armsx2_bios(ini): - """PCSX2 boots the one BIOS file named in [Filenames] BIOS (inside [Folders] Bios); its first-time - setup is what names it. With that skipped, the first dump in the folder is named here - a US one - first - while none is named or the named one is gone. A choice made in ARMSX2 is kept.""" folder = ini_get(ini, "Folders", "Bios") or ps2_bios_folder() if not os.path.isabs(folder): folder = os.path.join(os.path.dirname(os.path.dirname(ini)), folder) @@ -518,12 +510,6 @@ DOLPHIN_DATA = "/usr/share/dolphin-emu" def dolphin_data(): - """The Dolphin build in the catalog finds its own data - the GameCube fonts, the per-game fixes - (GameSettings: GUT.ini puts Ultimate Spider-Man on the MMU), its icons and shaders - only at the - fixed /usr/share/dolphin-emu it was built for; there is no setting or variable to move it. Here it - runs from a copy unpacked under /tmp (no FUSE), so it found none of it: a GameCube game stopped - on "Windows-1252 fonts are not loaded", another on an invalid write the missing game fix would - have prevented. So the folder is unpacked from the AppImage to that path, once per AppImage.""" import shutil, subprocess, tempfile try: st = os.stat(DOLPHIN_APPIMAGE) @@ -716,7 +702,6 @@ def melonds_geometry(): def toml_get(lines, table, key): - """The raw value of key in [table], or None.""" inside = False for l in lines: t = l.strip() @@ -728,7 +713,6 @@ def toml_get(lines, table, key): def toml_set(lines, table, key, value): - """key = value in [table]; the table is added at the end when missing.""" start = None for i, l in enumerate(lines): t = l.strip() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-pipewire b/tools/linuxfs/overlay/usr/local/bin/droiddeck-pipewire index 2677599bf0..df776d6644 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-pipewire +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-pipewire @@ -1,5 +1,4 @@ #!/bin/sh -# Audio stays on the session's PulseAudio, so WirePlumber runs its upstream video-only profile. set -u bundle=/usr/local/lib/droiddeck-pipewire.tzst diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-extra b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-extra index 241ac290d5..b7b1c27b0f 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-extra +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-extra @@ -31,7 +31,6 @@ def fetch_json(url): def pick_asset(source): - """(release tag, asset url, sha512 url or None) for the newest full release with an ARM64 build.""" repo, pattern = SOURCES[source] for release in fetch_json(RELEASES % repo + "?per_page=15"): if release.get("draft") or release.get("prerelease"): @@ -58,8 +57,6 @@ def release_asset(source, tag): def download(url, path): - """Resumable, because this is hundreds of megabytes over a phone's connection. curl is used - rather than urllib so a retry continues rather than starting again.""" log("downloading %s" % os.path.basename(path)) rc = subprocess.call([ "curl", "-fL", "--retry", "5", "--retry-delay", "3", "--retry-connrefused", diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run index 624d420741..410f1654d1 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run @@ -1,25 +1,4 @@ #!/usr/bin/python3 -"""Runs a Windows program with the Proton the Steam client has chosen for it. - - droiddeck-proton-run [--window] [--prefix ID] [--verb run] [--game-id ID] [--desktop WxH] PROGRAM [ARGS...] - droiddeck-proton-run --app ID [--dir FOLDER] [--options TEXT] [PROGRAM [ARGS...]] - -The program belongs to an installed Steam game when it sits in one's folder, to a prefix when it -sits in one's drive_c, or to a non-Steam shortcut that names it; any other program gets a prefix of -its own, under the id the client gives a new shortcut. That title's CompatToolMapping entry in -config.vdf picks the tool, else the client's default for all other titles ("0"). The tool is -started as the client starts it - its toolmanifest's command line, the waitforexitandrun verb and -the STEAM_COMPAT_* environment - so its wrapper applies the game's settings, components and audio. ---window keeps the program in the desktop's own window, drawn with WineD3D on the desktop's software -GL (llvmpipe): KWin there composites in software, and the session's zink finds no device. ---prefix ID puts the program in compatdata/ID whatever it is. --verb run starts it beside what already -runs in the prefix, which waitforexitandrun would wait for; the wrapper's launch-time steps are skipped. ---game-id ID keeps the id of the launch it runs for: gamescope shows the windows that carry the id Steam launched. ---app starts one game without the Steam client (its Start without Steam): a Steam game's default -Windows launch option from appinfo.vdf when no program is given, else the program in that -shortcut's own prefix, started in --dir with the shortcut's launch options (--options). Without ---options it takes the launch options set in the client's Properties for that game or shortcut. -""" import json import os import re @@ -91,7 +70,6 @@ def mapping(root): def tools(root): - """Windows compatibility tools this runtime can start, by the name config.vdf uses.""" found = {} for base in [os.path.join(root, "compatibilitytools.d")] + list(SYSTEM_TOOLS): try: @@ -121,7 +99,6 @@ def state_default(): def choose_tool(appid, current, available): - """(tool name, why) from the client's mapping, else the session's own default.""" for key, why in ((appid, "Steam's choice for this title"), ("0", "Steam's default")): name = current.get(key) if name in available: @@ -144,7 +121,6 @@ class Target: def ancestors(path): - """(folder, the entry below it on the way to path) from the program's folder up to /.""" child, folder = path, os.path.dirname(path) while True: yield folder, os.path.basename(child) @@ -211,7 +187,6 @@ def same_file(a, b): def shortcut_entries(root): - """(appid, exe, start dir) of the client's non-Steam shortcuts and the app's added games.""" entries = [] try: tool = runpy.run_path(os.path.join(BIN_DIR, "droiddeck-steam-shortcuts")) @@ -239,7 +214,6 @@ def shortcut_entries(root): def prefix_folder(root, appid): - """The prefix folder the client made for [appid], under either spelling of the id.""" folder = os.path.join(root, "steamapps", "compatdata") try: names = sorted(os.listdir(folder)) @@ -267,7 +241,6 @@ def vdf_string(token): def steam_options(app, root): - """The launch options the client keeps for a game (localconfig.vdf) or a shortcut (shortcuts.vdf).""" try: tool = runpy.run_path(os.path.join(BIN_DIR, "droiddeck-steam-shortcuts")) account = tool["account_dir"](root) @@ -305,7 +278,6 @@ def shortcut(program, root): def own_id(program): - """The id the client gives a new shortcut: the CRC of its quoted target and its name.""" name = os.path.splitext(os.path.basename(program))[0] return zlib.crc32(('"%s"%s' % (program, name)).encode("utf-8")) | SHORTCUT_BIT @@ -337,8 +309,6 @@ def split_words(text): def split_options(text): - """A shortcut's launch options: NAME=value words before %command% go to the environment, the words - after it - or all of them, without %command% - are the program's arguments.""" words = split_words(text) if "%command%" not in words: return {}, words @@ -352,7 +322,6 @@ def split_options(text): def find_file(base, relative): - """base/relative, matching each part without regard to case as Windows does.""" path = base for part in [p for p in relative.replace("\\", "/").split("/") if p and p != "."]: exact = os.path.join(path, part) @@ -379,7 +348,6 @@ def steam_install(appid, root): def steam_launch(appid, root): - """(target, program, arguments) for a Steam game's default Windows launch option, or None.""" library, install = steam_install(appid, root) if not install or not os.path.isdir(install): return None @@ -406,7 +374,6 @@ def shortcut_target(appid, program, start, root): def steam_launches(target, program, root): - """Whether a launch option of the Steam game starts [program]: then Steam should start it.""" if target.kind != "steam": return False entry = compat()["appinfo_entries"](os.path.join(root, "appcache", "appinfo.vdf")).get(target.appid, {}) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index 86d3f1c31a..babcb86d3d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists @@ -24,7 +24,7 @@ read_scripts() { xargs -0 -r awk -v want="${1:-redists}" ' proc[depth] = 1 program = tolower(part[4]) sub(/.*[\\\/]/, "", program) - if (program ~ /vulkan|uplay|ubisoft/) vulkan[depth] = 1 + if (program ~ /vulkan|uplay|ubisoft|eaapp/) vulkan[depth] = 1 next } if (n == 3) pending = part[2] @@ -144,8 +144,6 @@ unseed() { return 1 } -# The ledger lines whose values the registry still holds, in both views where we wrote both. A Proton -# update replaces its default_pfx system.reg but not our ledger beside it, and new prefixes copy both. present() { awk -F'\t' -v hive="$hive" ' NR == FNR { path = $1 @@ -192,10 +190,14 @@ present() { awk -F'\t' -v hive="$hive" ' regs=() for reg in "$steam_root"/steamapps/common/Proton*/files/share/default_pfx*/system.reg \ /mnt/droiddeck-sd/steamapps/common/Proton*/files/share/default_pfx*/system.reg \ + /mnt/droiddeck-lib/*/steamapps/common/Proton*/files/share/default_pfx*/system.reg \ + /mnt/droiddeck-lib/*/x86-64/steamapps/common/Proton*/files/share/default_pfx*/system.reg \ /root/Games/*/steamapps/common/Proton*/files/share/default_pfx*/system.reg \ "$steam_root"/compatibilitytools.d/*/files/share/default_pfx*/system.reg \ "$steam_root"/steamapps/compatdata/*/pfx/system.reg \ /mnt/droiddeck-sd/steamapps/compatdata/*/pfx/system.reg \ + /mnt/droiddeck-lib/*/steamapps/compatdata/*/pfx/system.reg \ + /mnt/droiddeck-lib/*/x86-64/steamapps/compatdata/*/pfx/system.reg \ /root/Games/*/steamapps/compatdata/*/pfx/system.reg; do [ -f "$reg" ] && regs+=("$reg") done @@ -243,7 +245,7 @@ for system in "${regs[@]}"; do had=() for line in "${kept[@]}"; do had[$line]=1; done printf '%s\n' "${other[@]}" "${kept[@]}" >"$seeded" - echo "== took Vulkan runtime and Ubisoft Connect markers out of $reg" + echo "== took Vulkan runtime, Ubisoft Connect and EA app markers out of $reg" fi if [ ${#had[@]} -gt 0 ] && { [ -z "$id" ] || [ "$id" != "$prev" ]; }; then declare -A held=() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 39fc4f6ad5..0c037af472 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -99,6 +99,8 @@ clear_stale_tmp() { [ -z "${BL_INSIDE:-}" ] && clear_stale_tmp if [ -z "${BL_INSIDE:-}" ]; then if [ "${BL_ZRAM:-0}" = 1 ]; then printf 0 > /tmp/.bl-zram; else rm -f /tmp/.bl-zram; fi + rm -f /tmp/.bl-clock + head -c 8 /dev/zero > /tmp/.bl-clock fi steam_devtools() { @@ -136,7 +138,6 @@ run_gamescope() ( local status_file child_status compositor_status status_file=$(mktemp "${XDG_RUNTIME_DIR:-/tmp}/droiddeck-steam-exit.XXXXXX") || exit 73 trap 'rm -f "$status_file"' EXIT - # Gamescope can return success when its primary child crashed. BL_STEAM_EXIT_FILE="$status_file" gamescope "$@" compositor_status=$? if read -r child_status < "$status_file" && [[ $child_status =~ ^[0-9]{1,3}$ ]] \ @@ -159,7 +160,7 @@ collect_steam_logs() { cp "$fex_state/status.json" "$fex_state/config/Config.json" "$BL_DEBUG_DIR/droiddeck-fex/" 2>/dev/null fi } -trap 'collect_steam_logs 2>/dev/null || true' TERM INT HUP +trap 'bl_stopping=1; collect_steam_logs 2>/dev/null || true' TERM INT HUP if [ -n "${BL_VK_DRIVER:-}" ]; then bl_icd_lib=$(sed -n 's/.*"library_path"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' "$BL_VK_DRIVER" 2>/dev/null | head -1) bl_icd_lib=$(printf '%s' "$bl_icd_lib" | sed 's|\\/|/|g') @@ -176,6 +177,83 @@ if [ -n "${BL_VK_DRIVER:-}" ]; then fi unset bl_icd_lib fi +bl_webhelper_layout() { + if [ -n "${BL_VKBRIDGE_WEBHELPER_ARGS:-}" ]; then + printf '%s\n' "$BL_VKBRIDGE_WEBHELPER_ARGS" + elif [ -z "${BL_VKBRIDGE_CEF_ANGLE:-}" ]; then + echo stock + elif [ "$BL_VKBRIDGE_CEF_ANGLE" = vulkan ] && [ "${BL_VKBRIDGE_CEF_VULKAN:-1}" != 0 ]; then + echo "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan" + else + echo "--use-gl=angle --use-angle=$BL_VKBRIDGE_CEF_ANGLE" + fi +} +bl_now_ms() { + if [ -n "${EPOCHREALTIME:-}" ]; then + local t=${EPOCHREALTIME/[.,]/} + echo $((10#$t / 1000)) + else + date +%s%3N + fi +} +vkbridge_wait_socket() { + local sock=$1 limit=${2:-10000} start now waited + [ -n "$sock" ] || return 1 + if [ -S "$sock" ]; then + echo "== vkbridge: server socket ready (waited 0 ms)" + return 0 + fi + start=$(bl_now_ms) + while :; do + now=$(bl_now_ms) + waited=$((now - start)) + if [ -S "$sock" ]; then + echo "== vkbridge: server socket ready (waited $waited ms; the server listens after its startup probe)" + return 0 + fi + if [ -n "${bl_stopping:-}" ]; then + echo "== vkbridge: no server socket after $waited ms; the session is stopping" + return 1 + fi + if [ "$waited" -ge "$limit" ]; then + echo "== vkbridge: no server socket after $waited ms (gave up at $limit ms)" + return 1 + fi + sleep 0.05 + done +} +if [ "${BL_VKBRIDGE:-0}" = 1 ]; then + bl_vkb_icd=/usr/local/share/vkbridge/droidbridge_icd.json + [ -z "${BL_INSIDE:-}" ] && vkbridge_wait_socket "${VKBRIDGE_SOCKET:-}" "${BL_VKBRIDGE_WAIT_MS:-10000}" + bl_vkb_missing= + [ -r "$bl_vkb_icd" ] || bl_vkb_missing="$bl_vkb_missing icd" + [ -r /usr/local/lib/vkbridge/libvulkan_droidbridge.so ] || bl_vkb_missing="$bl_vkb_missing library" + [ -S "${VKBRIDGE_SOCKET:-}" ] || bl_vkb_missing="$bl_vkb_missing socket" + if [ -z "$bl_vkb_missing" ]; then + export VK_DRIVER_FILES=$bl_vkb_icd VK_ICD_FILENAMES=$bl_vkb_icd + export VKBRIDGE_SOCKET VKBRIDGE_CLIENT_LOG + if [ -r /root/.vkbridge-env ]; then + while IFS='=' read -r _k _v; do + case "$_k" in VKBRIDGE_*|BL_VKBRIDGE_*) export "$_k=$_v" ;; esac + done < /root/.vkbridge-env + [ -z "${BL_INSIDE:-}" ] && echo "== vkbridge: development settings from /root/.vkbridge-env: $(cut -d= -f1 /root/.vkbridge-env | tr '\n' ' ')" + fi + export VKD3D_FEATURE_LEVEL=${VKD3D_FEATURE_LEVEL:-12_0} + unset TU_DEBUG + if [ -z "${BL_INSIDE:-}" ]; then + step "vkbridge self-test" + timeout 60 /usr/local/bin/droiddeck-vkbridge-smoke 2>&1 | sed 's/^/== vkbridge: /' + if command -v vulkaninfo >/dev/null 2>&1; then + timeout 30 vulkaninfo --summary 2>&1 | sed -n '/^Devices:/,$p' | head -40 | sed 's/^/== vulkaninfo: /' + fi + fi + echo "== vulkan driver: Mali bridge ($bl_vkb_icd, server at $VKBRIDGE_SOCKET)" + else + echo "== vulkan driver: Mali bridge requested but NOT usable (icd $bl_vkb_icd, socket ${VKBRIDGE_SOCKET:-unset}; missing:$bl_vkb_missing)" + [ -n "${BL_INSIDE:-}" ] || exit 69 + fi + unset bl_vkb_icd bl_vkb_missing +fi export GAMESCOPE_FORCE_VULKAN_REALTIME=${BL_GAMESCOPE_REALTIME:-0} start_agent() { @@ -303,11 +381,16 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: games at ${nested}x${nested_h} stretched to the ${width}x${height} output" fi fi - # Off unless Performance asks for it. Compositing the cursor here adds a second - # plane on the phone's compositor; a controller-driven cursor is the reason to turn it on. if [ "$mode" = steam ] && [ "${BL_CURSOR_COMPOSITE:-0}" = 1 ]; then export gamescope_cursor_composite=2 fi + # Through the Mali bridge, Steam's UI flickered while gamescope handed its layers to the phone's + # compositor as separate planes, for a reason not yet found; one composited image does not + # (Mali-G76 MC4: 145 footer flips in 6 s at rest, 0 composited). + if [ "$mode" = steam ] && [ "${BL_VKBRIDGE:-0}" = 1 ] && [ -z "${gamescope_composite_force:-}" ]; then + export gamescope_composite_force=1 + echo "== gamescope: composites every frame (Mali bridge: the Steam UI flickers on separate planes)" + fi args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$nested_h") if [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; then args+=(-S stretch) @@ -315,7 +398,6 @@ if [ -z "${BL_INSIDE:-}" ]; then fi if [ "${BL_REFRESH:-0}" -gt 0 ]; then args+=(-r "$BL_REFRESH") - # -r is the starting rate; gamescope follows the panel when it switches modes later. export GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST=1 fi [ "$mode" = steam ] && [ "${BL_STEAM_UI:-}" != desktop ] && args+=(-e) @@ -334,10 +416,8 @@ if [ -z "${BL_INSIDE:-}" ]; then args+=(--mangoapp) echo "== gamescope: mangoapp on ($(command -v mangoapp), config $MANGOHUD_CONFIGFILE)" fi - # gamescope writes the frame times the app's HUD shows here (patch 0125). mkdir -p /run/droiddeck-hud && export DROIDDECK_HUD_FRAMES=/run/droiddeck-hud/frames export BL_INSIDE=1 - # A fixed path: left to itself gamescope creates a new limiter state file on every start. rm -f "${XDG_RUNTIME_DIR:-/tmp}"/gamescope-limiter-* export GAMESCOPE_LIMITER_FILE="${XDG_RUNTIME_DIR:-/tmp}/droiddeck-gamescope-limiter" rm -f "$GAMESCOPE_LIMITER_FILE" @@ -467,7 +547,6 @@ case $mode in steam_cef_gpu=1 if [ "$steam_x64" = 1 ]; then step "checking the Steam client's arm64 parts (first run downloads them, ~1-2 min)" - # droiddeck-steam-install removes the repair request: read it first so Repair Steam covers both clients. _bl_x64_repair=0 [ -e "$HOME/.bl-steam-repair" ] && _bl_x64_repair=1 droiddeck-steam-install || steam_setup_failed $? @@ -538,7 +617,7 @@ case $mode in fi if [ "${BL_ZRAM:-0}" = 1 ]; then step "zRAM compression: on" - [ "${BL_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam and the hidden Epic Games Launcher are not compressed while games run (turned off in Performance)" + [ "${BL_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam, the hidden Epic Games Launcher and Battle.net are not compressed while games run (turned off in Performance)" _bl_ram_cap=0 case ${BL_RAM_CAP_MB:-} in ''|0) ;; @@ -548,11 +627,10 @@ case $mode in ( bl_zram_scan() { _bl_game=0 _bl_pids=() _bl_others=() _bl_apps= - local _d _c _args _name _a _id _fex + local _d _c _args _name _a _id _fex _lower _bnet=() _bnet_game=0 for _d in /proc/[0-9]*; do [ "${_d##*/}" != "$BASHPID" ] || continue _args=() - # Under FEX the program is FEX's first argument. AppId= is its own argument. while IFS= read -r -d '' _c; do _args+=("$_c"); done 2>/dev/null < "$_d/cmdline" || true [ "${#_args[@]}" -gt 0 ] || continue _name=${_args[0]} _fex=0 @@ -573,14 +651,34 @@ case $mode in ;; steam|steamwebhelper) _bl_pids+=("${_d##*/}") ;; *) + _lower=${_name,,} if [ "$_fex" = 1 ] && grep -qz '^DROIDDECK_EPIC_HIDDEN=1$' "$_d/environ" 2>/dev/null; then _bl_pids+=("${_d##*/}") + elif [[ $_lower == [a-z]:[\\/]'program files (x86)'[\\/]battle.net[\\/]* || + $_lower == [a-z]:[\\/]programdata[\\/]battle.net[\\/]* ]]; then + _bnet+=("${_d##*/}") else _bl_others+=("${_d##*/}") + if [[ $_lower == [a-z]:[\\/]* ]]; then + case ${_lower##*[\\/]} in + agent.exe|conhost.exe|explorer.exe|lsass.exe|plugplay.exe|rpcss.exe|services.exe|start.exe|\ + steam.exe|svchost.exe|tabtip.exe|winedevice.exe|rundll32.exe|wineboot.exe|winemenubuilder.exe) ;; + *) + for _a in "${_args[@]:1}"; do + [ "${_a,,}" = -uid ] && _bnet_game=1 + done + ;; + esac + fi fi ;; esac done + if [ "$_bnet_game" = 1 ]; then + _bl_pids+=("${_bnet[@]}") + else + _bl_others+=("${_bnet[@]}") + fi } bl_zram_usage() { local _p _k _v _u _rss=0 _swap=0 @@ -592,7 +690,6 @@ case $mode in _bl_rss=$_rss echo "$# processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" } - # Only processes that loaded libblsession are the session's own and answer SIGURG. bl_session_others() { local _p _bl_session=() @@ -608,8 +705,6 @@ case $mode in _pids=("${_bl_pids[@]}") fi } - # Same protocol as SessionSuspendController: an empty ack when the page-out starts, a byte when it is done. - # A process whose SIGURG handler was replaced never acks, so it is not waited for after the first 2 s. bl_zram_wait() { local _p _left _start=$SECONDS while [ $((SECONDS - _start)) -lt 12 ]; do @@ -637,9 +732,6 @@ case $mode in bl_zram_pick "$_which" step "zRAM: done ($(bl_zram_usage "${_pids[@]}"))" } - # Proton starts its reaper before the game window; compressing during launch stalls it. - # Desktop Steam has no focus.json, so it still uses the game process as its trigger. - # A configured RAM cap can still force compression while a game is launching. bl_game_focused() { if [ "${BL_DESKTOP:-}" = 1 ] || [ -z "${BL_LAUNCH_DIR:-}" ]; then return 0 @@ -668,7 +760,6 @@ case $mode in bl_zram_scan if bl_cap_due; then if bl_over_cap; then - # A cap below the game's working set cannot be met; paging out again every 30 s only churns. if [ "$_bl_capped" -lt 0 ] || [ $((SECONDS - _bl_capped)) -ge "$_bl_backoff" ]; then bl_zram_usage "${_bl_pids[@]}" > /dev/null if [ "$_bl_rss" -ge $((512 * 1024)) ]; then @@ -857,14 +948,11 @@ case $mode in until [ "$(_bl_focused)" = 769 ] || [ "$SECONDS" -ge "$_bl_end" ]; do sleep 1 done - # Shortcut CGameIDs are 64-bit; Steam app ids fit in 32 bits and keep the old short delay. [ "${#game}" -gt 10 ] && shortcut=1 [ -n "$shortcut" ] || sleep 4 echo "== steam: interface up; launching the requested game $game" _bl_hand_off [ -n "$shortcut" ] || return 0 - # Steam can drop a shortcut launch it gets before the shortcut's overview exists (large libraries). - # A launch can be running before it creates its first window. while [ "$(_bl_focused)" = 769 ] && [ "$waited" -lt 20 ]; do sleep 1 waited=$((waited + 1)) @@ -956,13 +1044,11 @@ case $mode in exit 69 fi - # The UI bridge launches SteamVR, which needs the guest agent's library environment. _bl_compat_env=(env -u LD_LIBRARY_PATH -u STEAM_RUNTIME -u STEAM_STEAMRT_RECURSION_GUARD) [ "${LD_LIBRARY_PATH+x}" ] && _bl_compat_env+=("LD_LIBRARY_PATH=$LD_LIBRARY_PATH") [ "${STEAM_RUNTIME+x}" ] && _bl_compat_env+=("STEAM_RUNTIME=$STEAM_RUNTIME") [ "${STEAM_STEAMRT_RECURSION_GUARD+x}" ] && _bl_compat_env+=("STEAM_STEAMRT_RECURSION_GUARD=$STEAM_STEAMRT_RECURSION_GUARD") export STEAM_RUNTIME=1 - # A containerized client re-executes itself through pressure-vessel-wrap (bwrap) unless told it is already inside. export STEAM_STEAMRT_RECURSION_GUARD=1 export LD_LIBRARY_PATH=$steam_root/steamrtarm64:$steam_root/steamrtarm64/panorama${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export SDL_VIDEO_X11_DGAMOUSE=0 @@ -1021,6 +1107,28 @@ case $mode in _bl_cef=(-cef-disable-gpu) _bl_ui=(-nobigpicture) fi + if [ "${BL_VKBRIDGE:-0}" = 1 ]; then + # On the GPU the Steam UI held about 400 MB through the bridge (Mali-G76 MC4, 3 GB of RAM); with + # a game loading beside it, Android's low-memory killer took the whole session down. + if [ -z "${BL_VKBRIDGE_CEF_GPU:-}" ]; then + _bl_mem_kb=$(awk '/^MemTotal:/ {print $2}' /proc/meminfo 2>/dev/null) + if [ "${_bl_mem_kb:-0}" -gt 0 ] && [ "$_bl_mem_kb" -lt 4194304 ]; then + BL_VKBRIDGE_CEF_GPU=0 + echo "== steam: $((_bl_mem_kb / 1024)) MB of RAM: the browser UI draws in software to leave games the memory" + fi + fi + if [ "${BL_VKBRIDGE_CEF_GPU:-1}" = 0 ]; then + _bl_cef=(-cef-disable-gpu -cef-disable-gpu-compositing) + echo "== steam: browser UI in software (Mali bridge)" + elif [ "${_bl_cef[0]}" = -cef-force-gpu ]; then + _bl_cef=(-cef-force-gpu -cef-use-gl=angle -cef-use-angle="${BL_VKBRIDGE_CEF_ANGLE:-vulkan}") + fi + [ "${BL_VKBRIDGE_CEF_LOG:-0}" = 1 ] && _bl_cef+=(-cef-enable-logging=stderr -cef-v=1) + [ -n "${BL_VKBRIDGE_CEF_EXTRA:-}" ] && read -r -a _bl_cef_extra <<<"$BL_VKBRIDGE_CEF_EXTRA" && _bl_cef+=("${_bl_cef_extra[@]}") + BL_WEBHELPER_ARGS=$(bl_webhelper_layout) + export BL_WEBHELPER_ARGS + echo "== steam: web helper process layout: $BL_WEBHELPER_ARGS (Mali bridge)" + fi if [ "${BL_STEAM_UI:-}" != desktop ]; then if [ "$steam_x64" = 0 ] || [ "${BL_X64_DECK:-1}" != 0 ]; then _bl_ui+=(-steamdeck -steamos3) @@ -1215,13 +1323,12 @@ case $mode in : > "$compat_restarted" compat_restarts=0 compat_settled() { - local app m flags r card=/mnt/droiddeck-sd - # The arm64 card library may hold that client's copy of the same title. - [ "$steam_x64" = 1 ] && card=/mnt/droiddeck-sd/x86-64 + local app m flags r card=/mnt/droiddeck-sd added=(/mnt/droiddeck-lib/*) + [ "$steam_x64" = 1 ] && { card=/mnt/droiddeck-sd/x86-64; added=(/mnt/droiddeck-lib/*/x86-64); } while read -r app; do [ -n "$app" ] || continue m= - for r in "$steam_root" "$card"; do + for r in "$steam_root" "$card" "${added[@]}"; do [ -f "$r/steamapps/appmanifest_$app.acf" ] && { m=$r/steamapps/appmanifest_$app.acf; break; } done [ -n "$m" ] || return 1 @@ -1290,7 +1397,7 @@ case $mode in done fi if [ "$beat" -le 720 ] && [ "$((beat % 3))" -eq 0 ] && { [ -z "$library_job" ] || ! kill -0 "$library_job" 2>/dev/null; }; then - libraries=("$steam_root/steamapps" /mnt/droiddeck/steamapps /mnt/droiddeck-sd/steamapps /root/Games/*/steamapps) + libraries=("$steam_root/steamapps" /mnt/droiddeck/steamapps /mnt/droiddeck-sd/steamapps /mnt/droiddeck-lib/*/steamapps /mnt/droiddeck-lib/*/x86-64/steamapps /root/Games/*/steamapps) seed=; compat= seed_due && seed=1 compat_due && compat=1 @@ -1333,7 +1440,6 @@ case $mode in lossless_left=0 elif ! pgrep -x wineserver >/dev/null 2>&1; then ( - # The probe reaches the x86-64 client through the arm64 client's steamclient.so, as the import watcher does. if [ "$steam_x64" = 1 ]; then export BL_STEAMCLIENT=$XDG_DATA_HOME/Steam/steamrtarm64/steamclient.so; fi answer=$(droiddeck-steam-games probe "$steam_root" 993090 2>/dev/null) || exit 0 case $answer in @@ -1393,7 +1499,6 @@ case $mode in BL_COMPAT_TOOL=$_bl_x64_tool droiddeck-steam-shortcuts "$steam_root" "$BL_ADDED_GAMES" || true fi fi - # The x86-64 client rewrote config.vdf from memory on exit, over the live passes' mapping. if [ "$steam_x64" = 1 ]; then [ -z "${_bl_x64_tool:-}" ] || BL_COMPAT_TOOL=$_bl_x64_tool steam-compatibility "$steam_root" --x64 >/dev/null 2>&1 || true @@ -1439,6 +1544,12 @@ case $mode in set -- continue fi + if [ "$steam_x64" = 1 ] && [ "$rc" -eq 132 ] && [ -z "${_bl_x64_sigill:-}" ]; then + _bl_x64_sigill=1 + echo "== steam: the x86-64 client stopped on an illegal instruction after it updated itself; starting it again once" + set -- + continue + fi [ "$rc" -eq 42 ] || break if steam_update_stuck "$steam_ran"; then echo "== steam: asked to restart for an update $steam_updates times and it is not installing; the session stops here rather than loop" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 93ca33883a..0b0b1b0560 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -18,6 +18,19 @@ COMPAT = runpy.run_path(os.path.join(HERE, "steam-compatibility")) BINDING = "droiddeckCompatChanged" BRIGHTNESS_BINDING = "droiddeckBrightnessChanged" CONTROLS_DIR = "/etc/droiddeck-device-controls" +LIBRARY_ART_JS = r""" +(() => { + if (window.__droiddeckLibraryArt) return "present"; + const store = typeof appStore === "object" ? appStore : null; + if (typeof store?.BHasCachedLibraryAsset !== "function") return "unavailable"; + // The client reports which cached assets exist only after a logon that reaches Steam; before that every app reads as + // uncached and the UI asks the CDN, which is blank offline. The native check still runs, so misses are still reported. + const native = store.BHasCachedLibraryAsset.bind(store); + store.BHasCachedLibraryAsset = (appid, version, type) => native(appid, version, type) || !version; + window.__droiddeckLibraryArt = true; + return "installed"; +})() +""" BRIGHTNESS_JS = r""" (() => { if (window.__droiddeckBrightness) return "present"; @@ -233,10 +246,6 @@ SWITCH_JS = r""" })() """.replace("__BINDING__", SWITCH_BINDING) SESSION_SELECT = "/usr/bin/steamos-session-select" -# Steam opens its Steam Controller welcome tour at every start while the client setting -# controller_show_ibex_tour (CMsgClientSettings field 140014) is on, and only a finished tour turns it -# off; closing it leaves it on. The app's pad is an emulated controller, so the tour never applies. -# A pending firmware update still opens Steam's updater, which checks the update priority instead. TOUR_JS = r""" (() => { let key = 140014 * 8; @@ -247,13 +256,6 @@ TOUR_JS = r""" return "off"; })() """ -# Steam keeps the Quick Access Frame Limit as the client setting gamescope_app_target_framerate -# (CMsgClientSettings field 21002) and offers the values gamescope's display state lists in -# active_display_info.supported_frame_rates. When the panel's refresh rate changes, a remembered -# limit that is not one of the new values leaves the slider on its first value while the game runs -# at the old limit. The limit is kept when it is still offered and moved to the highest value -# otherwise. Choices are read once they have been unchanged for a moment, since a mode switch can -# report a passing rate first. FRAME_LIMIT_JS = r""" (() => { if (window.__droiddeckFrameLimit) return "present"; @@ -426,7 +428,6 @@ VR_JS = r""" def launch_steamvr(): - """Keep downloads/startup off the Steam UI bridge's event loop.""" say("SteamVR library launch: using the DroidDeck ARM64 helper") state = os.path.join(os.environ.get("XDG_RUNTIME_DIR", "/tmp"), "droiddeck-steamvr") try: @@ -780,7 +781,6 @@ class Helper: pass def sync_frame_limit(self): - # Steam can still be loading its settings and gamescope state when the helper attaches. if self.frame_limit_state in ("installed", "present") or time.monotonic() < self.frame_limit_retry: return try: @@ -806,8 +806,6 @@ class Helper: self.finish_chooser(ident, None) return command = [sys.executable, os.path.realpath(__file__), "--choose-file"] - # Gamescope shows the dialog over the client by the AppId on a reaper above it; the x86-64 client has no - # native reaper, so the arm64 client's is borrowed when it is installed. data = os.environ.get("XDG_DATA_HOME") or os.path.join(os.path.expanduser("~"), ".local", "share") for root in (self.steam_root, os.path.join(data, "Steam")): reaper = os.path.join(root, "steamrtarm64", "reaper") @@ -866,6 +864,7 @@ class Helper: if self.files_only: page.call("Runtime.addBinding", {"name": FILE_BINDING}) page.evaluate(FILE_JS) + page.evaluate(LIBRARY_ART_JS) self.page = page self.controls_state = None self.controls_installed = False @@ -876,10 +875,10 @@ class Helper: page.evaluate(VR_JS) page.call("Runtime.addBinding", {"name": FILE_BINDING}) page.evaluate(FILE_JS) + page.evaluate(LIBRARY_ART_JS) try: page.evaluate(TOUR_JS) except RuntimeError: - # The optional tour setting must not block the compat bridge. pass if not self.steamos: page.call("Runtime.addBinding", {"name": SWITCH_BINDING}) @@ -916,7 +915,6 @@ class Helper: prior_auto = state.get("auto", {}) if not isinstance(prior_auto, dict): prior_auto = {} - # "native" from earlier builds also lists dual-platform games nobody chose to run natively. prior_native = state.get("native_choices", ()) native_choices = set(prior_native if isinstance(prior_native, (list, tuple, set)) else ()) picked = COMPAT["picked_apps"](state) @@ -948,7 +946,6 @@ class Helper: else: for app in set(native) | native_choices: if app in raw_mapping: - # The client shows an explicit native choice as the tool it inherits, and writes config.vdf late. if raw_mapping[app] == "" or current.get(app) not in self.known: current[app] = raw_mapping[app] elif app in prior_auto or app in native_choices or app in picked and ( @@ -981,7 +978,6 @@ class Helper: COMPAT["write_json"](state_file, state) def ensure_tools(self): - """Proton, FEX and the runtimes FEX needs are fetched as soon as the client is up, never left pending.""" now = time.monotonic() if self.tools_checked is not None and now - self.tools_checked < TOOL_CHECK_SECONDS: return @@ -1007,7 +1003,6 @@ class Helper: return isinstance(request.get("seq"), int) and request["seq"] > int(state.get("applied", 0) or 0) def drain(self): - """The page's events; a switch to the desktop is acted on as it comes.""" events = self.page.drain() if any(called(e, SWITCH_BINDING) for e in events): switch_to_desktop() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui index 68b0a2a3ac..88d60dde6a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui @@ -1,5 +1,4 @@ #!/usr/bin/python3 -"""Honor a desktop launch even when Steam remembers Big Picture from its last session.""" import os from pathlib import Path import runpy diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games index 775980a0c5..f8d3ef027c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Resolve added games against the signed-in Steam client's licenses.""" import ctypes as C import json import os @@ -12,6 +11,7 @@ import time import unicodedata import urllib.parse import urllib.request +import zlib STATE = ".droiddeck-games.json" TRIED = ".droiddeck-import-tried.json" @@ -20,6 +20,7 @@ LIBRARY = "/mnt/droiddeck-sd" LEGACY_LIBRARY = "/mnt/bannerlator-sd" PARKED = ".droiddeck-parked" BASE_ID = 76561197960265728 +SPACEWAR = 480 def read_json(path, default): @@ -65,8 +66,6 @@ def source_stamp(game): def store_game(game): - """Games a store client installed belong to that store: the Steam copy of the same title is - another license with its own files, and an import would let Steam update over the store's.""" return bool(game.get("store")) @@ -86,14 +85,14 @@ def identify(game): folder = Path(game["folder"]) steamapps = folder.parent.parent for library in ([steamapps] if folder.parent.name == "common" and steamapps.name == "steamapps" else []) + [folder.parent / WINNATIVE]: - matches = manifest_ids(library, folder.name) + matches = [appid for appid in manifest_ids(library, folder.name) if appid != SPACEWAR] if matches: return matches[0] if len(matches) == 1 else None ids = set() for parent in {folder, Path(game["exe"]).parent}: try: appid = int((parent / "steam_appid.txt").read_text().strip()) - if 0 < appid < 0x80000000: + if 0 < appid < 0x80000000 and appid != SPACEWAR: ids.add(appid) except (OSError, ValueError): pass @@ -107,7 +106,7 @@ def identify(game): ids = {int(item["id"]) for item in items if key(item.get("name", "")) == key(game["name"]) and key(game["name"])} if ids: - return next(iter(ids)) if len(ids) == 1 else None + return next(iter(ids)) if len(ids) == 1 and SPACEWAR not in ids else None return None except (OSError, ValueError, KeyError): return None @@ -149,7 +148,6 @@ def probe(steam_root, ids): def game_running(): - """Whether a Proton game is up: a wineserver is there for as long as any prefix is in use.""" try: pids = [p for p in os.listdir("/proc") if p.isdigit()] except OSError: @@ -172,8 +170,6 @@ def downloads_idle(steam_root): def request_restart(steam_root): - """The client reads manifests and shortcuts only at start, so an import needs one restart; - the session's loop runs the importer between the exit and the next start.""" Path(os.environ.get("HOME", "/root"), ".bl-restart-once").touch() command = shlex.split(os.environ.get("BL_STEAM_SHUTDOWN", "")) or [str(Path(steam_root) / "steamrtarm64/steam"), "-shutdown"] subprocess.run(command, @@ -181,7 +177,6 @@ def request_restart(steam_root): def ask_restart(names, timeout=600, clock=None, sleep=None): - """The app asks whether to restart the client now; anything but "now" leaves the import to the next start.""" clock, sleep = clock or time.monotonic, sleep or time.sleep folder = Path(os.environ.get("HOME", "/root"), ".cache/droiddeck") ask, answer = folder / "steam-import.json", folder / "steam-import.answer" @@ -295,8 +290,6 @@ def watch(steam_root, listing): def installed_build(folder, appid, installdir): - """The build another Steam client recorded for these files, so Steam updates from it - instead of verifying every file.""" try: text = (folder.parent / WINNATIVE / f"appmanifest_{appid}.acf").read_text() install = re.search(r'("installdir"\s*")([^"\\]*)(")', text, re.I) @@ -309,15 +302,76 @@ def installed_build(folder, appid, installdir): if not (folder / ".download_complete").is_file(): return None try: - ids = json.loads((folder / ".DepotDownloader/depot.config").read_text())["installedManifestIDs"] - depots = sorted((int(depot), int(gid)) for depot, gid in ids.items()) - except (OSError, ValueError, KeyError, TypeError, AttributeError): - return None + depots = config_depots((folder / ".DepotDownloader/depot.config").read_bytes()) + except OSError: + depots = None + if not depots: + depots = completed_depots(folder / ".DepotDownloader/completed") if not depots or not all(0 < depot < 0x80000000 and 0 < gid < 0x7FFFFFFFFFFFFFFF for depot, gid in depots): return None return "".join(f' "{depot}"\n {{\n "manifest" "{gid}"\n }}\n' for depot, gid in depots) +def varint(data, i): + value = shift = 0 + while True: + byte = data[i] + i += 1 + value |= (byte & 0x7F) << shift + shift += 7 + if byte < 0x80: + return value, i + + +def proto_fields(data): + i = 0 + while i < len(data): + key, i = varint(data, i) + kind = key & 7 + if kind == 0: + value, i = varint(data, i) + elif kind == 2: + size, i = varint(data, i) + value, i = data[i:i + size], i + size + elif kind in (1, 5): + value, i = None, i + (8 if kind == 1 else 4) + else: + raise ValueError + yield key >> 3, kind, value + + +def config_depots(data): + try: + ids = json.loads(data.decode())["installedManifestIDs"] + return sorted((int(depot), int(gid)) for depot, gid in ids.items()) + except (ValueError, KeyError, TypeError, AttributeError): + pass + try: + depots = {} + for number, kind, entry in proto_fields(zlib.decompress(data, -15)): + if number == 1 and kind == 2: + fields = {n: v for n, k, v in proto_fields(entry) if k == 0} + if 1 in fields and 2 in fields: + depots[fields[1]] = fields[2] + return sorted(depots.items()) or None + except (zlib.error, ValueError, IndexError): + return None + + +def completed_depots(completed): + newest = {} + try: + for manifest in completed.iterdir(): + match = re.fullmatch(r"(\d+)_(\d+)\.manifest", manifest.name) + if match and manifest.is_file(): + depot, gid, mtime = int(match[1]), int(match[2]), manifest.stat().st_mtime + if depot not in newest or mtime > newest[depot][0]: + newest[depot] = (mtime, gid) + except OSError: + return [] + return sorted((depot, gid) for depot, (_, gid) in newest.items()) + + def update_not_started(text, steamapps, appid, installdir): fields = dict(re.findall(r'^\s*"(\w+)"\s*"([^"]*)"', text, re.M)) return (fields.get("installdir") == installdir and fields.get("buildid", "0") == "0" @@ -423,20 +477,18 @@ def seed_install(steam_root, game, appid): return True -def release(steam_root, game): - """Undoes an import made before store games were skipped. Only our symlink and manifest go; - the store's folder stays where it is.""" +def release(steam_root, game, stale, reason): steamapps = Path(steam_root) / "steamapps" sources = {game.get("folder", ""), legacy_path(game.get("folder", ""))} for target in sorted((steamapps / "common").glob("DroidDeck-*")): appid = target.name.removeprefix("DroidDeck-") - if not (appid.isdigit() and target.is_symlink() and os.readlink(target) in sources): + if not (appid.isdigit() and target.is_symlink() and os.readlink(target) in sources and stale(int(appid))): continue for manifest in (steamapps / f"appmanifest_{appid}.acf", steamapps / PARKED / f"appmanifest_{appid}.acf"): if manifest.is_file() and ours(manifest, appid): manifest.unlink() target.unlink() - print(f"droiddeck-steam-games: {game.get('name', appid)} came from {game['store']}; it is a shortcut again, not Steam app {appid}") + print(f"droiddeck-steam-games: {game.get('name', appid)} {reason}; it is no longer Steam app {appid}") def route(steam_root, acct, games): @@ -457,7 +509,7 @@ def route(steam_root, acct, games): for game in games: if store_game(game): try: - release(steam_root, game) + release(steam_root, game, lambda old: True, f"came from {game['store']}") except OSError as error: print(f"droiddeck-steam-games: store import not undone ({error})") shortcuts.append(game) @@ -469,9 +521,14 @@ def route(steam_root, acct, games): appid = candidates.get(folder, candidates.get(legacy_path(folder))) stamp = source_stamp(game) recorded = sources.get(folder, sources.get(legacy_path(folder))) - confirmed = (isinstance(appid, int) and 0 < appid < 0x80000000 - and owned.get(str(appid)) is True and stamp is not None - and recorded in (stamp, [stamp[0], legacy_path(stamp[1])] + stamp[2:])) + current = stamp is not None and recorded in (stamp, [stamp[0], legacy_path(stamp[1])] + stamp[2:]) + named = isinstance(appid, int) and 0 < appid < 0x80000000 and appid != SPACEWAR + try: + release(steam_root, game, lambda old: old == SPACEWAR or (current and named and old != appid), + "names another Steam app now") + except OSError as error: + print(f"droiddeck-steam-games: earlier import not undone ({error})") + confirmed = named and current and owned.get(str(appid)) is True if confirmed: try: if seed_install(steam_root, game, appid): @@ -480,7 +537,7 @@ def route(steam_root, acct, games): print(f"droiddeck-steam-games: {game.get('name', appid)} stays a shortcut this session: it could not be linked as Steam app {appid}") except OSError as error: print(f"droiddeck-steam-games: import unavailable ({error})") - elif isinstance(appid, int) and 0 < appid < 0x80000000 and seeded(steamapps, game, appid): + elif named and seeded(steamapps, game, appid): routes[str(game["appid"])] = appid continue shortcuts.append(game) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install index 45bd96c259..f3098fd3ea 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install @@ -227,7 +227,6 @@ mkdir -p "$HOME/.steam" ln -sfn "$steam_root" "$HOME/.steam/root" ln -sfn "$steam_root" "$HOME/.steam/steam" ln -sfn "$steam_root/steamrtarm64" "$HOME/.steam/bin64" -# sdk64 is where x86_64 Steamworks looks for steamclient.so; arm64 builds look in sdkarm64. ln -sfn "$steam_root/linux64" "$HOME/.steam/sdk64" ln -sfn "$steam_root/linuxarm64" "$HOME/.steam/sdkarm64" ln -sfn "$steam_root/steamrtarm64" "$HOME/.steam/binarm64" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-language b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-language index f892e8e22c..f29c91d293 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-language +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-language @@ -1,18 +1,4 @@ #!/usr/bin/python3 -"""Sets the Steam client's interface language to the app's, before the client starts. - - droiddeck-steam-language <home> <language> - -<language> is one of the client's language names (english, spanish, latam, japanese, koreana, -schinese, tchinese, ...). The client reads it from <home>/.steam/registry.vdf, under -HKCU/Software/Valve/Steam and again under .../Steamsteamglobal: that second key is copied over the -first at every start, so setting only the first is undone by the old value. Its update window -reads the first key alone, and nothing reads LANG. exportedsettings.json is what the client writes -beside them when its own setting changes. The session also passes -language, which the interface -honours over the file; the file is still what the update window shows itself in. - -Run only while the client is stopped: it keeps the registry in memory and writes it back on exit. -""" import json import os import re @@ -63,7 +49,6 @@ def serialize(tokens): def block_end(tokens, start): - """Index of the '}' closing the block whose '{' is at start.""" depth = 0 for i in range(start, len(tokens)): if tokens[i] == "{": @@ -76,8 +61,6 @@ def block_end(tokens, start): def child(tokens, start, end, name): - """Index of the '{' of the block called name directly inside tokens[start:end], or None. - Keys are matched without case, as the client does.""" i = start while i < end: if tokens[i] in ("{", "}"): @@ -93,7 +76,6 @@ def child(tokens, start, end, name): def ensure_block(tokens, path): - """The '{' of the block at path, creating it and any missing parent at the end of its parent.""" start, end = 0, len(tokens) for depth, name in enumerate(path): found = child(tokens, start, end, name) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch index 7867eeed93..346b32d7f2 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch @@ -25,6 +25,14 @@ if [ "$ui" = desktop ] && [ "${BL_DESKTOP:-}" = 1 ]; then client_home=$HOME client=("$steam_root/steamrtarm64/steam") fi + if [ "${BL_BOTTOM_DESKTOP:-}" = 1 ]; then + pid=$(cat "$client_home/.steam/steam.pid" 2>/dev/null || true) + if [ -p "$client_home/.steam/steam.pipe" ] && [[ "$pid" =~ ^[0-9]+$ ]] && kill -0 "$pid" 2>/dev/null; then + # The top screen's client takes the request, so games open there. + exec "${client[@]}" -nobigpicture -no-cef-sandbox \ + -cef-ozone-platform=x11 -cef-disable-gpu "${url:-steam://open/library}" + fi + fi mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/droiddeck" exec 9>"${XDG_CACHE_HOME:-$HOME/.cache}/droiddeck/steam-desktop.lock" if ! flock -n 9; then diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library index 171400b310..5577e1aad7 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library @@ -9,9 +9,6 @@ MAIN_LABEL = "Internal Storage" def register(steam_root, library, label): - """Adds one library folder to the client's list; the client then offers it as an install - location as well as reading the games already in it. Registered even when empty: a new user - should be able to install straight into it.""" steamapps = os.path.join(library, "steamapps") if not os.path.isdir(steamapps): return 0 @@ -58,8 +55,6 @@ RENAMED = (("/mnt/bannerlator-sd", "/mnt/droiddeck-sd"),) def rename(steam_root, old, new): - """Moves a library registered under an earlier mount point to the current one, keeping its - entry (content id, app sizes) rather than registering it anew.""" path = os.path.join(steam_root, "steamapps", "libraryfolders.vdf") if not os.path.isfile(path): return @@ -77,8 +72,6 @@ def rename(steam_root, old, new): def forget(steam_root, library): - """Removes a library folder earlier builds registered and this one no longer binds, so the - client does not keep offering a location that is not there.""" path = os.path.join(steam_root, "steamapps", "libraryfolders.vdf") if not os.path.isfile(path): return @@ -107,10 +100,6 @@ def forget(steam_root, library): def relabel(steam_root, target, label): - """Names a library for what it is. The client writes its own entry with an empty label and - falls back to showing the mount point - "Local Drive (/)" - so the install dialog gives no - clue which of the two places is the phone and which is the card. A library registered on an - earlier run keeps whatever label it was given then, so both are named here every time.""" path = os.path.join(steam_root, "steamapps", "libraryfolders.vdf") if not os.path.isfile(path): return @@ -153,6 +142,7 @@ def relabel(steam_root, target, label): GAMES_DIR = "/root/Games/" +ADDED_DIR = "/mnt/droiddeck-lib/" def wanted(): @@ -193,7 +183,7 @@ def main(): if managed: keep = {library for library, _ in libraries} for library in registered(steam_root): - if library not in keep and (library == LIBRARIES[0][0] or library.startswith(GAMES_DIR)): + if library not in keep and (library == LIBRARIES[0][0] or library.startswith((GAMES_DIR, ADDED_DIR))): forget(steam_root, library) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders index da93ebec4c..ccb8d1dc84 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shaders @@ -1,12 +1,4 @@ #!/usr/bin/python3 -"""Sets the Steam client's shader pre-caching (Settings > Downloads), before the client starts. - - droiddeck-steam-shaders <0|1> <steam root>... - -The client stores the toggle as InstallConfigStore/Software/Valve/Steam/ShaderCacheManager/ -DisableShaderCache in config/config.vdf: "1" when off, "0" when on. It keeps the setting in memory -and writes config.vdf back on exit, so this runs only while the client is stopped. The launcher -passes a value only after its own toggle changes; otherwise the client's toggle stays the user's.""" from pathlib import Path import runpy import sys diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts index 0910cf6faf..9ad14d8385 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts @@ -16,7 +16,6 @@ TAG = "droiddeck-app" def account_dir(steam_root): - """The most recent account's userdata folder, else the only one that is not 0.""" users = os.path.join(steam_root, "config", "loginusers.vdf") recent, best = None, None try: @@ -243,9 +242,6 @@ ART_SLOTS = (("p", "p"), ("header", ""), ("hero", "_hero"), ("logo", "_logo")) def install_art(acct, games): - """Copies each game's art into the client's grid folder under the names it looks for. A file - the client already has that this script did not write (art the user set in the client) is - left alone; ours are replaced when the source changed and removed when the game lost its art.""" grid = os.path.join(acct, "config", "grid") os.makedirs(grid, exist_ok=True) manifest_path = os.path.join(grid, ART_MANIFEST) @@ -354,7 +350,6 @@ def main(): if x64_tool: protect = {compat.first_key(os.path.join(tools, e, "compatibilitytool.vdf"), ["compatibilitytools", "compat_tools"]) or e: e for e in (os.listdir(tools) if os.path.isdir(tools) else [])} - # Its own state: the arm64 client's state.json lists which of that client's titles follow its default. own = {"default": x64_tool, "directory": os.path.join(os.path.dirname(os.path.abspath(steam_root)), "droiddeck-compat"), "linux_tool": "droiddeck-direct"} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale index af809d1245..c1c2cc6ebc 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-ui-scale @@ -1,16 +1,4 @@ #!/usr/bin/python3 -"""Initialize Steam's own display settings once; subsequent choices belong to Steam. - -The UI scale, and native resolution: the client treats our gamescope as an external display and, -unless "Enable Native Resolution on External Displays" is on, draws itself at 1920x1080 on any -larger output - a 2340x1080 session came up as 16:9 with bars. The session's size is already the -user's Resolution choice, so the client should use all of it. - -And the screensaver over a running game. The client's defaults (steamui.so's settings descriptor) -show screensavers while a game runs, after 300 s on AC power with no button pressed - and a stick or -trigger held is no press. Red Dead Redemption 2's cutscenes run longer than that: the slideshow -covered the game, and the button that woke it reached the game as well (B asked to quit to the -desktop). Customization > Screensaver > "Show screensavers when playing a game" still turns it on.""" import math import os from pathlib import Path @@ -116,8 +104,6 @@ def seed_text(text, scale): def seed_value(text, path, value): - """InstallConfigStore/<path> = value, unless the client already has a value there (the - user's), adding only the blocks that are missing.""" root = parse(text).get('InstallConfigStore') if not isinstance(root, Block): raise ValueError("missing InstallConfigStore") @@ -170,9 +156,6 @@ def initialize(steam_root, width, height): def seed_once(steam_root, marker_name, seed, message): - """Applies seed to config.vdf the first time only: the marker keeps a later choice - including - a return to the client's own default, which the client may store by dropping the key - the - user's.""" config = Path(steam_root) / 'config/config.vdf' marker = config.with_name(marker_name) if marker.exists(): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index f6d7d1d92d..2a97bcb81d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -3,7 +3,6 @@ set -eu ROOTFS_URL=https://github.com/Droid-Deck/DroidDeck-Components/releases/download/fex-rootfs-ubuntu-24.04-2026-08-11/Ubuntu_24_04.sqsh ROOTFS_SHA256=2854b06d3ff1b8f6e526135bfb6dd5b7b30ab3ab73e79ae933a3d9fed959a178 CDN=https://client-update.fastly.steamstatic.com -# Must match the -clientbeta droiddeck-session starts this client with (steam_channel). X64_CHANNEL=steamdeck_publicbeta MANIFEST=steam_client_${X64_CHANNEL}_steamrt64 @@ -78,14 +77,17 @@ x64_sync_client() { rm -rf "$work" } -# The client rewrites config.vdf from memory as it exits: the mapping is written only while no x86 client runs. x64_map_direct() { local mode=write [ "${1:-}" = --live ] && mode=live [ -f "$STEAM_X64/config/config.vdf" ] || return 0 if [ "$mode" = write ] && pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then return 0; fi + local libraries="$STEAM_X64/steamapps:/mnt/droiddeck-sd/x86-64/steamapps:$X64_HOME/shared/arm64/steamapps" library + for library in /mnt/droiddeck-lib/*/x86-64/steamapps; do + [ -d "$library" ] && libraries="$libraries:$library" + done python3 - "$mode" "$STEAM_X64/config/config.vdf" "$STEAM_X64/appcache/appinfo.vdf" "$X64_HOME/direct-auto.json" \ - "$X64_HOME/direct-sniper" "$STEAM_X64/steamapps:/mnt/droiddeck-sd/x86-64/steamapps:$X64_HOME/shared/arm64/steamapps" "$(x64_default_tool)" \ + "$X64_HOME/direct-sniper" "$libraries" "$(x64_default_tool)" \ "$REAL_HOME/.bl-compat-pending" ${BL_X64_DIRECT_APPS:-550} \ <<'PY' || { [ "$mode" = live ] || step "could not map titles to DroidDeck direct"; } # Steam does not swap an installed build when the tool changes: a title installed for Windows stays on Proton. @@ -317,7 +319,6 @@ print("droiddeck-steam-x64: %d Linux title(s) on DroidDeck direct (%d on the new PY } -# A resumable download that reports every tenth of its size as a step. x64_fetch() { local url=$1 out=$2 label=$3 total pid rc=0 last=-1 pct total=$(curl -fsSIL "$url" 2>/dev/null | tr -d '\r' | awk 'tolower($1) == "content-length:" { v = $2 } END { print v + 0 }') @@ -336,11 +337,9 @@ x64_fetch() { x64_prepare() { fex_ready || { step "FEX could not be installed; see $LOG"; exit 1; } step "FEX ready ($FEX_NOW, $FEX_FROM)" -# The client's opt-in to its SteamRT3 build; without it, it re-executes through steam.sh, whose checks fail under proot. mkdir -p "$STEAM_X64" && : > "$STEAM_X64/.steam-enable-steamrt64-client" if [ ! -f "$ROOTFS/.droiddeck-complete" ]; then - # Resumes a part-done download; a finished one answers 416, which is not a failure here. x64_fetch "$ROOTFS_URL" "$X64_HOME/rootfs.sqsh" "downloading FEX's Ubuntu 24.04 x86 rootfs" || { rc=$? [ "$rc" = 22 ] && [ -s "$X64_HOME/rootfs.sqsh" ] || { step "rootfs download failed (curl $rc)"; exit 1; } @@ -356,13 +355,9 @@ if [ ! -f "$ROOTFS/.droiddeck-complete" ]; then touch "$ROOTFS/.droiddeck-complete" fi echo "== x86-64 rootfs: $(sed -n 's|.*/download/\([^/]*\)/.*|\1|p' <<<"$ROOTFS_URL") (sha256 ${ROOTFS_SHA256:0:12})" >&2 -# FEX falls back to the guest's own /etc/ld.so.preload (arm64 libraries) when the rootfs has none. The x86 -# session shim provides System V IPC, which Android kernels lack and the client's tier0 needs to start. : > "$ROOTFS/etc/ld.so.preload" for lib in libblsession libfakeinput; do have=0 - # 32-bit libfakeinput crashes SDL2 games (a NULL udev attribute reaches strdup), so only the x86_64 copy - # is preloaded, by full path: with $LIB, FEX falls through to the session's own i386 copy. arches="x86_64 i386"; [ "$lib" = libfakeinput ] && arches=x86_64 rm -f "$ROOTFS/usr/local/lib/i386-linux-gnu/libfakeinput.so" for arch in $arches; do @@ -439,7 +434,6 @@ if [ -f "$scout/steam-runtime.tar.xz" ] && fi [ -L "$STEAM_X64/steamapps" ] && rm -f "$STEAM_X64/steamapps" mkdir -p "$STEAM_X64/steamapps" -# FEX looks in the rootfs first: an empty dev/dri there hides the session's KGSL node, which x86 programs spin on. mkdir -p "$ROOTFS/dev/dri" mkdir -p "$X64_HOME/.steam" ln -sfn "$STEAM_X64" "$X64_HOME/.steam/root" @@ -448,9 +442,7 @@ ln -sfn "$STEAM_X64/ubuntu12_32" "$X64_HOME/.steam/bin32" ln -sfn "$STEAM_X64/ubuntu12_64" "$X64_HOME/.steam/bin64" ln -sfn "$STEAM_X64/linux32" "$X64_HOME/.steam/sdk32" ln -sfn "$STEAM_X64/linux64" "$X64_HOME/.steam/sdk64" -# Valve's Steam Runtime container needs user namespaces and a session-bus launcher; steamrt-shim stands in for both. droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || rm -rf "$X64_HOME/steamrt-shim" -# Valve's platform libraries ship without soname links (pressure-vessel makes them); ldconfig adds them here. srt_libs=$X64_HOME/steamrt-libs rm -rf "$srt_libs" mkdir -p "$srt_libs" @@ -460,13 +452,11 @@ for d in "$STEAM_X64"/steamrt64/pv-runtime/steam-runtime-steamrt/steamrt3c_platf for f in "$d"/*.so*; do [ -e "$srt_libs/$(basename "$f")" ] || ln -s "$f" "$srt_libs/"; done done FEX_ROOTFS=$ROOTFS /usr/local/bin/FEX "$ROOTFS/usr/sbin/ldconfig.real" -n "$srt_libs" >>"$LOG" 2>&1 || step "ldconfig on $srt_libs failed" -# The rootfs's HarfBuzz needs a newer FreeType than some games bundle (Counter-Strike 2): use Valve's runtime one. sniper_compat=$X64_HOME/sniper-compat rm -rf "$sniper_compat" mkdir -p "$sniper_compat" hb=$(ls "$srt_libs"/libharfbuzz.so.0.* 2>/dev/null | head -n 1) if [ -n "$hb" ]; then ln -s "$hb" "$sniper_compat/libharfbuzz.so.0"; else step "warning: no HarfBuzz in Valve's runtime for the newer-runtime titles"; fi -# LD_LIBRARY_PATH beats the system folders whatever its order: Valve's older glibc must not shadow the rootfs's. for f in "$srt_libs"/*; do n=$(basename "$f") if [ -e "$ROOTFS/usr/lib/x86_64-linux-gnu/$n" ] || [ -e "$ROOTFS/lib/x86_64-linux-gnu/$n" ]; then rm -f "$f"; fi @@ -540,7 +530,6 @@ RUN fi x64_share x86-64 x64_map_direct - # Each wrapper execs droiddeck-x64-arm-proton through an arm64 binary, which FEX hands straight to the CPU. arm_tools=$ARM_STEAM/compatibilitytools.d mkdir -p "$X64_HOME/arm64" cp -f /usr/bin/env "$X64_HOME/arm64/env" @@ -552,7 +541,6 @@ RUN for src in "$arm_tools"/*/; do src=${src%/}; name=${src##*/} [ -f "$src/compatibilitytool.vdf" ] && [ -f "$src/toolmanifest.vdf" ] || continue - # A droiddeck-fex wrapper made the arm64 client install Valve's FEX when this client probed its tools after logon. case $name in droiddeck-direct|droiddeck-fex) continue ;; esac dst=$STEAM_X64/compatibilitytools.d/$name mkdir -p "$dst" @@ -585,7 +573,6 @@ VDF chmod 755 "$dst/run" done x64_sync_login - # Each client keeps its own libraries; written only while no x86 client runs, as it rewrites these on exit. if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then listing_ok=0 if BL_X64_SHARED=$X64_HOME/shared/arm64 python3 - "$STEAM_X64" "${BL_X64_STEAM_LIBRARIES:-}" "$STEAM_X64/config/libraryfolders.vdf" "$STEAM_X64/steamapps/libraryfolders.vdf" <<'PY'; then @@ -634,7 +621,6 @@ PY step "could not add the card to the x86-64 client's library folders" fi fi - # default-tool is the default this script set: titles still on it move along; a user's choice is kept. default=$(x64_default_dir) if [ -f "$default/compatibilitytool.vdf" ] && [ -f "$STEAM_X64/config/config.vdf" ] && ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then @@ -709,7 +695,6 @@ s = s[:steam.end()] + movie.group(0) + s[steam.end():] open(path, "w", encoding="utf-8", errors="surrogateescape").write(s) PY fi - # FEX takes its rootfs from FEXServer, and one started without FEX_ROOTFS serves none: stop it while no x86 client runs. if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then FEX_ROOTFS=$ROOTFS /usr/local/bin/FEXServer -k >/dev/null 2>&1 || true fi @@ -724,7 +709,6 @@ x64_webhelper_gpu() { } x64_env() { -# droiddeck-x64-arm-proton restores this arm64 environment before Proton runs. export -p | grep -v -E '^declare -x (PWD|OLDPWD|SHLVL|_)=' > "$X64_HOME/arm-session.env.new" || true mv -f "$X64_HOME/arm-session.env.new" "$X64_HOME/arm-session.env" unset LD_LIBRARY_PATH LD_PRELOAD STEAM_RUNTIME STEAM_RUNTIME_PREFER_HOST_LIBRARIES @@ -746,7 +730,6 @@ if x64_gpu && [ "${BL_X64_CLIENT_SOFTWARE:-0}" != 1 ]; then else unset FEX_THUNKCONFIG $gpu_vars export LIBGL_ALWAYS_SOFTWARE=1 GALLIUM_DRIVER=llvmpipe -# Over DRI3 the X server hands out the GPU node, and Mesa's software path loops on KMS dumb buffers on it. export LIBGL_DRI3_DISABLE=1 fi [ "${BL_X64_FP_OFF:-0}" = 1 ] && export PROOT_FP_OFF=1 @@ -759,12 +742,9 @@ export FEX_ROOTFS=$ROOTFS export STEAM_EXTRA_COMPAT_TOOLS_PATHS= export STEAM_RUNTIME=1 [ -d "$X64_HOME/steamrt-shim" ] && export STEAM_RUNTIME_STEAMRT=$X64_HOME/steamrt-shim -# The client starts commands via steam-runtime-launch-client; Valve's needs a session-bus service, the shim's runs them. [ -d "$X64_HOME/steamrt-shim/bin" ] && export PATH=$X64_HOME/steamrt-shim/bin:$PATH export LD_LIBRARY_PATH=$STEAM_X64/steamrt64:$STEAM_X64/steamrt64/panorama:$X64_HOME/steamrt-libs -# After an update the client re-executes itself through pressure-vessel-wrap (bwrap) unless this guard is set. export STEAM_STEAMRT_RECURSION_GUARD=1 -# proot is a tracer: tier0 takes it for a debugger and breaks into it with int3 on its first failed assertion. export BL_WEBHELPER_HIDE_TRACER=1 } @@ -774,7 +754,6 @@ x64_manifest_version() { awk -F'"' '$2 == "version" { print $4; exit }' "$STEAM_X64/package/steam_client_${chan}_$1.manifest" 2>/dev/null || echo "?" } -# What x86 GL and Vulkan look like through FEX's thunks, for a session whose menus failed on the GPU. x64_gpu_probe() { local fex=${BL_FEX:-/usr/local/bin/FEX} echo "== x86-64 GPU probe (x86 glxinfo and vulkaninfo through FEX):" @@ -786,8 +765,6 @@ x64_gpu_probe() { ) | sed 's/^/ /' } -# Steam's menus come from the web helper; when its GPU process keeps exiting, Chromium gives up on the GPU and -# the menus never appear. Says so once in the session log, with the probe above. x64_gpu_watch() { local log=$STEAM_X64/logs/console-linux.txt from n codes from=$(( $(wc -l 2>/dev/null < "$log" || echo 0) + 1 )) @@ -801,7 +778,6 @@ x64_gpu_watch() { x64_arm_webhelper_cpu_supported() { local status=0 - # Valve's native ARM web helper contains LSE atomics; missing CPU data cannot establish incompatibility. awk -F: ' $1 ~ /^[[:space:]]*Features[[:space:]]*$/ { if ($2 !~ /(^|[[:space:]])atomics([[:space:]]|$)/) unsupported = 1 @@ -814,8 +790,6 @@ x64_arm_webhelper_cpu_supported() { x64_exec() { x64_env cd "$STEAM_X64" - # The client checksums its files at start and reinstalls over edited ones, so the session shim (preload/net.c) - # swaps the web helper at exec. The arm64 helper only comes up against a client of the same build. if [ "${BL_X64_X86_WEBHELPER:-0}" != 1 ] && [ -x /usr/local/bin/droiddeck-x64-arm-webhelper ] && [ -x "$ARM_STEAM/steamrtarm64/steamwebhelper" ] && x64_arm_webhelper_cpu_supported; then local chan x86_build arm_build @@ -829,7 +803,6 @@ x64_exec() { fi fi if [ -z "${BL_X64_ARM_WEBHELPER:-}" ] && x64_webhelper_gpu; then - # Not --in-process-gpu (the preload's default): a GPU crash there takes the whole helper down. export BL_WEBHELPER_ARGS="--ignore-gpu-blocklist --use-gl=angle --use-angle=gl --ozone-platform=x11" [ -x /usr/local/bin/droiddeck-x64-webhelper ] && export BL_X64_ARM_WEBHELPER=/usr/local/bin/droiddeck-x64-webhelper elif [ -z "${BL_X64_ARM_WEBHELPER:-}" ]; then @@ -860,7 +833,6 @@ x64_share() { step "could not share the games between the clients" } -# Steam renews its token every few days and refuses old copies: copy the newest every start, never while a client runs. x64_sync_login() { pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1 && return 0 pgrep -f 'steamrtarm64/steam( |$)' >/dev/null 2>&1 && return 0 @@ -996,7 +968,6 @@ if [ -n "${BL_FEXSERVER_LOG:-}" ]; then FEX_ROOTFS=$ROOTFS "$(dirname "${BL_FEX:-/usr/local/bin/FEX}")/FEXServer" -f -p 600 >"$BL_FEXSERVER_LOG" 2>&1 & sleep 1 fi -# The client's connection status comes from NetworkManager on the system bus; a desktop has no system bus. x64_bus= x64_nm= x64_pin= x64_cleanup() { [ -n "$x64_pin" ] && kill "$x64_pin" 2>/dev/null @@ -1035,7 +1006,6 @@ BUSCONF step "network: the system bus did not come up; the client will show no connection" fi fi -# Left by a killed client: .crash opens the update UI on its spinner; stale Singleton* locks can blank the UI. if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then for f in "$STEAM_X64/.crash" "$STEAM_X64/steam.pid" "$STEAM_X64/config/htmlcache/SingletonLock" \ "$STEAM_X64/config/htmlcache/SingletonCookie" "$STEAM_X64/config/htmlcache/SingletonSocket"; do @@ -1053,7 +1023,6 @@ if [ -n "${BL_CLIENT_CPUS:-}" ] && command -v taskset >/dev/null 2>&1; then x64_pin=$! fi for attempt in 1 2 3 4 5; do - # The branch on disk must match -clientbeta before every start, or the client loops on rc=42. echo "$X64_CHANNEL" > "$STEAM_X64/package/beta" step "starting the x86-64 SteamRT3 client under FEX (attempt $attempt): $*" rc=0 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim index feb4c5711f..725db479d5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim @@ -1,7 +1,4 @@ #!/bin/bash -# droiddeck-steamrt-shim <client runtime dir> <shim dir> -# Builds <shim dir> from the Steam Runtime container the client carries and exits 0, or removes it and exits 1 -# when the client carries none. set -eu client=$1 shim=$2 @@ -25,13 +22,11 @@ for e in "$srt_real"/bin/*; do [ -e "$e" ] || continue ln -s "$e" "$shim/bin/$(basename "$e")" done -# The client's bwrap probe (steam-runtime-check-requirements) needs user namespaces, which no Android app has. rm -f "$shim/bin/steam-runtime-check-requirements" printf '#!/bin/sh exit 0 ' > "$shim/bin/steam-runtime-check-requirements" chmod 755 "$shim/bin/steam-runtime-check-requirements" -# Valve's launcher asks a service on the session bus; proot is already the container, so the command runs here. rm -f "$shim/bin/steam-runtime-launch-client" cat > "$shim/bin/steam-runtime-launch-client" <<'LAUNCH' #!/bin/sh diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr index 1de7cb89eb..176f92aad3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr @@ -26,7 +26,6 @@ quest_settings() { configure_graphics() { case "$(cat /sys/class/kgsl/kgsl-3d0/gpu_model 2>/dev/null)" in Adreno840*) - # The session's forced sysmem mode loses the Vulkan device in SteamVR. export TU_DEBUG="$( IFS=', ' set -f @@ -41,8 +40,6 @@ configure_graphics() { esac } -# Any OpenXR probe (Steam runs one through Proton at every client start) starts vrserver -# while a runtime is registered, so SteamVR is registered only during a DroidDeck VR session. unregister() { if grep -qF "\"$steamvr\"" "$HOME/.config/openvr/openvrpaths.vrpath" 2>/dev/null; then rm -f "$HOME/.config/openvr/openvrpaths.vrpath" @@ -78,7 +75,6 @@ stop() { case "${1:-status}" in launch) - # Library/URL entry point: use the same installer and start path as the app. exec 8>"$state/launch.lock" flock -n 8 || exit 0 if ! installed; then @@ -221,7 +217,6 @@ JSON quest_settings apply || exit 1 startup_handed_off=0 trap '[ "$startup_handed_off" = 1 ] || quest_settings restore' EXIT - # The pinned Frame package's CVP constructor exits on Quest's unsupported SoC. cvp=$steamvr/drivers/cv/bin/linuxarm64/libArcturusPerception.so if [ -f "$cvp" ]; then disabled=$cvp.droiddeck-disabled diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat index a07462d07e..ee061811a5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-flat @@ -1,10 +1,6 @@ #!/bin/sh -# Exit 0 when this game run should open as a SteamVR panel: SteamVR is running and Steam -# lists no VR support for the app, optional or required. Under SteamVR, Steam stacks a flat game's window behind -# its own, so without the panel the game plays unseen. [ "${1:-}" = waitforexitandrun ] || exit 1 [ -z "${DROIDDECK_STEAMVR_PANEL:-}" ] || exit 1 -# Non-Steam shortcuts run with SteamAppId=0 and their CGameID in SteamGameId. app=${SteamAppId:-} [ "$app" = 0 ] && app=${SteamGameId:-} case $app in '' | 0 | *[!0-9]*) exit 1 ;; esac diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game index 0b7d405382..6d2ca116bd 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-game @@ -6,13 +6,11 @@ pgrep -x vrserver >/dev/null 2>&1 || { echo 'Start SteamVR before launching a game with droiddeck-steamvr-game.' >&2 exit 1 } -# droiddeck-steamvr-flat skips a run that a launch option already wrapped. export DROIDDECK_STEAMVR_PANEL=1 vrdir=${DROIDDECK_VR_DIR:-/usr/local/lib/droiddeck-vr} export VK_LAYER_PATH="$vrdir/layer${VK_LAYER_PATH:+:$VK_LAYER_PATH}" export VK_INSTANCE_LAYERS="VK_LAYER_DROIDDECK_vr${VK_INSTANCE_LAYERS:+:$VK_INSTANCE_LAYERS}" export VK_LOADER_LAYERS_DISABLE="${VK_LOADER_LAYERS_DISABLE:-~implicit~}" -# Quest's guest GPU images use Vulkan sharing rather than DMA-BUF modifiers. if [ -S "/run/droiddeck/droiddeck-xr-frames" ]; then export gamescope_vr_use_modifiers=${gamescope_vr_use_modifiers:-false} fi diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-settings b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-settings index 28f93cf97c..723a2b6d5b 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-settings +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr-settings @@ -1,5 +1,4 @@ #!/usr/bin/python3 -"""Preserve SteamVR preferences across Quest's required compositor overrides.""" import json import os from pathlib import Path diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 682cfc0edf..131c049062 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -1,34 +1,4 @@ #!/usr/bin/python3 -r"""Before Proton starts a store game, asks the app for what that store needs at launch. - -Run by droiddeck-proton / droiddeck-proton-wrap (steam-compatibility) for every real game launch, -whoever started it: the Games tab, a pinned shortcut, or the Steam client's own Play button. It -looks for the store launcher DroidDeck wrote (.droiddeck-launch.bat) among the arguments; beside it -.droiddeck-store.json says which store and game it is. - -For an Epic game, once the Epic Games Launcher is installed (droiddeck-epic), the game is started -through it: the hidden launcher signs the game in and hands its arguments back in -.droiddeck-epic-args. Without the launcher, or when it cannot, the game needs a fresh exchange code -to sign in, which only the app can mint. The request goes through files under $BL_LAUNCH_DIR/stores (the session root, the same path on both -sides): - - req/<id>.json {"op": "epic-code", "store": "epic", "id": "<app name>"} (tmp + rename) - resp/<id>.json {"ok": true, "code": true|false, "reason": "..."} - -The app writes .droiddeck-epic-code into the game's folder itself - the code never passes through -here - and the launcher .bat reads and deletes it. No answer within TIMEOUT seconds: the game starts -with its offline identity. A code file older than STALE_SECONDS is removed first, so a code left by -an earlier launch is never used. - -The game's prefix gets Wine's browser set to droiddeck-open-url, which hands web addresses to -Android: an EOS sign-in step that falls back to a browser (a consent Epic asks for once per product) -is finished there. An EOS overlay pointer (HKCU\Software\Epic Games\EOS "OverlayPath") an earlier -build wrote is removed - with it the game exited while loading. - -Battle.net.exe in Battle.net's prefix is handed to droiddeck-battlenet, which runs the whole launch. - - droiddeck-store-launch <the arguments Steam gave the compat tool> -""" import base64 import binascii @@ -77,12 +47,6 @@ def sidecar_at(folder): def find_store_game(argv): - """ - The (folder, sidecar) of a store game among [argv], or None when this is not one. Steam passes - the shortcut's target: the launcher .bat when the game has one (Epic, Amazon, a GOG game with - arguments), else the game's exe itself (most GOG games), which may sit in a subfolder - so the - folders above it are looked through too, up to MAX_DEPTH, for the sidecar. - """ for raw in argv: arg = raw.strip().strip('"').strip("'").replace("\\", "/") low = arg.lower() @@ -100,7 +64,6 @@ def find_store_game(argv): def drop_stale(folder, now=None): - """Removes a code file older than STALE_SECONDS; True when one was removed.""" code = folder / EPIC_CODE try: if (now if now is not None else time.time()) - code.stat().st_mtime > STALE_SECONDS: @@ -136,7 +99,6 @@ def through_client(folder, sidecar, timeout=CLIENT_TIMEOUT): def ask(channel, request, timeout=TIMEOUT): - """Writes [request] under channel/req and waits for channel/resp; the answer, or None on timeout.""" req_dir, resp_dir = channel / "req", channel / "resp" req_dir.mkdir(parents=True, exist_ok=True) resp_dir.mkdir(parents=True, exist_ok=True) @@ -161,7 +123,6 @@ def ask(channel, request, timeout=TIMEOUT): def windows_path(unix): - """A guest path as Wine names it through Z: (the whole filesystem).""" return "Z:" + unix.replace("/", "\\") @@ -170,12 +131,6 @@ def reg_escape(value): def set_value(reg, key, name, value, now=None): - """ - Appends `key` with `"name"="value"` to a prefix's user.reg unless the last word on it already - says so. Appended rather than edited in place, as DirectAudio's key is: Wine reads later sections - over earlier ones, and nothing of the file is rewritten under a wineserver that might hold it. - False when there is no user.reg yet (Proton creates the prefix after this; the next launch has it). - """ if not reg.is_file(): return False line = '"%s"="%s"' % (name, reg_escape(value)) @@ -193,7 +148,6 @@ def set_value(reg, key, name, value, now=None): def remove_value(reg, key, name): - """Drops every `"name"=` line under `key` in user.reg; True when one was there.""" if not reg.is_file(): return False rows, inside, dropped = [], False, False @@ -212,13 +166,11 @@ def remove_value(reg, key, name): def options(sidecar): - """An Epic game's launch choices from its sidecar, as the Games tab's Epic card sets them.""" e = sidecar.get("epic") if isinstance(sidecar.get("epic"), dict) else {} return {"eos": e.get("eos", True) is not False, "offline": e.get("offline", False) is True} def server_socket(pfx): - """The wineserver socket for prefix [pfx], as Wine names it (server-<dev>-<inode> under /tmp/.wine-<uid>).""" try: st = os.stat(pfx) except OSError: @@ -228,11 +180,6 @@ def server_socket(pfx): def wait_for_server(pfx, timeout=SERVER_WAIT): - """ - Waits for a wineserver still holding this prefix (an earlier verb's, or the last launch's) to - exit: it rewrites user.reg from its own memory when it does, which drops a line appended - meanwhile. True when none is left. - """ sock = server_socket(pfx) if sock is None: return True @@ -243,7 +190,6 @@ def wait_for_server(pfx, timeout=SERVER_WAIT): def has_value(reg, key, name, value=None): - """Whether the last word on `key` in user.reg sets "name" (to [value], when given).""" if not reg.is_file(): return False inside, last = False, None @@ -258,7 +204,6 @@ def has_value(reg, key, name, value=None): def provision_prefix(compat_data, wait=SERVER_WAIT): - """Wine's browser set to the hand-off, and an earlier build's EOS overlay pointer removed.""" if not compat_data: return "no-prefix" pfx = Path(compat_data) / "pfx" @@ -318,12 +263,10 @@ def battlenet(argv, env=os.environ): def cloud_on(sidecar): - """Cloud saves for this game (the game card's switch; on unless turned off).""" return str(sidecar.get("store")) in CLOUD_STORES and sidecar.get("cloud", True) is not False def exited(argv, code=0): - """After the game: ask the app to upload what changed, without waiting for it.""" found = find_store_game(argv) launch_dir = os.environ.get("BL_LAUNCH_DIR", "") if found is not None and str(found[1].get("store")) == "epic" and os.environ.get(EPIC_HANDLED) != "1" \ @@ -344,7 +287,6 @@ COMET_DIR = Path("/usr/local/lib/droiddeck-comet") def provision_galaxy(compat_data, proton, timeout=90): - """Proton creates the prefix and registers Galaxy before the first game runs.""" if not compat_data or not proton or not Path(proton).is_file(): return "no-proton" data = Path(compat_data) @@ -415,6 +357,27 @@ GOG_ROOTS = {"HKEY_LOCAL_MACHINE": "HKEY_LOCAL_MACHINE", "HKLM": "HKEY_LOCAL_MAC "HKEY_CLASSES_ROOT": "HKEY_CLASSES_ROOT", "HKCR": "HKEY_CLASSES_ROOT"} WINE_USER = "C:\\users\\steamuser" +# GOG completes some installs by running a support installer from the game folder (the +# goggame-<id>.script "Execute" action). Under ARM64 FEX that 32-bit self-extractor stops at +# "Path not found", so the values it would write are applied here instead. Only products GOG +# ships no setRegistry action for are listed; a script's own entries always win. +# The Witcher: Enhanced Edition (#694) exits during startup unless the installer's +# HKLM\Software\CD Projekt Red\The Witcher keys exist - the same ones The Witcher's own +# setup writes (InstallFolder, RegionVersion, IsDjinniInstalled) plus its language. +GOG_INSTALL_REGISTRY = { + "1207658924": [ + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "InstallFolder", "string", "{app}\\"), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "RegionVersion", "string", "US"), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "IsDjinniInstalled", "dword", 1), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "Language", "string", "{language}"), + ("HKCU", "Software\\CD Projekt RED\\Witcher\\Settings", "TextLanguage", "string", "{language}"), + ("HKCU", "Software\\CD Projekt RED\\Witcher\\Settings", "VoiceLanguage", "string", "{language}"), + ], +} +# The Witcher's text and voice language IDs, from its installer's registry data. +GOG_LANGUAGE_IDS = {"en": 3, "fr": 11, "de": 10, "es": 12, "it": 13, "ru": 14, "cs": 15, "hu": 16, + "zh": 21, "pl": 5} + def gog_paths(folder, product): app = windows_path(str(folder)) @@ -474,8 +437,94 @@ def gog_entry(arguments, paths): return None -def gog_registry(folder): - entries, skipped = [], 0 +def gog_installed_products(folder): + products = {} + for info in sorted(Path(folder).glob("goggame-*.info")): + product = info.name[len("goggame-"):-len(".info")] + if not product.isdigit(): + continue + try: + products[product] = json.loads(info.read_text(encoding="utf-8-sig")) + except (OSError, ValueError): + products[product] = {} + return products + + +def gog_language_id(info): + languages = info.get("languages") if isinstance(info, dict) else None + if isinstance(languages, str): + languages = [languages] + code = str(languages[0]).lower()[:2] if isinstance(languages, list) and languages else "" + return GOG_LANGUAGE_IDS.get(code, GOG_LANGUAGE_IDS["en"]) + + +GOG_VALUE_HIVES = {"hklm": "local_machine", "hkey_local_machine": "local_machine", + "hkcu": "current_user", "hkey_current_user": "current_user", + "hkcr": "classes_root", "hkey_classes_root": "classes_root"} + + +def gog_value_key(root, section, name, view32=True): + """A registry value's identity, keeping the root and the 32-bit view apart. + + The fallback import always targets the 32-bit view (`/reg:32`), which Wine keeps under + `Software\\Wow6432Node` for HKLM: a native HKLM value must not pass for the 32-bit one. + HKCU\\Software is shared by both views, so its values read the same either way. + """ + text = section.replace("\\\\", "\\").strip("\\").lower() + hive = GOG_VALUE_HIVES.get(root.lower(), root.lower()) + if text.startswith("software\\wow6432node\\"): + text = text[len("software\\wow6432node\\"):] + elif hive == "local_machine" and not view32 and text.startswith("software\\"): + text = "native\\" + text + elif text.startswith("software\\"): + text = text[len("software\\"):] + return "%s|%s|%s" % (hive, text, name.lower()) + + +def gog_registry_values(pfx): + """Values already in the prefix, so install defaults never overwrite a player's choice.""" + values = set() + for file, root in (("system.reg", "hklm"), ("user.reg", "hkcu")): + try: + lines = (pfx / file).read_text(encoding="utf-8", errors="ignore").splitlines() + except OSError: + continue + section = "" + for line in lines: + if line.startswith("["): + end = line.find("]") + section = line[1:end] if end > 0 else line[1:] + continue + match = re.match(r'^"([^"]+)"=', line) + if match and section: + values.add(gog_value_key(root, section, match.group(1), view32=False)) + return values + + +def gog_scripted_products(folder): + products = set() + for script in sorted(Path(folder).glob(GOG_SCRIPTS)): + try: + actions = json.loads(script.read_text(encoding="utf-8-sig")).get("actions") + except (OSError, ValueError, AttributeError): + continue + if isinstance(actions, list) and any( + isinstance(action, dict) and isinstance(action.get("install"), dict) + and action["install"].get("action") == "setRegistry" for action in actions): + products.add(script.name[len("goggame-"):-len(".script")]) + return products + + +def gog_expected_values(folder): + """The fallback values a launch must find, so the marker never hides one that was deleted.""" + scripted = gog_scripted_products(folder) + return [gog_value_key(root, subkey, name) for product in gog_installed_products(folder) + if product in GOG_INSTALL_REGISTRY and product not in scripted + for root, subkey, name, _kind, _value in GOG_INSTALL_REGISTRY[product]] + + +def gog_registry(folder, existing=()): + entries, skipped, scripted = [], 0, set() for script in sorted(Path(folder).glob(GOG_SCRIPTS)): product = script.name[len("goggame-"):-len(".script")] try: @@ -492,11 +541,28 @@ def gog_registry(folder): skipped += 1 else: entries.append(entry) + scripted.add(product) + for product, info in gog_installed_products(folder).items(): + if product in scripted or product not in GOG_INSTALL_REGISTRY: + continue + paths = dict(gog_paths(folder, product), language=str(gog_language_id(info))) + for root, subkey, name, kind, value in GOG_INSTALL_REGISTRY[product]: + if gog_value_key(root, subkey, name) in existing: + continue + entry = gog_entry({"root": root, "subkey": subkey, "valueName": name, + "valueType": kind, "valueData": value}, paths) + if entry is None: + skipped += 1 + else: + entries.append(entry) return entries, skipped def apply_gog_registry(folder, compat_data, proton, timeout=90, installation=None): - entries, skipped = gog_registry(folder) + pfx = Path(compat_data) / "pfx" if compat_data else None + existing = gog_registry_values(pfx) if pfx else set() + entries, skipped = gog_registry(folder, existing) + expected = gog_expected_values(folder) if installation: product = str(installation["id"]) if not product.isdigit(): @@ -523,10 +589,10 @@ def apply_gog_registry(folder, compat_data, proton, timeout=90, installation=Non return "no-proton" + note text = "Windows Registry Editor Version 5.00\r\n\r\n" + "".join(entry + "\r\n\r\n" for entry in entries) stamp = hashlib.sha256(text.encode("utf-8")).hexdigest() - pfx = Path(compat_data) / "pfx" marker = pfx / GOG_REGISTRY_MARK try: - if marker.is_file() and marker.read_text() == stamp and (pfx / "system.reg").is_file(): + if (marker.is_file() and marker.read_text() == stamp and (pfx / "system.reg").is_file() + and set(expected) <= existing): return "ready" + note Path(compat_data).mkdir(parents=True, exist_ok=True) with tempfile.TemporaryDirectory(prefix="droiddeck-gog-") as tmp: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents b/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents index d98e6d66ad..d7c3f61afd 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-wincomponents @@ -1,27 +1,4 @@ #!/usr/bin/python3 -"""Windows components (OpenAL, d3dx, XAudio, ...) for a game's Proton prefix. - -The app installs each component under STORE/<id>: its files in system32/ (64-bit) and syswow64/ -(32-bit) as Windows lays them out, and component.json naming the overrides that make Wine load -them instead of its own ("name" for native-then-builtin, or "name=n" with Wine's own letters) and -the components it bundles ("requires"). The ids are Bannerlator's catalog names (xaudio2.7, -oalinst_dll...). The user picks components per game; the picks are in SELECTION as -{"version": 1, "games": {"<appid>": ["oalinst_dll", ...]}}. - -A component installed from a Windows Installer package (droiddeck-msi-install) also has drive_c/, -its files at their Windows paths (Program Files, the .NET GAC, winsxs...), and registry.json, the -values its package writes. - -droiddeck-game-env calls apply() before every game launch. It copies what is missing or changed -into compatdata/<appid>/pfx, writes the components' registry values into the prefix's registry -files (system.reg, user.reg) and returns the overrides for WINEDLLOVERRIDES, so Wine never has to -be running. A prefix Proton has not made yet gets the registry values on the launch after. - -Proton leaves the files alone afterwards: its builtin refresh (update_builtin_libs) replaces only -files that are its own builtins, and a new prefix is built around files already there (copy_pfx -skips them). The one case that removes them is a launch on an older Proton than the prefix's, -which deletes every file Proton once placed - and the next launch's apply() puts ours back. -""" import json import os import re @@ -62,7 +39,6 @@ def wanted(app_id, selection=SELECTION): def component(store, cid): - """The component's overrides, its files as (relative path, source) and the ids it bundles, or None if not installed.""" root = Path(store) / cid try: with open(root / "component.json", encoding="utf-8") as source: @@ -87,7 +63,6 @@ def component(store, cid): def registry_values(root): - """The component's registry values (registry.json), the ones that are well formed.""" try: with open(Path(root) / "registry.json", encoding="utf-8") as source: values = json.load(source).get("values", []) @@ -102,7 +77,6 @@ def registry_values(root): def expand(store, ids, saved=None): - """The picks with everything they bundle, each once, a bundle's parts before it.""" out, seen = [], set() saved = saved if isinstance(saved, dict) else {} @@ -122,7 +96,6 @@ def expand(store, ids, saved=None): def spelled(path): - """path with each folder that exists spelled as the prefix spells it (Windows names ignore case).""" parts = path.parts current = Path(parts[0]) for part in parts[1:]: @@ -141,7 +114,6 @@ def spelled(path): def existing(path): - """The file at path as the prefix spells it: Windows names ignore case, the filesystem may not.""" folder = spelled(path.parent) path = folder / path.name try: @@ -165,7 +137,6 @@ def same(src, dst): def builtin(path): - """Proton's own: a symlink into its files, or a Wine DLL that says so in its DOS stub.""" if path.is_symlink(): return True try: @@ -177,7 +148,6 @@ def builtin(path): def place(src, target, backup=None): - """Copies src over target unless it is already there; a file of someone else's goes to backup first.""" target = spelled(target.parent) / target.name target.parent.mkdir(parents=True, exist_ok=True) found = existing(target) @@ -195,7 +165,6 @@ def place(src, target, backup=None): def reg_escape(text, extra=""): - """A string as Wine's registry files write it.""" out = [] for ch in text: if ch == "\\" or ch == '"' or ch in extra: @@ -240,7 +209,6 @@ def reg_key_line(key): def reg_value_line(name, kind, data): - """name=data as one registry file line; None for a kind that has no line of its own.""" head = "@" if name == "" else '"%s"' % reg_escape(name) if kind == "sz": return '%s="%s"' % (head, reg_escape(str(data))) @@ -258,13 +226,11 @@ def reg_value_line(name, kind, data): def reg_string(line): - """The text of a string value line (plain or str(2)), or None for any other kind.""" match = re.match(r'^(?:@|"(?:[^"\\]|\\.)*")=(?:str\(2\):)?"((?:[^"\\]|\\.)*)"\s*$', line) return reg_unescape(match.group(1)) if match else None class RegistryFile: - """One of a prefix's registry files, as Wine keeps them: [key] sections of name=value lines.""" def __init__(self, path): self.path = Path(path) @@ -291,7 +257,6 @@ class RegistryFile: self.links[current.lower()] = target def link_target(self, number, root): - """Where the link key whose "#link" line is at number leads, relative to this file's root.""" for at in range(number + 1, min(number + 8, len(self.lines))): line = self.lines[at] if line.startswith("["): @@ -312,7 +277,6 @@ class RegistryFile: return None def resolve(self, key): - """The key Wine really keeps key in: a path through a link key leads to the link's target.""" key = key.strip("\\") for _ in range(8): lower = key.lower() @@ -338,7 +302,6 @@ class RegistryFile: return None if end is None else reg_unescape(line[1:end]) def section(self, key): - """(start, end) line numbers of the key's values, or None.""" start = self.index.get(self.resolve(key).lower()) if start is None: return None @@ -355,7 +318,6 @@ class RegistryFile: return reg_unescape(match.group(1)).lower() if match else None def find(self, key, name): - """(first, last + 1) of the value's lines, or None.""" span = self.section(key) if span is None: return None @@ -389,7 +351,6 @@ class RegistryFile: self.changed = True def put(self, key, name, raw): - """Sets the value's line(s) to raw, or removes the value when raw is None; True if that changed it.""" found = self.find(key, name) if raw is None: if found is None: @@ -432,8 +393,6 @@ class RegistryFile: def list_line(name, current, item, separator, add, at_end=True): - """current (a string value line) with item added to or taken out of its list, None if it had - nothing else; a value that is not a string is left as it is.""" text = reg_string(current) if current is not None else "" if text is None: return current @@ -447,9 +406,6 @@ def list_line(name, current, item, separator, add, at_end=True): def apply_registry(pfx, values, state, held=()): - """Writes the picked components' registry values into the prefix and takes out the ones of - components turned off: a value goes back to what it was before, an entry added to a list such - as PATH just leaves the list. Returns (values written, notes).""" files = {} for hive, name in HIVES.items(): if (pfx / name).is_file(): @@ -518,7 +474,6 @@ def save_state(compat, state): def pending_for(app_id, pending=PENDING): - """The component ids the app is still getting ready for app_id; empty when none (or no file).""" try: with open(pending, encoding="utf-8") as source: ids = json.load(source).get("games", {}).get(str(app_id), []) @@ -528,9 +483,6 @@ def pending_for(app_id, pending=PENDING): def wait_for_pending(app_id, pending=PENDING, store=STORE, timeout=PENDING_WAIT, sleep=time.sleep, clock=time.monotonic): - """Waits (at most timeout seconds) for the components still being got ready for app_id to be in - the store or dropped from the pending list. No wait at all when nothing is pending. Returns a - note for the log, or None.""" def missing(): return [cid for cid in pending_for(app_id, pending) if component(store, cid) is None] left = missing() @@ -548,7 +500,6 @@ def wait_for_pending(app_id, pending=PENDING, store=STORE, timeout=PENDING_WAIT, def apply(compat_path, app_id, selection=SELECTION, store=STORE, pending=PENDING, wait=wait_for_pending): - """Brings the prefix in line with the game's picks. Returns (overrides, notes).""" compat = Path(compat_path) pfx = compat / "pfx" waited = wait(app_id, pending, store) if wait else None @@ -642,7 +593,6 @@ def apply(compat_path, app_id, selection=SELECTION, store=STORE, pending=PENDING def overrides_value(names): - """WINEDLLOVERRIDES entries: native-then-builtin unless the component says otherwise; the last word on a DLL wins.""" modes = {} for entry in names: name, _, mode = entry.partition("=") diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton index 4a074be13f..1f82a06915 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-proton @@ -1,9 +1,7 @@ #!/bin/bash -# Runs natively: droiddeck-steam-x64's x86 wrappers start it through an arm64 binary, which FEX hands to the CPU. tool=$1; shift x64_home=$HOME -# The game overlay tags the game's windows with the Steam app ID; without it gamescope never shows them. overlay=0 case ${LD_PRELOAD:-} in *gameoverlayrenderer.so*) overlay=1 ;; esac @@ -20,7 +18,6 @@ else export HOME=/root fi [ -z "$game_display" ] || export DISPLAY=$game_display -# Proton takes its Steam client parts from the client's install folder; the x86-64 client's are x86. export BL_X64_STEAM_ROOT=${STEAM_COMPAT_CLIENT_INSTALL_PATH:-} export STEAM_COMPAT_CLIENT_INSTALL_PATH=$HOME/.local/share/Steam arm_overlay=$STEAM_COMPAT_CLIENT_INSTALL_PATH/steamrtarm64/gameoverlayrenderer.so diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper index 646dbd01b1..bd89a4ddb1 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-arm-webhelper @@ -1,5 +1,4 @@ #!/bin/bash -# The arm64 client's web helper for the x86-64 client, run natively: FEX hands this arm64 program to the CPU. x64_home=$HOME arm=/root/.local/share/Steam/steamrtarm64 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper index 10abdf2a4a..8c830ab9b1 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-x64-webhelper @@ -1,8 +1,5 @@ #!/bin/bash -# Steam's compositor draws each browser window from its X pixmap: frames must reach X, not gamescope's WSI layer. -# gamescope sets vk_xwayland_wait_ready=false for its children; kopper swapchains flashed black even with the wait. unset BL_X64_ARM_WEBHELPER -# The shim already added the GPU flags (preload/webhelper.c) to these arguments. export BL_WEBHELPER_ARGS=stock DISABLE_GAMESCOPE_WSI=1 vk_xwayland_wait_ready=true LIBGL_KOPPER_DISABLE=true if [ -x ./steamwebhelper ]; then exec ./steamwebhelper "$@" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index 9382f2deba..304e126552 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -1,5 +1,4 @@ #!/usr/bin/python3 -"""Licensed Xbox launches through Xodus and the game's selected ARM64 Proton.""" import hmac import json import os @@ -151,13 +150,13 @@ def view_drive(prefix, exe): if os.path.lexists(link) and (os.path.exists(link) or not os.readlink(link).startswith(str(view.parent.parent) + '/')): continue devices.mkdir(parents=True, exist_ok=True) - staged.symlink_to(view) + staged.symlink_to(view.parent) os.replace(staged, link) except OSError: if os.path.lexists(staged): staged.unlink() continue - return letter.upper() + ':\\' + str(path.relative_to(view)).replace('/', '\\'), link + return letter.upper() + ':\\' + str(path.relative_to(view.parent)).replace('/', '\\'), link return exe, None diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 47c83fbd9a..397a19d73d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -248,8 +248,6 @@ bl_idtech3() { } """ -# Source games report VAC-secure or insecure only in their console, written to console.log only with -condebug. -# The app keeps the switch and the records in /root: the x86-64 client runs games with its own HOME. BL_VACDIAG_SETUP = """ bl_vacdiag() { [ -f /root/.droiddeck-vac-diagnostics ] || return 0 @@ -276,10 +274,6 @@ bl_vacdiag() { } """ -# Steam's shader pre-caching runs its D3D driver query through every Proton tool at each start, as -# "run <client>/bin/d3ddriverquery64.exe" in compatdata/0. Here it has never succeeded (exit 1 every time), and each -# run started Wine in compatdata/0, where the two Protons upgrade the prefix back and forth for many seconds while the -# game starts. Steam gets the same failure without starting Wine; other verbs and prefixes are left alone. BL_DRIVER_QUERY_SKIP = """ case "$verb:${1##*/}:${STEAM_COMPAT_DATA_PATH%/}" in run:d3ddriverquery64.exe:*/compatdata/0 | run:d3ddriverquery.exe:*/compatdata/0) @@ -335,6 +329,11 @@ bl_directaudio() { fi WINEDLLPATH="$da/lib/wine${WINEDLLPATH:+:$WINEDLLPATH}" export WINEDLLPATH + for name in $(compgen -e); do + case $name in + AUDIO_DIRECT_*) export "BANNER_$name=${!name}" ;; + esac + done WINE_AUDIO_DRIVER="directaudio,pulse" export WINE_AUDIO_DRIVER pfx="${STEAM_COMPAT_DATA_PATH:-}/pfx" @@ -546,7 +545,6 @@ def tokenize(text): def find_block(tokens, path): - """Index of the '{' opening the block at path, or None.""" depth, want, i = 0, 0, 0 while i < len(tokens): t = tokens[i] @@ -597,10 +595,6 @@ def serialize(tokens): def write_changed(path, text, mode=None): - """Writes `text` to `path` only when it differs, through a rename so a reader never sees half a - file. The session runs this script every 15 s for as long as the client does; rewriting files - that have not changed cost a python start's worth of writes each time, and config.vdf is the - client's own, which it may be writing at that moment. Returns whether anything was written.""" try: with open(path, encoding="utf-8", errors="replace") as f: same = f.read() == text @@ -628,8 +622,6 @@ def display_name(base): def first_key(path, section): - """The single key naming a block inside `section`, or None. Used to keep a third-party tool's - own internal name, so a mapping the user already made against it keeps working.""" try: with open(path, encoding="utf-8", errors="replace") as f: tokens = tokenize(f.read()) @@ -647,7 +639,6 @@ def first_key(path, section): def manifest_entry_point(path): - """The script a toolmanifest's commandline runs, relative to the tool directory.""" try: with open(path, encoding="utf-8", errors="replace") as f: tokens = tokenize(f.read()) @@ -662,9 +653,6 @@ def manifest_entry_point(path): def adopt_extras(tools): - """Makes every other Proton in compatibilitytools.d launchable here, and returns the tool names - to leave alone in CompatToolMapping - the whole point of installing one is to pick it per game, - so register_default must not repoint it back at ours.""" adopted = {} try: entries = sorted(os.listdir(tools)) @@ -738,7 +726,6 @@ def libraries(steam_root): def installed_apps(steam_root): - """App ids of the titles the client has installed, tools and runtimes excluded.""" apps = set() for library in libraries(steam_root): steamapps = os.path.join(library, "steamapps") @@ -758,7 +745,6 @@ STEAM_PLAY_MANIFESTS = 891390 def launch_programs(config): - """The Windows and Linux programs an app's launch options start, relative to its folder (lowercase, "/").""" launch = config.get("launch") if isinstance(config, dict) else None found = [] for option in launch.values() if isinstance(launch, dict) else (): @@ -773,7 +759,6 @@ def launch_programs(config): def launch_options(config): - """An app's launch options as Steam lists them: executable, arguments, working folder, type and oslist.""" launch = config.get("launch") if isinstance(config, dict) else None found = [] for key, option in launch.items() if isinstance(launch, dict) else (): @@ -951,7 +936,6 @@ def manifest_flags(tokens): def tool_downloads(steam_root): - """(app, "install" or "update") for each tool the client has yet to install or bring up to date.""" wanted = [] for app in REQUIRED_TOOLS: tokens = app_manifest(steam_root, app) @@ -1247,7 +1231,6 @@ def applied_game_requests(requests, overrides, state): def requested_games(requests, catalog, runnable=None): - """App id -> requested tool, None for inherit, or DEFERRED_GAME_TOOL while unavailable.""" runnable = None if runnable is None else set(runnable) resolved = {} for app, request in requests.items(): @@ -1351,7 +1334,6 @@ def read_mapping(tokens, mapping): def read_config_mapping(config_path): - """Read per-app choices without creating or rewriting the client's mapping block.""" try: with open(config_path, encoding="utf-8", errors="replace") as f: tokens = tokenize(f.read()) @@ -1374,6 +1356,20 @@ def read_config_mapping(config_path): return read_mapping(tokens, mapping + steam + 1) if mapping is not None else {} +def mapping_entry(app, tool): + return ['"%s"' % app, "{", '"name"', '"%s"' % tool, '"config"', '""', + '"priority"', '"75"' if app == "0" else '"250"', "}"] + + +def set_mapping_tool(tokens, block, tool): + end = block_end(tokens, block) + for i in range(block + 1, end): + if tokens[i] == '"name"': + tokens[i + 1] = '"%s"' % tool + return + tokens[block + 1:block + 1] = ['"name"', '"%s"' % tool] + + def set_mapping(tokens, mapping, app, tool): block = find_block(tokens[mapping + 1:], [app]) if tool is None: @@ -1382,16 +1378,40 @@ def set_mapping(tokens, mapping, app, tool): del tokens[block - 1:block_end(tokens, block) + 1] return if block is None: - tokens[mapping + 1:mapping + 1] = [ - '"%s"' % app, "{", '"name"', '"%s"' % tool, '"config"', '""', '"priority"', '"75"' if app == "0" else '"250"', "}"] + tokens[mapping + 1:mapping + 1] = mapping_entry(app, tool) return - block += mapping + 1 - end = block_end(tokens, block) - for i in range(block + 1, end): - if tokens[i] == '"name"': - tokens[i + 1] = '"%s"' % tool - return - tokens[block + 1:block + 1] = ['"name"', '"%s"' % tool] + set_mapping_tool(tokens, block + mapping + 1, tool) + + +def set_mappings(tokens, mapping, changes): + """Apply a batch with one traversal of the affected mapping entries.""" + pending = {('"%s"' % app).lower(): (app, tool) for app, tool in changes.items()} + # Non-string or aliased keys retain the single writer's sequential semantics. + if len(changes) < 2 or len(pending) != len(changes) or any(not isinstance(app, str) for app in changes): + for app, tool in changes.items(): + set_mapping(tokens, mapping, app, tool) + return + updated = [] + i = mapping + 1 + while pending and i < len(tokens) and tokens[i] != "}": + if i + 1 < len(tokens) and tokens[i + 1] == "{": + end = block_end(tokens, i + 1) + change = pending.pop(tokens[i].lower(), None) + if change is None: + updated.extend(tokens[i:end + 1]) + elif change[1] is not None: + entry = tokens[i:end + 1] + set_mapping_tool(entry, 1, change[1]) + updated.extend(entry) + i = end + 1 + else: + updated.append(tokens[i]) + i += 1 + added = [] + for app, tool in reversed(list(pending.values())): + if tool is not None: + added.extend(mapping_entry(app, tool)) + tokens[mapping + 1:i] = added + updated def steam_running(): @@ -1437,9 +1457,6 @@ def live_helper_running(directory=None): def register_default(config_path, apps=(), protect=(), default=None, catalog=None, directory=None, settle=False, picks=(), linux_tool=FEX_TOOL): - """Writes the mapping: the "0" default and every title that follows it (see plan_mapping). - With settle, the default itself is decided first (see choose_default): before the client - starts, config.vdf holds what the client last kept, menu changes included.""" with locked(directory): state = read_json(state_path("state.json", directory)) with open(config_path, encoding="utf-8", errors="replace") as f: @@ -1467,10 +1484,9 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non if settle and newest: state["own_proton"] = True if newest: - for app, name in list(current.items()): - if app != "0" and name in gone: - set_mapping(tokens, mapping, app, newest) - current[app] = newest + replacements = {app: newest for app, name in current.items() if app != "0" and name in gone} + set_mappings(tokens, mapping, replacements) + current.update(replacements) if isinstance(state.get("auto"), dict): state["auto"] = {app: newest if name in gone else name for app, name in state["auto"].items()} steam_root = os.path.dirname(os.path.dirname(os.path.abspath(config_path))) @@ -1486,8 +1502,7 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non changes, auto = plan_mapping( current, apps, names, default, followers(state, current), native, picks, overrides, managed, native_choices) - for app, tool in changes.items(): - set_mapping(tokens, mapping, app, tool) + set_mappings(tokens, mapping, changes) text = serialize(tokens) if text != serialize(tokenize(original)): write_changed(config_path, text) @@ -1503,7 +1518,6 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non def depot_build(depot): - """The build number a depot's version file starts with; 0 when there is none.""" try: with open(os.path.join(depot, "version"), encoding="utf-8", errors="replace") as f: first = f.read().split(None, 1) @@ -1513,7 +1527,6 @@ def depot_build(depot): def find_source(steam_root, sources=SOURCES): - """The first of `sources` the client has downloaded, newest across the libraries holding it.""" for name in sources: found = [os.path.join(root, "steamapps", "common", name) for root in libraries(steam_root) if os.path.isdir(os.path.join(root, "steamapps", "common", name, "files", "bin-arm64"))] @@ -1523,7 +1536,6 @@ def find_source(steam_root, sources=SOURCES): def build_tool(tool_dir, depot, sources=SOURCES, name=TOOL): - """Our own manifests and the launcher, named after `depot`. The depot is run at launch time.""" if os.path.islink(tool_dir): os.unlink(tool_dir) elif os.path.isdir(tool_dir) and set(os.listdir(tool_dir)) - set(OWN_FILES): @@ -1552,7 +1564,6 @@ def remove_tool(tool_dir): def local_tools(steam_root): - """The names of the compatibility tools installed in steam_root/compatibilitytools.d.""" names = set() tools = os.path.join(steam_root, "compatibilitytools.d") try: @@ -1571,11 +1582,6 @@ def local_tools(steam_root): def x64_repoint(steam_root, tool, live=False): - """The x86-64 client (droiddeck-steam-x64): its tools are arm64 wrappers that script makes and - its Linux titles run as Linux builds (FEX), so only the entries the client aimed at a Proton it - cannot start are repointed, to `tool`. Tools in its own compatibilitytools.d are kept: the - wrappers include proton-cachyos-*-a64, which starts with "proton" like Valve's own. - Returns the app ids repointed.""" config = os.path.join(steam_root, "config", "config.vdf") if not tool or not os.path.isfile(config): return [] @@ -1588,22 +1594,20 @@ def x64_repoint(steam_root, tool, live=False): keep = local_tools(steam_root) moved = [] current = read_mapping(tokens, mapping) - if "0" not in current: - set_mapping(tokens, mapping, "0", tool) + changes = {} if "0" in current else {"0": tool} for app, name in current.items(): named = name.lower() - # A tool named arm64 is never this client's (its wrappers are -a64), so this legacy name is always repointed. legacy = named == "droiddeck-proton-arm64" if (named.startswith("proton") or legacy) and named != tool.lower() \ and (legacy or named not in keep): - set_mapping(tokens, mapping, app, tool) + changes[app] = tool if app != "0": moved.append(app) + set_mappings(tokens, mapping, changes) text = serialize(tokens) if text != serialize(tokenize(original)): write_changed(config, text) print("steam-compatibility: x86-64 client's Proton entries point at %s" % tool) - # Steam reads a mapping changed while it runs only at its next start; the session restarts it (.bl-compat-pending). if moved and live: with open(os.path.join(os.path.expanduser("~"), ".bl-compat-pending"), "a") as f: f.write("".join("%s\n" % a for a in moved)) diff --git a/tools/linuxfs/preload/clockpause.c b/tools/linuxfs/preload/clockpause.c new file mode 100644 index 0000000000..19a1d728ab --- /dev/null +++ b/tools/linuxfs/preload/clockpause.c @@ -0,0 +1,314 @@ +#define _GNU_SOURCE +#include <dlfcn.h> +#include <errno.h> +#include <fcntl.h> +#include <linux/futex.h> +#include <pthread.h> +#include <semaphore.h> +#include <stdint.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/syscall.h> +#include <sys/timerfd.h> +#include <time.h> +#include <unistd.h> + +#if defined(__aarch64__) || defined(BL_CLOCK_ANY_ARCH) + +#ifndef CP_CTL +#define CP_CTL "/tmp/.bl-clock" +#endif +#ifndef FUTEX_LOCK_PI2 +#define FUTEX_LOCK_PI2 13 +#endif +#define CP_FDS 65536 + +static const int64_t *cp_shift; +static int cp_state; +static size_t cp_cond_byte; +static unsigned char cp_cond_mask; +static unsigned char cp_fds[CP_FDS / 8]; + +static int (*cp_gettime)(clockid_t, struct timespec *); +static int (*cp_nanosleep)(clockid_t, int, const struct timespec *, struct timespec *); +static int (*cp_cond_timedwait)(pthread_cond_t *, pthread_mutex_t *, const struct timespec *); +static int (*cp_cond_clockwait)(pthread_cond_t *, pthread_mutex_t *, clockid_t, const struct timespec *); +static int (*cp_sem_clockwait)(sem_t *, clockid_t, const struct timespec *); +static int (*cp_mutex_clocklock)(pthread_mutex_t *, clockid_t, const struct timespec *); +static int (*cp_rdlock)(pthread_rwlock_t *, clockid_t, const struct timespec *); +static int (*cp_wrlock)(pthread_rwlock_t *, clockid_t, const struct timespec *); +static int (*cp_join)(pthread_t, void **, clockid_t, const struct timespec *); +static int (*cp_tfd_create)(int, int); +static int (*cp_tfd_settime)(int, int, const struct itimerspec *, struct itimerspec *); + +static void *cp_real(const char *name) { + return dlsym(RTLD_NEXT, name); +} + +#define CP_REAL(var, name) (var ? var : (var = cp_real(name))) + +static int cp_find_cond_bit(void) { + pthread_condattr_t attr; + pthread_cond_t mono, real; + const unsigned char *a = (const unsigned char *)&mono, *b = (const unsigned char *)ℜ + int found = 0; + memset(&mono, 0, sizeof(mono)); + memset(&real, 0, sizeof(real)); + if (pthread_condattr_init(&attr) != 0) return 0; + if (pthread_condattr_setclock(&attr, CLOCK_MONOTONIC) == 0 && pthread_cond_init(&mono, &attr) == 0) { + if (pthread_cond_init(&real, NULL) == 0) { + for (size_t i = 0; i < sizeof(pthread_cond_t); i++) { + unsigned char diff = a[i] ^ b[i]; + if (!diff) continue; + if (found || (diff & (diff - 1))) { + found = -1; + break; + } + cp_cond_byte = i; + cp_cond_mask = diff; + found = 1; + } + pthread_cond_destroy(&real); + } + pthread_cond_destroy(&mono); + } + pthread_condattr_destroy(&attr); + return found == 1; +} + +static void cp_init(void) { + struct stat st; + void *map; + int fd; + if (strcmp(program_invocation_short_name, "plasmashell") != 0) return; + if (!cp_find_cond_bit()) return; + fd = open(CP_CTL, O_RDONLY | O_CLOEXEC); + if (fd < 0) return; + if (fstat(fd, &st) != 0 || st.st_size < (off_t)sizeof(int64_t)) { + close(fd); + return; + } + map = mmap(NULL, sizeof(int64_t), PROT_READ, MAP_SHARED, fd, 0); + close(fd); + if (map != MAP_FAILED) __atomic_store_n(&cp_shift, (const int64_t *)map, __ATOMIC_RELEASE); +} + +static int64_t cp_offset(void) { + const int64_t *shift; + int state = __atomic_load_n(&cp_state, __ATOMIC_ACQUIRE); + if (state == 0) { + int expected = 0; + if (__atomic_compare_exchange_n(&cp_state, &expected, 1, 0, __ATOMIC_ACQ_REL, __ATOMIC_ACQUIRE)) { + cp_init(); + __atomic_store_n(&cp_state, 2, __ATOMIC_RELEASE); + } + return 0; + } + if (state != 2) return 0; + shift = __atomic_load_n(&cp_shift, __ATOMIC_ACQUIRE); + if (!shift) return 0; + int64_t value = __atomic_load_n(shift, __ATOMIC_RELAXED); + return value > 0 ? value : 0; +} + +__attribute__((constructor)) static void cp_start(void) { + cp_offset(); +} + +static int cp_mono(clockid_t clock) { + return clock == CLOCK_MONOTONIC || clock == CLOCK_MONOTONIC_RAW || clock == CLOCK_MONOTONIC_COARSE; +} + +static void cp_move(struct timespec *ts, int64_t ns) { + int64_t total = (int64_t)ts->tv_nsec + ns % 1000000000LL; + ts->tv_sec += (time_t)(ns / 1000000000LL); + while (total < 0) { + total += 1000000000LL; + ts->tv_sec--; + } + while (total >= 1000000000LL) { + total -= 1000000000LL; + ts->tv_sec++; + } + ts->tv_nsec = (long)total; +} + +static const struct timespec *cp_later(const struct timespec *ts, struct timespec *out, int64_t shift) { + if (!ts || !shift) return ts; + *out = *ts; + cp_move(out, shift); + return out; +} + +static void cp_mark(int fd, int mono) { + if (fd < 0 || fd >= CP_FDS) return; + if (mono) __atomic_or_fetch(&cp_fds[fd / 8], (unsigned char)(1u << (fd % 8)), __ATOMIC_RELAXED); + else __atomic_and_fetch(&cp_fds[fd / 8], (unsigned char)~(1u << (fd % 8)), __ATOMIC_RELAXED); +} + +static int cp_marked(int fd) { + return fd >= 0 && fd < CP_FDS && (__atomic_load_n(&cp_fds[fd / 8], __ATOMIC_RELAXED) & (1u << (fd % 8))); +} + +static int cp_cond_mono(const pthread_cond_t *cond) { + return (((const volatile unsigned char *)cond)[cp_cond_byte] & cp_cond_mask) != 0; +} + +int clock_gettime(clockid_t clock, struct timespec *ts) { + if (!CP_REAL(cp_gettime, "clock_gettime")) { + errno = ENOSYS; + return -1; + } + int rc = cp_gettime(clock, ts); + if (rc == 0 && cp_mono(clock)) { + int64_t shift = cp_offset(); + if (shift) cp_move(ts, -shift); + } + return rc; +} + +int clock_nanosleep(clockid_t clock, int flags, const struct timespec *req, struct timespec *rem) { + struct timespec moved; + if (!CP_REAL(cp_nanosleep, "clock_nanosleep")) return ENOSYS; + if ((flags & TIMER_ABSTIME) && cp_mono(clock)) req = cp_later(req, &moved, cp_offset()); + return cp_nanosleep(clock, flags, req, rem); +} + +int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_cond_timedwait, "pthread_cond_timedwait")) return ENOSYS; + int64_t shift = cp_offset(); + if (shift && cp_cond_mono(cond)) abstime = cp_later(abstime, &moved, shift); + return cp_cond_timedwait(cond, mutex, abstime); +} + +int pthread_cond_clockwait(pthread_cond_t *cond, pthread_mutex_t *mutex, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_cond_clockwait, "pthread_cond_clockwait")) return ENOSYS; + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_cond_clockwait(cond, mutex, clock, abstime); +} + +int sem_clockwait(sem_t *sem, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_sem_clockwait, "sem_clockwait")) { + errno = ENOSYS; + return -1; + } + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_sem_clockwait(sem, clock, abstime); +} + +int pthread_mutex_clocklock(pthread_mutex_t *mutex, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_mutex_clocklock, "pthread_mutex_clocklock")) return ENOSYS; + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_mutex_clocklock(mutex, clock, abstime); +} + +int pthread_rwlock_clockrdlock(pthread_rwlock_t *lock, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_rdlock, "pthread_rwlock_clockrdlock")) return ENOSYS; + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_rdlock(lock, clock, abstime); +} + +int pthread_rwlock_clockwrlock(pthread_rwlock_t *lock, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_wrlock, "pthread_rwlock_clockwrlock")) return ENOSYS; + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_wrlock(lock, clock, abstime); +} + +int pthread_clockjoin_np(pthread_t thread, void **result, clockid_t clock, const struct timespec *abstime) { + struct timespec moved; + if (!CP_REAL(cp_join, "pthread_clockjoin_np")) return ENOSYS; + if (cp_mono(clock)) abstime = cp_later(abstime, &moved, cp_offset()); + return cp_join(thread, result, clock, abstime); +} + +int timerfd_create(int clock, int flags) { + if (!CP_REAL(cp_tfd_create, "timerfd_create")) { + errno = ENOSYS; + return -1; + } + int fd = cp_tfd_create(clock, flags); + cp_mark(fd, cp_mono(clock)); + return fd; +} + +static const struct itimerspec *cp_timer(int fd, int flags, const struct itimerspec *value, struct itimerspec *out) { + int64_t shift; + if (!value || !(flags & TFD_TIMER_ABSTIME) || !cp_marked(fd)) return value; + if ((value->it_value.tv_sec == 0 && value->it_value.tv_nsec == 0) || !(shift = cp_offset())) return value; + *out = *value; + cp_move(&out->it_value, shift); + return out; +} + +int timerfd_settime(int fd, int flags, const struct itimerspec *value, struct itimerspec *old) { + struct itimerspec moved; + if (!CP_REAL(cp_tfd_settime, "timerfd_settime")) { + errno = ENOSYS; + return -1; + } + return cp_tfd_settime(fd, flags, cp_timer(fd, flags, value, &moved), old); +} + +__attribute__((visibility("hidden"))) int bl_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) { + struct timespec moved; + struct itimerspec timer; + int64_t shift; + if (number == SYS_clock_gettime) { + *ret = real(number, args[0], args[1]); + if (*ret == 0 && args[1] && cp_mono((clockid_t)args[0]) && (shift = cp_offset())) + cp_move((struct timespec *)args[1], -shift); + return 1; + } + if (number == SYS_timerfd_create) { + *ret = real(number, args[0], args[1]); + cp_mark((int)*ret, cp_mono((clockid_t)args[0])); + return 1; + } + if (number == SYS_timerfd_settime) { + const struct itimerspec *value = cp_timer((int)args[0], (int)args[1], (const struct itimerspec *)args[2], &timer); + if (value == (const struct itimerspec *)args[2]) return 0; + *ret = real(number, args[0], args[1], (long)value, args[3]); + return 1; + } + if (number == SYS_clock_nanosleep) { + if (!((int)args[1] & TIMER_ABSTIME) || !cp_mono((clockid_t)args[0]) || !args[2] || !(shift = cp_offset())) return 0; + *ret = real(number, args[0], args[1], (long)cp_later((const struct timespec *)args[2], &moved, shift), args[3]); + return 1; + } + if (number == SYS_futex) { + int op = (int)args[1]; + int cmd = op & FUTEX_CMD_MASK; + if (op & FUTEX_CLOCK_REALTIME) return 0; + if (cmd != FUTEX_WAIT_BITSET && cmd != FUTEX_WAIT_REQUEUE_PI && cmd != FUTEX_LOCK_PI2) return 0; + if (!args[3] || !(shift = cp_offset())) return 0; + *ret = real(number, args[0], args[1], args[2], (long)cp_later((const struct timespec *)args[3], &moved, shift), args[4], args[5]); + return 1; + } +#ifdef SYS_futex_waitv + if (number == SYS_futex_waitv) { + if (!args[3] || (clockid_t)args[4] != CLOCK_MONOTONIC || !(shift = cp_offset())) return 0; + *ret = real(number, args[0], args[1], args[2], (long)cp_later((const struct timespec *)args[3], &moved, shift), args[4]); + return 1; + } +#endif + return 0; +} + +#else + +__attribute__((visibility("hidden"))) int bl_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) { + (void)number; + (void)args; + (void)real; + (void)ret; + return 0; +} + +#endif diff --git a/tools/linuxfs/preload/drm.c b/tools/linuxfs/preload/drm.c index 101512387f..37784c3d94 100644 --- a/tools/linuxfs/preload/drm.c +++ b/tools/linuxfs/preload/drm.c @@ -5,6 +5,7 @@ #include <pthread.h> #include <stdint.h> #include <stdlib.h> +#include <sys/file.h> #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/syscall.h> @@ -34,7 +35,8 @@ static int is_kgsl(int fd) { struct stat st; pthread_mutex_lock(&lock); if (kgsl_state == 0) { - kgsl_state = stat("/dev/kgsl-3d0", &st) == 0 ? 1 : -1; + const char *standin = getenv("BL_DRM_STANDIN"); + kgsl_state = stat("/dev/kgsl-3d0", &st) == 0 || (standin && *standin && stat(standin, &st) == 0) ? 1 : -1; kgsl_dev = st.st_rdev; } pthread_mutex_unlock(&lock); @@ -49,18 +51,42 @@ static void *real(const char *name) { return fn; } +static int same_by_flock(int a, int b) { + struct stat sa, sb; + if (fstat(a, &sa) || fstat(b, &sb) || sa.st_dev != sb.st_dev || sa.st_ino != sb.st_ino || + flock(a, LOCK_EX | LOCK_NB)) { + return 0; + } + int same = flock(b, LOCK_EX | LOCK_NB) == 0; + flock(a, LOCK_UN); + return same; +} + static int same_file_description(int a, int b) { if (a == b) { return 1; } -#ifdef SYS_kcmp int saved_errno = errno; - long ret = syscall(SYS_kcmp, getpid(), getpid(), 0 , a, b); - errno = saved_errno; - return ret == 0; -#else - return 0; + int ret = -1; +#ifdef SYS_kcmp + static int kcmp_missing; + if (!kcmp_missing) { + long k = syscall(SYS_kcmp, getpid(), getpid(), 0, a, b); + if (k >= 0) { + ret = k == 0; + } else if (errno == ENOSYS || errno == EPERM) { + kcmp_missing = 1; + } else { + ret = 0; + } + } #endif + if (ret < 0) { + const char *standin = getenv("BL_DRM_STANDIN"); + ret = standin && *standin ? same_by_flock(a, b) : 0; + } + errno = saved_errno; + return ret; } static int find_handle_locked(int fd, uint32_t handle) { diff --git a/tools/linuxfs/preload/inputudev.c b/tools/linuxfs/preload/inputudev.c index 4960c382da..eb78ce1efb 100644 --- a/tools/linuxfs/preload/inputudev.c +++ b/tools/linuxfs/preload/inputudev.c @@ -178,10 +178,6 @@ static int caller_is_winebus(void *caller) { return strstr(info.dli_fname, "winebus.so") != NULL; } -/* Wine's HID haptics give every XInput rumble a 1000 ms cutoff and xinput only writes on a change, - * but XInput motors hold their speed until the next XInputSetState; evdev's length 0 holds until - * stopped. Only this library, preloaded first, sees winebus as the caller. The length is put back - * because winebus compares its copy with the next state to decide whether to upload again. */ __attribute__((visibility("hidden"))) int bl_winebus_rumble_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, void *caller, int *rc) { diff --git a/tools/linuxfs/preload/kgslpoll.c b/tools/linuxfs/preload/kgslpoll.c index 841c049ee1..adc6fb28c4 100644 --- a/tools/linuxfs/preload/kgslpoll.c +++ b/tools/linuxfs/preload/kgslpoll.c @@ -1,28 +1,112 @@ #define _GNU_SOURCE #include <errno.h> #include <stdint.h> +#include <stdio.h> #include <stdlib.h> #include <sys/ioctl.h> -#define KGSL_IOC_TYPE 0x09 -#define KGSL_TIMESTAMP_RETIRED 0x00000002 +#include "../../quest/kgsl_compat.h" -struct kgsl_device_waittimestamp_ctxtid { - unsigned int context_id; - unsigned int timestamp; - unsigned int timeout; -}; +#define KGSL_CONTEXTS 1024 -struct kgsl_cmdstream_readtimestamp_ctxtid { - unsigned int context_id; - unsigned int type; - unsigned int timestamp; -}; +static struct { + uint32_t submitted; + uint32_t retired; + int owner; +} contexts[KGSL_CONTEXTS]; -#define IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID \ - _IOW(KGSL_IOC_TYPE, 0x7, struct kgsl_device_waittimestamp_ctxtid) -#define IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_CTXTID \ - _IOWR(KGSL_IOC_TYPE, 0x16, struct kgsl_cmdstream_readtimestamp_ctxtid) +static void report_denied(unsigned long request, int error) { + static unsigned reports; + int saved = errno; + + if (__atomic_fetch_add(&reports, 1, __ATOMIC_RELAXED) < 8) + fprintf(stderr, "[QuestKGSL] ioctl 0x%lx refused, errno=%d\n", request & 0xff, error); + errno = saved; +} + +static void note_submit(unsigned int context_id, unsigned int timestamp) { + uint32_t known; + + if (context_id >= KGSL_CONTEXTS) return; + known = __atomic_load_n(&contexts[context_id].submitted, __ATOMIC_RELAXED); + while ((int32_t)(timestamp - known) > 0 && + !__atomic_compare_exchange_n(&contexts[context_id].submitted, &known, timestamp, 1, + __ATOMIC_RELAXED, __ATOMIC_RELAXED)) { + } +} + +static int wait_retired(int (*real)(int, unsigned long, void *), int fd, uint32_t id, uint32_t timestamp) { + /* KGSL reads a timeout of 0 as wait forever. */ + struct kgsl_device_waittimestamp_ctxtid wait = {.context_id = id, .timestamp = timestamp, .timeout = 1}; + + if (real(fd, IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID, &wait) == 0) return 0; + return errno == ETIMEDOUT || errno == ETIME || errno == EINTR || errno == EAGAIN ? 1 : -1; +} + +/* shortcut: an unfinished timestamp sleeps a jiffy per poll, read the memstore instead if Quest's mmap of it is proven */ +static int read_retired(int (*real)(int, unsigned long, void *), int fd, + struct kgsl_cmdstream_readtimestamp_ctxtid *read) { + uint32_t id = read->context_id; + uint32_t timestamp, submitted; + int result; + + if (read->type != KGSL_TIMESTAMP_RETIRED || id >= KGSL_CONTEXTS || + __atomic_load_n(&contexts[id].owner, __ATOMIC_RELAXED) != fd + 1) + return -1; + timestamp = __atomic_load_n(&contexts[id].retired, __ATOMIC_RELAXED); + submitted = __atomic_load_n(&contexts[id].submitted, __ATOMIC_RELAXED); + /* KGSL checks a context's owner on every wait, which catches one that died with a reused descriptor. */ + if (timestamp == submitted && wait_retired(real, fd, id, timestamp) < 0) return -1; + while (timestamp != submitted) { + result = wait_retired(real, fd, id, timestamp + 1); + if (result < 0) return -1; + if (result > 0) break; + timestamp++; + __atomic_store_n(&contexts[id].retired, timestamp, __ATOMIC_RELAXED); + } + read->timestamp = timestamp; + return 0; +} + +/* Quest refuses some KGSL ioctls, and Mesa 27 turns a failed timestamp read into VK_ERROR_UNKNOWN. */ +__attribute__((visibility("hidden"))) void bl_kgsl_track(int (*real)(int, unsigned long, void *), + int fd, unsigned long request, void *arg, + int *rc) { + int saved = errno; + + if (arg == NULL) return; + if (*rc == 0) { + if (request == IOCTL_KGSL_GPU_COMMAND) { + const struct kgsl_gpu_command *submit = arg; + note_submit(submit->context_id, submit->timestamp); + } else if (request == IOCTL_KGSL_GPU_AUX_COMMAND) { + const struct kgsl_gpu_aux_command *submit = arg; + note_submit(submit->context_id, submit->timestamp); + } else if (request == IOCTL_KGSL_DRAWCTXT_CREATE) { + const struct kgsl_drawctxt_create *create = arg; + if (create->drawctxt_id < KGSL_CONTEXTS) { + __atomic_store_n(&contexts[create->drawctxt_id].submitted, 0, __ATOMIC_RELAXED); + __atomic_store_n(&contexts[create->drawctxt_id].retired, 0, __ATOMIC_RELAXED); + /* User timestamps can leave gaps that would take one wait per integer, so their reads stay failed. */ + __atomic_store_n(&contexts[create->drawctxt_id].owner, + create->flags & KGSL_CONTEXT_USER_GENERATED_TS ? 0 : fd + 1, __ATOMIC_RELAXED); + } + } else if (request == IOCTL_KGSL_DRAWCTXT_DESTROY) { + const struct kgsl_drawctxt_destroy *destroy = arg; + if (destroy->drawctxt_id < KGSL_CONTEXTS) + __atomic_store_n(&contexts[destroy->drawctxt_id].owner, 0, __ATOMIC_RELAXED); + } + return; + } + if (_IOC_TYPE(request) == KGSL_IOC_TYPE && (saved == EACCES || saved == EPERM || + request == IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_CTXTID)) + report_denied(request, saved); + if (request != IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_CTXTID || saved == EBADF) return; + if (read_retired(real, fd, arg) == 0) + *rc = 0; + else if (errno != saved) + report_denied(IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID, errno); +} static int enabled(void) { static int cached = -1; diff --git a/tools/linuxfs/preload/netif.c b/tools/linuxfs/preload/netif.c index 872a877e11..308af34437 100644 --- a/tools/linuxfs/preload/netif.c +++ b/tools/linuxfs/preload/netif.c @@ -404,6 +404,8 @@ void bl_kgsl_chip_id_fixup(unsigned long request, void *arg, int rc); #include "../../quest/kgsl_compat.h" int bl_kgsl_poll(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); +void bl_kgsl_track(int (*real)(int, unsigned long, void *), int fd, unsigned long request, + void *arg, int *rc) __attribute__((visibility("hidden"))); int bl_ntsync_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); int bl_drm_gem_close(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); int bl_venc_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); @@ -430,6 +432,7 @@ int ioctl(int fd, unsigned long request, ...) { if (bl_winebus_rumble_ioctl(real, fd, request, arg, __builtin_return_address(0), &rc)) return rc; if (bl_writewatch_ioctl(real, fd, request, arg, &rc)) return rc; if (!bl_kgsl_poll(real, fd, request, arg, &rc)) rc = quest_kgsl_ioctl(real, fd, request, arg); + bl_kgsl_track(real, fd, request, arg, &rc); bl_kgsl_chip_id_fixup(request, arg, rc); if (arg == NULL || !is_link_query(request)) return rc; int saved = errno; diff --git a/tools/linuxfs/preload/ntsync.c b/tools/linuxfs/preload/ntsync.c index 4fa0d6c2c5..7454ce15d6 100644 --- a/tools/linuxfs/preload/ntsync.c +++ b/tools/linuxfs/preload/ntsync.c @@ -1467,7 +1467,14 @@ int close(int fd) { bl_vdec_closed(fd); uint64_t *t = __atomic_load_n(&ns_fdt, __ATOMIC_ACQUIRE); if (t && fd >= 0 && fd < NS_FDS && __atomic_load_n(&t[fd], __ATOMIC_ACQUIRE)) ns_forget(fd); - return ns_close_fd(fd); + int saved = errno; + int mode = fd >= 0 ? fcntl(fd, F_GETFL) : -1; + int r = ns_close_fd(fd); + if (r < 0 && errno == EIO && mode >= 0 && (mode & O_ACCMODE) == O_RDONLY) { + errno = saved; + return 0; + } + return r; } int dup2(int oldfd, int newfd) { diff --git a/tools/linuxfs/preload/pulseguard.c b/tools/linuxfs/preload/pulseguard.c index c3011df67d..d9b4e7ef08 100644 --- a/tools/linuxfs/preload/pulseguard.c +++ b/tools/linuxfs/preload/pulseguard.c @@ -1,5 +1,3 @@ -/* In Deck mode (-steamos3) the x86-64 client's SteamOS audio manager passes libpulse the NULL operation of a - * failed request, and libpulse aborts on it ("Assertion 'o' failed ... pa_operation_get_state()"). */ #if defined(__x86_64__) || defined(__i386__) #define _GNU_SOURCE #include <dlfcn.h> @@ -9,7 +7,6 @@ typedef struct pa_operation pa_operation; #define PA_OPERATION_CANCELLED 2 -/* A libpulse loaded with RTLD_LOCAL (Wine's winepulse.so) is not in RTLD_NEXT's scope. */ static void *libpulse(const char *name) { void *fn = dlsym(RTLD_NEXT, name); if (!fn) { diff --git a/tools/linuxfs/preload/robust.c b/tools/linuxfs/preload/robust.c index 74324f5453..377b895672 100644 --- a/tools/linuxfs/preload/robust.c +++ b/tools/linuxfs/preload/robust.c @@ -23,7 +23,6 @@ #define BL_RESOLVE_BENEATH 0x08 #define BL_RESOLVE_IN_ROOT 0x10 -// The kernel's MAXSYMLINKS. #define BL_MAX_SYMLINKS 40 #define BL_PROC_ROOT_INO 1 @@ -107,7 +106,6 @@ void *dlopen(const char *filename, int flags) { } const char *basename = filename ? strrchr(filename, '/') : NULL; basename = basename ? basename + 1 : filename; - // Steam's deep binding bypasses the robust-list shim under PRoot. if (basename && strcmp(basename, "vrclient.so") == 0) { flags &= ~RTLD_DEEPBIND; } @@ -148,7 +146,6 @@ static struct robust_list_head *thread_robust_head(void) { return head; } -// Magic links are procfs links below a process's directory; procfs's root holds only plain ones (self, thread-self, mounts). static int is_magic_link(int dirfd, char *link, size_t parent_len) { int fd = (int)path_open(dirfd, link, O_PATH | O_NOFOLLOW | O_CLOEXEC, 0L); if (fd < 0) { @@ -168,7 +165,6 @@ static int is_magic_link(int dirfd, char *link, size_t parent_len) { return result != 0 || parent.st_ino != BL_PROC_ROOT_INO; } -// RESOLVE_IN_ROOT walked one component at a time: absolute symlinks restart at dirfd and ".." stops there. static long openat_in_root(int dirfd, const char *path, int flags, long mode) { char resolved[PATH_MAX]; char pending[PATH_MAX]; @@ -177,7 +173,6 @@ static long openat_in_root(int dirfd, const char *path, int flags, long mode) { int have_root = 0; int root_on_procfs = 0; dev_t root_dev = 0; - // O_NOFOLLOW and O_CREAT | O_EXCL leave a final symlink alone, unless a trailing slash follows it. int nofollow = (flags & O_NOFOLLOW) || (flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL); const char *rest = path; for (;;) { @@ -241,7 +236,6 @@ static long openat_in_root(int dirfd, const char *path, int flags, long mode) { have_root = 1; } if ((st.st_dev != root_dev || root_on_procfs) && is_magic_link(dirfd, resolved, resolved_len)) { - // RESOLVE_IN_ROOT refuses magic links. errno = EXDEV; return -1; } @@ -359,6 +353,7 @@ int bl_openat2(int dirfd, const char *path, void *how, size_t size) { } int bl_writewatch_syscall(long number, const long *args, long (*real)(long, ...), long *rc) __attribute__((visibility("hidden"))); +int bl_clock_syscall(long number, const long *args, long (*real)(long, ...), long *ret) __attribute__((visibility("hidden"))); long syscall(long number, ...) { va_list ap; @@ -385,6 +380,9 @@ long syscall(long number, ...) { if (!real_syscall) { real_syscall = (long (*)(long, ...)) dlsym(RTLD_NEXT, "syscall"); } + if (bl_clock_syscall(number, args, real_syscall, &handled)) { + return handled; + } if (bl_writewatch_syscall(number, args, real_syscall, &handled)) { return handled; } diff --git a/tools/linuxfs/preload/rptouch.c b/tools/linuxfs/preload/rptouch.c index 7d39f286e0..b8eb5ea90b 100644 --- a/tools/linuxfs/preload/rptouch.c +++ b/tools/linuxfs/preload/rptouch.c @@ -1,6 +1,3 @@ -/* Steam's Linux Remote Play host has no touch injection: client touches arrive as an XTest mouse (absolute - * motion plus button 1). While a stream holds the encoder, those become touches into gamescope's own touch - * input, as a finger on the device screen would. */ #define _GNU_SOURCE #include <dlfcn.h> #include <pthread.h> diff --git a/tools/linuxfs/preload/subreaper.c b/tools/linuxfs/preload/subreaper.c new file mode 100644 index 0000000000..90ed7548d3 --- /dev/null +++ b/tools/linuxfs/preload/subreaper.c @@ -0,0 +1,24 @@ +/* tools/linuxfs/preload/subreaper.c + * + * Mark every process that loads libblsession.so as a child subreaper. + * + * wlroots starts Xwayland with a double fork: gamescope -> middle process + * (exits immediately) -> Xwayland. With no subreaper in the tree, Xwayland + * is reparented to pid 1 and becomes an orphan. On some vendor kernels + * (observed on Meizu / Flyme 12) an orphan reaper SIGKILLs it in that window, + * which makes gamescope wait forever in wlserver_init() and the UI hangs on + * "Starting display and audio". + * + * With PR_SET_CHILD_SUBREAPER the reparent target becomes the nearest marked + * ancestor instead of init, so the orphan event never happens. + * + * Harmless for processes that do not fork, and cheap (one syscall at load). + */ +#define _GNU_SOURCE +#include <sys/prctl.h> + +__attribute__((constructor)) +static void bl_session_set_subreaper(void) +{ + (void)prctl(PR_SET_CHILD_SUBREAPER, 1); +} diff --git a/tools/linuxfs/preload/udevmon.c b/tools/linuxfs/preload/udevmon.c index 33baf2bdac..f0e171a863 100644 --- a/tools/linuxfs/preload/udevmon.c +++ b/tools/linuxfs/preload/udevmon.c @@ -195,8 +195,8 @@ static unsigned murmur_hash2(const char *key, size_t len) { len -= 4; } switch (len) { - case 3: h ^= data[2] << 16; /* fallthrough */ - case 2: h ^= data[1] << 8; /* fallthrough */ + case 3: h ^= data[2] << 16; __attribute__((fallthrough)); + case 2: h ^= data[1] << 8; __attribute__((fallthrough)); case 1: h ^= data[0]; h *= m; } h ^= h >> 13; diff --git a/tools/linuxfs/preload/venc.c b/tools/linuxfs/preload/venc.c index 9480e88126..92c60c3bff 100644 --- a/tools/linuxfs/preload/venc.c +++ b/tools/linuxfs/preload/venc.c @@ -1,4 +1,3 @@ -/* /dev/video-enc0 for Steam's Remote Play V4L2 encoder stage, backed by the app's MediaCodec encoder. */ #define _GNU_SOURCE #include <dlfcn.h> #include <errno.h> @@ -587,7 +586,6 @@ __attribute__((visibility("hidden"))) void bl_venc_closed(int fd) { vn_free_queue(&v->raw); vn_free_queue(&v->coded); v->used = 0; - /* A forked child closing its inherited copy must not end the stream for the parent. */ if (__atomic_sub_fetch(&vn_open_count, 1, __ATOMIC_RELEASE) == 0 && v->owner == getpid()) vn_marker(0); pthread_mutex_unlock(&vn_lock); } diff --git a/tools/linuxfs/preload/zram.c b/tools/linuxfs/preload/zram.c index 8f31d19eb1..af62c29413 100644 --- a/tools/linuxfs/preload/zram.c +++ b/tools/linuxfs/preload/zram.c @@ -126,8 +126,6 @@ static void zr_walk(int compress) { zr_sys(SYS_close, maps); } -// Before it stops a session for suspend, the app waits for <ZR_CTL>.ack.<pid> to appear (the handler -// runs here, not one a program installed over it) and then to hold a byte (the page-out finished). static void zr_ack(int done) { static const char suffix[] = ".ack."; char path[sizeof(ZR_CTL) + sizeof(suffix) + 20]; diff --git a/tools/packs/build.sh b/tools/packs/build.sh index b6089111cb..41dc7e03c0 100755 --- a/tools/packs/build.sh +++ b/tools/packs/build.sh @@ -1,13 +1,4 @@ #!/usr/bin/env bash -# Builds the add-on packs the app downloads on first use instead of shipping in the APK: -# proot.tar.zst the patched proot and its loader (built by tools/proot) -# directaudio.tar.zst the Wine DirectAudio drivers (fetched by tools/directaudio/fetch.sh) -# tracking.tar.zst hand-tracking models and the OpenCV/MediaPipe native libraries -# xbox.tar.zst the Xbox backend (built by tools/xbox) for /usr/local/lib/droiddeck-xbox -# comet.tar.zst the GOG Galaxy companion (built by tools/comet) for /usr/local/lib/droiddeck-comet -# Only CI publishes these (.github/workflows/publish-packs.yml); the APK built from the same -# directory pins each pack's SHA-256. -# Usage: tools/packs/build.sh <out-dir> set -euo pipefail here=$(cd "$(dirname "$0")" && pwd) diff --git a/tools/packs/proot/release.env b/tools/packs/proot/release.env index 7a23b27997..6d88f886ad 100644 --- a/tools/packs/proot/release.env +++ b/tools/packs/proot/release.env @@ -1,6 +1,2 @@ -# Published proot pack for a build that did not compile libproot.so into the APK. -# CI builds embed the binary and publish their own pack; this pin is what a source -# build downloads. Tag on DroidDeck-Components: pack-proot-<first 16 hex of the digest>. -# Update both lines when source builds should pick up a newer proot. PROOT_PACK_SHA256=5a2b7284e6357f88a14a790abd54e61effbe5f202c63b6aaba9b974c559649c3 PROOT_PACK_SIZE=96643 diff --git a/tools/pipewire/assemble.sh b/tools/pipewire/assemble.sh index a9adb6c26e..224b75c390 100755 --- a/tools/pipewire/assemble.sh +++ b/tools/pipewire/assemble.sh @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# assemble.sh <extracted packages root> <out.tzst> -# Packs the video side of SteamOS's PipeWire and WirePlumber: no audio plugins, no JACK. set -euo pipefail src=$1 out=$2 diff --git a/tools/prepare_windows_runtime.py b/tools/prepare_windows_runtime.py index 831fc7d7de..886deb2a0e 100644 --- a/tools/prepare_windows_runtime.py +++ b/tools/prepare_windows_runtime.py @@ -37,8 +37,6 @@ DONOR_CERT_SHA256 = 'b241ea7d77822d39b89d3227e06f3ecf62adec6cbfd38ad06196787991b DONOR_URL = 'https://github.com/Droid-Deck/DroidDeck-CI/releases/download/pr-732/DroidDeck-PR.732-bdf876d.apk' AUDITED_SOURCE = '1dc66bf9be64a404c80400049c0803614814461b' LOCAL_BUILD_PLUMBING = {'app/build.gradle', 'tools/release/runtime_inputs.py'} -# These Android-only inputs are compiled by Gradle, never taken from the donor. -# Keep this list explicit so unrelated native or Linux runtime edits still fail. LOCAL_ANDROID_SOURCES = {'app/src/main/cpp/CMakeLists.txt', 'app/src/main/cpp/viture/sdk_bridge.cpp', 'app/src/main/cpp/viture/display_modes.h', @@ -51,8 +49,6 @@ LOCAL_ANDROID_SOURCES = {'app/src/main/cpp/CMakeLists.txt', 'app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c', 'app/src/main/cpp/waylandcomp/src/spatialpose.c', 'app/src/main/cpp/waylandcomp/CMakeLists.txt'} -# These audited helper updates are copied from this checkout by runtime.record(). -# Permit them only while source_assets() still guarantees that staging path. LOCAL_SESSION_HELPERS = {'tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat', 'tools/linuxfs/overlay/usr/local/bin/droiddeck-steamvr'} VR_PREFIX = 'assets/linuxfs/usr/local/lib/droiddeck-vr/' @@ -83,7 +79,6 @@ def changed(base, target=None): def check_sources(): - # A branch label alone is insufficient: CI merged this main commit into it. if git('merge-tree', '--write-tree', DONOR_PR_SOURCE, DONOR_MAIN_SOURCE).decode().splitlines()[0] != DONOR_TREE: raise ValueError('The donor CI merge does not match the audited source tree') helper_sources = {path.relative_to(ROOT).as_posix() for path in source_assets()} @@ -187,8 +182,6 @@ def validate_tracked_assets(package, llvm_strip): if prefix != 'app/src/main/jniLibs/': raise ValueError('Tracked bytes differ from the donor: ' + name + ' (text inputs must be checked out with LF)') - # AGP strips prebuilt JNI libraries during packaging. Verify that - # deterministic transformation on a temporary copy, never the source. with tempfile.TemporaryDirectory(prefix='droiddeck-strip-check-') as temp: stripped = Path(temp) / 'library.so' subprocess.run([str(llvm_strip), '--strip-unneeded', '-o', str(stripped), @@ -264,7 +257,6 @@ def prepare(apk, rebuilt_dir, gamescope, llvm_strip=None, rebuilt_vr=None, vk_in checked_output(target) plan[target] = data origins[target] = 'VR rebuilt from current source; source and output checksums verified' - # Do not silently retain unrelated files from a prior preparation. expected = set(plan) | {'app/src/main/' + name for name in helper_assets} for tree in ('linuxfs', 'directaudio', 'droiddeck-esync'): base = ROOT / 'app/src/main/assets' / tree diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index c5924c0fe2..dbf1b959b5 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -127,6 +127,11 @@ Prototype (inert unless `PROOT_FASTPATH` is set; see `docs/development/proot-per IDs wrap (32768 on many Android kernels) a new child can get that ID, and PRoot aborted on the assertion that a new child has no state, ending the whole session. Chromium-based programs such as Steam's client do this. PRoot now retires the stale entry and sets the new child up from scratch. +- `0024-execveat-absolute-path.patch` - `execveat` with an absolute path and neither `AT_EMPTY_PATH` + nor `AT_SYMLINK_NOFOLLOW` runs as `execve`. The kernel ignores the directory descriptor for such a + path, and PRoot refused the call unless the descriptor was `AT_FDCWD`. FEX starts every child of an + emulated program with `execveat(fd, "/proc/self/exe")`, so x86 programs in a Flatpak sandbox, which + does not carry the session's preloads, could not start other programs. Old kernel fixes: diff --git a/tools/proot/bench/checks.h b/tools/proot/bench/checks.h index 2b0f9064ad..be60c7cb7b 100644 --- a/tools/proot/bench/checks.h +++ b/tools/proot/bench/checks.h @@ -1,7 +1,6 @@ #ifndef DROIDDECK_BENCH_CHECKS_H #define DROIDDECK_BENCH_CHECKS_H -/* Benchmark assertions execute the operations being measured. */ #ifdef NDEBUG #undef NDEBUG #endif diff --git a/tools/proot/bench/equiv2.py b/tools/proot/bench/equiv2.py index b267ad121e..d8eb956a5c 100644 --- a/tools/proot/bench/equiv2.py +++ b/tools/proot/bench/equiv2.py @@ -1,9 +1,3 @@ -"""Fast path equivalence, part two: symlinked directories (Wine's dosdevices), "..", trailing -slashes, realpath/getcwd, the write family, Unix sockets, xattrs, statfs, inotify and fstat. - -Run under proot with and without the fast path (run-device.sh fpoff / fastpath) and diff the -output: every line must match. Builds its own tree under /root/fx and /mnt/droiddeck-sd/fx. -""" import ctypes import errno import os diff --git a/tools/proot/bench/equiv3.py b/tools/proot/bench/equiv3.py index b40febf8e6..d8a22f32b2 100644 --- a/tools/proot/bench/equiv3.py +++ b/tools/proot/bench/equiv3.py @@ -1,13 +1,3 @@ -"""Fast path equivalence, part three: /proc (self, fd and exe links, readlink as proot answers it, -realpath through it, opening through fd links), link text naming host paths, creating in -directories whose host path is long, glue above a binding proot cannot look into, files the -caller may not stat, trailing slashes, shm_open, accept, passwd lookups and the _FORTIFY_SOURCE -entry points. - -Run under proot with and without the fast path (run-device.sh fpoff / fastpath) and diff the -output: every line must match. The rig's rootfs is ROOT; run-device.sh binds /cache/fp/perf and -SHARED at /opt/fpx. -""" import ctypes import errno import os diff --git a/tools/proot/fastpath/fastpath.c b/tools/proot/fastpath/fastpath.c index f768fb073c..0a9d3f22b5 100644 --- a/tools/proot/fastpath/fastpath.c +++ b/tools/proot/fastpath/fastpath.c @@ -913,7 +913,6 @@ static void fill_statx(struct statx *out, const struct stat *st) { out->stx_dev_minor = dev_minor(st->st_dev); } -/* Emulate statx on older kernels < 4.11 */ static long statx_call(int dirfd, const char *path, int flags, unsigned mask, struct statx *out) { struct stat st; long rs; @@ -1374,7 +1373,6 @@ int inotify_add_watch(int fd, const char *path, uint32_t mask) { } -/* The kernel reports a socket named through /proc/self/fd/N/<name> under that name: map it back, per socket. */ enum { LONG_SELF, LONG_PEER }; static struct { unsigned long ino; int kind; char name[sizeof ((struct sockaddr_un *)0)->sun_path]; char guest[sizeof ((struct sockaddr_un *)0)->sun_path]; } long_names[64]; static unsigned long_next; @@ -1453,7 +1451,6 @@ static long socket_address(const struct sockaddr *addr, socklen_t len, int follo memset(out, 0, sizeof *out); out->sun_family = AF_UNIX; if (hlen >= room) { - /* proot would bind it to a temporary name the fast path cannot see: name it through its directory. */ char *slash = strrchr(r.host, '/'); if (!slash || slash == r.host) return FP_SLOW; *slash = 0; diff --git a/tools/proot/fastpath/svc-patch.h b/tools/proot/fastpath/svc-patch.h index 300302f58e..6d19da3156 100644 --- a/tools/proot/fastpath/svc-patch.h +++ b/tools/proot/fastpath/svc-patch.h @@ -89,7 +89,6 @@ long fp_svc_dispatch(const long *r) { } void fp_svc_entry(void) __attribute__((visibility("hidden"))); -/* A replaced svc may have live values in every register, including NZCV and SIMD. */ __asm__( ".text\n.p2align 4\n.hidden fp_svc_entry\n.type fp_svc_entry,%function\nfp_svc_entry:\n" ".cfi_startproc\n.cfi_def_cfa sp, 16\n.cfi_return_column 16\n" @@ -144,11 +143,11 @@ static int svc_emit(uint32_t *code, uint32_t *site, uint32_t *branch) { uint32_t back; if (!svc_branch((uintptr_t)site, (uintptr_t)code, branch) || !svc_branch((uintptr_t)(code + 5), (uintptr_t)(site + 1), &back)) return 0; - code[0] = 0xa9bf47f0U; /* stp x16, x17, [sp, #-16]! */ - code[1] = 0x580000f0U; /* ldr x16, literal at +32 */ - code[2] = 0x10000051U; /* adr x17, +8 */ - code[3] = 0xd61f0200U; /* br x16 */ - code[4] = 0xa8c147f0U; /* ldp x16, x17, [sp], #16 */ + code[0] = 0xa9bf47f0U; + code[1] = 0x580000f0U; + code[2] = 0x10000051U; + code[3] = 0xd61f0200U; + code[4] = 0xa8c147f0U; code[5] = back; uintptr_t entry = (uintptr_t)fp_svc_entry; uintptr_t resume = (uintptr_t)(site + 1); diff --git a/tools/proot/fastpath/svc-stack.h b/tools/proot/fastpath/svc-stack.h index d3a4ff528b..0739bebc6d 100644 --- a/tools/proot/fastpath/svc-stack.h +++ b/tools/proot/fastpath/svc-stack.h @@ -78,6 +78,5 @@ static int svc_stack_room(uintptr_t sp) { if (grow < svc_stack_gap) grow = svc_stack_gap; if (grow < low) low = grow; } - /* Path translation nests several PATH_MAX-sized frames. */ return sp - low >= 96 * 1024; } diff --git a/tools/proot/patches/0015-lost-fork-events.patch b/tools/proot/patches/0015-lost-fork-events.patch index d3912abf44..dc1a4a2db6 100644 --- a/tools/proot/patches/0015-lost-fork-events.patch +++ b/tools/proot/patches/0015-lost-fork-events.patch @@ -15,19 +15,17 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c #include <sys/ptrace.h> /* ptrace(2), PTRACE_*, */ #include <errno.h> /* E*, */ #include <inttypes.h> /* PRI*, */ -+#include <unistd.h> /* getpid(2), */ -+#include <stdio.h> /* fopen(3), fgets(3), snprintf(3), */ -+#include <dirent.h> /* opendir(3), readdir(3), closedir(3), */ -+#include <limits.h> /* INT_MAX, */ ++#include <unistd.h> ++#include <stdio.h> ++#include <dirent.h> ++#include <limits.h> #include "tracee/tracee.h" #include "tracee/reg.h" -@@ -402,16 +406,128 @@ +@@ -402,16 +406,119 @@ } } -+/* Read host process IDs, not PRoot's guest /proc view. /proc/<tid>/status -+ * works for non-leader threads too, even though /proc lists only leaders. */ +static int read_task_ids(pid_t pid, long *tgid, long *ppid, long *tracer) +{ + char path[64], line[256]; @@ -54,13 +52,6 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c + return status; +} + -+/* Recover only a delivered creation event whose GETEVENTMSG succeeded but -+ * returned zero. The creator is still stopped at that event, and its real -+ * clone flags have already been read. Require exactly one uninitialized, -+ * PRoot-traced candidate of the right kind and relationship. Never infer -+ * clone flags from PPid, substitute a process for a thread, or choose by PID -+ * order. Include tracees whose initial SIGSTOP was handled before this event. -+ * Missing events and ambiguous candidates need separate recovery logic. */ +static int find_event_child(Tracee *parent, word_t clone_flags, unsigned long *result) +{ + char path[64]; @@ -153,7 +144,7 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c int status; /* If the tracee calls clone(2) with the CLONE_VFORK flag, -@@ -425,24 +541,62 @@ +@@ -425,24 +532,60 @@ * order to get the right flags. */ status = fetch_regs(parent); @@ -185,8 +176,6 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c + static bool warned; + + status = flags_known ? find_event_child(parent, clone_flags, &pid) : -EIO; -+ /* A thread creator can reach clone's exit while its child is held. -+ * vfork cannot: its creator waits for the child, so do not defer it. */ + if (status == -EAGAIN && (clone_flags & CLONE_THREAD) != 0 && + (clone_flags & CLONE_VFORK) == 0) { + parent->pending_clone_flags = clone_flags; @@ -218,14 +207,10 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c child = get_tracee(parent, (pid_t) pid, true); if (child == NULL) { -@@ -628,6 +782,52 @@ +@@ -628,6 +771,46 @@ return 0; } -+/* A clone event occurs before the creating thread returns from clone. For an -+ * ambiguous thread lookup, obtain the exact TID at that syscall's exit instead -+ * of guessing from the order of /proc entries. Called before normal syscall -+ * exit handling so the registers and inherited tracee state are still intact. */ +void finish_pending_child(Tracee *parent) +{ + word_t flags = parent->pending_clone_flags; @@ -243,8 +228,6 @@ diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c + status = -ESRCH; + goto failed; + } -+ /* Validate the host TID before setup. This also rejects an unmappable -+ * PID from a different PID namespace instead of adopting an unrelated task. */ + status = read_task_ids(parent->pid, &ptgid, &ppid, &tracer); + if (status < 0) + goto failed; @@ -295,17 +278,16 @@ diff --git a/src/tracee/event.c b/src/tracee/event.c diff --git a/src/tracee/tracee.h b/src/tracee/tracee.h --- a/src/tracee/tracee.h +++ b/src/tracee/tracee.h -@@ -172,6 +172,9 @@ +@@ -172,6 +172,8 @@ SIGSTOP_ALLOWED, /* Allow SIGSTOP (once the parent is known). */ SIGSTOP_PENDING, /* Block SIGSTOP until the parent is unknown. */ } sigstop; + -+ /* Nonzero only while resolving an ambiguous thread clone at its exit. */ + word_t pending_clone_flags; /* True if next SIGSYS caused by seccomp should be silently dropped * without affecting state of any registers. */ -@@ -310,6 +313,7 @@ +@@ -310,6 +312,7 @@ bool only_with_pevent, word_t wait_options); extern bool has_ptracees(const Tracee *ptracer, pid_t pid, word_t wait_options); extern int new_child(Tracee *parent, word_t clone_flags); diff --git a/tools/proot/patches/0024-execveat-absolute-path.patch b/tools/proot/patches/0024-execveat-absolute-path.patch new file mode 100644 index 0000000000..a3b7038cac --- /dev/null +++ b/tools/proot/patches/0024-execveat-absolute-path.patch @@ -0,0 +1,44 @@ +From 968f450754f97907d72a756add5010f6be746b6a Mon Sep 17 00:00:00 2001 +From: maxjivi05 <maxjividen@gmail.com> +Date: Fri, 30 Oct 2026 20:21:28 -0400 +Subject: [PATCH] syscall: run an execveat with an absolute path like execve + +The kernel ignores the directory descriptor of execveat when the path is +absolute, so such a call is an execve with flags. FEX runs every child +of an emulated program through execveat(fd, "/proc/self/exe"), which +proot refused unless the descriptor was AT_FDCWD. +--- + src/syscall/enter.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/syscall/enter.c b/src/syscall/enter.c +index f8ce2e7..98241bd 100644 +--- a/src/syscall/enter.c ++++ b/src/syscall/enter.c +@@ -129,8 +129,13 @@ int translate_syscall_enter(Tracee *tracee) + status = translate_execve_enter(tracee); + break; + +- case PR_execveat: +- if ((int) peek_reg(tracee, CURRENT, SYSARG_1) == AT_FDCWD) { ++ case PR_execveat: { ++ word_t flags = peek_reg(tracee, CURRENT, SYSARG_5); ++ char first = '\0'; ++ bool absolute = (flags & (AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW)) == 0 ++ && read_data(tracee, &first, peek_reg(tracee, CURRENT, SYSARG_2), 1) == 0 ++ && first == '/'; ++ if ((int) peek_reg(tracee, CURRENT, SYSARG_1) == AT_FDCWD || absolute) { + set_sysnum(tracee, PR_execve); + poke_reg(tracee, SYSARG_1, peek_reg(tracee, CURRENT, SYSARG_2)); + poke_reg(tracee, SYSARG_2, peek_reg(tracee, CURRENT, SYSARG_3)); +@@ -142,6 +147,7 @@ int translate_syscall_enter(Tracee *tracee) + } + status = translate_execve_enter(tracee); + break; ++ } + + case PR_ptrace: + status = translate_ptrace_enter(tracee); +-- +2.43.0 + diff --git a/tools/proot/statx_mnt_id.h b/tools/proot/statx_mnt_id.h index deb1789b8d..257707657d 100644 --- a/tools/proot/statx_mnt_id.h +++ b/tools/proot/statx_mnt_id.h @@ -72,11 +72,6 @@ static inline bool droiddeck_proot_statx_fill_mnt_id(pid_t pid, int fd, int n = snprintf(tracee_fd_path, sizeof tracee_fd_path, "/proc/%ld/fd/%d", (long)pid, fd); if (n < 0 || (size_t)n >= sizeof tracee_fd_path) return false; - /* Another thread sharing the tracee's fd table can close/reuse fd after statx returns. Pin the - * current referent, then require both device and inode to match statx before trusting its mount. - * Read fdinfo from our pin so a later tracee fd reuse cannot change which mount ID is observed. - * A same-inode bind-mount alias has the same device/inode pair; at this exit stop we cannot - * distinguish that rare concurrent replacement from the mount used by the completed syscall. */ int pinned = open(tracee_fd_path, O_PATH | O_CLOEXEC); if (pinned < 0) return false; struct stat st; diff --git a/tools/proot_profile.py b/tools/proot_profile.py index bfe4418f42..aa09e23d0d 100644 --- a/tools/proot_profile.py +++ b/tools/proot_profile.py @@ -1,4 +1,3 @@ -"""Read cumulative PRoot handler counters from a session log without double counting snapshots.""" from __future__ import annotations import json diff --git a/tools/quest/build-driver.py b/tools/quest/build-driver.py index e72b2991ec..43c7c5a3be 100644 --- a/tools/quest/build-driver.py +++ b/tools/quest/build-driver.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Build the Quest allocation adapter around the unchanged bundled Android Turnip.""" import io import json from pathlib import Path @@ -34,7 +33,6 @@ def pack(entries, output): def build_a6xx(ndk, output_dir=OUTPUT.parent, archive_path=None): - """Pin a real A6xx driver, with a separate Quest adapter around the same bytes.""" cached = archive_path or ROOT / 'app/build/quest-inputs' / f'Turnip-{A6XX_TAG}.zip' if not cached.exists(): cached.parent.mkdir(parents=True, exist_ok=True) diff --git a/tools/quest/kgsl_compat.c b/tools/quest/kgsl_compat.c index 33f4cfe182..c8cf409c94 100644 --- a/tools/quest/kgsl_compat.c +++ b/tools/quest/kgsl_compat.c @@ -4,6 +4,7 @@ #include <limits.h> #include <stdint.h> #include <stdio.h> +#include <stdlib.h> #ifdef __ANDROID__ #include <android/log.h> #endif @@ -29,10 +30,133 @@ static void report(const char *operation, int error) { errno = saved; } +struct tracked_context { + unsigned int context, queued, retired, generation; +}; + +static struct tracked_context *tracked; +static unsigned int tracked_count, tracked_capacity; +static unsigned int next_generation; +static char tracked_lock; + +static void tracked_acquire(void) { + while (__atomic_test_and_set(&tracked_lock, __ATOMIC_ACQUIRE)) {} +} + +static void tracked_release(void) { + __atomic_clear(&tracked_lock, __ATOMIC_RELEASE); +} + +static int tracked_find(unsigned int context, int create) { + int free_slot = -1; + for (unsigned int i = 0; i < tracked_count; i++) { + if (tracked[i].context == context) return (int)i; + if (free_slot < 0 && tracked[i].context == 0) free_slot = (int)i; + } + if (!create) return -1; + if (free_slot < 0) { + if (tracked_count == tracked_capacity) { + unsigned int capacity = tracked_capacity ? tracked_capacity * 2 : 32; + struct tracked_context *grown = realloc(tracked, capacity * sizeof *grown); + if (grown == NULL) return -1; + tracked = grown; + tracked_capacity = capacity; + } + free_slot = (int)tracked_count++; + } + tracked[free_slot].context = context; + tracked[free_slot].queued = tracked[free_slot].retired = 0; + tracked[free_slot].generation = ++next_generation; + return free_slot; +} + +static void track_submit(unsigned int context, unsigned int timestamp) { + if (context == 0) return; + tracked_acquire(); + int slot = tracked_find(context, 1); + if (slot < 0) { tracked_release(); return; } + if ((int)(timestamp - tracked[slot].queued) < 0) tracked[slot].retired = 0; + tracked[slot].queued = timestamp; + tracked_release(); +} + +static struct tracked_context track_detach(unsigned int context) { + struct tracked_context gone = {0}; + tracked_acquire(); + int slot = tracked_find(context, 0); + if (slot >= 0) { + gone = tracked[slot]; + tracked[slot].context = 0; + } + tracked_release(); + return gone; +} + +static void track_restore(struct tracked_context entry) { + if (entry.context == 0) return; + tracked_acquire(); + if (tracked_find(entry.context, 0) < 0) { + int slot = tracked_find(entry.context, 1); + if (slot >= 0) { + unsigned int generation = tracked[slot].generation; + tracked[slot] = entry; + tracked[slot].generation = generation; + } + } + tracked_release(); +} + +/* Quest's SELinux policy denies CMDSTREAM_READTIMESTAMP_CTXTID, which Mesa 26's Turnip needs to wait on + * timeline semaphores; a zero-timeout WAITTIMESTAMP on the last submitted timestamp answers it. */ +static int read_timestamp(quest_ioctl_fn real, int fd, struct kgsl_cmdstream_readtimestamp_ctxtid *query) { + tracked_acquire(); + int slot = tracked_find(query->context_id, 0); + unsigned int queued = slot < 0 ? 0 : tracked[slot].queued; + unsigned int retired = slot < 0 ? 0 : tracked[slot].retired; + unsigned int generation = slot < 0 ? 0 : tracked[slot].generation; + tracked_release(); + if (slot < 0 || (query->type != KGSL_TIMESTAMP_RETIRED && query->type != KGSL_TIMESTAMP_QUEUED)) { + errno = EACCES; + return -1; + } + + if (query->type == KGSL_TIMESTAMP_RETIRED && (int)(queued - retired) > 0) { + struct kgsl_device_waittimestamp_ctxtid wait = { + .context_id = query->context_id, .timestamp = queued, .timeout = 0}; + if (real(fd, IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID, &wait) == 0) { + retired = queued; + tracked_acquire(); + slot = tracked_find(query->context_id, 0); + if (slot >= 0 && tracked[slot].generation == generation && + (int)(retired - tracked[slot].retired) > 0) tracked[slot].retired = retired; + tracked_release(); + } else if (errno != ETIMEDOUT) { + return -1; + } + } + query->timestamp = query->type == KGSL_TIMESTAMP_RETIRED ? retired : queued; + return 0; +} + int quest_kgsl_ioctl(quest_ioctl_fn real, int fd, unsigned long request, void *arg) { + struct tracked_context detached = {0}; + if (request == IOCTL_KGSL_DRAWCTXT_DESTROY && arg != NULL) + detached = track_detach(((const struct kgsl_drawctxt_destroy *)arg)->drawctxt_id); int rc = real(fd, request, arg); + if (request == IOCTL_KGSL_DRAWCTXT_DESTROY && rc != 0) { + int error = errno; + track_restore(detached); + errno = error; + } + if (rc == 0 && arg != NULL && request == IOCTL_KGSL_GPU_COMMAND) { + const struct kgsl_gpu_command *submit = arg; + track_submit(submit->context_id, submit->timestamp); + } if (rc != -1 || (errno != EACCES && errno != EPERM) || arg == NULL) return rc; + if (request == IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_CTXTID) + return read_timestamp(real, fd, arg); + if (request == IOCTL_KGSL_GPUMEM_ALLOC_ID) { struct kgsl_gpumem_alloc_id *old = arg; struct kgsl_gpuobj_alloc alloc = {.size = old->size, .flags = old->flags}; diff --git a/tools/quest/test_first_frame.c b/tools/quest/test_first_frame.c index f58da48bb5..b0f0bac2ab 100644 --- a/tools/quest/test_first_frame.c +++ b/tools/quest/test_first_frame.c @@ -1,5 +1,3 @@ -/* Exercise the production vkp_render entrypoint without Android/Vulkan hardware. - * The Python runner extracts that function verbatim into the included file. */ #include <assert.h> #include <stddef.h> #include <stdio.h> @@ -18,8 +16,6 @@ static void vkp_signal_first_frame(void) { first_frames++; } static int vkp_base_black(int w, int h) { base_calls++; return base_result; } static int sc_layer_present_pass(const struct vkp_draw *draws, int n, int w, int h) { pass_calls++; - /* Production sc_layer_present_pass signals only after a content submission. - * Its no-op results (off-screen geometry or pool exhaustion) also return 0. */ if (pass_result == 0 && pass_shown) vkp_signal_first_frame(); return pass_result; } @@ -40,12 +36,10 @@ int main(void) { for (int i = 0; i < 3; i++) assert(vkp_render(1280, 720, NULL, 0) == 0); assert(base_calls == 3 && pass_calls == 0 && first_frames == 0); - /* An accepted layer operation is not necessarily a displayed client frame. */ reset(); assert(vkp_render(1280, 720, &draw, 1) == 0); assert(pass_calls == 1 && base_calls == 1 && first_frames == 0); - /* Content is the sole owner of the notification, with no second backdrop event. */ reset(); pass_shown = 1; assert(vkp_render(1280, 720, &draw, 1) == 0); assert(first_frames == 1); @@ -59,7 +53,6 @@ int main(void) { assert(vkp_render(1280, 720, NULL, 0) == -1); assert(first_frames == 0); - /* Existing routes remain responsible for their own notifications. */ for (int mode = 0; mode < 3; mode++) { reset(); if (mode == 0) quest = 0; diff --git a/tools/quest/test_kgsl_compat.c b/tools/quest/test_kgsl_compat.c index 30ae397a89..52a4ef2ab6 100644 --- a/tools/quest/test_kgsl_compat.c +++ b/tools/quest/test_kgsl_compat.c @@ -43,7 +43,93 @@ static struct kgsl_gpumem_alloc_id reset(void) { address = 0x100000; return (struct kgsl_gpumem_alloc_id){.size = 123, .flags = 0x10000}; } +static int read_error, wait_error, waits; +static unsigned int waited_for; +static void (*during_wait)(void); +static int destroy_error; +static int timestamp_mock(int fd, unsigned long request, void *arg) { + assert(fd == 42); + if (request == IOCTL_KGSL_DRAWCTXT_DESTROY && destroy_error) { errno = destroy_error; return -1; } + if (request == IOCTL_KGSL_GPU_COMMAND || request == IOCTL_KGSL_DRAWCTXT_DESTROY) return 0; + if (request == IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_CTXTID) { + errno = read_error; + return -1; + } + if (request == IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID) { + const struct kgsl_device_waittimestamp_ctxtid *w = arg; + assert(w->timeout == 0); + waits++; + waited_for = w->timestamp; + if (during_wait) during_wait(); + if (wait_error) { errno = wait_error; return -1; } + return 0; + } + errno = EACCES; + return -1; +} +static void submit(unsigned int context, unsigned int timestamp) { + struct kgsl_gpu_command cmd = {.context_id = context, .timestamp = timestamp}; + assert(quest_kgsl_ioctl(timestamp_mock, 42, IOCTL_KGSL_GPU_COMMAND, &cmd) == 0); +} +static int read_ts(unsigned int context, unsigned int type, unsigned int *timestamp) { + struct kgsl_cmdstream_readtimestamp_ctxtid q = {.context_id = context, .type = type, .timestamp = 0xdead}; + int rc = quest_kgsl_ioctl(timestamp_mock, 42, IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_CTXTID, &q); + *timestamp = q.timestamp; + return rc; +} +static void submit(unsigned int context, unsigned int timestamp); +static void recreate_context(void) { + struct kgsl_drawctxt_destroy gone = {.drawctxt_id = 8}; + during_wait = NULL; + assert(quest_kgsl_ioctl(timestamp_mock, 42, IOCTL_KGSL_DRAWCTXT_DESTROY, &gone) == 0); + submit(8, 20); +} +static void timestamp_scenarios(void) { + unsigned int ts; + read_error = EACCES; + assert(read_ts(5, KGSL_TIMESTAMP_RETIRED, &ts) == -1 && errno == EACCES && ts == 0xdead); + submit(5, 10); + assert(read_ts(5, KGSL_TIMESTAMP_QUEUED, &ts) == 0 && ts == 10 && waits == 0); + assert(read_ts(5, KGSL_TIMESTAMP_CONSUMED, &ts) == -1 && errno == EACCES && ts == 0xdead); + wait_error = ETIMEDOUT; + assert(read_ts(5, KGSL_TIMESTAMP_RETIRED, &ts) == 0 && ts == 0 && waits == 1 && waited_for == 10); + wait_error = 0; + assert(read_ts(5, KGSL_TIMESTAMP_RETIRED, &ts) == 0 && ts == 10 && waits == 2); + assert(read_ts(5, KGSL_TIMESTAMP_RETIRED, &ts) == 0 && ts == 10 && waits == 2); + submit(5, 11); + wait_error = ETIMEDOUT; + assert(read_ts(5, KGSL_TIMESTAMP_RETIRED, &ts) == 0 && ts == 10 && waited_for == 11); + wait_error = EIO; + assert(read_ts(5, KGSL_TIMESTAMP_RETIRED, &ts) == -1 && errno == EIO); + wait_error = 0; + submit(5, 0xfffffffe); + submit(5, 1); + assert(read_ts(5, KGSL_TIMESTAMP_RETIRED, &ts) == 0 && ts == 1); + struct kgsl_drawctxt_destroy gone = {.drawctxt_id = 5}; + assert(quest_kgsl_ioctl(timestamp_mock, 42, IOCTL_KGSL_DRAWCTXT_DESTROY, &gone) == 0); + assert(read_ts(5, KGSL_TIMESTAMP_QUEUED, &ts) == -1 && errno == EACCES); + for (unsigned int c = 100; c < 100 + 129; c++) submit(c, c); + for (unsigned int c = 100; c < 100 + 129; c++) assert(read_ts(c, KGSL_TIMESTAMP_QUEUED, &ts) == 0 && ts == c); + submit(8, 5); + during_wait = recreate_context; + assert(read_ts(8, KGSL_TIMESTAMP_RETIRED, &ts) == 0 && ts == 5); + wait_error = ETIMEDOUT; + assert(read_ts(8, KGSL_TIMESTAMP_RETIRED, &ts) == 0 && ts == 0 && waited_for == 20); + wait_error = 0; + assert(read_ts(8, KGSL_TIMESTAMP_RETIRED, &ts) == 0 && ts == 20); + submit(9, 4); + struct kgsl_drawctxt_destroy refused = {.drawctxt_id = 9}; + destroy_error = EBUSY; + assert(quest_kgsl_ioctl(timestamp_mock, 42, IOCTL_KGSL_DRAWCTXT_DESTROY, &refused) == -1 && errno == EBUSY); + destroy_error = 0; + assert(read_ts(9, KGSL_TIMESTAMP_QUEUED, &ts) == 0 && ts == 4); + read_error = EIO; + submit(6, 3); + assert(read_ts(6, KGSL_TIMESTAMP_QUEUED, &ts) == -1 && errno == EIO); +} + int main(void) { + timestamp_scenarios(); struct kgsl_gpumem_alloc_id p = reset(); assert(quest_kgsl_ioctl(mock, 42, IOCTL_KGSL_GPUMEM_ALLOC_ID, &p) == 0 && count == 1); p = reset(); old_error = EACCES; @@ -74,4 +160,5 @@ int main(void) { reset(); assert(quest_kgsl_ioctl(mock, 42, IOCTL_KGSL_GPUMEM_FREE_ID, &release) == 0 && count == 1); puts("PASS: 12 GPUOBJ translation, passthrough, failure and cleanup scenarios"); + puts("PASS: denied timestamp reads answered from tracked submissions"); } diff --git a/tools/quest/test_presentation.c b/tools/quest/test_presentation.c index dcbad62244..9ef5a826a1 100644 --- a/tools/quest/test_presentation.c +++ b/tools/quest/test_presentation.c @@ -1,4 +1,3 @@ -/* Exercise the production backdrop with mock Android buffers/transactions. */ #include "../../app/src/main/cpp/waylandcomp/src/sc_layer.c" #include "../../app/src/main/cpp/waylandcomp/src/quest_device.h" #include <assert.h> @@ -40,7 +39,6 @@ static void tx_delete(ASurfaceTransaction *t) { assert(t == (ASurfaceTransaction static void tx_apply(ASurfaceTransaction *t) { (void)t; applies++; } static void set_buffer(ASurfaceTransaction *t, ASurfaceControl *s, AHardwareBuffer *b, int fd) { (void)t; (void)s; assert(b == &buffer && fd == -1); - /* No garbage, including padded row bytes, reaches the display. */ for (unsigned i=0; i<sizeof(buffer.pixels); i++) assert(buffer.pixels[i] == 0); assert(unlocks > 0); buffers++; } @@ -79,7 +77,7 @@ int main(void) { assert(visible==ASC_VISIBILITY_SHOW && zorder==0 && opacity==ASC_TRANSPARENCY_OPAQUE); assert(destination.right==1920 && destination.bottom==1080); assert(allocs==1 && locks==1 && buffers==1 && creates==1); - assert(sc_layer_base_black(1920,1080)==0 && applies==1); /* retained, not redrawn */ + assert(sc_layer_base_black(1920,1080)==0 && applies==1); assert(sc_layer_base_black(1440,1080)==0 && destination.right==1440 && allocs==1); sc_layer_hide_base(); assert(!visible && !g_base_shown); assert(sc_layer_base_black(1440,1080)==0 && visible && allocs==1); diff --git a/tools/quick_deploy.sh b/tools/quick_deploy.sh index 57e585c4a4..1166feaa6b 100755 --- a/tools/quick_deploy.sh +++ b/tools/quick_deploy.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -# Kotlin/resource-only loop: reuses the assets build_local.sh already prepared, then signs and installs. set -euo pipefail repo_root=$(CDPATH= cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd) cd "${repo_root}" +"${repo_root}/tools/seed_worktree.sh" sdk_dir=${ANDROID_HOME:-${ANDROID_SDK_ROOT:-"${HOME}/Library/Android/sdk"}} export ANDROID_HOME=${sdk_dir} ANDROID_SDK_ROOT=${sdk_dir} export JAVA_HOME=${JAVA_HOME:-/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home} @@ -23,7 +23,7 @@ while IFS= read -r dir; do done < <(ls -d "${sdk_dir}"/build-tools/* 2>/dev/null | sort -rV) [[ -n "${build_tools}" ]] || { echo "No build-tools with aapt, zipalign and apksigner under ${sdk_dir}." >&2; exit 1; } -./gradlew -q :app:assembleRelease +./gradlew -q -PallowStaleRuntime=true :app:assembleRelease ( cd "$(dirname "${signing_env}")" set -a; . "${signing_env}"; set +a diff --git a/tools/release/check_authorship.py b/tools/release/check_authorship.py index 37e2a716a4..1b85424710 100644 --- a/tools/release/check_authorship.py +++ b/tools/release/check_authorship.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Reject bot authors and bot co-author trailers without executing reviewed code.""" import argparse import json import re @@ -11,7 +10,6 @@ PRODUCT = re.compile( r"Amazon Q|Tabnine|github-actions|dependabot|renovate)(?![a-z0-9])|\[bot\]", re.IGNORECASE, ) -# These are also people's names, so they only count alone or followed by a product word. ASSISTANT = r"(?:Claude|Cursor|Devin|Cody|Gemini)" ASSISTANT_ALONE = re.compile(ASSISTANT, re.IGNORECASE) ASSISTANT_PRODUCT = re.compile( diff --git a/tools/release/check_session_assets.py b/tools/release/check_session_assets.py index 8556f83fea..2042e470f7 100644 --- a/tools/release/check_session_assets.py +++ b/tools/release/check_session_assets.py @@ -1,4 +1,3 @@ -"""Reject an APK with missing or stale session helpers, including cached local bundles.""" from pathlib import Path import re import sys diff --git a/tools/release/install_authorship_hooks.py b/tools/release/install_authorship_hooks.py index dae4eb5177..9f7dda1a1a 100644 --- a/tools/release/install_authorship_hooks.py +++ b/tools/release/install_authorship_hooks.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Install shared worktree hooks while preserving existing executable hooks.""" from pathlib import Path import shutil import subprocess diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 6eff505e85..9682ef46ab 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -1,4 +1,3 @@ -"""Attest prepared runtime inputs and reject stale local or CI APK payloads.""" import hashlib import gzip import json @@ -13,7 +12,6 @@ from zipfile import ZipFile ROOT = Path(__file__).resolve().parents[2] MANIFEST = Path('app/build/runtime-inputs.json') PACKS = Path('app/build/packs') -# Runtime trees shipped as add-on packs (tools/packs/build.sh) rather than inside the APK. PACKED = {'assets/linuxfs/usr/local/lib/droiddeck-xbox/': 'xbox', 'assets/linuxfs/usr/local/lib/droiddeck-comet/': 'comet', 'assets/directaudio/': 'directaudio'} PACKED_FILES = {'lib/arm64-v8a/libproot.so': ('proot', 'libproot.so'), @@ -23,9 +21,10 @@ PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler'] SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst', 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/packs', 'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env', - 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/components', 'tools/ci', 'tools/build_local.sh', + 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/components', 'tools/ci', 'tools/build_local.sh', 'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal', 'tools/quest', 'tools/vr/src', 'tools/vr/driver_droiddeck', 'tools/vr/layer', 'tools/vr/build.sh', + 'tools/gpuload', 'app/src/main/cpp/waylandcomp/src/headpose_shm.h', 'app/src/main/cpp/venc/venc_proto.h', 'app/src/main/cpp/waylandcomp/src/spatialpose_shm.h', @@ -92,6 +91,8 @@ def required(): 'droiddeck/resources/settings/default.vrsettings', 'layer/libVkLayer_droiddeck_vr.so', 'layer/VK_LAYER_DROIDDECK_vr.json', 'layer/VK_LAYER_DROIDDECK_vr_implicit.json', 'layer/libdroiddeck_vr_scheduling.so']] + paths += ['assets/linuxfs/usr/local/lib/droiddeck-gpuload/' + name for name in + ['libVkLayer_droiddeck_gpuload.so', 'VK_LAYER_DROIDDECK_gpu_load.json']] for side in ['left', 'right']: paths += [f'assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/resources/rendermodels/droiddeck_hand_{side}/{name}' for name in [f'droiddeck_hand_{side}.json', 'hand.mtl', 'hand.png', 'hand_open.obj', 'hand_fist.obj', @@ -149,13 +150,21 @@ def record(root=ROOT): (root / MANIFEST).write_text(json.dumps(data, sort_keys=True, indent=2) + '\n') -def verify(root=ROOT): +def verify(root=ROOT, stale_sources_ok=False): try: data = json.loads((root / MANIFEST).read_text()) except (OSError, ValueError): raise ValueError('Runtime inputs have not been prepared. Run tools/build_local.sh.') - if data.get('version') != 1 or data.get('sources') != sources(root): + if data.get('version') != 1: raise ValueError('Runtime sources changed since preparation. Run tools/build_local.sh.') + current = sources(root) + if data.get('sources') != current: + if not stale_sources_ok: + raise ValueError('Runtime sources changed since preparation. Run tools/build_local.sh.') + recorded = data.get('sources') or {} + changed = sorted(name for name in recorded.keys() | current.keys() if recorded.get(name) != current.get(name)) + print('Warning: reusing runtime assets prepared from other sources (run tools/build_local.sh if these matter):\n ' + + '\n '.join(changed[:20]) + ('\n ...' if len(changed) > 20 else ''), file=sys.stderr) for name in required(): if name not in data['outputs']: raise ValueError('Runtime manifest missing ' + name) @@ -224,7 +233,7 @@ if __name__ == '__main__': if sys.argv[1] == 'record': record() elif sys.argv[1] == 'verify': - verify() + verify(stale_sources_ok='--allow-stale-sources' in sys.argv[2:]) elif sys.argv[1] == 'apk': check_apk(sys.argv[2]) else: diff --git a/tools/release/update_catalog.py b/tools/release/update_catalog.py index 808e576a0d..94ecd1ce5c 100755 --- a/tools/release/update_catalog.py +++ b/tools/release/update_catalog.py @@ -1,9 +1,4 @@ #!/usr/bin/env python3 -"""Build and publish the one-file update catalog consumed by DroidDeck. - -The catalog is derived from GitHub releases, but the Android app never has to infer -channels, parse release notes, dereference tags, or spend unauthenticated API quota. -""" from __future__ import annotations @@ -230,7 +225,6 @@ def release_entry( def preview_history_entry(release: dict, preview: dict, variants: list[tuple[str, str]]): - """Return compact history metadata for one complete, signed main build.""" tag = release.get("tag_name") or "" tag_match = MAIN_TAG.fullmatch(tag) commit = (preview.get("commit") or "").lower() @@ -259,7 +253,6 @@ def preview_history_entry(release: dict, preview: dict, variants: list[tuple[str def recent_previews(entries: list[dict], limit: int = 10) -> list[dict]: - """Keep the newest distinct Preview commits, newest first.""" result = [] seen = set() for entry in sorted(entries, key=lambda item: item["publishedAt"], reverse=True): @@ -288,8 +281,6 @@ def main_commit(release: dict) -> str | None: def stable_app_release(releases: list[dict]) -> dict | None: - """The newest published app release. The repo also publishes gamescope and desktop-package - releases that GitHub may mark latest, so an app release is one shipping DroidDeck-<tag>.apk.""" apps = [ r for r in releases if not r.get("draft") and not r.get("prerelease") diff --git a/tools/release/validate_apk.py b/tools/release/validate_apk.py index 5969b1ae8e..3ff90c2e27 100644 --- a/tools/release/validate_apk.py +++ b/tools/release/validate_apk.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Publish the APK result only after trusted source and metadata validation.""" import json import os import subprocess diff --git a/tools/seed_worktree.sh b/tools/seed_worktree.sh new file mode 100755 index 0000000000..e5079e7111 --- /dev/null +++ b/tools/seed_worktree.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +set -euo pipefail +repo_root=$(CDPATH= cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd) +common=$(git -C "${repo_root}" rev-parse --path-format=absolute --git-common-dir) +main_root=$(dirname "${common}") +[[ "${main_root}" != "${repo_root}" && -d "${main_root}/app/build" ]] || exit 0 + +paths=( + app/build/prepared-assets app/build/runtime-inputs.json app/build/runtimeAssets + app/build/packs app/build/localPackAssets app/build/packs-local-aside app/build/quest-inputs + app/build/rustJniLibs app/build/vkbridgeJniLibs + app/src/main/assets/directaudio app/src/main/assets/droiddeck-esync app/src/main/assets/linuxfs + app/src/main/assets/desktop-removal + app/src/main/jniLibs/arm64-v8a + app/src/main/rust/stores/target +) +for path in "${paths[@]}"; do + [[ -e "${main_root}/${path}" ]] || continue + if [[ -d "${main_root}/${path}" ]]; then + [[ -z "$(ls -A "${repo_root}/${path}" 2>/dev/null)" ]] || continue + mkdir -p "$(dirname "${repo_root}/${path}")" + staged=$(mktemp -d "${repo_root}/${path}.seed.XXXXXX") + trap 'rm -rf "${staged}"' EXIT + cp -R "${main_root}/${path}/." "${staged}/" + if [[ -d "${repo_root}/${path}" ]] && ! rmdir "${repo_root}/${path}" 2>/dev/null; then + rm -rf "${staged}"; trap - EXIT; continue + fi + if [[ -e "${repo_root}/${path}" ]]; then + rm -rf "${staged}"; trap - EXIT; continue + fi + mv "${staged}" "${repo_root}/${path}" + trap - EXIT + elif [[ ! -e "${repo_root}/${path}" ]]; then + mkdir -p "$(dirname "${repo_root}/${path}")" + staged=$(mktemp "${repo_root}/${path}.seed.XXXXXX") + trap 'rm -f "${staged}"' EXIT + cp "${main_root}/${path}" "${staged}" + mv "${staged}" "${repo_root}/${path}" + trap - EXIT + fi +done diff --git a/tools/syncthing/build.sh b/tools/syncthing/build.sh new file mode 100755 index 0000000000..ca9338eb62 --- /dev/null +++ b/tools/syncthing/build.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash +set -euo pipefail +OUTDIR=$(mkdir -p "$1" && cd "$1" && pwd) +: "${NDK:?set NDK to the Android NDK root}" +API=26 +HERE=$(cd "$(dirname "$0")" && pwd) +FORK="$HERE/syncthing-android" +SRC="$FORK/syncthing/src/github.com/syncthing/syncthing" +if [[ ! -f "$SRC/build.go" ]]; then + echo "Syncthing source missing; run: git submodule update --init --recursive tools/syncthing/syncthing-android" >&2 + exit 1 +fi +command -v go >/dev/null || { echo "Go is required to build Syncthing" >&2; exit 1; } +toml="$FORK/gradle/libs.versions.toml" +GO_VERSION=$(sed -n 's/^go_version *= *"\(.*\)"/\1/p' "$toml") +APP_VERSION=$(sed -n 's/^version-name *= *"\(.*\)"/\1/p' "$toml") +[[ -n "$GO_VERSION" && -n "$APP_VERSION" ]] || { echo "Cannot read go_version/version-name from $toml" >&2; exit 1; } +ST_VERSION="v$(echo "$APP_VERSION" | cut -d. -f1-3)" +case "$(uname -s):$(uname -m)" in + Darwin:*) NDK_HOST=darwin-x86_64 ;; + Linux:x86_64) NDK_HOST=linux-x86_64 ;; + Linux:aarch64|Linux:arm64) NDK_HOST=linux-aarch64 ;; + *) echo "Unsupported build host: $(uname -s) $(uname -m)" >&2; exit 1 ;; +esac +TOOLCHAIN="$NDK/toolchains/llvm/prebuilt/$NDK_HOST/bin" +if [[ ! -d "$TOOLCHAIN" && -d "$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin" ]]; then + TOOLCHAIN="$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin" +fi +CC="$TOOLCHAIN/aarch64-linux-android${API}-clang" +[[ -x "$CC" ]] || { echo "Android NDK toolchain not found at $TOOLCHAIN" >&2; exit 1; } + +EPOCH=$(git -C "$SRC" show -s --format=%ct HEAD) +cache=${DROIDDECK_BUILD_CACHE:-"${HOME}/.cache/droiddeck-build"} +WORK=$(mktemp -d) +trap 'rm -rf "$WORK"' EXIT +cp -a "$SRC" "$WORK/syncthing" +rm -f "$WORK/syncthing/.git" +( + cd "$WORK/syncthing" + export GOTOOLCHAIN="go${GO_VERSION}" GOPATH="$cache/go" GOMODCACHE="$cache/go/pkg/mod" GOFLAGS=-buildvcs=false + export CGO_ENABLED=1 EXTRA_LDFLAGS=-checklinkname=0 BUILD_HOST=droiddeck BUILD_USER=reproducible-build SOURCE_DATE_EPOCH="$EPOCH" + go version + go run build.go -goos android -goarch arm64 -cc "$CC" -version "$ST_VERSION" -no-upgrade build +) +install -m755 "$WORK/syncthing/syncthing" "$OUTDIR/libsyncthingnative.so" +echo "Syncthing ${ST_VERSION} (fork ${APP_VERSION}, Go ${GO_VERSION}) built into $OUTDIR/libsyncthingnative.so" diff --git a/tools/syncthing/syncthing-android b/tools/syncthing/syncthing-android new file mode 160000 index 0000000000..f8819078e7 --- /dev/null +++ b/tools/syncthing/syncthing-android @@ -0,0 +1 @@ +Subproject commit f8819078e7dec1e8a954eec839febd9f7385294e diff --git a/tools/tests/cursor_composite_harness.c b/tools/tests/cursor_composite_harness.c new file mode 100644 index 0000000000..e1f267794f --- /dev/null +++ b/tools/tests/cursor_composite_harness.c @@ -0,0 +1,61 @@ +#include <assert.h> +#include <stdio.h> + +#include "cursor_constants.inc" +#include "cursor_scene_positions.inc" +#include "cursor_clip_to_eye.inc" + +int main(void) { + int out[2]; + int dx, sx, dw; + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_SCREEN, 100, 0, out) == 1); + assert(out[0] == 100); + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_FLAT, 100, 0, out) == 1); + assert(out[0] == 100); + + assert(cursor_scene_positions(1, CARDBOARD_SOURCE_SBS, 0, 0, out) == 1); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 100, 0, out) == 2); + assert(out[0] == 100 && out[1] == 2020); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 2000, 0, out) == 2); + assert(out[0] == 2000 && out[1] == 80); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 1919, 0, out) == 2); + assert(out[0] == 1919 && out[1] == 3839); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 1920, 0, out) == 2); + assert(out[0] == 1920 && out[1] == 0); + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_SBS, 960, 32, out) == 2); + assert(out[0] == 928 && out[1] == -32); + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_SBS, 959, 32, out) == 2); + assert(out[0] == 927 && out[1] == 1887); + + assert(cursor_clip_to_eye(1920, -1, 100, 32, &dx, &sx, &dw) == 1); + assert(dx == 100 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 0, 100, 32, &dx, &sx, &dw) == 1); + assert(dx == 100 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 0, 950, 32, &dx, &sx, &dw) == 1); + assert(dx == 950 && sx == 0 && dw == 10); + + assert(cursor_clip_to_eye(1920, 1, 950, 32, &dx, &sx, &dw) == 1); + assert(dx == 960 && sx == 10 && dw == 22); + + assert(cursor_clip_to_eye(1920, 1, 960, 32, &dx, &sx, &dw) == 1); + assert(dx == 960 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 0, 928, 32, &dx, &sx, &dw) == 1); + assert(dx == 928 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 1, 928, 32, &dx, &sx, &dw) == 0); + assert(cursor_clip_to_eye(1920, 0, -32, 32, &dx, &sx, &dw) == 0); + + puts("PASS: cursor stereo placement"); + return 0; +} diff --git a/tools/tests/kgsl_busy_harness.c b/tools/tests/kgsl_busy_harness.c new file mode 100644 index 0000000000..74255eb08e --- /dev/null +++ b/tools/tests/kgsl_busy_harness.c @@ -0,0 +1,113 @@ +#include <assert.h> +#include <stdio.h> +#include <string.h> + +#include "kgsl_busy.h" +#include "kgsl_layout.h" + +#define ENTRIES 819 + +static uint32_t memstore[ENTRIES * KGSL_BUSY_ENTRY_WORDS]; + +static void stamp(int entry, uint32_t sop, uint32_t eop) { + memstore[entry * KGSL_BUSY_ENTRY_WORDS + KGSL_BUSY_SOP] = sop; + memstore[entry * KGSL_BUSY_ENTRY_WORDS + KGSL_BUSY_EOP] = eop; +} + +int main(void) { + assert(kgsl_busy_first_slot(8 * 4096) == 813); + assert(kgsl_busy_first_slot(8 * 16384) == 3270); + assert(kgsl_busy_first_slot(7 * 40) == -1); + + int first = kgsl_busy_first_slot(sizeof(memstore)); + uint32_t last[KGSL_BUSY_SLOTS] = {0}; + int moved = 0; + + stamp(first, 100, 100); + stamp(first + 2, 7, 7); + assert(kgsl_busy_sample(memstore, first, last, &moved) == 0); + assert(moved == 1 && last[0] == 100 && last[2] == 7); + + moved = 0; + assert(kgsl_busy_sample(memstore, first, last, &moved) == 0); + assert(moved == 0); + + stamp(first + 2, 8, 7); + assert(kgsl_busy_sample(memstore, first, last, &moved) == 1); + assert(moved == 1); + + moved = 0; + stamp(first + 2, 8, 8); + assert(kgsl_busy_sample(memstore, first, last, &moved) == 0); + assert(moved == 0); + + stamp(first + 4, 3, 2); + assert(kgsl_busy_sample(memstore, first, last, &moved) == 1); + + memset(memstore, 0, sizeof(memstore)); + stamp(first - 1, 5, 4); + stamp(first + KGSL_BUSY_SLOTS, 9, 8); + memset(last, 0, sizeof(last)); + moved = 0; + assert(kgsl_busy_sample(memstore, first, last, &moved) == 0); + assert(moved == 0); + + puts("PASS: kgsl memstore busy"); + + // Hardware-scheduled kernels: ringbuffer entries stay 0, contexts carry the stamps. + memset(memstore, 0, sizeof(memstore)); + static uint32_t seen[ENTRIES], ctx_last[ENTRIES]; + int live[KGSL_BUSY_MAX_LIVE]; + stamp(3, 50, 50); + stamp(9, 21, 20); + stamp(first - 1, 4, 4); + int count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + assert(count == 3 && live[0] == 3 && live[1] == 9 && live[2] == first - 1); + moved = 0; + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 1); + assert(moved == 1 && ctx_last[9] == 21); + + // Busy or newly started contexts come first; idle ones that have run work stay in the list. + stamp(9, 21, 21); + stamp(5, 2, 1); + count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + assert(count == 4 && live[0] == 5 && live[1] == 3 && live[2] == 9 && live[3] == first - 1); + moved = 0; + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 1); + assert(moved == 1); + moved = 0; + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 1); + assert(moved == 0); + stamp(5, 2, 2); + assert(kgsl_busy_sample_contexts(memstore, live, count, ctx_last, &moved) == 0); + + // Entry 0 (global) and the ringbuffer entries are not contexts; the live list is capped. + memset(memstore, 0, sizeof(memstore)); + memset(seen, 0, sizeof(seen)); + stamp(0, 8, 7); + stamp(first, 8, 7); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == 0); + for (int id = 1; id <= KGSL_BUSY_MAX_LIVE + 10; id++) stamp(id, 1, 1); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == KGSL_BUSY_MAX_LIVE); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == KGSL_BUSY_MAX_LIVE); + stamp(KGSL_BUSY_MAX_LIVE + 5, 2, 1); + assert(kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE) == KGSL_BUSY_MAX_LIVE); + assert(live[0] == KGSL_BUSY_MAX_LIVE + 5); + stamp(KGSL_BUSY_MAX_LIVE + 5, 0, 0); + count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + count = kgsl_busy_scan_contexts(memstore, first, seen, live, KGSL_BUSY_MAX_LIVE); + for (int i = 0; i < count; i++) assert(live[i] != KGSL_BUSY_MAX_LIVE + 5); + puts("PASS: kgsl memstore contexts"); + + assert(kgsl_layout_for(0x44050001u) == &KGSL_LAYOUT_A8XX); // Adreno 830 + assert(kgsl_layout_for(0x44030a20u) == &KGSL_LAYOUT_A8XX); // Adreno 829 + assert(kgsl_layout_for(0x43020100u) == &KGSL_LAYOUT_A7XX); // Adreno 722 + assert(kgsl_layout_for(0x43050a01u) == &KGSL_LAYOUT_A7XX); // Adreno 740 + assert(kgsl_layout_for(0x07010000u) == &KGSL_LAYOUT_A7XX); // Adreno 710 + assert(kgsl_layout_for(0x06030001u) == &KGSL_LAYOUT_A7XX); // Adreno 630 + assert(kgsl_layout_for(0x45000000u) == NULL); + assert(KGSL_LAYOUT_A8XX.always_on == 0x8e7u && KGSL_LAYOUT_A8XX.cycles == 1u); + assert(KGSL_LAYOUT_A7XX.always_on == 0x980u && KGSL_LAYOUT_A7XX.cycles == 0u); + puts("PASS: kgsl counter layout"); + return 0; +} diff --git a/tools/tests/pointer_release_harness.c b/tools/tests/pointer_release_harness.c index 8369eb3771..aaf58841f0 100644 --- a/tools/tests/pointer_release_harness.c +++ b/tools/tests/pointer_release_harness.c @@ -23,8 +23,6 @@ static void wl_pointer_send_button(struct wl_resource *r, uint32_t serial, r->held &= ~(1u << (button - 0x110)); r->releases++; } -/* The old dispatcher calls this even for releases, emitting stale coordinates. - * Recording this boundary detects that unwanted motion/focus routing path. */ static void pointer_input(double x, double y, int relative, uint32_t button, int pressed) { assert(x == 0 && y == 0 && relative == 1 && button >= 0x110 && button <= 0x112); assert(pressed == 1); diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index aed66699ed..c0d0a76311 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -293,11 +293,13 @@ class ProcessTest(Temp): def test_battle_nets_own_processes_are_those_under_its_folders(self): for argv in (["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe", "--type=renderer"], ["C:/ProgramData/Battle.net/Agent/Agent.9824/Agent.exe"], - ["C:\\Program Files (x86)\\Battle.net\\Battle.net Launcher.exe"]): + ["C:\\Program Files (x86)\\Battle.net\\Battle.net Launcher.exe"], + ["C:\\Program Files (x86)\\Battle.net\\Battle.net.17952\\BlizzardError.exe"]): with self.subTest(argv): self.assertTrue(BNET["is_battlenet"](argv)) for argv in (["Z:\\root\\.cache\\droiddeck\\battlenet\\Battle.net-Setup.exe"], ["Z:\\root\\Games\\Stores\\Battle.net\\Hearthstone\\Hearthstone.exe"], + ["C:\\Program Files (x86)\\Battle.net\\World of Warcraft\\_forever_\\Wow-arm64.exe"], ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe"], ["C:\\windows\\system32\\services.exe"], []): with self.subTest(argv): self.assertFalse(BNET["is_battlenet"](argv)) @@ -305,6 +307,8 @@ class ProcessTest(Temp): def test_a_game_battle_net_launched_carries_its_uid(self): self.assertTrue(BNET["launched"](["C:\\Program Files (x86)\\Diablo II Resurrected\\D2R.exe", "-uid", "osi"])) self.assertTrue(BNET["launched"](["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe", "-launch", "-UID", "fenris"])) + self.assertTrue(BNET["launched"](["C:\\Program Files (x86)\\Battle.net\\World of Warcraft\\_forever_\\Wow-arm64.exe", + "-launcherlogin", "-uid", "wowf"])) for argv in (["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe"], ["C:\\Program Files (x86)\\Diablo IV\\vc_redist.x64.exe", "/quiet"], ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe", "-uid", "battle.net"]): @@ -831,6 +835,15 @@ class LaunchTest(Harness): self.assertEqual(BNET["launch"](self.root, "Fen"), 0) self.assertEqual([c for c in self.calls if c[0] == "stop"], [("stop", [10, 11, 12, 13, 14, 30])]) + def test_a_game_installed_in_battle_nets_folder_is_followed_not_stopped(self): + self.install() + up = self.clients() + [(30, self.AGENT)] + wow = (40, ["C:\\Program Files (x86)\\Battle.net\\World of Warcraft\\_forever_\\Wow-arm64.exe", "-launcherlogin", "-uid", "wowf"]) + wine = (50, ["C:\\windows\\system32\\services.exe"]) + self.states = [[], [], up, up + [wow], [wow, wine], [wow, wine], [wine], [wine]] + self.assertEqual(BNET["launch"](self.root, "WoWF"), 0) + self.assertEqual([c for c in self.calls if c[0] == "stop"], [("stop", [50])]) + def test_battle_net_closing_itself_as_it_launches_the_game_is_not_an_end(self): game = (40, self.GAME + ["-uid", "fenris"]) self.states = [[], [game], [game], [], []] @@ -896,6 +909,27 @@ class LaunchTest(Harness): self.assertEqual(image.read_bytes(), b"BM1152x720") self.assertIn('"WallpaperStyle"="2"', (pfx / "user.reg").read_text()) + def test_a_large_desktop_scales_battle_net_to_fit_it(self): + sizes = {("1280", "720"): 96, ("1920", "1080"): 96, ("2400", "1504"): 120, ("2448", "1848"): 120, + ("1080", "2400"): 96, ("3840", "2160"): 192, ("2560", "1600"): 120} + for (width, height), want in sizes.items(): + with mock.patch.dict(os.environ, {"BL_WIDTH": width, "BL_HEIGHT": height}): + self.assertEqual(BNET["desktop_dpi"](), want, (width, height)) + + def test_battle_nets_desktop_scale_is_written_once_and_follows_the_size(self): + self.install() + pfx = Path(self.root) / ("steamapps/compatdata/%s/pfx" % BNET["APP_ID"]) + (pfx / "user.reg").write_text('WINE REGISTRY Version 2\n\n[Control Panel\\\\Desktop] 1\n"LogPixels"=dword:00000060\n') + with mock.patch.dict(os.environ, {"BL_WIDTH": "1280", "BL_HEIGHT": "720"}): + self.assertTrue(BNET["dpi"](self.root)) + self.assertEqual((pfx / "user.reg").read_text().count("LogPixels"), 1) + with mock.patch.dict(os.environ, {"BL_WIDTH": "2448", "BL_HEIGHT": "1848"}): + self.assertTrue(BNET["dpi"](self.root)) + self.assertTrue(BNET["dpi"](self.root)) + reg = (pfx / "user.reg").read_text() + self.assertEqual(reg.count('"LogPixels"=dword:00000078'), 1) + self.assertTrue(reg.rstrip().endswith('"LogPixels"=dword:00000078')) + def test_an_open_battle_net_is_handed_the_game(self): self.install() up = self.clients() diff --git a/tools/tests/test_bwrap_fex.py b/tools/tests/test_bwrap_fex.py new file mode 100644 index 0000000000..2fc6463339 --- /dev/null +++ b/tools/tests/test_bwrap_fex.py @@ -0,0 +1,98 @@ +import os +import runpy +import shutil +import struct +import tempfile +import unittest +from pathlib import Path + +BWRAP = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-bwrap" + + +def elf(path, machine): + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(b"\x7fELF\x02\x01\x01" + bytes(11) + struct.pack("<H", machine) + bytes(64)) + path.chmod(0o755) + + +class BwrapFexTest(unittest.TestCase): + def setUp(self): + self.dir = Path(tempfile.mkdtemp()) + self.addCleanup(shutil.rmtree, self.dir, True) + self.shim = runpy.run_path(str(BWRAP)) + self.fex = self.dir / "fex" + for name in ("bin/FEX", "bin/FEXServer", "lib/libxxhash.so.0"): + elf(self.fex / name, 183) + self.shim["through_fex"].__globals__["OWN_FEX"] = str(self.fex) + self.runtime = self.dir / "runtime" + self.app = self.dir / "app" + elf(self.runtime / "bin/ldconfig", 62) + elf(self.runtime / "bin/bash", 62) + os.symlink("bash", self.runtime / "bin/sh") + elf(self.runtime / "bin/arm-tool", 183) + (self.app / "bin").mkdir(parents=True) + (self.app / "bin/r2modman").write_text("#!/bin/sh\nexec /app/r2modman \"$@\"\n") + + def spec(self, command, path="/app/bin:/usr/bin"): + s = self.shim["Spec"]() + s.env = {"PATH": path, "XDG_CACHE_HOME": "/home/user/.var/app/x/cache", "FEX_ROOTFS": "/sniper"} + s.ops = [ + {"t": "bind", "src": str(self.runtime), "dest": "/usr", "try": False, "ro": True}, + {"t": "bind", "src": str(self.app), "dest": "/app", "try": False, "ro": True}, + {"t": "symlink", "target": "usr/bin", "dest": "/bin"}, + ] + s.command = command + return s + + def test_an_x86_64_program_found_on_path_runs_through_fex(self): + s = self.spec(["ldconfig", "-X", "-C", "/run/cache"]) + self.assertTrue(self.shim["through_fex"](s)) + self.assertEqual(["/run/droiddeck-fex/bin/FEX", "/usr/bin/ldconfig", "-X", "-C", "/run/cache"], s.command) + dests = {op["dest"]: op["src"] for op in s.ops if op["t"] == "bind"} + self.assertEqual(str(self.fex / "bin/FEX"), dests["/run/droiddeck-fex/bin/FEX"]) + self.assertEqual(str(self.fex / "lib/libxxhash.so.0"), dests["/run/droiddeck-fex/lib/libxxhash.so.0"]) + self.assertIn("/usr/lib/aarch64-linux-gnu", dests) + self.assertIn("/usr/lib/ld-linux-aarch64.so.1", dests) + self.assertNotIn("FEX_ROOTFS", s.env) + self.assertEqual("/home/user/.var/app/x/cache/droiddeck-fex/", s.env["FEX_APP_DATA_LOCATION"]) + + def test_a_script_whose_interpreter_is_x86_64_runs_through_fex(self): + s = self.spec(["r2modman", "--flag"]) + self.assertTrue(self.shim["through_fex"](s)) + self.assertEqual(["/run/droiddeck-fex/bin/FEX", "/app/bin/r2modman", "--flag"], s.command) + + def test_a_program_reached_through_a_sandbox_symlink_is_checked(self): + s = self.spec(["/bin/sh", "-c", "true"]) + self.assertTrue(self.shim["through_fex"](s)) + self.assertEqual("/bin/sh", s.command[1]) + + def test_a_bind_whose_source_is_a_symlink_resolves_from_the_source(self): + real = self.dir / "store" / "tool-real" + elf(real, 62) + os.symlink("tool-real", self.dir / "store" / "tool-link") + s = self.spec(["/opt/tool"]) + s.ops.append({"t": "bind", "src": str(self.dir / "store" / "tool-link"), "dest": "/opt/tool", "try": False, + "ro": True}) + self.assertTrue(self.shim["through_fex"](s)) + self.assertEqual("/opt/tool", s.command[1]) + + def test_a_relative_path_entry_is_searched_from_the_working_directory(self): + s = self.spec(["r2modman"], path="bin") + s.cwd = "/app" + self.assertTrue(self.shim["through_fex"](s)) + self.assertEqual("/app/bin/r2modman", s.command[1]) + + def test_an_arm64_program_runs_as_it_is(self): + s = self.spec(["arm-tool"]) + self.assertFalse(self.shim["through_fex"](s)) + self.assertEqual(["arm-tool"], s.command) + self.assertEqual(3, len(s.ops)) + + def test_a_missing_program_is_left_alone(self): + s = self.spec(["nothing-here"]) + self.assertFalse(self.shim["through_fex"](s)) + self.assertEqual(["nothing-here"], s.command) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_ci_checks.py b/tools/tests/test_ci_checks.py index b7c29fceba..52c1607aad 100644 --- a/tools/tests/test_ci_checks.py +++ b/tools/tests/test_ci_checks.py @@ -82,7 +82,7 @@ class CiChecksTest(unittest.TestCase): gate = jobs['checks'] self.assertEqual(gate['name'], 'Compile and test APK') self.assertEqual(set(gate['needs']), {'build', 'python-tests'}) - self.assertIn('always()', gate['if']) + self.assertIn('!cancelled()', gate['if']) for build, python in itertools.product(('success', 'failure', 'cancelled', 'skipped'), repeat=2): with self.subTest(build=build, python=python): result = subprocess.run( diff --git a/tools/tests/test_client_core_mask.py b/tools/tests/test_client_core_mask.py index 59178b4dbb..9462c43af6 100644 --- a/tools/tests/test_client_core_mask.py +++ b/tools/tests/test_client_core_mask.py @@ -1,4 +1,3 @@ -"""Single-core Steam affinity is rechecked even if its thread count stayed the same.""" import subprocess import tempfile import unittest diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index c808f47227..dda4e5b6ee 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -43,6 +43,41 @@ class ClientZramFocusTest(unittest.TestCase): self.assertEqual('', result.stderr) self.assertEqual('5000010 5000011 5000012|5000013 5000014 5000015|1| 413150', result.stdout.strip()) + def scan_fake(self, tasks): + with tempfile.TemporaryDirectory() as tmp: + for pid, argv in tasks: + self.write_cmd(Path(tmp), pid, argv) + source = function_source('bl_zram_scan').replace('/proc/[0-9]*', tmp + '/[0-9]*') + return run_bash(source + '\nbl_zram_scan\necho "${_bl_pids[*]}|${_bl_others[*]}|$_bl_game"') + + def test_battlenet_is_compressed_with_the_client_while_one_of_its_games_runs(self): + launcher = [ + (6000010, ['/s/steamrtarm64/steam', '-gamepadui']), + (6000011, ['/s/reaper', 'SteamLaunch', 'AppId=2899116412', '--', 'droiddeck-battlenet']), + (6000012, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.exe', '--exec=launch S1']), + (6000013, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.15511\\Battle.net Helper.exe', '--type=renderer']), + (6000014, ['C:\\ProgramData\\Battle.net\\Agent\\Agent.9324\\Agent.exe', '--internalclienttools']), + (6000015, ['C:\\windows\\system32\\services.exe']), + (6000016, ['C:\\windows\\system32\\winedevice.exe', '-uid']), + ] + game = [(6000017, ['S:\\Games\\StarCraft\\x86\\StarCraft.exe', '-launch', '-uid', 's1'])] + before = self.scan_fake(launcher) + during = self.scan_fake(launcher + game) + for result in (before, during): + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual('6000010|6000015 6000016 6000012 6000013 6000014|1', before.stdout.strip()) + self.assertEqual('6000010 6000012 6000013 6000014|6000015 6000016 6000017|1', during.stdout.strip()) + + def test_a_game_without_a_battlenet_uid_leaves_battlenet_alone(self): + result = self.scan_fake([ + (6000020, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.exe']), + (6000021, ['D:\\Games\\Other\\Game.exe', '-windowed']), + (6000022, ['/usr/bin/wine', 'game.exe', '-uid']), + ]) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('|6000021 6000022 6000020|0', result.stdout.strip()) + def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self): source = SCRIPT.read_text() start = source.index(' if [ "$_bl_game" = 1 ] && bl_game_focused; then') diff --git a/tools/tests/test_clock_pause_preload.py b/tools/tests/test_clock_pause_preload.py new file mode 100644 index 0000000000..6523811125 --- /dev/null +++ b/tools/tests/test_clock_pause_preload.py @@ -0,0 +1,137 @@ +import os +from pathlib import Path +import shutil +import struct +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +PROGRAM = r""" +#define _GNU_SOURCE +#include <linux/futex.h> +#include <pthread.h> +#include <semaphore.h> +#include <stdint.h> +#include <stdio.h> +#include <sys/syscall.h> +#include <sys/timerfd.h> +#include <time.h> +#include <unistd.h> + +static int64_t ns(clockid_t clock) { + struct timespec ts; + clock_gettime(clock, &ts); + return (int64_t)ts.tv_sec * 1000000000LL + ts.tv_nsec; +} + +static struct timespec in(clockid_t clock, int64_t delay) { + int64_t t = ns(clock) + delay; + struct timespec ts = {(time_t)(t / 1000000000LL), (long)(t % 1000000000LL)}; + return ts; +} + +static int64_t start; +static void begin(void) { start = ns(CLOCK_BOOTTIME); } +static void end(const char *name) { printf("%s %lld\n", name, (long long)((ns(CLOCK_BOOTTIME) - start) / 1000000LL)); } + +int main(void) { + const int64_t wait = 60000000LL; + printf("gap %lld\n", (long long)((ns(CLOCK_BOOTTIME) - ns(CLOCK_MONOTONIC)) / 1000000LL)); + struct timespec raw; + syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &raw); + printf("rawgap %lld\n", (long long)((ns(CLOCK_BOOTTIME) - ((int64_t)raw.tv_sec * 1000000000LL + raw.tv_nsec)) / 1000000LL)); + + pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + pthread_condattr_t attr; + pthread_cond_t mono, real; + pthread_condattr_init(&attr); + pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); + pthread_cond_init(&mono, &attr); + pthread_cond_init(&real, NULL); + struct timespec ts; + + pthread_mutex_lock(&mutex); + ts = in(CLOCK_MONOTONIC, wait); begin(); pthread_cond_timedwait(&mono, &mutex, &ts); end("cond_mono"); + ts = in(CLOCK_REALTIME, wait); begin(); pthread_cond_timedwait(&real, &mutex, &ts); end("cond_real"); + ts = in(CLOCK_MONOTONIC, wait); begin(); pthread_cond_clockwait(&real, &mutex, CLOCK_MONOTONIC, &ts); end("clockwait"); + pthread_mutex_unlock(&mutex); + + sem_t sem; + sem_init(&sem, 0, 0); + ts = in(CLOCK_MONOTONIC, wait); begin(); sem_clockwait(&sem, CLOCK_MONOTONIC, &ts); end("sem"); + + ts = in(CLOCK_MONOTONIC, wait); begin(); clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &ts, NULL); end("nanosleep"); + + int fd = timerfd_create(CLOCK_MONOTONIC, 0); + struct itimerspec it = {{0, 0}, in(CLOCK_MONOTONIC, wait)}; + uint64_t ticks; + timerfd_settime(fd, TFD_TIMER_ABSTIME, &it, NULL); + begin(); if (read(fd, &ticks, sizeof(ticks)) < 0) ticks = 0; end("timerfd"); + + static uint32_t word; + ts = in(CLOCK_MONOTONIC, wait); begin(); + syscall(SYS_futex, &word, FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG, 0, &ts, NULL, FUTEX_BITSET_MATCH_ANY); + end("futex"); + return 0; +} +""" + +SHIFT_MS = 10000 + + +@unittest.skipUnless(shutil.which("cc"), "needs a C compiler") +class ClockPausePreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.temp = tempfile.TemporaryDirectory() + cls.dir = Path(cls.temp.name) + cls.control = cls.dir / "clock" + build = cls.dir / "build" + build.mkdir() + (build / "program.c").write_text(PROGRAM) + cls.preload = build / "libblsession.so" + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-DBL_CLOCK_ANY_ARCH", + '-DCP_CTL="%s"' % cls.control, "-o", str(cls.preload), + *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) + cls.shell = build / "plasmashell" + subprocess.run(["cc", "-O2", "-pthread", "-o", str(cls.shell), str(build / "program.c")], check=True) + cls.other = build / "kwin_wayland" + shutil.copy(cls.shell, cls.other) + + @classmethod + def tearDownClass(cls): + cls.temp.cleanup() + + def run_program(self, program, shift_ms, preload=True): + self.control.write_bytes(struct.pack("<q", shift_ms * 1000000)) + env = dict(os.environ) + if preload: + env["LD_PRELOAD"] = str(self.preload) + result = subprocess.run([str(program)], env=env, capture_output=True, text=True, check=True, timeout=30) + return {name: int(value) for name, value in (line.split() for line in result.stdout.splitlines())} + + def test_the_shell_sees_monotonic_time_stopped_for_the_pause(self): + plain = self.run_program(self.shell, 0) + paused = self.run_program(self.shell, SHIFT_MS) + self.assertAlmostEqual(paused["gap"] - plain["gap"], SHIFT_MS, delta=50) + self.assertAlmostEqual(paused["rawgap"] - plain["rawgap"], SHIFT_MS, delta=50) + + def test_timed_waits_last_as_long_as_asked_after_a_pause(self): + paused = self.run_program(self.shell, SHIFT_MS) + for name in ("cond_mono", "cond_real", "clockwait", "sem", "nanosleep", "timerfd", "futex"): + self.assertGreaterEqual(paused[name], 50, name) + self.assertLess(paused[name], 1000, name) + + def test_other_programs_keep_the_real_clock(self): + plain = self.run_program(self.other, 0, preload=False) + paused = self.run_program(self.other, SHIFT_MS) + self.assertAlmostEqual(paused["gap"], plain["gap"], delta=50) + for name in ("cond_mono", "clockwait", "sem", "nanosleep", "timerfd", "futex"): + self.assertGreaterEqual(paused[name], 50, name) + self.assertLess(paused[name], 1000, name) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_close_eio_preload.py b/tools/tests/test_close_eio_preload.py new file mode 100644 index 0000000000..0abe77d7b1 --- /dev/null +++ b/tools/tests/test_close_eio_preload.py @@ -0,0 +1,112 @@ +import errno +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +SHIM = r""" +#define _GNU_SOURCE +#include <errno.h> +#include <limits.h> +#include <stdio.h> +#include <string.h> +#include <sys/syscall.h> +#include <unistd.h> + +int close(int fd) { + char link[64], path[PATH_MAX]; + snprintf(link, sizeof link, "/proc/self/fd/%d", fd); + ssize_t n = readlink(link, path, sizeof path - 1); + path[n > 0 ? n : 0] = 0; + long r = syscall(SYS_close, fd); + if (r == 0 && n > 4 && !strcmp(path + n - 4, ".eio")) { + errno = EIO; + return -1; + } + return (int)r; +} +""" + +PROGRAM = r""" +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <unistd.h> + +static void check(const char *name, const char *path, int flags) { + int fd = open(path, flags); + if (fd < 0) { printf("%s open-failed\n", name); return; } + char b[4]; + if (read(fd, b, sizeof b) < 0) {} + errno = 0; + int r = close(fd); + int error = r ? errno : 0; + int still_open = fcntl(fd, F_GETFD) >= 0; + printf("%s %d %d %d\n", name, r, error, still_open); +} + +int main(int argc, char **argv) { + check("readonly", argv[1], O_RDONLY); + check("readwrite", argv[1], O_RDWR); + check("plain", argv[2], O_RDONLY); + errno = 0; + int r = close(-1); + printf("badfd %d %d\n", r, errno == EBADF); + return 0; +} +""" + + +@unittest.skipUnless(shutil.which("cc"), "needs a C compiler") +class CloseEioPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.temp = tempfile.TemporaryDirectory() + cls.dir = Path(cls.temp.name) + (cls.dir / "shim.c").write_text(SHIM) + (cls.dir / "program.c").write_text(PROGRAM) + cls.preload = cls.dir / "libblsession.so" + cls.shim = cls.dir / "libshim.so" + cls.program = cls.dir / "program" + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-DBL_CLOCK_ANY_ARCH", + '-DCP_CTL="%s"' % (cls.dir / "clock"), "-o", str(cls.preload), + *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl"], check=True) + subprocess.run(["cc", "-shared", "-fPIC", "-O2", "-o", str(cls.shim), str(cls.dir / "shim.c")], check=True) + subprocess.run(["cc", "-O2", "-o", str(cls.program), str(cls.dir / "program.c")], check=True) + (cls.dir / "data.eio").write_bytes(b"data") + (cls.dir / "plain").write_bytes(b"data") + + @classmethod + def tearDownClass(cls): + cls.temp.cleanup() + + def run_program(self, preloads): + env = dict(os.environ, LD_PRELOAD=":".join(map(str, preloads))) + result = subprocess.run([str(self.program), str(self.dir / "data.eio"), str(self.dir / "plain")], + env=env, capture_output=True, text=True, check=True, timeout=30) + return {line.split()[0]: line.split()[1:] for line in result.stdout.splitlines()} + + def test_a_flush_error_on_a_read_only_file_is_not_a_close_failure(self): + out = self.run_program([self.preload, self.shim]) + self.assertEqual(["0", "0", "0"], out["readonly"]) + + def test_a_flush_error_after_writing_access_is_still_reported(self): + out = self.run_program([self.preload, self.shim]) + self.assertEqual(["-1", str(errno.EIO), "0"], out["readwrite"]) + + def test_other_closes_are_unchanged(self): + out = self.run_program([self.preload, self.shim]) + self.assertEqual(["0", "0", "0"], out["plain"]) + self.assertEqual(["-1", "1"], out["badfd"]) + + def test_without_the_session_library_the_error_reaches_the_program(self): + out = self.run_program([self.shim]) + self.assertEqual("-1", out["readonly"][0]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_component_prepare.py b/tools/tests/test_component_prepare.py index b513c8fe75..d86fff9b3c 100644 --- a/tools/tests/test_component_prepare.py +++ b/tools/tests/test_component_prepare.py @@ -57,6 +57,26 @@ class ComponentPrepareTest(unittest.TestCase): script.write_text(script.read_text() + '\nprintf changed\n') self.assertNotEqual(changed, components.identity('fake', self.root)) + def test_identity_follows_a_submodule_commit(self): + library = self.root / 'library' + subprocess.run(['git', 'init', '-q', str(library)], check=True) + def commit(text): + (library / 'source.c').write_text(text) + subprocess.run(['git', '-C', str(library), 'add', '.'], check=True) + subprocess.run(['git', '-C', str(library), '-c', 'user.name=Test Developer', '-c', 'user.email=test@example.test', + 'commit', '-qm', text], check=True) + return subprocess.check_output(['git', '-C', str(library), 'rev-parse', 'HEAD'], text=True).strip() + first = commit('int a;\n') + subprocess.run(['git', '-C', str(self.root), 'add', 'library'], check=True) + spec = dict(script='tools/components/recipes/fake.sh', inputs=['library'], outputs=[]) + (self.root / components.REGISTRY).write_text(json.dumps(dict(fake=spec))) + original = components.identity('fake', self.root) + commit('int b;\n') + self.assertEqual(original, components.identity('fake', self.root)) + subprocess.run(['git', '-C', str(self.root), 'add', 'library'], check=True) + self.assertNotEqual(original, components.identity('fake', self.root)) + self.assertNotEqual(first, subprocess.check_output(['git', '-C', str(library), 'rev-parse', 'HEAD'], text=True).strip()) + def test_tool_requirements_are_installed_in_one_union(self): definitions = dict(one=dict(packages=['gcc', 'cmake']), two=dict(packages=['gcc', 'qemu-user'])) with patch.object(components, 'registry', return_value=definitions), patch.object(components.subprocess, 'run') as run: diff --git a/tools/tests/test_cursor_composite.py b/tools/tests/test_cursor_composite.py new file mode 100644 index 0000000000..b3788d348f --- /dev/null +++ b/tools/tests/test_cursor_composite.py @@ -0,0 +1,53 @@ +import os +from pathlib import Path +import re +import shutil +import subprocess +import tempfile +import unittest + +REPO = Path(__file__).resolve().parents[2] + + +class CursorCompositeTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + compiler = shutil.which(os.environ.get('CC', 'cc')) + if compiler is None: + raise unittest.SkipTest('A host C compiler is required') + header = (REPO / 'app/src/main/cpp/waylandcomp/src/cardboard.h').read_text() + sources = dict(re.findall(r'CARDBOARD_SOURCE_(SCREEN|SBS|FLAT)\s*=\s*(\d+)', header)) + for name in ('SCREEN', 'SBS', 'FLAT'): + if name not in sources: + raise AssertionError(f'cardboard.h no longer defines CARDBOARD_SOURCE_{name}') + if sources['SBS'] != '1': + raise AssertionError(f'CARDBOARD_SOURCE_SBS is {sources["SBS"]}, expected 1') + + source = (REPO / 'app/src/main/cpp/waylandcomp/src/compositor.c').read_text() + start = source.index('static int cursor_scene_positions(int scene_w, int source, int ptr_x, int hx, int out[2]) {') + end = source.index('\n}\n', start) + 3 + + cls.temp = tempfile.TemporaryDirectory(prefix='droiddeck-cursor-composite-') + cls.addClassCleanup(cls.temp.cleanup) + folder = Path(cls.temp.name) + (folder / 'cursor_scene_positions.inc').write_text(source[start:end]) + start = source.index('static int cursor_clip_to_eye(int scene_w, int eye, int x0, int w, int *dx, int *sx, int *dw) {') + end = source.index('\n}\n', start) + 3 + (folder / 'cursor_clip_to_eye.inc').write_text(source[start:end]) + (folder / 'cursor_constants.inc').write_text( + f'#define CARDBOARD_SOURCE_SCREEN {sources["SCREEN"]}\n' + f'#define CARDBOARD_SOURCE_SBS {sources["SBS"]}\n' + f'#define CARDBOARD_SOURCE_FLAT {sources["FLAT"]}\n') + cls.binary = folder / 'cursor-composite-test' + subprocess.run([compiler, '-std=c11', '-Wall', '-Wextra', '-Werror', '-I', str(folder), + str(REPO / 'tools/tests/cursor_composite_harness.c'), + '-o', str(cls.binary)], check=True, capture_output=True, text=True) + + def test_cursor_is_drawn_once_for_one_eye_and_mirrored_for_sbs(self): + result = subprocess.run([str(self.binary)], capture_output=True, text=True) + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + self.assertIn('PASS: cursor stereo placement', result.stdout) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_desktop_gpu_window.py b/tools/tests/test_desktop_gpu_window.py index ba3bfc5492..5a1ccb5ff4 100644 --- a/tools/tests/test_desktop_gpu_window.py +++ b/tools/tests/test_desktop_gpu_window.py @@ -32,6 +32,7 @@ class DesktopGpuWindowTest(unittest.TestCase): def test_on_the_desktop_the_game_gets_a_window_of_its_own(self): run = self.run_gpu(WAYLAND_DISPLAY="wayland-1", MESA_VK_WSI_DEBUG="sw,linear") self.assertEqual(run["args"][:2], ["--backend", "sdl"]) + self.assertIn("--follow-game-window-mode", run["args"]) self.assertNotIn("-f", run["args"]) self.assertEqual(run["args"][-2:], ["/usr/local/bin/droiddeck-gpu-window", "game.exe"]) self.assertEqual(run["env"]["WAYLAND_DISPLAY"], "wayland-1") @@ -44,6 +45,7 @@ class DesktopGpuWindowTest(unittest.TestCase): for env in ({"WAYLAND_DISPLAY": "wayland-1", "BL_DESKTOP_GPU_WINDOW": "0"}, {"WAYLAND_DISPLAY": "wayland-0"}, {}): run = self.run_gpu(**env) self.assertEqual(run["args"][:2], ["--backend", "wayland"]) + self.assertNotIn("--follow-game-window-mode", run["args"]) self.assertIn("-f", run["args"]) self.assertEqual(run["env"]["WAYLAND_DISPLAY"], "wayland-0") self.assertIsNone(run["env"]["MESA_VK_WSI_DEBUG"]) diff --git a/tools/tests/test_desktop_open.py b/tools/tests/test_desktop_open.py index ef299963b7..39eee38cf9 100644 --- a/tools/tests/test_desktop_open.py +++ b/tools/tests/test_desktop_open.py @@ -316,7 +316,6 @@ class GameFolderTest(Temp): def appinfo(apps): - """appinfo.vdf as the client writes it (format 29: keys in a string table).""" strings = [] def key(name): diff --git a/tools/tests/test_droiddeck_agent.py b/tools/tests/test_droiddeck_agent.py index 7989afa9dc..02e53f9607 100644 --- a/tools/tests/test_droiddeck_agent.py +++ b/tools/tests/test_droiddeck_agent.py @@ -1,4 +1,3 @@ -"""The guest agent: its request files, exec, errors and the DevTools client, without a session.""" import base64 import hashlib import importlib.machinery @@ -26,7 +25,6 @@ loader.exec_module(agent) class FakeDevTools(threading.Thread): - """GET /json lists one target; its WebSocket answers Runtime.evaluate the way Chromium does.""" def __init__(self, answer): super().__init__(daemon=True) @@ -857,7 +855,6 @@ class VrFocusTest(unittest.TestCase): self.assertEqual(focus.order([42, 9, 7], [7, 42], None), [9, 7]) self.assertIsNone(focus.order([9, 7], [7], 42)) self.assertEqual(focus.order([9, 7], [7, 42], 42), [42, 9, 7]) - # Do not overwrite a different focus order installed after our last write. self.assertIsNone(focus.order([123, 7], [7, 42], None)) def test_scene_requires_live_server_and_game_environment(self): diff --git a/tools/tests/test_droiddeckctl.py b/tools/tests/test_droiddeckctl.py index 82ff7daa06..1fb7e3fde6 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -1,4 +1,3 @@ -"""droiddeckctl and droiddeck-scenario against a fake adb: the JSON contract and exit codes.""" import base64 import contextlib import importlib.machinery @@ -61,6 +60,16 @@ FAKE_ADB = textwrap.dedent('''\ print(config.get("timestats", "")) elif args[:2] == ["exec-out", "screencap"]: sys.stdout.buffer.write(b"\\x89PNG fake") + elif args[:3] == ["shell", "dumpsys", "battery"]: + temperatures = config.get("battery", [""]) + count = config.setdefault("counts", {}).get("battery", 0) + config["counts"]["battery"] = count + 1 + json.dump(config, open(config_path, "w")) + print(temperatures[min(count, len(temperatures) - 1)]) + elif args[:3] == ["shell", "dumpsys", "thermalservice"]: + print(config.get("thermalservice", "")) + elif args[:3] == ["shell", "grep", "."]: + print(config.get("cpufreq", "")) with open(config["log"], "a") as log: log.write(json.dumps(entry) + "\\n") ''') @@ -88,8 +97,6 @@ def timestats_record(name, frames, histogram, hz): f"present2present histogram is as below:\n{bins}\nlatch2present histogram is as below:\n8ms={frames}\n") -# A capture where the panel went from 60 to 120 Hz: the game layer is split in two records. The -# activity's own window and an unrelated app draw too, and must not count. TIMESTATS_SPLIT = "SurfaceFlinger TimeStats:\ntotalFrames = 2000\n" + "".join([ timestats_record("droiddeck_wayland_game#6110", 900, {16: 700, 33: 199}, 60), timestats_record("droiddeck_wayland_game#6110", 900, {16: 850, 25: 49}, 120), @@ -99,7 +106,6 @@ TIMESTATS_SPLIT = "SurfaceFlinger TimeStats:\ntotalFrames = 2000\n" + "".join([ timestats_record("StatusBar#106", 1, {}, 60), ]) -# A build that presents the game on the session's SurfaceView instead of a layer of its own. TIMESTATS_SURFACEVIEW = "SurfaceFlinger TimeStats:\n" + "".join([ timestats_record("a1b2c3 SurfaceView[com.droiddeck.launcher/com.droiddeck.launcher.SessionActivity]#77", 1800, {16: 1796, 33: 3}, 120), @@ -107,6 +113,25 @@ TIMESTATS_SURFACEVIEW = "SurfaceFlinger TimeStats:\n" + "".join([ ]) +THERMALSERVICE = textwrap.dedent('''\ + IsStatusOverride: false + Thermal Status: 2 + Cached temperatures: + \tTemperature{mValue=41.3, mType=3, mName=skin, mStatus=2} +''') + +CPUFREQ = textwrap.dedent('''\ + /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq:3532800 + /sys/devices/system/cpu/cpufreq/policy6/scaling_max_freq:2918400 + /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_max_freq:3532800 + /sys/devices/system/cpu/cpufreq/policy6/cpuinfo_max_freq:4473600 +''') + + +def battery(tenths): + return f"Current Battery Service state:\n level: 80\n temperature: {tenths}\n technology: Li-poly" + + def state(phase="READY", focused=None, focusable=()): focus = None if focused is None else {"focusedApp": focused, "focusableApps": list(focusable), "baselayerAppIds": [], "seq": 1, "t": 0} @@ -155,7 +180,7 @@ class DroiddeckctlTest(FakeAdbTest): with unittest.mock.patch.dict(os.environ, {"DROIDDECK_PACKAGE": "com.antutu.benchmark.full"}): variant = load("droiddeckctl") self.assertEqual("content://com.antutu.benchmark.full.agent", variant.AUTHORITY) - with self.assertRaises(variant.ControlError): # the fake adb does not answer `am start` + with self.assertRaises(variant.ControlError): variant.start_agent_activity(str(self.adb), "fake-1", {"mode": "steam"}) started = [e["args"] for e in self.calls() if e["args"][:3] == ["shell", "am", "start"]] self.assertIn("com.antutu.benchmark.full/com.droiddeck.launcher.agent.AgentStartActivity", started[0]) @@ -449,6 +474,40 @@ class DroiddeckctlTest(FakeAdbTest): self.assertEqual(7, code) self.assertFalse([c for c in self.calls() if c["args"][:1] == ["push"]]) + def test_thermal_reads_battery_status_and_cpu_caps(self): + self.configure({}, battery=[battery(386)], thermalservice=THERMALSERVICE, cpufreq=CPUFREQ) + code, out = self.run_ctl("thermal") + self.assertEqual(0, code, out) + self.assertEqual(38.6, out["batteryC"]) + self.assertEqual([2, "MODERATE"], [out["status"], out["statusName"]]) + self.assertEqual({"policy0": {"maxKHz": 3532800, "hardwareMaxKHz": 3532800, "capped": False}, + "policy6": {"maxKHz": 2918400, "hardwareMaxKHz": 4473600, "capped": True}}, out["cpu"]) + + def test_thermal_without_readings_answers_nulls(self): + code, out = self.run_ctl("thermal") + self.assertEqual(0, code, out) + self.assertEqual([None, None, None, {}], [out["batteryC"], out["status"], out["statusName"], out["cpu"]]) + + def test_wait_cool_polls_until_the_battery_is_below(self): + self.configure({}, battery=[battery(412), battery(395), battery(379)], thermalservice=THERMALSERVICE) + with unittest.mock.patch.object(ctl.time, "sleep") as slept: + code, out = self.run_ctl("wait", "cool", "--below", "38", "--timeout", "600") + self.assertEqual(0, code, out) + self.assertEqual(["wait", 37.9], [out["command"], out["batteryC"]]) + self.assertEqual(2, slept.call_count) + + def test_wait_cool_times_out_with_exit_5(self): + self.configure({}, battery=[battery(412)]) + code, out = self.run_ctl("wait", "cool", "--below", "38", "--timeout", "0") + self.assertEqual(5, code) + self.assertIn("41.2", out["error"]["message"]) + + def test_wait_cool_needs_below_and_a_battery_temperature(self): + code, out = self.run_ctl("wait", "cool") + self.assertEqual(["INVALID_ARGUMENTS", 2], [out["error"]["code"], code]) + code, out = self.run_ctl("wait", "cool", "--below", "38") + self.assertEqual("THERMAL_FAILED", out["error"]["code"]) + class ScenarioTest(FakeAdbTest): def write(self, body): diff --git a/tools/tests/test_flatpak_bundle_arch.py b/tools/tests/test_flatpak_bundle_arch.py new file mode 100644 index 0000000000..b46848b704 --- /dev/null +++ b/tools/tests/test_flatpak_bundle_arch.py @@ -0,0 +1,136 @@ +import importlib.machinery +import importlib.util +import io +import json +from pathlib import Path +import sys +import types +import unittest +from contextlib import redirect_stdout + +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-flatpak" + + +class FakeRef: + def __init__(self, arch): + self.arch = arch + + def get_name(self): + return "io.github.ebkr.r2modman" + + def get_arch(self): + return self.arch + + +def load(bundle_arch, installs): + flatpak = types.SimpleNamespace( + get_default_arch=lambda: "aarch64", + BundleRef=types.SimpleNamespace(new=lambda bundle: FakeRef(bundle_arch)), + ) + repository = types.ModuleType("gi.repository") + repository.Flatpak = flatpak + repository.Gio = types.SimpleNamespace(File=types.SimpleNamespace(new_for_path=lambda path: path)) + repository.GLib = types.SimpleNamespace(Error=RuntimeError) + gi = types.ModuleType("gi") + gi.require_version = lambda *args: None + gi.repository = repository + saved = {name: sys.modules.get(name) for name in ("gi", "gi.repository")} + sys.modules["gi"] = gi + sys.modules["gi.repository"] = repository + try: + loader = importlib.machinery.SourceFileLoader("droiddeck_flatpak", str(SCRIPT)) + module = importlib.util.module_from_spec(importlib.util.spec_from_loader(loader.name, loader)) + loader.exec_module(module) + finally: + for name, value in saved.items(): + if value is None: + sys.modules.pop(name, None) + else: + sys.modules[name] = value + module.installation = lambda: object() + module.app_ref = lambda inst, app_id: None + + def transaction(inst): + installs.append("bundle") + raise AssertionError("the bundle reached a transaction") + + module.transaction = transaction + return module + + +class FlatpakBundleArchTest(unittest.TestCase): + def run_install(self, arch): + installs = [] + module = load(arch, installs) + out = io.StringIO() + with redirect_stdout(out): + try: + rc = module.install_bundle("/tmp/r2modman.flatpak") + except AssertionError: + rc = None + return rc, [json.loads(line) for line in out.getvalue().splitlines()], installs + + def test_a_bundle_for_an_architecture_fex_cannot_run_is_refused_before_installing(self): + rc, events, installs = self.run_install("riscv64") + self.assertEqual(rc, 1) + self.assertEqual(installs, []) + self.assertEqual(events[0]["e"], "error") + self.assertEqual(events[0]["code"], "arch") + self.assertEqual(events[0]["arch"], "riscv64") + self.assertEqual(events[0]["id"], "io.github.ebkr.r2modman") + + def test_a_bundle_for_this_device_goes_on_to_install(self): + rc, events, installs = self.run_install("aarch64") + self.assertEqual(installs, ["bundle"]) + self.assertEqual(events, []) + + def test_an_x86_64_bundle_goes_on_to_install_for_fex(self): + rc, events, installs = self.run_install("x86_64") + self.assertEqual(installs, ["bundle"]) + self.assertEqual(events, []) + + def test_flathub_falls_back_to_the_x86_64_build(self): + module = load("aarch64", []) + asked = [] + + class Remote: + def __init__(self, branch): + self.branch = branch + + def get_branch(self): + return self.branch + + class Installation: + def fetch_remote_ref_sync(self, remote, kind, app_id, arch, branch, cancellable): + asked.append((arch, branch)) + if arch == "x86_64" and branch == "stable": + return Remote("stable") + raise RuntimeError("not found") + + added = [] + + class Transaction: + def add_install(self, remote, ref, subpaths): + added.append(ref) + + module.Flatpak.RefKind = types.SimpleNamespace(APP=0) + module.installation = lambda: Installation() + installed = [] + module.app_ref = lambda inst, app_id: (installed[0] if installed else None) + module.transaction = lambda inst: (Transaction(), {}) + + def run(t, state, report_done=True): + installed.append(object()) + return 0 + + module.run = run + out = io.StringIO() + with redirect_stdout(out): + rc = module.install("io.github.ebkr.r2modman") + self.assertEqual(rc, 0) + self.assertEqual(asked, [("aarch64", "stable"), ("aarch64", "master"), ("x86_64", "stable")]) + self.assertEqual(added, ["app/io.github.ebkr.r2modman/x86_64/stable"]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_flatpak_system_bus.py b/tools/tests/test_flatpak_system_bus.py new file mode 100644 index 0000000000..ebddaa3a6e --- /dev/null +++ b/tools/tests/test_flatpak_system_bus.py @@ -0,0 +1,199 @@ +import importlib.machinery +import importlib.util +import os +from pathlib import Path +import socket +import sys +import tempfile +import types +import unittest +from unittest import mock + +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-flatpak" + + +def load(): + repository = types.ModuleType("gi.repository") + repository.Flatpak = types.SimpleNamespace() + repository.Gio = types.SimpleNamespace() + repository.GLib = types.SimpleNamespace(Error=RuntimeError) + gi = types.ModuleType("gi") + gi.require_version = lambda *args: None + gi.repository = repository + saved = {name: sys.modules.get(name) for name in ("gi", "gi.repository")} + sys.modules["gi"] = gi + sys.modules["gi.repository"] = repository + try: + loader = importlib.machinery.SourceFileLoader("droiddeck_flatpak_bus", str(SCRIPT)) + module = importlib.util.module_from_spec(importlib.util.spec_from_loader(loader.name, loader)) + loader.exec_module(module) + finally: + for name, value in saved.items(): + if value is None: + sys.modules.pop(name, None) + else: + sys.modules[name] = value + return module + + +class FakeDaemon: + started = [] + + def __init__(self, argv, **kwargs): + conf = next(a for a in argv if a.startswith("--config-file=")).split("=", 1)[1] + text = open(conf).read() + self.path = text.split("<listen>unix:path=", 1)[1].split("</listen>", 1)[0] + self.server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self.server.bind(self.path) + self.server.listen(4) + self.running = True + FakeDaemon.started.append(self) + + def poll(self): + return None if self.running else 0 + + def terminate(self): + self.running = False + self.server.close() + + def wait(self, timeout=None): + return 0 + + def kill(self): + self.terminate() + + +class FlatpakSystemBusTest(unittest.TestCase): + def setUp(self): + self.module = load() + self.tmp = tempfile.mkdtemp() + self.env = mock.patch.dict(os.environ, {"DBUS_SYSTEM_BUS_ADDRESS": "unix:path=" + os.path.join(self.tmp, "missing")}) + self.env.start() + FakeDaemon.started = [] + + def tearDown(self): + self.env.stop() + os.rmdir(self.tmp) + + def test_a_reachable_system_bus_is_used_as_it_is(self): + path = os.path.join(self.tmp, "system") + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind(path) + server.listen(1) + try: + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=" + path + with mock.patch.object(self.module.subprocess, "Popen", FakeDaemon): + self.assertIsNone(self.module.private_system_bus()) + self.assertEqual([], FakeDaemon.started) + finally: + server.close() + os.unlink(path) + + def test_without_a_system_bus_a_private_one_runs_for_the_command_and_is_removed_after(self): + with mock.patch.object(self.module.shutil, "which", return_value="/usr/bin/dbus-daemon"), \ + mock.patch.object(self.module.subprocess, "Popen", FakeDaemon): + bus = self.module.private_system_bus() + self.assertIsNotNone(bus) + _, work, conf, path = bus + self.assertEqual("unix:path=" + path, os.environ["DBUS_SYSTEM_BUS_ADDRESS"]) + self.assertTrue(self.module.bus_reachable(path)) + self.module.stop_system_bus(bus) + self.assertFalse(os.path.exists(work)) + + def test_any_reachable_address_in_a_list_counts_as_the_system_bus(self): + path = os.path.join(self.tmp, "system") + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind(path) + server.listen(1) + try: + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=%s;unix:guid=1,path=%s" % (os.path.join(self.tmp, "missing"), path) + with mock.patch.object(self.module.subprocess, "Popen", FakeDaemon): + self.assertIsNone(self.module.private_system_bus()) + self.assertEqual([], FakeDaemon.started) + finally: + server.close() + os.unlink(path) + + def test_escaped_and_abstract_addresses_are_probed_as_dbus_reads_them(self): + path = os.path.join(self.tmp, "sys-bus") + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind(path) + server.listen(1) + abstract = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + abstract.bind(b"\0droiddeck-flatpak-test-%d\xff" % os.getpid()) + abstract.listen(1) + try: + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=" + path.replace("-", "%2D") + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=%s;unix:abstract=droiddeck-flatpak-test-%d%%FF" % (os.path.join(self.tmp, "missing"), os.getpid()) + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:abstract=droiddeck-flatpak-missing-%d" % os.getpid() + self.assertFalse(self.module.system_bus_reachable()) + listener = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + listener.bind(("127.0.0.1", 0)) + listener.listen(8) + port = listener.getsockname()[1] + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:abstract=droiddeck-flatpak-missing-%d;tcp:host=127.0.0.1,port=%d" % (os.getpid(), port) + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "tcp:host=127.0.0.1,port=" + "".join("%%%02X" % ord(c) for c in str(port)) + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "tcp:host=127.0.0.1,port=000%d" % port + self.assertTrue(self.module.system_bus_reachable()) + listener.close() + self.assertFalse(self.module.system_bus_reachable()) + for bad in ("%C2%B2", "65536", "0", "000", "x", "9" * 5000): + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "tcp:host=127.0.0.1,port=" + bad + self.assertEqual([], self.module.system_bus_paths()) + self.assertFalse(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET" + self.assertTrue(self.module.system_bus_reachable()) + finally: + abstract.close() + server.close() + os.unlink(path) + + def test_a_daemon_that_cannot_launch_leaves_no_files_and_warns(self): + made = [] + real = tempfile.mkdtemp + + def mkdtemp(**kwargs): + made.append(real(**kwargs)) + return made[-1] + + with mock.patch.object(self.module.shutil, "which", return_value="/usr/bin/dbus-daemon"), \ + mock.patch.object(self.module.tempfile, "mkdtemp", mkdtemp), \ + mock.patch.object(self.module.subprocess, "Popen", side_effect=OSError("exec failed")), \ + mock.patch.object(self.module, "emit") as emit: + self.assertIsNone(self.module.private_system_bus()) + emit.assert_called_once() + self.assertFalse(os.path.exists(made[0])) + + def test_without_dbus_daemon_the_command_still_runs_and_warns(self): + with mock.patch.object(self.module.shutil, "which", return_value=None), \ + mock.patch.object(self.module, "emit") as emit: + self.assertIsNone(self.module.private_system_bus()) + emit.assert_called_once() + + def test_every_command_that_changes_apps_gets_a_system_bus(self): + calls = [] + self.module.private_system_bus = lambda: calls.append("start") or "bus" + self.module.stop_system_bus = lambda bus: calls.append("stop:%s" % bus) + self.module.prepare_rootfs = lambda: None + self.module.install = lambda app_id: calls.append("install") or 0 + self.module.updates = lambda: calls.append("updates") or 0 + with mock.patch.object(sys, "argv", ["droiddeck-flatpak", "install", "org.example.App"]), \ + mock.patch.object(self.module.signal, "signal") as handler: + self.assertEqual(0, self.module.main()) + self.assertEqual(["start", "install", "stop:bus"], calls) + self.assertEqual(self.module.signal.SIGTERM, handler.call_args[0][0]) + with self.assertRaises(SystemExit): + handler.call_args[0][1](self.module.signal.SIGTERM, None) + calls.clear() + with mock.patch.object(sys, "argv", ["droiddeck-flatpak", "updates"]): + self.assertEqual(0, self.module.main()) + self.assertNotIn("start", calls) + self.assertIn("updates", calls) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_frame_limit_sync.py b/tools/tests/test_frame_limit_sync.py index 0cbdc18fb9..b14b0771a1 100644 --- a/tools/tests/test_frame_limit_sync.py +++ b/tools/tests/test_frame_limit_sync.py @@ -1,4 +1,3 @@ -"""The Quick Access Frame Limit follows the panel when its refresh rate changes.""" from pathlib import Path import runpy import subprocess diff --git a/tools/tests/test_fsync_preload.py b/tools/tests/test_fsync_preload.py index 63007f3734..af8a51dc42 100644 --- a/tools/tests/test_fsync_preload.py +++ b/tools/tests/test_fsync_preload.py @@ -319,7 +319,7 @@ class FsyncPreloadTest(unittest.TestCase): source = base / "fsync-test.c" source.write_text(PROGRAM) subprocess.run(["cc", "-O2", "-Wall", "-fPIC", "-shared", "-pthread", "-o", str(cls.lib), - str(PRELOAD / "fsync.c"), str(PRELOAD / "robust.c"), str(PRELOAD / "noexec.c"), str(PRELOAD / "writewatch.c"), "-ldl"], check=True) + str(PRELOAD / "fsync.c"), str(PRELOAD / "robust.c"), str(PRELOAD / "noexec.c"), str(PRELOAD / "writewatch.c"), str(PRELOAD / "clockpause.c"), "-ldl"], check=True) subprocess.run(["cc", "-O2", "-Wall", "-pthread", "-o", str(cls.exe), str(source)], check=True) @classmethod diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 1f178c0f80..919d6673bb 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -29,6 +29,374 @@ def config_text(entries): return '"InstallConfigStore" { "Software" { "Valve" { "Steam" { "CompatToolMapping" { %s } } } } }' % mapping +class RenderPathDefaultsTest(unittest.TestCase): + DRIVER = "/drivers/DD-Turnip_v0.4.0/icd.json" + COMMAND = ["proton", "waitforexitandrun", "/games/Spintires/SpinTires.exe"] + + def apply(self, env=None, command=None, model="Adreno722", library="libvulkan_freedreno.so"): + env = dict({"VK_DRIVER_FILES": self.DRIVER} if env is None else env) + manifest = json.dumps({"ICD": {"library_path": library}}) + with mock.patch.object(Path, "read_text", return_value=model), \ + mock.patch.object(Path, "is_file", return_value=False), \ + mock.patch("builtins.open", mock.mock_open(read_data=manifest)): + note = MODULE["render_path_defaults"](command or self.COMMAND, env) + return env, note + + def test_tested_render_path_keeps_other_options(self): + env, note = self.apply({"VK_DRIVER_FILES": self.DRIVER, "DXVK_CONFIG": "d3d9.maxFrameLatency = 2; ", "CUSTOM": "kept"}) + self.assertEqual(env["DXVK_CONFIG"], "d3d9.maxFrameLatency = 2; dxvk.tilerMode = False") + self.assertEqual(env["CUSTOM"], "kept") + self.assertIsNotNone(note) + self.assertEqual(self.apply()[0]["DXVK_CONFIG"], "dxvk.tilerMode = False") + self.assertIsNotNone(self.apply({"VK_ICD_FILENAMES": self.DRIVER})[1]) + + def test_other_games_devices_and_drivers_keep_their_environment(self): + for changes in ( + {"command": ["proton", "waitforexitandrun", "/games/MudRunner.exe"]}, + {"command": ["proton", "run", self.COMMAND[2]]}, + {"command": ["proton"]}, + {"model": "Adreno740"}, + {"model": "Mali-G715"}, + {"library": "libvulkan.so"}, + {"env": {}}, + {"env": {"VK_DRIVER_FILES": "/drivers/new-turnip/icd.json"}}, + {"env": {"VK_DRIVER_FILES": "", "VK_ICD_FILENAMES": self.DRIVER}}, + ): + with self.subTest(changes=changes): + env, note = self.apply(**changes) + self.assertIsNone(note) + self.assertNotIn("DXVK_CONFIG", env) + + def test_explicit_environment_and_config_files_take_precedence(self): + for value in ("dxvk.tilerMode = Auto", "d3d9.maxFrameLatency = 1; dxvk.tilerMode=True", "dxvk.tilerMode = False"): + env, note = self.apply({"VK_DRIVER_FILES": self.DRIVER, "DXVK_CONFIG": value}) + self.assertIsNone(note) + self.assertEqual(env["DXVK_CONFIG"], value) + env, note = self.apply({"VK_DRIVER_FILES": self.DRIVER, "DXVK_CONFIG_FILE": "/games/custom.conf"}) + self.assertIsNone(note) + self.assertNotIn("DXVK_CONFIG", env) + with mock.patch.object(Path, "is_file", return_value=True): + env = {"VK_DRIVER_FILES": self.DRIVER} + self.assertIsNone(MODULE["render_path_defaults"](self.COMMAND, env)) + self.assertNotIn("DXVK_CONFIG", env) + + def test_unreadable_or_invalid_driver_metadata_leaves_launch_unchanged(self): + for data in ("not-json", "{}", '{"ICD":{"library_path":null}}'): + with mock.patch.object(Path, "read_text", return_value="Adreno722"), \ + mock.patch.object(Path, "is_file", return_value=False), \ + mock.patch("builtins.open", mock.mock_open(read_data=data)): + env = {"VK_DRIVER_FILES": self.DRIVER} + self.assertIsNone(MODULE["render_path_defaults"](self.COMMAND, env)) + self.assertNotIn("DXVK_CONFIG", env) + with mock.patch.object(Path, "read_text", side_effect=PermissionError), \ + mock.patch.object(Path, "is_file", return_value=False): + self.assertIsNone(MODULE["render_path_defaults"](self.COMMAND, {"VK_DRIVER_FILES": self.DRIVER})) + + +class DirtTelemetryFixTest(unittest.TestCase): + SHOWDOWN_ON = '<x><motion enabled="true" ip="127.0.0.1" port="20777" delay="1" extradata="3" /></x>' + SHOWDOWN_DEFAULT = '<x><motion enabled="true" ip="dbox" port="20777" delay="1" extradata="0" /></x>' + + def setUp(self): + self.tmp = tempfile.TemporaryDirectory() + root = Path(self.tmp.name) + self.prefix = root / "compatdata/2848447563" + self.proton = root / "Proton/proton" + self.own = root / "Proton/files/lib/wine/i386-windows/ws2_32.dll" + self.own.parent.mkdir(parents=True) + self.own.write_bytes(b"MZ wine ws2_32") + self.proton.write_text("") + self.target = self.prefix / "pfx/drive_c/windows/syswow64/ws2_32.dll" + self.target.parent.mkdir(parents=True) + self.target.symlink_to(self.own) + self.stand_in = root / "droiddeck-dirt/ws2_32.dll" + self.stand_in.parent.mkdir() + self.stand_in.write_bytes(b"MZ droiddeck-dirt-ws2_32 stand-in") + self.patch = mock.patch.dict(MODULE["dirt_ws2_wanted"].__globals__, {"DIRT_WS2": str(self.stand_in)}) + self.patch.start() + + def tearDown(self): + self.patch.stop() + self.tmp.cleanup() + + def config(self, folder, text): + path = self.prefix / "pfx/drive_c/users/steamuser/Documents/My Games" / folder / "hardwaresettings/hardware_settings_config.xml" + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text(text) + + def command(self, exe="showdown.exe"): + return [str(self.proton), "waitforexitandrun", "/root/Storage/games/DiRT Showdown/" + exe] + + def env(self): + return {"STEAM_COMPAT_DATA_PATH": str(self.prefix)} + + def test_telemetry_counts_as_on_when_the_game_sends_somewhere(self): + self.config("DiRT Showdown", self.SHOWDOWN_DEFAULT) + self.assertFalse(MODULE["dirt_telemetry_on"](self.prefix, "dirtshowdown")) + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.assertTrue(MODULE["dirt_telemetry_on"](self.prefix, "dirtshowdown")) + self.config("DiRT Showdown", self.SHOWDOWN_ON.replace('enabled="true"', 'enabled="false"')) + self.assertFalse(MODULE["dirt_telemetry_on"](self.prefix, "dirtshowdown")) + self.config("DiRT3", '<x><motion enabled="true" ip="192.168.1.20" port="20777" /></x>') + self.assertTrue(MODULE["dirt_telemetry_on"](self.prefix, "dirt3")) + + def test_stand_in_is_wanted_only_for_the_dirt_games_with_telemetry_on_and_a_proton_without_the_fix(self): + wanted = MODULE["dirt_ws2_wanted"] + self.config("DiRT Showdown", self.SHOWDOWN_DEFAULT) + self.assertIsNone(wanted(self.command(), self.env())) + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.assertEqual(wanted(self.command(), self.env()), str(self.prefix)) + self.assertEqual(wanted(self.command("Showdown_AVX.exe"), self.env()), str(self.prefix)) + self.assertIsNone(wanted(self.command("DiRTRally2.exe"), self.env())) + self.own.write_bytes(b"MZ wine ws2_32 " + "showdown_avx.exe".encode("utf-16-le")) + self.assertIsNone(wanted(self.command(), self.env())) + + def test_swap_keeps_the_prefix_link_and_restore_puts_it_back(self): + MODULE["swap_dirt_ws2"](self.prefix) + saved = self.target.with_name("ws2_32.dll.droiddeck-original") + self.assertFalse(self.target.is_symlink()) + self.assertEqual(self.target.read_bytes(), self.stand_in.read_bytes()) + self.assertEqual(os.readlink(saved), str(self.own)) + self.assertEqual(self.own.read_bytes(), b"MZ wine ws2_32") + MODULE["swap_dirt_ws2"](self.prefix) + self.assertEqual(os.readlink(saved), str(self.own)) + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(saved)) + self.assertFalse(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + + def test_restore_keeps_a_file_proton_put_back_meanwhile(self): + MODULE["swap_dirt_ws2"](self.prefix) + newer = self.own.with_name("ws2_32-newer.dll") + newer.write_bytes(b"MZ newer wine ws2_32") + self.target.unlink() + self.target.symlink_to(newer) + self.assertFalse(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(newer)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_after_a_proton_switch_the_running_protons_file_goes_back(self): + MODULE["swap_dirt_ws2"](self.prefix) + other = Path(self.tmp.name) / "GE-Proton/proton" + other_own = other.parent / "files/lib/wine/i386-windows/ws2_32.dll" + other_own.parent.mkdir(parents=True) + other_own.write_bytes(b"MZ GE wine ws2_32") + other.write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, other)) + self.assertEqual(os.readlink(self.target), str(other_own)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_restore_follows_a_proton_reached_through_a_linked_folder(self): + MODULE["swap_dirt_ws2"](self.prefix) + pack = Path(self.tmp.name) / "pack" + (pack / "files/lib/wine").mkdir(parents=True) + (pack / "files/lib/wine/i386-windows").symlink_to(self.own.parent) + (pack / "proton").write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, pack / "proton")) + self.assertEqual(os.readlink(self.target), str(self.own)) + + def test_a_stand_in_left_without_the_saved_link_is_replaced_by_protons_own_file(self): + self.target.unlink() + self.target.write_bytes(self.stand_in.read_bytes()) + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(self.own)) + + def test_launch_swaps_the_stand_in_in_for_the_game_and_back_afterwards(self): + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.proton.write_text("#!" + sys.executable + "\nimport os, sys\n" + "target = os.path.join(os.environ['STEAM_COMPAT_DATA_PATH'], 'pfx/drive_c/windows/syswow64/ws2_32.dll')\n" + "print(os.environ.get('WINEDLLOVERRIDES', ''))\n" + "print(os.path.islink(target), b'droiddeck-dirt-ws2_32' in open(target, 'rb').read())\n") + self.proton.chmod(0o755) + runner = Path(self.tmp.name) / "run.py" + runner.write_text("import runpy, sys\nmain = runpy.run_path(sys.argv[1])['main']\nmain.__globals__['DIRT_WS2'] = sys.argv[2]\n" + "sys.argv = [sys.argv[1]] + sys.argv[3:]\nsys.exit(main())\n") + home = Path(self.tmp.name) / "home" + home.mkdir() + result = subprocess.run([sys.executable, str(runner), str(BIN / "droiddeck-game-env"), str(self.stand_in), *self.command()], + env={**os.environ, "HOME": str(home), "STEAM_COMPAT_DATA_PATH": str(self.prefix)}, text=True, capture_output=True) + self.assertEqual(result.returncode, 0, result.stderr) + overrides, state = result.stdout.splitlines()[-2:] + self.assertIn("ws2_32=n,b", overrides.split(";")) + self.assertEqual(state, "False True") + self.assertIn("DiRT telemetry fix: ws2_32 stand-in", result.stderr) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_a_proton_that_cannot_start_leaves_the_prefix_as_it_was(self): + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.proton.write_text("not a program") + self.proton.chmod(0o644) + runner = Path(self.tmp.name) / "run.py" + runner.write_text("import runpy, sys\nmain = runpy.run_path(sys.argv[1])['main']\nmain.__globals__['DIRT_WS2'] = sys.argv[2]\n" + "sys.argv = [sys.argv[1]] + sys.argv[3:]\nsys.exit(main())\n") + home = Path(self.tmp.name) / "home" + home.mkdir() + result = subprocess.run([sys.executable, str(runner), str(BIN / "droiddeck-game-env"), str(self.stand_in), *self.command()], + env={**os.environ, "HOME": str(home), "STEAM_COMPAT_DATA_PATH": str(self.prefix)}, text=True, capture_output=True) + self.assertNotEqual(result.returncode, 0) + self.assertIn("DiRT telemetry fix: ws2_32 stand-in", result.stderr) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_launch_with_telemetry_off_leaves_the_prefix_alone(self): + self.config("DiRT Showdown", self.SHOWDOWN_DEFAULT) + self.proton.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('WINEDLLOVERRIDES', ''))\n") + self.proton.chmod(0o755) + home = Path(self.tmp.name) / "home" + home.mkdir() + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), *self.command()], + env={**os.environ, "HOME": str(home), "STEAM_COMPAT_DATA_PATH": str(self.prefix)}, text=True, capture_output=True) + self.assertEqual(result.returncode, 0, result.stderr) + self.assertNotIn("ws2_32=n,b", result.stdout) + self.assertEqual(os.readlink(self.target), str(self.own)) + + def test_a_failed_put_back_does_not_end_the_launch_with_an_error(self): + def fail(): + raise OSError(28, "No space left on device") + stderr = io.StringIO() + with mock.patch("sys.stderr", stderr): + code = MODULE["start"]([sys.executable, "-c", "raise SystemExit(0)"], dict(os.environ), None, fail) + self.assertEqual(code, 0) + self.assertIn("not put back", stderr.getvalue()) + + def test_a_half_done_swap_is_put_back(self): + saved = self.target.with_name("ws2_32.dll.droiddeck-original") + os.replace(self.target, saved) + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(saved)) + + def test_a_native_ws2_32_goes_back_as_it_was_after_a_proton_switch(self): + self.target.unlink() + self.target.write_bytes(b"MZ a mod's own ws2_32") + MODULE["swap_dirt_ws2"](self.prefix) + other = Path(self.tmp.name) / "GE-Proton/proton" + (other.parent / "files/lib/wine/i386-windows").mkdir(parents=True) + (other.parent / "files/lib/wine/i386-windows/ws2_32.dll").write_bytes(b"MZ GE wine ws2_32") + other.write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, other)) + self.assertFalse(self.target.is_symlink()) + self.assertEqual(self.target.read_bytes(), b"MZ a mod's own ws2_32") + + def test_a_link_to_a_mods_ws2_32_goes_back_as_it_was(self): + mod = Path(self.tmp.name) / "mods/ws2_32.dll" + mod.parent.mkdir() + mod.write_bytes(b"MZ a mod's ws2_32") + self.target.unlink() + self.target.symlink_to(mod) + MODULE["swap_dirt_ws2"](self.prefix) + other = Path(self.tmp.name) / "GE-Proton/proton" + (other.parent / "files/lib/wine/i386-windows").mkdir(parents=True) + (other.parent / "files/lib/wine/i386-windows/ws2_32.dll").write_bytes(b"MZ GE wine ws2_32") + other.write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, other)) + self.assertEqual(os.readlink(self.target), str(mod)) + + def test_start_gives_the_signal_handlers_back(self): + import signal + before = {s: signal.getsignal(s) for s in (signal.SIGTERM, signal.SIGINT, signal.SIGHUP)} + MODULE["start"]([sys.executable, "-c", "pass"], dict(os.environ), None, lambda: None) + self.assertEqual(before, {s: signal.getsignal(s) for s in before}) + + def test_start_puts_the_file_back_after_the_game_exits(self): + calls = [] + code = MODULE["start"]([sys.executable, "-c", "raise SystemExit(3)"], dict(os.environ), None, lambda: calls.append("restored")) + self.assertEqual(code, 3) + self.assertEqual(calls, ["restored"]) + with self.assertRaises(OSError): + MODULE["start"]([str(Path(self.tmp.name) / "missing")], dict(os.environ), None, lambda: calls.append("again")) + self.assertEqual(calls, ["restored"]) + + +class EgoCorePlanTest(unittest.TestCase): + + @staticmethod + def rule(op, value, worker_map): + return (' <restrict_if name="cores" op="%s" value="%d">\r\n <restrict_add>\r\n' + ' <threadStrategy parallelUpdateRender="true" workerMapFile="system/%s" updateProcessor="2" />\r\n' + ' </restrict_add>\r\n </restrict_if>\r\n' % (op, value, worker_map)) + + def setUp(self): + self.tmp = tempfile.TemporaryDirectory() + self.addCleanup(self.tmp.cleanup) + self.system = Path(self.tmp.name) / "DiRT 3/system" + self.system.mkdir(parents=True) + cpu = "".join(self.rule("int_eq", n, "workerMap%dCore.xml" % n) for n in (2, 3, 4, 6)) + self.rule("int_ge", 8, "workerMap8Core.xml") + self.shipped = ('<?xml version="1.0" encoding="UTF-8" ?>\r\n<hardware_settings_restrictions>\r\n <cpu>\r\n' + ' <restrict_info>\r\n' + cpu + + ' <restrict_else>\r\n <restrict_add>\r\n' + ' <threadStrategy parallelUpdateRender="false" workerMapFile="system/workerMap.xml" />\r\n' + ' </restrict_add>\r\n </restrict_else>\r\n </restrict_info>\r\n </cpu>\r\n' + ' <audio_card>\r\n' + self.rule("int_eq", 5, "audio.xml") + ' </audio_card>\r\n' + '</hardware_settings_restrictions>').encode("latin-1") + self.path = self.system / "hardware_settings_restrictions.xml" + self.path.write_bytes(self.shipped) + for name in ("workerMap.xml", "workerMap2Core.xml", "workerMap3Core.xml", "workerMap4Core.xml", "workerMap6Core.xml", "workerMap8Core.xml"): + (self.system / name).write_text("<workerMap />") + self.command = ["/proton", "waitforexitandrun", str(self.system.parent / "dirt3_game.exe")] + self.saved = self.path.with_name(self.path.name + ".droiddeck-original") + + def plan(self, topology, command=None): + env = {} if topology is None else {"WINE_CPU_TOPOLOGY": topology} + return MODULE["ego_core_plan"](command or self.command, env) + + def test_five_cores_get_a_copy_of_the_four_core_plan(self): + note = self.plan("5:7,3,4,5,6") + self.assertIn("5 cores", note) + self.assertIn("4-core plan", note) + text = self.path.read_bytes() + four = self.rule("int_eq", 4, "workerMap4Core.xml").encode("latin-1") + five = self.rule("int_eq", 5, "workerMap4Core.xml").encode("latin-1") + self.assertEqual(text, self.shipped.replace(four, four + five)) + self.assertNotIn(b"\n", text.replace(b"\r\n", b"")) + self.assertEqual(self.saved.read_bytes(), self.shipped) + self.assertEqual(sorted(p.name for p in self.system.glob("*droiddeck-tmp*")), []) + self.assertIsNone(self.plan("5:7,3,4,5,6")) + self.assertEqual(self.path.read_bytes(), text) + self.assertEqual(self.saved.read_bytes(), self.shipped) + + def test_seven_cores_get_the_six_core_plan(self): + self.assertIn("6-core plan", self.plan("7:7,1,2,3,4,5,6")) + self.assertIn(b'value="7">\r\n <restrict_add>\r\n <threadStrategy parallelUpdateRender="true" ' + b'workerMapFile="system/workerMap6Core.xml"', self.path.read_bytes()) + + def test_counts_with_a_plan_are_left_alone(self): + for topology in ("2:7,6", "4:7,3,4,5", "6:7,3,4,5,6,2", "8:7,2,3,4,5,6,0,1", "12:0,1,2,3,4,5,6,7,8,9,10,11"): + self.assertIsNone(self.plan(topology), topology) + self.assertEqual(self.path.read_bytes(), self.shipped) + self.assertFalse(os.path.lexists(self.saved)) + + def test_nothing_changes_without_a_core_count_a_restrictions_file_a_smaller_plan_or_its_worker_map(self): + self.assertIsNone(self.plan(None)) + self.assertIsNone(self.plan("")) + self.assertIsNone(self.plan("x:1")) + self.assertIsNone(self.plan("\u00b2:7")) + self.assertIsNone(self.plan("1:7")) + self.assertIsNone(self.plan("5:7,3,4,5,6", ["/proton", "waitforexitandrun"])) + self.assertIsNone(self.plan("5:7,3,4,5,6", ["/proton", "waitforexitandrun", "/elsewhere/game.exe"])) + (self.system / "workerMap4Core.xml").unlink() + self.assertIsNone(self.plan("5:7,3,4,5,6")) + self.assertEqual(self.path.read_bytes(), self.shipped) + self.assertFalse(os.path.lexists(self.saved)) + + def test_an_unknown_comparison_counts_as_a_plan(self): + self.path.write_bytes(self.shipped.replace(b'op="int_ge" value="8"', b'op="int_between" value="8"')) + self.assertIsNone(self.plan("5:7,3,4,5,6")) + + def test_main_adds_the_plan_before_the_game_starts(self): + with tempfile.TemporaryDirectory() as tmp: + probe = Path(tmp) / "probe" + probe.write_text('#!/bin/sh\ngrep -c \'value="5"\' "%s"\n' % self.path) + probe.chmod(0o755) + env = {k: v for k, v in os.environ.items() if not k.startswith(("WINE", "PROTON", "DROIDDECK", "BL_", "STEAM"))} + env.update(HOME=tmp, STEAM_COMPAT_DATA_PATH="/compatdata/3791535942", WINE_CPU_TOPOLOGY="5:7,3,4,5,6") + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun", self.command[2]], + env=env, text=True, capture_output=True, check=True) + self.assertEqual(result.stdout.strip(), "2", result.stderr) + self.assertIn("added a copy of its 4-core plan", result.stderr) + + class GameDebugLoggingTest(unittest.TestCase): def test_maintenance_precision_survives_run_with_performance_game_settings(self): with tempfile.TemporaryDirectory() as tmp: @@ -155,7 +523,6 @@ class GameDebugLoggingTest(unittest.TestCase): result = launch([str(probe), verb], {**env, "STEAM_COMPAT_DATA_PATH": str(home / "compatdata" / prefix)}) self.assertEqual(result["env"]["PROTON_LOG"], "0") self.assertEqual(result["env"]["WINEDEBUG"], "-all") - # Non-Steam shortcuts use the same normalized unsigned compatdata identity. result = launch(command, {**env, "STEAM_COMPAT_DATA_PATH": str(home / "compatdata/-1")}) self.assertEqual(result["env"]["PROTON_LOG"], "1") self.assertFalse((home / "never-created").exists()) @@ -194,23 +561,43 @@ class GameEnvironmentTest(unittest.TestCase): with tempfile.TemporaryDirectory() as tmp: home = Path(tmp) probe = home / "probe" - probe.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('BANNER_AUDIO_DIRECT_MIC', 'unset'))\n") + probe.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('AUDIO_DIRECT_MIC', 'unset'))\n") probe.chmod(0o755) config = home / ".config/droiddeck/game-environment.json" config.parent.mkdir(parents=True) for enabled, override, expected in (("1", None, "1"), ("0", "1", "0"), ("1", "0", "0")): with self.subTest(enabled=enabled, override=override): profile = {} if override is None else { - "BANNER_AUDIO_DIRECT_MIC": override, "BL_MIC_ENABLED": override, + "AUDIO_DIRECT_MIC": override, "BL_MIC_ENABLED": override, } config.write_text(json.dumps({"version": 1, "games": {"42": profile}})) env = dict(os.environ, HOME=tmp, BL_MIC_ENABLED=enabled, - BANNER_AUDIO_DIRECT_MIC="1", STEAM_COMPAT_DATA_PATH="/compatdata/42") + AUDIO_DIRECT_MIC="1", STEAM_COMPAT_DATA_PATH="/compatdata/42") result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun"], env=env, text=True, capture_output=True, check=True) self.assertEqual(result.stdout.strip(), expected) + def test_game_profile_directaudio_settings_reach_the_driver(self): + with tempfile.TemporaryDirectory() as tmp: + home = Path(tmp) + probe = home / "probe" + probe.write_text("#!" + sys.executable + "\nimport os\nprint(' '.join(sorted(k + '=' + v for k, v in os.environ.items() if k.startswith('BANNER_AUDIO_DIRECT_'))))\n") + probe.chmod(0o755) + config = home / ".config/droiddeck/game-environment.json" + config.parent.mkdir(parents=True) + config.write_text(json.dumps({"version": 1, "games": {"42": {"AUDIO_DIRECT_MS": "80"}}})) + base = {key: value for key, value in os.environ.items() if "AUDIO_DIRECT_" not in key} + base.update(HOME=tmp, BL_MIC_ENABLED="0", STEAM_COMPAT_DATA_PATH="/compatdata/42", + AUDIO_DIRECT_MS="60", AUDIO_DIRECT_PERIOD_MS="20", AUDIO_DIRECT_MIC="1", + BANNER_AUDIO_DIRECT_MS="60", BANNER_AUDIO_DIRECT_MIC="1") + for driver, expected in (("directaudio,pulse", "BANNER_AUDIO_DIRECT_MIC=0 BANNER_AUDIO_DIRECT_MS=80 BANNER_AUDIO_DIRECT_PERIOD_MS=20"), + ("pulse", "BANNER_AUDIO_DIRECT_MIC=1 BANNER_AUDIO_DIRECT_MS=60")): + with self.subTest(driver=driver): + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), str(probe), "waitforexitandrun"], + env=dict(base, WINE_AUDIO_DRIVER=driver), text=True, capture_output=True, check=True) + self.assertEqual(result.stdout.strip(), expected) + def test_desktop_games_restart_on_the_gpu_with_steams_preloads_handed_back(self): with tempfile.TemporaryDirectory() as tmp: home = Path(tmp) @@ -326,6 +713,15 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(evaluate(), (0, 2)) self.assertEqual(evaluate("changed"), (0, 3)) + def test_the_mali_bridge_caps_the_vkd3d_feature_level(self): + bridge = {"BL_VKBRIDGE": "1", "VKD3D_FEATURE_LEVEL": "12_2"} + self.assertIn("capped", MODULE["bridge_feature_level"](bridge)) + self.assertEqual(bridge["VKD3D_FEATURE_LEVEL"], "12_0") + for env in ({"BL_VKBRIDGE": "1", "VKD3D_FEATURE_LEVEL": "11_1"}, {"VKD3D_FEATURE_LEVEL": "12_2"}, {"BL_VKBRIDGE": "1"}): + before = dict(env) + self.assertIsNone(MODULE["bridge_feature_level"](env)) + self.assertEqual(env, before) + def test_profile_precedence_and_unset(self): env = {"KEEP": "inherited", "REMOVE": "inherited", "CUSTOM": "launch option"} config = {"version": 1, "shared": {"CUSTOM": "shared"}, "games": {"42": {"REMOVE": None, "CUSTOM": "game", "EMPTY": ""}}} @@ -432,7 +828,7 @@ class GameEnvironmentTest(unittest.TestCase): (game / name).touch() env, extra, notes = MODULE["engine_fixes"](str(game / "Game.exe"), []) self.assertEqual(env["FEX_TSOENABLED"], "1") - self.assertEqual(env["FEX_MULTIBLOCK"], "0") + self.assertNotIn("FEX_MULTIBLOCK", env) self.assertEqual(env["WINEDLLOVERRIDES"], "libsentry.windows.release.x86_64=d") self.assertEqual(extra, ["--rendering-driver", "vulkan"]) self.assertEqual(MODULE["engine_fixes"](str(game / "Game.exe"), ["--rendering-driver", "opengl3"])[1], []) @@ -550,6 +946,38 @@ class GameEnvironmentTest(unittest.TestCase): (game / "D3DGear64.DLL").unlink() self.assertEqual(MODULE["engine_fixes"](str(game / "TheCrew2.exe"), []), ({}, [], [])) + def test_doom_2016_keeps_the_swapchain_image_count_it_asks_for(self): + with tempfile.TemporaryDirectory() as tmp: + game = Path(tmp) / "DOOM (2016)" + game.mkdir() + for name in ("DOOMx64.exe", "DOOMx64vk.exe", "Galaxy64.dll"): + (game / name).touch() + images = { + "GAMESCOPE_WSI_MIN_IMAGE_COUNT": None, + "GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT": None, + "vk_x11_strict_image_count": "true", + } + for exe in ("DOOMx64.exe", "DOOMx64vk.exe"): + env, extra, notes = MODULE["engine_fixes"](str(game / exe), []) + self.assertEqual((env, extra), (images, [])) + self.assertTrue(notes) + launched = {"GAMESCOPE_WSI_MIN_IMAGE_COUNT": "8", "GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT": "1"} + result = MODULE["apply_config"](launched, {"version": 1}, "3566086475", env) + self.assertNotIn("GAMESCOPE_WSI_MIN_IMAGE_COUNT", result) + self.assertNotIn("GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT", result) + self.assertEqual(result["vk_x11_strict_image_count"], "true") + config = {"version": 1, "games": {"3566086475": {"GAMESCOPE_WSI_MIN_IMAGE_COUNT": "3"}}} + self.assertEqual(MODULE["apply_config"](launched, config, "3566086475", env)["GAMESCOPE_WSI_MIN_IMAGE_COUNT"], "3") + eternal = Path(tmp) / "DOOMEternal" + eternal.mkdir() + (eternal / "DOOMEternalx64vk.exe").touch() + self.assertEqual(MODULE["engine_fixes"](str(eternal / "DOOMEternalx64vk.exe"), []), ({}, [], [])) + other = Path(tmp) / "Other" + other.mkdir() + for name in ("Other.exe", "DOOMx64vk.exe"): + (other / name).touch() + self.assertEqual(MODULE["engine_fixes"](str(other / "Other.exe"), []), ({}, [], [])) + def test_dll_overrides_from_several_fixes_are_all_kept(self): with tempfile.TemporaryDirectory() as tmp: for name in ("Game.exe", "Game.pck", "GodotSharp.dll", "libsentry.windows.release.x86_64.dll", "d3dgear64.dll"): @@ -564,6 +992,12 @@ class GameEnvironmentTest(unittest.TestCase): self.assertTrue(notes) self.assertEqual(MODULE["engine_fixes"]("/game/Game/DarkSoulsII.exe", []), ({}, [], [])) + def test_little_nightmares_keeps_its_render_thread(self): + env, extra, notes = MODULE["engine_fixes"]("/game/Little Nightmares/Atlas/Binaries/Win64/LittleNightmares.exe", []) + self.assertEqual((env, extra), ({"PROTONFIXES_DISABLE": "1"}, [])) + self.assertTrue(notes) + self.assertEqual(MODULE["engine_fixes"]("/game/Little Nightmares II/Moonlight/Binaries/Win64/LittleNightmaresII.exe", []), ({}, [], [])) + def test_game_cores_are_parsed_from_lists_and_ranges(self): parse = MODULE["parse_cores"] self.assertEqual(parse("0-3,6"), {0, 1, 2, 3, 6}) @@ -1497,11 +1931,11 @@ class DirectAudioPrefixTest(unittest.TestCase): (self.windows / folder).mkdir(parents=True) self.reg = self.compat / "pfx/user.reg" - def run_setup(self, verb="waitforexitandrun", target="game.exe", cwd=None): - script = COMPAT["BL_DIRECTAUDIO_SETUP"] + '\nverb=$2\nbl_directaudio "$1" "$3"\necho "WINEDLLPATH=$WINEDLLPATH"\necho "WINE_AUDIO_DRIVER=${WINE_AUDIO_DRIVER:-}"\n' + def run_setup(self, verb="waitforexitandrun", target="game.exe", cwd=None, extra=None): + script = COMPAT["BL_DIRECTAUDIO_SETUP"] + '\nverb=$2\nbl_directaudio "$1" "$3"\necho "WINEDLLPATH=$WINEDLLPATH"\necho "WINE_AUDIO_DRIVER=${WINE_AUDIO_DRIVER:-}"\nenv | grep "^BANNER_AUDIO_DIRECT_" | sort\n' steam = self.compat.parent / "Steam" env = dict(os.environ, BL_DIRECTAUDIO=str(self.sets), STEAM_COMPAT_DATA_PATH=str(self.compat), - STEAM_COMPAT_CLIENT_INSTALL_PATH=str(steam)) + STEAM_COMPAT_CLIENT_INSTALL_PATH=str(steam), **(extra or {})) env.pop("WINEDLLPATH", None) env.pop("WINE_AUDIO_DRIVER", None) return subprocess.run(["bash", "-c", script, "bash", str(self.tool), verb, target], cwd=cwd, env=env, @@ -1549,6 +1983,21 @@ class DirectAudioPrefixTest(unittest.TestCase): self.assertIn("DirectAudio selected", result.stderr) self.assertEqual(self.link("system32"), str(self.audio / "lib/wine/aarch64-windows/winedirectaudio.drv")) self.assertEqual(self.audio_values(), [("[Software\\\\Wine\\\\Drivers]", '"Audio"="directaudio,pulse"')]) + def test_audio_direct_settings_reach_the_driver_under_its_own_names(self): + self.reg.write_text("WINE REGISTRY Version 2\n\n#arch=win64\n") + result = self.run_setup(extra={"AUDIO_DIRECT_MS": "60", "AUDIO_DIRECT_PERIOD_MS": "20", + "AUDIO_DIRECT_RELAY": "/run/relay.sock", "OTHER_AUDIO_DIRECT_MS": "5"}) + lines = [line for line in result.stdout.splitlines() if line.startswith("BANNER_")] + self.assertEqual(lines, ["BANNER_AUDIO_DIRECT_MS=60", "BANNER_AUDIO_DIRECT_PERIOD_MS=20", + "BANNER_AUDIO_DIRECT_RELAY=/run/relay.sock"]) + + def test_audio_direct_settings_are_not_handed_on_when_directaudio_stays_off(self): + legacycompat = self.compat.parent / "Steam/legacycompat" + legacycompat.mkdir(parents=True) + (legacycompat / "iscriptevaluator.exe").write_bytes(b"Steam install-script evaluator") + result = self.run_setup(target="iscriptevaluator.exe", cwd=legacycompat, extra={"AUDIO_DIRECT_MS": "60"}) + self.assertNotIn("BANNER_AUDIO_DIRECT_MS", result.stdout) + def test_non_launch_verbs_preserve_audio_configuration(self): for verb in ("getcompatpath", "getnativepath", "destroyprefix"): with self.subTest(verb=verb): @@ -1650,6 +2099,51 @@ class DirectAudioPrefixTest(unittest.TestCase): self.assertIsNone(self.link("system32")) +class ProjectZomboidJvmTest(unittest.TestCase): + ARGS = ["-Djava.awt.headless=true", "-Xmx3072m", "-XX:+UseZGC", "-XX:-CreateCoredumpOnCrash"] + + def launch(self, tmp, args=None, stem="ProjectZomboid64"): + settings = Path(tmp) / (stem + ".json") + settings.write_text(json.dumps({"mainClass": "zombie/gameStates/MainScreenState", "vmArgs": args or self.ARGS})) + command = ["proton", "waitforexitandrun", str(Path(tmp) / (stem + ".exe"))] + return settings, command + + def test_zgc_becomes_g1_and_the_c1_jit_flag_is_added_once(self): + with tempfile.TemporaryDirectory() as tmp: + settings, command = self.launch(tmp) + MODULE["project_zomboid_jvm"](command) + data = json.loads(settings.read_text()) + self.assertEqual(data["vmArgs"], ["-Djava.awt.headless=true", "-Xmx3072m", "-XX:-CreateCoredumpOnCrash", + "-XX:+UseG1GC", "-XX:TieredStopAtLevel=1"]) + self.assertEqual(data["mainClass"], "zombie/gameStates/MainScreenState") + before = settings.read_text() + MODULE["project_zomboid_jvm"](command) + self.assertEqual(settings.read_text(), before) + + def test_other_collectors_and_windows_specific_lists_are_rewritten(self): + with tempfile.TemporaryDirectory() as tmp: + settings, command = self.launch(tmp) + settings.write_text(json.dumps({"vmArgs": ["-XX:+UseParallelGC", "-Xmx1g"], + "windows": {"10.0.17134": {"vmArgs": ["-XX:+UseZGC", "-XX:+UseG1GC"]}}})) + MODULE["project_zomboid_jvm"](command) + data = json.loads(settings.read_text()) + flags = ["-XX:+UseG1GC", "-XX:TieredStopAtLevel=1"] + self.assertEqual(data["vmArgs"], ["-Xmx1g"] + flags) + self.assertEqual(data["windows"]["10.0.17134"]["vmArgs"], flags) + + def test_other_games_and_unreadable_files_are_left_alone(self): + with tempfile.TemporaryDirectory() as tmp: + settings, command = self.launch(tmp, stem="Other") + before = settings.read_text() + MODULE["project_zomboid_jvm"](command) + self.assertEqual(settings.read_text(), before) + settings.write_text("{") + MODULE["project_zomboid_jvm"](command[:2] + [str(Path(tmp) / "Other.exe")]) + (Path(tmp) / "ProjectZomboid64.json").write_text("{") + MODULE["project_zomboid_jvm"](command[:2] + [str(Path(tmp) / "ProjectZomboid64.exe")]) + self.assertEqual((Path(tmp) / "ProjectZomboid64.json").read_text(), "{") + + class UbisoftOverlayTest(unittest.TestCase): SETTINGS = ( "language:\n code: en-US\n" diff --git a/tools/tests/test_gamescope_cursor_shm.py b/tools/tests/test_gamescope_cursor_shm.py index 35ca27acb2..e88b199756 100644 --- a/tools/tests/test_gamescope_cursor_shm.py +++ b/tools/tests/test_gamescope_cursor_shm.py @@ -106,9 +106,6 @@ def main(): surface = alloc() send(comp, 0, U(surface)) if not args.unassigned_control: - # wlroots 0.20.2 assigns the cursor role before forwarding this serial - # to Gamescope, so zero avoids needing pointer focus but still tests the - # role guard in xwayland_surface_commit. send(pointer, 0, U(0, surface, 0, 0)) roundtrip() before = count() diff --git a/tools/tests/test_gamescope_override_stacking.py b/tools/tests/test_gamescope_override_stacking.py new file mode 100644 index 0000000000..c97e160808 --- /dev/null +++ b/tools/tests/test_gamescope_override_stacking.py @@ -0,0 +1,101 @@ +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + + +ROOT = Path(__file__).resolve().parents[2] +PATCH = ROOT / "tools/gamescope/patches/0126-topmost-focus-outranks-other-process-override.patch" + + +def patched_rule(): + added = [line[1:] for line in PATCH.read_text().splitlines() if line.startswith("+") and not line.startswith("+++")] + text = "\n".join(added) + start = text.index("static bool is_stacked_below_focus") + return text[start:text.index("\n}\n", start) + 3] + + +PREAMBLE = r''' +#include <cassert> +#include <cstdint> +#include <cstdio> + +static constexpr uint32_t WS_EX_TOPMOST = 0x00000008u; +static constexpr uint32_t WS_EX_TOOLWINDOW = 0x00000080u; +static constexpr uint32_t WS_EX_LAYERED = 0x00080000u; + +enum class steamcompmgr_win_type_t { XWAYLAND, XDG }; +struct xwayland_t { unsigned long id = 0; unsigned long transientFor = 0; }; +struct steamcompmgr_win_t { + int pid = 0; + bool hasHwndStyleEx = false; + uint32_t hwndStyleEx = 0; + steamcompmgr_win_type_t type = steamcompmgr_win_type_t::XWAYLAND; + xwayland_t x; + xwayland_t &xwayland() { return x; } +}; + +static steamcompmgr_win_t win(int pid, unsigned long id, uint32_t exstyle) { + steamcompmgr_win_t w; + w.pid = pid; + w.x.id = id; + w.hasHwndStyleEx = true; + w.hwndStyleEx = exstyle; + return w; +} +''' + +MAIN = r''' +int main() { + steamcompmgr_win_t signin = win(4407, 0x2c00008, WS_EX_TOPMOST); + steamcompmgr_win_t splash = win(4055, 0x1c00005, WS_EX_LAYERED | WS_EX_TOOLWINDOW); + assert(is_stacked_below_focus(&splash, &signin)); + + steamcompmgr_win_t dropdown = win(4407, 0x2c00010, WS_EX_TOOLWINDOW); + assert(!is_stacked_below_focus(&dropdown, &signin)); + + steamcompmgr_win_t menu = win(5120, 0x3000004, WS_EX_TOPMOST | WS_EX_TOOLWINDOW); + assert(!is_stacked_below_focus(&menu, &signin)); + + steamcompmgr_win_t game = win(4407, 0x2c00008, 0); + assert(!is_stacked_below_focus(&splash, &game)); + + steamcompmgr_win_t owned = win(4055, 0x1c00007, 0); + owned.x.transientFor = signin.x.id; + assert(!is_stacked_below_focus(&owned, &signin)); + + steamcompmgr_win_t unknown = win(4055, 0x1c00009, 0); + unknown.hasHwndStyleEx = false; + assert(!is_stacked_below_focus(&unknown, &signin)); + + steamcompmgr_win_t no_pid = win(-1, 0x1c0000b, WS_EX_LAYERED | WS_EX_TOOLWINDOW); + assert(!is_stacked_below_focus(&no_pid, &signin)); + steamcompmgr_win_t signin_no_pid = win(-1, 0x2c00008, WS_EX_TOPMOST); + assert(!is_stacked_below_focus(&splash, &signin_no_pid)); + + puts("ok"); + return 0; +} +''' + + +@unittest.skipUnless(shutil.which("c++"), "needs a C++ compiler") +class OverrideStackingTest(unittest.TestCase): + def test_a_topmost_focus_keeps_other_process_windows_beneath_it(self): + with tempfile.TemporaryDirectory() as tmp: + source = Path(tmp) / "stacking.cpp" + binary = Path(tmp) / "stacking" + source.write_text(PREAMBLE + patched_rule() + MAIN) + subprocess.run(["c++", "-std=c++17", "-Wall", "-Werror", str(source), "-o", str(binary)], check=True) + self.assertEqual(subprocess.run([str(binary)], capture_output=True, text=True, check=True).stdout.strip(), "ok") + + def test_map_win_reads_the_wine_extended_style(self): + hunks = PATCH.read_text().split("\n@@ ") + map_win = next(hunk for hunk in hunks if "map_win(" in hunk.split("\n", 1)[0]) + added = [line[1:].strip() for line in map_win.splitlines() if line.startswith("+")] + self.assertIn("w->hwndStyleEx = get_prop(ctx, w->xwayland().id, ctx->atoms.wineHwndStyleEx, 0, &w->hasHwndStyleEx);", added) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_hud_frames.py b/tools/tests/test_hud_frames.py index 381c18e37e..e7af1aa5e4 100644 --- a/tools/tests/test_hud_frames.py +++ b/tools/tests/test_hud_frames.py @@ -14,7 +14,7 @@ READER = ROOT / "app/src/main/cpp/waylandcomp/src/hudframes.c" def patch_writer(): added = [line[1:] for line in PATCH.read_text().splitlines() if line.startswith("+") and not line.startswith("+++")] text = "\n".join(added) - start = text.index("// DroidDeck's own HUD reads") + start = text.index("static constexpr uint32_t k_uDroidDeckHudFramesMagic") end = text.index("\n}\n", text.index("static void publish_droiddeck_hud_info()", start)) + 3 return text[start:end] diff --git a/tools/tests/test_kgsl_busy.py b/tools/tests/test_kgsl_busy.py new file mode 100644 index 0000000000..6b75f56b53 --- /dev/null +++ b/tools/tests/test_kgsl_busy.py @@ -0,0 +1,35 @@ +"""Exercise the HUD's kgsl memstore busy sampling and counter layout (app/src/main/cpp/gpuclock).""" +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +REPO = Path(__file__).resolve().parents[2] + + +class KgslBusyTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + compiler = shutil.which(os.environ.get('CC', 'cc')) + if compiler is None: + raise unittest.SkipTest('A host C compiler is required') + cls.temp = tempfile.TemporaryDirectory(prefix='droiddeck-kgsl-busy-') + cls.addClassCleanup(cls.temp.cleanup) + cls.binary = Path(cls.temp.name) / 'kgsl-busy-test' + subprocess.run([compiler, '-std=c11', '-Wall', '-Wextra', '-Werror', + '-I', str(REPO / 'app/src/main/cpp/gpuclock'), + str(REPO / 'tools/tests/kgsl_busy_harness.c'), '-o', str(cls.binary)], + check=True, capture_output=True, text=True) + + def test_ringbuffer_slots_and_busy_rule(self): + result = subprocess.run([str(self.binary)], capture_output=True, text=True) + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + self.assertIn('PASS: kgsl memstore busy', result.stdout) + self.assertIn('PASS: kgsl memstore contexts', result.stdout) + self.assertIn('PASS: kgsl counter layout', result.stdout) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_kgsl_read.c b/tools/tests/test_kgsl_read.c new file mode 100644 index 0000000000..29353d7a71 --- /dev/null +++ b/tools/tests/test_kgsl_read.c @@ -0,0 +1,151 @@ +#include <assert.h> +#include <errno.h> +#include <stdio.h> + +#include "../quest/kgsl_compat.h" + +void bl_kgsl_track(int (*real)(int, unsigned long, void *), int fd, unsigned long request, + void *arg, int *rc); + +static int read_error, wait_error, waits; +static unsigned int retired; + +static int mock(int fd, unsigned long request, void *arg) { + assert(fd == 42 || fd == 43); + if (request == IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_CTXTID) { + if (read_error) { + errno = read_error; + return -1; + } + ((struct kgsl_cmdstream_readtimestamp_ctxtid *)arg)->timestamp = retired; + return 0; + } + assert(request == IOCTL_KGSL_DEVICE_WAITTIMESTAMP_CTXTID); + struct kgsl_device_waittimestamp_ctxtid *wait = arg; + assert(wait->context_id == 3 && wait->timeout != 0); + waits++; + if (wait_error) { + errno = wait_error; + return -1; + } + if (wait->timestamp > retired) { + errno = ETIMEDOUT; + return -1; + } + return 0; +} + +static int issue(unsigned long request, void *arg) { + int rc = mock(42, request, arg); + bl_kgsl_track(mock, 42, request, arg, &rc); + return rc; +} + +static void submit(unsigned int timestamp) { + struct kgsl_gpu_command command = {.context_id = 3, .timestamp = timestamp}; + int rc = 0; + bl_kgsl_track(mock, 42, IOCTL_KGSL_GPU_COMMAND, &command, &rc); + assert(rc == 0); +} + +static int read_timestamp(unsigned int context, unsigned int *timestamp) { + struct kgsl_cmdstream_readtimestamp_ctxtid read = { + .context_id = context, .type = KGSL_TIMESTAMP_RETIRED}; + int rc = issue(IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_CTXTID, &read); + *timestamp = read.timestamp; + return rc; +} + +static void create_context(unsigned int context) { + struct kgsl_drawctxt_create create = {.drawctxt_id = context}; + int rc = 0; + bl_kgsl_track(mock, 42, IOCTL_KGSL_DRAWCTXT_CREATE, &create, &rc); +} + +int main(void) { + unsigned int timestamp; + + retired = 5; + assert(read_timestamp(3, ×tamp) == 0 && timestamp == 5 && waits == 0); + + read_error = EACCES; + retired = 0; + errno = EACCES; + assert(read_timestamp(3, ×tamp) == -1 && errno == EACCES && waits == 0); + + create_context(3); + assert(read_timestamp(3, ×tamp) == 0 && timestamp == 0 && waits == 1); + + wait_error = EINVAL; + assert(read_timestamp(3, ×tamp) == -1 && errno == EINVAL); + wait_error = 0; + + waits = 0; + read_error = EBADF; + assert(read_timestamp(3, ×tamp) == -1 && errno == EBADF && waits == 0); + read_error = EACCES; + + struct kgsl_cmdstream_readtimestamp_ctxtid other = {.context_id = 3, .type = KGSL_TIMESTAMP_RETIRED}; + int other_rc = mock(43, IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_CTXTID, &other); + bl_kgsl_track(mock, 43, IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_CTXTID, &other, &other_rc); + assert(other_rc == -1 && errno == EACCES && waits == 0); + + submit(1); + submit(2); + submit(3); + assert(read_timestamp(3, ×tamp) == 0 && timestamp == 0 && waits == 1); + + retired = 2; + waits = 0; + assert(read_timestamp(3, ×tamp) == 0 && timestamp == 2 && waits == 3); + + waits = 0; + assert(read_timestamp(3, ×tamp) == 0 && timestamp == 2 && waits == 1); + + retired = 3; + waits = 0; + assert(read_timestamp(3, ×tamp) == 0 && timestamp == 3 && waits == 1); + + waits = 0; + assert(read_timestamp(3, ×tamp) == 0 && timestamp == 3 && waits == 1); + + wait_error = EINVAL; + assert(read_timestamp(3, ×tamp) == -1 && errno == EINVAL); + wait_error = 0; + + submit(4); + retired = 4; + wait_error = EDEADLK; + assert(read_timestamp(3, ×tamp) == -1 && errno == EDEADLK); + wait_error = 0; + + struct kgsl_gpu_aux_command aux = {.context_id = 3, .timestamp = 6}; + int rc = 0; + bl_kgsl_track(mock, 42, IOCTL_KGSL_GPU_AUX_COMMAND, &aux, &rc); + retired = 6; + assert(read_timestamp(3, ×tamp) == 0 && timestamp == 6); + + submit(8); + submit(7); + retired = 8; + assert(read_timestamp(3, ×tamp) == 0 && timestamp == 8); + + create_context(3); + retired = 0; + waits = 0; + assert(read_timestamp(3, ×tamp) == 0 && timestamp == 0 && waits == 1); + + struct kgsl_drawctxt_destroy destroy = {.drawctxt_id = 3}; + bl_kgsl_track(mock, 42, IOCTL_KGSL_DRAWCTXT_DESTROY, &destroy, &rc); + assert(read_timestamp(3, ×tamp) == -1 && errno == EACCES); + + struct kgsl_drawctxt_create user = {.flags = KGSL_CONTEXT_USER_GENERATED_TS, .drawctxt_id = 3}; + bl_kgsl_track(mock, 42, IOCTL_KGSL_DRAWCTXT_CREATE, &user, &rc); + waits = 0; + assert(read_timestamp(3, ×tamp) == -1 && errno == EACCES && waits == 0); + + errno = EACCES; + assert(read_timestamp(5000, ×tamp) == -1 && errno == EACCES); + + puts("PASS: refused timestamp reads answered from retired waits"); +} diff --git a/tools/tests/test_launcher_cores.py b/tools/tests/test_launcher_cores.py index 4f05df2424..b3e9fc9298 100644 --- a/tools/tests/test_launcher_cores.py +++ b/tools/tests/test_launcher_cores.py @@ -19,7 +19,6 @@ ALL = set(range(8)) class FakeCores: - """Per-thread masks and priorities, with every change recorded.""" def __init__(self): self.state = {} diff --git a/tools/tests/test_login1.py b/tools/tests/test_login1.py index e257ccf814..fe69c209e6 100644 --- a/tools/tests/test_login1.py +++ b/tools/tests/test_login1.py @@ -1,4 +1,3 @@ -"""Real login1 sleep handshakes; run with dbus-run-session and python3-gi.""" import os from pathlib import Path import subprocess diff --git a/tools/tests/test_msi_install.py b/tools/tests/test_msi_install.py index dda3eeea50..60d8fc8df4 100644 --- a/tools/tests/test_msi_install.py +++ b/tools/tests/test_msi_install.py @@ -10,7 +10,6 @@ COMPONENTS = runpy.run_path(str(BIN / "droiddeck-wincomponents")) class FakePackage: - """A package's tables in memory, as msiinfo would give them.""" def __init__(self, tables, summary=None): self.path = "fake.msi" diff --git a/tools/tests/test_netmanager.py b/tools/tests/test_netmanager.py index 69159fdfce..5f65d97d41 100644 --- a/tools/tests/test_netmanager.py +++ b/tools/tests/test_netmanager.py @@ -1,7 +1,3 @@ -"""NetworkManager contract and real D-Bus handovers (requires python3-gi and dbus). - -Run on Linux: dbus-run-session -- python3 -m unittest discover -s tools/tests -p test_netmanager.py -""" import importlib.machinery import importlib.util import json diff --git a/tools/tests/test_noexec_preload.py b/tools/tests/test_noexec_preload.py index 20a437d4cb..b228444f90 100644 --- a/tools/tests/test_noexec_preload.py +++ b/tools/tests/test_noexec_preload.py @@ -43,7 +43,7 @@ class NoexecPreloadTest(unittest.TestCase): cls.tmp = Path(tempfile.mkdtemp()) cls.lib = cls.tmp / "libnoexec.so" subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-fPIC", "-shared", "-pthread", "-DNOEXEC_TEST", "-o", str(cls.lib), - str(PRELOAD / "noexec.c"), str(PRELOAD / "fsync.c"), str(PRELOAD / "robust.c"), str(PRELOAD / "writewatch.c"), "-ldl"], check=True) + str(PRELOAD / "noexec.c"), str(PRELOAD / "fsync.c"), str(PRELOAD / "robust.c"), str(PRELOAD / "writewatch.c"), str(PRELOAD / "clockpause.c"), "-ldl"], check=True) source = cls.tmp / "program.c" source.write_text(PROGRAM) for name in ("FEX", "game"): diff --git a/tools/tests/test_openat2_preload.py b/tools/tests/test_openat2_preload.py index 793f069f02..cbaefaab24 100644 --- a/tools/tests/test_openat2_preload.py +++ b/tools/tests/test_openat2_preload.py @@ -9,8 +9,6 @@ import unittest PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" FASTPATH = Path(__file__).resolve().parents[1] / "proot/fastpath/fastpath.c" -# Opens each "<dirfd>\t<flags>\t<path>" case with openat2(RESOLVE_IN_ROOT) as FEX does: first through the kernel's own -# openat2 on argv[1] when it has one, then, with openat2 failing ENOSYS as under proot, through the preload on argv[2]. PROGRAM = r""" #define _GNU_SOURCE #include <dlfcn.h> @@ -225,7 +223,6 @@ int main(int argc, char **argv) { O_PATH = getattr(os, "O_PATH", 0o10000000) -# (dirfd: r = the tree, o = "/"), flags, path, expected: a path in the tree, an errno name, or "proc" for a file outside it. CASES = [ ("r", os.O_RDONLY, "etc/alternatives/hn", "etc/hostname"), ("r", os.O_RDONLY, "/lib64/x86_64-linux-gnu/libfoo.so.1", "usr/lib/x86_64-linux-gnu/libfoo.so.1.2"), @@ -256,7 +253,6 @@ CASES = [ ("o", os.O_RDONLY, "proc/self/status", "proc"), ] -# Only the preload: an absolute link to a path missing in the tree but present outside it, as droiddeck-fex's rootfs has. HOST_CASES = [ ("r", os.O_RDONLY, "lib/x86_64-linux-gnu/libbar.so.2", "host:libbar.so.2"), ("r", os.O_RDONLY, "hostdir/sub/data", "host:sub/data"), @@ -312,7 +308,7 @@ class Openat2PreloadTest(unittest.TestCase): cls.tmp = Path(tempfile.mkdtemp()) cls.lib = cls.tmp / "libopenat2.so" subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-fPIC", "-shared", "-pthread", "-o", str(cls.lib), - str(PRELOAD / "robust.c"), str(PRELOAD / "fsync.c"), str(PRELOAD / "noexec.c"), str(PRELOAD / "writewatch.c"), "-ldl"], check=True) + str(PRELOAD / "robust.c"), str(PRELOAD / "fsync.c"), str(PRELOAD / "noexec.c"), str(PRELOAD / "writewatch.c"), str(PRELOAD / "clockpause.c"), "-ldl"], check=True) source = cls.tmp / "openat2.c" source.write_text(PROGRAM) subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-o", str(cls.tmp / "openat2"), str(source), "-ldl"], check=True) diff --git a/tools/tests/test_picture_position_mapping.py b/tools/tests/test_picture_position_mapping.py index 597fec9384..2c9eb8e32b 100644 --- a/tools/tests/test_picture_position_mapping.py +++ b/tools/tests/test_picture_position_mapping.py @@ -1,4 +1,3 @@ -"""Test the renderer's actual map and inverse map without a Vulkan device.""" import os from pathlib import Path import shutil diff --git a/tools/tests/test_pointer_release.py b/tools/tests/test_pointer_release.py index 9da5672e3f..37e096c7a8 100644 --- a/tools/tests/test_pointer_release.py +++ b/tools/tests/test_pointer_release.py @@ -1,4 +1,3 @@ -"""Exercise the compositor's real button dispatcher with a recording Wayland sink.""" import os from pathlib import Path import shutil diff --git a/tools/tests/test_preload_snapshots.py b/tools/tests/test_preload_snapshots.py index 464b24e7b6..6629d1ab22 100644 --- a/tools/tests/test_preload_snapshots.py +++ b/tools/tests/test_preload_snapshots.py @@ -30,7 +30,6 @@ class PreloadSnapshotTest(unittest.TestCase): directory = tempfile.TemporaryDirectory() self.addCleanup(directory.cleanup) self.root = Path(directory.name) - # Real repository inputs exercise the transitive include walker and build recipe. for group in snapshots.INPUTS: for name in snapshots.source_files(group): if name.startswith('@'): diff --git a/tools/tests/test_quest_kgsl.py b/tools/tests/test_quest_kgsl.py index 4ce7ae0f63..7c3365544d 100644 --- a/tools/tests/test_quest_kgsl.py +++ b/tools/tests/test_quest_kgsl.py @@ -17,6 +17,16 @@ class QuestKgslTest(unittest.TestCase): str(QUEST / 'test_kgsl_compat.c'), str(QUEST / 'kgsl_compat.c')], check=True) result = subprocess.run([binary], capture_output=True, text=True, check=True, timeout=10) self.assertIn('PASS: 12 GPUOBJ', result.stdout) + self.assertIn('PASS: denied timestamp reads', result.stdout) + + def test_refused_timestamp_read_is_answered_from_waits(self): + with tempfile.TemporaryDirectory() as folder: + binary = str(Path(folder) / 'test-kgsl-read') + subprocess.run(['gcc', '-Wall', '-Wextra', '-Werror', '-O2', '-o', binary, + str(QUEST.parent / 'tests/test_kgsl_read.c'), + str(QUEST.parent / 'linuxfs/preload/kgslpoll.c')], check=True) + result = subprocess.run([binary], capture_output=True, text=True, check=True, timeout=10) + self.assertIn('PASS: refused timestamp reads', result.stdout) if __name__ == '__main__': diff --git a/tools/tests/test_quest_presentation.py b/tools/tests/test_quest_presentation.py index 9c87926e40..81b726a563 100644 --- a/tools/tests/test_quest_presentation.py +++ b/tools/tests/test_quest_presentation.py @@ -10,8 +10,6 @@ ROOT = Path(__file__).resolve().parents[2] @unittest.skipUnless(shutil.which('cc'), 'needs a C compiler') class QuestBackdropTest(unittest.TestCase): def test_first_frame_requires_client_content(self): - # Compile the real entrypoint with controlled layer outcomes, including the - # successful no-op that previously dismissed the loading UI on a black frame. source = (ROOT / 'app/src/main/cpp/waylandcomp/src/vk_present.c').read_text() start = source.index('\nint vkp_render(') end = source.index('\nint vkp_render_hdr(', start) diff --git a/tools/tests/test_render_on_commit.py b/tools/tests/test_render_on_commit.py index d27c7646e1..698944f844 100644 --- a/tools/tests/test_render_on_commit.py +++ b/tools/tests/test_render_on_commit.py @@ -32,6 +32,8 @@ static int64_t g_hold_missed_ns; static int64_t g_refresh_ns = 16666667; volatile int g_render_on_commit = 1; volatile int g_release_unpaced = 1; +volatile int g_fps_limit; +static int64_t g_scene_due_ns; static atomic_int g_stream_on; static struct { unsigned ticks, ticks_late_2ms, commit_renders; int64_t tick_late_ns, tick_late_max_ns; } g_pace; static struct { unsigned ticks; } g_perf; @@ -204,7 +206,7 @@ class RenderOnCommitTest(unittest.TestCase): render = extract_function(source, 'render_scene') self.assertIn('g_rendered_tick_ns = g_tick_vsync_ns;', render) self.assertIn('g_tick_held = 0;', render) - functions = ('commit_renders_on', 'render_on_commit', 'schedule_render', 'scene_waits_for_game', 'on_commit_idle', 'on_vsync') + functions = ('scene_held_for_limit', 'commit_renders_on', 'render_on_commit', 'schedule_render', 'scene_waits_for_game', 'on_commit_idle', 'on_vsync') harness = PREAMBLE + '\n'.join(extract_function(source, name) for name in functions) + CHECKS with tempfile.TemporaryDirectory(prefix='droiddeck-render-on-commit-') as folder: path = Path(folder) diff --git a/tools/tests/test_run_windows.py b/tools/tests/test_run_windows.py index 143fba9257..ac1be22f4a 100644 --- a/tools/tests/test_run_windows.py +++ b/tools/tests/test_run_windows.py @@ -1,4 +1,3 @@ -"""Exercise the Windows launcher without building an APK or contacting a phone.""" import os from pathlib import Path import shutil diff --git a/tools/tests/test_runtime_inputs.py b/tools/tests/test_runtime_inputs.py index 1ace64e406..ebb6cf97ee 100644 --- a/tools/tests/test_runtime_inputs.py +++ b/tools/tests/test_runtime_inputs.py @@ -88,6 +88,19 @@ class RuntimeInputsTest(unittest.TestCase): with self.assertRaisesRegex(ValueError, 'sources changed'): runtime.verify(self.root) + def test_dev_loop_can_reuse_assets_from_other_sources(self): + runtime.record(self.root) + self.source.write_text('new implementation') + with mock.patch('sys.stderr', new_callable=io.StringIO) as stderr: + runtime.verify(self.root, stale_sources_ok=True) + self.assertIn('tools/linuxfs/preload/test.c', stderr.getvalue()) + + def test_dev_loop_still_rejects_changed_outputs(self): + runtime.record(self.root) + (self.root / 'app/src/main/jniLibs/arm64-v8a/libproot.so').write_bytes(b'old APK binary') + with self.assertRaisesRegex(ValueError, 'changed runtime input'): + runtime.verify(self.root, stale_sources_ok=True) + def test_changed_quest_source_rejects_old_outputs(self): source = self.root / 'tools/quest/kgsl_compat.c' source.parent.mkdir(parents=True) diff --git a/tools/tests/test_scene_limit_hold.py b/tools/tests/test_scene_limit_hold.py new file mode 100644 index 0000000000..e2c32937eb --- /dev/null +++ b/tools/tests/test_scene_limit_hold.py @@ -0,0 +1,105 @@ +import os +from pathlib import Path +import re +import shutil +import subprocess +import tempfile +import unittest + + +ROOT = Path(__file__).resolve().parents[2] +SOURCE = ROOT / 'app/src/main/cpp/waylandcomp/src/compositor.c' + + +def extract_function(source, name): + match = re.search(r'^static int(?:64_t)? ' + re.escape(name) + r'\([^;]*?\) \{', source, re.MULTILINE) + if match is None: + raise AssertionError(f'Missing compositor function: {name}') + cursor, depth = match.end(), 1 + while depth: + depth += (source[cursor] == '{') - (source[cursor] == '}') + cursor += 1 + return source[match.start():cursor] + + +HARNESS = r''' +#include <assert.h> +#include <stdint.h> +#include <stdio.h> + +@FUNCTIONS@ + +#define MS 1000000LL + +static int run(int64_t refresh, int limit, int64_t jitter, int seconds) { + int renders = 0; + int64_t due = 0; + for (int64_t tick = 0; tick * refresh < seconds * 1000 * MS; tick++) { + int64_t now = 1000 * MS + tick * refresh + (tick % 2 ? jitter : -jitter); + if (scene_held_for_limit(now, due, limit, 0)) continue; + renders++; + due = scene_next_due(now, due, limit); + } + return renders; +} + +int main(void) { + assert(!scene_held_for_limit(100 * MS, 0, 30, 0)); + assert(!scene_held_for_limit(100 * MS, 130 * MS, 0, 0)); + assert(!scene_held_for_limit(100 * MS, 130 * MS, 30, 1)); + assert(scene_held_for_limit(100 * MS, 130 * MS, 30, 0)); + assert(scene_held_for_limit(100 * MS, 102 * MS, 30, 0)); + assert(!scene_held_for_limit(100 * MS, 101 * MS, 30, 0)); + assert(!scene_held_for_limit(100 * MS, 90 * MS, 30, 0)); + assert(scene_next_due(100 * MS, 0, 0) == 0); + assert(scene_next_due(100 * MS, 0, 25) == 140 * MS); + assert(scene_next_due(101 * MS, 100 * MS, 25) == 140 * MS); + assert(scene_next_due(200 * MS, 100 * MS, 25) == 240 * MS); + const struct { int64_t refresh; int limit; int expected; } cases[] = { + {8333333, 30, 300}, {8333333, 60, 600}, {16666667, 25, 250}, {16666667, 30, 300}, + {10000000, 30, 300}, {11111111, 30, 300}, {6944444, 40, 400}, {16666667, 120, 600}, + }; + for (unsigned i = 0; i < sizeof cases / sizeof cases[0]; i++) { + int got = run(cases[i].refresh, cases[i].limit, 0, 10); + if (got > cases[i].expected + 1 || got < cases[i].expected - 2) { + fprintf(stderr, "refresh %lld limit %d: %d renders, expected %d\n", + (long long)cases[i].refresh, cases[i].limit, got, cases[i].expected); + return 1; + } + got = run(cases[i].refresh, cases[i].limit, 300000, 10); + if (got > cases[i].expected + 1 || got < cases[i].expected - 2) { + fprintf(stderr, "jittered refresh %lld limit %d: %d renders, expected %d\n", + (long long)cases[i].refresh, cases[i].limit, got, cases[i].expected); + return 1; + } + } + int fallback = run(8 * MS, 30, 0, 10); + assert(fallback <= 301 && fallback >= 290); + puts("PASS"); + return 0; +} +''' + + +class SceneLimitHoldTest(unittest.TestCase): + def test_a_frame_limit_holds_scene_renders_to_its_rate_without_slowing_paced_frames(self): + compiler = shutil.which(os.environ.get('CC', 'cc')) + if compiler is None: + self.skipTest('A host C compiler is required') + source = SOURCE.read_text() + harness = HARNESS.replace('@FUNCTIONS@', '\n'.join(extract_function(source, name) for name in ('scene_held_for_limit', 'scene_next_due'))) + with tempfile.TemporaryDirectory(prefix='droiddeck-scene-hold-') as folder: + path = Path(folder) + (path / 'hold.c').write_text(harness) + binary = path / 'hold-test' + build = subprocess.run([compiler, '-std=c11', '-Wall', '-Wextra', '-Werror', '-O2', + str(path / 'hold.c'), '-o', str(binary)], + capture_output=True, text=True) + self.assertEqual(0, build.returncode, build.stderr) + result = subprocess.run([str(binary)], capture_output=True, text=True, timeout=10) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('PASS', result.stdout.strip()) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index bc71403f8b..1440b41b0f 100644 --- a/tools/tests/test_seed_redists.py +++ b/tools/tests/test_seed_redists.py @@ -64,6 +64,31 @@ UBISOFT_SCRIPT = r'''"installscript" } ''' +EA_SCRIPT = r'''"installscript" +{ + "Run Process" + { + "EADesktopSetup" + { + "process 1" "%INSTALLDIR%\\__Installer\\Origin\\redist\\internal\\EAappInstaller.exe" + "command 1" "EAX_LAUNCH_CLIENT=0 IGNORE_INSTALLED=1" + "HasRunStringKey" "HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\EA Desktop\\InstallSuccessful" + "HasRunStringValue" "true" + "RunType" "1" + } + "Windows6.1-KB2670838-x64.msu" + { + "process 1" "%INSTALLDIR%\\__Installer\\customcomponent\\patch_KB2670838_x64\\Windows6.1-KB2670838-x64.msu" + "command 1" "/quiet" + "Requirement_OS" + { + "OSType" "Windows 7" + } + } + } +} +''' + class SeedRedistsTest(unittest.TestCase): def setUp(self): @@ -373,14 +398,17 @@ class SeedRedistsTest(unittest.TestCase): self.assertEqual(self.reg.read_text().count('"Vulkan111080"'), 2) - def ubisoft(self): - script = self.tmp / "legacycompat/evaluatorscript_447040.vdf" + def evaluator(self, appid, install_script): + script = self.tmp / ("legacycompat/evaluatorscript_%s.vdf" % appid) script.parent.mkdir(parents=True) - script.write_text('"evaluatorscript"\n{\n\t"appid"\t\t"447040"\n\t"1"\n' - + "\n".join("\t" + line for line in UBISOFT_SCRIPT.splitlines()) + "\n}\n") + script.write_text('"evaluatorscript"\n{\n\t"appid"\t\t"%s"\n\t"1"\n' % appid + + "\n".join("\t" + line for line in install_script.splitlines()) + "\n}\n") env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_SCRIPTS=str(script)) return subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) + def ubisoft(self): + return self.evaluator("447040", UBISOFT_SCRIPT) + def test_the_ubisoft_connect_installer_is_left_to_run(self): self.ubisoft() self.assertIn('"easyanticheat"=dword:00000001', self.user.read_text()) @@ -399,7 +427,28 @@ class SeedRedistsTest(unittest.TestCase): result = self.ubisoft() self.assertNotIn("Ubisoft Connect PC Client", self.reg.read_text()) self.assertNotIn("Ubisoft Connect PC Client", (self.reg.parent / ".droiddeck-redists").read_text()) - self.assertIn("Ubisoft Connect markers out", result.stdout) + self.assertIn("Ubisoft Connect and EA app markers out", result.stdout) + + def test_the_ea_app_installer_is_left_to_run(self): + self.evaluator("1238080", EA_SCRIPT) + reg = self.reg.read_text() + self.assertNotIn("EADesktopSetup", reg) + self.assertEqual(reg.count('"Windows6.1-KB2670838-x64.msu"=dword:00000001'), 2) + self.assertNotIn("EADesktopSetup", (self.reg.parent / ".droiddeck-redists").read_text()) + + def test_an_ea_app_marker_an_earlier_seeding_wrote_comes_out(self): + marker = "HKEY_LOCAL_MACHINE\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\1238080\tEADesktopSetup" + self.reg.write_text( + "WINE REGISTRY Version 2\n" + "\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\1238080] 1793680524\n" + '"EADesktopSetup"=dword:00000001\n' + "\n[Software\\\\Wow6432Node\\\\Valve\\\\Steam\\\\Apps\\\\1238080] 1793680524\n" + '"EADesktopSetup"=dword:00000001\n') + (self.reg.parent / ".droiddeck-redists").write_text(marker + "\n") + result = self.evaluator("1238080", EA_SCRIPT) + self.assertNotIn("EADesktopSetup", self.reg.read_text()) + self.assertNotIn("EADesktopSetup", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertIn("EA app markers out", result.stdout) if __name__ == "__main__": unittest.main() diff --git a/tools/tests/test_session_cursor_routing.py b/tools/tests/test_session_cursor_routing.py index 60d28edc41..dd2c77d944 100644 --- a/tools/tests/test_session_cursor_routing.py +++ b/tools/tests/test_session_cursor_routing.py @@ -1,4 +1,3 @@ -"""Gamescope composites the cursor only when a Steam session asks for it.""" import os from pathlib import Path import re diff --git a/tools/tests/test_session_guest_command.py b/tools/tests/test_session_guest_command.py index d6f352a8e9..5938b8c453 100644 --- a/tools/tests/test_session_guest_command.py +++ b/tools/tests/test_session_guest_command.py @@ -1,9 +1,3 @@ -"""Exercise the literal launch prefix from SessionService without an Android runtime. - -This is a focused source/exec regression check, not a Kotlin or PRoot integration -test. PRoot executes the first guest argument directly; KEY=VALUE is meaningful -only after /usr/bin/env. Read the production prefix rather than duplicate it. -""" import json from pathlib import Path import re diff --git a/tools/tests/test_session_pacing.py b/tools/tests/test_session_pacing.py index 84962fe9e6..67b616669c 100644 --- a/tools/tests/test_session_pacing.py +++ b/tools/tests/test_session_pacing.py @@ -1,4 +1,3 @@ -"""Steam owns game caps; the nested compositor follows the output refresh rate.""" import os from pathlib import Path import subprocess diff --git a/tools/tests/test_session_vkbridge_wait.py b/tools/tests/test_session_vkbridge_wait.py new file mode 100644 index 0000000000..bbd4fdb264 --- /dev/null +++ b/tools/tests/test_session_vkbridge_wait.py @@ -0,0 +1,127 @@ +import os +import re +import shutil +import socket +import subprocess +import tempfile +import threading +import time +import unittest +from pathlib import Path + +SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session" + + +def wait_functions(): + text = SESSION.read_text() + found = [] + for name in ("bl_now_ms", "vkbridge_wait_socket"): + match = re.search(r"^%s\(\) \{\n.*?^\}\n" % name, text, re.M | re.S) + if match: + found.append(match.group(0)) + return found + + +class VkBridgeSocketWaitTest(unittest.TestCase): + def setUp(self): + self.root = Path(tempfile.mkdtemp()) + self.addCleanup(shutil.rmtree, self.root, True) + self.sock = self.root / "vkbridge" / "server.sock" + self.sock.parent.mkdir() + self.listeners = [] + self.addCleanup(lambda: [s.close() for s in self.listeners]) + + def listen(self): + listener = socket.socket(socket.AF_UNIX) + listener.bind(str(self.sock)) + listener.listen(1) + self.listeners.append(listener) + + def listen_after(self, seconds): + timer = threading.Timer(seconds, self.listen) + timer.start() + self.addCleanup(timer.cancel) + + def run_wait(self, limit_ms, prelude=""): + functions = wait_functions() + self.assertEqual(2, len(functions), "droiddeck-session lacks bl_now_ms() or vkbridge_wait_socket()") + script = "set -u\n" + "".join(functions) + prelude + script += 'if vkbridge_wait_socket "$1" "$2"; then echo USABLE; else echo FALLBACK; fi\n' + started = time.monotonic() + out = subprocess.run(["bash", "-c", script, "session", str(self.sock), str(limit_ms)], + capture_output=True, text=True, timeout=30, check=True).stdout + return out, time.monotonic() - started + + def waited_ms(self, out): + match = re.search(r"waited (\d+) ms|after (\d+) ms", out) + self.assertIsNotNone(match, out) + return int(match.group(1) or match.group(2)) + + def test_a_socket_already_listening_is_used_at_once(self): + self.listen() + out, elapsed = self.run_wait(10000) + self.assertTrue(out.endswith("USABLE\n"), out) + self.assertIn("== vkbridge: server socket ready (waited 0 ms)", out) + self.assertLess(elapsed, 2) + + def test_a_server_still_probing_is_waited_for(self): + self.listen_after(0.4) + out, elapsed = self.run_wait(10000) + self.assertTrue(out.endswith("USABLE\n"), out) + self.assertIn("== vkbridge: server socket ready (waited ", out) + waited = self.waited_ms(out) + self.assertGreaterEqual(waited, 300, out) + self.assertLess(waited, 5000, out) + self.assertLess(elapsed, 6) + + def test_no_server_falls_back_after_the_limit(self): + out, elapsed = self.run_wait(300) + self.assertTrue(out.endswith("FALLBACK\n"), out) + self.assertIn("== vkbridge: no server socket after ", out) + self.assertIn("(gave up at 300 ms)", out) + self.assertGreaterEqual(self.waited_ms(out), 300) + self.assertLess(elapsed, 5) + + def test_a_plain_file_is_not_a_socket(self): + self.sock.write_text("stale") + out, _ = self.run_wait(200) + self.assertTrue(out.endswith("FALLBACK\n"), out) + + def test_a_stopping_session_does_not_wait(self): + out, elapsed = self.run_wait(10000, prelude="bl_stopping=1\n") + self.assertTrue(out.endswith("FALLBACK\n"), out) + self.assertIn("the session is stopping", out) + self.assertLess(elapsed, 2) + + def test_no_socket_path_is_a_fallback_without_waiting(self): + functions = "".join(wait_functions()) + out = subprocess.run(["bash", "-c", "set -u\n" + functions + + 'if vkbridge_wait_socket "" 10000; then echo USABLE; else echo FALLBACK; fi\n'], + capture_output=True, text=True, timeout=10, check=True).stdout + self.assertEqual("FALLBACK\n", out) + + +class VkBridgeSessionCheckTest(unittest.TestCase): + + def setUp(self): + self.text = SESSION.read_text() + match = re.search(r'^if \[ "\$\{BL_VKBRIDGE:-0\}" = 1 \]; then\n.*?^fi\n', self.text, re.M | re.S) + self.assertIsNotNone(match) + self.block = match.group(0) + + def test_the_first_pass_waits_before_the_usability_check(self): + wait = self.block.index("vkbridge_wait_socket") + check = self.block.index('[ -S "${VKBRIDGE_SOCKET:-}" ]') + self.assertLess(wait, check) + self.assertIn('[ -z "${BL_INSIDE:-}" ] && vkbridge_wait_socket', self.block) + + def test_the_fallback_message_names_what_is_missing(self): + self.assertIn("Mali bridge requested but NOT usable", self.block) + self.assertIn("missing:$bl_vkb_missing", self.block) + + def test_a_stop_ends_the_wait(self): + self.assertRegex(self.text, r"trap '[^']*bl_stopping=1[^']*' TERM INT HUP") + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_session_webhelper_layout.py b/tools/tests/test_session_webhelper_layout.py new file mode 100644 index 0000000000..f14afd61da --- /dev/null +++ b/tools/tests/test_session_webhelper_layout.py @@ -0,0 +1,48 @@ +import os +import re +import subprocess +import unittest +from pathlib import Path + +SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session" +KEYS = ("BL_VKBRIDGE_WEBHELPER_ARGS", "BL_VKBRIDGE_CEF_ANGLE", "BL_VKBRIDGE_CEF_VULKAN") + + +def layout_function(): + match = re.search(r"^bl_webhelper_layout\(\) \{\n.*?^\}\n", SESSION.read_text(), re.M | re.S) + return match.group(0) if match else None + + +class WebhelperLayoutTest(unittest.TestCase): + def layout(self, **settings): + function = layout_function() + self.assertIsNotNone(function, "droiddeck-session lacks bl_webhelper_layout()") + env = {k: v for k, v in os.environ.items() if k not in KEYS} + env.update(settings) + return subprocess.run(["bash", "-c", "set -u\n" + function + "bl_webhelper_layout\n"], env=env, + capture_output=True, text=True, check=True).stdout.strip() + + def test_unset_keeps_steams_own_layout(self): + self.assertEqual(self.layout(), "stock") + + def test_angle_on_vulkan_brings_chromiums_vulkan_compositing(self): + self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan"), + "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") + + def test_vulkan_compositing_can_be_left_off(self): + self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan", BL_VKBRIDGE_CEF_VULKAN="0"), + "--use-gl=angle --use-angle=vulkan") + + def test_other_angle_backends_get_only_the_angle_switches(self): + self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="gl"), "--use-gl=angle --use-angle=gl") + + def test_explicit_layout_wins(self): + self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan", BL_VKBRIDGE_WEBHELPER_ARGS="--x +Y"), + "--x +Y") + + def test_the_steam_block_uses_it(self): + self.assertIn("BL_WEBHELPER_ARGS=$(bl_webhelper_layout)", SESSION.read_text()) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_sign_apk_renames.py b/tools/tests/test_sign_apk_renames.py index 4859f4a2e5..bd111fa0f7 100644 --- a/tools/tests/test_sign_apk_renames.py +++ b/tools/tests/test_sign_apk_renames.py @@ -9,8 +9,6 @@ PACKAGE = 'com.droiddeck.launcher' class SignApkRenamesTest(unittest.TestCase): def test_variants_rename_every_authority_and_task_named_after_the_package(self): - # sign-apk.sh renames a fixed list of names for the pubg/antutu/ludashi variants and fails the - # main build on any authority or task affinity it leaves on the base package; PR builds do not sign. manifest = (ROOT / 'app/src/main/AndroidManifest.xml').read_text() names = set() for attribute in ('authorities', 'taskAffinity'): diff --git a/tools/tests/test_steam_cold_launch.py b/tools/tests/test_steam_cold_launch.py index 162037eba9..1695ad0e16 100644 --- a/tools/tests/test_steam_cold_launch.py +++ b/tools/tests/test_steam_cold_launch.py @@ -1,4 +1,3 @@ -"""Retry a dropped shortcut without duplicating a launch that is still preparing its first window.""" import os from pathlib import Path import subprocess @@ -29,7 +28,6 @@ class SteamColdLaunchTest(unittest.TestCase): self.agent_count = self.root / "agent-count" self.focus_count = self.root / "focus-count" - # FOCUS lists the focused app per xprop call; the last value repeats. xprop = self.bin / "xprop" xprop.write_text( "#!/bin/sh\n" diff --git a/tools/tests/test_steam_compat_mapping.py b/tools/tests/test_steam_compat_mapping.py new file mode 100644 index 0000000000..dd9ba22196 --- /dev/null +++ b/tools/tests/test_steam_compat_mapping.py @@ -0,0 +1,226 @@ +import json +from pathlib import Path +import random +import runpy +import tempfile +import unittest +from unittest import mock + + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +COMPAT = runpy.run_path(str(BIN / "steam-compatibility")) + + +def config_text(entries): + return ('"Before" { "9" { "name" "outside" } } ' + '"InstallConfigStore" { "Software" { "Valve" { "Steam" { ' + '"CompatToolMapping" { ' + entries + + ' } "After" { "9" { "name" "outside" } } } } } }') + + +class CountedTokens(list): + def __init__(self, tokens): + super().__init__(tokens) + self.visited = 0 + + def __getitem__(self, key): + self.visited += len(range(*key.indices(len(self)))) if isinstance(key, slice) else 1 + return super().__getitem__(key) + + +class MappingBatchTest(unittest.TestCase): + def assert_batch(self, entries, changes): + original = COMPAT["tokenize"](config_text(entries)) + mapping = COMPAT["mapping_block"](original) + expected, actual = list(original), list(original) + for app, tool in changes.items(): + COMPAT["set_mapping"](expected, mapping, app, tool) + COMPAT["set_mappings"](actual, mapping, changes) + self.assertEqual(actual, expected) + self.assertEqual(COMPAT["serialize"](actual), COMPAT["serialize"](expected)) + return actual, mapping + + def test_existing_fields_and_default_priority_are_preserved(self): + entries = ('"0" { "name" "old" "priority" "123" "config" "custom" } ' + '"1" { "name" "old" "priority" "17" "extra" { "keep" "yes" } }') + actual, _ = self.assert_batch(entries, {"0": "New Default", "1": "New Game"}) + expected = entries.replace('"old"', '"New Default"', 1).replace('"old"', '"New Game"', 1) + self.assertEqual(actual, COMPAT["tokenize"](config_text(expected))) + + def test_missing_names_are_inserted_without_replacing_other_fields(self): + entries = '"1" { "config" "custom" "priority" "17" } "2" { "NAME" "kept" }' + actual, _ = self.assert_batch(entries, {"1": "new", "2": ""}) + expected = ('"1" { "name" "new" "config" "custom" "priority" "17" } ' + '"2" { "name" "" "NAME" "kept" }') + self.assertEqual(actual, COMPAT["tokenize"](config_text(expected))) + + def test_new_entries_keep_reverse_insertion_order_and_priorities(self): + actual, mapping = self.assert_batch('"1" { "name" "old" }', + {"4": "four", "0": "default", "9": "nine", "8": None, "1": "one"}) + expected = COMPAT["tokenize"]( + '"9" { "name" "nine" "config" "" "priority" "250" } ' + '"0" { "name" "default" "config" "" "priority" "75" } ' + '"4" { "name" "four" "config" "" "priority" "250" }') + self.assertEqual(actual[mapping + 1:mapping + 1 + len(expected)], expected) + + def test_deletion_and_absent_deletion_preserve_neighbor_sections(self): + entries = '"layout" "keep" "1" { "name" "old" } "2" { "name" "kept" }' + actual, _ = self.assert_batch(entries, {"1": None, "9": None}) + self.assertEqual(actual, COMPAT["tokenize"](config_text('"layout" "keep" "2" { "name" "kept" }'))) + + def test_duplicate_app_entries_change_only_the_first_match(self): + entries = '"1" { "name" "first" } "1" { "name" "second" } "2" { "name" "other" }' + for tool in (None, "new"): + with self.subTest(tool=tool): + actual, _ = self.assert_batch(entries, {"1": tool, "2": "updated"}) + first = '' if tool is None else '"1" { "name" "new" } ' + expected = first + '"1" { "name" "second" } "2" { "name" "updated" }' + self.assertEqual(actual, COMPAT["tokenize"](config_text(expected))) + + def test_nested_and_duplicate_name_fields_keep_first_match_semantics(self): + entries = ('"1" { "extra" { "name" "nested" } "name" "outer" } ' + '"2" { "name" "first" "name" "second" }') + actual, _ = self.assert_batch(entries, {"1": "new", "2": "new"}) + expected = entries.replace('"nested"', '"new"').replace('"first"', '"new"') + self.assertEqual(actual, COMPAT["tokenize"](config_text(expected))) + + def test_case_aliases_and_quoted_aliases_keep_sequential_semantics(self): + for entries, changes in ( + ('"App" { "name" "first" } "app" { "name" "second" }', {"App": None, "app": "new"}), + ('', {"App": "first", "app": "second"}), + ('', {0: "first", "0": "second"})): + with self.subTest(entries=entries, changes=changes): + self.assert_batch(entries, changes) + + def test_an_empty_batch_does_not_read_or_mutate_tokens(self): + tokens = CountedTokens(COMPAT["tokenize"](config_text('"1" { "name" "old" }'))) + mapping = COMPAT["mapping_block"](tokens) + tokens.visited = 0 + before = list(tokens) + COMPAT["set_mappings"](tokens, mapping, {}) + self.assertEqual(tokens, before) + self.assertEqual(tokens.visited, 0) + + def test_non_string_keys_keep_the_single_writers_error_behavior(self): + for changes in ({1: "new", "2": "new"}, {"2": "new", 1: "new"}): + with self.subTest(changes=changes): + tokens = COMPAT["tokenize"](config_text('"1" { "name" "old" } "2" { "name" "old" }')) + mapping = COMPAT["mapping_block"](tokens) + expected, actual = list(tokens), list(tokens) + with self.assertRaises(AttributeError): + for app, tool in changes.items(): + COMPAT["set_mapping"](expected, mapping, app, tool) + with self.assertRaises(AttributeError): + COMPAT["set_mappings"](actual, mapping, changes) + self.assertEqual(actual, expected) + + def test_single_changes_use_the_existing_writer(self): + globals_ = COMPAT["set_mappings"].__globals__ + for changes in ({"1": "new"}, {"1": None}, {"2": "new"}): + with self.subTest(changes=changes): + tokens = COMPAT["tokenize"](config_text('"1" { "name" "old" }')) + mapping = COMPAT["mapping_block"](tokens) + with mock.patch.dict(globals_, set_mapping=mock.Mock(wraps=COMPAT["set_mapping"])): + COMPAT["set_mappings"](tokens, mapping, changes) + globals_["set_mapping"].assert_called_once_with(tokens, mapping, *next(iter(changes.items()))) + + def test_bulk_work_is_linear_for_updates_insertions_and_deletions(self): + for count in (128, 512): + for kind in ("update", "insert", "delete", "missing-name"): + with self.subTest(count=count, kind=kind): + field = '"config" "kept"' if kind == "missing-name" else '"name" "old"' + entries = "".join('"%s" { %s }' % (app, field) for app in range(count)) + tokens = CountedTokens(COMPAT["tokenize"](config_text(entries))) + mapping = COMPAT["mapping_block"](tokens) + start = count if kind == "insert" else 0 + changes = {str(app): None if kind == "delete" else "new" for app in range(start, start + count)} + tokens.visited = 0 + size = len(tokens) + COMPAT["set_mappings"](tokens, mapping, changes) + self.assertLessEqual(tokens.visited, 8 * size + 8 * count) + + def test_a_batch_stops_after_its_last_matching_entry(self): + entries = "".join('"%s" { "name" "old" }' % app for app in range(512)) + tokens = CountedTokens(COMPAT["tokenize"](config_text(entries))) + mapping = COMPAT["mapping_block"](tokens) + tokens.visited = 0 + COMPAT["set_mappings"](tokens, mapping, {"0": "new", "1": "new"}) + self.assertLess(tokens.visited, 100) + + def test_mixed_batches_match_the_single_writer(self): + random_ = random.Random(1748) + fields = ( + '"name" "old" "config" "" "priority" "250"', + '"priority" "17"', + '"name" "" "name" "second"', + '"extra" { "name" "nested" } "name" "outer"', + '"NAME" "keep" "extra" { "1" { "name" "nested" } }', + '', + r'"name" "old" "config" "quoted \"value\" and \\path"', + ) + for case in range(512): + entries = '"layout" "keep" ' + "".join( + '"%s" { %s }' % (random_.randrange(8), random_.choice(fields)) + for _ in range(random_.randrange(12))) + apps = random_.sample(range(12), random_.randrange(13)) + changes = {str(app): random_.choice((None, "", "New Tool", r"new\\tool")) for app in apps} + with self.subTest(case=case): + self.assert_batch(entries, changes) + + +class MappingBatchIntegrationTest(unittest.TestCase): + def register(self, replace): + old = {"name": "DroidDeck-Proton-11-11.2", "dir": "DroidDeck-Proton 11-11.2", "valve": False} + new = {"name": "DroidDeck-Proton-11-11.4", "dir": "DroidDeck-Proton 11-11.4", "valve": False} + valve = {"name": COMPAT["TOOL"], "dir": "Proton - Experimental (ARM64)", "valve": True} + before = old if replace else valve + apps = [str(app) for app in range(1, 65)] + with tempfile.TemporaryDirectory() as tmp: + state = Path(tmp) / "state" + state.mkdir() + (state / "state.json").write_text(json.dumps({ + "default": before["name"], "own_proton": True, "tools": [valve, before], + "auto": {app: before["name"] for app in apps}, + })) + config = Path(tmp) / "Steam/config/config.vdf" + config.parent.mkdir(parents=True) + config.write_text(config_text("".join( + '"%s" { "name" "%s" "priority" "%s" }' % + (app, before["name"], "75" if app == "0" else "250") for app in ["0", *apps]))) + globals_ = COMPAT["register_default"].__globals__ + single = mock.Mock(wraps=COMPAT["set_mapping"]) + with mock.patch.dict(globals_, set_mapping=single, steam_running=lambda: False): + result = COMPAT["register_default"]( + str(config), apps, catalog=[valve, new], directory=str(state), settle=True, + default=None if replace else new["name"]) + self.assertEqual(result, new["name"]) + self.assertEqual(COMPAT["read_config_mapping"](str(config)), {app: new["name"] for app in ["0", *apps]}) + self.assertLessEqual(single.call_count, 1 if replace else 0) + + def test_retired_proton_replacements_are_batched(self): + self.register(replace=True) + + def test_planned_default_changes_are_batched(self): + self.register(replace=False) + + def test_x64_repoint_batches_default_and_games_and_keeps_pending_order(self): + apps = [str(app) for app in range(1, 65)] + with tempfile.TemporaryDirectory() as tmp: + steam = Path(tmp) / "Steam" + config = steam / "config/config.vdf" + config.parent.mkdir(parents=True) + config.write_text(config_text("".join('"%s" { "name" "proton_experimental" }' % app for app in apps))) + pending = Path(tmp) / ".bl-compat-pending" + pending.write_text("before\n") + globals_ = COMPAT["x64_repoint"].__globals__ + single = mock.Mock(wraps=COMPAT["set_mapping"]) + with mock.patch.dict(globals_, set_mapping=single), mock.patch.dict("os.environ", HOME=tmp): + moved = COMPAT["x64_repoint"](str(steam), "new-a64", live=True) + self.assertEqual(moved, apps) + self.assertEqual(COMPAT["read_config_mapping"](str(config)), {app: "new-a64" for app in ["0", *apps]}) + self.assertEqual(pending.read_text(), "before\n" + "".join(app + "\n" for app in apps)) + single.assert_not_called() + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_steam_compat_x64.py b/tools/tests/test_steam_compat_x64.py index 3d4b069e04..9f9abc478a 100644 --- a/tools/tests/test_steam_compat_x64.py +++ b/tools/tests/test_steam_compat_x64.py @@ -50,14 +50,12 @@ CONFIG = '''"InstallConfigStore" class X64RepointTest(unittest.TestCase): - """steam-compatibility --x64: the x86-64 client's Proton entries go to its arm64 wrapper.""" def setUp(self): self.home = tempfile.TemporaryDirectory() self.root = Path(self.home.name) / "Steam" (self.root / "config").mkdir(parents=True) (self.root / "config" / "config.vdf").write_text(CONFIG) - # A wrapper of its own whose name starts with "proton": kept, never repointed. own = self.root / "compatibilitytools.d" / "proton-cachyos-a64" own.mkdir(parents=True) (own / "compatibilitytool.vdf").write_text('"compatibilitytools"\n{\n\t"compat_tools"\n\t{\n\t\t"proton-cachyos-a64"\n\t\t{\n\t\t}\n\t}\n}\n') @@ -82,12 +80,10 @@ class X64RepointTest(unittest.TestCase): self.assertEqual(m["550"], "GE-Proton11-7-a64") self.assertEqual(m["620"], "proton-cachyos-a64") self.assertEqual(m["730"], "steamlinuxruntime") - # The arm64 client's own Proton name, which this client ignores. self.assertEqual(m["880"], "GE-Proton11-7-a64") self.assertEqual(m["0"], "GE-Proton11-7-a64") def test_repoints_arm64_name_even_with_its_stray_tool(self): - # An arm64 compat pass that ran against this client also left its tool folder here. stray = self.root / "compatibilitytools.d" / "droiddeck-proton-arm64" stray.mkdir(parents=True) (stray / "compatibilitytool.vdf").write_text('"compatibilitytools"\n{\n\t"compat_tools"\n\t{\n\t\t"droiddeck-proton-arm64"\n\t\t{\n\t\t}\n\t}\n}\n') diff --git a/tools/tests/test_steam_desktop_launch.py b/tools/tests/test_steam_desktop_launch.py index 4100b3e79c..7d50640878 100644 --- a/tools/tests/test_steam_desktop_launch.py +++ b/tools/tests/test_steam_desktop_launch.py @@ -1,4 +1,3 @@ -"""Desktop Steam stays on KDE; explicit Big Picture still switches sessions.""" import fcntl import os from pathlib import Path @@ -92,6 +91,30 @@ class DesktopSteamLaunchTest(unittest.TestCase): '-cef-disable-gpu', 'steam://open/settings']) self.assertFalse((self.session / 'steam-launch').exists()) + def _running_client(self): + steam = self.root / 'data/Steam/steamrtarm64/steam' + steam.parent.mkdir(parents=True) + steam.write_text('#!/bin/bash\nprintf "%s\\n" "$@"\n') + steam.chmod(0o755) + (self.root / '.steam').mkdir() + os.mkfifo(self.root / '.steam/steam.pipe') + (self.root / '.steam/steam.pid').write_text(str(os.getpid())) + + def test_bottom_screen_desktop_hands_games_to_the_running_client(self): + self._running_client() + self.env['BL_BOTTOM_DESKTOP'] = '1' + result = self.launch('desktop', '501590') + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(result.stdout.splitlines(), ['-nobigpicture', '-no-cef-sandbox', '-cef-ozone-platform=x11', + '-cef-disable-gpu', 'steam://rungameid/501590']) + self.assertFalse((self.root / 'cache/droiddeck/steam-desktop.lock').exists()) + + def test_bottom_screen_desktop_starts_its_own_client_when_none_runs(self): + self.env.update(BL_BOTTOM_DESKTOP='1', DISPLAY=':7') + result = self.launch('desktop') + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(result.stdout.splitlines(), ['1', 'desktop', ':7', 'steam', 'steam://open/library']) + def test_second_click_forwards_to_the_x86_64_client_in_its_own_home(self): lock = self.root / 'cache/droiddeck/steam-desktop.lock' lock.parent.mkdir(parents=True) diff --git a/tools/tests/test_steam_games.py b/tools/tests/test_steam_games.py index c09d751a95..142898a172 100644 --- a/tools/tests/test_steam_games.py +++ b/tools/tests/test_steam_games.py @@ -6,6 +6,7 @@ from pathlib import Path import subprocess import tempfile import unittest +import zlib from unittest.mock import Mock, patch BIN = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin' @@ -247,6 +248,36 @@ class ImportsTest(unittest.TestCase): config.write_text(json.dumps({'installedManifestIDs': {'43': 0x7FFFFFFFFFFFFFFF}})) self.assertIsNone(imports.installed_build(self.folder, 42, 'DroidDeck-42')) + def test_compressed_protobuf_depot_config_records_installed_depots(self): + config = self.folder / '.DepotDownloader/depot.config' + config.parent.mkdir() + (self.folder / '.download_complete').touch() + entry = bytes([0x08, 43, 0x10, 99]) + packed = zlib.compressobj(wbits=-15) + config.write_bytes(packed.compress(bytes([0x0A, len(entry)]) + entry) + packed.flush()) + self.assertIn('"43"\n {\n "manifest" "99"', imports.installed_build(self.folder, 42, 'DroidDeck-42')) + config.write_bytes(b'not a config') + self.assertIsNone(imports.installed_build(self.folder, 42, 'DroidDeck-42')) + (config.parent / 'completed').mkdir() + (config.parent / 'completed/43_98.manifest').write_bytes(b'x') + self.assertIn('"manifest" "98"', imports.installed_build(self.folder, 42, 'DroidDeck-42')) + config.write_text(json.dumps({'installedManifestIDs': {}})) + self.assertIn('"manifest" "98"', imports.installed_build(self.folder, 42, 'DroidDeck-42')) + + def test_completed_manifests_record_installed_depots(self): + completed = self.folder / '.DepotDownloader/completed' + completed.mkdir(parents=True) + (self.folder / '.download_complete').touch() + self.assertIsNone(imports.installed_build(self.folder, 42, 'DroidDeck-42')) + (completed / '43_98.manifest').write_bytes(b'old') + (completed / '43_99.manifest').write_bytes(b'new') + (completed / '44_7.manifest').write_bytes(b'x') + os.utime(completed / '43_98.manifest', (1, 1)) + text = imports.installed_build(self.folder, 42, 'DroidDeck-42') + self.assertIn('"43"\n {\n "manifest" "99"', text) + self.assertIn('"44"\n {\n "manifest" "7"', text) + self.assertNotIn('"98"', text) + def test_bare_import_manifest_gains_installed_build(self): self.snapshot() imports.route(self.steam, self.acct, [self.game]) @@ -391,6 +422,61 @@ class ImportsTest(unittest.TestCase): with patch.object(imports.urllib.request, 'urlopen', side_effect=AssertionError): self.assertEqual(42, imports.identify(self.game)) + def test_spacewar_appid_names_no_game(self): + (self.folder / 'steam_appid.txt').write_text('480\n') + with patch.object(imports.urllib.request, 'urlopen', side_effect=OSError): + self.assertIsNone(imports.identify(self.game)) + + def import_as(self, appid): + self.assertTrue(imports.seed_install(self.steam, self.game, appid)) + self.assertTrue((self.steam / f'steamapps/appmanifest_{appid}.acf').is_file()) + + def snapshot_names(self, appid, owned): + imports.save_json(self.acct / 'config' / imports.STATE, + dict(account='123', owned={str(appid): owned}, + candidates={str(self.folder): appid}, + sources={str(self.folder): imports.source_stamp(self.game)})) + + def assert_not_imported_as(self, appid): + self.assertFalse((self.steam / f'steamapps/appmanifest_{appid}.acf').exists()) + self.assertFalse(os.path.lexists(self.steam / f'steamapps/common/DroidDeck-{appid}')) + + def test_spacewar_import_is_released_and_never_made_again(self): + self.import_as(480) + self.snapshot_names(480, owned=True) + with patch('builtins.print'): + self.assertEqual(([self.game], {}), imports.route(self.steam, self.acct, [self.game])) + self.assert_not_imported_as(480) + self.assertEqual(b'game', self.exe.read_bytes()) + + def test_import_follows_the_app_the_files_name_now(self): + self.snapshot() + imports.route(self.steam, self.acct, [self.game]) + self.snapshot_names(43, owned=True) + with patch('builtins.print'): + self.assertEqual(([], {str(self.game['appid']): 43}), imports.route(self.steam, self.acct, [self.game])) + self.assert_not_imported_as(42) + self.assertEqual(self.folder, (self.steam / 'steamapps/common/DroidDeck-43').resolve()) + + def test_unowned_new_appid_leaves_a_shortcut(self): + self.snapshot() + imports.route(self.steam, self.acct, [self.game]) + self.snapshot_names(43, owned=False) + with patch('builtins.print'): + self.assertEqual(([self.game], {}), imports.route(self.steam, self.acct, [self.game])) + self.assert_not_imported_as(42) + self.assert_not_imported_as(43) + + def test_import_stays_while_the_new_identity_is_unknown(self): + self.snapshot() + imports.route(self.steam, self.acct, [self.game]) + for candidates in ({}, {str(self.folder): 43}): + imports.save_json(self.acct / 'config' / imports.STATE, + dict(account='123', owned={'43': True}, candidates=candidates, + sources={str(self.folder): ['stale']})) + imports.route(self.steam, self.acct, [self.game]) + self.assertTrue((self.steam / 'steamapps/appmanifest_42.acf').is_file()) + def test_manifest_identity_uses_install_directory(self): folder = self.root / 'second/steamapps/common/Custom Name' folder.mkdir(parents=True) @@ -399,6 +485,21 @@ class ImportsTest(unittest.TestCase): with patch.object(imports.urllib.request, 'urlopen', side_effect=AssertionError): self.assertEqual(42, imports.identify(game)) + def test_a_spacewar_manifest_names_no_game(self): + folder = self.root / 'second/steamapps/common/PEAK' + folder.mkdir(parents=True) + (folder.parent.parent / 'appmanifest_480.acf').write_text('"AppState" { "installdir" "PEAK" }') + (folder / 'steam_appid.txt').write_text('3527290\n') + game = dict(self.game, folder=str(folder), exe=str(folder / 'PEAK.exe')) + with patch.object(imports.urllib.request, 'urlopen', side_effect=AssertionError): + self.assertEqual(3527290, imports.identify(game)) + + def test_a_store_search_answering_spacewar_names_no_game(self): + with patch.object(imports.urllib.request, 'urlopen') as request: + request.return_value.__enter__.return_value.read.return_value = json.dumps( + {'items': [{'id': 480, 'name': 'Spacewar'}]}).encode() + self.assertIsNone(imports.identify(dict(self.game, name='Spacewar'))) + def test_store_requires_unique_exact_title(self): cases = [([{'id': 42, 'name': 'Example Deluxe'}], None), ([{'id': 42, 'name': 'Example'}, {'id': 43, 'name': 'Example'}], None), diff --git a/tools/tests/test_steam_install.py b/tools/tests/test_steam_install.py index 6a02bcb0ae..81e2724cbb 100644 --- a/tools/tests/test_steam_install.py +++ b/tools/tests/test_steam_install.py @@ -280,8 +280,6 @@ done(28 if end < len(data) else 0) self.assertFalse(self.requests.exists()) def publish(self, **parts): - """The CDN's client as these parts (block name -> byte count of incompressible content), - listed with sizes as Valve's manifest lists them.""" files = {} blocks = '' for block, length in parts.items(): diff --git a/tools/tests/test_steam_libraries.py b/tools/tests/test_steam_libraries.py index 95ae20c24a..18c477a78a 100644 --- a/tools/tests/test_steam_libraries.py +++ b/tools/tests/test_steam_libraries.py @@ -90,6 +90,20 @@ class LibraryListTest(unittest.TestCase): self.assertIn(self.pc, self.paths(self.run_main())) self.assertIn(self.card, self.paths(self.vdf.read_text())) + def test_added_library_is_registered_while_listed_and_forgotten_once_removed(self): + added = self.root / "lib" / "1" + manifest(added / "steamapps", 20) + with patch.object(library, "ADDED_DIR", str(self.root / "lib") + "/"): + self.listing.write_text(json.dumps([{"path": str(added), "label": "Documents"}])) + text = self.run_main() + self.assertIn(added, self.paths(text)) + self.assertIn('"20"\t\t"0"', text) + self.listing.write_text(json.dumps([])) + text = self.run_main() + self.assertNotIn(added, self.paths(text)) + self.assertIn(self.user, self.paths(text)) + self.assertTrue((added / "steamapps/appmanifest_20.acf").is_file()) + def test_without_a_list_only_the_card_is_managed(self): text = self.run_main(listing=False) self.assertEqual([self.steam, self.old, self.user, self.card], self.paths(text)) diff --git a/tools/tests/test_steam_library_art.py b/tools/tests/test_steam_library_art.py new file mode 100644 index 0000000000..04843af23f --- /dev/null +++ b/tools/tests/test_steam_library_art.py @@ -0,0 +1,54 @@ +from pathlib import Path +import runpy +import shutil +import subprocess +import tempfile +import unittest + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +LIVE = runpy.run_path(str(BIN / "droiddeck-steam-compat")) + +HARNESS = """ +const reports = []; +global.appStore = { + BHasCachedLibraryAsset(appid, version, type) { + if ((version ?? 0) & (1 << type)) return true; + reports.push([appid, type]); + return false; + }, +}; +const first = eval(process.argv[2]); +const second = eval(process.argv[2]); +const check = (name, actual, expected) => { if (actual !== expected) throw new Error(name + ": " + actual); }; +check("install", first, "installed"); +check("reinstall", second, "present"); +check("no logon", appStore.BHasCachedLibraryAsset(10, undefined, 3), true); +check("zero version", appStore.BHasCachedLibraryAsset(10, 0, 3), true); +check("reported", reports.length, 2); +check("bit set", appStore.BHasCachedLibraryAsset(10, 1 << 3, 3), true); +check("bit missing", appStore.BHasCachedLibraryAsset(10, 1 << 2, 3), false); +check("reported again", reports.length, 3); +""" + + +@unittest.skipUnless(shutil.which("node"), "node is not installed") +class LibraryArtTest(unittest.TestCase): + def run_node(self, harness): + with tempfile.TemporaryDirectory() as directory: + script = Path(directory, "harness.js") + script.write_text("global.window = {};\n" + harness) + return subprocess.run(["node", str(script), LIVE["LIBRARY_ART_JS"]], capture_output=True, text=True, timeout=20) + + def test_apps_without_a_client_cache_report_read_from_the_local_library_cache(self): + result = self.run_node(HARNESS) + self.assertEqual(result.returncode, 0, result.stderr) + + def test_a_page_without_the_app_store_is_left_alone(self): + result = self.run_node(""" +if (eval(process.argv[2]) !== "unavailable") throw new Error("installed without an app store"); +""") + self.assertEqual(result.returncode, 0, result.stderr) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index 5dadcfb2fb..7ea5a1ae79 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -1,6 +1,3 @@ -"""droiddeck-store-launch: a launch from anywhere - the Steam client's own Play button included - -asks the app for an Epic game's sign-in code before Proton starts. These pin how it recognises a -store game, how it asks, and that both Proton launchers call it.""" import importlib.machinery import importlib.util import json @@ -441,6 +438,120 @@ class GogRegistry(unittest.TestCase): ], entries) self.assertEqual(3, skipped) + def test_a_game_whose_support_installer_cannot_run_gets_the_install_registry(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'language': 'English', 'languages': ['en-US']})) + gog_script(folder, '1207658924', [ + {'install': {'action': 'Execute', 'arguments': {'executable': 'galaxy_the_witcher_enhanced_edition_2.1.0.15.exe'}}}, + ]) + entries, skipped = store.gog_registry(folder) + app = store.windows_path(str(folder)).replace('\\', '\\\\') + self.assertEqual([ + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"InstallFolder"="%s\\\\"' % app, + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"RegionVersion"="US"', + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"IsDjinniInstalled"=dword:00000001', + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"Language"="3"', + '[HKEY_CURRENT_USER\\Software\\CD Projekt RED\\Witcher\\Settings]\r\n"TextLanguage"="3"', + '[HKEY_CURRENT_USER\\Software\\CD Projekt RED\\Witcher\\Settings]\r\n"VoiceLanguage"="3"', + ], entries) + self.assertEqual(0, skipped) + + def test_a_players_language_choice_is_not_overwritten(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + proton = Path(root) / 'proton' + proton.write_text('selected Proton') + data = Path(root) / 'compat' + (data / 'pfx').mkdir(parents=True) + (data / 'pfx/user.reg').write_text( + '[Software\\\\OtherApp] 1\n"InstallFolder"="C:\\\\Other"\n\n' + '[Software\\\\CD Projekt RED\\\\Witcher\\\\Settings] 1\n"TextLanguage"="5"\n') + imported = [] + def run(argv, **kwargs): + imported.append(Path(argv[4][2:].replace('\\', '/')).read_bytes()[2:].decode('utf-16-le')) + (data / 'pfx/system.reg').write_text('Wine registry') + return __import__('subprocess').CompletedProcess(argv, 0) + with patch.object(store.subprocess, 'run', side_effect=run): + store.apply_gog_registry(folder, str(data), str(proton)) + text = imported[0] + self.assertNotIn('"TextLanguage"', text) + self.assertIn('"VoiceLanguage"', text) + self.assertIn('"InstallFolder"', text) + + def test_malformed_language_metadata_falls_back_to_english(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': 3})) + entries, _ = store.gog_registry(folder) + self.assertIn('"Language"="3"', entries[3]) + + def test_a_native_hklm_value_does_not_replace_the_32_bit_fallback(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + pfx = Path(root) / 'pfx' + pfx.mkdir() + (pfx / 'system.reg').write_text( + '[Software\\\\CD Projekt Red\\\\The Witcher] 1\n"InstallFolder"="C:\\\\Native"\n') + entries, _ = store.gog_registry(folder, store.gog_registry_values(pfx)) + self.assertTrue(any('"InstallFolder"' in entry for entry in entries)) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n"InstallFolder"="C:\\\\32bit"\n') + entries, _ = store.gog_registry(folder, store.gog_registry_values(pfx)) + self.assertFalse(any('"InstallFolder"' in entry for entry in entries)) + + def test_a_deleted_fallback_value_is_imported_again(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + proton = Path(root) / 'proton' + proton.write_text('selected Proton') + data = Path(root) / 'compat' + pfx = data / 'pfx' + pfx.mkdir(parents=True) + imported = [] + def run(argv, **kwargs): + imported.append(argv) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n' + '"InstallFolder"="C:\\\\Game"\n"RegionVersion"="US"\n' + '"IsDjinniInstalled"=dword:00000001\n"Language"="3"\n') + (pfx / 'user.reg').write_text( + '[Software\\\\CD Projekt RED\\\\Witcher\\\\Settings] 1\n' + '"TextLanguage"="3"\n"VoiceLanguage"="3"\n') + return __import__('subprocess').CompletedProcess(argv, 0) + with patch.object(store.subprocess, 'run', side_effect=run): + self.assertEqual('written=6', store.apply_gog_registry(folder, str(data), str(proton))) + self.assertEqual('none', store.apply_gog_registry(folder, str(data), str(proton))) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n' + '"RegionVersion"="US"\n"IsDjinniInstalled"=dword:00000001\n"Language"="3"\n') + self.assertEqual('written=1', store.apply_gog_registry(folder, str(data), str(proton))) + self.assertEqual(2, len(imported)) + + def test_the_install_language_selects_the_titles_language_id(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['pl-PL']})) + entries, _ = store.gog_registry(folder) + self.assertIn('"Language"="5"', entries[3]) + + def test_a_script_that_sets_registry_keeps_its_own_values(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + gog_script(folder, '1207658924', [ + set_registry(root='HKLM', subkey='Software\\CD Projekt Red\\The Witcher', + valueName='InstallFolder', valueData='{app}\\', valueType='string'), + ]) + entries, _ = store.gog_registry(folder) + app = store.windows_path(str(folder)).replace('\\', '\\\\') + self.assertEqual([ + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"InstallFolder"="%s\\\\"' % app, + ], entries) + def test_a_game_without_a_script_starts_without_proton(self): with tempfile.TemporaryDirectory() as root: folder = game(root, store_id='gog') diff --git a/tools/tests/test_store_shortcuts.py b/tools/tests/test_store_shortcuts.py index 082011e8fc..1c454fa774 100644 --- a/tools/tests/test_store_shortcuts.py +++ b/tools/tests/test_store_shortcuts.py @@ -1,6 +1,3 @@ -"""The shortcuts writer and a store install: the app registers a game GOG, Epic or Amazon -installed through the same listing as an added folder, pointing the shortcut at the game's -launcher .bat when it has one. These pin the parts of the writer that contract relies on.""" import importlib.machinery import importlib.util import json @@ -28,8 +25,6 @@ LAUNCHER = FOLDER + '/.droiddeck-launch.bat' def app_id(exe, name): - """The appid the app computes for a shortcut (AddedGames.scanGame): CRC32 of the quoted exe - and the name, high bit set - what Steam itself derives for a shortcut it is given.""" return (zlib.crc32(('"%s"' % exe + name).encode()) | 0x80000000) & 0xFFFFFFFF diff --git a/tools/tests/test_termux_jni.py b/tools/tests/test_termux_jni.py index 6fd3d97873..94fe29fd37 100644 --- a/tools/tests/test_termux_jni.py +++ b/tools/tests/test_termux_jni.py @@ -12,7 +12,6 @@ TERMUX_DIR = TESTS.parents[1] / "app/src/main/cpp/termux" def jni_include_dir(): - """A directory holding jni.h: JNI_INCLUDE, then the JDK, then the Android NDK.""" candidates = [os.environ.get("JNI_INCLUDE")] java_home = os.environ.get("JAVA_HOME") if java_home: @@ -29,7 +28,6 @@ def jni_include_dir(): def include_flags(): - """-I flags for jni.h, plus the JDK's per-platform directory that holds jni_md.h.""" base = jni_include_dir() flags = ["-I", base] for sub in glob.glob(os.path.join(base, "*")): diff --git a/tools/tests/test_vrclient_loader.py b/tools/tests/test_vrclient_loader.py index fa1a778bf4..d3b41e5636 100644 --- a/tools/tests/test_vrclient_loader.py +++ b/tools/tests/test_vrclient_loader.py @@ -33,6 +33,7 @@ int probe(void) { #include <dlfcn.h> int bl_fsync_syscall(long n, const long *a, long *r) { (void)n; (void)a; (void)r; return 0; } int bl_writewatch_syscall(long n, const long *a, long (*real)(long, ...), long *r) { (void)n; (void)a; (void)real; (void)r; return 0; } +int bl_clock_syscall(long n, const long *a, long (*real)(long, ...), long *r) { (void)n; (void)a; (void)real; (void)r; return 0; } #include """ + '"' + robust.as_posix() + '"' + r""" int main(int argc, char **argv) { assert(argc == 3); diff --git a/tools/tests/test_webhelper_preload.py b/tools/tests/test_webhelper_preload.py index 30a41fc7bd..7c49e1d765 100644 --- a/tools/tests/test_webhelper_preload.py +++ b/tools/tests/test_webhelper_preload.py @@ -61,6 +61,19 @@ class WebhelperPreloadTest(unittest.TestCase): args = [WEBHELPER, "--enable-features=A"] self.assertEqual(self.argv(*args, spec="stock"), args) + def test_angle_switches_are_appended_with_the_gpu_process_kept_out_of_process(self): + out = self.argv(WEBHELPER, "-lang=en_US", "--enable-features=A", spec="--use-gl=angle --use-angle=vulkan") + self.assertEqual(out, [WEBHELPER, "-lang=en_US", "--use-gl=angle", "--use-angle=vulkan", + "--enable-features=A"]) + self.assertNotIn("--in-process-gpu", out) + + def test_vulkan_compositing_features_join_steams_feature_list(self): + out = self.argv(WEBHELPER, "--enable-features=PlatformHEVCDecoderSupport,V4L2VideoDecode", + spec="--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") + self.assertEqual(out, [WEBHELPER, "--use-gl=angle", "--use-angle=vulkan", + "--enable-features=PlatformHEVCDecoderSupport,V4L2VideoDecode," + "Vulkan,VulkanFromANGLE,DefaultANGLEVulkan"]) + def test_an_empty_setting_means_the_default(self): self.assertIn("--no-zygote", self.argv(WEBHELPER, spec="")) diff --git a/tools/tests/test_winebus_rumble_preload.py b/tools/tests/test_winebus_rumble_preload.py index 82e3b01120..abd60c2743 100644 --- a/tools/tests/test_winebus_rumble_preload.py +++ b/tools/tests/test_winebus_rumble_preload.py @@ -8,7 +8,6 @@ import unittest PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" -# Stands in for libfakeinput.so, which ld.so.preload lists after libblsession.so. SHIM = r""" #include <linux/input.h> #include <stdarg.h> diff --git a/tools/tests/test_xbox_launch.py b/tools/tests/test_xbox_launch.py index 370c694dfd..1701d6ea4b 100644 --- a/tools/tests/test_xbox_launch.py +++ b/tools/tests/test_xbox_launch.py @@ -136,7 +136,7 @@ class XboxLaunchTest(unittest.TestCase): self.assertNotIn('DROIDDECK_XBOX_COMMAND_FILE', child_env) self.assertEqual(child_env['XODUS_BRIDGE_KEY'], 'runtime-key') - def test_launch_view_runs_from_a_short_drive_letter(self): + def test_launch_view_runs_from_its_own_folder_on_a_short_drive_letter(self): with tempfile.TemporaryDirectory() as root: root = Path(root) prefix = root / 'compat/pfx' @@ -156,7 +156,7 @@ class XboxLaunchTest(unittest.TestCase): with patch.dict(os.environ, env), patch.dict(xbox['wine'].__globals__, RUNTIME=runtime.parent), patch('subprocess.run') as initialize, patch('subprocess.call', side_effect=call): initialize.return_value.returncode = 0 self.assertEqual(xbox['wine']([str(view / 'Bin/Game.exe')]), 0) - self.assertEqual(seen, [(['/selected/proton', 'waitforexitandrun', 'X:\\Bin\\Game.exe'], str(view))]) + self.assertEqual(seen, [(['/selected/proton', 'waitforexitandrun', 'X:\\droiddeck-xbox-1ZpM3D\\Bin\\Game.exe'], str(view.parent))]) self.assertFalse(os.path.lexists(prefix / 'dosdevices/x:')) def test_view_drive_keeps_drives_in_use_and_reuses_a_stale_view(self): @@ -170,8 +170,8 @@ class XboxLaunchTest(unittest.TestCase): (devices / 'w:').symlink_to(root / 'games') (devices / 'v:').symlink_to(views / 'launch-0/droiddeck-xbox-gone') exe, link = xbox['view_drive'](root / 'pfx', str(view / 'Game.exe')) - self.assertEqual((exe, link), ('V:\\Game.exe', devices / 'v:')) - self.assertEqual(os.readlink(devices / 'v:'), str(view)) + self.assertEqual((exe, link), ('V:\\droiddeck-xbox-new\\Game.exe', devices / 'v:')) + self.assertEqual(os.readlink(devices / 'v:'), str(view.parent)) self.assertEqual(os.readlink(devices / 'x:'), str(live)) self.assertEqual(sorted(p.name for p in devices.iterdir()), ['v:', 'w:', 'x:']) self.assertEqual(xbox['view_drive'](root / 'pfx', '/games/Game.exe'), ('/games/Game.exe', None)) diff --git a/tools/ubuntu/README.md b/tools/ubuntu/README.md index ceea395c55..85001fe67a 100644 --- a/tools/ubuntu/README.md +++ b/tools/ubuntu/README.md @@ -29,7 +29,8 @@ Steam on the desktop). The app installs it into `files/linuxfs` and runs it unde - The desktop pack's `usr/share/droiddeck/desktop/files.tsv.gz` lists each path the desktop added (N), changed (C) or removed (R), and `originals/` keeps the runtime's copies of changed and removed files. Removing the desktop restores those and deletes the added files the user has not changed; - a runtime update replaces the tree, and the desktop is downloaded again when it is next opened. + a runtime update replaces the tree, so when the desktop was installed the update installs the new + runtime's desktop pack right after it. At run time: diff --git a/tools/ubuntu/packages-runtime.txt b/tools/ubuntu/packages-runtime.txt index a6e19c6429..c6bcd3618e 100644 --- a/tools/ubuntu/packages-runtime.txt +++ b/tools/ubuntu/packages-runtime.txt @@ -108,6 +108,7 @@ libliftoff0 liblua5.4-0 libluajit-5.1-2 liblzma5 +liblzo2-2 libmount1 libmp3lame0 libmpg123-0t64 diff --git a/tools/ubuntu/patches/kwin/0004-keep-tranches-of-the-main-device.patch b/tools/ubuntu/patches/kwin/0004-keep-tranches-of-the-main-device.patch index 5e4050e626..9165715ed1 100644 --- a/tools/ubuntu/patches/kwin/0004-keep-tranches-of-the-main-device.patch +++ b/tools/ubuntu/patches/kwin/0004-keep-tranches-of-the-main-device.patch @@ -10,7 +10,7 @@ Subject: [PATCH] Keep dmabuf tranches that target the main device diff --git a/src/wayland-client/linuxdmabuf.cpp b/src/wayland-client/linuxdmabuf.cpp --- a/src/wayland-client/linuxdmabuf.cpp +++ b/src/wayland-client/linuxdmabuf.cpp -@@ -130,15 +130,17 @@ +@@ -130,15 +130,16 @@ drmFreeDevice(&mainDevice); drmFreeDevice(&trancheDevice); }); @@ -30,7 +30,6 @@ diff --git a/src/wayland-client/linuxdmabuf.cpp b/src/wayland-client/linuxdmabuf + return; + } + if (!drmDevicesEqual(mainDevice, trancheDevice)) { -+ // TODO take multi GPU handling into account as well + qCDebug(KWIN_WAYLAND_CLIENT, "Ignoring tranche from non-main device"); + return; + } diff --git a/tools/vr/build_windows.py b/tools/vr/build_windows.py index 06a1dde74f..af8fa4d465 100644 --- a/tools/vr/build_windows.py +++ b/tools/vr/build_windows.py @@ -129,8 +129,6 @@ def build(folder, include, root=ROOT, image=IMAGE): workspace.mkdir(parents=True, exist_ok=True) with tempfile.TemporaryDirectory(prefix='vr-build-', dir=workspace) as temp: snapshot = Path(temp).resolve() - # build.sh's recursive output cleanup and TemporaryDirectory cleanup are - # confined to this new, verified directory, never the real checkout. if not snapshot.is_relative_to(workspace): raise ValueError('Temporary VR workspace escapes the checkout') inspect = subprocess.run([docker, 'image', 'inspect', '--format', '{{.Id}}', image], @@ -159,7 +157,6 @@ def build(folder, include, root=ROOT, image=IMAGE): manifest = {'version': 1, 'source_commit': revision, 'sources': hashes(input_files), 'headers': hashes(input_headers), 'compiler_image': image_id, 'outputs': hashes(files), 'native_tests': 'passed in tools/vr/build.sh'} - # Publish only after the complete build and native regression tests pass. for name, data in files.items(): target = folder / name if not target.resolve().is_relative_to(folder): diff --git a/tools/vr/src/driver_droiddeck.cpp b/tools/vr/src/driver_droiddeck.cpp index 1398a1d057..2535e04cc2 100644 --- a/tools/vr/src/driver_droiddeck.cpp +++ b/tools/vr/src/driver_droiddeck.cpp @@ -281,7 +281,6 @@ public: const uint32_t create = 0x8 ; for (int i = 0; i < 3; i++) { SharedTextureHandle_t h = 0; - // Compute access makes SteamVR substitute UNORM for sRGB, darkening direct compositor output. if (!VRIPCResourceManager()->NewSharedVulkanImage(d->nFormat, d->nWidth, d->nHeight, true, false, false, 1, 1, create, usage, &h)) { Log("NewSharedVulkanImage failed"); @@ -1276,7 +1275,6 @@ public: } private: - // Face buttons, menus and the stick, for both the game pad and optical hands. void UpdatePadButtons(uint32_t b, float stickX, float stickY, bool stickToGame) { auto in = VRDriverInput(); const bool touch = stickToGame && stickX * stickX + stickY * stickY > 0.01f; @@ -1289,7 +1287,6 @@ private: in->UpdateBooleanComponent(padClick_, (b & (right_ ? (PAD_A | PAD_R3) : PAD_X)) != 0, 0); return; } - // Touch and Index: face buttons are their own inputs and the stick is a thumbstick. const bool primary = b & (right_ ? PAD_A : PAD_X), secondary = b & (right_ ? PAD_B : PAD_Y); const bool both = (b & PAD_L3) && (b & PAD_R3); if (menu_) in->UpdateBooleanComponent(menu_, !right_ && (b & (PAD_START | PAD_SELECT)), 0); @@ -1754,7 +1751,6 @@ public: void SetHands(CardboardController *left, CardboardController *right) { hands_[0] = left; hands_[1] = right; } void SetSticksMoveHands(bool on) { sticksMoveHands_ = on; } - // Called only from the pose thread: a replaced pair is disconnected there, so it never races an update. CardboardController *ActiveHand(int side) { CardboardController *wanted = hands_[side].load(); if (wanted != active_[side]) { @@ -1908,10 +1904,7 @@ private: target.frequency = std::max(pulse.fFrequency, 0.f); __atomic_store_n(&haptics_->seq, (sequence | 1u) + 1u, __ATOMIC_RELEASE); } - // SteamVR fixes a device's input profile when it activates, so each type gets its own pair, - // added the first time it is chosen; devices cannot be removed, only disconnected. void ApplyPadConfig(bool initial) { - // The file is a few bytes, so compare what it says; two quick writes can share an mtime. const PadControllerConfig pads = read_pad_controller_config("/run/droiddeck/" DROIDDECK_VR_CONTROLLERS_FILE); if (!initial && pads.profile == configProfile_ && pads.sticksMoveHands == configSticks_) return; configProfile_ = pads.profile; diff --git a/tools/vr/src/fence_tracker.h b/tools/vr/src/fence_tracker.h index d016d9ded1..273ecbd4de 100644 --- a/tools/vr/src/fence_tracker.h +++ b/tools/vr/src/fence_tracker.h @@ -4,8 +4,6 @@ #include <stdlib.h> #include <vulkan/vulkan.h> -/* All pool operations require the caller's tracker lock. Reserved fences are - * invisible to the completer until vkQueueSubmit has returned successfully. */ struct tracked { struct tracked *next; VkDevice dev; @@ -33,8 +31,6 @@ static struct tracked *track_pool_take(struct tracked **pool, VkDevice dev, PFN_ t.destroy = (PFN_vkDestroyFence)gdpa(dev, "vkDestroyFence"); PFN_vkCreateFence create = (PFN_vkCreateFence)gdpa(dev, "vkCreateFence"); if (!t.wait || !t.reset || !t.destroy || !create) return NULL; - /* Never wait for a slot: the next submission may signal a semaphore that - * every outstanding fence is waiting on. Grow only at the high-water mark. */ struct tracked *slot = idle ? idle : calloc(1, sizeof(*slot)); if (!slot) return NULL; VkFenceCreateInfo fci = {VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, NULL, 0}; @@ -69,8 +65,6 @@ static int track_pool_reap(struct tracked *pool, uint32_t issued, uint32_t *done uint32_t through = issued; for (struct tracked *t = pool; t; t = t->next) { if (t->state != TRACK_SUBMITTED) continue; - /* Scan all fences without blocking behind an earlier submission on a - * different queue. Device loss retires fences as in the previous path. */ if (t->wait(t->dev, 1, &t->fence, VK_TRUE, 0) == VK_TIMEOUT) { pending = 1; if ((int32_t)(t->mark - through) <= 0) through = t->mark - 1; @@ -79,9 +73,6 @@ static int track_pool_reap(struct tracked *pool, uint32_t issued, uint32_t *done t->state = TRACK_IDLE; } } - /* done is a contiguous watermark, not a count of completed fences. Later - * work may free its slot but cannot release an unfinished presenter frame. - * Signed differences also handle the uint32_t counter wrapping. */ *done = through; return pending; } @@ -92,7 +83,6 @@ static int track_pool_device_busy(struct tracked *pool, VkDevice dev) { return 0; } -/* The caller must first wait for all this device's reservations and work. */ static void track_pool_forget(struct tracked **pool, VkDevice dev) { for (struct tracked **p = pool; *p;) { struct tracked *t = *p; diff --git a/tools/vr/src/hand_skeleton.h b/tools/vr/src/hand_skeleton.h index 8ade4a609d..0bb9f1e788 100644 --- a/tools/vr/src/hand_skeleton.h +++ b/tools/vr/src/hand_skeleton.h @@ -1,5 +1,4 @@ -// Adapted from Valve's OpenVR handskeletonsimulation driver sample (BSD-3-Clause, see OPENVR_LICENSE), -// which follows Moshi Turner's hand simulation in Monado. +// Adapted from Valve's OpenVR handskeletonsimulation driver sample (BSD-3-Clause, see OPENVR_LICENSE), which follows Moshi Turner's hand simulation in Monado. #pragma once #include "arm_model.h" diff --git a/tools/vr/src/pad_controller_config.h b/tools/vr/src/pad_controller_config.h index 387832b3a9..fd1e08d527 100644 --- a/tools/vr/src/pad_controller_config.h +++ b/tools/vr/src/pad_controller_config.h @@ -11,7 +11,6 @@ struct PadControllerConfig { bool sticksMoveHands = false; }; -// One key=value per line, written by the app before SteamVR starts. inline PadControllerConfig pad_controller_config(const char *text) { PadControllerConfig config; if (!text) return config; diff --git a/tools/vr/src/presenter.cpp b/tools/vr/src/presenter.cpp index 20b0ad63cd..efc110640f 100644 --- a/tools/vr/src/presenter.cpp +++ b/tools/vr/src/presenter.cpp @@ -606,7 +606,6 @@ private: im.height = p.height; im.producerPid = p.producerPid; im.format = (VkFormat)p.format; - // Dedicated OPAQUE_FD imports must match SteamVR's exported image description. SharedEyeImage description(im.format, p.width, p.height); VkResult r = vk_.CreateImage(dev_, &description.info, nullptr, &im.image); if (r != VK_SUCCESS) { Log("presenter: import image %d", r); close(p.fd); return; } diff --git a/tools/vr/src/scheduling.c b/tools/vr/src/scheduling.c index df89196500..381397cea7 100644 --- a/tools/vr/src/scheduling.c +++ b/tools/vr/src/scheduling.c @@ -28,7 +28,6 @@ int setrlimit(__rlimit_resource_t resource, const struct rlimit *limit) { struct rlimit current; if (!getrlimit(resource, ¤t) && (limit->rlim_cur < current.rlim_cur || limit->rlim_max < current.rlim_max)) { - // SDL's failed RTKit fallback leaves a fatal RT budget on Android GPU submissions. errno = EPERM; return -1; } diff --git a/tools/vr/src/spatial_tracking.h b/tools/vr/src/spatial_tracking.h index 20842c8877..1f9f65a7c8 100644 --- a/tools/vr/src/spatial_tracking.h +++ b/tools/vr/src/spatial_tracking.h @@ -78,7 +78,6 @@ struct OpticalPose { } auto target = filtered; if (predict) { - // Inference already consumes most capture age; receipt-relative prediction advances between results. float seconds = std::clamp(float(now-receivedAt)/1e9f,0.f,.08f); float speed2 = 0; for (float v : velocity) speed2 += v*v; diff --git a/tools/vr/src/vk_layer_droiddeck_vr.c b/tools/vr/src/vk_layer_droiddeck_vr.c index 5b315f243b..be74139e5f 100644 --- a/tools/vr/src/vk_layer_droiddeck_vr.c +++ b/tools/vr/src/vk_layer_droiddeck_vr.c @@ -981,8 +981,6 @@ static int submit_drop_wait(VkSemaphore s, uint64_t value) { for (;;) { uint64_t local = 0; if (get(dev, s, &local) == VK_SUCCESS && local >= value) return 0; - /* Only the poller mirrors shared values. A second host signal here can - * race its signal and submit the same timeline value twice. */ if (now_us() >= until) break; usleep(100); } @@ -1073,7 +1071,7 @@ static void *completer(void *arg) { if (pending) { struct timespec until; clock_gettime(CLOCK_REALTIME, &until); - until.tv_nsec += 1000000; /* Poll pending GPU work at most every 1 ms. */ + until.tv_nsec += 1000000; if (until.tv_nsec >= 1000000000) { until.tv_sec++; until.tv_nsec -= 1000000000; } pthread_cond_timedwait(&g_trk_cond, &g_trk_lock, &until); } else { @@ -1345,8 +1343,6 @@ static VkResult VKAPI_CALL CreateImage(VkDevice d, const VkImageCreateInfo *ci, VkImageCreateInfo compatible = *ci; VkExternalMemoryImageCreateInfo shared; const VkBaseInStructure *first = ci->pNext; - // SteamVR's OpenXR stereo arrays omit a format list, while DXVK adds one on import. - // Leave single-layer OpenVR images alone: the application owns their export layout. if (dev_for(d)->quest_images && ci->arrayLayers > 1 && (ci->flags & VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT) && ci->tiling == VK_IMAGE_TILING_OPTIMAL && first && first->sType == VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO) { const VkBaseInStructure *second = first->pNext; diff --git a/tools/vr/src/wsi_capture.cpp b/tools/vr/src/wsi_capture.cpp index 11f4d4e2b6..ee7a7266c9 100644 --- a/tools/vr/src/wsi_capture.cpp +++ b/tools/vr/src/wsi_capture.cpp @@ -395,7 +395,6 @@ extern "C" VkResult droiddeck_wsi_present(VkDevice device, VkQueue queue, const VkResult result = it->second->Capture(queue, present->pImageIndices[0], *present, &completion); if (result) return result; if (!completion) return next(queue, present); - // Reacquiring this swapchain image also proves its previous present wait semaphore is reusable. VkPresentInfoKHR copy = *present; copy.waitSemaphoreCount = 1; copy.pWaitSemaphores = &completion; return next(queue, ©); } catch (...) { diff --git a/tools/vr/src/xr_frame_math.h b/tools/vr/src/xr_frame_math.h index a78de79871..473c028473 100644 --- a/tools/vr/src/xr_frame_math.h +++ b/tools/vr/src/xr_frame_math.h @@ -9,7 +9,6 @@ struct DroidDeckXrRenderView { inline void xr_frame_projection_raw(const float fov[4], float *left, float *right, float *top, float *bottom) { *left = std::tan(fov[0]); *right = std::tan(fov[1]); - // OpenVR's top/bottom parameters are the lower/upper Y bounds in its projection formula. *top = std::tan(fov[3]); *bottom = std::tan(fov[2]); } diff --git a/tools/vr/src/xr_gpu_channel.h b/tools/vr/src/xr_gpu_channel.h index 8735d3dc5d..52fb5d9d39 100644 --- a/tools/vr/src/xr_gpu_channel.h +++ b/tools/vr/src/xr_gpu_channel.h @@ -31,7 +31,6 @@ inline XrGpuFrameState xr_gpu_frame_state(const XrGpuFrame &frame, uint32_t widt return now - frame.header.captured_ns > 200000000LL ? XrGpuFrameState::Stale : XrGpuFrameState::Ready; } -// SEQPACKET keeps descriptor transfer and its metadata in one indivisible message. inline bool xr_gpu_send(int socket, const void *data, size_t size, const int *fds = nullptr, unsigned count = 0) { if (count > XR_GPU_SLOTS) return false; iovec bytes{const_cast<void *>(data), size}; diff --git a/tools/vr/tests/test_fence_tracker.c b/tools/vr/tests/test_fence_tracker.c index 8eecc3936a..b747304b97 100644 --- a/tools/vr/tests/test_fence_tracker.c +++ b/tools/vr/tests/test_fence_tracker.c @@ -66,8 +66,6 @@ static void saturated_pool_and_out_of_order_completion(void) { struct tracked *pool = NULL, *pending[130]; VkDevice dev = (VkDevice)(uintptr_t)1; uint32_t issued = 0, done = 0; - /* These waits can all depend on a signal from a later queue submission. - * A fixed 64-slot pool blocks that signal before it reaches the driver. */ for (unsigned i = 0; i < 130; i++) pending[i] = submit(&pool, dev, &issued); assert(issued == 130); assert(track_pool_reap(pool, issued, &done) && done == 0); @@ -79,7 +77,6 @@ static void saturated_pool_and_out_of_order_completion(void) { unsigned before = created; struct tracked *signal = submit(&pool, dev, &issued); assert(signal == pending[129] && created == before && issued == 131); - /* Freeing the latest fence must not mark the older work as drawn. */ for (unsigned i = 0; i < 129; i++) fake(pending[i]->fence)->result = VK_SUCCESS; assert(track_pool_reap(pool, issued, &done) && done == 130); fake(signal->fence)->result = VK_SUCCESS; diff --git a/tools/vr/tests/test_presenter_image.cpp b/tools/vr/tests/test_presenter_image.cpp index baf36bddf5..2cf58ce2ff 100644 --- a/tools/vr/tests/test_presenter_image.cpp +++ b/tools/vr/tests/test_presenter_image.cpp @@ -6,7 +6,6 @@ int main() { droiddeck::SharedEyeImage image(VK_FORMAT_R8G8B8A8_SRGB, 1728, 1080); const auto &info = image.info; - // SteamVR's shared-eye creation trace on the Fold7: format 43, flags 8, usage 0x97, list 43/37. assert(info.format == 43 && info.flags == 8 && info.usage == 0x97); assert(info.extent.width == 1728 && info.extent.height == 1080 && info.extent.depth == 1); assert(info.samples == VK_SAMPLE_COUNT_1_BIT && info.mipLevels == 1 && info.arrayLayers == 1); diff --git a/tools/vr/tests/test_semaphore_layer.c b/tools/vr/tests/test_semaphore_layer.c index 89f4ce8ae7..45b387cfa2 100644 --- a/tools/vr/tests/test_semaphore_layer.c +++ b/tools/vr/tests/test_semaphore_layer.c @@ -39,7 +39,6 @@ static void check_shared_images(VkDevice device) { image.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; image.tiling = VK_IMAGE_TILING_OPTIMAL; VkImage output; - /* Other targets, nonmutable, linear and DMA-BUF images retain their caller's chain. */ expected_image_chain = &list; assert(CreateImage(device, &image, NULL, &output) == VK_ERROR_FORMAT_NOT_SUPPORTED); g_dev[0].quest_images = 1; @@ -58,7 +57,6 @@ static void check_shared_images(VkDevice device) { expected_image_chain = &external; assert(CreateImage(device, &image, NULL, &output) == VK_ERROR_FORMAT_NOT_SUPPORTED); assert(image.pNext == &list && list.pNext == &external && external.pNext == &tail); - /* The reverse chain order preserves its tail without modifying caller memory. */ external.pNext = &list; list.pNext = &tail; image.pNext = &external; expect_cloned_external = 1; expected_external_tail = &tail; assert(CreateImage(device, &image, NULL, &output) == VK_ERROR_FORMAT_NOT_SUPPORTED); diff --git a/tools/vr/tests/test_xr_shared.cpp b/tools/vr/tests/test_xr_shared.cpp index fae4efde6a..2e60bc2159 100644 --- a/tools/vr/tests/test_xr_shared.cpp +++ b/tools/vr/tests/test_xr_shared.cpp @@ -58,7 +58,6 @@ int main() { assert(!absent.SendShared(path, header, buffer)); assert(!absent.SharedLeaseLost()); XrFrameReceiver receiver; assert(receiver.Start(path)); XrFrameSender invalid; - // An ordinary file is not a DMA-BUF and must never be acknowledged as one. assert(!invalid.SendShared(path, Header(), buffer)); assert(invalid.SharedLeaseLost() && receiver.Rejected() == 1); DroidDeckXrPixels frame; assert(!receiver.Take(&frame)); diff --git a/tools/xbox/droiddeck-cloud-token.patch b/tools/xbox/droiddeck-cloud-token.patch index 606410a66e..97493f4a05 100644 --- a/tools/xbox/droiddeck-cloud-token.patch +++ b/tools/xbox/droiddeck-cloud-token.patch @@ -37,11 +37,7 @@ SubCommand::Achievements { title_id, json } => commands::achievements::run(&tokens, title_id, json).await, --- /dev/null +++ b/crates/xodus-cli/src/commands/cloud_token.rs -@@ -0,0 +1,237 @@ -+//! Xbox Cloud Gaming streaming token for the stored account (DroidDeck). Same bearer -+//! RPS -> Xbox user -> XSTS exchange as the profile read, for the cloud gaming relying party, -+//! then the streaming service's user login (as xbox.com and Greenlight's xal-node do). -+//! Never provisions a device or opens login. +@@ -0,0 +1,226 @@ +use std::{process::ExitCode, time::Duration}; +use serde_json::{Value, json}; +use xodus::{models::{live::ExchangeUserTokenOutcome, secrets::Token, soap}, tokens::TokenManager}; @@ -49,7 +45,6 @@ +const GSSV_RELYING_PARTY: &str = "http://gssv.xboxlive.com/"; +const OFFERINGS: [&str; 2] = ["xgpuweb", "xgpuwebf2p"]; + -+/// The stored account's compact Microsoft account ticket for one service target and policy. +async fn ticket(tokens: &TokenManager, client: &reqwest::Client, target: &str, policy: soap::PolicyReference) -> Result<(String, String), &'static str> { + let (account, device, user) = super::session::prepare(tokens, client).await.map_err(|stage| { + super::session::diagnostic(stage); stage @@ -63,9 +58,6 @@ + ExchangeUserTokenOutcome::Issued(soap::BodyContent::RequestSecurityTokenResponse(response)) => *response, + _ => return Err("msa-response"), + }; -+ // Only accept compact forms here and reject incomplete token responses. The cloud -+ // transfer purpose answers with a login proof token, which is what /connect takes (Greenlight -+ // sends the MSAL response's "lpt"). + let kind = response.token_type.clone(); + if kind == "urn:passport:loginprooftoken" { + let shape = match (&response.requested_security_token.binary_security_token, &response.requested_security_token.encrypted_data) { @@ -97,8 +89,6 @@ + Ok((account, xsts.token)) +} + -+/// The Microsoft account token a cloud session's /connect step takes (xbox.com asks MSAL for -+/// "service::http://Passport.NET/purpose::PURPOSE_XBOX_CLOUD_CONSOLE_TRANSFER_TOKEN"). +async fn transfer_token(tokens: &TokenManager, client: &reqwest::Client) -> Result<String, &'static str> { + let policy = soap::PolicyReference { uri: "PURPOSE_XBOX_CLOUD_CONSOLE_TRANSFER_TOKEN".into(), val: String::default() }; + Ok(ticket(tokens, client, "http://Passport.NET/purpose", policy).await?.1) @@ -153,7 +143,6 @@ + let xsts = &xsts; + async move { request_offering(client, &endpoint, xsts, offering).await } + }).await?; -+ // Diagnostic lines are letters and dashes only (the app's allow-list). + eprintln!("NEXUS_SESSION_DIAGNOSTIC_V1 gssv-login-ok-{}", if offering == "xgpuweb" { "gamepass" } else { "free" }); + let transfer = transfer_token(tokens, &client).await; + eprintln!("NEXUS_SESSION_DIAGNOSTIC_V1 transfer-token-{}", if transfer.is_ok() { "ok" } else { "missing" }); diff --git a/tools/xbox/droiddeck-credential-diagnostics.patch b/tools/xbox/droiddeck-credential-diagnostics.patch index 67576e1f54..f1d441d3b2 100644 --- a/tools/xbox/droiddeck-credential-diagnostics.patch +++ b/tools/xbox/droiddeck-credential-diagnostics.patch @@ -2,11 +2,10 @@ diff --git a/crates/xodus/src/tokens/backend/keychain.rs b/crates/xodus/src/toke index 19480da..dc8f136 100644 --- a/crates/xodus/src/tokens/backend/keychain.rs +++ b/crates/xodus/src/tokens/backend/keychain.rs -@@ -13,29 +13,24 @@ pub struct KeychainBackend; +@@ -13,29 +13,22 @@ pub struct KeychainBackend; // keyed loopback port the app also listens on is used for the rest of the process. static LOOPBACK: AtomicBool = AtomicBool::new(false); static REPORTED: AtomicBool = AtomicBool::new(false); -+// The app seals credentials with the Android Keystore, which took over 10 s on some phones. +const REPLY_TIMEOUT: Duration = Duration::from_secs(30); -/// Letters and dashes only: the app passes `NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}` lines to its log. @@ -33,7 +32,6 @@ index 19480da..dc8f136 100644 +fn exchange<S: Read + Write>(stream: S, prefix: Option<&str>, value: &Value) -> Result<Value, TokenStoreError> { + let route = if prefix.is_some() { "loopback" } else { "socket" }; + transfer(stream, prefix, value).inspect_err(|error| { -+ // Kind Other is the host's own refusal, already reported. + if let TokenStoreError::Io(error) = error + && error.kind() != std::io::ErrorKind::Other + { @@ -47,7 +45,7 @@ index 19480da..dc8f136 100644 if let Some(key) = prefix { stream.write_all(key.as_bytes())?; stream.write_all(b"\n")?; -@@ -45,6 +40,7 @@ fn exchange<S: Read + Write>(mut stream: S, prefix: Option<&str>, value: &Value) +@@ -45,6 +38,7 @@ fn exchange<S: Read + Write>(mut stream: S, prefix: Option<&str>, value: &Value) let mut bytes = Vec::new(); std::io::BufReader::new(stream).take(2_097_153).read_until(b'\n', &mut bytes)?; if bytes.len() > 2_097_152 || bytes.last() != Some(&b'\n') { @@ -55,7 +53,7 @@ index 19480da..dc8f136 100644 return Err(std::io::Error::other("Invalid Android credential response").into()); } let response: Value = serde_json::from_slice(&bytes)?; -@@ -56,28 +52,36 @@ fn exchange<S: Read + Write>(mut stream: S, prefix: Option<&str>, value: &Value) +@@ -56,28 +50,36 @@ fn exchange<S: Read + Write>(mut stream: S, prefix: Option<&str>, value: &Value) } fn loopback(value: &Value) -> Result<Value, TokenStoreError> { @@ -183,13 +181,11 @@ diff --git a/crates/xodus/src/tokens/store.rs b/crates/xodus/src/tokens/store.rs index 78b73d0..15cbff0 100644 --- a/crates/xodus/src/tokens/store.rs +++ b/crates/xodus/src/tokens/store.rs -@@ -50,3 +50,51 @@ impl TokenStoreError { +@@ -50,3 +50,49 @@ impl TokenStoreError { eprintln!("{self}"); } } + -+/// Letters and dashes only: DroidDeck passes `NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}` lines to its -+/// log. Unlisted errno values are spelled with letters, a = 0 ... j = 9 (`os-dh` = errno 37). +pub(crate) fn io_reason(error: &std::io::Error) -> String { + let known = match error.raw_os_error() { + Some(111) => "refused", diff --git a/tools/xbox/droiddeck-credential-fallback.patch b/tools/xbox/droiddeck-credential-fallback.patch index 859afd4f65..4dec0d7e69 100644 --- a/tools/xbox/droiddeck-credential-fallback.patch +++ b/tools/xbox/droiddeck-credential-fallback.patch @@ -2,7 +2,7 @@ diff --git a/crates/xodus/src/tokens/backend/keychain.rs b/crates/xodus/src/toke index 1903638..19480da 100644 --- a/crates/xodus/src/tokens/backend/keychain.rs +++ b/crates/xodus/src/tokens/backend/keychain.rs -@@ -1,20 +1,46 @@ +@@ -1,20 +1,45 @@ use crate::tokens::store::{TokenBackend, TokenStoreError}; use serde_json::{Value, json}; use std::io::{BufRead, Read, Write}; @@ -22,7 +22,6 @@ index 1903638..19480da 100644 - stream.set_read_timeout(Some(Duration::from_secs(10)))?; - stream.set_write_timeout(Some(Duration::from_secs(10)))?; - serde_json::to_writer(&mut stream, &value)?; -+// Some Android devices refuse the abstract socket from inside PRoot; after one failure the +// keyed loopback port the app also listens on is used for the rest of the process. +static LOOPBACK: AtomicBool = AtomicBool::new(false); +static REPORTED: AtomicBool = AtomicBool::new(false); @@ -57,7 +56,7 @@ index 1903638..19480da 100644 stream.write_all(b"\n")?; let mut bytes = Vec::new(); std::io::BufReader::new(stream).take(2_097_153).read_until(b'\n', &mut bytes)?; -@@ -22,10 +48,52 @@ fn request(value: Value) -> Result<Value, TokenStoreError> { +@@ -22,10 +47,52 @@ fn request(value: Value) -> Result<Value, TokenStoreError> { return Err(std::io::Error::other("Invalid Android credential response").into()); } let response: Value = serde_json::from_slice(&bytes)?; diff --git a/tools/xbox/droiddeck-xbox-ticket.patch b/tools/xbox/droiddeck-xbox-ticket.patch index 78093d74d3..bb8f5d08f4 100644 --- a/tools/xbox/droiddeck-xbox-ticket.patch +++ b/tools/xbox/droiddeck-xbox-ticket.patch @@ -1,14 +1,12 @@ --- a/crates/xodus/src/models/secrets.rs +++ b/crates/xodus/src/models/secrets.rs -@@ -80,9 +80,17 @@ +@@ -80,9 +80,13 @@ } } -/// Store and licensing services reject delegation-compact tickets in the "d=" -/// form that Xbox Live sign-in needs (InvalidMsaTicketFormat) and accept the -/// same value as "t=". Convert only where a ticket is sent to those services. -+// Xbox accepts compact JWE tickets without the delegation prefix; opaque -+// delegation tickets keep their original wire representation. +pub fn xbox_ticket(ticket: String) -> String { + match ticket.strip_prefix("d=") { + Some(raw) if is_compact_jwe(raw) => raw.to_owned(), @@ -16,8 +14,6 @@ + } +} + -+/// Store services accept delegation-compact tickets in the "t=" form. -+/// Convert only where a ticket is sent to those services. pub fn store_ticket(ticket: String) -> String { match ticket.strip_prefix("d=") { Some(value) => format!("t={value}"), diff --git a/tools/xbox/prepare.py b/tools/xbox/prepare.py index 8d435d34b0..ef2b230245 100755 --- a/tools/xbox/prepare.py +++ b/tools/xbox/prepare.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Reproduce the pinned Nexus source and DroidDeck credential transport.""" import hashlib import json from pathlib import Path diff --git a/tools/xbox/runtime.py b/tools/xbox/runtime.py index cbe3589ff9..38bb102395 100755 --- a/tools/xbox/runtime.py +++ b/tools/xbox/runtime.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -"""Extract only pinned Windows GDK modules; Linux Wine stays ARM64.""" import hashlib import json from pathlib import Path @@ -35,7 +34,6 @@ def download(name, expected, algorithm): return target archive = download(lock['archive'], lock['sha512'], 'sha512') -# Keep corresponding source available beside the build cache for redistribution. source = lock['source'] download(source['name'], source['sha256'], 'sha256') remaining = set(lock['dlls']) @@ -49,8 +47,6 @@ with tarfile.open(archive) as tar: data = tar.extractfile(member).read() if hashlib.sha256(data).hexdigest() != lock['dlls'][name] or data[:2] != b'MZ': raise RuntimeError('Xbox Windows runtime module checksum mismatch') - # Wine rejects builtin-tagged PE files when WINEDLLOVERRIDES selects native. - # These standalone Windows modules must use the native x64 loader on ARM64EC. if data[64:80] == b'Wine builtin DLL': data = data[:64] + b'DroidDeck native' + data[80:] (output / name).write_bytes(data) diff --git a/tools/xcloud-player/build.sh b/tools/xcloud-player/build.sh index 8839c5693d..0246e96bb8 100644 --- a/tools/xcloud-player/build.sh +++ b/tools/xcloud-player/build.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# Bundles the cloud player page script with esbuild 0.24.0 (ESBUILD=/path/to/esbuild, default: esbuild on PATH). set -euo pipefail here=$(cd "$(dirname "$0")" && pwd) repo=$(cd "$here/../.." && pwd) diff --git a/tools/xcloud-player/entry.ts b/tools/xcloud-player/entry.ts index 9237be3dd4..d135074c63 100644 --- a/tools/xcloud-player/entry.ts +++ b/tools/xcloud-player/entry.ts @@ -1,5 +1,3 @@ -// DroidDeck cloud player page: runs one Xbox Cloud Gaming session. Every request to Microsoft goes -// through the app (DDCloud), which holds the tokens; this page only does WebRTC, video, sound and input. import xCloudPlayer from './greenlight/lib/player' import Gamepad from './greenlight/lib/input/gamepad' import { EffectRenderer, Effects, needsRenderer } from './renderer' @@ -9,21 +7,19 @@ import { capVideoBitrate, preferH264Profile } from './sdp-tweaks' interface Reply { status: number, body: string } declare const DDCloud: { call(id: number, op: string, arg: string): void, status(text: string): void, failed(stage: string, detail: string): void, playing(): void, log(text: string): void, settings(): string } -/** The player settings the app hands over (XboxCloudSettings.toJson); stream-start ones are applied by the app. */ interface Settings extends Effects { - bitrateMbps: number // 0 = Microsoft's own limit - codec: string // 'default' | 'high' | 'normal' | 'low' + bitrateMbps: number + codec: string preventDrops: boolean - statsLevel: number // 0 off, 1 fps, 2 basic, 3 detailed, 4 full - statsLayout: string // 'horizontal' | 'vertical' - statsCorner: string // 'right' | 'left' - server: string // the region's host, for the full overlay - volume: number // 100..300 % - rumble: number // 0..100 % + statsLevel: number + statsLayout: string + statsCorner: string + server: string + volume: number + rumble: number } let settings: Settings = JSON.parse(DDCloud.settings()) -// Codec profile and bitrate cap go into our offer (Better xCloud's approach). const nativeSetLocalDescription = RTCPeerConnection.prototype.setLocalDescription RTCPeerConnection.prototype.setLocalDescription = function (this: RTCPeerConnection, description?: RTCLocalSessionDescriptionInit) { if (description?.sdp) { @@ -34,7 +30,6 @@ RTCPeerConnection.prototype.setLocalDescription = function (this: RTCPeerConnect } as typeof RTCPeerConnection.prototype.setLocalDescription ;(window as any).__ddRumble = settings.rumble / 100 -// Page errors go to the app's Xbox log (no tokens ever reach this page). window.addEventListener('error', event => DDCloud.log(`error: ${event.message} @${event.lineno}`)) window.addEventListener('unhandledrejection', event => DDCloud.log(`rejection: ${String(event.reason).slice(0, 200)}`)) window.addEventListener('gamepadconnected', event => DDCloud.log(`controller: ${event.gamepad.id.slice(0, 60)} mapping=${event.gamepad.mapping || 'none'} buttons=${event.gamepad.buttons.length} axes=${event.gamepad.axes.length}`)) @@ -112,8 +107,6 @@ async function run() { player.init() const pc = player._peerConnection - // "Stop quality drops": report a short decode time so the server does not lower the resolution - // for a slow decoder (Better xCloud's patchStreamMetadata). const input = player._channels.input as any const queueMetadata = input.queueMetadataFrame.bind(input) input.queueMetadataFrame = (frame: any) => { @@ -125,7 +118,6 @@ async function run() { queueMetadata(frame) } - // Volume above 100 %: the stream's sound goes through a gain node instead of the <audio> element. let gain: GainNode | undefined let audioStream: MediaStream | undefined const applyVolume = () => { @@ -154,7 +146,6 @@ async function run() { catch (error) { DDCloud.log(`effects unavailable: ${String(error).slice(0, 200)}`) } } else renderer.resume(settings) } - // Live changes from the in-player menu. ;(window as any).__ddApply = (json: string) => { settings = JSON.parse(json) ;(window as any).__ddRumble = settings.rumble / 100 @@ -166,7 +157,6 @@ async function run() { if (pc.connectionState === 'connected') { show(''); DDCloud.playing() stats.show(settings.statsLevel, settings.statsLayout === 'vertical', settings.server, settings.statsCorner === 'left') - // The video element exists once its track arrived; give it a moment for its first frame. setTimeout(applyEffects, 500) } else if (pc.connectionState === 'failed') DDCloud.failed('webrtc', 'connection failed') @@ -186,8 +176,6 @@ async function run() { const ice = expect('ice', await call('ice', local)) player.setRemoteIceCandidates(JSON.parse(JSON.parse(ice.body).exchangeResponse)) - // The control channel's authorization (sent on the message handshake) announces controller 0 and - // then removes it, clearing any handler attached before; attach the controller after that. const handshake = Date.now() while (!player._channels.message._handshakeCompleted && Date.now() - handshake < 20_000) await sleep(100) DDCloud.log(`handshake ${player._channels.message._handshakeCompleted ? 'done' : 'missing'} after ${Date.now() - handshake} ms`) @@ -195,15 +183,12 @@ async function run() { const pad = new Gamepad(0, { enable_keyboard: false }) pad.attach(player) DDCloud.log(`controllers at attach: ${Array.from(navigator.getGamepads()).filter(Boolean).length}`) - // The app's "Xbox button" (in the leave dialog) presses Nexus for a moment. ;(window as any).__ddNexus = () => { pad.sendButtonState('Nexus', 1); setTimeout(() => pad.sendButtonState('Nexus', 0), 200) } - // The app's menu button / a controller's Guide button: Nexus follows the physical button. ;(window as any).__ddButton = (name: string, value: number) => pad.sendButtonState(name, value) - // The in-player menu pauses controller input to the game while it is open. ;(window as any).__ddInput = (enabled: boolean) => { if (enabled) pad.onWindowFocus(); else pad.onWindowBlur() } setInterval(() => { call('keepalive') }, 30_000) - ;(window as any).__ddStop = () => { try { renderer?.destroy(); stats.destroy(); pad.detach(); player.destroy() } catch (e) { /* closing anyway */ } } + ;(window as any).__ddStop = () => { try { renderer?.destroy(); stats.destroy(); pad.detach(); player.destroy() } catch (e) { } } } run().catch((error: unknown) => { diff --git a/tools/xcloud-player/renderer.ts b/tools/xcloud-player/renderer.ts index 222333cc90..7f123e4a95 100644 --- a/tools/xcloud-player/renderer.ts +++ b/tools/xcloud-player/renderer.ts @@ -1,21 +1,18 @@ -// Picture effects for the stream: the video is drawn through WebGL2 shaders onto a canvas over it. -// Base pass: sharpening (CAS / unsharp mask, from Better xCloud by redphx, MIT) plus DroidDeck's colour -// grading (brightness, contrast, saturation, gamma) and deband dither. Extra passes are DroidDeck's own -// screen effects (FXAA, Toon, CRT, NTSC, from Bannerlator). Off (no canvas) when nothing is set. +// Sharpening (CAS and unsharp mask) from Better xCloud by redphx, MIT. Screen effects from Bannerlator. export interface Effects { - brightness: number // -50..50 (DroidDeck's slider units) - contrast: number // -100..100 - gamma: number // 0.5..3 - saturation: number // 0..200 % - sharpen: number // 0..10 - sharpenMode: string // 'cas' | 'usm' - deband: number // 0..8 (dither amplitude in 8-bit steps) + brightness: number + contrast: number + gamma: number + saturation: number + sharpen: number + sharpenMode: string + deband: number fxaa: boolean toon: boolean crt: boolean ntsc: boolean - maxFps: number // 0 = every frame + maxFps: number } export function needsRenderer(e: Effects): boolean { @@ -82,7 +79,6 @@ void main() { fragColor = vec4(color, 1.0); }` -// Screen-effect shaders from Bannerlator (GLSL ES 1.00), unchanged. const FXAA = `precision highp float; #define FXAA_MIN_REDUCE (1.0 / 128.0) #define FXAA_MUL_REDUCE (1.0 / 8.0) @@ -246,7 +242,6 @@ export class EffectRenderer { update(effects: Effects) { this.effects = effects } - // Turning effects off hides the canvas but keeps the GL context: losing and recreating it can stall the stream. pause() { if (this.idle || this.stopped) return; this.idle = true; this.canvas.style.display = 'none' } resume(effects: Effects) { diff --git a/tools/xcloud-player/sdp-tweaks.ts b/tools/xcloud-player/sdp-tweaks.ts index b500b52fa0..2fbb7c5416 100644 --- a/tools/xcloud-player/sdp-tweaks.ts +++ b/tools/xcloud-player/sdp-tweaks.ts @@ -1,6 +1,5 @@ -// Offer tweaks after Better xCloud by redphx (MIT, src/utils/sdp.ts): prefer an H.264 profile, cap bitrate. +// Offer tweaks after Better xCloud by redphx (MIT, src/utils/sdp.ts). -/** Moves the H.264 payloads of the chosen profile to the front of the video m-line. */ export function preferH264Profile(sdp: string, profile: 'high' | 'normal' | 'low'): string { const prefix = profile === 'high' ? '4d' : (profile === 'low' ? '420' : '42e') const preferred: string[] = [] @@ -17,7 +16,6 @@ export function preferH264Profile(sdp: string, profile: 'high' | 'normal' | 'low return lines.join('\r\n') } -/** Sets b=AS (kbit/s) on the video m-section. */ export function capVideoBitrate(sdp: string, kbps: number): string { const lines = sdp.split('\r\n') const start = lines.findIndex(line => line.startsWith('m=video')) diff --git a/tools/xcloud-player/streamstats.ts b/tools/xcloud-player/streamstats.ts index 04234a020d..738b1120aa 100644 --- a/tools/xcloud-player/streamstats.ts +++ b/tools/xcloud-player/streamstats.ts @@ -1,6 +1,3 @@ -// Performance overlay in the top-right or top-left corner, from WebRTC getStats. Levels: 1 fps; 2 + ping, resolution; -// 3 + bitrate, decode time, packet loss; 4 + codec, jitter, dropped frames, server. Horizontal or vertical. - export class StreamStats { private element: HTMLDivElement private timer: ReturnType<typeof setInterval> | undefined @@ -22,7 +19,6 @@ export class StreamStats { show(level: number, vertical: boolean, server: string, left = false) { this.level = level; this.vertical = vertical; this.server = server; this.left = left - // Top left keeps clear of the clock Xbox draws top right while its guide is open. Object.assign(this.element.style, left ? { left: '8px', right: '', textAlign: 'left' } : { left: '', right: '8px', textAlign: 'right' }) this.element.style.display = level > 0 ? 'block' : 'none' if (level > 0 && this.timer === undefined) { this.timer = setInterval(() => this.update(), 1000); this.update() } diff --git a/tools/xcloud-player/uuid.ts b/tools/xcloud-player/uuid.ts index b13c23dfee..f55aa7c0ce 100644 --- a/tools/xcloud-player/uuid.ts +++ b/tools/xcloud-player/uuid.ts @@ -1,2 +1 @@ -// Stand-in for the "uuid" package (only v4 is used by the Greenlight player). export function v4(): string { return crypto.randomUUID() }