diff --git a/.github/workflows/authorship.yml b/.github/workflows/authorship.yml index ebbcae644f..615267b6c0 100644 --- a/.github/workflows/authorship.yml +++ b/.github/workflows/authorship.yml @@ -25,7 +25,7 @@ jobs: validate: name: Validate source and build result runs-on: ubuntu-24.04 - timeout-minutes: 5 + timeout-minutes: 70 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b836d480d..52c70b7d8f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -152,6 +152,9 @@ jobs: runs-on: ${{ fromJSON(needs.components-runner.outputs.labels) }} timeout-minutes: 40 steps: + - name: Reclaim files a cancelled container build left owned by root + if: runner.environment == 'self-hosted' + run: sudo -n chown -R "$(id -u):$(id -g)" "$GITHUB_WORKSPACE" || echo "::warning::could not reclaim $GITHUB_WORKSPACE" - uses: actions/checkout@v4 with: ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} @@ -350,6 +353,9 @@ jobs: outputs: variants: ${{ steps.variants.outputs.list }} steps: + - name: Reclaim files a cancelled container build left owned by root + if: runner.environment == 'self-hosted' + run: sudo -n chown -R "$(id -u):$(id -g)" "$GITHUB_WORKSPACE" || echo "::warning::could not reclaim $GITHUB_WORKSPACE" - uses: actions/checkout@v4 with: ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} diff --git a/CUserskurtAppDataLocalTemptmp0f4q8icrlibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmp0f4q8icrlibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmp14hd31qklibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmp14hd31qklibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmp2mef0wkllibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmp2mef0wkllibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmp73_7uuj5libdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmp73_7uuj5libdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmp7nxgq9gqlibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmp7nxgq9gqlibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmp91gz53fclibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmp91gz53fclibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpdt3ncj81libdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpdt3ncj81libdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpegj5g4_rlibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpegj5g4_rlibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpf2uqpjqilibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpf2uqpjqilibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpgrvh95ohlibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpgrvh95ohlibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpi_vtq19alibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpi_vtq19alibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpka9avchplibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpka9avchplibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmplqa73x2wlibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmplqa73x2wlibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpn1y4kqiflibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpn1y4kqiflibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpro8wrf5zlibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpro8wrf5zlibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpssagdywwlibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpssagdywwlibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmptsbvvx7glibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmptsbvvx7glibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmptsmww03alibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmptsmww03alibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpwinkawsalibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpwinkawsalibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpyb8mkr4rlibdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpyb8mkr4rlibdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CUserskurtAppDataLocalTemptmpz7q4_ew8libdroiddeck-pipewire.lock b/CUserskurtAppDataLocalTemptmpz7q4_ew8libdroiddeck-pipewire.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/README.md b/README.md index a62414073d..54311796da 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ DroidDeck is [GPL-3.0](LICENSE). Steam and Proton belong to Valve Corporation. V - 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. +- [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), and its GL thunk hands X errors to the program's own error handler. 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. @@ -97,6 +97,7 @@ DroidDeck is [GPL-3.0](LICENSE). Steam and Proton belong to Valve Corporation. V - 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`. - The EA store follows the EA app's protocols as documented by [ArmchairDevelopers](https://github.com/ArmchairDevelopers)' [Maxima](https://github.com/ArmchairDevelopers/Maxima) (GPL-3.0): sign-in, the GraphQL queries (included verbatim, since EA matches them by hash), build archives, online activation licences and the LSX game endpoint. The code is DroidDeck's own. - 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. +- The Rockstar launcher service looks for launcher pipe names in the executables beside the game, since [CitizenFX](https://github.com/citizenfx/fivem)'s `ros-patches-five` shows GTA V opening `GTAVLauncher_Pipe` and [@pingod](https://github.com/pingod)'s [rdr2-linux-launcher](https://github.com/pingod/rdr2-linux-launcher) notes that Rockstar's protected executables resolve such strings only at run time. Read without taking code. - World of Warcraft addon imports replace an addon's folder from a temporary copy, as [WowUp](https://github.com/WowUp/WowUp) does, and read flavour folders the way [WoWDeck](https://github.com/sigboe/wowdeck) does. No code from either is used. - The World of Warcraft addon Download window searches [WoWInterface](https://www.wowinterface.com) through its MMOUI API. [CurseForge](https://www.curseforge.com/wow) opens in the user's browser, with no API and no key. - The Xbox store runs [@domsvoboda](https://github.com/domsvoboda)'s [nexus-backend](https://github.com/domsvoboda/nexus-backend) 0.2.15 (GPL-3.0, a fork of [Xodus](https://github.com/xodus-gaming/xodus)), and Xbox games load the Windows modules of his [nexus-runtime](https://github.com/domsvoboda/nexus-runtime) (LGPL-2.1-or-later), including the C++ [nexus-xgameruntime](https://github.com/domsvoboda/nexus-xgameruntime) and `wintypes.dll`. Content licensing sends delegation-compact device tickets in the licensing wire form, as nexus-backend's Store license path (commit `27c335e`) does. Minecraft's GameInput setup was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 70defee53a..9f92cb97e5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -161,6 +161,7 @@ + @@ -309,6 +310,15 @@ android:resizeableActivity="true" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden|navigation|uiMode|density" /> + = horizontal; + vec2 tangent = verticalEdge ? vec2(0.0, px.y) : vec2(px.x, 0.0); + vec2 normal = verticalEdge + ? vec2(dL >= dR ? -1.0 : 1.0, 0.0) + : vec2(0.0, dU >= dD ? -1.0 : 1.0); + + float negativeRun = 0.0; + float positiveRun = 0.0; + for (int i = 1; i <= 6; ++i) { + vec2 offset = tangent * float(i); + float edgeN = verticalEdge ? edgeVertical(uv - offset, px) : edgeHorizontal(uv - offset, px); + float edgeP = verticalEdge ? edgeVertical(uv + offset, px) : edgeHorizontal(uv + offset, px); + if (negativeRun == float(i - 1) && edgeN > threshold * 0.65) negativeRun = float(i); + if (positiveRun == float(i - 1) && edgeP > threshold * 0.65) positiveRun = float(i); + } + + float span = negativeRun + positiveRun; + float edgeConfidence = smoothstep(threshold, threshold * 2.5, strongest); + + float nw = luma(texture(InputTexture, uv + vec2(-px.x, -px.y)).rgb); + float ne = luma(texture(InputTexture, uv + vec2(px.x, -px.y)).rgb); + float sw = luma(texture(InputTexture, uv + vec2(-px.x, px.y)).rgb); + float se = luma(texture(InputTexture, uv + vec2(px.x, px.y)).rgb); + float endpointPattern = clamp(abs(negativeRun - positiveRun) / max(span, 1.0), 0.0, 1.0); + float endpointArea = endpointPattern / (1.0 + span * 0.055); + float crossingA = verticalEdge ? abs(nw - ne) : abs(nw - sw); + float crossingB = verticalEdge ? abs(sw - se) : abs(ne - se); + float crossingContrast = abs(crossingA - crossingB); + float crossingPattern = smoothstep(threshold, threshold * 2.5, crossingContrast); + float areaWeight = 0.38 * crossingPattern * clamp(span / 4.0, 0.0, 1.0); + float diagonalContrast = max(abs(nw - se), abs(ne - sw)); + float cornerFactor = 1.0 - 0.18 * smoothstep(threshold, threshold * 3.0, diagonalContrast); + float baseWeight = areaWeight * endpointArea * edgeConfidence * cornerFactor; + + float diagonalStrength = abs(abs(nw - se) - abs(ne - sw)); + float diagonalPattern = smoothstep(threshold, threshold * 2.5, diagonalStrength); + float diagonalFallback = 0.16 * diagonalPattern * edgeConfidence * cornerFactor; + + float weight = clamp( + baseWeight <= 0.0001 ? diagonalFallback : baseWeight, + 0.0, 0.42 + ); + vec3 across = texture(InputTexture, uv + normal * px).rgb; + outColor = vec4(mix(center.rgb, across, weight), center.a); +} diff --git a/app/src/main/cpp/shaders/smaa_frag.h b/app/src/main/cpp/shaders/smaa_frag.h new file mode 100644 index 0000000000..ea8bb4d56a --- /dev/null +++ b/app/src/main/cpp/shaders/smaa_frag.h @@ -0,0 +1,443 @@ +#pragma once +#include + +static const uint32_t smaa_code[] = { + 0x07230203u, 0x00010000u, 0x0008000bu, 0x00000254u, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu, + 0x00000001u, 0x4c534c47u, 0x6474732eu, 0x3035342eu, 0x00000000u, 0x0003000eu, 0x00000000u, 0x00000001u, + 0x0007000fu, 0x00000004u, 0x00000004u, 0x6e69616du, 0x00000000u, 0x00000072u, 0x000000f6u, 0x00030010u, + 0x00000004u, 0x00000007u, 0x00030003u, 0x00000002u, 0x000001c2u, 0x00040005u, 0x00000004u, 0x6e69616du, + 0x00000000u, 0x00050005u, 0x0000000bu, 0x616d756cu, 0x33667628u, 0x0000003bu, 0x00030005u, 0x0000000au, + 0x00000063u, 0x00080005u, 0x00000012u, 0x65676465u, 0x74726556u, 0x6c616369u, 0x32667628u, 0x3266763bu, + 0x0000003bu, 0x00030005u, 0x00000010u, 0x00007675u, 0x00030005u, 0x00000011u, 0x00007870u, 0x00080005u, + 0x00000016u, 0x65676465u, 0x69726f48u, 0x746e6f7au, 0x76286c61u, 0x763b3266u, 0x003b3266u, 0x00030005u, + 0x00000014u, 0x00007675u, 0x00030005u, 0x00000015u, 0x00007870u, 0x00030005u, 0x00000021u, 0x00000061u, + 0x00060005u, 0x00000025u, 0x75706e49u, 0x78655474u, 0x65727574u, 0x00000000u, 0x00040005u, 0x00000031u, + 0x61726170u, 0x0000006du, 0x00030005u, 0x00000034u, 0x00000062u, 0x00040005u, 0x0000003cu, 0x61726170u, + 0x0000006du, 0x00030005u, 0x00000045u, 0x00000061u, 0x00040005u, 0x0000004eu, 0x61726170u, 0x0000006du, + 0x00030005u, 0x00000051u, 0x00000062u, 0x00040005u, 0x00000059u, 0x61726170u, 0x0000006du, 0x00030005u, + 0x00000062u, 0x00007870u, 0x00050005u, 0x00000064u, 0x736e6f43u, 0x746e6174u, 0x00000073u, 0x00040006u, + 0x00000064u, 0x00000000u, 0x0063646eu, 0x00060006u, 0x00000064u, 0x00000001u, 0x6f736572u, 0x6974756cu, + 0x00006e6fu, 0x00050006u, 0x00000064u, 0x00000002u, 0x72747865u, 0x00000061u, 0x00040006u, 0x00000064u, + 0x00000003u, 0x00646170u, 0x00030005u, 0x00000066u, 0x00006370u, 0x00030005u, 0x00000070u, 0x00007675u, + 0x00060005u, 0x00000072u, 0x67617266u, 0x43786554u, 0x64726f6fu, 0x00000000u, 0x00040005u, 0x0000007cu, + 0x746e6563u, 0x00007265u, 0x00030005u, 0x00000080u, 0x0000636cu, 0x00040005u, 0x00000081u, 0x61726170u, + 0x0000006du, 0x00030005u, 0x00000085u, 0x00006c6cu, 0x00040005u, 0x0000008du, 0x61726170u, 0x0000006du, + 0x00030005u, 0x00000090u, 0x0000726cu, 0x00040005u, 0x00000098u, 0x61726170u, 0x0000006du, 0x00030005u, + 0x0000009bu, 0x0000756cu, 0x00040005u, 0x000000a3u, 0x61726170u, 0x0000006du, 0x00030005u, 0x000000a6u, + 0x0000646cu, 0x00040005u, 0x000000aeu, 0x61726170u, 0x0000006du, 0x00030005u, 0x000000b1u, 0x00004c64u, + 0x00030005u, 0x000000b6u, 0x00005264u, 0x00030005u, 0x000000bbu, 0x00005564u, 0x00030005u, 0x000000c0u, + 0x00004464u, 0x00050005u, 0x000000c5u, 0x61636f6cu, 0x6e694d6cu, 0x00000000u, 0x00050005u, 0x000000cfu, + 0x61636f6cu, 0x78614d6cu, 0x00000000u, 0x00060005u, 0x000000d9u, 0x61636f6cu, 0x6e6f436cu, 0x73617274u, + 0x00000074u, 0x00050005u, 0x000000ddu, 0x65726874u, 0x6c6f6873u, 0x00000064u, 0x00050005u, 0x000000e3u, + 0x74726576u, 0x6c616369u, 0x00000000u, 0x00050005u, 0x000000e7u, 0x69726f68u, 0x746e6f7au, 0x00006c61u, + 0x00050005u, 0x000000ebu, 0x6f727473u, 0x7365676eu, 0x00000074u, 0x00050005u, 0x000000f6u, 0x4374756fu, + 0x726f6c6fu, 0x00000000u, 0x00060005u, 0x000000fau, 0x74726576u, 0x6c616369u, 0x65676445u, 0x00000000u, + 0x00040005u, 0x000000feu, 0x676e6174u, 0x00746e65u, 0x00040005u, 0x0000010bu, 0x6d726f6eu, 0x00006c61u, + 0x00050005u, 0x0000011du, 0x6167656eu, 0x65766974u, 0x006e7552u, 0x00050005u, 0x0000011eu, 0x69736f70u, + 0x65766974u, 0x006e7552u, 0x00030005u, 0x00000120u, 0x00000069u, 0x00040005u, 0x00000129u, 0x7366666fu, + 0x00007465u, 0x00040005u, 0x0000012eu, 0x65676465u, 0x0000004eu, 0x00040005u, 0x00000136u, 0x61726170u, + 0x0000006du, 0x00040005u, 0x00000137u, 0x61726170u, 0x0000006du, 0x00040005u, 0x0000013eu, 0x61726170u, + 0x0000006du, 0x00040005u, 0x0000013fu, 0x61726170u, 0x0000006du, 0x00040005u, 0x00000143u, 0x65676465u, + 0x00000050u, 0x00040005u, 0x0000014bu, 0x61726170u, 0x0000006du, 0x00040005u, 0x0000014cu, 0x61726170u, + 0x0000006du, 0x00040005u, 0x00000153u, 0x61726170u, 0x0000006du, 0x00040005u, 0x00000154u, 0x61726170u, + 0x0000006du, 0x00040005u, 0x0000017bu, 0x6e617073u, 0x00000000u, 0x00060005u, 0x0000017fu, 0x65676465u, + 0x666e6f43u, 0x6e656469u, 0x00006563u, 0x00030005u, 0x00000186u, 0x0000776eu, 0x00040005u, 0x00000192u, + 0x61726170u, 0x0000006du, 0x00030005u, 0x00000195u, 0x0000656eu, 0x00040005u, 0x000001a0u, 0x61726170u, + 0x0000006du, 0x00030005u, 0x000001a3u, 0x00007773u, 0x00040005u, 0x000001aeu, 0x61726170u, 0x0000006du, + 0x00030005u, 0x000001b1u, 0x00006573u, 0x00040005u, 0x000001bbu, 0x61726170u, 0x0000006du, 0x00060005u, + 0x000001beu, 0x70646e65u, 0x746e696fu, 0x74746150u, 0x006e7265u, 0x00060005u, 0x000001c7u, 0x70646e65u, + 0x746e696fu, 0x61657241u, 0x00000000u, 0x00050005u, 0x000001ceu, 0x736f7263u, 0x676e6973u, 0x00000041u, + 0x00050005u, 0x000001ddu, 0x736f7263u, 0x676e6973u, 0x00000042u, 0x00070005u, 0x000001ecu, 0x736f7263u, + 0x676e6973u, 0x746e6f43u, 0x74736172u, 0x00000000u, 0x00060005u, 0x000001f1u, 0x736f7263u, 0x676e6973u, + 0x74746150u, 0x006e7265u, 0x00050005u, 0x000001f7u, 0x61657261u, 0x67696557u, 0x00007468u, 0x00070005u, + 0x00000200u, 0x67616964u, 0x6c616e6fu, 0x746e6f43u, 0x74736172u, 0x00000000u, 0x00060005u, 0x0000020au, + 0x6e726f63u, 0x61467265u, 0x726f7463u, 0x00000000u, 0x00050005u, 0x00000214u, 0x65736162u, 0x67696557u, + 0x00007468u, 0x00070005u, 0x0000021cu, 0x67616964u, 0x6c616e6fu, 0x65727453u, 0x6874676eu, 0x00000000u, + 0x00060005u, 0x00000227u, 0x67616964u, 0x6c616e6fu, 0x74746150u, 0x006e7265u, 0x00070005u, 0x0000022du, + 0x67616964u, 0x6c616e6fu, 0x6c6c6146u, 0x6b636162u, 0x00000000u, 0x00040005u, 0x00000235u, 0x67696577u, + 0x00007468u, 0x00040005u, 0x0000023eu, 0x6f726361u, 0x00007373u, 0x00040047u, 0x00000025u, 0x00000021u, + 0x00000000u, 0x00040047u, 0x00000025u, 0x00000022u, 0x00000000u, 0x00030047u, 0x00000064u, 0x00000002u, + 0x00050048u, 0x00000064u, 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u, 0x00000064u, 0x00000001u, + 0x00000023u, 0x00000010u, 0x00050048u, 0x00000064u, 0x00000002u, 0x00000023u, 0x00000018u, 0x00050048u, + 0x00000064u, 0x00000003u, 0x00000023u, 0x0000001cu, 0x00040047u, 0x00000072u, 0x0000001eu, 0x00000000u, + 0x00040047u, 0x000000f6u, 0x0000001eu, 0x00000000u, 0x00020013u, 0x00000002u, 0x00030021u, 0x00000003u, + 0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u, 0x00040017u, 0x00000007u, 0x00000006u, 0x00000003u, + 0x00040020u, 0x00000008u, 0x00000007u, 0x00000007u, 0x00040021u, 0x00000009u, 0x00000006u, 0x00000008u, + 0x00040017u, 0x0000000du, 0x00000006u, 0x00000002u, 0x00040020u, 0x0000000eu, 0x00000007u, 0x0000000du, + 0x00050021u, 0x0000000fu, 0x00000006u, 0x0000000eu, 0x0000000eu, 0x0004002bu, 0x00000006u, 0x00000019u, + 0x3e59b3d0u, 0x0004002bu, 0x00000006u, 0x0000001au, 0x3f371759u, 0x0004002bu, 0x00000006u, 0x0000001bu, + 0x3d93dd98u, 0x0006002cu, 0x00000007u, 0x0000001cu, 0x00000019u, 0x0000001au, 0x0000001bu, 0x00040020u, + 0x00000020u, 0x00000007u, 0x00000006u, 0x00090019u, 0x00000022u, 0x00000006u, 0x00000001u, 0x00000000u, + 0x00000000u, 0x00000000u, 0x00000001u, 0x00000000u, 0x0003001bu, 0x00000023u, 0x00000022u, 0x00040020u, + 0x00000024u, 0x00000000u, 0x00000023u, 0x0004003bu, 0x00000024u, 0x00000025u, 0x00000000u, 0x00040015u, + 0x00000028u, 0x00000020u, 0x00000000u, 0x0004002bu, 0x00000028u, 0x00000029u, 0x00000000u, 0x0004002bu, + 0x00000006u, 0x0000002cu, 0x00000000u, 0x00040017u, 0x0000002fu, 0x00000006u, 0x00000004u, 0x0004002bu, + 0x00000028u, 0x00000048u, 0x00000001u, 0x0004002bu, 0x00000006u, 0x00000063u, 0x3f800000u, 0x0006001eu, + 0x00000064u, 0x0000002fu, 0x0000000du, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000065u, 0x00000009u, + 0x00000064u, 0x0004003bu, 0x00000065u, 0x00000066u, 0x00000009u, 0x00040015u, 0x00000067u, 0x00000020u, + 0x00000001u, 0x0004002bu, 0x00000067u, 0x00000068u, 0x00000001u, 0x00040020u, 0x00000069u, 0x00000009u, + 0x0000000du, 0x0005002cu, 0x0000000du, 0x0000006cu, 0x00000063u, 0x00000063u, 0x00040020u, 0x00000071u, + 0x00000001u, 0x0000000du, 0x0004003bu, 0x00000071u, 0x00000072u, 0x00000001u, 0x0004002bu, 0x00000006u, + 0x00000075u, 0x3f000000u, 0x00040020u, 0x0000007bu, 0x00000007u, 0x0000002fu, 0x0004002bu, 0x00000006u, + 0x000000deu, 0x3d3851ecu, 0x0004002bu, 0x00000006u, 0x000000e0u, 0x3da3d70au, 0x00020014u, 0x000000f1u, + 0x00040020u, 0x000000f5u, 0x00000003u, 0x0000002fu, 0x0004003bu, 0x000000f5u, 0x000000f6u, 0x00000003u, + 0x00040020u, 0x000000f9u, 0x00000007u, 0x000000f1u, 0x0004002bu, 0x00000006u, 0x00000113u, 0xbf800000u, + 0x00040020u, 0x0000011fu, 0x00000007u, 0x00000067u, 0x0004002bu, 0x00000067u, 0x00000127u, 0x00000006u, + 0x0004002bu, 0x00000006u, 0x00000161u, 0x3f266666u, 0x0004002bu, 0x00000006u, 0x00000182u, 0x40200000u, + 0x0004002bu, 0x00000006u, 0x000001cau, 0x3d6147aeu, 0x0004002bu, 0x00000006u, 0x000001f8u, 0x3ec28f5cu, + 0x0004002bu, 0x00000006u, 0x000001fcu, 0x40800000u, 0x0004002bu, 0x00000006u, 0x0000020bu, 0x3e3851ecu, + 0x0004002bu, 0x00000006u, 0x0000020eu, 0x40400000u, 0x0004002bu, 0x00000006u, 0x0000022eu, 0x3e23d70au, + 0x0004002bu, 0x00000006u, 0x00000237u, 0x38d1b717u, 0x0004002bu, 0x00000006u, 0x0000023cu, 0x3ed70a3du, + 0x0004002bu, 0x00000028u, 0x0000024du, 0x00000003u, 0x00050036u, 0x00000002u, 0x00000004u, 0x00000000u, + 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003bu, 0x0000000eu, 0x00000062u, 0x00000007u, 0x0004003bu, + 0x0000000eu, 0x00000070u, 0x00000007u, 0x0004003bu, 0x0000007bu, 0x0000007cu, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x00000080u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000081u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x00000085u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x0000008du, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x00000090u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000098u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x0000009bu, 0x00000007u, 0x0004003bu, 0x00000008u, 0x000000a3u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000000a6u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x000000aeu, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000000b1u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000b6u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000000bbu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000c0u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000000c5u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000cfu, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000000d9u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000ddu, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000000e3u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000e7u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000000ebu, 0x00000007u, 0x0004003bu, 0x000000f9u, 0x000000fau, 0x00000007u, 0x0004003bu, + 0x0000000eu, 0x000000feu, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000100u, 0x00000007u, 0x0004003bu, + 0x0000000eu, 0x0000010bu, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x0000010du, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x0000011du, 0x00000007u, 0x0004003bu, 0x00000020u, 0x0000011eu, 0x00000007u, 0x0004003bu, + 0x0000011fu, 0x00000120u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000129u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x0000012eu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000130u, 0x00000007u, 0x0004003bu, + 0x0000000eu, 0x00000136u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000137u, 0x00000007u, 0x0004003bu, + 0x0000000eu, 0x0000013eu, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x0000013fu, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x00000143u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000145u, 0x00000007u, 0x0004003bu, + 0x0000000eu, 0x0000014bu, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x0000014cu, 0x00000007u, 0x0004003bu, + 0x0000000eu, 0x00000153u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000154u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x0000017bu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x0000017fu, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x00000186u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000192u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x00000195u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x000001a0u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000001a3u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x000001aeu, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000001b1u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x000001bbu, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000001beu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001c7u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000001ceu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001d0u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000001ddu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001dfu, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000001ecu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001f1u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x000001f7u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000200u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x0000020au, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000214u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x0000021cu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000227u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x0000022du, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000235u, 0x00000007u, 0x0004003bu, + 0x00000008u, 0x0000023eu, 0x00000007u, 0x00050041u, 0x00000069u, 0x0000006au, 0x00000066u, 0x00000068u, + 0x0004003du, 0x0000000du, 0x0000006bu, 0x0000006au, 0x0007000cu, 0x0000000du, 0x0000006du, 0x00000001u, + 0x00000028u, 0x0000006bu, 0x0000006cu, 0x00050050u, 0x0000000du, 0x0000006eu, 0x00000063u, 0x00000063u, + 0x00050088u, 0x0000000du, 0x0000006fu, 0x0000006eu, 0x0000006du, 0x0003003eu, 0x00000062u, 0x0000006fu, + 0x0004003du, 0x0000000du, 0x00000073u, 0x00000072u, 0x0004003du, 0x0000000du, 0x00000074u, 0x00000062u, + 0x0005008eu, 0x0000000du, 0x00000076u, 0x00000074u, 0x00000075u, 0x0004003du, 0x0000000du, 0x00000077u, + 0x00000062u, 0x0005008eu, 0x0000000du, 0x00000078u, 0x00000077u, 0x00000075u, 0x00050083u, 0x0000000du, + 0x00000079u, 0x0000006cu, 0x00000078u, 0x0008000cu, 0x0000000du, 0x0000007au, 0x00000001u, 0x0000002bu, + 0x00000073u, 0x00000076u, 0x00000079u, 0x0003003eu, 0x00000070u, 0x0000007au, 0x0004003du, 0x00000023u, + 0x0000007du, 0x00000025u, 0x0004003du, 0x0000000du, 0x0000007eu, 0x00000070u, 0x00050057u, 0x0000002fu, + 0x0000007fu, 0x0000007du, 0x0000007eu, 0x0003003eu, 0x0000007cu, 0x0000007fu, 0x0004003du, 0x0000002fu, + 0x00000082u, 0x0000007cu, 0x0008004fu, 0x00000007u, 0x00000083u, 0x00000082u, 0x00000082u, 0x00000000u, + 0x00000001u, 0x00000002u, 0x0003003eu, 0x00000081u, 0x00000083u, 0x00050039u, 0x00000006u, 0x00000084u, + 0x0000000bu, 0x00000081u, 0x0003003eu, 0x00000080u, 0x00000084u, 0x0004003du, 0x00000023u, 0x00000086u, + 0x00000025u, 0x0004003du, 0x0000000du, 0x00000087u, 0x00000070u, 0x00050041u, 0x00000020u, 0x00000088u, + 0x00000062u, 0x00000029u, 0x0004003du, 0x00000006u, 0x00000089u, 0x00000088u, 0x00050050u, 0x0000000du, + 0x0000008au, 0x00000089u, 0x0000002cu, 0x00050083u, 0x0000000du, 0x0000008bu, 0x00000087u, 0x0000008au, + 0x00050057u, 0x0000002fu, 0x0000008cu, 0x00000086u, 0x0000008bu, 0x0008004fu, 0x00000007u, 0x0000008eu, + 0x0000008cu, 0x0000008cu, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x0000008du, 0x0000008eu, + 0x00050039u, 0x00000006u, 0x0000008fu, 0x0000000bu, 0x0000008du, 0x0003003eu, 0x00000085u, 0x0000008fu, + 0x0004003du, 0x00000023u, 0x00000091u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000092u, 0x00000070u, + 0x00050041u, 0x00000020u, 0x00000093u, 0x00000062u, 0x00000029u, 0x0004003du, 0x00000006u, 0x00000094u, + 0x00000093u, 0x00050050u, 0x0000000du, 0x00000095u, 0x00000094u, 0x0000002cu, 0x00050081u, 0x0000000du, + 0x00000096u, 0x00000092u, 0x00000095u, 0x00050057u, 0x0000002fu, 0x00000097u, 0x00000091u, 0x00000096u, + 0x0008004fu, 0x00000007u, 0x00000099u, 0x00000097u, 0x00000097u, 0x00000000u, 0x00000001u, 0x00000002u, + 0x0003003eu, 0x00000098u, 0x00000099u, 0x00050039u, 0x00000006u, 0x0000009au, 0x0000000bu, 0x00000098u, + 0x0003003eu, 0x00000090u, 0x0000009au, 0x0004003du, 0x00000023u, 0x0000009cu, 0x00000025u, 0x0004003du, + 0x0000000du, 0x0000009du, 0x00000070u, 0x00050041u, 0x00000020u, 0x0000009eu, 0x00000062u, 0x00000048u, + 0x0004003du, 0x00000006u, 0x0000009fu, 0x0000009eu, 0x00050050u, 0x0000000du, 0x000000a0u, 0x0000002cu, + 0x0000009fu, 0x00050083u, 0x0000000du, 0x000000a1u, 0x0000009du, 0x000000a0u, 0x00050057u, 0x0000002fu, + 0x000000a2u, 0x0000009cu, 0x000000a1u, 0x0008004fu, 0x00000007u, 0x000000a4u, 0x000000a2u, 0x000000a2u, + 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x000000a3u, 0x000000a4u, 0x00050039u, 0x00000006u, + 0x000000a5u, 0x0000000bu, 0x000000a3u, 0x0003003eu, 0x0000009bu, 0x000000a5u, 0x0004003du, 0x00000023u, + 0x000000a7u, 0x00000025u, 0x0004003du, 0x0000000du, 0x000000a8u, 0x00000070u, 0x00050041u, 0x00000020u, + 0x000000a9u, 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x000000aau, 0x000000a9u, 0x00050050u, + 0x0000000du, 0x000000abu, 0x0000002cu, 0x000000aau, 0x00050081u, 0x0000000du, 0x000000acu, 0x000000a8u, + 0x000000abu, 0x00050057u, 0x0000002fu, 0x000000adu, 0x000000a7u, 0x000000acu, 0x0008004fu, 0x00000007u, + 0x000000afu, 0x000000adu, 0x000000adu, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x000000aeu, + 0x000000afu, 0x00050039u, 0x00000006u, 0x000000b0u, 0x0000000bu, 0x000000aeu, 0x0003003eu, 0x000000a6u, + 0x000000b0u, 0x0004003du, 0x00000006u, 0x000000b2u, 0x00000080u, 0x0004003du, 0x00000006u, 0x000000b3u, + 0x00000085u, 0x00050083u, 0x00000006u, 0x000000b4u, 0x000000b2u, 0x000000b3u, 0x0006000cu, 0x00000006u, + 0x000000b5u, 0x00000001u, 0x00000004u, 0x000000b4u, 0x0003003eu, 0x000000b1u, 0x000000b5u, 0x0004003du, + 0x00000006u, 0x000000b7u, 0x00000080u, 0x0004003du, 0x00000006u, 0x000000b8u, 0x00000090u, 0x00050083u, + 0x00000006u, 0x000000b9u, 0x000000b7u, 0x000000b8u, 0x0006000cu, 0x00000006u, 0x000000bau, 0x00000001u, + 0x00000004u, 0x000000b9u, 0x0003003eu, 0x000000b6u, 0x000000bau, 0x0004003du, 0x00000006u, 0x000000bcu, + 0x00000080u, 0x0004003du, 0x00000006u, 0x000000bdu, 0x0000009bu, 0x00050083u, 0x00000006u, 0x000000beu, + 0x000000bcu, 0x000000bdu, 0x0006000cu, 0x00000006u, 0x000000bfu, 0x00000001u, 0x00000004u, 0x000000beu, + 0x0003003eu, 0x000000bbu, 0x000000bfu, 0x0004003du, 0x00000006u, 0x000000c1u, 0x00000080u, 0x0004003du, + 0x00000006u, 0x000000c2u, 0x000000a6u, 0x00050083u, 0x00000006u, 0x000000c3u, 0x000000c1u, 0x000000c2u, + 0x0006000cu, 0x00000006u, 0x000000c4u, 0x00000001u, 0x00000004u, 0x000000c3u, 0x0003003eu, 0x000000c0u, + 0x000000c4u, 0x0004003du, 0x00000006u, 0x000000c6u, 0x00000080u, 0x0004003du, 0x00000006u, 0x000000c7u, + 0x00000085u, 0x0004003du, 0x00000006u, 0x000000c8u, 0x00000090u, 0x0007000cu, 0x00000006u, 0x000000c9u, + 0x00000001u, 0x00000025u, 0x000000c7u, 0x000000c8u, 0x0004003du, 0x00000006u, 0x000000cau, 0x0000009bu, + 0x0004003du, 0x00000006u, 0x000000cbu, 0x000000a6u, 0x0007000cu, 0x00000006u, 0x000000ccu, 0x00000001u, + 0x00000025u, 0x000000cau, 0x000000cbu, 0x0007000cu, 0x00000006u, 0x000000cdu, 0x00000001u, 0x00000025u, + 0x000000c9u, 0x000000ccu, 0x0007000cu, 0x00000006u, 0x000000ceu, 0x00000001u, 0x00000025u, 0x000000c6u, + 0x000000cdu, 0x0003003eu, 0x000000c5u, 0x000000ceu, 0x0004003du, 0x00000006u, 0x000000d0u, 0x00000080u, + 0x0004003du, 0x00000006u, 0x000000d1u, 0x00000085u, 0x0004003du, 0x00000006u, 0x000000d2u, 0x00000090u, + 0x0007000cu, 0x00000006u, 0x000000d3u, 0x00000001u, 0x00000028u, 0x000000d1u, 0x000000d2u, 0x0004003du, + 0x00000006u, 0x000000d4u, 0x0000009bu, 0x0004003du, 0x00000006u, 0x000000d5u, 0x000000a6u, 0x0007000cu, + 0x00000006u, 0x000000d6u, 0x00000001u, 0x00000028u, 0x000000d4u, 0x000000d5u, 0x0007000cu, 0x00000006u, + 0x000000d7u, 0x00000001u, 0x00000028u, 0x000000d3u, 0x000000d6u, 0x0007000cu, 0x00000006u, 0x000000d8u, + 0x00000001u, 0x00000028u, 0x000000d0u, 0x000000d7u, 0x0003003eu, 0x000000cfu, 0x000000d8u, 0x0004003du, + 0x00000006u, 0x000000dau, 0x000000cfu, 0x0004003du, 0x00000006u, 0x000000dbu, 0x000000c5u, 0x00050083u, + 0x00000006u, 0x000000dcu, 0x000000dau, 0x000000dbu, 0x0003003eu, 0x000000d9u, 0x000000dcu, 0x0004003du, + 0x00000006u, 0x000000dfu, 0x000000d9u, 0x00050085u, 0x00000006u, 0x000000e1u, 0x000000dfu, 0x000000e0u, + 0x0007000cu, 0x00000006u, 0x000000e2u, 0x00000001u, 0x00000028u, 0x000000deu, 0x000000e1u, 0x0003003eu, + 0x000000ddu, 0x000000e2u, 0x0004003du, 0x00000006u, 0x000000e4u, 0x000000b1u, 0x0004003du, 0x00000006u, + 0x000000e5u, 0x000000b6u, 0x0007000cu, 0x00000006u, 0x000000e6u, 0x00000001u, 0x00000028u, 0x000000e4u, + 0x000000e5u, 0x0003003eu, 0x000000e3u, 0x000000e6u, 0x0004003du, 0x00000006u, 0x000000e8u, 0x000000bbu, + 0x0004003du, 0x00000006u, 0x000000e9u, 0x000000c0u, 0x0007000cu, 0x00000006u, 0x000000eau, 0x00000001u, + 0x00000028u, 0x000000e8u, 0x000000e9u, 0x0003003eu, 0x000000e7u, 0x000000eau, 0x0004003du, 0x00000006u, + 0x000000ecu, 0x000000e3u, 0x0004003du, 0x00000006u, 0x000000edu, 0x000000e7u, 0x0007000cu, 0x00000006u, + 0x000000eeu, 0x00000001u, 0x00000028u, 0x000000ecu, 0x000000edu, 0x0003003eu, 0x000000ebu, 0x000000eeu, + 0x0004003du, 0x00000006u, 0x000000efu, 0x000000ebu, 0x0004003du, 0x00000006u, 0x000000f0u, 0x000000ddu, + 0x000500bcu, 0x000000f1u, 0x000000f2u, 0x000000efu, 0x000000f0u, 0x000300f7u, 0x000000f4u, 0x00000000u, + 0x000400fau, 0x000000f2u, 0x000000f3u, 0x000000f4u, 0x000200f8u, 0x000000f3u, 0x0004003du, 0x0000002fu, + 0x000000f7u, 0x0000007cu, 0x0003003eu, 0x000000f6u, 0x000000f7u, 0x000100fdu, 0x000200f8u, 0x000000f4u, + 0x0004003du, 0x00000006u, 0x000000fbu, 0x000000e3u, 0x0004003du, 0x00000006u, 0x000000fcu, 0x000000e7u, + 0x000500beu, 0x000000f1u, 0x000000fdu, 0x000000fbu, 0x000000fcu, 0x0003003eu, 0x000000fau, 0x000000fdu, + 0x0004003du, 0x000000f1u, 0x000000ffu, 0x000000fau, 0x000300f7u, 0x00000102u, 0x00000000u, 0x000400fau, + 0x000000ffu, 0x00000101u, 0x00000106u, 0x000200f8u, 0x00000101u, 0x00050041u, 0x00000020u, 0x00000103u, + 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x00000104u, 0x00000103u, 0x00050050u, 0x0000000du, + 0x00000105u, 0x0000002cu, 0x00000104u, 0x0003003eu, 0x00000100u, 0x00000105u, 0x000200f9u, 0x00000102u, + 0x000200f8u, 0x00000106u, 0x00050041u, 0x00000020u, 0x00000107u, 0x00000062u, 0x00000029u, 0x0004003du, + 0x00000006u, 0x00000108u, 0x00000107u, 0x00050050u, 0x0000000du, 0x00000109u, 0x00000108u, 0x0000002cu, + 0x0003003eu, 0x00000100u, 0x00000109u, 0x000200f9u, 0x00000102u, 0x000200f8u, 0x00000102u, 0x0004003du, + 0x0000000du, 0x0000010au, 0x00000100u, 0x0003003eu, 0x000000feu, 0x0000010au, 0x0004003du, 0x000000f1u, + 0x0000010cu, 0x000000fau, 0x000300f7u, 0x0000010fu, 0x00000000u, 0x000400fau, 0x0000010cu, 0x0000010eu, + 0x00000116u, 0x000200f8u, 0x0000010eu, 0x0004003du, 0x00000006u, 0x00000110u, 0x000000b1u, 0x0004003du, + 0x00000006u, 0x00000111u, 0x000000b6u, 0x000500beu, 0x000000f1u, 0x00000112u, 0x00000110u, 0x00000111u, + 0x000600a9u, 0x00000006u, 0x00000114u, 0x00000112u, 0x00000113u, 0x00000063u, 0x00050050u, 0x0000000du, + 0x00000115u, 0x00000114u, 0x0000002cu, 0x0003003eu, 0x0000010du, 0x00000115u, 0x000200f9u, 0x0000010fu, + 0x000200f8u, 0x00000116u, 0x0004003du, 0x00000006u, 0x00000117u, 0x000000bbu, 0x0004003du, 0x00000006u, + 0x00000118u, 0x000000c0u, 0x000500beu, 0x000000f1u, 0x00000119u, 0x00000117u, 0x00000118u, 0x000600a9u, + 0x00000006u, 0x0000011au, 0x00000119u, 0x00000113u, 0x00000063u, 0x00050050u, 0x0000000du, 0x0000011bu, + 0x0000002cu, 0x0000011au, 0x0003003eu, 0x0000010du, 0x0000011bu, 0x000200f9u, 0x0000010fu, 0x000200f8u, + 0x0000010fu, 0x0004003du, 0x0000000du, 0x0000011cu, 0x0000010du, 0x0003003eu, 0x0000010bu, 0x0000011cu, + 0x0003003eu, 0x0000011du, 0x0000002cu, 0x0003003eu, 0x0000011eu, 0x0000002cu, 0x0003003eu, 0x00000120u, + 0x00000068u, 0x000200f9u, 0x00000121u, 0x000200f8u, 0x00000121u, 0x000400f6u, 0x00000123u, 0x00000124u, + 0x00000000u, 0x000200f9u, 0x00000125u, 0x000200f8u, 0x00000125u, 0x0004003du, 0x00000067u, 0x00000126u, + 0x00000120u, 0x000500b3u, 0x000000f1u, 0x00000128u, 0x00000126u, 0x00000127u, 0x000400fau, 0x00000128u, + 0x00000122u, 0x00000123u, 0x000200f8u, 0x00000122u, 0x0004003du, 0x0000000du, 0x0000012au, 0x000000feu, + 0x0004003du, 0x00000067u, 0x0000012bu, 0x00000120u, 0x0004006fu, 0x00000006u, 0x0000012cu, 0x0000012bu, + 0x0005008eu, 0x0000000du, 0x0000012du, 0x0000012au, 0x0000012cu, 0x0003003eu, 0x00000129u, 0x0000012du, + 0x0004003du, 0x000000f1u, 0x0000012fu, 0x000000fau, 0x000300f7u, 0x00000132u, 0x00000000u, 0x000400fau, + 0x0000012fu, 0x00000131u, 0x0000013au, 0x000200f8u, 0x00000131u, 0x0004003du, 0x0000000du, 0x00000133u, + 0x00000070u, 0x0004003du, 0x0000000du, 0x00000134u, 0x00000129u, 0x00050083u, 0x0000000du, 0x00000135u, + 0x00000133u, 0x00000134u, 0x0003003eu, 0x00000136u, 0x00000135u, 0x0004003du, 0x0000000du, 0x00000138u, + 0x00000062u, 0x0003003eu, 0x00000137u, 0x00000138u, 0x00060039u, 0x00000006u, 0x00000139u, 0x00000012u, + 0x00000136u, 0x00000137u, 0x0003003eu, 0x00000130u, 0x00000139u, 0x000200f9u, 0x00000132u, 0x000200f8u, + 0x0000013au, 0x0004003du, 0x0000000du, 0x0000013bu, 0x00000070u, 0x0004003du, 0x0000000du, 0x0000013cu, + 0x00000129u, 0x00050083u, 0x0000000du, 0x0000013du, 0x0000013bu, 0x0000013cu, 0x0003003eu, 0x0000013eu, + 0x0000013du, 0x0004003du, 0x0000000du, 0x00000140u, 0x00000062u, 0x0003003eu, 0x0000013fu, 0x00000140u, + 0x00060039u, 0x00000006u, 0x00000141u, 0x00000016u, 0x0000013eu, 0x0000013fu, 0x0003003eu, 0x00000130u, + 0x00000141u, 0x000200f9u, 0x00000132u, 0x000200f8u, 0x00000132u, 0x0004003du, 0x00000006u, 0x00000142u, + 0x00000130u, 0x0003003eu, 0x0000012eu, 0x00000142u, 0x0004003du, 0x000000f1u, 0x00000144u, 0x000000fau, + 0x000300f7u, 0x00000147u, 0x00000000u, 0x000400fau, 0x00000144u, 0x00000146u, 0x0000014fu, 0x000200f8u, + 0x00000146u, 0x0004003du, 0x0000000du, 0x00000148u, 0x00000070u, 0x0004003du, 0x0000000du, 0x00000149u, + 0x00000129u, 0x00050081u, 0x0000000du, 0x0000014au, 0x00000148u, 0x00000149u, 0x0003003eu, 0x0000014bu, + 0x0000014au, 0x0004003du, 0x0000000du, 0x0000014du, 0x00000062u, 0x0003003eu, 0x0000014cu, 0x0000014du, + 0x00060039u, 0x00000006u, 0x0000014eu, 0x00000012u, 0x0000014bu, 0x0000014cu, 0x0003003eu, 0x00000145u, + 0x0000014eu, 0x000200f9u, 0x00000147u, 0x000200f8u, 0x0000014fu, 0x0004003du, 0x0000000du, 0x00000150u, + 0x00000070u, 0x0004003du, 0x0000000du, 0x00000151u, 0x00000129u, 0x00050081u, 0x0000000du, 0x00000152u, + 0x00000150u, 0x00000151u, 0x0003003eu, 0x00000153u, 0x00000152u, 0x0004003du, 0x0000000du, 0x00000155u, + 0x00000062u, 0x0003003eu, 0x00000154u, 0x00000155u, 0x00060039u, 0x00000006u, 0x00000156u, 0x00000016u, + 0x00000153u, 0x00000154u, 0x0003003eu, 0x00000145u, 0x00000156u, 0x000200f9u, 0x00000147u, 0x000200f8u, + 0x00000147u, 0x0004003du, 0x00000006u, 0x00000157u, 0x00000145u, 0x0003003eu, 0x00000143u, 0x00000157u, + 0x0004003du, 0x00000006u, 0x00000158u, 0x0000011du, 0x0004003du, 0x00000067u, 0x00000159u, 0x00000120u, + 0x00050082u, 0x00000067u, 0x0000015au, 0x00000159u, 0x00000068u, 0x0004006fu, 0x00000006u, 0x0000015bu, + 0x0000015au, 0x000500b4u, 0x000000f1u, 0x0000015cu, 0x00000158u, 0x0000015bu, 0x000300f7u, 0x0000015eu, + 0x00000000u, 0x000400fau, 0x0000015cu, 0x0000015du, 0x0000015eu, 0x000200f8u, 0x0000015du, 0x0004003du, + 0x00000006u, 0x0000015fu, 0x0000012eu, 0x0004003du, 0x00000006u, 0x00000160u, 0x000000ddu, 0x00050085u, + 0x00000006u, 0x00000162u, 0x00000160u, 0x00000161u, 0x000500bau, 0x000000f1u, 0x00000163u, 0x0000015fu, + 0x00000162u, 0x000200f9u, 0x0000015eu, 0x000200f8u, 0x0000015eu, 0x000700f5u, 0x000000f1u, 0x00000164u, + 0x0000015cu, 0x00000147u, 0x00000163u, 0x0000015du, 0x000300f7u, 0x00000166u, 0x00000000u, 0x000400fau, + 0x00000164u, 0x00000165u, 0x00000166u, 0x000200f8u, 0x00000165u, 0x0004003du, 0x00000067u, 0x00000167u, + 0x00000120u, 0x0004006fu, 0x00000006u, 0x00000168u, 0x00000167u, 0x0003003eu, 0x0000011du, 0x00000168u, + 0x000200f9u, 0x00000166u, 0x000200f8u, 0x00000166u, 0x0004003du, 0x00000006u, 0x00000169u, 0x0000011eu, + 0x0004003du, 0x00000067u, 0x0000016au, 0x00000120u, 0x00050082u, 0x00000067u, 0x0000016bu, 0x0000016au, + 0x00000068u, 0x0004006fu, 0x00000006u, 0x0000016cu, 0x0000016bu, 0x000500b4u, 0x000000f1u, 0x0000016du, + 0x00000169u, 0x0000016cu, 0x000300f7u, 0x0000016fu, 0x00000000u, 0x000400fau, 0x0000016du, 0x0000016eu, + 0x0000016fu, 0x000200f8u, 0x0000016eu, 0x0004003du, 0x00000006u, 0x00000170u, 0x00000143u, 0x0004003du, + 0x00000006u, 0x00000171u, 0x000000ddu, 0x00050085u, 0x00000006u, 0x00000172u, 0x00000171u, 0x00000161u, + 0x000500bau, 0x000000f1u, 0x00000173u, 0x00000170u, 0x00000172u, 0x000200f9u, 0x0000016fu, 0x000200f8u, + 0x0000016fu, 0x000700f5u, 0x000000f1u, 0x00000174u, 0x0000016du, 0x00000166u, 0x00000173u, 0x0000016eu, + 0x000300f7u, 0x00000176u, 0x00000000u, 0x000400fau, 0x00000174u, 0x00000175u, 0x00000176u, 0x000200f8u, + 0x00000175u, 0x0004003du, 0x00000067u, 0x00000177u, 0x00000120u, 0x0004006fu, 0x00000006u, 0x00000178u, + 0x00000177u, 0x0003003eu, 0x0000011eu, 0x00000178u, 0x000200f9u, 0x00000176u, 0x000200f8u, 0x00000176u, + 0x000200f9u, 0x00000124u, 0x000200f8u, 0x00000124u, 0x0004003du, 0x00000067u, 0x00000179u, 0x00000120u, + 0x00050080u, 0x00000067u, 0x0000017au, 0x00000179u, 0x00000068u, 0x0003003eu, 0x00000120u, 0x0000017au, + 0x000200f9u, 0x00000121u, 0x000200f8u, 0x00000123u, 0x0004003du, 0x00000006u, 0x0000017cu, 0x0000011du, + 0x0004003du, 0x00000006u, 0x0000017du, 0x0000011eu, 0x00050081u, 0x00000006u, 0x0000017eu, 0x0000017cu, + 0x0000017du, 0x0003003eu, 0x0000017bu, 0x0000017eu, 0x0004003du, 0x00000006u, 0x00000180u, 0x000000ddu, + 0x0004003du, 0x00000006u, 0x00000181u, 0x000000ddu, 0x00050085u, 0x00000006u, 0x00000183u, 0x00000181u, + 0x00000182u, 0x0004003du, 0x00000006u, 0x00000184u, 0x000000ebu, 0x0008000cu, 0x00000006u, 0x00000185u, + 0x00000001u, 0x00000031u, 0x00000180u, 0x00000183u, 0x00000184u, 0x0003003eu, 0x0000017fu, 0x00000185u, + 0x0004003du, 0x00000023u, 0x00000187u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000188u, 0x00000070u, + 0x00050041u, 0x00000020u, 0x00000189u, 0x00000062u, 0x00000029u, 0x0004003du, 0x00000006u, 0x0000018au, + 0x00000189u, 0x0004007fu, 0x00000006u, 0x0000018bu, 0x0000018au, 0x00050041u, 0x00000020u, 0x0000018cu, + 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x0000018du, 0x0000018cu, 0x0004007fu, 0x00000006u, + 0x0000018eu, 0x0000018du, 0x00050050u, 0x0000000du, 0x0000018fu, 0x0000018bu, 0x0000018eu, 0x00050081u, + 0x0000000du, 0x00000190u, 0x00000188u, 0x0000018fu, 0x00050057u, 0x0000002fu, 0x00000191u, 0x00000187u, + 0x00000190u, 0x0008004fu, 0x00000007u, 0x00000193u, 0x00000191u, 0x00000191u, 0x00000000u, 0x00000001u, + 0x00000002u, 0x0003003eu, 0x00000192u, 0x00000193u, 0x00050039u, 0x00000006u, 0x00000194u, 0x0000000bu, + 0x00000192u, 0x0003003eu, 0x00000186u, 0x00000194u, 0x0004003du, 0x00000023u, 0x00000196u, 0x00000025u, + 0x0004003du, 0x0000000du, 0x00000197u, 0x00000070u, 0x00050041u, 0x00000020u, 0x00000198u, 0x00000062u, + 0x00000029u, 0x0004003du, 0x00000006u, 0x00000199u, 0x00000198u, 0x00050041u, 0x00000020u, 0x0000019au, + 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x0000019bu, 0x0000019au, 0x0004007fu, 0x00000006u, + 0x0000019cu, 0x0000019bu, 0x00050050u, 0x0000000du, 0x0000019du, 0x00000199u, 0x0000019cu, 0x00050081u, + 0x0000000du, 0x0000019eu, 0x00000197u, 0x0000019du, 0x00050057u, 0x0000002fu, 0x0000019fu, 0x00000196u, + 0x0000019eu, 0x0008004fu, 0x00000007u, 0x000001a1u, 0x0000019fu, 0x0000019fu, 0x00000000u, 0x00000001u, + 0x00000002u, 0x0003003eu, 0x000001a0u, 0x000001a1u, 0x00050039u, 0x00000006u, 0x000001a2u, 0x0000000bu, + 0x000001a0u, 0x0003003eu, 0x00000195u, 0x000001a2u, 0x0004003du, 0x00000023u, 0x000001a4u, 0x00000025u, + 0x0004003du, 0x0000000du, 0x000001a5u, 0x00000070u, 0x00050041u, 0x00000020u, 0x000001a6u, 0x00000062u, + 0x00000029u, 0x0004003du, 0x00000006u, 0x000001a7u, 0x000001a6u, 0x0004007fu, 0x00000006u, 0x000001a8u, + 0x000001a7u, 0x00050041u, 0x00000020u, 0x000001a9u, 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, + 0x000001aau, 0x000001a9u, 0x00050050u, 0x0000000du, 0x000001abu, 0x000001a8u, 0x000001aau, 0x00050081u, + 0x0000000du, 0x000001acu, 0x000001a5u, 0x000001abu, 0x00050057u, 0x0000002fu, 0x000001adu, 0x000001a4u, + 0x000001acu, 0x0008004fu, 0x00000007u, 0x000001afu, 0x000001adu, 0x000001adu, 0x00000000u, 0x00000001u, + 0x00000002u, 0x0003003eu, 0x000001aeu, 0x000001afu, 0x00050039u, 0x00000006u, 0x000001b0u, 0x0000000bu, + 0x000001aeu, 0x0003003eu, 0x000001a3u, 0x000001b0u, 0x0004003du, 0x00000023u, 0x000001b2u, 0x00000025u, + 0x0004003du, 0x0000000du, 0x000001b3u, 0x00000070u, 0x00050041u, 0x00000020u, 0x000001b4u, 0x00000062u, + 0x00000029u, 0x0004003du, 0x00000006u, 0x000001b5u, 0x000001b4u, 0x00050041u, 0x00000020u, 0x000001b6u, + 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x000001b7u, 0x000001b6u, 0x00050050u, 0x0000000du, + 0x000001b8u, 0x000001b5u, 0x000001b7u, 0x00050081u, 0x0000000du, 0x000001b9u, 0x000001b3u, 0x000001b8u, + 0x00050057u, 0x0000002fu, 0x000001bau, 0x000001b2u, 0x000001b9u, 0x0008004fu, 0x00000007u, 0x000001bcu, + 0x000001bau, 0x000001bau, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x000001bbu, 0x000001bcu, + 0x00050039u, 0x00000006u, 0x000001bdu, 0x0000000bu, 0x000001bbu, 0x0003003eu, 0x000001b1u, 0x000001bdu, + 0x0004003du, 0x00000006u, 0x000001bfu, 0x0000011du, 0x0004003du, 0x00000006u, 0x000001c0u, 0x0000011eu, + 0x00050083u, 0x00000006u, 0x000001c1u, 0x000001bfu, 0x000001c0u, 0x0006000cu, 0x00000006u, 0x000001c2u, + 0x00000001u, 0x00000004u, 0x000001c1u, 0x0004003du, 0x00000006u, 0x000001c3u, 0x0000017bu, 0x0007000cu, + 0x00000006u, 0x000001c4u, 0x00000001u, 0x00000028u, 0x000001c3u, 0x00000063u, 0x00050088u, 0x00000006u, + 0x000001c5u, 0x000001c2u, 0x000001c4u, 0x0008000cu, 0x00000006u, 0x000001c6u, 0x00000001u, 0x0000002bu, + 0x000001c5u, 0x0000002cu, 0x00000063u, 0x0003003eu, 0x000001beu, 0x000001c6u, 0x0004003du, 0x00000006u, + 0x000001c8u, 0x000001beu, 0x0004003du, 0x00000006u, 0x000001c9u, 0x0000017bu, 0x00050085u, 0x00000006u, + 0x000001cbu, 0x000001c9u, 0x000001cau, 0x00050081u, 0x00000006u, 0x000001ccu, 0x00000063u, 0x000001cbu, + 0x00050088u, 0x00000006u, 0x000001cdu, 0x000001c8u, 0x000001ccu, 0x0003003eu, 0x000001c7u, 0x000001cdu, + 0x0004003du, 0x000000f1u, 0x000001cfu, 0x000000fau, 0x000300f7u, 0x000001d2u, 0x00000000u, 0x000400fau, + 0x000001cfu, 0x000001d1u, 0x000001d7u, 0x000200f8u, 0x000001d1u, 0x0004003du, 0x00000006u, 0x000001d3u, + 0x00000186u, 0x0004003du, 0x00000006u, 0x000001d4u, 0x00000195u, 0x00050083u, 0x00000006u, 0x000001d5u, + 0x000001d3u, 0x000001d4u, 0x0006000cu, 0x00000006u, 0x000001d6u, 0x00000001u, 0x00000004u, 0x000001d5u, + 0x0003003eu, 0x000001d0u, 0x000001d6u, 0x000200f9u, 0x000001d2u, 0x000200f8u, 0x000001d7u, 0x0004003du, + 0x00000006u, 0x000001d8u, 0x00000186u, 0x0004003du, 0x00000006u, 0x000001d9u, 0x000001a3u, 0x00050083u, + 0x00000006u, 0x000001dau, 0x000001d8u, 0x000001d9u, 0x0006000cu, 0x00000006u, 0x000001dbu, 0x00000001u, + 0x00000004u, 0x000001dau, 0x0003003eu, 0x000001d0u, 0x000001dbu, 0x000200f9u, 0x000001d2u, 0x000200f8u, + 0x000001d2u, 0x0004003du, 0x00000006u, 0x000001dcu, 0x000001d0u, 0x0003003eu, 0x000001ceu, 0x000001dcu, + 0x0004003du, 0x000000f1u, 0x000001deu, 0x000000fau, 0x000300f7u, 0x000001e1u, 0x00000000u, 0x000400fau, + 0x000001deu, 0x000001e0u, 0x000001e6u, 0x000200f8u, 0x000001e0u, 0x0004003du, 0x00000006u, 0x000001e2u, + 0x000001a3u, 0x0004003du, 0x00000006u, 0x000001e3u, 0x000001b1u, 0x00050083u, 0x00000006u, 0x000001e4u, + 0x000001e2u, 0x000001e3u, 0x0006000cu, 0x00000006u, 0x000001e5u, 0x00000001u, 0x00000004u, 0x000001e4u, + 0x0003003eu, 0x000001dfu, 0x000001e5u, 0x000200f9u, 0x000001e1u, 0x000200f8u, 0x000001e6u, 0x0004003du, + 0x00000006u, 0x000001e7u, 0x00000195u, 0x0004003du, 0x00000006u, 0x000001e8u, 0x000001b1u, 0x00050083u, + 0x00000006u, 0x000001e9u, 0x000001e7u, 0x000001e8u, 0x0006000cu, 0x00000006u, 0x000001eau, 0x00000001u, + 0x00000004u, 0x000001e9u, 0x0003003eu, 0x000001dfu, 0x000001eau, 0x000200f9u, 0x000001e1u, 0x000200f8u, + 0x000001e1u, 0x0004003du, 0x00000006u, 0x000001ebu, 0x000001dfu, 0x0003003eu, 0x000001ddu, 0x000001ebu, + 0x0004003du, 0x00000006u, 0x000001edu, 0x000001ceu, 0x0004003du, 0x00000006u, 0x000001eeu, 0x000001ddu, + 0x00050083u, 0x00000006u, 0x000001efu, 0x000001edu, 0x000001eeu, 0x0006000cu, 0x00000006u, 0x000001f0u, + 0x00000001u, 0x00000004u, 0x000001efu, 0x0003003eu, 0x000001ecu, 0x000001f0u, 0x0004003du, 0x00000006u, + 0x000001f2u, 0x000000ddu, 0x0004003du, 0x00000006u, 0x000001f3u, 0x000000ddu, 0x00050085u, 0x00000006u, + 0x000001f4u, 0x000001f3u, 0x00000182u, 0x0004003du, 0x00000006u, 0x000001f5u, 0x000001ecu, 0x0008000cu, + 0x00000006u, 0x000001f6u, 0x00000001u, 0x00000031u, 0x000001f2u, 0x000001f4u, 0x000001f5u, 0x0003003eu, + 0x000001f1u, 0x000001f6u, 0x0004003du, 0x00000006u, 0x000001f9u, 0x000001f1u, 0x00050085u, 0x00000006u, + 0x000001fau, 0x000001f8u, 0x000001f9u, 0x0004003du, 0x00000006u, 0x000001fbu, 0x0000017bu, 0x00050088u, + 0x00000006u, 0x000001fdu, 0x000001fbu, 0x000001fcu, 0x0008000cu, 0x00000006u, 0x000001feu, 0x00000001u, + 0x0000002bu, 0x000001fdu, 0x0000002cu, 0x00000063u, 0x00050085u, 0x00000006u, 0x000001ffu, 0x000001fau, + 0x000001feu, 0x0003003eu, 0x000001f7u, 0x000001ffu, 0x0004003du, 0x00000006u, 0x00000201u, 0x00000186u, + 0x0004003du, 0x00000006u, 0x00000202u, 0x000001b1u, 0x00050083u, 0x00000006u, 0x00000203u, 0x00000201u, + 0x00000202u, 0x0006000cu, 0x00000006u, 0x00000204u, 0x00000001u, 0x00000004u, 0x00000203u, 0x0004003du, + 0x00000006u, 0x00000205u, 0x00000195u, 0x0004003du, 0x00000006u, 0x00000206u, 0x000001a3u, 0x00050083u, + 0x00000006u, 0x00000207u, 0x00000205u, 0x00000206u, 0x0006000cu, 0x00000006u, 0x00000208u, 0x00000001u, + 0x00000004u, 0x00000207u, 0x0007000cu, 0x00000006u, 0x00000209u, 0x00000001u, 0x00000028u, 0x00000204u, + 0x00000208u, 0x0003003eu, 0x00000200u, 0x00000209u, 0x0004003du, 0x00000006u, 0x0000020cu, 0x000000ddu, + 0x0004003du, 0x00000006u, 0x0000020du, 0x000000ddu, 0x00050085u, 0x00000006u, 0x0000020fu, 0x0000020du, + 0x0000020eu, 0x0004003du, 0x00000006u, 0x00000210u, 0x00000200u, 0x0008000cu, 0x00000006u, 0x00000211u, + 0x00000001u, 0x00000031u, 0x0000020cu, 0x0000020fu, 0x00000210u, 0x00050085u, 0x00000006u, 0x00000212u, + 0x0000020bu, 0x00000211u, 0x00050083u, 0x00000006u, 0x00000213u, 0x00000063u, 0x00000212u, 0x0003003eu, + 0x0000020au, 0x00000213u, 0x0004003du, 0x00000006u, 0x00000215u, 0x000001f7u, 0x0004003du, 0x00000006u, + 0x00000216u, 0x000001c7u, 0x00050085u, 0x00000006u, 0x00000217u, 0x00000215u, 0x00000216u, 0x0004003du, + 0x00000006u, 0x00000218u, 0x0000017fu, 0x00050085u, 0x00000006u, 0x00000219u, 0x00000217u, 0x00000218u, + 0x0004003du, 0x00000006u, 0x0000021au, 0x0000020au, 0x00050085u, 0x00000006u, 0x0000021bu, 0x00000219u, + 0x0000021au, 0x0003003eu, 0x00000214u, 0x0000021bu, 0x0004003du, 0x00000006u, 0x0000021du, 0x00000186u, + 0x0004003du, 0x00000006u, 0x0000021eu, 0x000001b1u, 0x00050083u, 0x00000006u, 0x0000021fu, 0x0000021du, + 0x0000021eu, 0x0006000cu, 0x00000006u, 0x00000220u, 0x00000001u, 0x00000004u, 0x0000021fu, 0x0004003du, + 0x00000006u, 0x00000221u, 0x00000195u, 0x0004003du, 0x00000006u, 0x00000222u, 0x000001a3u, 0x00050083u, + 0x00000006u, 0x00000223u, 0x00000221u, 0x00000222u, 0x0006000cu, 0x00000006u, 0x00000224u, 0x00000001u, + 0x00000004u, 0x00000223u, 0x00050083u, 0x00000006u, 0x00000225u, 0x00000220u, 0x00000224u, 0x0006000cu, + 0x00000006u, 0x00000226u, 0x00000001u, 0x00000004u, 0x00000225u, 0x0003003eu, 0x0000021cu, 0x00000226u, + 0x0004003du, 0x00000006u, 0x00000228u, 0x000000ddu, 0x0004003du, 0x00000006u, 0x00000229u, 0x000000ddu, + 0x00050085u, 0x00000006u, 0x0000022au, 0x00000229u, 0x00000182u, 0x0004003du, 0x00000006u, 0x0000022bu, + 0x0000021cu, 0x0008000cu, 0x00000006u, 0x0000022cu, 0x00000001u, 0x00000031u, 0x00000228u, 0x0000022au, + 0x0000022bu, 0x0003003eu, 0x00000227u, 0x0000022cu, 0x0004003du, 0x00000006u, 0x0000022fu, 0x00000227u, + 0x00050085u, 0x00000006u, 0x00000230u, 0x0000022eu, 0x0000022fu, 0x0004003du, 0x00000006u, 0x00000231u, + 0x0000017fu, 0x00050085u, 0x00000006u, 0x00000232u, 0x00000230u, 0x00000231u, 0x0004003du, 0x00000006u, + 0x00000233u, 0x0000020au, 0x00050085u, 0x00000006u, 0x00000234u, 0x00000232u, 0x00000233u, 0x0003003eu, + 0x0000022du, 0x00000234u, 0x0004003du, 0x00000006u, 0x00000236u, 0x00000214u, 0x000500bcu, 0x000000f1u, + 0x00000238u, 0x00000236u, 0x00000237u, 0x0004003du, 0x00000006u, 0x00000239u, 0x0000022du, 0x0004003du, + 0x00000006u, 0x0000023au, 0x00000214u, 0x000600a9u, 0x00000006u, 0x0000023bu, 0x00000238u, 0x00000239u, + 0x0000023au, 0x0008000cu, 0x00000006u, 0x0000023du, 0x00000001u, 0x0000002bu, 0x0000023bu, 0x0000002cu, + 0x0000023cu, 0x0003003eu, 0x00000235u, 0x0000023du, 0x0004003du, 0x00000023u, 0x0000023fu, 0x00000025u, + 0x0004003du, 0x0000000du, 0x00000240u, 0x00000070u, 0x0004003du, 0x0000000du, 0x00000241u, 0x0000010bu, + 0x0004003du, 0x0000000du, 0x00000242u, 0x00000062u, 0x00050085u, 0x0000000du, 0x00000243u, 0x00000241u, + 0x00000242u, 0x00050081u, 0x0000000du, 0x00000244u, 0x00000240u, 0x00000243u, 0x00050057u, 0x0000002fu, + 0x00000245u, 0x0000023fu, 0x00000244u, 0x0008004fu, 0x00000007u, 0x00000246u, 0x00000245u, 0x00000245u, + 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x0000023eu, 0x00000246u, 0x0004003du, 0x0000002fu, + 0x00000247u, 0x0000007cu, 0x0008004fu, 0x00000007u, 0x00000248u, 0x00000247u, 0x00000247u, 0x00000000u, + 0x00000001u, 0x00000002u, 0x0004003du, 0x00000007u, 0x00000249u, 0x0000023eu, 0x0004003du, 0x00000006u, + 0x0000024au, 0x00000235u, 0x00060050u, 0x00000007u, 0x0000024bu, 0x0000024au, 0x0000024au, 0x0000024au, + 0x0008000cu, 0x00000007u, 0x0000024cu, 0x00000001u, 0x0000002eu, 0x00000248u, 0x00000249u, 0x0000024bu, + 0x00050041u, 0x00000020u, 0x0000024eu, 0x0000007cu, 0x0000024du, 0x0004003du, 0x00000006u, 0x0000024fu, + 0x0000024eu, 0x00050051u, 0x00000006u, 0x00000250u, 0x0000024cu, 0x00000000u, 0x00050051u, 0x00000006u, + 0x00000251u, 0x0000024cu, 0x00000001u, 0x00050051u, 0x00000006u, 0x00000252u, 0x0000024cu, 0x00000002u, + 0x00070050u, 0x0000002fu, 0x00000253u, 0x00000250u, 0x00000251u, 0x00000252u, 0x0000024fu, 0x0003003eu, + 0x000000f6u, 0x00000253u, 0x000100fdu, 0x00010038u, 0x00050036u, 0x00000006u, 0x0000000bu, 0x00000000u, + 0x00000009u, 0x00030037u, 0x00000008u, 0x0000000au, 0x000200f8u, 0x0000000cu, 0x0004003du, 0x00000007u, + 0x00000018u, 0x0000000au, 0x00050094u, 0x00000006u, 0x0000001du, 0x00000018u, 0x0000001cu, 0x000200feu, + 0x0000001du, 0x00010038u, 0x00050036u, 0x00000006u, 0x00000012u, 0x00000000u, 0x0000000fu, 0x00030037u, + 0x0000000eu, 0x00000010u, 0x00030037u, 0x0000000eu, 0x00000011u, 0x000200f8u, 0x00000013u, 0x0004003bu, + 0x00000020u, 0x00000021u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000031u, 0x00000007u, 0x0004003bu, + 0x00000020u, 0x00000034u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x0000003cu, 0x00000007u, 0x0004003du, + 0x00000023u, 0x00000026u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000027u, 0x00000010u, 0x00050041u, + 0x00000020u, 0x0000002au, 0x00000011u, 0x00000029u, 0x0004003du, 0x00000006u, 0x0000002bu, 0x0000002au, + 0x00050050u, 0x0000000du, 0x0000002du, 0x0000002bu, 0x0000002cu, 0x00050083u, 0x0000000du, 0x0000002eu, + 0x00000027u, 0x0000002du, 0x00050057u, 0x0000002fu, 0x00000030u, 0x00000026u, 0x0000002eu, 0x0008004fu, + 0x00000007u, 0x00000032u, 0x00000030u, 0x00000030u, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, + 0x00000031u, 0x00000032u, 0x00050039u, 0x00000006u, 0x00000033u, 0x0000000bu, 0x00000031u, 0x0003003eu, + 0x00000021u, 0x00000033u, 0x0004003du, 0x00000023u, 0x00000035u, 0x00000025u, 0x0004003du, 0x0000000du, + 0x00000036u, 0x00000010u, 0x00050041u, 0x00000020u, 0x00000037u, 0x00000011u, 0x00000029u, 0x0004003du, + 0x00000006u, 0x00000038u, 0x00000037u, 0x00050050u, 0x0000000du, 0x00000039u, 0x00000038u, 0x0000002cu, + 0x00050081u, 0x0000000du, 0x0000003au, 0x00000036u, 0x00000039u, 0x00050057u, 0x0000002fu, 0x0000003bu, + 0x00000035u, 0x0000003au, 0x0008004fu, 0x00000007u, 0x0000003du, 0x0000003bu, 0x0000003bu, 0x00000000u, + 0x00000001u, 0x00000002u, 0x0003003eu, 0x0000003cu, 0x0000003du, 0x00050039u, 0x00000006u, 0x0000003eu, + 0x0000000bu, 0x0000003cu, 0x0003003eu, 0x00000034u, 0x0000003eu, 0x0004003du, 0x00000006u, 0x0000003fu, + 0x00000021u, 0x0004003du, 0x00000006u, 0x00000040u, 0x00000034u, 0x00050083u, 0x00000006u, 0x00000041u, + 0x0000003fu, 0x00000040u, 0x0006000cu, 0x00000006u, 0x00000042u, 0x00000001u, 0x00000004u, 0x00000041u, + 0x000200feu, 0x00000042u, 0x00010038u, 0x00050036u, 0x00000006u, 0x00000016u, 0x00000000u, 0x0000000fu, + 0x00030037u, 0x0000000eu, 0x00000014u, 0x00030037u, 0x0000000eu, 0x00000015u, 0x000200f8u, 0x00000017u, + 0x0004003bu, 0x00000020u, 0x00000045u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x0000004eu, 0x00000007u, + 0x0004003bu, 0x00000020u, 0x00000051u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000059u, 0x00000007u, + 0x0004003du, 0x00000023u, 0x00000046u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000047u, 0x00000014u, + 0x00050041u, 0x00000020u, 0x00000049u, 0x00000015u, 0x00000048u, 0x0004003du, 0x00000006u, 0x0000004au, + 0x00000049u, 0x00050050u, 0x0000000du, 0x0000004bu, 0x0000002cu, 0x0000004au, 0x00050083u, 0x0000000du, + 0x0000004cu, 0x00000047u, 0x0000004bu, 0x00050057u, 0x0000002fu, 0x0000004du, 0x00000046u, 0x0000004cu, + 0x0008004fu, 0x00000007u, 0x0000004fu, 0x0000004du, 0x0000004du, 0x00000000u, 0x00000001u, 0x00000002u, + 0x0003003eu, 0x0000004eu, 0x0000004fu, 0x00050039u, 0x00000006u, 0x00000050u, 0x0000000bu, 0x0000004eu, + 0x0003003eu, 0x00000045u, 0x00000050u, 0x0004003du, 0x00000023u, 0x00000052u, 0x00000025u, 0x0004003du, + 0x0000000du, 0x00000053u, 0x00000014u, 0x00050041u, 0x00000020u, 0x00000054u, 0x00000015u, 0x00000048u, + 0x0004003du, 0x00000006u, 0x00000055u, 0x00000054u, 0x00050050u, 0x0000000du, 0x00000056u, 0x0000002cu, + 0x00000055u, 0x00050081u, 0x0000000du, 0x00000057u, 0x00000053u, 0x00000056u, 0x00050057u, 0x0000002fu, + 0x00000058u, 0x00000052u, 0x00000057u, 0x0008004fu, 0x00000007u, 0x0000005au, 0x00000058u, 0x00000058u, + 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x00000059u, 0x0000005au, 0x00050039u, 0x00000006u, + 0x0000005bu, 0x0000000bu, 0x00000059u, 0x0003003eu, 0x00000051u, 0x0000005bu, 0x0004003du, 0x00000006u, + 0x0000005cu, 0x00000045u, 0x0004003du, 0x00000006u, 0x0000005du, 0x00000051u, 0x00050083u, 0x00000006u, + 0x0000005eu, 0x0000005cu, 0x0000005du, 0x0006000cu, 0x00000006u, 0x0000005fu, 0x00000001u, 0x00000004u, + 0x0000005eu, 0x000200feu, 0x0000005fu, 0x00010038u, +}; diff --git a/app/src/main/cpp/waylandcomp/src/effects_chain.c b/app/src/main/cpp/waylandcomp/src/effects_chain.c index b73c92f711..141a536229 100644 --- a/app/src/main/cpp/waylandcomp/src/effects_chain.c +++ b/app/src/main/cpp/waylandcomp/src/effects_chain.c @@ -17,6 +17,7 @@ #include "cas_frag.h" #include "color_frag.h" #include "fxaa_frag.h" +#include "smaa_frag.h" #include "toon_frag.h" #include "hdr_frag.h" #include "ntsc_frag.h" @@ -41,7 +42,7 @@ struct fx_settings { int color_on; float brightness, contrast, gamma, saturation; float b_raw, c_raw, s_raw; - int fxaa, toon, crt, ntsc; + int aa_mode, toon, crt, ntsc; char look[48]; }; @@ -78,7 +79,7 @@ void vkp_effects_set_deband(int enabled, int pct) { } static float clampf(float v, float lo, float hi) { return v < lo ? lo : v > hi ? hi : v; } void vkp_effects_set_screen(float brightness, float contrast, float gamma, float saturation, - int fxaa, int toon, int crt, int ntsc) { + int aa_mode, int toon, int crt, int ntsc) { int on = !(brightness == 0.0f && contrast == 0.0f && gamma == 1.0f && saturation == 100.0f); set_begin(); g_set.color_on = on; @@ -87,7 +88,8 @@ void vkp_effects_set_screen(float brightness, float contrast, float gamma, float g_set.contrast = clampf(contrast / 100.0f, 0.0f, 2.0f); g_set.saturation = clampf(saturation / 100.0f, 0.0f, 2.0f); g_set.gamma = clampf(gamma, 0.1f, 5.0f); - g_set.fxaa = fxaa ? 1 : 0; g_set.toon = toon ? 1 : 0; g_set.crt = crt ? 1 : 0; g_set.ntsc = ntsc ? 1 : 0; + g_set.aa_mode = (aa_mode >= 0 && aa_mode <= 2) ? aa_mode : 0; + g_set.toon = toon ? 1 : 0; g_set.crt = crt ? 1 : 0; g_set.ntsc = ntsc ? 1 : 0; set_end(); } void vkp_effects_set_look(const char *name) { @@ -103,7 +105,7 @@ static const char *scaling_name(int m) { static int spatial_mode(int m) { return m >= 3 && m <= 8; } static int cas_active(const struct fx_settings *s) { return s->cas_on && s->cas_pct > 0; } static int effect_count(const struct fx_settings *s) { - return s->fxaa + s->toon + s->color_on + cas_active(s) + s->hdr_on + s->ntsc + s->crt + s->deband_on; + return (s->aa_mode != 0) + s->toon + s->color_on + cas_active(s) + s->hdr_on + s->ntsc + s->crt + s->deband_on; } static void log_settings(const struct fx_settings *s) { @@ -121,7 +123,8 @@ static void log_settings(const struct fx_settings *s) { if (s->color_on) n += snprintf(line + n, sizeof(line) - n, ", colour b=%+.0f c=%+.0f g=%.2f s=%.0f%%", s->b_raw, s->c_raw, s->gamma, s->s_raw); - if (s->fxaa) n += snprintf(line + n, sizeof(line) - n, ", FXAA on"); + if (s->aa_mode == 1) n += snprintf(line + n, sizeof(line) - n, ", FXAA on"); + else if (s->aa_mode == 2) n += snprintf(line + n, sizeof(line) - n, ", SMAA on"); if (s->toon) n += snprintf(line + n, sizeof(line) - n, ", Toon on"); if (s->hdr_on) n += snprintf(line + n, sizeof(line) - n, ", HDR on"); if (s->ntsc) n += snprintf(line + n, sizeof(line) - n, ", NTSC on"); @@ -202,7 +205,7 @@ static VkDescriptorSetLayout g_dsl; static VkPipelineLayout g_pl; static VkDescriptorPool g_dpool; static VkSampler g_sampler; -enum { P_SGSR, P_SGSR_HQ, P_NIS, P_EASU, P_RCAS, P_CAS, P_COLOR, P_FXAA, P_TOON, P_HDR, P_NTSC, P_CRT, P_DEBAND, P_COUNT }; +enum { P_SGSR, P_SGSR_HQ, P_NIS, P_EASU, P_RCAS, P_CAS, P_COLOR, P_FXAA, P_SMAA, P_TOON, P_HDR, P_NTSC, P_CRT, P_DEBAND, P_COUNT }; static VkPipeline g_pipe[P_COUNT]; static struct fx_target g_t[2], g_mid; @@ -438,6 +441,7 @@ static int objects_ensure(void) { MK(P_CAS, cas_code, "cas"); MK(P_COLOR, color_code, "color"); MK(P_FXAA, fxaa_code, "fxaa"); + MK(P_SMAA, smaa_code, "smaa"); MK(P_TOON, toon_code, "toon"); MK(P_HDR, hdr_code, "hdr"); MK(P_NTSC, ntsc_code, "ntsc"); @@ -446,7 +450,7 @@ static int objects_ensure(void) { #undef MK g_vk.DestroyShaderModule(g_dev, vert, NULL); g_ready = 1; - droiddeck_log("effects", "chain ready: 13 passes (SGSR, SGSR HQ, NIS, FSR EASU+RCAS, CAS, colour, FXAA, Toon, HDR, NTSC, CRT, deband) on %s", vkp_gpu_name()); + droiddeck_log("effects", "chain ready: 14 pipelines (SGSR, SGSR HQ, NIS, FSR EASU+RCAS, CAS, colour, FXAA, SMAA, Toon, HDR, NTSC, CRT, deband) on %s", vkp_gpu_name()); return 0; fail: objects_destroy(); @@ -567,9 +571,10 @@ VkImage vkp_effects_run(VkCommandBuffer cmd, VkImage scene, int scene_w, int sce cur = NULL; cur_ds = g_scene.ds; } - enum { FX_FXAA, FX_TOON, FX_COLOR, FX_CAS, FX_HDR, FX_NTSC, FX_CRT, FX_DEBAND }; + enum { FX_FXAA, FX_SMAA, FX_TOON, FX_COLOR, FX_CAS, FX_HDR, FX_NTSC, FX_CRT, FX_DEBAND }; int order[8], n = 0; - if (s->fxaa) order[n++] = FX_FXAA; + if (s->aa_mode == 1) order[n++] = FX_FXAA; + else if (s->aa_mode == 2) order[n++] = FX_SMAA; if (s->toon) order[n++] = FX_TOON; if (s->color_on) order[n++] = FX_COLOR; if (cas_active(s)) order[n++] = FX_CAS; @@ -584,6 +589,7 @@ VkImage vkp_effects_run(VkCommandBuffer cmd, VkImage scene, int scene_w, int sce pr.res[0] = (float)cw; pr.res[1] = (float)ch; switch (order[i]) { case FX_FXAA: pass(cmd, g_pipe[P_FXAA], dst, cur_ds, &pr, sizeof(pr)); break; + case FX_SMAA: pass(cmd, g_pipe[P_SMAA], dst, cur_ds, &pr, sizeof(pr)); break; case FX_TOON: pass(cmd, g_pipe[P_TOON], dst, cur_ds, &pr, sizeof(pr)); break; case FX_COLOR: { struct pc_color pc = {0}; diff --git a/app/src/main/cpp/waylandcomp/src/effects_chain.h b/app/src/main/cpp/waylandcomp/src/effects_chain.h index 9e9ad6859b..25f00225fc 100644 --- a/app/src/main/cpp/waylandcomp/src/effects_chain.h +++ b/app/src/main/cpp/waylandcomp/src/effects_chain.h @@ -30,7 +30,7 @@ void vkp_effects_set_cas(int enabled, int pct); void vkp_effects_set_hdr(int enabled); void vkp_effects_set_deband(int enabled, int pct); void vkp_effects_set_screen(float brightness, float contrast, float gamma, float saturation, - int fxaa, int toon, int crt, int ntsc); + int aa_mode, int toon, int crt, int ntsc); void vkp_effects_set_look(const char *name); #endif diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c index 9844aca302..8c595d1711 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -13,6 +13,7 @@ #include "quest_device.h" #include #include +#include #include #include #include @@ -416,7 +417,13 @@ static void update_map(int scene_w, int scene_h) { if (mode == VKP_MODE_FILL) aspect = sx > sy ? sx : sy; else if (mode == VKP_MODE_INTEGER) { float m = sx < sy ? sx : sy; - aspect = m >= 1.0f ? (float)(int)m : m; + float nearest = roundf(m); + if (nearest >= 1.0f && nearest > m && + nearest - m < 0.15f) { + aspect = nearest; + } else { + aspect = m >= 1.0f ? (float)(int)m : m; + } } else aspect = sx < sy ? sx : sy; g_map.kx = g_map.ky = aspect; g_map.off_x = (float)(g_map.rx + (int)((g_map.rw - scene_w * aspect) * 0.5f)); diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index 2a6b8e2908..7879d51521 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -497,8 +497,8 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetDeband(JNIEnv *en JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetScreenEffects(JNIEnv *env, jclass clazz, jfloat brightness, - jfloat contrast, jfloat gamma, jfloat saturation, jboolean fxaa, jboolean toon, jboolean crt, jboolean ntsc) { - vkp_effects_set_screen(brightness, contrast, gamma, saturation, fxaa ? 1 : 0, toon ? 1 : 0, crt ? 1 : 0, ntsc ? 1 : 0); + jfloat contrast, jfloat gamma, jfloat saturation, jint aa_mode, jboolean toon, jboolean crt, jboolean ntsc) { + vkp_effects_set_screen(brightness, contrast, gamma, saturation, aa_mode, toon ? 1 : 0, crt ? 1 : 0, ntsc ? 1 : 0); } JNIEXPORT void JNICALL diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 3cedb3f171..d13dd65403 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -43,8 +43,10 @@ class App : Application() { if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic" || process == "$packageName:shortcuts_sync" || process == "$packageName:bottom_desktop") return CrashHandler.install(this) + com.droiddeck.launcher.input.ShortcutsRelay.Holder.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) com.droiddeck.launcher.agent.AgentTab.load(this) + com.droiddeck.launcher.ui.DeveloperTools.load(this) com.droiddeck.launcher.ui.NavTabs.load(this) com.droiddeck.launcher.ui.AgentPet.install(this) if (com.droiddeck.launcher.agent.AgentTab.visible) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index bdb334a9e7..9b2db303c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -911,6 +911,16 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private fun readGameIntent(request: Intent) { request.getStringExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV)?.let { navRequest = it; request.removeExtra(com.droiddeck.launcher.stores.download.StoreDownloadService.EXTRA_NAV) } + request.data?.takeIf { it.scheme == "droiddeck" && it.host == "settings" }?.let { uri -> + val section = uri.pathSegments.firstOrNull() + navRequest = if (section in setOf("storage", "sync", "downloads")) section + else "settings:" + (com.droiddeck.launcher.ui.SettingsSection.of(section) ?: com.droiddeck.launcher.ui.SettingsSection.OVERVIEW).key + request.data = null + gameLinkReading = false + pendingGameLink = null + syncDualPanel() + return + } if (navRequest == com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_APPS) { homeAppSelected = HomeApp.isHomeScreenEnabled(this) && HomeApp.isDefault(this) if (!homeAppSelected) navRequest = null @@ -1493,6 +1503,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, onSaveExport = { sg, layout -> exportSaves(sg.name, layout) { GameSaves.game(sg) } }, onPerformance = { refreshCores(); showComponents = false; showMapping = false; showPerformance = true }, + performancePanel = { PerformanceHost(embedded = true) }, onRoms = { showRoms = true }, onFiles = { startActivity(Intent(this, com.droiddeck.launcher.files.FileManagerActivity::class.java)) }, onBrowseFiles = { dir -> @@ -2704,7 +2715,8 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet } @Composable - private fun PerformanceHost() { + private fun PerformanceHost(embedded: Boolean = false) { + if (embedded) androidx.compose.runtime.LaunchedEffect(Unit) { refreshCores() } PerformancePage( cores = CpuCores.all.map { c -> CoreRow(c, "cpu$c" + (CpuCores.maxGhz(c)?.let { String.format(java.util.Locale.US, " · %.1f GHz", it) } ?: "")) }, clientOverride = clientOverride, clientCores = clientCores, gameCores = gameCores, paceCores = paceCores, @@ -2750,6 +2762,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet SessionPrefs.setGameCpus(this, CpuCores.format(gameCores)) }, onDismiss = { showPerformance = false }, + embedded = embedded, ) } @@ -3300,6 +3313,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet if (!ok) android.widget.Toast.makeText(this, R.string.setup_reset_settings_partial, android.widget.Toast.LENGTH_LONG).show() com.droiddeck.launcher.ui.Motion.refresh(this) com.droiddeck.launcher.agent.AgentTab.load(this) + com.droiddeck.launcher.ui.DeveloperTools.load(this) com.droiddeck.launcher.ui.NavTabs.load(this) if (!switchLauncherIcon(LauncherIcon.DARK)) recreate() } diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index dd70bb2d09..6d734a91e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -191,6 +191,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var unfoldedPanel by mutableStateOf(null) private var unfoldedColumn: android.widget.LinearLayout? = null private var unfoldedDeckSurface: com.droiddeck.launcher.ui.InputSurfaceView? = null + private var swappedInputSurface: com.droiddeck.launcher.ui.InputSurfaceView? = null private var unfoldedDeckPanel by mutableStateOf(null) private var deckPanelLayouts: Map = emptyMap() private lateinit var sessionRoot: FrameLayout @@ -200,6 +201,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde @Volatile private var inputUsesLocalActions = false private var inputUsesPointer = false private var inputProfile = InputProfile.defaults(InputProfile.GAME) + private var stockInputProfile = InputProfile.defaults(InputProfile.GAME) private val inputMotion = InputMotion { inputRouter } private val heldKeys = HeldInput { code, down -> WaylandCompositor.nativeSendKey(code, if (down) 1 else 0) } private val heldButtons = HeldInput(::sendSceneButton) @@ -500,6 +502,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var drawerGameProfileId by mutableStateOf(null) private var drawerGameProfileSelectionMade = false private var fpsLimit by mutableStateOf(SessionState.fpsLimit) + private var cornerTap by mutableStateOf(false) + private fun fpsLimitKey(): String? = if (SessionState.running) SessionPrefs.fpsLimitKey(SessionState.mode, SessionState.gameId) + else SessionPrefs.fpsLimitKey(intent.getStringExtra(SessionService.EXTRA_MODE), intent.getStringExtra(SessionService.EXTRA_GAME_ID)) private var blackFrameInsertion by mutableStateOf(false) private fun noSteamSession(): Boolean = (SessionState.mode == SessionService.MODE_RUN && @@ -539,6 +544,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var lastMouseY = Float.NaN private var padType by mutableStateOf(SessionPrefs.CONTROLLER_DECK) private var pcKeyboardOpen by mutableStateOf(false) + private var fieldKeyboardOnPrimary = false + private var pendingFieldKeyboard = false + private var fieldKeyboardImeShown = false private var achievementsInFront by mutableStateOf(null) private var achievementsOpen by mutableStateOf(false) private var hudOn by mutableStateOf(true) @@ -656,11 +664,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde override fun onDisplayAdded(displayId: Int) { notifyActivityDisplayStateChanged(displayId) refreshSecondScreenDisplays() + updateBottomGame() } override fun onDisplayRemoved(displayId: Int) { if (refreshActivityDisplayId() && started) { SessionService.setActivityDisplay(this@SessionActivity, sessionActivityDisplayId) } + updateBottomGame() refreshSecondScreenDisplays() } override fun onDisplayChanged(displayId: Int) { @@ -788,9 +798,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde com.droiddeck.launcher.gpu.SteamVrHealth.begin(this, SessionState.sessionId) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) if (!SessionState.running) { - SessionState.fpsLimit = 0 - fpsLimit = 0 + SessionState.fpsLimit = SessionPrefs.savedFpsLimit(this, fpsLimitKey()) } + fpsLimit = SessionState.fpsLimit + cornerTap = SessionPrefs.drawerCornerTap(this) applyOutputPacing() if (!SessionState.running) { SessionState.followScreen = followChoice() @@ -872,10 +883,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde root.addView(controls) } keyboard = KeyboardHost(this).also { host -> - host.onImeChanged = { updateDesktopKeyboardButton() } + host.onImeChanged = ::onPrimaryImeChanged root.addView(host) } - desktopKeyboardButton = com.droiddeck.launcher.input.DesktopKeyboardButton(this) { keyboard?.show() } + desktopKeyboardButton = com.droiddeck.launcher.input.DesktopKeyboardButton(this) { showPrimaryKeyboard() } .also { root.addView(it) } touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener) directTouchHold = DirectTouchHold(PointerGestures.slop(this), pointerListener, directTouchSink) @@ -893,6 +904,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde drawnRect()?.let { forwardTouch(event, it) } } override fun rightClick(x: Float, y: Float) { + if (!screenTapsClick) return pointerListener.onLongPress() pointerListener.onButton(PointerGestures.BTN_RIGHT, true, x, y) surfaceView.postDelayed({ pointerListener.onButton(PointerGestures.BTN_RIGHT, false, x, y) }, 50L) @@ -1090,6 +1102,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (AgentGuest.keyboardDismissals != keyboardDismissalsSeen[0]) { keyboardDismissalsSeen[0] = AgentGuest.keyboardDismissals secondScreenPresentation?.closeFieldKeyboard() + dismissFieldKeyboard() } } androidx.compose.runtime.LaunchedEffect(picturePosition, integerScaling, SessionState.running, pipUi, cardboard.enabled) { applyGameAlignment() } @@ -1130,6 +1143,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde drawerPage = com.droiddeck.launcher.ui.SessionDrawerPage.GLASSES drawerOpen = true } + if (!drawerOpen && !pcKeyboardOpen && !loading.visible) { + com.droiddeck.launcher.ui.DrawerEntryHint(SessionState.mode == SessionService.MODE_STEAM, backActionsInverted) { drawerOpen = true } + if (cornerTap) com.droiddeck.launcher.ui.DrawerCornerTap { drawerOpen = true } + } if (loading.visible) LoadingOverlay( loading.step, loading.percent, loading.elapsed, loading.hint, loading.ended, topic = loading.topic, readable = loading.readable, @@ -1312,7 +1329,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } if (pcKeyboardOpen) com.droiddeck.launcher.ui.PcKeyboard( sendKey = { code, down -> if (CompositorHost.isStarted) sendGuestKey(code, down, 32) }, - onAndroidKeyboard = { pcKeyboardOpen = false; keyboard?.toggle() }, + onAndroidKeyboard = { pcKeyboardOpen = false; togglePrimaryKeyboard() }, onClose = { pcKeyboardOpen = false }, ) if (!drawerDocked) SessionMenu( @@ -1436,6 +1453,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde secondScreenNone = !bottomOutputActive && !dockDrawer(), gameOnBottom = bottomOutputActive, gameSwapAvailable = bottomSwapAvailable, + gameSwapBuiltIn = !::displayManager.isInitialized || displayManager.getDisplay(selectedSecondScreenDisplay) + ?.let(com.droiddeck.launcher.input.DualScreen::builtIn) ?: true, onGameOnBottom = { on -> drawerOpen = false; putGameOnBottom(on) }, dashboardAvailable = bottomPages().isNotEmpty(), desktopAvailable = com.droiddeck.launcher.session.BottomDesktop.available(), @@ -1447,6 +1466,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde onHudReset = { hudConfig = DroidDeckHudConfig.reset(this@SessionActivity); hud.applyConfig() }, onHudOrderReset = { hudConfig = DroidDeckHudConfig.clearOrder(this@SessionActivity); hud.applyConfig() }, onHudExport = { exportHudDiagnostics() }, + integerScaling = integerScaling, + onIntegerScaling = { enabled -> + SessionPrefs.setIntegerScaling(this@SessionActivity, enabled) + integerScaling = enabled + applyGameAlignment() + }, onUpscaler = { m -> val target = effectsEditorTarget ?: screenEffectsTarget val activeProfileId = @@ -1592,8 +1617,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde onFpsLimit = { fps -> SessionState.fpsLimit = fps fpsLimit = fps + SessionPrefs.saveFpsLimit(this@SessionActivity, fpsLimitKey(), fps) applyOutputPacing() }, + cornerTap = cornerTap, + onCornerTap = { on -> SessionPrefs.setDrawerCornerTap(this@SessionActivity, on); cornerTap = on }, blackFrameInsertion = blackFrameInsertion, blackFrameInsertionAvailable = blackFrameInsertion || blackFrameInsertionAvailable(), onBlackFrameInsertion = { on -> @@ -1623,7 +1651,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde pickLossless.launch(InAppFilePicker.buildIntent( this@SessionActivity, listOf("dll"), getString(R.string.lsfg_pick_title))) }, - onKeyboard = { drawerOpen = false; pcKeyboardOpen = false; keyboard?.toggle() }, + onKeyboard = { drawerOpen = false; pcKeyboardOpen = false; togglePrimaryKeyboard() }, onHardwareKeyboard = ::togglePcKeyboard, wowChatShown = com.droiddeck.launcher.ui.WowChat.isWow(AgentGuest.gameProgram), wowChat = wowChat.remembered, @@ -1854,7 +1882,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val all = com.droiddeck.launcher.input.VrControllers.Emulate.entries com.droiddeck.launcher.input.VrControllers.setEmulate(this, all[(pads.emulate.ordinal + 1) % all.size]) }) else null, - onKeyboard = { keyboard?.toggle() }, + onKeyboard = { togglePrimaryKeyboard() }, onSessionMenu = { drawerOpen = true }, onStopSteamVr = if (vr) ({ steamVrAction("stop") }) else null, brightness = glasses.brightness, @@ -1895,12 +1923,44 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun togglePcKeyboard() { drawerOpen = false - keyboard?.hide() + hidePrimaryKeyboard() onScreenControls?.releaseAll() bottomInputControls?.releaseAll() pcKeyboardOpen = !pcKeyboardOpen } + private fun showPrimaryKeyboard() { + pendingFieldKeyboard = false + fieldKeyboardOnPrimary = false + keyboard?.show() + } + + private fun togglePrimaryKeyboard() { + pendingFieldKeyboard = false + fieldKeyboardOnPrimary = false + keyboard?.toggle() + } + + private fun hidePrimaryKeyboard() { + pendingFieldKeyboard = false + fieldKeyboardOnPrimary = false + keyboard?.hide() + } + + private fun onPrimaryImeChanged(visible: Boolean) { + if (visible) fieldKeyboardImeShown = true + else if (fieldKeyboardImeShown) { + fieldKeyboardImeShown = false + fieldKeyboardOnPrimary = false + } + updateDesktopKeyboardButton() + } + + private fun dismissFieldKeyboard() { + pendingFieldKeyboard = false + if (fieldKeyboardOnPrimary) hidePrimaryKeyboard() + } + private fun updateControllerPrefs(change: () -> Unit) { change() controllerSettings = ControllerPrefs.read(this) @@ -2878,7 +2938,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val display = if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay val wanted = window.attributes.preferredDisplayModeId val requested = display?.supportedModes?.firstOrNull { wanted != 0 && it.modeId == wanted }?.refreshRate - val running = display?.refreshRate?.takeIf { it > 1f } + // Display.refreshRate reports a per-app frame rate override (Game Mode FPS) instead of the panel's mode. + val running = display?.mode?.refreshRate?.takeIf { it > 1f } val hz = listOfNotNull(requested, running).minOrNull() ?: 60f val mirrorCap = mirrorRefreshLimit().takeIf { it > 0 }?.toFloat() ?: Float.POSITIVE_INFINITY val capped = minOf(hz, PerfMode.peakRefreshCap(this), mirrorCap) @@ -3132,6 +3193,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun onSessionEnded(status: Int) { ended = true + uiHandler.removeCallbacks(guardWhenRunning) + com.droiddeck.launcher.session.KeepTopActivity.release() ++steamVrRequestGeneration if (isInPictureInPictureMode) { runOnUiThread { finish() } @@ -3650,7 +3713,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return false return try { val presentation = secondScreenPresentation ?: secondScreenPresentation(target).also { - selectedSecondScreenDisplay = target.displayId secondScreenPresentation = it } if (!presentation.isShowing) presentation.show() @@ -4009,16 +4071,23 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val candidates = SecondScreenDisplays.available(displayManager, primaryId) .filter { glassesScreen == null || it.id != glasses.displayId } val oldIds = secondScreenDisplays.map { it.id }.toSet() + val oldSelectedDisplay = selectedSecondScreenDisplay secondScreenDisplays = candidates reconcileDock(primaryId) - bottomSwapAvailable = bottomGame != null || bottomGameDisplay() != null val newIds = candidates.map { it.id }.toSet() if (secondScreenMode != SecondScreenMode.NONE && oldIds.isNotEmpty() && selectedSecondScreenDisplay !in newIds) { + bottomSwapAvailable = bottomGame != null closeSecondScreen(reset = true) SessionState.secondScreenAutoOpened = false return } - if (selectedSecondScreenDisplay !in newIds) selectedSecondScreenDisplay = candidates.firstOrNull()?.id ?: -1 + selectedSecondScreenDisplay = SecondScreenDisplays.selection(selectedSecondScreenDisplay, candidates.map { it.id }, gameOnBottom) { + SessionState.secondScreenDisplay = it + } + if (selectedSecondScreenDisplay != oldSelectedDisplay) { + updateBottomGame() + } + bottomSwapAvailable = bottomGame != null || bottomGameDisplay() != null if (secondScreenMode != SecondScreenMode.NONE && candidates.isEmpty()) { closeSecondScreen(reset = true) SessionState.secondScreenAutoOpened = false @@ -4040,12 +4109,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun openDualScreenControls() { if (SessionState.secondScreenAutoOpened || secondScreenMode != SecondScreenMode.NONE || pipUi) return + if (gameOnBottom && selectedSecondScreenDisplay >= 0 && secondScreenDisplays.none { it.id == selectedSecondScreenDisplay }) return if (!SessionPrefs.dualScreenSessionControls(this)) return val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return if (secondScreenDisplays.none { it.id == target.displayId }) return + val gameDisplay = bottomGame?.display?.displayId + ?: if (SessionState.gameOnBottom) bottomGameDisplay()?.displayId else null SessionState.secondScreenAutoOpened = true - selectedSecondScreenDisplay = target.displayId - selectSecondScreenMode(openingPanel()) + if (gameDisplay != null && gameDisplay != target.displayId && secondScreenDisplays.any { it.id == gameDisplay }) { + panelMode(openingPanel()) + } else { + val selectionChanged = selectedSecondScreenDisplay != target.displayId + selectedSecondScreenDisplay = target.displayId + SessionState.secondScreenDisplay = target.displayId + if (selectionChanged) updateBottomGame() + selectSecondScreenMode(openingPanel()) + } automaticPanel = secondScreenMode != SecondScreenMode.NONE dualControlsProvisional = ::loading.isInitialized && loading.visible } @@ -4071,6 +4150,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (secondScreenDisplays.none { it.id == displayId }) return selectedSecondScreenDisplay = displayId SessionState.secondScreenDisplay = displayId + updateBottomGame() if (secondScreenMode != SecondScreenMode.NONE) showSecondScreen(secondScreenMode) } @@ -4089,6 +4169,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde return } if (selectedSecondScreenDisplay !in secondScreenDisplays.map { it.id }) { + if (gameOnBottom && selectedSecondScreenDisplay >= 0) { + panelMode(mode) + return + } selectedSecondScreenDisplay = secondScreenDisplays.first().id } showSecondScreen(mode) @@ -4167,7 +4251,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde ) } }, - onSwap = if (bottomSwapAvailable && com.droiddeck.launcher.input.DualScreen.builtIn(target)) ({ putGameOnBottom(true) }) else null, + onSwap = if (bottomSwapAvailable) ({ putGameOnBottom(true) }) else null, onDeckPanel = ::selectDeckPanel, dashboard = if (bottomPages().isEmpty()) null else ({ DroidDeckTheme { @@ -4271,6 +4355,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val library = com.droiddeck.launcher.input.InputLibraries.read(this) val desktop = loadingMode() == SessionService.MODE_DESKTOP inputProfile = library.compileActive(desktop, secondScreenMode.panel(this)) + stockInputProfile = library.compileStock(desktop, secondScreenMode.panel(this)) primaryInputLayout = library.activeLayout(desktop, InputRole.PRIMARY) adaptiveSticks = primaryInputLayout?.adaptiveSticks quickButtons = primaryInputLayout?.takeIf { it.editable }?.let { l -> l.quickButtons.associateWith { it !in l.style.hidden } }.orEmpty() @@ -4410,6 +4495,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (!started) return null if (secondScreenPresentation?.showsKeyboard != true && dockDrawer()) { val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return null + if (gameOnBottom && selectedSecondScreenDisplay != target.displayId) return null if (drawerOpen || drawerPinned) drawerOpen = false typingReturnMode = secondScreenMode selectedSecondScreenDisplay = target.displayId @@ -4419,16 +4505,37 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun openBottomKeyboard() { - val presentation = bottomKeyboardPresentation() ?: return + val presentation = bottomKeyboardPresentation() + if (presentation == null) { + if (keyboardBelongsOnPrimary()) { + pendingFieldKeyboard = true + retryFieldKeyboard(hasWindowFocus()) + } + return + } + pendingFieldKeyboard = false + if (fieldKeyboardOnPrimary) hidePrimaryKeyboard() presentation.requestKeyboard(forField = true) com.droiddeck.launcher.ui.SessionTyping.focusDisplay(this, presentation.display.displayId) } + private fun keyboardBelongsOnPrimary() = SecondScreenDisplays.keyboardOnPrimary(gameOnBottom, selectedSecondScreenDisplay, + secondScreenDisplays.map { it.id }, taken = com.droiddeck.launcher.input.DualScreen::taken) + + private fun retryFieldKeyboard(hasFocus: Boolean) { + if (!pendingFieldKeyboard || !hasFocus || !resumed || pipUi) return + pendingFieldKeyboard = false + if (!keyboardBelongsOnPrimary()) return + fieldKeyboardOnPrimary = true + fieldKeyboardImeShown = keyboard?.hideMeansDismissal == true + keyboard?.show() + } + private fun onGameTextField(focused: Boolean) { if (!focused || !com.droiddeck.launcher.ui.WowChat.isWow(AgentGuest.gameProgram)) wowChat.chatClosed() else if (resumed && !pipUi && !pcKeyboardOpen && resources.configuration.hardKeyboardHidden != android.content.res.Configuration.HARDKEYBOARDHIDDEN_NO) { - keyboard?.takeIf { it.shown }?.hide() + hidePrimaryKeyboard() wowChat.chatOpened() } } @@ -4515,9 +4622,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun updateKeyboardRoute() { - AgentGuest.routeKeyboard(this, SessionState.mode == SessionService.MODE_STEAM && - (secondScreenPresentation?.showsKeyboard == true || dockDrawer()) && - SessionPrefs.androidTextFieldKeyboard(this)) + AgentGuest.routeKeyboard(this, SecondScreenDisplays.routeKeyboard( + SessionState.mode == SessionService.MODE_STEAM, + SessionPrefs.androidTextFieldKeyboard(this), + secondScreenPresentation?.showsKeyboard == true, + dockDrawer(), + SecondScreenDisplays.keyboardOnPrimary(gameOnBottom, selectedSecondScreenDisplay, + secondScreenDisplays.map { it.id }, resumed && !pipUi, com.droiddeck.launcher.input.DualScreen::taken))) } private fun dropDockedDrawer() { @@ -4728,6 +4839,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var lockedSwipeY = 0f private var dismissTouch = false private var sessionTouchDown = false + private var screenTapsClick = true + + private fun onScreenMouseButtonShown(): Boolean = listOfNotNull( + onScreenControls?.inputSurface, bottomInputControls?.inputSurface, unfoldedPanel?.inputSurface, unfoldedDeckSurface, + secondScreenPresentation?.controlsView, swappedInputSurface, + ).any { it.isShown && inputProfile.showsMouseButton(it.inputRole, it.shownElements, stockInputProfile) } override fun onTouchEvent(event: MotionEvent): Boolean { val pen = PenStream.penIndex(event) @@ -4760,6 +4877,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } val snapshot = fingerTouchSnapshot(uiBlocking) val route = com.droiddeck.launcher.input.TouchRouter.decide(snapshot) + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + screenTapsClick = !onScreenMouseButtonShown() + if (::touchpad.isInitialized) touchpad.clicks = screenTapsClick + if (::scrollTouch.isInitialized) scrollTouch.clicks = screenTapsClick + } if (route != touchRoute) { Log.i(TAG, "touch route $touchRoute -> $route (mode=$routedTouchMode steamUi=${SessionState.steamUi} scrollLayer=$scrollTouchGesture)") touchRoute = route @@ -4909,6 +5031,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) ignoreGameTouch = false return true } + // With an on-screen mouse button the press comes from the button, so the pointer has to be there before + // the two-finger gesture buffer holds the touch-down. + if (SessionState.mode == SessionService.MODE_DESKTOP && !screenTapsClick && !pointerLocked && + event.actionMasked == MotionEvent.ACTION_DOWN) movePointer(event.x, event.y) if (SessionState.mode == SessionService.MODE_DESKTOP && twoFingerGestures.onTouch(event)) return true return forwardTouch(event, rect) } @@ -4943,7 +5069,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } } } - directTouchHold.onTouch(event) + if (screenTapsClick) directTouchHold.onTouch(event) + else if (!pointerLocked && (event.actionMasked == MotionEvent.ACTION_DOWN || event.actionMasked == MotionEvent.ACTION_MOVE)) + movePointer(event.x, event.y) return true } @@ -5399,6 +5527,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun showPipUi(show: Boolean) { pipUi = show + updateKeyboardRoute() + if (!show) retryFieldKeyboard(hasWindowFocus()) if (show) { if (::hud.isInitialized) hud.setHidden(true) drawerOpen = false @@ -5418,7 +5548,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde guestKeysDown.toList().forEach { sendGuestKey(it, false) } heldKeys.clear() heldButtons.clear() - keyboard?.hide() + hidePrimaryKeyboard() sessionClipboard.stop() padMotion?.stop() cursorVisible = false @@ -5459,7 +5589,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) { - if (::pip.isInitialized && (requestCode >= 0 || intent.component?.packageName == packageName || + if (::pip.isInitialized && intent.component?.className != com.droiddeck.launcher.session.KeepTopActivity::class.java.name && + (requestCode >= 0 || intent.component?.packageName == packageName || intent.action in setOf(Intent.ACTION_CHOOSER, Intent.ACTION_SEND, Intent.ACTION_OPEN_DOCUMENT, Intent.ACTION_GET_CONTENT, "android.settings.PICTURE_IN_PICTURE_SETTINGS"))) pip.background() super.startActivityForResult(intent, requestCode, options) @@ -5491,6 +5622,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } override fun onStop() { + if (lightPause.stopped()) departureCleanup() if (runtimeRemovalBlocked) { super.onStop(); return } started = false if (::hud.isInitialized) hud.setBackgrounded(true) @@ -5534,6 +5666,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde override fun onResume() { super.onResume() + uiHandler.removeCallbacks(lightPauseCheck) + when (lightPause.resumed(com.droiddeck.launcher.session.KeepTopActivity.bounces)) { + com.droiddeck.launcher.session.LightPause.Resume.LIGHT -> return + com.droiddeck.launcher.session.LightPause.Resume.CLEANUP_FIRST -> departureCleanup() + com.droiddeck.launcher.session.LightPause.Resume.NORMAL -> Unit + } drawerGameInventoryRevision++ 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) } @@ -5561,6 +5699,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde onScreenControls?.reload() controllerSettings = ControllerPrefs.read(this) resumed = true + updateKeyboardRoute() + retryFieldKeyboard(hasWindowFocus()) updateDesktopKeyboardButton() com.droiddeck.launcher.input.HomeButtonShortcuts.attach(this, enabled = { @@ -5597,10 +5737,63 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde SessionPrefs.sessionPrefs(this).registerOnSharedPreferenceChangeListener(cardboardPrefListener) } + private var memoryPressureAt = 0L + private var focusBounce = false + private val lightPause = com.droiddeck.launcher.session.LightPause() + private val lightPauseCheck = Runnable { if (lightPause.timedOut()) departureCleanup() } + private var topResumed = false + private val guardWhenRunning = object : Runnable { + override fun run() { + if (!topResumed || isFinishing) return + if (SessionState.running) guardOtherDisplays() else uiHandler.postDelayed(this, 2_000) + } + } + + // RUNNING_LOW and RUNNING_CRITICAL are not delivered from API 34, so the guard also goes up + // as soon as a running session is on top. + override fun onTrimMemory(level: Int) { + super.onTrimMemory(level) + if (!com.droiddeck.launcher.session.TopUnderPressure.isPressure(level)) return + memoryPressureAt = android.os.SystemClock.elapsedRealtime() + guardOtherDisplays() + } + + override fun onTopResumedActivityChanged(isTopResumedActivity: Boolean) { + super.onTopResumedActivityChanged(isTopResumedActivity) + topResumed = isTopResumedActivity + uiHandler.removeCallbacks(guardWhenRunning) + if (isTopResumedActivity) uiHandler.post(guardWhenRunning) + else if (com.droiddeck.launcher.session.TopUnderPressure.shouldReclaim( + android.os.SystemClock.elapsedRealtime(), memoryPressureAt, SessionState.running, isFinishing)) guardOtherDisplays() + } + + private fun guardOtherDisplays() { + if (!SessionState.running || isFinishing) return + val wasResumed = lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED) + val bounced = com.droiddeck.launcher.session.KeepTopActivity.guardOtherDisplays(this, display?.displayId ?: android.view.Display.DEFAULT_DISPLAY) + if (com.droiddeck.launcher.session.KeepTopActivity.hasPendingStarts()) { + uiHandler.removeCallbacks(guardWhenRunning) + uiHandler.postDelayed(guardWhenRunning, com.droiddeck.launcher.session.KeepTopActivity.RETRY_MS) + } + if (!bounced) return + if (!wasResumed) return + focusBounce = true + uiHandler.postDelayed({ focusBounce = false }, 500) + } + override fun onPause() { + if (focusBounce) { + focusBounce = false + lightPause.paused(com.droiddeck.launcher.session.KeepTopActivity.bounces) + uiHandler.postDelayed(lightPauseCheck, 200) + } else departureCleanup() + super.onPause() + } + + private fun departureCleanup() { com.droiddeck.launcher.input.SystemKeyCapture.detach(this) com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) - if (runtimeRemovalBlocked) { super.onPause(); return } + if (runtimeRemovalBlocked) return physicalShortcuts.clear() backQamInput.cancel() mouseBackInput.cancel() @@ -5634,14 +5827,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (::scrollTouch.isInitialized) scrollTouch.cancel() if (::padMouse.isInitialized) padMouse.reset() resumed = false + updateKeyboardRoute() updatePointerCapture() updatePadMotion() - keyboard?.takeIf { it.shown }?.hide() + val pendingKeyboard = pendingFieldKeyboard + hidePrimaryKeyboard() + pendingFieldKeyboard = pendingKeyboard SessionPrefs.sessionPrefs(this).unregisterOnSharedPreferenceChangeListener(cardboardPrefListener) SessionPrefs.sessionPrefs(this).unregisterOnSharedPreferenceChangeListener(screenEffectsProfilePrefListener) ControllerPrefs.prefs(this).unregisterOnSharedPreferenceChangeListener(shortcutPrefListener) updateHeadTracker() - super.onPause() } private fun steamVrAction(action: String) { @@ -5882,9 +6077,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } 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) } + if (!::displayManager.isInitialized || SessionPrefs.dualScreenSessionMode(this) == com.droiddeck.launcher.input.DualScreen.MODE_OFF) return null + return com.droiddeck.launcher.input.DualScreen.selectedSessionDisplay( + this, displayManager, shownOnDisplayId, selectedSecondScreenDisplay, + ) } private fun putGameOnBottom(on: Boolean) { @@ -6010,7 +6206,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde tabs = tabs, ) val keyboardExtra = com.droiddeck.launcher.ui.BarExtra(getString(R.string.second_show_keyboard), icon = R.drawable.ic_bottom_keyboard) { - keyboard?.toggle() + togglePrimaryKeyboard() } val profileLayout = secondaryInputLayout androidx.compose.foundation.layout.Box( @@ -6038,8 +6234,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde androidx.compose.runtime.key(profileLayout) { androidx.compose.ui.viewinterop.AndroidView( factory = { context -> com.droiddeck.launcher.ui.InputSurfaceView(context, padBridge, profileLayout?.elements.orEmpty(), - surfaceStyle = profileLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()) }, + surfaceStyle = profileLayout?.style ?: com.droiddeck.launcher.input.InputSurfaceStyle()).also { swappedInputSurface = it } }, modifier = Modifier.fillMaxWidth().weight(1f), + onRelease = { if (swappedInputSurface === it) swappedInputSurface = null }, ) } } @@ -6206,6 +6403,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde releaseHeldGuestInput() } if (hasFocus && !pipUi) { + retryFieldKeyboard(true) goFullscreen() refreshClipboard() } @@ -6250,6 +6448,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } override fun onDestroy() { + uiHandler.removeCallbacks(guardWhenRunning) + com.droiddeck.launcher.session.KeepTopActivity.release() synchronized(frameGenGlobalLock) { frameGenActivityActive = false frameGenRequests.incrementAndGet() diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt index 149adf6456..669a1c5503 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -19,6 +19,17 @@ interface AgentHarness { val signedIn: List /** A guest command that signs in through $BROWSER. */ val signIn: List + /** + * Where the user makes an API key, for a CLI whose own sign-in is a terminal prompt: [signIn] + * then only opens this page, and the key is pasted into DroidDeck and saved by [saveKey]. + */ + val keyPage: String? get() = null + /** Whether a key from [keyPage] is saved under [rootfs]. */ + fun hasKey(rootfs: File): Boolean = false + fun saveKey(rootfs: File, key: String) {} + /** Whether the CLI has models that need no account; [useFree] then counts as signed in. */ + val free: Boolean get() = false + fun useFree(rootfs: File) {} /** Whether [Options.plan] means anything to this CLI. */ val plans: Boolean /** Reasoning effort levels the CLI accepts, lowest first; empty when it has none. */ @@ -49,7 +60,7 @@ interface AgentHarness { data class Options(val model: String? = null, val plan: Boolean = false, val brief: String? = null, val effort: String? = null) companion object { - val all: List = listOf(ClaudeCode, Codex) + val all: List = listOf(ClaudeCode, Codex, OpenCode) fun byId(id: String?): AgentHarness = all.firstOrNull { it.id == id } ?: ClaudeCode } } @@ -392,6 +403,184 @@ object Codex : AgentHarness { } } +/** OpenCode: `opencode run --format json`, resumed by session id. */ +object OpenCode : AgentHarness { + override val id = "opencode" + override val name = "OpenCode" + override val binary = "/root/.opencode/bin/opencode" + override val skills = "root/.config/opencode/skills" + override val instructions = "root/.config/opencode/AGENTS.md" + override val install = "curl -fsSL https://opencode.ai/install | bash -s -- --no-modify-path" + private const val AUTH = "root/.local/share/opencode/auth.json" + private const val FREE = "root/.config/opencode/.droiddeck-free" + private const val MODELS = "root/.cache/droiddeck/opencode-models" + + // `opencode models` lists only what the saved keys reach, so the check that runs it keeps the model list current. + override val signedIn = listOf("sh", "-c", + "mkdir -p /${MODELS.substringBeforeLast('/')}; $binary models --verbose > /$MODELS.$$ 2>/dev/null && mv -f /$MODELS.$$ /$MODELS; rm -f /$MODELS.$$; " + + "grep -q '\"type\"' /$AUTH 2>/dev/null || [ -e /$FREE ]") + override val keyPage = "https://opencode.ai/auth" + override val signIn = listOf("/root/.local/bin/android-open", keyPage) + override val free = true + override val plans = true + override val efforts = listOf("low", "medium", "high") + + override fun hasKey(rootfs: File) = runCatching { JSONObject(File(rootfs, AUTH).readText()).has("opencode") }.getOrDefault(false) + + /** The key opencode's own `auth login` would save for OpenCode Zen. */ + override fun saveKey(rootfs: File, key: String) { + val file = File(rootfs, AUTH) + // An auth.json that cannot be read holds other providers' sign-ins too, so it is never replaced. + val auth = if (file.exists()) JSONObject(file.readText()) else JSONObject() + auth.put("opencode", JSONObject().put("type", "api").put("key", key.trim())) + file.parentFile?.mkdirs() + file.writeText(auth.toString(2) + "\n") + file.setReadable(false, false) + file.setReadable(true, true) + } + + override fun useFree(rootfs: File) { + File(rootfs, FREE).apply { parentFile?.mkdirs() }.writeText("Free OpenCode Zen models, chosen in DroidDeck's agent setup.\n") + } + + private class Listed(val modified: Long, val models: List, val windows: Map) + @Volatile private var listed: Listed? = null + + private fun listed(rootfs: File): Listed? { + val file = File(rootfs, MODELS) + val modified = file.lastModified().takeIf { it > 0 } ?: return null + listed?.takeIf { it.modified == modified }?.let { return it } + return runCatching { listModels(file.readText()) }.getOrNull()?.let { (models, windows) -> Listed(modified, models, windows) }?.also { listed = it } + } + + override fun models(rootfs: File) = listed(rootfs)?.models.orEmpty() + + /** `opencode models --verbose` prints each model's id on a line of its own, then its details as JSON. */ + @VisibleForTesting + internal fun listModels(output: String): Pair, Map> { + val models = mutableListOf() + val windows = mutableMapOf() + var id: String? = null + val json = StringBuilder() + for (line in output.lineSequence()) { + val current = id + if (current == null) { + if (MODEL_ID.matches(line)) id = line.trim() + continue + } + json.appendLine(line) + if (line != "}") continue + runCatching { JSONObject(json.toString()) }.getOrNull()?.takeIf { it.optString("status") != "deprecated" }?.let { o -> + val provider = o.optString("providerID") + val label = o.optString("name").ifEmpty { current } + models += AgentHarness.Model(current, if (provider.isEmpty() || provider == "opencode") label else "$label · $provider") + o.optJSONObject("limit")?.optLong("context")?.takeIf { it > 0 }?.let { windows[current] = it } + } + id = null + json.clear() + } + return models to windows + } + + private val MODEL_ID = Regex("""^[\w.-]+/\S+$""") + + private class Spent(var cost: Double = 0.0, var input: Long = 0, var output: Long = 0) + private val spent = Spent() + @Volatile private var model: String? = null + + override fun turn(message: String, conversation: String?, options: AgentHarness.Options): List { + synchronized(spent) { spent.cost = 0.0; spent.input = 0; spent.output = 0 } + model = options.model + // DroidDeck runs the agent unattended; --auto approves all the agent does not deny itself, and plan mode denies edits. + return buildList { + addAll(listOf(binary, "run", "--format", "json", "--auto", "--thinking")) + if (conversation != null) addAll(listOf("-s", conversation)) + if (options.plan) addAll(listOf("--agent", "plan")) + options.model?.let { addAll(listOf("-m", it)) } + options.effort?.let { addAll(listOf("--variant", it)) } + add("--") + // opencode run has no system prompt option, so a new conversation starts with the brief. + add(if (conversation == null && options.brief != null) "${options.brief}\n\n$message" else message) + } + } + + override fun usage(rootfs: File, conversation: String?): AgentEvent? { + val id = model ?: return null + return listed(rootfs)?.windows?.get(id)?.let { AgentEvent(window = it) } + } + + override fun parse(line: String): AgentEvent? { + val o = runCatching { JSONObject(line) }.getOrNull() ?: return null + val conversation = o.optString("sessionID").takeIf { it.isNotEmpty() } + val part = o.optJSONObject("part") + return when (o.optString("type")) { + "text" -> AgentEvent(conversation, text(part) { AgentHost.Entry.Said(it) }) + "reasoning" -> AgentEvent(conversation, text(part) { AgentHost.Entry.Thought(it) }) + "tool_use" -> AgentEvent(conversation, part?.let { tool(it) }.orEmpty()) + "step_finish" -> { + val tokens = part?.optJSONObject("tokens") + val cache = tokens?.optJSONObject("cache") + val total = synchronized(spent) { + spent.cost += part?.optDouble("cost", 0.0) ?: 0.0 + spent.input += (tokens?.optLong("input") ?: 0) + (cache?.optLong("read") ?: 0) + (cache?.optLong("write") ?: 0) + spent.output += (tokens?.optLong("output") ?: 0) + (tokens?.optLong("reasoning") ?: 0) + AgentHost.Usage(0, spent.cost, spent.input, spent.output) + } + val context = tokens?.optLong("total")?.takeIf { it > 0 } + // A step that ends to run tools is followed by another; any other reason ends the turn. + if (part?.optString("reason") == "tool-calls") AgentEvent(conversation, context = context) + else AgentEvent(conversation, listOf(AgentHost.Entry.Finished(null)), context = context, usage = total) + } + "error" -> { + val error = o.optJSONObject("error") + val message = error?.optJSONObject("data")?.optString("message")?.takeIf { it.isNotEmpty() } + ?: error?.optString("message")?.takeIf { it.isNotEmpty() } ?: error?.optString("name")?.takeIf { it.isNotEmpty() } ?: "error" + AgentEvent(conversation, listOf(AgentHost.Entry.Finished(message))) + } + else -> conversation?.let { AgentEvent(it) } + } + } + + private fun text(part: JSONObject?, entry: (String) -> AgentHost.Entry) = + part?.optString("text")?.trim()?.takeIf { it.isNotEmpty() }?.let { listOf(entry(it)) }.orEmpty() + + private fun tool(part: JSONObject): List { + val id = part.optString("callID").ifEmpty { part.optString("id") } + val state = part.optJSONObject("state") ?: JSONObject() + val input = state.optJSONObject("input") ?: JSONObject() + val path = input.optString("filePath") + val (name, detail, full) = when (val tool = part.optString("tool")) { + "bash" -> Triple("Bash", firstLine(input.optString("command")), input.optString("command")) + "edit" -> Triple("Edit", path, path + "\n" + lineDiff(input.optString("oldString"), input.optString("newString"))) + "write" -> Triple("Write", path, path + "\n" + lineDiff("", input.optString("content"))) + "todowrite" -> Triple("TodoWrite", "", todos(input.optJSONArray("todos"))) + else -> Triple(tool.replaceFirstChar { it.uppercase() }.ifEmpty { "Tool" }, detail(input), input.toString(2)) + } + val used = AgentHost.Entry.Used(id, name, detail, full) + return when (state.optString("status")) { + "completed" -> { + val exit = state.optJSONObject("metadata")?.opt("exit") + listOf(used, AgentHost.Entry.Result(id, state.optString("output"), exit is Number && exit.toInt() != 0)) + } + "error" -> listOf(used, AgentHost.Entry.Result(id, state.optString("error"), true)) + else -> listOf(used) + } + } + + private fun detail(input: JSONObject): String { + for (key in listOf("filePath", "path", "pattern", "url", "query", "description", "prompt", "command")) { + input.optString(key).takeIf { it.isNotEmpty() }?.let { return firstLine(it) } + } + return "" + } + + private fun todos(list: JSONArray?) = (0 until (list?.length() ?: 0)).mapNotNull { i -> + val todo = list?.optJSONObject(i) ?: return@mapNotNull null + val mark = when (todo.optString("status")) { "completed" -> "[x]"; "in_progress" -> "[~]"; else -> "[ ]" } + "$mark ${todo.optString("content")}" + }.joinToString("\n") +} + @VisibleForTesting internal fun firstLine(text: String) = text.lineSequence().first().take(160) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index d8d57abd24..a4107fa287 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -27,6 +27,28 @@ object AgentSetup { val detail = mutableStateMapOf() var runtimeInstalled by mutableStateOf(true) private set + /** The harness has a key from its [AgentHarness.keyPage] saved; signed in without one means its free models. */ + var keySaved by mutableStateOf(false) + private set + + /** Saves a pasted key for a harness that signs in with one, then checks the sign-in again. */ + fun saveKey(context: Context, key: String) = signInLocally(context) { harness, root -> harness.saveKey(root, key) } + + fun useFree(context: Context) = signInLocally(context) { harness, root -> harness.useFree(root) } + + private fun signInLocally(context: Context, write: (AgentHarness, File) -> Unit) { + val app = context.applicationContext + val harness = AgentHost.harness + set(Step.SIGN_IN, Status.WORKING) + Thread({ + val result = runCatching { write(harness, LinuxRuntime.rootDir(app)) } + main.post { + status[Step.SIGN_IN] = Status.UNKNOWN + result.exceptionOrNull()?.let { detail[Step.SIGN_IN] = it.message ?: "failed" } + check(app) + } + }, "agent-sign-in").start() + } val ready: Boolean get() = Step.entries.filter { it.required }.all { status[it] == Status.DONE } @@ -53,6 +75,7 @@ object AgentSetup { if (!runtimeInstalled) return AgentHost.refresh(app) val harness = AgentHost.harness + keySaved = harness.hasKey(LinuxRuntime.rootDir(app)) val probes = mutableListOf>>() for (step in Step.entries) if (status[step] != Status.WORKING) { when (step) { diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentStorage.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentStorage.kt index 9eacc4a6b6..f55a69a22a 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentStorage.kt @@ -16,13 +16,14 @@ import java.nio.file.attribute.BasicFileAttributes /** * What the agent adds to the Linux userland, measured and removable piece by piece. Sign-ins - * (~/.claude, ~/.codex, gh's config) are left alone, so removing a CLI and installing it again - * does not sign out. + * (~/.claude, ~/.codex, ~/.local/share/opencode, gh's config) are left alone, so removing a CLI + * and installing it again does not sign out. */ object AgentStorage { enum class Item(val paths: List) { CLAUDE_CODE(listOf("/root/.local/share/claude", "/root/.local/bin/claude", "/root/cc")), CODEX(listOf("/root/.local/bin/codex", "/root/.local/bin/codex-code-mode-host")), + OPENCODE(listOf("/root/.opencode")), BUILD_TOOLS(listOf("/root/android-sdk", "/root/aapt2", "/root/x86root", "/root/.gradle")), SOURCE(listOf("/root/DroidDeck")), CACHES(listOf("/root/.cache", "/root/.npm")), diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt index 7392473c72..b779288f3e 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.setValue import com.droiddeck.launcher.session.SessionPrefs object AgentTab { - var shown by mutableStateOf(true) + var shown by mutableStateOf(false) private set val visible: Boolean get() = shown && AgentHost.available diff --git a/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt b/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt index 89ec374d6d..650a6b8d4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/SessionLogCapture.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.core +import android.content.Context import android.os.Process import android.util.Log import java.io.BufferedWriter @@ -113,7 +114,17 @@ object SessionLogCapture { } } - fun dumpMemoryPressure(target: File) { + internal const val LMKD_COMMAND = "logcat -d -b main,events -v threadtime -s lowmemorykiller:D killinfo:I" + + " | grep -v -E 'pgskip|zoneinfo_parse|polling check|thrashing:' | tail -n 120" + + private fun lowMemoryKiller(context: Context?): String = when { + context == null -> "(not captured)\n" + !WirelessAdbFix.hasSavedPairing(context) -> "(not captured: pair DroidDeck with Wireless debugging in Settings > Diagnostics)\n" + else -> runCatching { WirelessAdbFix.shell(context, LMKD_COMMAND) } + .fold({ it.ifBlank { "(no lmkd lines in the log)\n" } }, { "(not captured: ${it.message})\n" }) + } + + fun dumpMemoryPressure(target: File, context: Context? = null) { var temporary: File? = null try { val staged = File.createTempFile(target.name, ".part", target.parentFile).also { temporary = it } @@ -150,7 +161,8 @@ object SessionLogCapture { body.isNotEmpty() -> body else -> "(no readable events were returned)\n" } + - "\n/proc/pressure/memory:\n$pressure\n/proc/meminfo:\n$meminfo\n/sys/class/kgsl/kgsl/page_alloc:\n$gpu" + "\n/proc/pressure/memory:\n$pressure\n/proc/meminfo:\n$meminfo\n/sys/class/kgsl/kgsl/page_alloc:\n$gpu" + + "\nAndroid's low memory killer (lmkd), read over Wireless debugging:\n${lowMemoryKiller(context)}" ) Files.move( staged.toPath(), target.toPath(), diff --git a/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt b/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt index 84f87cca13..cd10300f4f 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt @@ -37,7 +37,7 @@ object SteamIntegration { locationOn = WifiDiscovery.locationEnabled(context), brightness = Settings.System.canWrite(context), home = HomeApp.isDefault(context), - shortcuts = shortcutsEnabled(context), + shortcuts = shortcutsEnabled(context) && shortcutsCurrent(context), shortcutsRestricted = restrictedSettings(context), suggested = !SessionPrefs.sessionPrefs(context).getBoolean("steam_integration_seen", false), ) @@ -61,6 +61,10 @@ object SteamIntegration { return enabled.split(':').any { ComponentName.unflattenFromString(it.trim()) == shortcutsComponent } } + @Suppress("DEPRECATION") + fun shortcutsCurrent(context: Context): Boolean = + runCatching { context.packageManager.getPackageInfo(Relay.PACKAGE, 0).versionCode }.getOrDefault(0) >= Relay.VERSION + fun shortcutsListed(context: Context): Boolean = context.getSystemService(android.view.accessibility.AccessibilityManager::class.java) ?.installedAccessibilityServiceList.orEmpty() 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 eefe397723..e3c2d9a749 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -335,7 +335,10 @@ object AddedGames { val path = canonical(exe) val owner = ownerFolder(app, exe) if (owner != null && owner.path !in SessionPrefs.removedAddedGames(app)) { - single(app, owner.path)?.takeIf { canonical(it.exe) == path }?.let { return AddResult.Existing(it) } + single(app, owner.path)?.takeIf { canonical(it.exe) == path }?.let { + if (guestPath(app, exe) != null) AddedExes.put(app, AddedExes.Entry(owner.path, exe.path)) + return AddResult.Existing(it) + } } if (guestPath(app, exe) == null) { (owner ?: exe.parentFile)?.takeIf { guestPath(app, it) == null }?.let { bindFolder(app, it) } @@ -344,7 +347,7 @@ object AddedGames { val folder = owner ?: exe.parentFile ?: return AddResult.NotFound SessionPrefs.setAddedGameRemoved(app, folder.path, false) SessionPrefs.setAddedGameExe(app, folder.path, exe.path) - if (owner == null) AddedExes.put(app, AddedExes.Entry(folder.path, exe.path)) + AddedExes.put(app, AddedExes.Entry(folder.path, exe.path)) val game = single(app, folder.path) ?: return AddResult.NotFound AddedGamesPublisher.later(app) { com.droiddeck.launcher.stores.SteamLiveShortcuts.sync(app, listOf(game)) { true } } Log.i(TAG, "added ${game.name} from its exe") diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/ScreenEffects.kt b/app/src/main/java/com/droiddeck/launcher/gpu/ScreenEffects.kt index a7c7175c72..84b29bd5d9 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/ScreenEffects.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/ScreenEffects.kt @@ -16,30 +16,36 @@ data class ScreenEffects( val hdr: Boolean = false, val deband: Boolean = false, val debandStrength: Int = 100, - val fxaa: Boolean = false, + val aaMode: Int = AA_OFF, val toon: Boolean = false, val crt: Boolean = false, val ntsc: Boolean = false, ) { + val fxaa: Boolean get() = aaMode == AA_FXAA + val smaa: Boolean get() = aaMode == AA_SMAA val effectiveCas: Int get() = if (cas) casLevel else 0 val any: Boolean get() = brightness != 0 || contrast != 0 || abs(gamma - 1f) > 0.005f || saturation != 100 || - effectiveCas > 0 || hdr || deband || fxaa || toon || crt || ntsc + effectiveCas > 0 || hdr || deband || aaMode != AA_OFF || toon || crt || ntsc fun push(upscaler: Int) { WaylandCompositor.nativeSetCas(cas, casLevel) WaylandCompositor.nativeSetHdr(hdr) WaylandCompositor.nativeSetDeband(deband, debandStrength) - WaylandCompositor.nativeSetScreenEffects(brightness.toFloat(), contrast.toFloat(), gamma, saturation.toFloat(), fxaa, toon, crt, ntsc) + WaylandCompositor.nativeSetScreenEffects(brightness.toFloat(), contrast.toFloat(), gamma, saturation.toFloat(), aaMode, toon, crt, ntsc) WaylandCompositor.nativeSetLookName(ScreenEffectLooks.match(this, upscaler)?.name) } fun encode(): JSONObject = JSONObject() .put("brightness", brightness).put("contrast", contrast).put("gamma", gamma.toDouble()).put("saturation", saturation) .put("cas", cas).put("casLevel", casLevel).put("hdr", hdr).put("deband", deband).put("debandStrength", debandStrength) - .put("fxaa", fxaa).put("toon", toon).put("crt", crt).put("ntsc", ntsc) + .put("aaMode", aaMode).put("fxaa", fxaa).put("toon", toon).put("crt", crt).put("ntsc", ntsc) companion object { + const val AA_OFF = 0 + const val AA_FXAA = 1 + const val AA_SMAA = 2 + val OFF = ScreenEffects() fun decode(json: JSONObject): ScreenEffects = ScreenEffects( @@ -52,7 +58,7 @@ data class ScreenEffects( hdr = json.optBoolean("hdr", false), deband = json.optBoolean("deband", false), debandStrength = json.optInt("debandStrength", 100).coerceIn(0, 200), - fxaa = json.optBoolean("fxaa", false), + aaMode = json.optInt("aaMode", if (json.optBoolean("fxaa", false)) AA_FXAA else AA_OFF).coerceIn(AA_OFF, AA_SMAA), toon = json.optBoolean("toon", false), crt = json.optBoolean("crt", false), ntsc = json.optBoolean("ntsc", false), @@ -79,13 +85,13 @@ object ScreenEffectLooks { desc = "Sharpening with a touch of contrast - the everyday one.", label = R.string.look_game_clarity, descRes = R.string.look_game_clarity_desc), Look("Vivid", ScreenEffects(brightness = 3, contrast = 10, gamma = 0.98f, saturation = 145, cas = true, casLevel = 30, deband = true), desc = "Colour pushed hard. Deband on so skies don't stripe.", label = R.string.look_vivid, descRes = R.string.look_vivid_desc), - Look("Cinematic", ScreenEffects(brightness = -4, contrast = 22, gamma = 1.10f, saturation = 88, cas = true, casLevel = 20, fxaa = true, deband = true), + Look("Cinematic", ScreenEffects(brightness = -4, contrast = 22, gamma = 1.10f, saturation = 88, cas = true, casLevel = 20, aaMode = ScreenEffects.AA_FXAA, deband = true), desc = "Deeper contrast, cooler colour, edges smoothed.", label = R.string.look_cinematic, descRes = R.string.look_cinematic_desc), Look("Competitive", ScreenEffects(brightness = 16, contrast = 18, gamma = 0.92f, saturation = 82, cas = true, casLevel = 75), desc = "Shadows lifted and heavy sharpening - spot people first.", label = R.string.look_competitive, descRes = R.string.look_competitive_desc), Look("Adaptive Sharpen", ScreenEffects(cas = true, casLevel = 85), desc = "Sharpening only, colour untouched.", label = R.string.look_adaptive_sharpen, descRes = R.string.look_adaptive_sharpen_desc), - Look("Filmic", ScreenEffects(brightness = -2, contrast = 16, gamma = 1.14f, saturation = 92, cas = true, casLevel = 15, fxaa = true, deband = true), + Look("Filmic", ScreenEffects(brightness = -2, contrast = 16, gamma = 1.14f, saturation = 92, cas = true, casLevel = 15, aaMode = ScreenEffects.AA_FXAA, deband = true), desc = "Film-like curve, slightly muted.", label = R.string.look_filmic, descRes = R.string.look_filmic_desc), Look("Arcade", ScreenEffects(brightness = 6, contrast = 20, gamma = 0.95f, saturation = 170, cas = true, casLevel = 45, deband = true), desc = "Loud and punchy.", label = R.string.look_arcade, descRes = R.string.look_arcade_desc), @@ -103,7 +109,7 @@ object ScreenEffectLooks { val t = l.effects t.brightness == e.brightness && t.contrast == e.contrast && abs(t.gamma - e.gamma) < 0.005f && t.saturation == e.saturation && t.effectiveCas == e.effectiveCas && - t.fxaa == e.fxaa && t.crt == e.crt && t.toon == e.toon && t.ntsc == e.ntsc && t.deband == e.deband && + t.aaMode == e.aaMode && t.crt == e.crt && t.toon == e.toon && t.ntsc == e.ntsc && t.deband == e.deband && (l.scalingMode == null || l.scalingMode == upscaler) } } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt index 63afa4c167..719aae8d7f 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt @@ -5,7 +5,7 @@ import com.droiddeck.launcher.session.SessionPrefs internal object DroidDeckHudConfig { val DEFAULTS: Map = linkedMapOf( - "hudSize" to "minimal", "hudLocked" to "1", "hudSnap" to "1", "hudScale" to "100", "hudDock" to "none", "hudOpacity" to "80", "hudColor" to "mid", + "hudSize" to "minimal", "hudLocked" to "1", "hudHold" to "collapse", "hudSnap" to "1", "hudScale" to "100", "hudDock" to "none", "hudOpacity" to "80", "hudColor" to "mid", "hudOutline" to "40", "hudOutlineAccent" to "1", "showGpuModel" to "1", "showGPULoad" to "1", "showCPUUsage" to "1", "showCPULoad" to "1", "showPerCore" to "1", "showTemp" to "1", "showBatteryTemp" to "1", "showGpuTemp" to "0", @@ -18,6 +18,8 @@ internal object DroidDeckHudConfig { "tempUnit" to "c", "tempBands" to "1", "tempAuto" to "1", "tempRedCpu" to "90", "tempRedGpu" to "90", "tempRedBat" to "48", ) + const val HOLD_LOCKS = "lock" + private val NOT_READINGS = setOf("showCPULoad", "showRenderer", "fpsDecimal") /** Orders saved before the GPU switch was named after the alias the HUD actually reads. */ diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index e2ddefc692..59f8a5e6eb 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -119,6 +119,7 @@ class DroidDeckHudHost(context: Context) { } hud.setOnSizeCycledListener { size -> DroidDeckHudConfig.set(context, "hudSize", size); onConfigChanged?.invoke() } hud.setOnDockChangedListener { token -> setDock(hud, DroidDeckHudDock.from(token)) } + hud.setOnHoldListener { rawX, rawY -> collapseAt(hud, rawX, rawY) } hud.setOnScaledListener { percent -> DroidDeckHudConfig.set(context, "hudScale", percent.toString()) onConfigChanged?.invoke() @@ -291,7 +292,7 @@ class DroidDeckHudHost(context: Context) { DroidDeckHudDock.RIGHT -> (maxX - hud.x) / hud.width DroidDeckHudDock.TOP -> hud.y / hud.height DroidDeckHudDock.BOTTOM -> (maxY - hud.y) / hud.height - DroidDeckHudDock.NONE -> 0f + DroidDeckHudDock.NONE, DroidDeckHudDock.FLOAT -> 0f } if (pulled >= 1f) { setDock(hud, DroidDeckHudDock.NONE); return } wantX = hud.x; wantY = hud.y @@ -375,12 +376,30 @@ class DroidDeckHudHost(context: Context) { hud.scaleX = s; hud.scaleY = s } - private fun setDock(hud: DroidDeckHudView, edge: DroidDeckHudDock) { + private fun setDock(hud: DroidDeckHudView, edge: DroidDeckHudDock, center: Pair? = null) { if (edge == hud.dock) return - animateDock(hud, edge) { commitDock(hud, edge) } + animateDock(hud, edge, center) { commitDock(hud, edge) } } + private fun collapseAt(hud: DroidDeckHudView, rawX: Float, rawY: Float) { + if (hud.dock != DroidDeckHudDock.NONE) return + val p = hud.parent as? View ?: return + val at = IntArray(2).also { p.getLocationOnScreen(it) } + val x = rawX - at[0] + val y = rawY - at[1] + val edge = if (snaps) nearestEdge(x, y, p.width.toFloat(), p.height.toFloat()) else DroidDeckHudDock.FLOAT + setDock(hud, edge, Pair(x, y)) + } + + private fun nearestEdge(x: Float, y: Float, width: Float, height: Float): DroidDeckHudDock = mapOf( + DroidDeckHudDock.LEFT to x, + DroidDeckHudDock.RIGHT to width - x, + DroidDeckHudDock.TOP to y, + DroidDeckHudDock.BOTTOM to height - y, + ).minByOrNull { it.value }!!.key + private fun commitDock(hud: DroidDeckHudView, edge: DroidDeckHudDock) { + snapping = false val tabX = hud.x; val tabY = hud.y if (edge != DroidDeckHudDock.NONE) { val p = hud.parent as? View @@ -407,12 +426,17 @@ class DroidDeckHudHost(context: Context) { SessionPrefs.setDroidDeckHudPosition(context, wantX, wantY) } - private fun animateDock(hud: DroidDeckHudView, edge: DroidDeckHudDock, commit: () -> Unit) { + private fun animateDock(hud: DroidDeckHudView, edge: DroidDeckHudDock, center: Pair?, commit: () -> Unit) { stopMotion(hud) previewFade?.cancel(); previewFade = null snapping = false hud.alpha = 1f val p = hud.parent as? View + if (edge != DroidDeckHudDock.NONE && center != null) { + val (tabW, tabH) = hud.dockTabSize() + wantX = center.first - tabW / 2f + wantY = center.second - tabH / 2f + } if (Motion.scale == 0f || p == null || !hud.isLaidOut || hud.width <= 0) { hud.scaleX = 1f; hud.scaleY = 1f hud.setDockPreview(DroidDeckHudDock.NONE, 0f) @@ -424,11 +448,14 @@ class DroidDeckHudHost(context: Context) { 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 + if (center == null) { + 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 + snapping = true 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 { @@ -473,7 +500,7 @@ class DroidDeckHudHost(context: Context) { DroidDeckHudDock.RIGHT -> x = maxX DroidDeckHudDock.TOP -> y = 0f DroidDeckHudDock.BOTTOM -> y = maxY - DroidDeckHudDock.NONE -> {} + DroidDeckHudDock.NONE, DroidDeckHudDock.FLOAT -> {} } return Pair(x, y) } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt index e88997a09b..94bcb2920f 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt @@ -118,7 +118,7 @@ enum class DroidDeckHudSize(val token: String, val label: String) { } enum class DroidDeckHudDock(val token: String) { - NONE("none"), LEFT("left"), RIGHT("right"), TOP("top"), BOTTOM("bottom"); + NONE("none"), LEFT("left"), RIGHT("right"), TOP("top"), BOTTOM("bottom"), FLOAT("float"); companion object { fun from(token: String?): DroidDeckHudDock = values().firstOrNull { it.token == token } ?: NONE diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index f7211d69e2..bd04d149a2 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -191,6 +191,8 @@ class DroidDeckHudView(context: Context) : View(context) { private var onMovedListener: BiConsumer? = null private var onSizeCycledListener: Consumer? = null private var onLockChangedListener: Consumer? = null + private var onHoldListener: BiConsumer? = null + fun setOnHoldListener(l: BiConsumer?) { onHoldListener = l } fun setOnMovedListener(l: BiConsumer?) { onMovedListener = l } fun setOnSizeCycledListener(l: Consumer?) { onSizeCycledListener = l } fun setOnLockChangedListener(l: Consumer?) { onLockChangedListener = l } @@ -209,6 +211,7 @@ class DroidDeckHudView(context: Context) : View(context) { 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 onHold(rawX: Float, rawY: Float) { onHoldListener?.accept(rawX, rawY) } override fun onPinch(factor: Float) { val next = (scale * factor).coerceIn(MIN_SCALE, MAX_SCALE) if (next == scale) return @@ -224,6 +227,7 @@ class DroidDeckHudView(context: Context) : View(context) { private var tabStartX = 0f private var tabStartY = 0f private var tabDragging = false + private var tabPressed = false private var onTabDraggedListener: BiConsumer? = null private var onTabDroppedListener: Runnable? = null private var onTabDragCancelledListener: Runnable? = null @@ -237,19 +241,24 @@ class DroidDeckHudView(context: Context) : View(context) { tabDownRawX = event.rawX; tabDownRawY = event.rawY tabStartX = x; tabStartY = y tabDragging = false + tabPressed = true } - MotionEvent.ACTION_MOVE -> { + MotionEvent.ACTION_MOVE -> if (tabPressed) { 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 -> { + MotionEvent.ACTION_UP -> if (tabPressed) { + tabPressed = false if (tabDragging) { tabDragging = false; onTabDroppedListener?.run() } else onDockChangedListener?.accept(DroidDeckHudDock.NONE.token) } - MotionEvent.ACTION_CANCEL -> if (tabDragging) { - tabDragging = false - onTabDragCancelledListener?.run() + MotionEvent.ACTION_CANCEL -> { + tabPressed = false + if (tabDragging) { + tabDragging = false + onTabDragCancelledListener?.run() + } } } return true @@ -341,6 +350,7 @@ class DroidDeckHudView(context: Context) : View(context) { showSession = switchOn("showSession") tempDisplay = HudMetrics.TempDisplay.from(cfg) lockController.setLocked(cfg.get("hudLocked", "1") == "1") + lockController.setHoldLocks(cfg.get("hudHold", "collapse") == DroidDeckHudConfig.HOLD_LOCKS) dock = DroidDeckHudDock.from(cfg.get("hudDock", "none")) colorIntensity = when (cfg.get("hudColor", "vivid")) { @@ -591,7 +601,7 @@ class DroidDeckHudView(context: Context) : View(context) { DroidDeckHudDock.RIGHT -> intArrayOf(1, 2) DroidDeckHudDock.TOP -> intArrayOf(0, 1) DroidDeckHudDock.BOTTOM -> intArrayOf(2, 3) - DroidDeckHudDock.NONE -> intArrayOf() + DroidDeckHudDock.NONE, DroidDeckHudDock.FLOAT -> intArrayOf() } for (corner in edge) { round[corner * 2] = 0f; round[corner * 2 + 1] = 0f } tabPath.rewind() 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 b4c1cfc7ea..4fd1eeba6d 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java +++ b/app/src/main/java/com/droiddeck/launcher/hud/HudLockController.java @@ -36,6 +36,7 @@ public class HudLockController { default void onDragged(float rawX, float rawY) {} default void onFlung(float velocityX, float velocityY) {} void onLockChanged(boolean locked); + default void onHold(float rawX, float rawY) {} default void onPinch(float factor) {} default void onPinchEnd() {} } @@ -53,6 +54,7 @@ public class HudLockController { private final android.view.VelocityTracker velocity = android.view.VelocityTracker.obtain(); private boolean locked = false; + private boolean holdLocks = false; private float downRawX, downRawY, startX, startY; private boolean dragging = false; @@ -80,6 +82,8 @@ public class HudLockController { public void setLocked(boolean locked) { this.locked = locked; } + public void setHoldLocks(boolean holdLocks) { this.holdLocks = holdLocks; } + public boolean isLocked() { return locked; } public boolean isDragging() { return dragging; } @@ -119,6 +123,10 @@ public class HudLockController { @Override public void onLongPress(MotionEvent e) { + if (!holdLocks) { + cb.onHold(e.getRawX(), e.getRawY()); + return; + } locked = !locked; cb.onLockChanged(locked); flash(locked, HOLD_TOGGLE_MS); 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 848fc65701..1d8bf5d682 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/DualScreen.kt @@ -82,6 +82,12 @@ object DualScreen { fun sessionDisplay(context: Context, displayManager: DisplayManager, primaryDisplayId: Int): Display? = display(context, displayManager, primaryDisplayId, SessionPrefs.dualScreenSessionMode(context)) + fun selectedSessionDisplay(context: Context, displayManager: DisplayManager, primaryDisplayId: Int, selectedDisplayId: Int): Display? = + displayManager.getDisplay(selectedDisplayId)?.takeIf { + SessionPrefs.dualScreenSessionMode(context) != MODE_OFF && it.isValid && it.displayId != primaryDisplayId && + (it.flags and Display.FLAG_PRESENTATION) != 0 && !taken(it.displayId) + } + fun display(context: Context, displayManager: DisplayManager, primaryDisplayId: Int, mode: String = SessionPrefs.dualScreenMode(context)): Display? = when (mode) { MODE_OFF -> null diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt index cc6313dc30..0e5ed4261f 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibrary.kt @@ -97,6 +97,16 @@ data class InputLibrary( fun compileActive(isDesktop: Boolean, panel: String? = null): InputProfile = compileParts(activeId(isDesktop), InputRole.entries.associateWith { preset(if (it == InputRole.SECONDARY) panelPart(isDesktop, panel).bindings else activePart(isDesktop, it).bindings) }) + fun compileStock(isDesktop: Boolean, panel: String? = null): InputProfile { + val defaults = InputProfile.defaults(profile(activeId(isDesktop)).base) + val stock = InputStockLayouts.presets(InputStockLayouts.layouts()) + return compileParts(defaults.id, InputRole.entries.associateWith { role -> + val part = if (role == InputRole.SECONDARY) panelPart(isDesktop, panel) else activePart(isDesktop, role) + val origin = layouts.firstOrNull { it.id == part.layout }?.origin ?: part.layout + stock.firstOrNull { it.id == part.bindings || (origin != null && it.layoutId == origin) } + ?: SavedInputBindings(part.bindings, "", role == InputRole.PHYSICAL, part.layout, defaults.bindings[role].orEmpty()) + }) + } fun saveSelection(isDesktop: Boolean, name: String, id: String = newInputId()): InputLibrary { val current = profile(activeId(isDesktop)) diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt b/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt index 2375cf34e8..a122766271 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputProfile.kt @@ -53,6 +53,16 @@ data class InputProfile( fun elementClickAction(role: InputRole, element: InputSurfaceElement): InputAction = clicks[role]?.get(element.id) ?: defaultElementClick(element, elementAction(role, element.id, element.control)) { action(role, it) } + fun showsMouseButton(role: InputRole, shown: List, stock: InputProfile): Boolean = shown.any { element -> + val action = elementAction(role, element.id, element.control).takeIf { + elements[role]?.get(element.id) != stock.elements[role]?.get(element.id) || it != stock.elementAction(role, element.id, element.control) + } + val click = elementClickAction(role, element).takeIf { + clicks[role]?.get(element.id) != stock.clicks[role]?.get(element.id) || it != stock.elementClickAction(role, element) + } + listOfNotNull(action, click).any { it is InputAction.MouseButton && it.validFor(element.control) } + } + companion object { const val GAME = "game" const val DESKTOP = "desktop" diff --git a/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt b/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt index 6656b7697f..5372be6db5 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt @@ -26,6 +26,8 @@ class KeyboardHost( var imeShowing = false private set var onImeChanged: ((Boolean) -> Unit)? = null + val hideMeansDismissal: Boolean + get() = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || (shown && imeShowing) init { isFocusable = false diff --git a/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt index e281a2b741..2a36489e85 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/LegacyGamepadLayout.kt @@ -176,7 +176,7 @@ internal class LegacyGamepadLayout(private val context: Context, private val wid } - fun elements(): List { + fun elements(previousStickGeometry: Boolean = false): List { fit = fitScale() controls.forEach { it.radius = scaled(it.radiusDp) } placeAuto(width.toFloat(), height.toFloat()) @@ -189,7 +189,7 @@ internal class LegacyGamepadLayout(private val context: Context, private val wid }.map { c -> InputSurfaceElement(requireNotNull(InputControl.fromId(c.id)), (c.cx - c.halfW) / width, (c.cy - c.halfH) / height, 2 * c.halfW / width, 2 * c.halfH / height, floating = settings.adaptiveSticks, hideWhenIdle = c.stick >= 0 && settings.adaptiveSticks, - buttonShape = if (c.id in shoulderIds) InputButtonShape.PILL else InputButtonShape.CIRCLE).let(::widenStick).bounded() + buttonShape = if (c.id in shoulderIds) InputButtonShape.PILL else InputButtonShape.CIRCLE).let { if (previousStickGeometry) widenStickPreviously(it) else widenStick(it) }.bounded() }.toMutableList() if (settings.keyboardButton) result += keyboard() return result @@ -315,7 +315,7 @@ internal class LegacyGamepadLayout(private val context: Context, private val wid return e.copy(x = (cx - radius) / width, y = (cy - radius) / height, width = 2 * radius / width, height = 2 * radius / height) } - private fun widenStick(e: InputSurfaceElement): InputSurfaceElement { + private fun widenStickPreviously(e: InputSurfaceElement): InputSurfaceElement { val extra = e.width * (STICK_REACH - 1f) return when (e.control) { InputControl.LS -> (e.x - extra).coerceAtLeast(0f).let { x -> e.copy(x = x, width = e.x + e.width - x) } @@ -323,6 +323,16 @@ internal class LegacyGamepadLayout(private val context: Context, private val wid else -> e } } + + private fun widenStick(e: InputSurfaceElement): InputSurfaceElement { + val extra = e.width * (STICK_REACH - 1f) + val width = e.width + extra + return when (e.control) { + InputControl.LS -> e.copy(x = (e.x - extra).coerceIn(0f, (1f - width).coerceAtLeast(0f)), width = width) + InputControl.RS -> e.copy(x = e.x.coerceIn(0f, (1f - width).coerceAtLeast(0f)), width = width) + else -> e + } + } private companion object { const val MIN_FACE_MM = 9.5f const val FULL_SIZE_HEIGHT_MM = 85f 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 4923221fa0..ee3a6560ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt @@ -32,6 +32,7 @@ class OnScreenControls(context: Context, pad: PadBridge?, val dock: OnScreenLayo var isPinnedOnly = false private set val hasPinned get() = layout?.elements?.any { it.alwaysShown } == true + val inputSurface: com.droiddeck.launcher.ui.InputSurfaceView get() = surface var onTouchMiss: ((MotionEvent) -> Unit)? get() = surface.onTouchMiss set(value) { surface.onTouchMiss = value } diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt index 3935c1a565..9fbb01c7ad 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenLayout.kt @@ -5,6 +5,7 @@ import android.graphics.Rect import kotlin.math.abs import kotlin.math.max import kotlin.math.min +import kotlin.math.roundToInt object OnScreenLayout { data class Dock(val portrait: Boolean, val grips: Boolean, val left: InputControl = InputControl.LS, val right: InputControl = InputControl.RS) { @@ -41,6 +42,14 @@ object OnScreenLayout { return stored.mapNotNull { byId[it.id] } + placed.filter { p -> stored.none { it.id == p.id } } } + fun editorElements(context: Context, layout: SavedInputLayout, width: Int, height: Int, edited: Boolean = false): List = + elements(context, if (edited && width > 0 && height > 0) layout.copy(aspect = width.toFloat() / height) else layout, width, height, Rect()) + + fun editorFrame(layout: SavedInputLayout, displayed: List): List { + val byId = displayed.associateBy { it.id } + return layout.elements.map { byId[it.id] ?: it } + } + fun fit(elements: List, referenceWidth: Float, referenceHeight: Float, width: Int, height: Int, safe: Rect): List { val w = width.toFloat() val h = height.toFloat() @@ -77,8 +86,11 @@ object OnScreenLayout { if (gamepad.any { it.id.startsWith("legacy:") }) { val named = layout.id.removePrefix("migrated.layout.").takeIf { it != layout.id }?.split('x')?.mapNotNull { it.toIntOrNull() } ?.takeIf { it.size == 2 && it.all { size -> size > 0 } }?.let { it[0] to it[1] } - for ((w, h) in listOfNotNull(named, width to height, long to short, short to long).distinct()) { - if (matches(gamepad, LegacyGamepadLayout(display, w, h, scale = layout.scale).elements())) return (w.toFloat() to h.toFloat()) to true + val aspectSize = layout.aspect.takeIf { layout.id == InputLibraries.OVERLAY && it > 0f } + ?.let { (it * height).roundToInt().coerceAtLeast(1) to height } + for ((w, h) in listOfNotNull(named, width to height, aspectSize, long to short, short to long).distinct()) { + val generator = LegacyGamepadLayout(display, w, h, scale = layout.scale) + if (matches(gamepad, generator.elements()) || matches(gamepad, generator.elements(previousStickGeometry = true))) return (w.toFloat() to h.toFloat()) to true } } val aspect = layout.aspect.takeIf { it > 0f } ?: (long.toFloat() / short) 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 c75602585c..666a9d1ceb 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -12,6 +12,8 @@ import com.droiddeck.launcher.session.SessionState; import java.io.File; import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.atomic.AtomicIntegerArray; public final class PadBridge { @@ -56,6 +58,7 @@ public final class PadBridge { private final FakeInputWriter[] playerWriters = new FakeInputWriter[SLOTS]; private final PadState[] playerStates = new PadState[SLOTS]; private final float[][] rawSticks = new float[SLOTS][4]; + private final Map rightStickLayouts = new HashMap<>(); private final boolean[][] keyTriggers = new boolean[SLOTS][2]; private final int[] retainedSticks = new int[SLOTS]; private final PadState effectiveState = new PadState(); @@ -240,6 +243,7 @@ public final class PadBridge { clearBackQamWrites(); releaseBackPaddles(); activeControllerId = NO_CONTROLLER; + rightStickLayouts.clear(); for (int slot = 0; slot < SLOTS; slot++) { owners[slot] = NO_CONTROLLER; partners[slot] = NO_CONTROLLER; @@ -525,20 +529,23 @@ public final class PadBridge { float lx = event.getAxisValue(MotionEvent.AXIS_X); float ly = event.getAxisValue(MotionEvent.AXIS_Y); boolean wired = wiredXboxLayout(device, event.getSource()); - float rx = event.getAxisValue(wired ? MotionEvent.AXIS_RX : MotionEvent.AXIS_Z); - float ry = event.getAxisValue(wired ? MotionEvent.AXIS_RY : MotionEvent.AXIS_RZ); + boolean rxRyStick = rightStickUsesRxRy(event, device, rightStickLayouts); + float rx = event.getAxisValue(rxRyStick ? MotionEvent.AXIS_RX : MotionEvent.AXIS_Z); + float ry = event.getAxisValue(rxRyStick ? MotionEvent.AXIS_RY : MotionEvent.AXIS_RZ); retainStick(slot, JoyCon.LEFT, lx, ly); retainStick(slot, JoyCon.RIGHT, rx, ry); projectSticks(slot); int source = event.getSource(); float lt = 0f; float rt = 0f; - if (wired || hasAxis(device, source, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE)) { - lt = axisTrigger(leftTrigger(event, wired), keyTriggers[slot], 0); + boolean signedLeft = signedZTriggers(event, device, wired, rxRyStick, true); + boolean signedRight = signedZTriggers(event, device, wired, rxRyStick, false); + if (signedLeft || hasAxis(device, source, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE)) { + lt = axisTrigger(triggerValue(event, device, wired, rxRyStick, true), keyTriggers[slot], 0); pad.leftTrigger = lt; } - if (wired || hasAxis(device, source, MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS)) { - rt = axisTrigger(rightTrigger(event, wired), keyTriggers[slot], 1); + if (signedRight || hasAxis(device, source, MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS)) { + rt = axisTrigger(triggerValue(event, device, wired, rxRyStick, false), keyTriggers[slot], 1); pad.rightTrigger = rt; } if (hasAxis(device, source, MotionEvent.AXIS_HAT_X)) { @@ -596,6 +603,92 @@ public final class PadBridge { return false; } + static boolean rightStickUsesRxRy(MotionEvent event, InputDevice device, Map layouts) { + int source = event.getSource(); + if (wiredXboxLayout(device, source)) return true; + boolean hasRxRy = hasAxis(device, source, MotionEvent.AXIS_RX) + && hasAxis(device, source, MotionEvent.AXIS_RY); + boolean hasZRz = hasAxis(device, source, MotionEvent.AXIS_Z) + && hasAxis(device, source, MotionEvent.AXIS_RZ); + if (!hasRxRy) return false; + if (!hasZRz) return true; + Boolean cached = layouts.get(event.getDeviceId()); + if (cached != null) return cached; + boolean rxRyEvidence = atMinimum(device, source, event, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ) + && nearCentre(device, source, event, MotionEvent.AXIS_RX, MotionEvent.AXIS_RY); + boolean zRzEvidence = atMinimum(device, source, event, MotionEvent.AXIS_RX, MotionEvent.AXIS_RY) + && nearCentre(device, source, event, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ); + if (rxRyEvidence == zRzEvidence) return false; + boolean useRxRy = rxRyEvidence; + layouts.put(event.getDeviceId(), useRxRy); + return useRxRy; + } + + static boolean signedZTriggers(MotionEvent event, InputDevice device, boolean wired, boolean rxRyStick, boolean left) { + if (wired) return true; + if (!rxRyStick) return false; + int source = event.getSource(); + int signedAxis = left ? MotionEvent.AXIS_Z : MotionEvent.AXIS_RZ; + int dedicatedAxis = left ? MotionEvent.AXIS_LTRIGGER : MotionEvent.AXIS_RTRIGGER; + int alternateAxis = left ? MotionEvent.AXIS_BRAKE : MotionEvent.AXIS_GAS; + return hasAxis(device, source, signedAxis) + && !hasAxis(device, source, dedicatedAxis, alternateAxis); + } + + static float triggerValue(MotionEvent event, InputDevice device, boolean wired, boolean rxRyStick, boolean left) { + if (signedZTriggers(event, device, wired, rxRyStick, left)) { + int axis = left ? MotionEvent.AXIS_Z : MotionEvent.AXIS_RZ; + float value = event.getAxisValue(axis); + if (!wired && device != null) { + InputDevice.MotionRange range = device.getMotionRange(axis, event.getSource()); + if (range != null && range.getMax() > range.getMin()) { + return Math.max(0f, Math.min(1f, + (value - range.getMin()) / (range.getMax() - range.getMin()))); + } + } + return Math.max(0f, Math.min(1f, (value + 1f) / 2f)); + } + int source = event.getSource(); + int axis = left ? MotionEvent.AXIS_LTRIGGER : MotionEvent.AXIS_RTRIGGER; + int alternate = left ? MotionEvent.AXIS_BRAKE : MotionEvent.AXIS_GAS; + if (device == null) { + float value = event.getAxisValue(axis); + return value != 0f ? value : event.getAxisValue(alternate); + } + if (hasAxis(device, source, axis)) { + float value = event.getAxisValue(axis); + return value != 0f ? value : event.getAxisValue(alternate); + } + if (hasAxis(device, source, alternate)) return event.getAxisValue(alternate); + return 0f; + } + + private static float restDistance(InputDevice device, int source, MotionEvent event, int xAxis, int yAxis) { + return (restDistance(device.getMotionRange(xAxis, source), event.getAxisValue(xAxis)) + + restDistance(device.getMotionRange(yAxis, source), event.getAxisValue(yAxis))) / 2f; + } + + private static float restDistance(InputDevice.MotionRange range, float value) { + float span = range.getMax() - range.getMin(); + if (span <= 0f) return 1f; + return Math.abs(value - (range.getMin() + range.getMax()) / 2f) / span; + } + + private static boolean atMinimum(InputDevice device, int source, MotionEvent event, int xAxis, int yAxis) { + return atMinimum(device.getMotionRange(xAxis, source), event.getAxisValue(xAxis)) + && atMinimum(device.getMotionRange(yAxis, source), event.getAxisValue(yAxis)); + } + + private static boolean atMinimum(InputDevice.MotionRange range, float value) { + float span = range.getMax() - range.getMin(); + return value - range.getMin() <= span * 0.02f; + } + + private static boolean nearCentre(InputDevice device, int source, MotionEvent event, int xAxis, int yAxis) { + return restDistance(device.getMotionRange(xAxis, source), event.getAxisValue(xAxis)) <= 0.1f + && restDistance(device.getMotionRange(yAxis, source), event.getAxisValue(yAxis)) <= 0.1f; + } + public interface TouchRoute { boolean active(); @@ -1182,16 +1275,4 @@ public final class PadBridge { && device.getMotionRange(MotionEvent.AXIS_RZ, source) != null; } - public static float leftTrigger(MotionEvent event, boolean wired) { - if (wired) return Math.max(0f, Math.min(1f, (event.getAxisValue(MotionEvent.AXIS_Z) + 1f) / 2f)); - float value = event.getAxisValue(MotionEvent.AXIS_LTRIGGER); - return value != 0f ? value : event.getAxisValue(MotionEvent.AXIS_BRAKE); - } - - public static float rightTrigger(MotionEvent event, boolean wired) { - if (wired) return Math.max(0f, Math.min(1f, (event.getAxisValue(MotionEvent.AXIS_RZ) + 1f) / 2f)); - float value = event.getAxisValue(MotionEvent.AXIS_RTRIGGER); - return value != 0f ? value : event.getAxisValue(MotionEvent.AXIS_GAS); - } - } diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadMouse.kt b/app/src/main/java/com/droiddeck/launcher/input/PadMouse.kt index 2d71451ccf..dccba8a1b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadMouse.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/PadMouse.kt @@ -42,6 +42,7 @@ class PadMouse(private val listener: Listener, private val clock: () -> Long = S private val total = Sticks() private val triggerAxes = HashMap() private val wiredLayout = HashMap() + private val rightStickLayouts = HashMap() private val down = HashMap>() private val sent = HashMap() private val held = LinkedHashMap() @@ -87,14 +88,21 @@ class PadMouse(private val listener: Listener, private val clock: () -> Long = S fun onMotion(event: MotionEvent): Boolean { if (event.actionMasked != MotionEvent.ACTION_MOVE) return true val sticks = physical.getOrPut(event.deviceId) { Sticks() } - val wired = wiredLayout.getOrPut(event.deviceId) { PadBridge.wiredXboxLayout(event) } + val device = event.device + val wired = wiredLayout.getOrPut(event.deviceId) { PadBridge.wiredXboxLayout(device, event.source) } + val rxRyStick = PadBridge.rightStickUsesRxRy(event, device, rightStickLayouts) sticks.leftX = event.getAxisValue(MotionEvent.AXIS_X) sticks.leftY = event.getAxisValue(MotionEvent.AXIS_Y) - sticks.rightX = scrollAxis(event, if (wired) MotionEvent.AXIS_RX else MotionEvent.AXIS_Z) - sticks.rightY = scrollAxis(event, if (wired) MotionEvent.AXIS_RY else MotionEvent.AXIS_RZ) - if (hasTriggerAxes(event)) { - sticks.leftTrigger = PadBridge.leftTrigger(event, wired) - sticks.rightTrigger = PadBridge.rightTrigger(event, wired) + sticks.rightX = scrollAxis(event, if (rxRyStick) MotionEvent.AXIS_RX else MotionEvent.AXIS_Z) + sticks.rightY = scrollAxis(event, if (rxRyStick) MotionEvent.AXIS_RY else MotionEvent.AXIS_RZ) + val signedLeft = PadBridge.signedZTriggers(event, device, wired, rxRyStick, true) + val signedRight = PadBridge.signedZTriggers(event, device, wired, rxRyStick, false) + val analogTriggers = hasTriggerAxes(event) + if (analogTriggers || signedLeft) { + sticks.leftTrigger = PadBridge.triggerValue(event, device, wired, rxRyStick, true) + } + if (analogTriggers || signedRight) { + sticks.rightTrigger = PadBridge.triggerValue(event, device, wired, rxRyStick, false) } val hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X) val hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y) @@ -129,6 +137,7 @@ class PadMouse(private val listener: Listener, private val clock: () -> Long = S physical.clear() triggerAxes.clear() wiredLayout.clear() + rightStickLayouts.clear() touch.clear() down.clear() sent.clear() @@ -207,6 +216,7 @@ class PadMouse(private val listener: Listener, private val clock: () -> Long = S private fun hasTriggerAxes(event: android.view.InputEvent): Boolean = triggerAxes.getOrPut(event.deviceId) { val device = event.device ?: return@getOrPut true device.getMotionRange(MotionEvent.AXIS_LTRIGGER) != null || device.getMotionRange(MotionEvent.AXIS_BRAKE) != null || + device.getMotionRange(MotionEvent.AXIS_RTRIGGER) != null || device.getMotionRange(MotionEvent.AXIS_GAS) != null || (event is MotionEvent && wiredLayout.getOrPut(event.deviceId) { PadBridge.wiredXboxLayout(event) }) } diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt index 4f1ebc9bdd..06da1bae21 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt @@ -42,6 +42,7 @@ class ScrollTouchGestures( private var flingY = 0f private var flingAt = 0L private var flinging = false + var clicks = true private val longPress = Runnable { held = true @@ -86,7 +87,7 @@ class ScrollTouchGestures( lastY = startY tracker = VelocityTracker.obtain().also { it.addMovement(event) } listener.onMove(startX, startY) - handler.postDelayed(longPress, TouchTiming.HOLD_MS) + if (clicks) handler.postDelayed(longPress, TouchTiming.HOLD_MS) } MotionEvent.ACTION_MOVE -> { val index = event.findPointerIndex(pointerId).takeIf { it >= 0 } ?: return true @@ -153,6 +154,7 @@ class ScrollTouchGestures( private fun click(button: Int) { releaseClick() + if (!clicks) return listener.onButton(button, true) clicked = button handler.postDelayed(clickUp, TouchTiming.CLICK_MS) 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 2d0006925f..590ef4fc08 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt @@ -40,6 +40,18 @@ enum class SecondScreenMode(val id: String, @StringRes val label: Int, val bindi data class SecondScreenDisplay(val id: Int, val label: String) object SecondScreenDisplays { + fun selection(selected: Int, available: List, gameRequested: Boolean): Int = + if (selected in available || gameRequested && selected >= 0) selected else available.firstOrNull() ?: -1 + + fun selection(selected: Int, available: List, gameRequested: Boolean, save: (Int) -> Unit): Int = + selection(selected, available, gameRequested).also { if (it != selected) save(it) } + + fun keyboardOnPrimary(gameRequested: Boolean, selected: Int, available: List, visible: Boolean = true, taken: (Int) -> Boolean): Boolean = + visible && gameRequested && selected >= 0 && (selected !in available || taken(selected)) + + fun routeKeyboard(steam: Boolean, enabled: Boolean, panel: Boolean, dock: Boolean, primaryFallback: Boolean): Boolean = + steam && enabled && (panel || dock || primaryFallback) + fun available(displayManager: DisplayManager, primaryDisplayId: Int = Display.DEFAULT_DISPLAY): List = displayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION) .asSequence() diff --git a/app/src/main/java/com/droiddeck/launcher/input/ShortcutsRelay.kt b/app/src/main/java/com/droiddeck/launcher/input/ShortcutsRelay.kt index 6c24a7a472..a39a84adf1 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ShortcutsRelay.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ShortcutsRelay.kt @@ -178,4 +178,56 @@ class ShortcutsRelay : Service(), InputManager.InputDeviceListener { private companion object { const val KEY_TIMEOUT_MS = 200L } + + // Frontends such as Cocoon treat a running player process as an open game, so the relay runs only while a screen is started. + object Holder : android.app.Application.ActivityLifecycleCallbacks, android.content.ServiceConnection { + private const val RELEASE_MS = 1_000L + private val handler = Handler(Looper.getMainLooper()) + private var app: android.app.Application? = null + private var started = 0 + private var bound = false + private val release = Runnable { unbind() } + + fun install(application: android.app.Application) { + app?.unregisterActivityLifecycleCallbacks(this) + handler.removeCallbacks(release) + started = 0 + bound = false + app = application + application.registerActivityLifecycleCallbacks(this) + } + + override fun onActivityStarted(activity: android.app.Activity) { + started++ + handler.removeCallbacks(release) + if (!bound) bind() + } + + override fun onActivityStopped(activity: android.app.Activity) { + started = (started - 1).coerceAtLeast(0) + if (started == 0) handler.postDelayed(release, RELEASE_MS) + } + + private fun bind() { + val context = app ?: return + if (runCatching { context.packageManager.getPackageInfo(Relay.PACKAGE, 0) }.isFailure) return + bound = runCatching { + context.bindService(Intent(context, ShortcutsRelay::class.java), this, Context.BIND_AUTO_CREATE) + }.getOrDefault(false) + } + + private fun unbind() { + if (!bound) return + bound = false + runCatching { app?.unbindService(this) } + } + + override fun onServiceConnected(name: android.content.ComponentName?, service: IBinder?) = Unit + override fun onServiceDisconnected(name: android.content.ComponentName?) = Unit + override fun onActivityCreated(activity: android.app.Activity, savedInstanceState: android.os.Bundle?) = Unit + override fun onActivityResumed(activity: android.app.Activity) = Unit + override fun onActivityPaused(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 + } } 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 ed4e87732b..659b99c0ce 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt @@ -17,6 +17,11 @@ class TouchpadGestures( var bounds: android.graphics.RectF = android.graphics.RectF(0f, 0f, 1f, 1f) var sensitivity = 1.15f var desktop = false + var clicks = true + set(value) { + if (field != value) lastTapAt = 0L + field = value + } private val handler = Handler(Looper.getMainLooper()) private var lastX = 0f @@ -50,12 +55,17 @@ class TouchpadGestures( held = true dragging = true listener.onLongPress() - listener.onButton(PointerGestures.BTN_LEFT, true, x, y) + press(PointerGestures.BTN_LEFT) } private val clickUp = Runnable { releaseClick() } + private fun press(button: Int) { + if (clicks) listener.onButton(button, true, x, y) + } + private fun click(button: Int) { releaseClick() + if (!clicks) return listener.onButton(button, true, x, y) clicked = button handler.postDelayed(clickUp, TouchTiming.CLICK_MS) @@ -108,12 +118,12 @@ class TouchpadGestures( travelled = 0f; held = false; twoFingers = false; scrolled = false; secondWasTap = false fingers = 1; pinching = false anchorId = event.getPointerId(0); moverId = -1; holdDrag = false; scrollLocked = false - if (event.eventTime - lastTapAt < TouchTiming.DOUBLE_TAP_MS) { + if (clicks && event.eventTime - lastTapAt < TouchTiming.DOUBLE_TAP_MS) { dragging = true - listener.onButton(PointerGestures.BTN_LEFT, true, x, y) + press(PointerGestures.BTN_LEFT) } else { dragging = false - handler.postDelayed(longPress, TouchTiming.HOLD_MS) + if (clicks) handler.postDelayed(longPress, TouchTiming.HOLD_MS) } return true } @@ -153,7 +163,7 @@ class TouchpadGestures( secondWasTap = false if (!dragging) { dragging = true - listener.onButton(PointerGestures.BTN_LEFT, true, x, y) + press(PointerGestures.BTN_LEFT) } } } 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 1eed2f3842..ca408e3b36 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -218,12 +218,15 @@ object BwrapSpawner { private fun runtimeLib(rootfs: String, name: String): File? = LIB_DIRS.map { File(rootfs, "$it/$name") }.firstOrNull { it.exists() } - private fun gpu(rootfs: String, root: File, env: MutableMap): List? { + internal fun gpu( + rootfs: String, root: File, env: MutableMap, + kgslAvailable: Boolean = File("/dev/kgsl-3d0").exists(), + ): List? { 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 (driver == null || !kgslAvailable) return null if (env.containsKey("VK_ICD_FILENAMES") || env.containsKey("VK_DRIVER_FILES")) return null - if (env["BL_DESKTOP"] == "1" && env["GAMESCOPE_WAYLAND_DISPLAY"] == null) return null + if (env["LIBGL_ALWAYS_SOFTWARE"] == "1" && env["GAMESCOPE_WAYLAND_DISPLAY"] == null) return null val binds = arrayListOf(Bind(driver.canonicalPath, "$GPU_DIR/libvulkan_freedreno.so")) for (name in GPU_LIBS) { val f = runtimeLib(rootfs, name) ?: continue diff --git a/app/src/main/java/com/droiddeck/launcher/session/KeepTopActivity.kt b/app/src/main/java/com/droiddeck/launcher/session/KeepTopActivity.kt new file mode 100644 index 0000000000..849c0aafcc --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/KeepTopActivity.kt @@ -0,0 +1,91 @@ +package com.droiddeck.launcher.session + +import android.app.Activity +import android.app.ActivityOptions +import android.content.Context +import android.content.Intent +import android.hardware.display.DisplayManager +import android.os.Bundle +import android.os.SystemClock +import android.util.Log +import android.view.Display +import android.view.WindowManager + +// While a session runs, sits invisibly on top of every other display until it ends, so +// that display's home launcher is not its top activity. lmkd kills the launcher first; restarted as a +// top activity it takes focus from the session, which then drops to adj 50 and is killed next. +class KeepTopActivity : Activity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + @Suppress("DEPRECATION") overridePendingTransition(0, 0) + if (intent.getBooleanExtra(EXTRA_BOUNCE, false)) { + bounces++ + finish() + return + } + if (intent.getIntExtra(EXTRA_GENERATION, -1) != generation) { + finishAndRemoveTask() + return + } + window.addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + val id = display?.displayId ?: Display.INVALID_DISPLAY + starting.remove(id) + guards[id]?.takeIf { it !== this && !it.isFinishing }?.finishAndRemoveTask() + guards[id] = this + } + + override fun onDestroy() { + guards.values.remove(this) + super.onDestroy() + } + + companion object { + private const val TAG = "KeepTop" + private const val EXTRA_BOUNCE = "bounce" + private const val EXTRA_GENERATION = "generation" + private var generation = 0 + var bounces = 0 + private set + private val guards = HashMap() + private const val START_TIMEOUT_MS = 2_000L + private val starting = HashMap() + + fun guardOtherDisplays(context: Context, sessionDisplay: Int): Boolean { + val displays = context.getSystemService(DisplayManager::class.java)?.displays ?: return false + var started = false + for (display in displays) { + val id = display.displayId + if (id == sessionDisplay || display.state != Display.STATE_ON || guards[id]?.isFinishing == false || + starting[id]?.let { SystemClock.elapsedRealtime() - it < START_TIMEOUT_MS } == true) continue + runCatching { + launch(context, id, bounce = false) + starting[id] = SystemClock.elapsedRealtime() + started = true + Log.i(TAG, "guarding display $id from a home launcher restart") + }.onFailure { Log.w(TAG, "could not guard display $id", it) } + } + if (!started) return false + return runCatching { launch(context, sessionDisplay, bounce = true) } + .onFailure { Log.w(TAG, "could not return focus to display $sessionDisplay", it) }.isSuccess + } + + fun hasPendingStarts() = starting.isNotEmpty() + + const val RETRY_MS = START_TIMEOUT_MS + 250 + + fun release() { + generation++ + guards.values.toList().forEach { it.finishAndRemoveTask() } + guards.clear() + starting.clear() + } + + private fun launch(context: Context, displayId: Int, bounce: Boolean) { + val intent = Intent(context, KeepTopActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION) + .putExtra(EXTRA_BOUNCE, bounce) + .putExtra(EXTRA_GENERATION, generation) + context.startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(displayId).toBundle()) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/LightPause.kt b/app/src/main/java/com/droiddeck/launcher/session/LightPause.kt new file mode 100644 index 0000000000..6ac1eabf9f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/LightPause.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.session + +// Tracks a pause that skipped the session's departure cleanup for the keep-top focus bounce. +internal class LightPause { + private var pending = false + private var bouncesAtPause = 0 + + fun paused(bounces: Int) { + pending = true + bouncesAtPause = bounces + } + + // The bounce resumes the session within tens of milliseconds; still paused at the timeout means + // something else holds the pause. + fun timedOut(): Boolean = take() + + fun stopped(): Boolean = take() + + fun resumed(bounces: Int): Resume { + if (!pending) return Resume.NORMAL + pending = false + return if (bounces != bouncesAtPause) Resume.LIGHT else Resume.CLEANUP_FIRST + } + + private fun take(): Boolean { + val was = pending + pending = false + return was + } + + enum class Resume { NORMAL, LIGHT, CLEANUP_FIRST } +} 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 3ac0ef8ab6..2b4744574f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt @@ -544,6 +544,7 @@ object SessionArtifacts { "session died of a crash, the entry is in there unless the device rebooted.\n" + (if (newest) exitReasons(context) else "") ) + restartNote(File(dir, "device.txt").lastModified(), bootedAt())?.let { recoveryNote.appendText(it) } if (newest && lastExitForMemory(context)) killedForMemory = true } if (recoveryPreviouslyAttempted && !runtimeCaptured.exists() && @@ -597,7 +598,7 @@ object SessionArtifacts { } val memoryLog = File(dir, "memory-pressure.log") if (newest && !memoryLog.exists()) { - SessionLogCapture.dumpMemoryPressure(memoryLog) + SessionLogCapture.dumpMemoryPressure(memoryLog, context) } if (stopWhenSessionStarts && SessionState.running) { record.failed = true @@ -686,5 +687,21 @@ object SessionArtifacts { return gone.size } + private fun bootedAt(): Long = System.currentTimeMillis() - android.os.SystemClock.elapsedRealtime() + + internal fun restartNote(sessionStartedAt: Long, bootedAt: Long): String? { + if (sessionStartedAt <= 0L) return null + val stamp = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US) + return if (bootedAt > sessionStartedAt + BOOT_CLOCK_SLACK_MS) { + "The device itself probably restarted after this session began (estimated boot ${stamp.format(Date(bootedAt))}, from the clock and uptime, so a clock change can fake it):\n" + + "if so, the whole system went down and crash.log is the new boot's buffer and says nothing about the session.\n" + } else { + "The device does not appear to have restarted since this session began (estimated boot ${stamp.format(Date(bootedAt))}, from the clock and uptime):\n" + + "only this app's processes ended, so crash.log and the exit records cover the end.\n" + } + } + + private const val BOOT_CLOCK_SLACK_MS = 60_000L + private fun now(): String = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(Date()) } 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 04a8d17d7f..8089bfec04 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -273,12 +273,45 @@ object SessionPrefs { prefs(context).edit().putBoolean("railLabels", show).apply() } - fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", true) + fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", false) fun setAgentTab(context: Context, show: Boolean) { prefs(context).edit().putBoolean("agentTab", show).apply() } + fun developerTools(context: Context): Boolean = + prefs(context).getBoolean("developerTools", agentTab(context) || com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(context)) + + fun setDeveloperTools(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("developerTools", on).apply() + } + + fun fpsLimitKey(mode: String?, game: String?): String? = when (mode) { + SessionService.MODE_RUN -> game?.trim()?.takeIf(com.droiddeck.launcher.frontend.GameLaunchLink::validId)?.let { "fpsLimit.game.$it" } + SessionService.MODE_DESKTOP -> "fpsLimit.desktop" + else -> null + } + + fun savedFpsLimit(context: Context, key: String?): Int = key?.let { prefs(context).getInt(it, 0) } ?: 0 + + fun saveFpsLimit(context: Context, key: String?, fps: Int) { + key ?: return + prefs(context).edit().apply { if (fps > 0) putInt(key, fps) else remove(key) }.apply() + } + + fun drawerCornerTap(context: Context): Boolean = + prefs(context).getBoolean("drawerCornerTap", android.os.Build.MANUFACTURER.equals("Oculus", true) || android.os.Build.MANUFACTURER.equals("Meta", true)) + + fun setDrawerCornerTap(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("drawerCornerTap", on).apply() + } + + fun drawerHintShown(context: Context): Int = prefs(context).getInt("drawerHintShown", 0) + + fun countDrawerHint(context: Context) { + prefs(context).edit().putInt("drawerHintShown", drawerHintShown(context) + 1).apply() + } + fun libraryShowUninstalled(context: Context): Boolean = prefs(context).getBoolean("libraryShowUninstalled", false) fun setLibraryShowUninstalled(context: Context, show: Boolean) { @@ -309,7 +342,7 @@ object SessionPrefs { prefs(context).edit().putString("navTabOrder", order.joinToString(",")).apply() } - fun navTabShelved(context: Context): Set = idList(prefs(context).getString("navTabShelved", "soundtracks,agent")).toSet() + fun navTabShelved(context: Context): Set = idList(prefs(context).getString("navTabShelved", "soundtracks,agent,storage,sync")).toSet() fun setNavTabShelved(context: Context, keys: Set) { prefs(context).edit().putString("navTabShelved", keys.joinToString(",")).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 b9e7215dc0..afdd58d98a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -411,6 +411,7 @@ class SessionService : Service() { ?.takeIf(GameLaunchLink::validId) ?: steamUrlGameId SessionState.gameId = resolvedGameId + SessionState.fpsLimit = SessionPrefs.savedFpsLimit(this, SessionPrefs.fpsLimitKey(SessionState.mode, resolvedGameId)) SessionPrefs.setActiveScreenEffectsProfile( this, SessionPrefs.screenEffectsProfileId(SessionState.mode, resolvedGameId, SessionState.program), @@ -1428,6 +1429,28 @@ class SessionService : Service() { } catch (e: Exception) { Log.w(TAG, "steam library: the list could not be written; the card alone this session", e) } + if (SessionState.mode == MODE_DESKTOP) { + try { + val listing = File(filesDir, "session/desktop-volumes.json").apply { parentFile?.mkdirs() } + val volumes = org.json.JSONArray() + var room = if (ProotFastPath.enabled(this)) { + ProotFastPath.MAX_BINDS - LinuxRuntime.binds(this, sessionRoot, runtimeDir, Environment.getExternalStorageDirectory(), binds).size + } else Int.MAX_VALUE + for (root in com.droiddeck.launcher.files.StorageRoots.list(this)) { + if (!root.removable || !root.readable) continue + val path = root.dir.absolutePath + if (':' in path || '|' in path || room <= 0) continue + binds.add(path) + room-- + volumes.put(org.json.JSONObject().put("path", path).put("label", root.label)) + } + listing.writeText(volumes.toString()) + val envAt = guest.indexOf(LinuxRuntime.SESSION_SCRIPT).takeIf { it >= 0 } ?: guest.size + guest.add(envAt, "BL_DESKTOP_VOLUMES=" + listing.path) + } catch (e: Exception) { + Log.w(TAG, "desktop volumes: the list could not be written", e) + } + } return binds } @@ -2325,7 +2348,8 @@ class SessionService : Service() { override fun onTaskRemoved(rootIntent: Intent?) { if (rootIntent?.component?.className in setOf( com.droiddeck.launcher.ui.DualScreenActivity::class.java.name, - com.droiddeck.launcher.ui.SessionTypingActivity::class.java.name)) return + com.droiddeck.launcher.ui.SessionTypingActivity::class.java.name, + KeepTopActivity::class.java.name)) return if (pipTask || xrActivityVisible) { Log.i(TAG, "panel task dismissed - retaining the session under its active surface policy") activityVisible = false diff --git a/app/src/main/java/com/droiddeck/launcher/session/TopUnderPressure.kt b/app/src/main/java/com/droiddeck/launcher/session/TopUnderPressure.kt new file mode 100644 index 0000000000..3c7a55adea --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/TopUnderPressure.kt @@ -0,0 +1,13 @@ +package com.droiddeck.launcher.session + +import android.content.ComponentCallbacks2 + +internal object TopUnderPressure { + const val WINDOW_MS = 5_000L + + fun isPressure(level: Int) = + level == ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL || level == ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW + + fun shouldReclaim(nowMs: Long, pressureAtMs: Long, sessionRunning: Boolean, finishing: Boolean) = + sessionRunning && !finishing && pressureAtMs > 0 && nowMs - pressureAtMs in 0..WINDOW_MS +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLibraryCache.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLibraryCache.kt new file mode 100644 index 0000000000..9adeff3f16 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLibraryCache.kt @@ -0,0 +1,70 @@ +package com.droiddeck.launcher.stores + +import android.content.Context +import java.io.File +import org.json.JSONArray +import org.json.JSONObject + +internal object StoreLibraryCache { + private fun file(context: Context, store: Store) = File(context.filesDir, "store-library/${store.id}.json") + + fun load(context: Context, store: Store): List? { + val f = file(context, store) + if (!f.isFile) return null + return runCatching { decode(store, f.readText()) }.getOrNull() + } + + private val locks = Store.entries.associateWith { Any() } + + fun save(context: Context, store: Store, items: List, current: () -> Boolean) = synchronized(locks.getValue(store)) { + if (!current()) return@synchronized + val f = file(context, store) + runCatching { + f.parentFile?.mkdirs() + val tmp = File(f.parentFile, f.name + ".tmp") + tmp.writeText(encode(items)) + if (!tmp.renameTo(f)) { f.delete(); tmp.renameTo(f) } + } + } + + fun clear(context: Context, store: Store) = synchronized(locks.getValue(store)) { + file(context, store).delete() + } + + internal fun encode(items: List): String { + val out = JSONArray() + items.forEach { i -> + out.put(JSONObject() + .put("id", i.id).put("title", i.title) + .put("image", i.imageUrl ?: "").put("tall", i.tallImageUrl ?: "").put("logo", i.logoUrl ?: "") + .put("tags", i.tags).put("free", i.isFree).put("hasPrice", i.hasPrice) + .put("finalPrice", i.finalPrice).put("originalPrice", i.originalPrice).put("discount", i.discountPercent) + .put("url", i.storeUrl).put("developer", i.developer).put("publisher", i.publisher) + .put("releaseDate", i.releaseDate).put("description", i.description) + .put("owned", i.owned).put("size", i.sizeBytes).put("extra", JSONObject(i.extra)) + .put("mature", i.mature).put("subscription", i.subscription).put("includedWith", i.includedWith)) + } + return out.toString() + } + + internal fun decode(store: Store, text: String): List { + val raw = JSONArray(text) + return (0 until raw.length()).mapNotNull { n -> + val o = raw.optJSONObject(n) ?: return@mapNotNull null + val extra = o.optJSONObject("extra") + val map = HashMap() + extra?.keys()?.forEach { k -> map[k] = extra.optString(k) } + CatalogItem( + store = store, id = o.optString("id"), title = o.optString("title"), + imageUrl = o.optString("image").ifBlank { null }, tallImageUrl = o.optString("tall").ifBlank { null }, + logoUrl = o.optString("logo").ifBlank { null }, + tags = o.optString("tags"), isFree = o.optBoolean("free"), hasPrice = o.optBoolean("hasPrice"), + finalPrice = o.optString("finalPrice"), originalPrice = o.optString("originalPrice"), discountPercent = o.optInt("discount"), + storeUrl = o.optString("url"), developer = o.optString("developer"), publisher = o.optString("publisher"), + releaseDate = o.optString("releaseDate"), description = o.optString("description"), + owned = o.optBoolean("owned"), sizeBytes = o.optLong("size"), extra = map, + mature = o.optBoolean("mature"), subscription = o.optBoolean("subscription"), includedWith = o.optString("includedWith"), + ) + } + } +} 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 46de6eaab0..8cd6ea13a2 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -202,6 +202,7 @@ 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) + StoreLibraryCache.clear(app, store) if (store == Store.GAMEJOLT) { com.droiddeck.launcher.stores.gamejolt.GameJoltCollections.clear() com.droiddeck.launcher.stores.gamejolt.GameJoltUpdates.clear(app) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt index f816ed8ef1..1d0584ac9d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/rockstar/RockstarBackend.kt @@ -14,6 +14,7 @@ import com.droiddeck.launcher.stores.StoreFront import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.StoreLoginActivity import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.StoreLibraryCache import com.droiddeck.launcher.stores.StoresState import com.droiddeck.launcher.stores.WebCookies import com.droiddeck.launcher.stores.download.DownloadEntry @@ -163,7 +164,16 @@ object RockstarLibrary { post(gen) { StoresState.status.remove(Store.ROCKSTAR); StoresState.problems[Store.ROCKSTAR] = app.getString(R.string.stores_sync_sign_in) } return } - if (StoresState.library[Store.ROCKSTAR].isNullOrEmpty()) post(gen) { StoresState.status[Store.ROCKSTAR] = app.getString(R.string.stores_sync_game_list) } + val cached = StoreLibraryCache.load(app, Store.ROCKSTAR) + post(gen) { + if (StoresState.library[Store.ROCKSTAR] == null) { + if (cached != null) { + StoresState.library[Store.ROCKSTAR] = cached + StoresState.shelves[Store.ROCKSTAR]?.let { StoresState.shelves[Store.ROCKSTAR] = StoreFront.markOwned(it, cached, RockstarCatalog::sameGame) } + } + else StoresState.status[Store.ROCKSTAR] = app.getString(R.string.stores_sync_game_list) + } + } val account = RockstarApps.fetch(t.ticket) { StoresState.logLine(it) } val games = games(account) owned(account).filter { o -> games.none { it.id == o.id } }.takeIf { it.isNotEmpty() }?.let { elsewhere -> @@ -175,6 +185,7 @@ object RockstarLibrary { StoresState.library[Store.ROCKSTAR] = games StoresState.shelves[Store.ROCKSTAR]?.let { StoresState.shelves[Store.ROCKSTAR] = StoreFront.markOwned(it, games, RockstarCatalog::sameGame) } } + StoreLibraryCache.save(app, Store.ROCKSTAR, games) { generation.get() == gen } StoresState.logLine("Rockstar: ${games.size} owned games") } catch (e: Exception) { StoresState.logLine("Rockstar: library sync failed: ${e.javaClass.simpleName} ${e.message.orEmpty().take(300)}") diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt index 5d1a8c31bc..ba3053ef7c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt @@ -15,6 +15,7 @@ import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.StoreLoginActivity +import com.droiddeck.launcher.stores.StoreLibraryCache import com.droiddeck.launcher.stores.StoresState import com.droiddeck.launcher.stores.WebCookies import org.json.JSONObject @@ -206,7 +207,16 @@ object UbisoftLibrary { post(gen) { StoresState.status.remove(Store.UBISOFT); StoresState.problems[Store.UBISOFT] = app.getString(R.string.stores_sync_sign_in) } return } - if (StoresState.library[Store.UBISOFT].isNullOrEmpty()) post(gen) { StoresState.status[Store.UBISOFT] = app.getString(R.string.stores_sync_game_list) } + val cached = StoreLibraryCache.load(app, Store.UBISOFT) + post(gen) { + if (StoresState.library[Store.UBISOFT] == null) { + if (cached != null) { + StoresState.library[Store.UBISOFT] = cached + StoresState.shelves[Store.UBISOFT]?.let { StoresState.shelves[Store.UBISOFT] = StoreFront.markOwned(it, cached, UbisoftStore::sameGame) } + } + else StoresState.status[Store.UBISOFT] = app.getString(R.string.stores_sync_game_list) + } + } val all = ArrayList() var offset = 0 while (true) { @@ -241,6 +251,7 @@ object UbisoftLibrary { StoresState.library[Store.UBISOFT] = games StoresState.shelves[Store.UBISOFT]?.let { StoresState.shelves[Store.UBISOFT] = StoreFront.markOwned(it, games, UbisoftStore::sameGame) } } + StoreLibraryCache.save(app, Store.UBISOFT, games) { generation.get() == gen } StoresState.logLine("Ubisoft: ${games.size} owned games") } catch (e: Exception) { StoresState.logLine("Ubisoft: library sync failed: ${e.javaClass.simpleName} ${e.message.orEmpty().take(200)}") 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 530eca4e58..47cc21e5f6 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 @@ -1,18 +1,27 @@ package com.droiddeck.launcher.stores.xbox import android.annotation.SuppressLint +import android.content.Intent import android.graphics.Color import android.net.Uri import android.os.Bundle import android.util.Log +import android.util.TypedValue +import android.view.Gravity +import android.view.View +import android.view.ViewGroup import android.webkit.CookieManager import android.webkit.WebResourceRequest import android.webkit.WebView import android.webkit.WebViewClient import android.widget.Button +import android.widget.FrameLayout +import android.widget.ImageButton import android.widget.LinearLayout +import android.widget.ProgressBar import android.widget.TextView import androidx.activity.ComponentActivity +import com.droiddeck.launcher.R import androidx.webkit.WebViewCompat import androidx.webkit.WebViewFeature import com.droiddeck.launcher.core.AddonPack @@ -24,8 +33,10 @@ import org.json.JSONObject import java.util.concurrent.TimeUnit class XboxLoginActivity : ComponentActivity() { - private lateinit var host: LinearLayout + private lateinit var host: FrameLayout private lateinit var status: TextView + private lateinit var retry: Button + private lateinit var progressBar: ProgressBar private var view: WebView? = null @Volatile private var child: Xodus.Child? = null @Volatile private var session = 0L @@ -37,11 +48,7 @@ class XboxLoginActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) - host = LinearLayout(this).apply { orientation = LinearLayout.VERTICAL; setBackgroundColor(Color.BLACK) } - status = TextView(this).apply { setTextColor(Color.WHITE); text = "Preparing Microsoft sign-in…"; setPadding(24, 16, 24, 16) } - host.addView(status) - host.addView(Button(this).apply { text = getString(com.droiddeck.launcher.R.string.stores_login_close); setOnClickListener { finish() } }) - setContentView(host) + setContentView(buildChrome()) if (android.os.Build.VERSION.SDK_INT < 28 || !WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER) || !WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) { status.text = "Update Android System WebView to sign in to Xbox." @@ -148,15 +155,60 @@ class XboxLoginActivity : ComponentActivity() { val failed = step val reason = failure(e) logStep("failed while $failed: $reason") + if (e is java.io.IOException) logStep("I/O detail: ${e.message.orEmpty().take(300)}") runOnUiThread { disposeView() val details = if (codes.isEmpty()) "" else "\nDetails: ${codes.joinToString(", ")}" - status.text = "Microsoft sign-in did not complete.\nFailed while $failed: $reason$details\nClose this window and try again." + status.text = "Microsoft sign-in did not complete.\nFailed while $failed: $reason$details" + retry.visibility = View.VISIBLE } } }, "xbox-login").start() } + private fun dp(value: Int): Int = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, value.toFloat(), resources.displayMetrics).toInt() + + /** The other stores' sign-in frame: a title bar with close, a load bar, and a centered status. */ + private fun buildChrome(): View { + val root = LinearLayout(this).apply { orientation = LinearLayout.VERTICAL; setBackgroundColor(BACKGROUND) } + val bar = LinearLayout(this).apply { + orientation = LinearLayout.HORIZONTAL; gravity = Gravity.CENTER_VERTICAL; setBackgroundColor(BAR) + layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dp(48)) + } + bar.addView(TextView(this).apply { + text = getString(R.string.stores_login_title, Store.XBOX.label) + setTextColor(TEXT); textSize = 16f; setPadding(dp(16), 0, dp(8), 0) + layoutParams = LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f) + }) + bar.addView(ImageButton(this).apply { + setImageResource(android.R.drawable.ic_menu_close_clear_cancel); setBackgroundColor(Color.TRANSPARENT) + contentDescription = getString(R.string.stores_login_close); layoutParams = LinearLayout.LayoutParams(dp(48), dp(48)) + setOnClickListener { finish() } + }) + progressBar = ProgressBar(this, null, android.R.attr.progressBarStyleHorizontal).apply { + max = 100; visibility = View.GONE + layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dp(3)) + } + host = FrameLayout(this).apply { + setBackgroundColor(BACKGROUND) + layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f) + } + val panel = LinearLayout(this).apply { + orientation = LinearLayout.VERTICAL; gravity = Gravity.CENTER; setBackgroundColor(BACKGROUND) + setPadding(dp(24), dp(24), dp(24), dp(24)) + } + status = TextView(this).apply { setTextColor(TEXT); textSize = 15f; gravity = Gravity.CENTER; text = "Preparing Microsoft sign-in…" } + retry = Button(this).apply { + text = getString(R.string.stores_login_retry); visibility = View.GONE + setOnClickListener { startActivity(Intent(intent)); finish() } + } + panel.addView(status) + panel.addView(retry, LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { topMargin = dp(16) }) + host.addView(panel, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + root.addView(bar); root.addView(progressBar); root.addView(host) + return root + } + private fun show(text: String) = runOnUiThread { if (!closed && view == null) status.text = text } private fun progress(name: String, text: String) { step = name; show(text) } @@ -191,7 +243,6 @@ class XboxLoginActivity : ComponentActivity() { override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = !trusted(request.url.toString()) override fun onPageFinished(view: WebView, url: String) { if (!trusted(url)) { finish(); return } - status.text = "Microsoft sign-in" val uri = Uri.parse(url) if (uri.host == "login.live.com" && uri.path == "/ppsecure/post.srf") { view.evaluateJavascript("JSON.stringify(globalThis.ServerData ?? null)") { raw -> @@ -203,7 +254,14 @@ class XboxLoginActivity : ComponentActivity() { } } } - host.addView(web, LinearLayout.LayoutParams(-1, 0, 1f)) + web.setBackgroundColor(BACKGROUND) + web.webChromeClient = object : android.webkit.WebChromeClient() { + override fun onProgressChanged(view: WebView?, newProgress: Int) { + progressBar.progress = newProgress + progressBar.visibility = if (newProgress in 1..99) View.VISIBLE else View.GONE + } + } + host.addView(web, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) val headers = frame.getJSONObject("headers") val values = headers.keys().asSequence().associateWith { key -> require(key in allowedHeaders) @@ -212,7 +270,11 @@ class XboxLoginActivity : ComponentActivity() { web.loadUrl(frame.getString("url"), values) } - private fun disposeView() { view?.let { host.removeView(it); it.stopLoading(); it.destroy() }; view = null } + private fun disposeView() { + view?.let { host.removeView(it); it.stopLoading(); it.destroy() } + view = null + if (::progressBar.isInitialized) progressBar.visibility = View.GONE + } override fun onDestroy() { closed = true val current = child; child = null @@ -225,6 +287,9 @@ class XboxLoginActivity : ComponentActivity() { companion object { private const val TAG = "XboxLogin" + private const val BACKGROUND = 0xFF0A0B0D.toInt() + private const val BAR = 0xFF121417.toInt() + private const val TEXT = 0xFFF2F4F7.toInt() internal fun failure(e: Exception): String { val message = e.message.orEmpty() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index ae1826bbde..0a02ebf9ba 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -50,7 +50,7 @@ import androidx.compose.material.icons.outlined.Mic import androidx.compose.material.icons.outlined.Add import androidx.compose.material.icons.outlined.ArrowDownward import androidx.compose.material.icons.outlined.AttachFile -import androidx.compose.material.icons.outlined.AutoAwesome +import androidx.compose.material.icons.outlined.Terminal import androidx.compose.material.icons.outlined.Build import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.ExpandMore @@ -451,7 +451,7 @@ private fun AgentConversation(modifier: Modifier, list: LazyListState, following } if (AgentHost.entries.isEmpty() && !working) { Column(modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) { - Icon(Icons.Outlined.AutoAwesome, null, tint = pal.primary, modifier = Modifier.size(40.dp)) + Icon(Icons.Outlined.Terminal, null, tint = pal.primary, modifier = Modifier.size(40.dp)) Text(stringResource(R.string.agent_empty), fontSize = 15.sp, color = pal.onSurfaceVariant, textAlign = TextAlign.Center, modifier = Modifier.widthIn(max = 460.dp).padding(top = 12.dp)) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt index ce4135a73e..3fc46e09b1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt @@ -416,7 +416,7 @@ private fun ToolsRow(title: String, detail: String, action: @Composable () -> Un } @Composable -private fun ToolsField(value: String, onValue: (String) -> Unit, hint: String, tag: String) { +internal fun ToolsField(value: String, onValue: (String) -> Unit, hint: String, tag: String) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current Box(Modifier.fillMaxWidth().clip(Shape12).background(pal.surfaceVariant).padding(horizontal = 12.dp, vertical = 10.dp)) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt index 2fd0249f1e..653e8eedb6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt @@ -96,27 +96,61 @@ internal fun AgentSetupView(modifier: Modifier, onDone: () -> Unit = {}) { ) { steps.forEachIndexed { index, step -> val status = AgentSetup.status[step] ?: Status.UNKNOWN - val (title, hint) = labels(step, AgentHost.harness.name) + val harness = AgentHost.harness + // A harness that signs in with a pasted key: the sign-in opens its key page and this field takes the key. + val keyed = step == Step.SIGN_IN && harness.keyPage != null + var keyOpen by rememberSaveable(harness.id) { mutableStateOf(false) } + val (title, hint) = labels(step, harness.name, keyed) val lab = AgentHost.lab?.takeIf { it.prepare && it.running } - val detail = if (step == Step.PREPARE && lab != null) - stringResource(R.string.agent_prepare_progress, lab.permille / 10, clock(lab.etaSeconds.toLong().coerceAtLeast(0))) - else AgentSetup.detail[step] ?: hint + val detail = when { + step == Step.PREPARE && lab != null -> + stringResource(R.string.agent_prepare_progress, lab.permille / 10, clock(lab.etaSeconds.toLong().coerceAtLeast(0))) + keyed && status == Status.DONE && !AgentSetup.keySaved -> stringResource(R.string.agent_step_free_models) + else -> AgentSetup.detail[step] ?: hint + } + // Shown while the sign-in is pending, so it is still there after a trip to the browser for the key. + val pending = (status == Status.TODO || status == Status.FAILED) && AgentSetup.status[Step.INSTALL] == Status.DONE + val showKey = keyed && (keyOpen || pending) && status != Status.WORKING + var key by remember(harness.id) { mutableStateOf("") } CheckRow( when (status) { Status.DONE -> CheckState.OK Status.WORKING, Status.UNKNOWN -> CheckState.BUSY Status.TODO, Status.FAILED -> CheckState.WARN }, - title, detail, divider = index < steps.lastIndex, + title, detail, divider = index < steps.lastIndex && !showKey, ) { val blocked = (step in setOf(Step.SIGN_IN, Step.GITHUB, Step.BUILD_TOOLS) && AgentSetup.status[Step.INSTALL] != Status.DONE) || (step == Step.PREPARE && AgentSetup.status[Step.BUILD_TOOLS] != Status.DONE) + val openKey = { + keyOpen = true + AgentSetup.run(context, step) + } if ((status == Status.TODO || status == Status.FAILED) && !blocked) { val label = stringResource(if (status == Status.FAILED) R.string.agent_setup_retry else action(step)) - val run = { if (step == Step.CONNECTION) pair(context) else AgentSetup.run(context, step) } - if (step.required) PrimaryButton(label, compact = true, onClick = run) else SecondaryButton(label, compact = true, onClick = run) + val run = { if (step == Step.CONNECTION) pair(context) else if (keyed) openKey() else AgentSetup.run(context, step) } + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + if (keyed && harness.free) SecondaryButton(stringResource(R.string.agent_action_free), compact = true) { AgentSetup.useFree(context) } + if (step.required) PrimaryButton(label, compact = true, onClick = run) else SecondaryButton(label, compact = true, onClick = run) + } + } else if (keyed && status == Status.DONE && !AgentSetup.keySaved && !keyOpen) { + SecondaryButton(stringResource(R.string.agent_action_add_key), compact = true, onClick = openKey) } } + if (showKey) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().padding(start = 56.dp, end = 14.dp, bottom = 10.dp), + ) { + Box(Modifier.weight(1f)) { ToolsField(key, { key = it.trim() }, stringResource(R.string.agent_key_hint), "agent-key") } + PrimaryButton(stringResource(R.string.agent_key_save), enabled = key.isNotBlank(), compact = true) { + keyOpen = false + AgentSetup.saveKey(context, key) + key = "" + } + } + if (index < steps.lastIndex) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } } } Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(horizontal = 2.dp)) { @@ -183,6 +217,7 @@ private fun StorageCard() { private fun storageTitle(item: AgentStorage.Item) = when (item) { AgentStorage.Item.CLAUDE_CODE -> R.string.agent_storage_claude AgentStorage.Item.CODEX -> R.string.agent_storage_codex + AgentStorage.Item.OPENCODE -> R.string.agent_storage_opencode AgentStorage.Item.BUILD_TOOLS -> R.string.agent_step_build AgentStorage.Item.SOURCE -> R.string.agent_storage_source AgentStorage.Item.CACHES -> R.string.agent_storage_caches @@ -195,10 +230,10 @@ private fun storageWarning(item: AgentStorage.Item) = when (item) { } @Composable -private fun labels(step: Step, harness: String): Pair = when (step) { +private fun labels(step: Step, harness: String, keyed: Boolean = false): Pair = when (step) { Step.CONNECTION -> stringResource(R.string.agent_step_connection) to stringResource(R.string.agent_step_connection_hint) Step.INSTALL -> stringResource(R.string.agent_step_install, harness) to stringResource(R.string.agent_step_install_hint) - Step.SIGN_IN -> stringResource(R.string.agent_step_sign_in, harness) to stringResource(R.string.agent_step_sign_in_hint) + Step.SIGN_IN -> stringResource(R.string.agent_step_sign_in, harness) to stringResource(if (keyed) R.string.agent_step_sign_in_key_hint else R.string.agent_step_sign_in_hint) Step.GITHUB -> stringResource(R.string.agent_step_github) to stringResource(R.string.agent_step_github_hint) Step.BUILD_TOOLS -> stringResource(R.string.agent_step_build) to stringResource(R.string.agent_step_build_hint) Step.PREPARE -> stringResource(R.string.agent_step_prepare) to stringResource(R.string.agent_step_prepare_hint) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt index 28768454c3..9d3a84e7a5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt @@ -156,7 +156,10 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie }, rows = { tab -> if (tab == SheetTab.FILES) DesktopFiles(s, a) - else a.modeSheet(mode, tab, SheetExtras()) + else a.modeSheet(mode, tab, SheetExtras( + performance = { PerformanceLink(a, "desktop", SheetTab.SESSION) }, + drivers = { summary -> DriversLink(a, summary, "desktop", stringResource(R.string.hop_from_play)) }, + )) }, ) if (adding && !s.busy) AddAppDialog(s.ready, onDismiss = { adding = false }) { request, label -> UserAppsState.add(ctx, request, label) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DownloadsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DownloadsPage.kt new file mode 100644 index 0000000000..b32ad6b87f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/DownloadsPage.kt @@ -0,0 +1,70 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.expandVertically +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkVertically +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +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.filled.Settings +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.positionInRoot +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R + +internal object DownloadsNav { + var showSettings = false +} + +@Composable +internal fun DownloadsPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { + val pal = LocalPalette.current + val live = androidx.compose.runtime.rememberUpdatedState(s) + var gearAt by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(null) } + val openSettings = { gearAt?.let { StoresMotion.ask(downloadsSettingsStep(it, live, a, pal.signal)) } } + androidx.compose.runtime.LaunchedEffect(gearAt != null) { + if (gearAt != null && DownloadsNav.showSettings) { DownloadsNav.showSettings = false; openSettings() } + } + var hostAt by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(androidx.compose.ui.geometry.Offset.Zero) } + androidx.compose.runtime.DisposableEffect(Unit) { val page = Any(); StoresMotion.hosting(page); onDispose { StoresMotion.release(page) } } + androidx.activity.compose.BackHandler(enabled = StoresMotion.stepOpen) { StoresMotion.fold() } + androidx.compose.foundation.layout.Box(androidx.compose.ui.Modifier.fillMaxSize().onGloballyPositioned { hostAt = it.positionInRoot() }) { + Column(modifier.verticalScroll(rememberScrollState()).padding(bottom = 24.dp)) { + PageHeader(stringResource(R.string.stores_tab_downloads)) { + Spacer(Modifier.weight(1f)) + androidx.compose.foundation.layout.Box(Modifier.onGloballyPositioned { gearAt = it.boundsInRoot() }) { + SmallIconButton(Icons.Filled.Settings, stringResource(R.string.downloads_settings), tint = MaterialTheme.colorScheme.onSurfaceVariant) { + openSettings() + } + } + } + StoresDownloadsPane(s, a) + } + StoresMotion.step?.let { ask -> + androidx.compose.runtime.key(ask) { + StepOut( + 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, + ) + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DrawerEntryHint.kt b/app/src/main/java/com/droiddeck/launcher/ui/DrawerEntryHint.kt new file mode 100644 index 0000000000..59c87675e9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/DrawerEntryHint.kt @@ -0,0 +1,101 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInHorizontally +import androidx.compose.animation.slideOutHorizontally +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.gestures.detectTapGestures +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.displayCutout +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft +import androidx.compose.material3.Icon +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.input.pointer.pointerInput +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.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.SessionPrefs +import kotlinx.coroutines.delay + +private const val HINT_SESSIONS = 3 +private const val HINT_MS = 6_000L +private var hintedSession: Any? = null + +@Composable +internal fun DrawerEntryHint(steam: Boolean, inverted: Boolean, onOpen: () -> Unit) { + val context = LocalContext.current + var shown by remember { mutableStateOf(false) } + LaunchedEffect(Unit) { + val session = com.droiddeck.launcher.session.SessionState.sessionId + if (hintedSession == session || SessionPrefs.drawerHintShown(context) >= HINT_SESSIONS) return@LaunchedEffect + hintedSession = session + SessionPrefs.countDrawerHint(context) + shown = true + delay(HINT_MS) + shown = false + } + Box(Modifier.fillMaxSize().windowInsetsPadding(WindowInsets.displayCutout), contentAlignment = Alignment.CenterEnd) { + AnimatedVisibility(shown, enter = slideInHorizontally { it } + fadeIn(), exit = slideOutHorizontally { it } + fadeOut()) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier + .clip(RoundedCornerShape(topStart = 14.dp, bottomStart = 14.dp)) + .background(Color(0xE6101216)) + .clickable(role = Role.Button, onClickLabel = stringResource(R.string.drawer_handle)) { shown = false; onOpen() } + .padding(start = 10.dp, end = 14.dp, top = 10.dp, bottom = 10.dp) + .widthIn(max = 260.dp) + .testTag("drawer-hint"), + ) { + Icon(Icons.AutoMirrored.Filled.KeyboardArrowLeft, null, tint = Color.White, modifier = Modifier.size(20.dp)) + val bound = remember { + com.droiddeck.launcher.input.PhysicalShortcuts.read(context) + .filter { it.action == com.droiddeck.launcher.input.PhysicalShortcuts.Action.DROIDDECK } + .map { it.button.label }.distinct().joinToString(" / ") + } + Text( + if (bound.isNotEmpty()) stringResource(R.string.drawer_hint_button, bound) + else stringResource(if (!steam) R.string.drawer_hint else if (inverted) R.string.drawer_hint_steam_inverted else R.string.drawer_hint_steam), + fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = Color.White, + ) + } + } + } +} + +@Composable +internal fun DrawerCornerTap(onOpen: () -> Unit) { + Box(Modifier.fillMaxSize().windowInsetsPadding(WindowInsets.displayCutout), contentAlignment = Alignment.TopEnd) { + Box( + Modifier.size(64.dp).testTag("drawer-corner") + .pointerInput(Unit) { detectTapGestures(onDoubleTap = { onOpen() }) }, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index 65a65502f2..cb5d4795f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -37,6 +37,11 @@ internal fun DroidDeckHudSettings(host: MenuHost, a: DrawerActions, track: (Stri DroidDeckHudSize.STRIP to stringResource(R.string.hud_size_strip), ), size, chipModifier = track("hud-size")) { a.onHudSetting("hudSize", it.token) } + ChoiceRow(host, "hud-hold", stringResource(R.string.hud_hold), null, + listOf("collapse" to stringResource(R.string.hud_hold_collapse), + DroidDeckHudConfig.HOLD_LOCKS to stringResource(R.string.hud_hold_lock)), + if (cfg["hudHold"] == DroidDeckHudConfig.HOLD_LOCKS) DroidDeckHudConfig.HOLD_LOCKS else "collapse", + chipModifier = track("hud-hold")) { a.onHudSetting("hudHold", it) } 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"), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DropSheet.kt b/app/src/main/java/com/droiddeck/launcher/ui/DropSheet.kt index 317d9b0ce4..c0b4ac7a8a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DropSheet.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DropSheet.kt @@ -465,7 +465,7 @@ internal fun BoxWithConstraintsScope.DropSheet( var handleSize by remember { mutableStateOf(androidx.compose.ui.unit.IntSize.Zero) } val lipH = 32.dp + state.pull.value.dp val drop = { if (!state.open && enabled) state.open = true } - val settingsLabel = stringResource(R.string.drawer_page_settings) + val settingsLabel = stringResource(R.string.sheet_lip) Box( contentAlignment = Alignment.BottomCenter, modifier = Modifier 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 8049dc3c40..a8aa6914ad 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -251,6 +251,18 @@ private fun Content( } return } + if (selected == "downloads") { + DownloadsPage(s, a, modifier.padding(horizontal = padH).padding(top = padV)) + return + } + if (selected == "storage") { + StorageTabPage(s, a, modifier.padding(horizontal = padH).padding(top = padV)) + return + } + if (selected == "sync") { + SyncTabPage(s, modifier.padding(horizontal = padH).padding(top = padV)) + return + } if (selected == "updates") { UpdatesPage(s, a, modifier.padding(horizontal = padH).padding(top = padV)) return @@ -280,7 +292,10 @@ private fun Content( return } if (selected == NavTabs.MORE) { - MorePage(s, a, onSelect, modifier.padding(horizontal = padH).padding(top = padV)) + Box(modifier) { + MorePage(s, a, onSelect, Modifier.padding(horizontal = padH).padding(top = padV)) + EditTabsSheet(s, a) + } return } if (selected == "agent") { 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 0916dfc39f..ea87d38700 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -47,7 +47,10 @@ import androidx.compose.foundation.relocation.bringIntoViewRequester import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Apps -import androidx.compose.material.icons.outlined.AutoAwesome +import androidx.compose.material.icons.outlined.Download +import androidx.compose.material.icons.outlined.SdStorage +import androidx.compose.material.icons.outlined.Sync +import androidx.compose.material.icons.outlined.Terminal import androidx.compose.material.icons.outlined.DesktopWindows import androidx.compose.material.icons.outlined.Layers import androidx.compose.material.icons.outlined.LocalMall @@ -196,29 +199,33 @@ internal fun railLabelIcon(key: String): Pair = when (key) { "games" -> R.string.rail_games to Icons.Outlined.VideoLibrary "soundtracks" -> R.string.rail_music to SoundtrackIcon "stores" -> R.string.rail_stores to Icons.Outlined.LocalMall + "downloads" -> R.string.stores_tab_downloads to Icons.Outlined.Download "desktop" -> R.string.rail_desktop to Icons.Outlined.DesktopWindows "components" -> R.string.rail_components to Icons.Outlined.Layers - "agent" -> R.string.rail_agent to Icons.Outlined.AutoAwesome + "agent" -> R.string.rail_agent to Icons.Outlined.Terminal "android-apps" -> R.string.rail_apps to Icons.Outlined.Apps "setup" -> R.string.rail_setup to Icons.Outlined.Tune "trinkets" -> R.string.rail_trinkets to Icons.Outlined.Toys + "storage" -> R.string.rail_storage to Icons.Outlined.SdStorage + "sync" -> R.string.rail_sync to Icons.Outlined.Sync NavTabs.MORE -> R.string.rail_more to Icons.Outlined.MoreHoriz else -> R.string.rail_updates to Icons.Outlined.SystemUpdate } internal fun setupNeedsAttention(s: FrontEndState): Boolean = !s.ready || (s.available != null && s.available != s.installed) || - PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) || com.droiddeck.launcher.sync.Syncthing.needsAttention + PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) internal fun railBadge(s: FrontEndState, key: String, setupNeedsAttention: Boolean = setupNeedsAttention(s)): Boolean = when (key) { "setup" -> setupNeedsAttention + "sync" -> com.droiddeck.launcher.sync.Syncthing.needsAttention "updates" -> s.updates.hasUpdate NavTabs.MORE -> NavTabs.more(s).any { it != NavTabs.MORE && railBadge(s, it, setupNeedsAttention) } else -> false } internal fun railCount(s: FrontEndState, key: String): Int = when (key) { - "stores" -> s.storeDownloadsActive - NavTabs.MORE -> if ("stores" in NavTabs.more(s)) s.storeDownloadsActive else 0 + "downloads" -> s.storeDownloadsActive + NavTabs.MORE -> if ("downloads" in NavTabs.more(s)) s.storeDownloadsActive else 0 else -> 0 } @@ -228,13 +235,15 @@ private fun NavigationItems( place: (String) -> Modifier, onSelect: (String) -> Unit, onFocusSelect: (String) -> Unit, ) { val setupNeedsAttention = setupNeedsAttention(s) + val downloadsAt = if ("downloads" in NavTabs.more(s)) NavTabs.MORE else "downloads" for (key in navigationKeys(s)) { val (label, icon) = railLabelIcon(key) key(key) { RailItem(stringResource(label), icon, key, shown == key, compact, iconOnly, height, width, badge = railBadge(s, key, setupNeedsAttention), count = railCount(s, key), - place = place, onFocus = { onFocusSelect(key) }) { onSelect(key) } + place = { k -> if (k == downloadsAt) place(k).onGloballyPositioned { StoresMotion.downloadsChip = it.boundsInRoot() } else place(k) }, + onFocus = { onFocusSelect(key) }) { onSelect(key) } } } } 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 369f78edff..0475e69d3c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.ui.input.pointer.pointerInput import java.io.File import androidx.compose.ui.res.stringResource import com.droiddeck.launcher.R @@ -246,6 +247,7 @@ class FrontEndActions( val onAddonDelete: (com.droiddeck.launcher.runtime.WowAddons.Target, String) -> Unit = { _, _ -> }, val onSaveExport: (Library.SteamGame, com.droiddeck.launcher.session.GameSaves.Layout) -> Unit = { _, _ -> }, val onPerformance: () -> Unit, + val performancePanel: @Composable () -> Unit = {}, val onRoms: () -> Unit, val onFiles: () -> Unit, val onBrowseFiles: (File) -> Unit = {}, @@ -455,16 +457,26 @@ fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () - val frontFocus = remember { FrontFocus() } val textInput = androidx.compose.ui.platform.LocalTextInputService.current val bottomTextInput = remember(textInput) { textInput?.let { androidx.compose.ui.text.input.TextInputService(BottomScreenTextInput(it)) } } - androidx.compose.foundation.layout.BoxWithConstraints(Modifier.fillMaxSize()) { + androidx.compose.foundation.layout.BoxWithConstraints(Modifier.fillMaxSize().pointerInput(Unit) { + awaitPointerEventScope { + while (true) { + val e = awaitPointerEvent(androidx.compose.ui.input.pointer.PointerEventPass.Initial) + e.changes.firstOrNull { it.pressed && !it.previousPressed }?.let { StoresMotion.touched(it.position) } + } + } + }) { CompositionLocalProvider( LocalFrontFocus provides frontFocus, LocalNarrowPane provides (maxWidth < NarrowPaneWidth), androidx.compose.ui.platform.LocalTextInputService provides (if (s.dualScreen) bottomTextInput else textInput), LocalBottomTyping provides s.dualScreen, ) { FrontEndScreenBody(s, a, page, frontFocus) } + DownloadFlights() } } +private val SETTINGS_NAV = SettingsSection.entries.map { "settings:${it.key}" }.toSet() + "settings" + @OptIn(ExperimentalComposeUiApi::class) @Composable private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)?, frontFocus: FrontFocus) { @@ -475,11 +487,12 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com LaunchedEffect(s.navigate) { val target = s.navigate ?: return@LaunchedEffect when (target) { - "stores:downloads" -> { com.droiddeck.launcher.stores.StoresState.openDownloads = true; selected = "stores" } + "stores:downloads" -> selected = "downloads" "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" } + in SETTINGS_NAV -> { SetupTabs.openSection = SettingsSection.of(target.removePrefix("settings:")) ?: SettingsSection.OVERVIEW; selected = "setup" } com.droiddeck.launcher.core.AppUiPrefs.HOME_PAGE_APPS -> { // Home lands on the apps page itself, so a page open over the rail (Components, Performance) closes first. if (s.pageKey != null) a.onPageBack() @@ -595,7 +608,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com val openTab = when { Hops.origin != null && s.pageKey == Hops.origin?.page -> Hops.origin!!.dest - s.pageKey == "performance" -> "steam" + s.pageKey == "performance" -> "setup" s.pageKey == "controller-mapping" -> "setup" selected.startsWith("app:") -> "games" selected.startsWith("sound:") -> "soundtracks" @@ -616,10 +629,29 @@ 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) + if (com.droiddeck.launcher.storage.StorageState.openPending) { + com.droiddeck.launcher.storage.StorageState.openPending = false + showRailPage("storage", true) + } } LaunchedEffect(com.droiddeck.launcher.sync.Syncthing.openRequests) { - if (com.droiddeck.launcher.sync.Syncthing.openPending) showRailPage("setup", true) + if (com.droiddeck.launcher.sync.Syncthing.openPending) { + com.droiddeck.launcher.sync.Syncthing.openPending = false + showRailPage("sync", true) + } + } + LaunchedEffect(com.droiddeck.launcher.stores.StoresState.openDownloads) { + if (com.droiddeck.launcher.stores.StoresState.openDownloads) { + com.droiddeck.launcher.stores.StoresState.openDownloads = false + showRailPage("downloads", true) + } + } + LaunchedEffect(RailRequest.key) { + RailRequest.key?.let { showRailPage(it, true) } + RailRequest.key = null + } + LaunchedEffect(SetupTabs.openSection) { + if (SetupTabs.openSection != null && (railSelection != "setup" || s.pageKey != null)) showRailPage("setup", true) } val onRailFocus: (String) -> Unit = { key -> if (key != railSelection) showRailPage(key, false) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index cb5d228a7a..a70d411f40 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -86,16 +86,19 @@ import com.droiddeck.launcher.R internal enum class CheckState { OK, WARN, BUSY } -private const val STORAGE_TAB = 3 -private const val LAUNCHER_TAB = 2 +private val OVERVIEW_TAB = SettingsSection.OVERVIEW.ordinal +private val PERFORMANCE_TAB = SettingsSection.PERFORMANCE.ordinal +private val CONTROLLER_TAB = SettingsSection.CONTROLLER.ordinal +private val GLASSES_TAB = SettingsSection.GLASSES.ordinal +private val LAUNCHER_TAB = SettingsSection.LAUNCHER.ordinal +private val DEVELOPER_TAB = SettingsSection.DEVELOPER.ordinal internal object SetupTabs { var openLauncher = false var focusTabs = false var openOverview = false + var openSection by mutableStateOf(null) } -private const val GLASSES_TAB = 6 -private const val SYNC_TAB = 4 @Composable internal fun CheckRow(state: CheckState, title: String, detail: String?, divider: Boolean = true, action: (@Composable () -> Unit)? = null) { @@ -193,40 +196,28 @@ 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_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) } + val tabs = SettingsSection.entries.map { stringResource(it.title) } + var tab by rememberSaveable { mutableStateOf(SetupTabs.openSection?.ordinal ?: if (SetupTabs.openLauncher) LAUNCHER_TAB else OVERVIEW_TAB) } + var query by rememberSaveable { mutableStateOf("") } + var searching by rememberSaveable { mutableStateOf(false) } var logsRefresh by remember { mutableStateOf(0) } var deleteSessionLogs by remember { mutableStateOf(null) } SetupTabs.openLauncher = false - if (SetupTabs.openOverview) { tab = 0; SetupTabs.openOverview = false } + if (SetupTabs.openOverview) { tab = OVERVIEW_TAB; SetupTabs.openOverview = false } + LaunchedEffect(SetupTabs.openSection) { + SetupTabs.openSection?.let { tab = it.ordinal; searching = false; query = "" } + SetupTabs.openSection = null + } val chipFocus = remember { List(tabs.size) { FocusRequester() } } var tabTurned by remember { mutableStateOf(false) } - val pick: (Int) -> Unit = { i -> tab = i; tabTurned = true; if (i == 5) logsRefresh++ } + val pick: (Int) -> Unit = { i -> tab = i; tabTurned = true; searching = false; query = ""; if (i == DEVELOPER_TAB) logsRefresh++ } val inputModeManager = LocalInputModeManager.current - LaunchedEffect(com.droiddeck.launcher.storage.StorageState.openRequests) { - if (com.droiddeck.launcher.storage.StorageState.openPending) { - com.droiddeck.launcher.storage.StorageState.openPending = false - tab = STORAGE_TAB - } - } LaunchedEffect(Unit) { while (true) { kotlinx.coroutines.delay(2_000) a.onRefreshPhantomStatus() } } - LaunchedEffect(com.droiddeck.launcher.sync.Syncthing.openRequests) { - if (com.droiddeck.launcher.sync.Syncthing.openPending) { - com.droiddeck.launcher.sync.Syncthing.openPending = false - tab = SYNC_TAB - } - } - var syncAdvanced by rememberSaveable { mutableStateOf(false) } - if (syncAdvanced) { - androidx.activity.compose.BackHandler { syncAdvanced = false } - SyncAdvancedPage(host) { syncAdvanced = false } - return - } LaunchedEffect(tab) { if (tabTurned && inputModeManager.inputMode == InputMode.Keyboard) { androidx.compose.runtime.withFrameNanos { } @@ -246,10 +237,18 @@ internal fun SetupPanel( ) { PageHeader(stringResource(R.string.setup_title)) { Box(Modifier.weight(1f)) { SheetChips(tabs, tab, chipFocus, onPick = pick) } + if (!searching) SearchIcon(stringResource(R.string.settings_search)) { searching = true } } - Column(modifier = Modifier.weight(1f).fillMaxWidth().then(if (tab == 1) Modifier else Modifier.verticalScroll(rememberScrollState())).padding(bottom = if (tab == 1) 0.dp else 24.dp)) { - when (tab) { - 0 -> { + if (searching) { + androidx.activity.compose.BackHandler { searching = false; query = "" } + SettingsSearchField(query, { query = it }) { searching = false; query = "" } + } + val listing = searching && query.isNotBlank() + val fixed = tab == CONTROLLER_TAB && !listing + Column(modifier = Modifier.weight(1f).fillMaxWidth().then(if (fixed) Modifier else Modifier.verticalScroll(rememberScrollState())).padding(bottom = if (fixed) 0.dp else 24.dp)) { + if (listing) SettingsSearchResults(query) { section -> pick(section.ordinal) } + else when (tab) { + OVERVIEW_TAB -> { // Setup's "Safe mode" row, under the GPU row while the bridge is on and can be used here. val bridgeModeRow = !s.adreno && s.vkBridge && com.droiddeck.launcher.core.DeviceSupport.bridgeUsable() val gpuCheck: @Composable (Boolean) -> Unit = { divider -> @@ -413,12 +412,16 @@ internal fun SetupPanel( SettingsGroup(stringResource(R.string.setup_runtime)) { runtimeCheck(false) } SteamIntegrationGroup(s.integration, s.integrationFocus, a.onIntegration, a.onIntegrationAppInfo, a.onIntegrationLocation) } - 1 -> { + PERFORMANCE_TAB -> { + a.performancePanel() + MemoryGroup(s, a, host, onPairWirelessDebugging) + } + CONTROLLER_TAB -> { val controller = s.controller - if (controller != null && a.controller != null) InputSettingsPage(onBack = { pick(0) }, embedded = true) + if (controller != null && a.controller != null) InputSettingsPage(onBack = { pick(OVERVIEW_TAB) }, embedded = true) if (s.controller == null || a.controller == null) Note(stringResource(R.string.setup_controller_unavailable)) } - 2 -> { + LAUNCHER_TAB -> { val look: @Composable () -> Unit = { SettingsGroup(stringResource(R.string.setup_group_look)) { SettingsRow(stringResource(R.string.setup_theme), stringResource(R.string.setup_theme_hint)) { @@ -461,7 +464,6 @@ internal fun SetupPanel( LanguageRow(host, s.language, a.onLanguage) if (s.soundtracksEnabled) ToggleRow(host, "soundtracks-ingame", stringResource(R.string.setup_soundtracks_ingame), stringResource(R.string.setup_soundtracks_ingame_hint), s.soundtracksIngame, onChange = a.onSoundtracksIngame) } - TabsSettingsGroup(host, s, a) } val device: @Composable () -> Unit = { SettingsGroup(stringResource(R.string.setup_group_device)) { @@ -588,12 +590,16 @@ internal fun SetupPanel( } else Column { look(); device(); art(); download() } } } - STORAGE_TAB -> StoragePanel(s, a) - SYNC_TAB -> SyncPanel(host, runtimeOk) { syncAdvanced = true } - 5 -> { - SettingsGroup(stringResource(R.string.setup_tab_diagnostics)) { + DEVELOPER_TAB -> { + val devContext = LocalContext.current + SettingsGroup(stringResource(R.string.dev_tools_title)) { + ToggleRow(host, "developer-tools", stringResource(R.string.dev_tools_title), stringResource(R.string.dev_tools_hint), DeveloperTools.on) { + DeveloperTools.set(devContext, it) + } + } + SettingsGroup(stringResource(R.string.dev_group_logs)) { ToggleRow(host, "logs", stringResource(R.string.setup_logs), stringResource(R.string.setup_logs_hint), s.logsEnabled) { a.onLogs() } - ToggleRow( + if (DeveloperTools.on) ToggleRow( host, "enhanced-diagnostics", stringResource(R.string.setup_enhanced_diagnostics), stringResource(R.string.setup_enhanced_diagnostics_hint), s.enhancedDiagnosticsArmed, ) { a.onEnhancedDiagnostics() } @@ -603,9 +609,9 @@ internal fun SetupPanel( s.gameDebugLogsEnabled, enabled = s.logsEnabled, ) { a.onGameDebugLogs() } - ToggleRow(host, "vacdiag", stringResource(R.string.setup_vac_diag), stringResource(R.string.setup_vac_diag_hint), s.vacDiagnostics) { a.onVacDiagnostics() } - ToggleRow(host, "agent-commands", stringResource(R.string.setup_agent_commands), null, s.agentCommands) { a.onAgentCommands() } - if (com.droiddeck.launcher.agent.AgentHost.available) { + if (DeveloperTools.on) ToggleRow(host, "vacdiag", stringResource(R.string.setup_vac_diag), stringResource(R.string.setup_vac_diag_hint), s.vacDiagnostics) { a.onVacDiagnostics() } + if (DeveloperTools.on) ToggleRow(host, "agent-commands", stringResource(R.string.setup_agent_commands), null, s.agentCommands) { a.onAgentCommands() } + if (DeveloperTools.on && com.droiddeck.launcher.agent.AgentHost.available) { val agentContext = androidx.compose.ui.platform.LocalContext.current ToggleRow(host, "agent-pet", stringResource(R.string.setup_agent_pet), stringResource(R.string.setup_agent_pet_hint), AgentPet.enabled) { AgentPet.set(agentContext, it) @@ -615,8 +621,8 @@ internal fun SetupPanel( stringResource(R.string.setup_agent_pet_allow), onClick = { AgentPet.requestFloating(agentContext) }, ) } - ToggleRow(host, "graphics-logs", stringResource(R.string.setup_graphics_logs), stringResource(R.string.setup_graphics_logs_hint), s.graphicsLogs) { a.onGraphicsLogs() } - if (!s.adreno && com.droiddeck.launcher.session.SessionPrefs.steamGpuCompositingAllowed()) ToggleRow(host, "steam-gpu-drawing", stringResource(R.string.setup_steam_gpu_drawing), stringResource(R.string.setup_steam_gpu_drawing_hint), s.steamGpuDrawing) { a.onSteamGpuDrawing() } + if (DeveloperTools.on) ToggleRow(host, "graphics-logs", stringResource(R.string.setup_graphics_logs), stringResource(R.string.setup_graphics_logs_hint), s.graphicsLogs) { a.onGraphicsLogs() } + if (DeveloperTools.on && !s.adreno && com.droiddeck.launcher.session.SessionPrefs.steamGpuCompositingAllowed()) ToggleRow(host, "steam-gpu-drawing", stringResource(R.string.setup_steam_gpu_drawing), stringResource(R.string.setup_steam_gpu_drawing_hint), s.steamGpuDrawing) { a.onSteamGpuDrawing() } ActionRow(stringResource(R.string.setup_latest_logs), stringResource(R.string.drawer_logs_hint), stringResource(R.string.drawer_share_logs), a.onShareLogs, progress = com.droiddeck.launcher.session.SessionLogShare.progress) androidx.compose.material3.HorizontalDivider() @@ -661,38 +667,6 @@ internal fun SetupPanel( ActionRow(stringResource(R.string.setup_reset_settings), stringResource(R.string.setup_reset_settings_hint), stringResource(R.string.setup_reset_settings_button), a.onResetSettings) } - SettingsGroup(stringResource(R.string.setup_group_memory)) { - ToggleRow( - host, "clear-cached-apps", stringResource(R.string.setup_clear_cached), - stringResource(if (s.adbPaired) R.string.setup_clear_cached_hint else R.string.setup_clear_cached_unpaired), - s.clearCachedApps, enabled = s.adbPaired || s.clearCachedApps, - ) { a.onClearCachedApps(it) } - ChoiceRow( - host, "background-app-limit", stringResource(R.string.setup_bg_limit), - stringResource(if (s.adbPaired) R.string.setup_bg_limit_hint else R.string.setup_clear_cached_unpaired), - listOf( - com.droiddeck.launcher.core.BackgroundAppLimit.OFF to stringResource(R.string.game_env_off), - 4 to stringResource(R.string.setup_bg_limit_4), - 1 to stringResource(R.string.setup_bg_limit_1), - 0 to stringResource(R.string.setup_bg_limit_0), - ), - s.backgroundAppLimit, enabled = s.adbPaired || s.backgroundAppLimit != com.droiddeck.launcher.core.BackgroundAppLimit.OFF, - onPick = a.onBackgroundAppLimit, - ) - ChoiceRow( - host, "memory-hud", stringResource(R.string.setup_memory_hud), stringResource(R.string.setup_memory_hud_hint), - listOf( - com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_OFF to stringResource(R.string.game_env_off), - com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_SIMPLE to stringResource(R.string.setup_memory_hud_simple), - com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_ADVANCED to stringResource(R.string.setup_memory_hud_advanced), - ), - s.memoryHud, onPick = a.onMemoryHud, - ) - if (!s.adbPaired) ActionRow( - stringResource(R.string.setup_adb_pair), stringResource(R.string.setup_adb_pair_hint), - stringResource(R.string.setup_adb_pair_button), onPairWirelessDebugging, - ) - } } GLASSES_TAB -> GlassesSetupPanel() } @@ -715,6 +689,42 @@ internal fun SetupPanel( } } +@Composable +private fun MemoryGroup(s: FrontEndState, a: FrontEndActions, host: MenuHost, onPairWirelessDebugging: () -> Unit) { + SettingsGroup(stringResource(R.string.setup_group_background_apps)) { + ToggleRow( + host, "clear-cached-apps", stringResource(R.string.setup_clear_cached), + stringResource(if (s.adbPaired) R.string.setup_clear_cached_hint else R.string.setup_clear_cached_unpaired), + s.clearCachedApps, enabled = s.adbPaired || s.clearCachedApps, + ) { a.onClearCachedApps(it) } + ChoiceRow( + host, "background-app-limit", stringResource(R.string.setup_bg_limit), + stringResource(if (s.adbPaired) R.string.setup_bg_limit_hint else R.string.setup_clear_cached_unpaired), + listOf( + com.droiddeck.launcher.core.BackgroundAppLimit.OFF to stringResource(R.string.game_env_off), + 4 to stringResource(R.string.setup_bg_limit_4), + 1 to stringResource(R.string.setup_bg_limit_1), + 0 to stringResource(R.string.setup_bg_limit_0), + ), + s.backgroundAppLimit, enabled = s.adbPaired || s.backgroundAppLimit != com.droiddeck.launcher.core.BackgroundAppLimit.OFF, + onPick = a.onBackgroundAppLimit, + ) + ChoiceRow( + host, "memory-hud", stringResource(R.string.setup_memory_hud), stringResource(R.string.setup_memory_hud_hint), + listOf( + com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_OFF to stringResource(R.string.game_env_off), + com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_SIMPLE to stringResource(R.string.setup_memory_hud_simple), + com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_ADVANCED to stringResource(R.string.setup_memory_hud_advanced), + ), + s.memoryHud, onPick = a.onMemoryHud, + ) + if (!s.adbPaired) ActionRow( + stringResource(R.string.setup_adb_pair), stringResource(R.string.setup_adb_pair_hint), + stringResource(R.string.setup_adb_pair_button), onPairWirelessDebugging, + ) + } +} + @Composable internal fun ReadinessCard( passing: Int, total: Int, line: String, open: Boolean, onDetails: () -> Unit, title: String? = null, ready: Boolean = passing == total, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index ddf5838be8..065b2183ff 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -59,7 +59,7 @@ import com.droiddeck.launcher.input.* import com.droiddeck.launcher.session.SessionState private data class SurfaceSnapshot(val elements: List, val actions: Map, - val clicks: Map, val scale: Float) + val clicks: Map, val scale: Float, val aspect: Float) private class GamepadScaler(private val context: android.content.Context, private val width: Int, private val height: Int) { private fun generator(scale: Float) = LegacyGamepadLayout(context, width, height, scale = scale) @@ -83,6 +83,7 @@ private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputB var clickProperties by mutableStateOf(false) var history by mutableStateOf>(emptyList()) var layoutScale by mutableFloatStateOf(layout.scale) + var aspect by mutableFloatStateOf(layout.aspect) private var scaleBase by mutableStateOf, List, Float>?>(null) private var scaleValue by mutableIntStateOf(100) private val rescales get() = gamepad != null && elements.any { it.id in gamepad.ids } @@ -94,9 +95,14 @@ private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputB val positioned get() = (if (rescales) gamepad!!.reset(elements) else defaults?.let { elements.withPositionsOf(it) }) ?.takeIf { it != elements || rescales && layoutScale != 1f } val element get() = elements.firstOrNull { it.id == selected } - val dirty get() = elements != layout.elements || actions != preset.elements || clicks != preset.clicks || layoutScale != layout.scale - fun checkpoint() { history = (history + SurfaceSnapshot(elements, actions, clicks, layoutScale)).takeLast(40) } - fun undo() { history.lastOrNull()?.let { elements = it.elements; actions = it.actions; clicks = it.clicks; layoutScale = it.scale; history = history.dropLast(1) } } + val dirty get() = elements != layout.elements || actions != preset.elements || clicks != preset.clicks || layoutScale != layout.scale || aspect != layout.aspect + fun checkpoint() { history = (history + SurfaceSnapshot(elements, actions, clicks, layoutScale, aspect)).takeLast(40) } + fun undo() { history.lastOrNull()?.let { elements = it.elements; actions = it.actions; clicks = it.clicks; layoutScale = it.scale; aspect = it.aspect; history = history.dropLast(1) } } + fun beginEdit(displayed: List, aspect: Float) { + checkpoint() + elements = OnScreenLayout.editorFrame(layout.copy(elements = elements), displayed) + this.aspect = aspect + } fun scaleAll(percent: Int) { val base = scaleBase?.takeIf { it.second == elements } ?: Triple(elements, elements, if (rescales) layoutScale else 0f).also { checkpoint() } val factor = percent / 100f @@ -112,10 +118,6 @@ private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputB fun clickAction(e: InputSurfaceElement) = preset.copy(elements = actions, clicks = clicks).clickAction(e) } -@Suppress("DEPRECATION") -private fun displayAspect(display: Display): Float? = android.util.DisplayMetrics().also(display::getRealMetrics) - .takeIf { it.widthPixels > 0 && it.heightPixels > 0 }?.let { (it.widthPixels.toFloat() / it.heightPixels).coerceIn(.05f, 20f) } - @Composable fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> Unit, role: InputRole = InputRole.SECONDARY, layoutId: String? = null, bindingsId: String? = null) { @@ -153,7 +155,7 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> InputLibraries.update(context) { latest -> val l = latest.layouts.first { it.id == savedLayout.id } val p = latest.preset(savedBindings.id) - latest.withLayout(l.copy(elements = draft.elements, aspect = target?.let(::displayAspect) ?: l.aspect, scale = draft.layoutScale)).withPreset(p.copy(elements = draft.actions.filterKeys { id -> draft.elements.any { it.id == id } }, + latest.withLayout(l.copy(elements = draft.elements, aspect = draft.aspect, scale = draft.layoutScale)).withPreset(p.copy(elements = draft.actions.filterKeys { id -> draft.elements.any { it.id == id } }, clicks = draft.clicks.filterKeys { id -> draft.elements.any { it.id == id && it.hasClick } })) } }.onSuccess { onChanged(); onDismiss() }.onFailure { failure = it.message ?: context.getString(R.string.input_save_failed) } @@ -253,10 +255,10 @@ private fun SurfaceCanvas(draft: SurfaceDraft, transparent: Boolean = false) { AndroidView(factory = { InputSurfaceEditorView(it) }, modifier = Modifier.fillMaxSize().testTag("input-layout-canvas"), update = { view -> view.setBackgroundColor(if (transparent) android.graphics.Color.TRANSPARENT else android.graphics.Color.rgb(10, 11, 13)) - view.style = draft.layout.style.copy(hidden = emptySet()); view.elements = draft.elements; view.selected = draft.selected; view.snap = draft.snap + view.style = draft.layout.style.copy(hidden = emptySet()); view.sourceLayout = draft.layout; view.aspect = draft.aspect; view.elements = draft.elements; view.selected = draft.selected; view.snap = draft.snap view.isEnabled = !draft.properties && !draft.adding view.onSelect = { if (!draft.properties) draft.selected = it } - view.onBeginEdit = draft::checkpoint + view.onBeginEdit = draft::beginEdit view.onChange = { e -> if (!draft.properties) draft.elements = draft.elements.map { if (it.id == e.id) e else it } } }) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt index d03eaa6e9f..e71aba6a59 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt @@ -9,6 +9,8 @@ import android.view.HapticFeedbackConstants import android.view.MotionEvent import android.view.ViewConfiguration import android.widget.FrameLayout +import com.droiddeck.launcher.input.OnScreenLayout +import com.droiddeck.launcher.input.SavedInputLayout import com.droiddeck.launcher.input.InputSurfaceElement import com.droiddeck.launcher.input.InputSurfaceStyle import com.droiddeck.launcher.input.snapSurfaceElement @@ -16,7 +18,11 @@ import kotlin.math.abs internal class InputSurfaceEditorView(context: Context) : FrameLayout(context) { var elements: List = emptyList() - set(value) { field = value; preview.updateCustomLayout(value); invalidate() } + set(value) { field = value; refreshElements(); invalidate() } + var aspect = 1f + set(value) { field = value; refreshElements(); invalidate() } + var sourceLayout: SavedInputLayout? = null + set(value) { field = value; refreshElements(); invalidate() } var style = InputSurfaceStyle() set(value) { field = value; preview.updateStyle(value) } var snap = true @@ -26,7 +32,7 @@ internal class InputSurfaceEditorView(context: Context) : FrameLayout(context) { var selected: String? = null set(value) { field = value; invalidate() } var onSelect: (String?) -> Unit = {} - var onBeginEdit: () -> Unit = {} + var onBeginEdit: (List, Float) -> Unit = { _, _ -> } var onChange: (InputSurfaceElement) -> Unit = {} private val preview = InputSurfaceView(context) private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = Color.rgb(26, 159, 255); strokeWidth = 2 * resources.displayMetrics.density } @@ -37,17 +43,31 @@ internal class InputSurfaceEditorView(context: Context) : FrameLayout(context) { private var corner = 0 private var dragging = false + private var visibleElements: List = emptyList() + init { setBackgroundColor(Color.rgb(10, 11, 13)) addView(preview, LayoutParams(-1, -1)) } + private fun refreshElements() { + visibleElements = sourceLayout?.let { layout -> + OnScreenLayout.editorElements(context, layout.copy(elements = elements, aspect = aspect), width, height) + } ?: elements + preview.updateCustomLayout(visibleElements) + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + refreshElements() + } + override fun dispatchDraw(canvas: Canvas) { super.dispatchDraw(canvas) paint.style = Paint.Style.STROKE guideX?.let { canvas.drawLine(width * it, 0f, width * it, height.toFloat(), paint) } guideY?.let { canvas.drawLine(0f, height * it, width.toFloat(), height * it, paint) } - val e = elements.firstOrNull { it.id == selected } ?: return + val e = visibleElements.firstOrNull { it.id == selected } ?: return val l = width * e.x; val t = height * e.y; val r = l + width * e.width; val b = t + height * e.height paint.style = Paint.Style.STROKE; canvas.drawRect(l, t, r, b, paint) paint.style = Paint.Style.FILL @@ -65,7 +85,7 @@ internal class InputSurfaceEditorView(context: Context) : FrameLayout(context) { MotionEvent.ACTION_DOWN -> { clearGuides() downX = event.x; downY = event.y; dragging = false; corner = 0 - val current = elements.firstOrNull { it.id == selected } + val current = visibleElements.firstOrNull { it.id == selected } if (current != null) { val left = width * current.x; val top = height * current.y val right = left + width * current.width; val bottom = top + height * current.height @@ -73,7 +93,7 @@ internal class InputSurfaceEditorView(context: Context) : FrameLayout(context) { val vertical = if (abs(downY - top) < radius) 4 else if (abs(downY - bottom) < radius) 8 else 0 if (horizontal != 0 && vertical != 0) corner = horizontal or vertical } - original = if (corner != 0) current else elements.asReversed().firstOrNull { + original = if (corner != 0) current else visibleElements.asReversed().firstOrNull { downX / width in it.x..(it.x + it.width) && downY / height in it.y..(it.y + it.height) } selected = original?.id; onSelect(selected) @@ -81,7 +101,7 @@ internal class InputSurfaceEditorView(context: Context) : FrameLayout(context) { MotionEvent.ACTION_MOVE -> { val e = original ?: return true if (!dragging && abs(event.x - downX) + abs(event.y - downY) > ViewConfiguration.get(context).scaledTouchSlop) { - dragging = true; onBeginEdit() + dragging = true; onBeginEdit(visibleElements, width.toFloat() / height) } if (!dragging) return true val dx = (event.x - downX) / width; val dy = (event.y - downY) / height @@ -93,7 +113,7 @@ internal class InputSurfaceEditorView(context: Context) : FrameLayout(context) { val bottom = if (corner and 8 != 0) (e.y + e.height + dy).coerceIn(top + .03f, 1f) else e.y + e.height e.copy(x = left, y = top, width = right - left, height = bottom - top).bounded() } - val aligned = if (snap) snapSurfaceElement(next, elements.filter { it.id != e.id }, 9 * resources.displayMetrics.density / width, + val aligned = if (snap) snapSurfaceElement(next, visibleElements.filter { it.id != e.id }, 9 * resources.displayMetrics.density / width, 9 * resources.displayMetrics.density / height, corner) else null if (aligned != null && (aligned.x != null && aligned.x != guideX || aligned.y != null && aligned.y != guideY)) performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK) guideX = aligned?.x; guideY = aligned?.y diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt index f121a9a73a..0058224c01 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceView.kt @@ -48,7 +48,7 @@ class InputSurfaceView( context: Context, private val pad: PadBridge? = null, private var customLayout: List = emptyList(), - private val inputRole: InputRole = InputRole.SECONDARY, + val inputRole: InputRole = InputRole.SECONDARY, private var surfaceStyle: InputSurfaceStyle = InputSurfaceStyle(), private val haptics: Boolean = inputRole != InputRole.PRIMARY, ) : FrameLayout(context) { @@ -59,6 +59,7 @@ class InputSurfaceView( private var requestedLayout = customLayout init { customLayout = surfaceStyle.shown(customLayout); addView(content, LayoutParams(-1, -1)); renderCustom(pad) } + val shownElements: List get() = customLayout var onTouchMiss: ((MotionEvent) -> Unit)? = null private var forwardedPointers = 0 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 3b89f47d2e..88b32cf5de 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LiftSheet.kt @@ -322,7 +322,7 @@ internal fun LiftHero( val touchOnly = inputMode.inputMode == InputMode.Touch val lipFocus = remember { FocusRequester() } - val settingsLabel = stringResource(R.string.drawer_page_settings) + val settingsLabel = stringResource(R.string.sheet_lip) var lipFocused by remember { mutableStateOf(false) } val lipWanted = !open && (!shown || lipBack) && (playFocused || playHovered || touchOnly || lipFocused) && drop?.let { it.open || it.shown } != true LaunchedEffect(lipWanted) { @@ -666,7 +666,7 @@ internal fun Handle(height: Dp, above: Boolean = false) { .drawBorderSidesAndFoot(pal.line, 12.dp, flip = above) .padding(start = 14.dp, end = 10.dp), ) { - Text(stringResource(R.string.drawer_page_settings), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant, maxLines = 1) + Text(stringResource(R.string.sheet_lip), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant, maxLines = 1) Icon( if (above) Icons.Filled.KeyboardArrowDown else Icons.Filled.KeyboardArrowUp, null, tint = colors.onSurfaceVariant, modifier = Modifier.size(16.dp).graphicsLayer { translationY = if (still) 0f else (if (above) 3.dp else -3.dp).toPx() * lift }, 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 d25cd1ffa3..1cc0393388 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -213,6 +213,14 @@ class SheetExtras( fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: SheetExtras = SheetExtras()) { val steam = s.mode == SessionService.MODE_STEAM val host = rememberMenuHost() + Text( + stringResource(when (s.mode) { + SessionService.MODE_STEAM -> R.string.sheet_scope_steam + SessionService.MODE_DESKTOP -> R.string.sheet_scope_desktop + else -> R.string.sheet_scope_other + }), + fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = 2.dp, bottom = 4.dp), + ) if (tab == SheetTab.DISPLAY) { val context = LocalContext.current val portraitWindow = SessionPrefs.portrait(context) @@ -251,7 +259,7 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: stringResource(R.string.display_integer_scaling_hint), listOf( false to stringResource(R.string.display_scaling_fit), - true to stringResource(R.string.display_scaling_auto), + true to stringResource(R.string.display_scaling_integer), ), enabled, onPick = a.onIntegerScaling, ) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt index b4d6952413..a2dad0a54c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt @@ -28,6 +28,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.testTag +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.font.FontWeight @@ -43,10 +44,9 @@ internal fun MorePage(s: FrontEndState, a: FrontEndActions, onSelect: (String) - Column(modifier.verticalScroll(rememberScrollState())) { PageHeader(stringResource(R.string.rail_more)) { Spacer(Modifier.weight(1f)) - SecondaryButton(stringResource(R.string.more_edit_tabs), compact = true) { - SetupTabs.openLauncher = true - SetupTabs.focusTabs = true - onSelect("setup") + SecondaryButton(stringResource(R.string.more_edit_tabs), compact = true, + modifier = Modifier.focusRequester(MoreTabs.button).testTag("more-edit-tabs")) { + MoreTabs.editing = true } } BoxWithConstraints(Modifier.fillMaxWidth()) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt index 5848061180..925deea66a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt @@ -10,10 +10,25 @@ import com.droiddeck.launcher.session.SessionPrefs internal enum class TabPlace { BAR, MORE, HIDDEN } +internal object DeveloperTools { + var on by mutableStateOf(false) + private set + + fun load(context: Context) { + on = SessionPrefs.developerTools(context) + } + + fun set(context: Context, enabled: Boolean) { + on = enabled + SessionPrefs.setDeveloperTools(context, enabled) + } +} + internal object NavTabs { const val MORE = "more" val FEATURES = setOf("stores", "soundtracks", "agent") - val ALL = listOf("steam", "games", "soundtracks", "stores", "desktop", "agent", "components", "android-apps", "setup", "updates", "trinkets") + val ALL = listOf("steam", "games", "soundtracks", "stores", "downloads", "desktop", "agent", "components", "android-apps", "storage", "sync", "setup", "updates", "trinkets") + private val SHELVED_WHEN_NEW = setOf("storage", "sync") var order by mutableStateOf(ALL) private set @@ -23,8 +38,10 @@ internal object NavTabs { private set fun load(context: Context) { - order = arrange(SessionPrefs.navTabOrder(context)) - shelved = SessionPrefs.navTabShelved(context).intersect(ALL.toSet()) + val saved = SessionPrefs.navTabOrder(context) + order = arrange(saved) + shelved = SessionPrefs.navTabShelved(context).intersect(ALL.toSet()) + + if (saved.isEmpty()) emptySet() else SHELVED_WHEN_NEW - saved.toSet() hidden = SessionPrefs.navTabHidden(context).intersect(ALL.toSet()) - FEATURES - "setup" } @@ -41,7 +58,7 @@ internal object NavTabs { fun available(s: FrontEndState, key: String): Boolean = when (key) { "android-apps" -> s.isHomeApp - "agent" -> AgentHost.available + "agent" -> AgentHost.available && DeveloperTools.on else -> true } @@ -54,7 +71,7 @@ internal object NavTabs { } private fun featureOff(s: FrontEndState, key: String) = when (key) { - "stores" -> !s.gameStoresEnabled + "stores", "downloads" -> !s.gameStoresEnabled "soundtracks" -> !s.soundtracksEnabled "agent" -> !AgentTab.shown else -> false diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index e55590dba3..df22a743f1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -83,15 +83,12 @@ fun PerformancePage( onClientCore: (Int, Boolean) -> Unit, onGameCore: (Int, Boolean) -> Unit, onDismiss: () -> Unit, + embedded: Boolean = false, ) { val host = rememberMenuHost() val colors = MaterialTheme.colorScheme val coreItems = cores.map { it.core to it.label } - SettingsPage( - host, title = stringResource(R.string.perf_title), - lede = stringResource(R.string.perf_lede), - onBack = onDismiss, - ) { + val body: @Composable () -> Unit = { SettingsGroup(stringResource(R.string.perf_client_cores_group)) { ToggleRow( host, "override", stringResource(R.string.perf_override), @@ -252,4 +249,12 @@ fun PerformancePage( } } } + if (embedded) Column { + Text(stringResource(R.string.perf_lede), fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 4.dp, vertical = 6.dp)) + body() + } else SettingsPage( + host, title = stringResource(R.string.perf_title), + lede = stringResource(R.string.perf_lede), + onBack = onDismiss, + ) { body() } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt index 60b4223f0a..7f633fcf4f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt @@ -41,6 +41,7 @@ import com.droiddeck.launcher.core.PhantomProcessLimit import com.droiddeck.launcher.core.PhantomProcessStatus import com.droiddeck.launcher.core.WirelessAdbPairingService import com.droiddeck.launcher.core.WirelessAdbPairingService.Stage +import com.droiddeck.launcher.session.QuestExperimental @Composable fun PhantomProcessGatePage( @@ -63,6 +64,7 @@ fun PhantomProcessGatePage( } } val hasToggle = PhantomProcessLimit.hasDeveloperToggle() + val sideQuest = QuestExperimental.isSupported() BoxWithConstraints(Modifier.fillMaxWidth()) { val compact = maxWidth < 620.dp && maxHeight < 500.dp @@ -78,12 +80,13 @@ fun PhantomProcessGatePage( BoxWithConstraints(Modifier.fillMaxWidth()) { val wide = maxWidth >= 620.dp val fix: @Composable ColumnScope.() -> Unit = { - FixGroup(hasToggle, stage, environment, compact, applyingSavedPairing, onOpenDeveloperOptions, onFixWithWirelessDebugging, + if (sideQuest) SideQuestGroup(compact, onCopyCommand) + else FixGroup(hasToggle, stage, environment, compact, applyingSavedPairing, onOpenDeveloperOptions, onFixWithWirelessDebugging, onOpenNotificationSettings, onCancel = { WirelessAdbPairingService.cancel(context) }) } val side: @Composable ColumnScope.() -> Unit = { StatusGroup(status, compact) - OtherWays(hasToggle, compact, onOpenDeveloperOptions, onFixWithWirelessDebugging, onEnterAddressManually, onCopyCommand) + if (!sideQuest) OtherWays(hasToggle, compact, onOpenDeveloperOptions, onFixWithWirelessDebugging, onEnterAddressManually, onCopyCommand) } if (wide) { Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.widthIn(max = 900.dp).fillMaxWidth()) { @@ -246,16 +249,35 @@ private fun OtherWays( Body(stringResource(R.string.gate_manual_hint)) SecondaryButton(stringResource(R.string.gate_enter_manually), compact = true, onClick = onEnterAddressManually) Body(stringResource(R.string.gate_from_computer)) - Text( - PhantomProcessLimit.adbCommand(), - style = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace, fontSize = 11.sp), - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) + AdbCommand() SecondaryButton(stringResource(R.string.gate_copy_command), compact = true, onClick = onCopyCommand) } } } +@Composable +private fun SideQuestGroup(compact: Boolean, onCopyCommand: () -> Unit) { + SettingsGroup(stringResource(R.string.gate_sidequest), compact = compact) { + Column( + modifier = Modifier.fillMaxWidth().padding(if (compact) 10.dp else 14.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + Body(stringResource(R.string.gate_sidequest_steps)) + AdbCommand() + PrimaryButton(stringResource(R.string.gate_copy_command), compact = compact, onClick = onCopyCommand) + } + } +} + +@Composable +private fun AdbCommand() { + Text( + PhantomProcessLimit.adbCommand(), + style = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace, fontSize = 11.sp), + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) +} + @Composable private fun Body(text: String, modifier: Modifier = Modifier, error: Boolean = false, warn: Boolean = false) { Text( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt b/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt new file mode 100644 index 0000000000..23ed5c2043 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt @@ -0,0 +1,131 @@ +package com.droiddeck.launcher.ui + +import androidx.activity.compose.BackHandler +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInHorizontally +import androidx.compose.animation.slideOutHorizontally +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.MaterialTheme +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.graphics.Color +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.foundation.focusGroup +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R + +internal object MoreTabs { + var editing by mutableStateOf(false) + val button = FocusRequester() +} + +@Composable +internal fun StorageTabPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { + Column(modifier.verticalScroll(rememberScrollState()).padding(bottom = 24.dp)) { + PageHeader(stringResource(R.string.rail_storage)) + StoragePanel(s, a) + } +} + +@Composable +internal fun SyncTabPage(s: FrontEndState, modifier: Modifier) { + val host = rememberMenuHost() + var advanced by rememberSaveable { mutableStateOf(false) } + if (advanced) { + BackHandler { advanced = false } + Box(modifier) { SyncAdvancedPage(host) { advanced = false } } + return + } + Column(modifier.verticalScroll(rememberScrollState()).padding(bottom = 24.dp)) { + PageHeader(stringResource(R.string.rail_sync)) + SyncPanel(host, s.ready && !s.busy && !s.removalPending) { advanced = true } + } +} + +@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) +@Composable +internal fun EditTabsSheet(s: FrontEndState, a: FrontEndActions) { + val pal = LocalPalette.current + BackHandler(enabled = MoreTabs.editing) { MoreTabs.editing = false } + androidx.compose.runtime.DisposableEffect(Unit) { onDispose { MoreTabs.editing = false } } + var wasOpen by remember { mutableStateOf(false) } + val closeInput = androidx.compose.ui.platform.LocalInputModeManager.current + LaunchedEffect(MoreTabs.editing) { + if (MoreTabs.editing) wasOpen = true + else if (wasOpen && closeInput.inputMode == androidx.compose.ui.input.InputMode.Keyboard) focusSoon { MoreTabs.button } + } + Box(Modifier.fillMaxSize()) { + AnimatedVisibility(MoreTabs.editing, enter = fadeIn(), exit = fadeOut()) { + Box( + Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.45f)) + .focusProperties { canFocus = false } + .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) { MoreTabs.editing = false }, + ) + } + BoxWithConstraints(Modifier.fillMaxSize(), contentAlignment = Alignment.CenterEnd) { + val width = minOf(560.dp, maxWidth * 0.92f) + AnimatedVisibility(MoreTabs.editing, enter = slideInHorizontally { it } + fadeIn(), exit = slideOutHorizontally { it } + fadeOut()) { + val inside = remember { FocusRequester() } + var holds by remember { mutableStateOf(false) } + val openInput = androidx.compose.ui.platform.LocalInputModeManager.current + // The launcher only takes focus in controller mode, so opening by touch switches to it like startup does. + LaunchedEffect(Unit) { + repeat(60) { + androidx.compose.runtime.withFrameNanos { } + if (holds || !MoreTabs.editing) return@LaunchedEffect + if (openInput.inputMode != androidx.compose.ui.input.InputMode.Keyboard) openInput.requestInputMode(androidx.compose.ui.input.InputMode.Keyboard) + runCatching { inside.requestFocus() } + } + } + Column( + Modifier.width(width).fillMaxHeight() + .onFocusChanged { holds = it.hasFocus } + .focusRequester(inside) + .focusProperties { exit = { if (MoreTabs.editing) FocusRequester.Cancel else FocusRequester.Default } } + .focusGroup() + .background(MaterialTheme.colorScheme.background) + .border(1.dp, pal.line).padding(horizontal = 18.dp, vertical = 16.dp).testTag("edit-tabs-sheet"), + ) { + PageHeader(stringResource(R.string.more_edit_tabs)) { + Spacer(Modifier.weight(1f)) + SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = MaterialTheme.colorScheme.onSurfaceVariant) { + MoreTabs.editing = false + } + } + Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) { + TabsSettingsGroup(rememberMenuHost(), s, a) + } + } + } + } + } +} 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 578c936ad6..62f3c61f6c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -63,7 +63,8 @@ class SecondScreenPresentation( private var imeSeen = false private var fieldKeyboard = false private var terminalPanel: SessionTerminalPanel? = null - private var controlsView: InputSurfaceView? = null + var controlsView: InputSurfaceView? = null + private set private var created = false init { 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 cb438903b7..2cf218001e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -14,7 +14,7 @@ internal enum class SessionDrawerPage(val firstControl: String) { } internal fun sessionDrawerPages( - hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentHost.installed && com.droiddeck.launcher.agent.AgentTab.shown, + hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentHost.installed && com.droiddeck.launcher.agent.AgentTab.shown && DeveloperTools.on, ): List = SessionDrawerPage.entries.filter { (hasSecondScreen || it != SessionDrawerPage.SECOND_SCREEN) && (hasGlasses || it != SessionDrawerPage.GLASSES) && diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index 85a1462949..888ab39678 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -77,6 +77,7 @@ import androidx.compose.ui.text.PlatformTextStyle import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.LineHeightStyle import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.platform.testTag @Composable @@ -223,6 +224,9 @@ fun LoadingOverlay( modifier = Modifier.align(Alignment.BottomCenter).padding(start = 120.dp, end = 120.dp, bottom = 28.dp), ) if (!ended && onCancel != null) CancelHint(onCancel, Modifier.align(Alignment.BottomEnd).padding(end = 16.dp, bottom = 16.dp)) + if (!ended && onShareLogs != null) androidx.compose.material3.TextButton( + onClick = onShareLogs, modifier = Modifier.align(Alignment.BottomStart).padding(start = 16.dp, bottom = 12.dp).testTag("loading-report"), + ) { Text(stringResource(R.string.report_problem), fontSize = 13.sp, color = colors.onSurfaceVariant) } if (flood != null) FloodGather(flood, ball, onFlooded) } } @@ -242,7 +246,7 @@ private fun EndedActions(onRetry: (() -> Unit)?, onRepair: (() -> Unit)?, onShar if (onRepair != null) SecondaryButton(stringResource(R.string.store_try_again), modifier = claim(), onClick = onRetry) else PrimaryButton(stringResource(R.string.store_try_again), modifier = claim(), onClick = onRetry) } - if (onShareLogs != null) SecondaryButton(stringResource(R.string.drawer_share_logs), modifier = claim(), + if (onShareLogs != null) SecondaryButton(stringResource(R.string.report_problem), modifier = claim(), progress = com.droiddeck.launcher.session.SessionLogShare.progress, onClick = onShareLogs) if (onClose != null) SecondaryButton(stringResource(R.string.mode_back), modifier = claim(), onClick = onClose) } 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 1d022d5b12..cd1c3cd9c3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -43,7 +43,6 @@ import androidx.compose.material.icons.outlined.PowerSettingsNew import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.material.icons.outlined.DesktopWindows import androidx.compose.material.icons.outlined.Layers -import androidx.compose.material.icons.outlined.AutoAwesome import androidx.compose.material.icons.outlined.ScreenShare import androidx.compose.material.icons.outlined.Pause import androidx.compose.material.icons.outlined.PictureInPictureAlt @@ -186,7 +185,7 @@ private val SessionDrawerPage.icon get() = when (this) { SessionDrawerPage.VR -> VrHeadsetIcon SessionDrawerPage.EFFECTS -> Icons.Outlined.AutoFixHigh SessionDrawerPage.GAMES -> Icons.Outlined.Layers - SessionDrawerPage.AGENT -> Icons.Outlined.AutoAwesome + SessionDrawerPage.AGENT -> Icons.Outlined.Terminal SessionDrawerPage.SESSION -> Icons.Outlined.Settings } @@ -244,6 +243,8 @@ class DrawerActions( val fexPreset: String, val upscaler: Int = 0, val upscaleSharpness: Int = 75, + val integerScaling: Boolean = false, + val onIntegerScaling: (Boolean) -> Unit = {}, val effects: ScreenEffects = ScreenEffects.OFF, val screenEffectsTarget: String = "auto", val screenEffectsTargets: List> = emptyList(), @@ -260,6 +261,7 @@ class DrawerActions( val secondScreenNone: Boolean = true, val gameOnBottom: Boolean = false, val gameSwapAvailable: Boolean = false, + val gameSwapBuiltIn: Boolean = true, val onGameOnBottom: (Boolean) -> Unit = {}, val dashboardAvailable: Boolean = false, val desktopAvailable: Boolean = false, @@ -275,6 +277,8 @@ class DrawerActions( val onFrameGenReset: () -> Unit = {}, val fpsLimit: Int = 0, val onFpsLimit: (Int) -> Unit = {}, + val cornerTap: Boolean = false, + val onCornerTap: (Boolean) -> Unit = {}, val blackFrameInsertion: Boolean = false, val blackFrameInsertionAvailable: Boolean = false, val onBlackFrameInsertion: (Boolean) -> Unit = {}, @@ -616,8 +620,26 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont format = { if (it <= SessionPrefs.FPS_LIMIT_OFF) offLabel else it.toString() }, modifier = focus.track(page, "fps-limit"), onChange = { a.onFpsLimit(if (it <= SessionPrefs.FPS_LIMIT_OFF) 0 else it) }) + if (a.steam && !a.direct && a.onQam != null) SettingsRow( + stringResource(R.string.drawer_frame_limit), stringResource(R.string.drawer_frame_limit_steam_hint), + ) { + DrawerOutlineButton(stringResource(R.string.drawer_open_steam_qam), modifier = focus.track(page, "fps-limit-steam")) { + host.open = null + a.onQam?.invoke() + } + } } SettingsGroup(stringResource(R.string.display_image_scaling)) { + if (a.steam) SettingsRow(stringResource(R.string.display_integer_scaling), null) { + PadTextButton( + onClick = { a.onIntegerScaling(!a.integerScaling) } + ) { + Text(stringResource( + if (a.integerScaling) R.string.display_scaling_integer + else R.string.display_scaling_fit + )) + } + } ChoiceRow(host, "upscaler", stringResource(R.string.display_filter), null, SessionPrefs.upscalerChoices(LocalContext.current), a.upscaler, note = stringResource(R.string.display_filter_note), @@ -716,6 +738,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont SessionPrefs.BACK_DOUBLE_TAP_MS_OPTIONS.map { it to stringResource(R.string.back_tap_ms, it) }, a.backDoubleTapMs, chipModifier = focus.track(page, "back-double-tap"), onPick = a.onBackDoubleTapMs) PhysicalShortcutRows(modifierFor = { focus.track(page, "physical-shortcut-${it.name}") }) + ToggleRow(host, "corner-tap", stringResource(R.string.drawer_corner_tap), + stringResource(R.string.drawer_corner_tap_hint), a.cornerTap, + chipModifier = focus.track(page, "corner-tap"), onChange = a.onCornerTap) } SettingsGroup(stringResource(R.string.drawer_latency)) { ToggleRow(host, "low-latency", stringResource(R.string.drawer_low_latency), @@ -808,6 +833,15 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } SessionDrawerPage.AGENT -> Unit SessionDrawerPage.SESSION -> { + SettingsGroup(stringResource(R.string.drawer_support)) { + SettingsRow(stringResource(R.string.report_problem), stringResource(R.string.report_problem_hint)) { + DrawerOutlineButton(stringResource(R.string.drawer_share_logs), modifier = focus.track(page, "share-logs"), + progress = com.droiddeck.launcher.session.SessionLogShare.progress) { + host.open = null + a.onShareLogs() + } + } + } if (a.isHomeApp) SettingsGroup(stringResource(R.string.drawer_android_apps)) { SettingsRow(stringResource(R.string.drawer_launch_app), null) { DrawerOutlineButton(if (androidAppsExpanded) stringResource(R.string.common_hide) else stringResource(R.string.common_show), modifier = focus.track(page, "apps")) { @@ -862,15 +896,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont onChange = a.onSteamDownloadsInBackground, ) } - SettingsGroup(stringResource(R.string.drawer_support)) { - SettingsRow(stringResource(R.string.drawer_logs), stringResource(R.string.drawer_logs_hint)) { - DrawerOutlineButton(stringResource(R.string.drawer_share_logs), modifier = focus.track(page, "share-logs"), - progress = com.droiddeck.launcher.session.SessionLogShare.progress) { - host.open = null - a.onShareLogs() - } - } - } if (a.pipSupported) SettingsGroup(stringResource(R.string.pip_title)) { ToggleRow(host, "pip-auto", stringResource(R.string.pip_auto), null, a.pipAutoEnter, onChange = a.onPipAutoEnter) @@ -1110,7 +1135,24 @@ private fun ScreenEffectsGroup( a.onEffects(picked.effects) } } - ToggleRow(host, "fxaa", stringResource(R.string.drawer_fxaa), null, e.fxaa, chipModifier = track("fxaa")) { a.onEffects(e.copy(fxaa = it)) } + ChoiceRow(host, "antialiasing", stringResource(R.string.drawer_antialiasing), null, + listOf( + "off" to stringResource(R.string.frame_gen_off), + "fxaa" to stringResource(R.string.drawer_fxaa), + "smaa" to stringResource(R.string.drawer_smaa), + ), + when (e.aaMode) { + ScreenEffects.AA_FXAA -> "fxaa" + ScreenEffects.AA_SMAA -> "smaa" + else -> "off" + }, chipModifier = track("antialiasing")) { mode -> + val aaMode = when (mode) { + "fxaa" -> ScreenEffects.AA_FXAA + "smaa" -> ScreenEffects.AA_SMAA + else -> ScreenEffects.AA_OFF + } + a.onEffects(e.copy(aaMode = aaMode)) + } ToggleRow(host, "toon", stringResource(R.string.drawer_toon), null, e.toon, chipModifier = track("toon")) { a.onEffects(e.copy(toon = it)) } ToggleRow(host, "crt", stringResource(R.string.drawer_crt), null, e.crt, chipModifier = track("crt")) { a.onEffects(e.copy(crt = it)) } ToggleRow(host, "ntsc", stringResource(R.string.drawer_ntsc), null, e.ntsc, chipModifier = track("ntsc")) { a.onEffects(e.copy(ntsc = it)) } @@ -1274,7 +1316,8 @@ private fun SecondScreenGroup(host: MenuHost, a: DrawerActions, track: (String) } 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)), + if (a.gameSwapBuiltIn) listOf(false to stringResource(R.string.swap_game_screen_top), true to stringResource(R.string.swap_game_screen_bottom)) + else listOf(false to stringResource(R.string.main_primary), true to stringResource(R.string.main_secondary)), a.gameOnBottom, chipModifier = track("game-screen"), onPick = a.onGameOnBottom) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt new file mode 100644 index 0000000000..37de5eba31 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt @@ -0,0 +1,153 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.annotation.StringRes +import androidx.compose.runtime.getValue +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R + +internal enum class SettingsSection(val key: String, @StringRes val title: Int) { + OVERVIEW("overview", R.string.setup_tab_overview), + PERFORMANCE("performance", R.string.setup_tab_performance), + CONTROLLER("controller", R.string.setup_tab_controller), + GLASSES("glasses", R.string.setup_tab_glasses), + LAUNCHER("launcher", R.string.setup_tab_launcher), + DEVELOPER("developer", R.string.setup_tab_diagnostics); + + companion object { + fun of(key: String?): SettingsSection? = entries.firstOrNull { it.key == key } + } +} + +internal object RailRequest { + var key by androidx.compose.runtime.mutableStateOf(null) +} + +internal enum class SettingsPlace(@StringRes val title: Int) { + SETTINGS(R.string.settings_place_settings), + TAB(R.string.settings_place_tab), + DRAWER(R.string.settings_place_drawer), + SHEET(R.string.settings_place_sheet), + STEAM_QAM(R.string.settings_place_steam_qam), +} + +internal class SettingsEntry( + val place: SettingsPlace, + @StringRes val title: Int, + @StringRes val group: Int? = null, + val section: SettingsSection? = null, + val words: List = emptyList(), + val developer: Boolean = false, + val tab: String? = null, +) { + val within: Int? get() = section?.title ?: tab?.let { railLabelIcon(it).first } ?: group + + fun path(context: Context): List = + listOfNotNull(context.getString(place.title), within?.let(context::getString), context.getString(title)) + + fun matches(context: Context, query: String): Boolean { + val q = query.trim().lowercase() + if (q.isEmpty()) return false + val text = (path(context) + words).joinToString(" ").lowercase() + return q.split(Regex("\\s+")).all { it in text } + } +} + +internal object SettingsIndex { + private fun s(section: SettingsSection, @StringRes title: Int, vararg words: String) = + SettingsEntry(SettingsPlace.SETTINGS, title, section = section, words = words.toList()) + + private fun d(@StringRes group: Int, @StringRes title: Int, vararg words: String) = + SettingsEntry(SettingsPlace.DRAWER, title, group = group, words = words.toList()) + + private fun sh(@StringRes group: Int, @StringRes title: Int, vararg words: String) = + SettingsEntry(SettingsPlace.SHEET, title, group = group, words = words.toList()) + + val entries: List = listOf( + s(SettingsSection.OVERVIEW, R.string.setup_runtime, "ubuntu", "linux", "repair", "update"), + s(SettingsSection.OVERVIEW, R.string.setup_limit, "phantom", "process", "killed", "background"), + s(SettingsSection.OVERVIEW, R.string.setup_account, "steam", "login", "sign in"), + + s(SettingsSection.PERFORMANCE, R.string.perf_override, "steam client cores", "cpu"), + s(SettingsSection.PERFORMANCE, R.string.perf_game_cores, "cpu", "pin", "cores", "affinity"), + s(SettingsSection.PERFORMANCE, R.string.perf_pace_cores, "cpu"), + s(SettingsSection.PERFORMANCE, R.string.perf_glthread, "opengl", "gl"), + s(SettingsSection.PERFORMANCE, R.string.perf_zink), + s(SettingsSection.PERFORMANCE, R.string.perf_noglerror), + s(SettingsSection.PERFORMANCE, R.string.perf_gsrealtime, "gamescope"), + s(SettingsSection.PERFORMANCE, R.string.perf_gpuclock, "gpu", "clock", "max"), + s(SettingsSection.PERFORMANCE, R.string.perf_ram_cap, "ram", "memory"), + s(SettingsSection.PERFORMANCE, R.string.perf_vram_cap, "vram", "memory"), + s(SettingsSection.PERFORMANCE, R.string.perf_zram_idle, "zram", "swap", "memory"), + s(SettingsSection.PERFORMANCE, R.string.perf_zram_client, "zram", "swap", "memory"), + s(SettingsSection.PERFORMANCE, R.string.setup_clear_cached, "memory", "ram", "crash", "sleep", "killed"), + s(SettingsSection.PERFORMANCE, R.string.setup_bg_limit, "memory", "ram", "background apps"), + s(SettingsSection.PERFORMANCE, R.string.setup_memory_hud, "memory", "ram", "overlay"), + s(SettingsSection.PERFORMANCE, R.string.perf_sysmem), + s(SettingsSection.PERFORMANCE, R.string.perf_xalia), + s(SettingsSection.PERFORMANCE, R.string.perf_esync, "esync", "sync", "wine"), + s(SettingsSection.PERFORMANCE, R.string.perf_fsync, "fsync", "sync", "wine"), + s(SettingsSection.PERFORMANCE, R.string.perf_fastsync, "ntsync", "sync", "wine"), + s(SettingsSection.PERFORMANCE, R.string.perf_seccomp, "proot"), + s(SettingsSection.PERFORMANCE, R.string.perf_fastpath, "proot"), + s(SettingsSection.PERFORMANCE, R.string.perf_native_userland, "proot"), + s(SettingsSection.PERFORMANCE, R.string.perf_cursor_composite, "mouse", "cursor"), + s(SettingsSection.PERFORMANCE, R.string.perf_hostname, "name"), + + s(SettingsSection.CONTROLLER, R.string.setup_tab_controller, "gamepad", "buttons", "mapping", "profile", "remap"), + SettingsEntry(SettingsPlace.TAB, R.string.rail_storage, tab = "storage", words = listOf("sd card", "space", "uninstall", "disk")), + SettingsEntry(SettingsPlace.TAB, R.string.rail_sync, tab = "sync", words = listOf("syncthing", "saves")), + s(SettingsSection.GLASSES, R.string.setup_tab_glasses, "xreal", "viture", "vr", "ar"), + + s(SettingsSection.LAUNCHER, R.string.setup_theme, "color", "dark"), + s(SettingsSection.LAUNCHER, R.string.setup_app_scale, "size", "zoom"), + s(SettingsSection.LAUNCHER, R.string.setup_launcher_icon), + s(SettingsSection.LAUNCHER, R.string.setup_animations), + s(SettingsSection.LAUNCHER, R.string.setup_rail_labels, "sidebar"), + s(SettingsSection.LAUNCHER, R.string.setup_language, "translate"), + SettingsEntry(SettingsPlace.TAB, R.string.setup_stores_speed, tab = "downloads", words = listOf("download", "speed", "bandwidth", "slow")), + SettingsEntry(SettingsPlace.TAB, R.string.stores_parallel, tab = "downloads", words = listOf("download", "parallel", "queue", "at once")), + SettingsEntry(SettingsPlace.TAB, R.string.setup_group_tabs, tab = NavTabs.MORE, words = listOf("tabs", "hide", "reorder", "agent", "stores", "edit tabs")), + s(SettingsSection.LAUNCHER, R.string.setup_home, "home screen", "launcher"), + s(SettingsSection.LAUNCHER, R.string.setup_launcher_orientation, "rotate", "portrait"), + s(SettingsSection.LAUNCHER, R.string.setup_session_orientation, "rotate", "portrait"), + s(SettingsSection.LAUNCHER, R.string.setup_fullscreen), + s(SettingsSection.LAUNCHER, R.string.setup_dual_screen_launcher, "thor", "second screen", "bottom screen"), + s(SettingsSection.LAUNCHER, R.string.setup_low_storage_warning), + s(SettingsSection.LAUNCHER, R.string.mode_sgdb_key, "artwork", "steamgriddb"), + s(SettingsSection.LAUNCHER, R.string.setup_download_source, "mirror", "china"), + s(SettingsSection.LAUNCHER, R.string.setup_download_proxy), + + s(SettingsSection.DEVELOPER, R.string.setup_latest_logs, "logs", "log", "bug", "report", "crash", "zip"), + s(SettingsSection.DEVELOPER, R.string.setup_logs, "logs"), + s(SettingsSection.DEVELOPER, R.string.setup_game_debug_logs, "logs", "wine", "proton"), + SettingsEntry(SettingsPlace.SETTINGS, R.string.setup_enhanced_diagnostics, section = SettingsSection.DEVELOPER, words = listOf("logs"), developer = true), + s(SettingsSection.DEVELOPER, R.string.setup_reset_settings, "default"), + s(SettingsSection.DEVELOPER, R.string.dev_tools_title, "agent", "ai", "claude", "codex"), + SettingsEntry(SettingsPlace.SETTINGS, R.string.setup_graphics_logs, section = SettingsSection.DEVELOPER, words = listOf("logs", "gpu"), developer = true), + + d(R.string.drawer_page_display, R.string.drawer_frame_limit, "fps", "cap", "limit", "non-steam", "desktop"), + d(R.string.drawer_page_display, R.string.frame_gen_title, "lsfg", "lossless", "fps"), + d(R.string.drawer_page_display, R.string.display_filter, "upscale", "fsr", "sharpness"), + d(R.string.drawer_hud, R.string.drawer_hud, "fps", "counter", "overlay", "performance"), + d(R.string.drawer_page_controller, R.string.input_touchscreen, "touch", "mouse", "direct", "touchpad", "click"), + d(R.string.drawer_page_controller, R.string.mode_osc, "on-screen", "controls", "touch controls", "buttons"), + d(R.string.drawer_page_controller, R.string.osc_steam_layout, "touch layout", "edit layout", "on-screen"), + d(R.string.drawer_page_controller, R.string.drawer_pc_keyboard, "keyboard", "typing"), + d(R.string.mode_session, R.string.report_problem, "logs", "log", "bug", "crash", "share", "zip"), + d(R.string.mode_session, R.string.mode_suspend, "sleep", "background", "native", "resume"), + + SettingsEntry(SettingsPlace.STEAM_QAM, R.string.drawer_frame_limit, R.string.perf_title, words = listOf("fps", "cap", "limit", "steam games")), + SettingsEntry(SettingsPlace.STEAM_QAM, R.string.perf_title, words = listOf("performance overlay", "fps", "counter", "tdp")), + + sh(R.string.drawer_page_display, R.string.display_session, "resolution", "scaling", "hdr", "refresh"), + sh(R.string.drawer_page_display, R.string.sheet_graphics_drivers, "turnip", "driver", "gpu", "adreno", "mali"), + sh(R.string.mode_tab_steam, R.string.setup_offline, "offline", "steam"), + sh(R.string.mode_audio, R.string.mode_mic, "microphone", "voice"), + sh(R.string.mode_session, R.string.mode_suspend, "sleep", "background"), + sh(R.string.stores_tab_library, R.string.stores_tab_library, "second library", "sd card", "steam library"), + ) + + fun search(context: Context, query: String): List = + entries.filter { (!it.developer || DeveloperTools.on) && it.matches(context, query) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt new file mode 100644 index 0000000000..0119977b9b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt @@ -0,0 +1,68 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +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.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R + +@Composable +internal fun SettingsSearchField(query: String, onQuery: (String) -> Unit, onClose: () -> Unit) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp), + ) { + AdbTextField( + value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, + placeholder = stringResource(R.string.settings_search), compact = true, showLabel = false, focusOnShow = true, + modifier = Modifier.weight(1f), + ) + SmallIconButton(Icons.Filled.Close, stringResource(R.string.settings_search_clear), tint = MaterialTheme.colorScheme.onSurfaceVariant, onClick = onClose) + } +} + +@Composable +internal fun SettingsSearchResults(query: String, onOpen: (SettingsSection) -> Unit) { + val ctx = LocalContext.current + val found = remember(query) { SettingsIndex.search(ctx, query) } + if (found.isEmpty()) { + Note(stringResource(R.string.settings_search_none, query.trim())) + return + } + Column { + found.groupBy { it.place }.forEach { (place, entries) -> + SettingsGroup(stringResource(place.title)) { + entries.forEach { entry -> + val within = entry.within?.let { stringResource(it) } + val title = stringResource(entry.title) + val section = entry.section + val tab = entry.tab + if (section != null) { + ActionRow(title, within, stringResource(R.string.store_open), onClick = { onOpen(section) }) + } else if (tab != null) { + ActionRow(title, within, stringResource(R.string.store_open), onClick = { + if (tab == NavTabs.MORE) MoreTabs.editing = true + if (tab == "downloads") DownloadsNav.showSettings = true + RailRequest.key = tab + }) + } else { + SettingsRow(title, entry.path(ctx).dropLast(1).joinToString(" › ")) {} + } + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SheetRows.kt b/app/src/main/java/com/droiddeck/launcher/ui/SheetRows.kt index 2b2ecf9048..181a837065 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SheetRows.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SheetRows.kt @@ -23,7 +23,7 @@ internal fun FrameGenGroup(s: FrontEndState, a: FrontEndActions) { internal fun PerformanceLink(a: FrontEndActions, rail: String, tab: String) { val id = "sheet:performance" val title = stringResource(R.string.setup_tool_performance) - SettingsGroup(title) { + SettingsGroup(stringResource(R.string.sheet_all_settings_hint)) { LinkRow(title, stringResource(R.string.setup_tool_performance_hint), stringResource(R.string.store_open), id, arrow = "›") { Hops.sources[id]?.let { at -> PageOrigin.mark(Origin(at, 12f * Hops.density)) @@ -31,6 +31,9 @@ internal fun PerformanceLink(a: FrontEndActions, rail: String, tab: String) { } a.onPerformance() } + LinkRow(stringResource(R.string.sheet_all_settings), stringResource(R.string.setup_title), stringResource(R.string.store_open), "sheet:all-settings", arrow = "›") { + SetupTabs.openSection = SettingsSection.OVERVIEW + } } } 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 b24c0f2cf1..244ef0096f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -145,6 +145,8 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) words = { val runtimeStatus: @Composable () -> Unit = { if (s.busy || (s.available != null && s.available != s.installed)) RuntimeChip(s) + else if (setupNeedsAttention(s)) SecondaryButton(stringResource(R.string.play_needs_you), compact = true, + modifier = Modifier.testTag("play-needs-you")) { SetupTabs.openSection = SettingsSection.OVERVIEW } else if (s.integration.suggested && signedIn && !com.droiddeck.launcher.core.PhantomProcessLimit.blocksSteam(s.phantomProcessStatus)) IntegrationSuggestion(s.integration, { a.onSteamIntegration(null) }, a.onDismissIntegration) } 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 1333172d7a..7856fdcfea 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -39,6 +39,7 @@ import androidx.compose.foundation.relocation.bringIntoViewRequester import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.ChevronRight +import androidx.compose.material.icons.outlined.Delete import androidx.compose.material.icons.outlined.Extension import androidx.compose.material.icons.outlined.Folder import androidx.compose.material.icons.outlined.Layers @@ -907,19 +908,31 @@ private fun SelectBox(on: Boolean, enabled: Boolean, onToggle: () -> Unit) { @Composable private fun ConfirmDialog(title: String, body: String, confirm: String, danger: Boolean = true, onConfirm: () -> Unit, onDismiss: () -> Unit) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - AlertDialog( - onDismissRequest = onDismiss, - title = { Text(title) }, - text = { Text(body, fontSize = 14.sp) }, - confirmButton = { FocusText(confirm, if (danger) colors.error else pal.signal) { onDismiss(); onConfirm() } }, - dismissButton = { - val cancel = remember { FocusRequester() } - LaunchedEffect(Unit) { runCatching { cancel.requestFocus() } } - FocusText(stringResource(R.string.common_cancel), colors.onBackground, modifier = Modifier.focusRequester(cancel), onClick = onDismiss) - }, - ) + val accent = if (danger) MaterialTheme.colorScheme.error else LocalPalette.current.signal + val cancel = stringResource(R.string.common_cancel) + val glide = LocalFocusGlide.current + val view = androidx.compose.ui.platform.LocalView.current + val confirmNow = androidx.compose.runtime.rememberUpdatedState(onConfirm) + val dismissNow = androidx.compose.runtime.rememberUpdatedState(onDismiss) + androidx.compose.runtime.DisposableEffect(Unit) { + val at = focusAnchor(glide, androidx.compose.ui.geometry.Offset.Zero) + ?: androidx.compose.ui.geometry.Rect(androidx.compose.ui.geometry.Offset(view.rootView.width / 2f, view.rootView.height / 2f), 1f) + var confirmed = false + val ask = StepAsk( + anchor = at, side = StepSide.Left, accent = accent, items = 3, pillCorner = 12.dp, maxWidth = 360.dp, + onDismiss = { dismissNow.value(); if (confirmed) confirmNow.value() }, + handle = { Icon(if (danger) Icons.Outlined.Delete else Icons.Filled.Check, null, tint = accent, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + Text(body, fontSize = 13.sp, lineHeight = 18.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.stepItem(1).padding(start = 4.dp, bottom = 12.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End), modifier = Modifier.fillMaxWidth().stepItem(2)) { + StepChoice(cancel, enabled = open, modifier = Modifier.focusRequester(first)) { Steps.fold() } + StepChoice(confirm, danger = danger, enabled = open) { confirmed = true; Steps.fold() } + } + } + Steps.ask(ask) + onDispose { if (Steps.step === ask) Steps.drop() } + } } private class DataTarget(val key: String, val label: String, val prefixes: List>, val shaders: List>) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index 0b1000e6e3..ed382d8d5d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -535,7 +535,6 @@ internal fun storesSettingsStep(at: Rect, s: androidx.compose.runtime.State, a: FrontEndActions, accent: androidx.compose.ui.graphics.Color): StepAsk = + StepAsk( + anchor = at, side = StepSide.Left, accent = accent, items = 2, maxWidth = 440.dp, + handle = { androidx.compose.material3.Icon(androidx.compose.material.icons.Icons.Filled.Settings, null, tint = accent, modifier = Modifier.size(20.dp)) }, + ) { + StepTitle(stringResource(R.string.downloads_settings)) + Column(Modifier.stepItem(1).fillMaxWidth().focusRequester(first).focusGroup().padding(horizontal = 14.dp, vertical = 11.dp)) { DownloadControls(s.value, a) } + } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt index 3d5ba671ca..d1d1e3ba48 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt @@ -1,5 +1,8 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.layout.Box +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.positionInRoot import android.os.SystemClock import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.EnterTransition @@ -67,6 +70,13 @@ internal object StoresMotion { var downloadsChip by mutableStateOf(null) + private var touch: Offset? = null + private var touchAt = 0L + + fun touched(at: Offset) { touch = at; touchAt = SystemClock.uptimeMillis() } + + fun recentTouch(): Offset? = touch.takeIf { SystemClock.uptimeMillis() - touchAt < 4_000 } + var landed by mutableIntStateOf(0) val flights = mutableStateListOf() @@ -87,6 +97,16 @@ internal object StoresMotion { stepOpen = true } + private var host: Any? = null + + fun hosting(page: Any) { host = page } + + fun release(page: Any) { + if (host !== page) return + host = null + drop() + } + fun drop() { step?.let { step = null; it.onDismiss() } stepOpen = false @@ -301,3 +321,28 @@ internal fun AnimatedRows( } } } + +@Composable +internal fun DownloadFlights() { + val glide = LocalFocusGlide.current + var origin by remember { mutableStateOf(Offset.Zero) } + val active = com.droiddeck.launcher.stores.StoresState.downloads.filter { it.isActive }.map { it.key }.toSet() + val seen = remember { mutableSetOf().also { it.addAll(active) } } + LaunchedEffect(active) { + val fresh = active - seen + seen.clear(); seen.addAll(active) + if (fresh.isEmpty()) return@LaunchedEffect + val from = StoresMotion.takeInstall() ?: focusAnchor(glide, origin) + if (from != null) StoresMotion.fly(from) else StoresMotion.landed++ + } + Box(Modifier.fillMaxSize().onGloballyPositioned { origin = it.positionInRoot() }) { FlightLayer(origin) } +} + +internal fun focusAnchor(glide: FocusGlide?, origin: Offset): Rect? { + val ring = glide?.let { g -> + val src = g.current ?: return@let null + val host = g.host?.takeIf { it.isAttached } ?: return@let null + g.boundsOf(src)?.translate(host.positionInRoot()) + } + return ring ?: StoresMotion.recentTouch()?.let { Rect(it + origin - Offset(24f, 24f), androidx.compose.ui.geometry.Size(48f, 48f)) } +} 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 e5005a018e..bc27308a4a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -143,7 +143,6 @@ import com.droiddeck.launcher.stores.formatBytes import androidx.compose.runtime.setValue -private const val DOWNLOADS = "downloads" private data class PaneKey(val chip: String, val signedIn: Boolean, val accountsLoaded: Boolean) @@ -196,10 +195,9 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier var query by rememberSaveable { mutableStateOf("") } var openGame by rememberSaveable { mutableStateOf(null) } val liveState = androidx.compose.runtime.rememberUpdatedState(s) - LaunchedEffect(StoresState.openDownloads) { if (StoresState.openDownloads) { chip = DOWNLOADS; StoresState.openDownloads = false } } val store = Store.byId(chip) LaunchedEffect(tabs.toList()) { - if (chip != DOWNLOADS && Store.byId(chip) !in shownStores) chip = shownStores.firstOrNull()?.id ?: DOWNLOADS + if (Store.byId(chip) !in shownStores) chip = shownStores.firstOrNull()?.id ?: chip } val pane = PaneKey( chip, @@ -333,9 +331,8 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier StoreTheme(Store.byId(focusedChip ?: chip)) { Rise(0) { StoreChips( - chip, focusedChip, s.storeDownloadsActive, tabs, arranging, + chip, focusedChip, tabs, arranging, onStore = { st -> openModes(st) }, - onDownloads = { if (chip != DOWNLOADS) pickChip(DOWNLOADS) else move("first") }, onFocusChip = { focusedChip = it }, onArrangeDone = { arranging = false }, onMoveTab = { st, to -> moveTab(st, to) }, @@ -378,7 +375,6 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier .focusGroup(), ) { when { - k.chip == DOWNLOADS -> Column(Modifier.fillMaxWidth().verticalScroll(scroll).padding(top = 4.dp, bottom = 16.dp)) { StoresDownloadsPane(s, a) } st == null -> {} !k.accountsLoaded -> Box(Modifier.fillMaxWidth().padding(top = 16.dp)) { androidx.compose.material3.LinearProgressIndicator(Modifier.fillMaxWidth().height(3.dp)) @@ -393,7 +389,6 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier }, ) { key -> GameDetail(key, s, a, heroFocus, backLabel, hopRail = null, onBack = { closeGame() }, inStore = true) } } - FlightLayer(hostAt) StoresMotion.step?.let { ask -> key(ask) { StepOut( @@ -405,14 +400,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier } SignInFloodLayer(hostAt) } - androidx.compose.runtime.DisposableEffect(Unit) { onDispose { StoresMotion.drop() } } - val activeKeys = StoresState.downloads.filter { it.isActive }.map { it.key }.toSet() - val seenActive = remember { mutableSetOf().also { it.addAll(activeKeys) } } - LaunchedEffect(activeKeys) { - val fresh = activeKeys - seenActive - seenActive.clear(); seenActive.addAll(activeKeys) - if (fresh.isNotEmpty()) StoresMotion.takeInstall()?.let { StoresMotion.fly(it) } - } + androidx.compose.runtime.DisposableEffect(Unit) { val page = Any(); StoresMotion.hosting(page); onDispose { StoresMotion.release(page) } } } @Composable @@ -594,12 +582,12 @@ private fun RowScope.ArrangeStoreChip( @OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable private fun StoreChips( - selected: String, focused: String?, active: Int, tabs: List, arranging: Boolean, - onStore: (Store) -> Unit, onDownloads: () -> Unit, onSettings: (Rect?) -> Unit, onFocusChip: (String?) -> Unit, + selected: String, focused: String?, tabs: List, arranging: Boolean, + onStore: (Store) -> Unit, onSettings: (Rect?) -> Unit, onFocusChip: (String?) -> Unit, onArrangeDone: () -> Unit, onMoveTab: (Store, Int) -> Unit, onToggleTab: (Store) -> Unit, ) { val pal = LocalPalette.current - val keys = tabs.filter { it.shown }.map { it.store.id } + DOWNLOADS + val keys = tabs.filter { it.shown }.map { it.store.id } val bounds = remember { androidx.compose.runtime.mutableStateMapOf() } val highlighted = focused ?: selected val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current.inputMode @@ -638,25 +626,11 @@ private fun StoreChips( } } } - ChipGlide(keys.indexOf(highlighted), bounds[highlighted], tint, visible = fillShown && highlighted != DOWNLOADS) + ChipGlide(keys.indexOf(highlighted), bounds[highlighted], tint, visible = fillShown) } if (arranging) { IconChip(Icons.Filled.Check, stringResource(R.string.stores_tabs_arrange_done)) { onArrangeDone() } } else { - Box { - StoreChip( - label = null, on = selected == DOWNLOADS, under = fillShown && highlighted == DOWNLOADS, key = DOWNLOADS, mark = pal.signal, - modifier = Modifier.onGloballyPositioned { - bounds[DOWNLOADS] = it.boundsInParent() - StoresMotion.downloadsChip = it.boundsInRoot() - }, - lead = { Icon(Icons.Outlined.Download, null, modifier = Modifier.size(18.dp)) }, - trail = if (active > 0) { { CountPill(active) } } else null, - description = stringResource(R.string.stores_tab_downloads), - onFocused = onFocusChip, - ) { onDownloads() } - ChipGlide(keys.indexOf(DOWNLOADS), bounds[DOWNLOADS], tint, visible = fillShown && highlighted == DOWNLOADS) - } var cogAt by remember { mutableStateOf(null) } Box(Modifier.onGloballyPositioned { cogAt = it.boundsInRoot() }) { IconChip(Icons.Filled.Settings, stringResource(R.string.stores_settings)) { onSettings(cogAt) } 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 4761bad373..874493e41c 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -304,7 +304,7 @@ public final class WaylandCompositor { public static native void nativeSetDeband(boolean enabled, int strength); public static native void nativeSetScreenEffects(float brightness, float contrast, float gamma, float saturation, - boolean fxaa, boolean toon, boolean crt, boolean ntsc); + int aaMode, boolean toon, boolean crt, boolean ntsc); public static native void nativeSetLookName(String name); diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 88e150a04a..5f85d0392c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1,4 +1,4 @@ - + توقفت رسومات SteamVR سيُعاد تشغيل DroidDeck خلال %1$d ثانية لإعادة ضبط الرسومات وإعادة فتح SteamVR. ستُغلق لعبتك الجارية، ولا يمكن استعادة التقدم غير المحفوظ. @@ -357,7 +357,7 @@ العودة إلى DroidDeck بعد اللعبة عند إغلاق لعبة بدأتها من DroidDeck أو من مشغّل آخر، يُغلَق Steam بشكل سليم (بعد اكتمال الحفظ السحابي) وتعود إلى هناك. عند الإيقاف: تبقى في Steam. التخزين المسبق للمظلِّلات - ينزّل Steam مظلِّلات مُعدّة مسبقًا لألعابك ويعالجها في الخلفية، فتقلّ التقطّعات في الألعاب. يوفّر الإيقاف البيانات والتخزين والبطارية، وتبني الألعاب المظلِّلات أثناء اللعب بدلًا من ذلك. هو الإعداد نفسه في Steam ضمن التنزيلات > التخزين المسبق للمظلِّلات. يُطبَّق في الجلسة التالية. + ينزّل Steam مظلِّلات مُعدّة مسبقًا لألعابك ويعالجها في الخلفية، فتقلّ التقطّعات في الألعاب. يوفّر الإيقاف البيانات والتخزين والبطارية، وتبني الألعاب المظلِّلات أثناء اللعب بدلًا من ذلك. هو الإعداد نفسه في Steam ضمن التنزيلات > التخزين المسبق للمظلِّلات. يُطبَّق في الجلسة التالية. إصلاح عميل Steam يُنزّل عميل Steam مجددًا في المرة التالية التي يبدأ فيها Steam. استخدمه إذا بقي Steam على شاشة التحميل. يتم الاحتفاظ بالألعاب وتسجيل الدخول والإعدادات. سيتم تنزيل عميل Steam مجددًا في المرة التالية التي يبدأ فيها Steam. @@ -718,7 +718,10 @@ ضخم شريط تثبيت في مكانه - اسحب HUD لتحريكه؛ والضغط مطولًا يثبّته أو يلغي تثبيته. أثناء تثبيته، تظل عناصر التحكم على الشاشة الموجودة تحته تعمل. + اسحب HUD لتحريكه. أثناء تثبيته، تظل عناصر التحكم على الشاشة الموجودة تحته تعمل. + ضغط مطوّل + طيّ أو توسيع + تثبيت أو إلغاء التثبيت الالتصاق بالجانبين اترك الواجهة لتنتقل إلى أقرب جانب من الشاشة. اسحبها بسرعة لترميها في ذلك الاتجاه. المظهر @@ -1157,7 +1160,7 @@ تم إيقاف نسخة المختبر بُنيت لإصدار آخر من DroidDeck. وهي محفوظة في التحديثات. لم يبدأ DroidDeck عليها مرتين - الوكيل + Dev Harness الوكيل الوكيل يعمل ثبّت Claude Code في بيئة مستخدم Linux لاستخدام الوكيل. @@ -1343,6 +1346,7 @@ إدخال العنوان يدويًا من جهاز كمبيوتر يحتوي على ADB: نسخ الأمر + وصّل النظارة بالكمبيوتر وافتح SideQuest. اختر “Run ADB Command” ثم “Custom Command”، واكتب الأمر الظاهر أدناه، ثم اختر “Run Command”. اختر الشاشة التي ستُفتَح فيها إعدادات Android. الشاشة الرئيسية تم الإقران. جارٍ البحث عن منفذ تصحيح الأخطاء اللاسلكي… @@ -1622,7 +1626,6 @@ اختر مجلدًا لملفات الألعاب الخاصة بالواجهات الأمامية تم حفظ ملفات الألعاب في %1$s ملفات الواجهة الأمامية - انتظر حتى تنتهي عملية بيئة التشغيل انتظر حتى ينتهي تثبيت أداة التوافق جارٍ تجهيز أدوات التوافق @@ -1728,7 +1731,6 @@ جارٍ إزالة بيئة تشغيل Linux تعذّر فتح الإعدادات على الشاشة السفلية، لذا فُتحت على الشاشة الأساسية. افتح خيارات المطوّرين في الإعدادات - تعذّر فتح إعداد «تثبيت التطبيقات غير المعروفة» في Android تعذّر التحقّق: %1$s لا يتوفّر لهذا الإصدار ملف تنزيل لهذه النسخة من DroidDeck @@ -1738,12 +1740,10 @@ في انتظار تأكيدك فشل التحديث لم يعرض Android تثبيت التحديث - فشل تثبيت Decky: %1$s جارٍ بدء استيراد الإضافة… فشل استيراد الإضافة: %1$s تم تثبيت الإضافة. أعِد تشغيل Steam لتحميلها. - لم يتم التحقّق بعد - انقر على «تحديث» للبحث عن برامج تشغيل جديدة Android + Linux: يضبط برنامج تشغيل العرض معه Android + Linux: يضبط برنامج تشغيل بيئة Linux معه @@ -1808,7 +1808,6 @@ فشل التحقّق تم تثبيت %1$s - اختره من أيٍّ من القائمتين لضبط برنامجَي التشغيل معًا تم تثبيت %1$s - اختره من القائمة - انتظر حتى تنتهي إزالة بيئة التشغيل لعبة لوحة اللمس @@ -1862,7 +1861,6 @@ يُظهر السجل %1$d خطأً من نوع «Function not implemented»: تسريع seccomp في proot يتسبّب في فشل أداة مساعدة على هذا الجهاز. جرِّب %2$s → «%3$s» (أو «%4$s») وابدأ من جديد. يُظهر السجل %1$d خطأ من نوع «Function not implemented»: تسريع seccomp في proot يتسبّب في فشل أداة مساعدة على هذا الجهاز. جرِّب %2$s → «%3$s» (أو «%4$s») وابدأ من جديد. - الإضافات ثبِّت ملف ZIP لإضافة في جلسة Steam التالية. جارٍ التنزيل… @@ -2247,7 +2245,6 @@ Elite Dangerous يستقبل المنفذ %1$d بيانات (%2$d حزمة بحجم %3$d بايت)، لكن بتنسيق لا تستطيع هذه الصفحة قراءته بعد. يستخدم برنامج آخر المنفذ %1$s بالفعل، لذا لا يمكن عرض تلك اللعبة هنا. - جارٍ إزالة بيئة تشغيل Linux جارٍ إزالة بيئة تشغيل Linux · %1$d عنصر @@ -2266,7 +2263,6 @@ يظهر أثناء تثبيت بيئة تشغيل Linux أو إزالتها جارٍ تثبيت بيئة تشغيل Linux جارٍ إزالة بيئة تشغيل Linux - بيئة تشغيل Linux غير مثبَّتة لا يتضمّن الكتالوج مجموعًا اختباريًا لـ %1$s المجموع الاختباري غير مطابق - لم يتم تغيير أي شيء @@ -2274,7 +2270,6 @@ تعذّر وضع ملف AppImage في مكانه فشل الاستخراج فشل التثبيت - فشل إعداد Flatpak (رمز الخروج %1$d) لم يكتمل إعداد Flatpak هناك مهمة أخرى للمتجر قيد التشغيل @@ -2293,7 +2288,6 @@ برامج ترميز الوسائط بيئة تشغيل %1$s بيئة تشغيل %1$s %2$s - الملف أصغر من أن يكون AppImage تتعذّر قراءة الملف: %1$s هذا ليس AppImage (ليس برنامج Linux) @@ -2308,7 +2302,6 @@ جارٍ استخراج %1$s تعذّر استخراج ملف AppImage تعذّر استخراج ملف AppImage: %1$s - أوقِف الجلسة النشطة قبل تثبيت Decky Loader فشل تنزيل Decky Loader حجم Decky Loader غير مطابق لبيانات الإصدار الوصفية @@ -2357,13 +2350,11 @@ تعذّر تفعيل الإضافة المستورَدة تعذّر تحديث إعدادات إضافات Decky تعذّر استعادة الإضافة الحالية - تعذّر حفظ هوية تصحيح الأخطاء اللاسلكي فشل أمر ADB (%1$d) لم يؤكّد Android تغيير حدّ العمليات الفرعية: %1$s لا يوجد إقران محفوظ لتصحيح الأخطاء اللاسلكي أدخِل عنوان IP الحالي ورقم المنفذ لتصحيح الأخطاء اللاسلكي - انتهت مهلة انتظار النافذة المنبثقة للإقران. حاوِل مرة أخرى من DroidDeck. تعذّر البحث عن النافذة المنبثقة للإقران (%1$d). تحقَّق من تفعيل Wi-Fi. تعذّر البحث عن النافذة المنبثقة للإقران: %1$s @@ -2389,7 +2380,6 @@ Steam جاهز اضغط للعودة إلى DroidDeck. يمكنك إيقاف تصحيح الأخطاء اللاسلكي الآن. توقَّف إعداد تصحيح الأخطاء اللاسلكي - فشل التنزيل حجم التنزيل غير مطابق لملف APK المنشور، وتم تجاهله - حاوِل مرة أخرى التنزيل غير مطابق لمجموعه الاختباري، وتم تجاهله - حاوِل مرة أخرى @@ -2402,13 +2392,11 @@ ملف APK الذي تم تنزيله لا يحمل معلومات توقيع ملف APK الذي تم تنزيله غير موقَّع بمفتاح إصدار DroidDeck استجاب كتالوج التحديثات بـ HTTP %1$d - جارٍ بدء الجلسة… %1$d:%2$02d منقضية · لا تزال جارية جارٍ تنزيل تحديث عميل Steam · %1$d%% جارٍ تطبيق تحديث عميل Steam… جارٍ تنزيل عميل Steam · %1$s - يوجد تثبيت لأداة توافق قيد التنفيذ بالفعل أوقِف الجلسة النشطة قبل تثبيت أدوات التوافق تعذّر العثور على إصدار ARM64 لـ %1$s @@ -2428,7 +2416,6 @@ فشل تثبيت %1$s (حالة الخروج %2$d) تعذّر تثبيت %1$s جارٍ جلب حزمة droiddeck-esync - مع أدوات Linux المساعدة ملفات DLL فقط الأصلي (تم تحديث Proton منذ آخر تبديل) @@ -2451,13 +2438,11 @@ فشل التنزيل: ربما استُبدل هذا الإصدار الليلي بإصدار أحدث. حدّث القائمة وحاول مرة أخرى. قائمة الحزم هذه أقدم من إضافة المجاميع الاختبارية - حدِّثها وحاوِل مرة أخرى عدم تطابق المجموع الاختباري - خطي الأقرب Snapdragon GSR (جودة) زيادة الحدة فقط تلقائي (يطابق التكبير) - لا يُطبَّق أي شيء. وضوح اللعبة زيادة حدّة مع لمسة من التباين - الخيار اليومي. @@ -2481,7 +2466,6 @@ بكسلات واضحة للألعاب الثنائية الأبعاد والألعاب القديمة. حافة الأنيمي حدود كرتونية مع زيادة الحدّة. - وحدة GPU ليست من نوع Adreno برنامج تشغيل PowerVR في النظام: يختلف التوافق باختلاف الجهاز تجريبي: RADV أو برنامج تشغيل Xclipse في النظام @@ -2506,7 +2490,6 @@ غير مدعوم: لا تتوفر واجهة رسومات متوافقة مع وحدة معالجة الرسومات هذه يعمل عبر جسر Mali، على برنامج تشغيل Vulkan الخاص بالهاتف غير مدعوم عند إيقاف جسر Mali: يحتاج Turnip إلى معالج رسوميات Adreno (Snapdragon) - تم الوصول إلى حدّ الطلبات في GitHub - حاوِل مرة أخرى لاحقًا استجاب GitHub بـ HTTP %1$d فشل التنزيل @@ -2527,16 +2510,12 @@ ليست حزمة برامج تشغيل: لا يوجد manifest.json يذكر برنامج تشغيل لـ Android وآخر لـ Linux ليست حزمة برامج تشغيل: %1$s يشير إلى خارجها ليست حزمة برامج تشغيل: تتجاوز بعد الاستخراج %1$d MB - بطاقة SD مجلد - مشاركة سجلات الجلسة - يحتاج إلى Android 10 أو أحدث (طبقات عرض بمساحة ألوان) لا تُعلن هذه الشاشة عن دعم HDR تدعم هذه الشاشة %1$s، وليس HDR10 - وحدة GPU هذه حدّ العمليات الفرعية مفعَّل حدّ العمليات الفرعية غير محدَّد @@ -2610,7 +2589,6 @@ تم النسخ. فرض SSBS يحافظ على إعداد سرعة لوحدة المعالجة (CPU) يستمر Wine في إيقافه. قد يجعل ألعاب Windows أسرع على Snapdragon 8 Elite؛ مع تغيّر طفيف على الشرائح الأقدم. يُطبَّق عند تشغيل اللعبة في المرة التالية. - المتاجر Steam مخصَّص @@ -3108,7 +3086,6 @@ لون الأيقونة لون الزر بلا أيقونة - جارٍ التحقق من تسجيل الدخول… جارٍ جلب مكتبتك… جارٍ جلب قائمة الألعاب… @@ -4189,10 +4166,8 @@ إظهار التسمية تعذّر استيراد هذا التخطيط يُثبّت عبر %1$s - ثلج قرمزي أسطح بيضاء مع لمسات حمراء. - الموسيقى التصويرية الموسيقى خيارات التشغيل @@ -4269,7 +4244,9 @@ المعروض %1$d من %2$d اضغط زر الرجوع مرة أخرى للخروج - تحجيم صحيح بالأعداد الصحيحة - يستخدم أكبر معامل تحجيم صحيح يناسب الشاشة. إذا كان المصدر كبيرًا جدًا، يتم تصغير الصورة كاملة لتجنب الاقتصاص. يتم ضبط الدقة بشكل منفصل. - + يستخدم أكبر معامل تكبير صحيح يناسب الشاشة. قد يقص الحواف. إذا كان المصدر أكبر من الناتج، فإن التحجيم الكسري يعرض الصورة كاملة. يتم ضبط الدقة بشكل منفصل. + عدد صحيح + ملاءمة + تنعيم الحواف + \ No newline at end of file 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 43000b9a3d..6c67130a34 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1,4 +1,4 @@ - + Los gráficos de SteamVR se detuvieron DroidDeck se reiniciará en %1$d segundos para restablecer los gráficos y volver a abrir SteamVR. Tu juego en curso se cerrará; el progreso no guardado no se podrá recuperar. @@ -712,7 +712,10 @@ Mega Barra Fijar posición - 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. + Arrastra el HUD para moverlo. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando. + Pulsación larga + Contraer o expandir + Bloquear o desbloquear Ajustar a los lados Al soltar el HUD, se mueve al lado más cercano de la pantalla. Un gesto rápido lo lanza en esa dirección. Aspecto @@ -1175,7 +1178,7 @@ Compilación de Lab desactivada Se creó para otra versión de DroidDeck. Se conserva en Actualizaciones. DroidDeck no arrancó con ella dos veces - Agente + Dev Harness Agente El agente está trabajando Instala Claude Code en el entorno de usuario de Linux para usar el agente. @@ -1349,6 +1352,7 @@ Ingresar dirección manualmente Desde una computadora con ADB: Copiar comando + Conecta el visor a una computadora y abre SideQuest. Elige “Run ADB Command” y luego “Custom Command”, escribe el comando que aparece abajo y selecciona “Run Command”. Elige en qué pantalla abrir los Ajustes de Android. Pantalla principal Vinculado. Buscando el puerto de la Depuración inalámbrica… @@ -4120,7 +4124,9 @@ Mostrados %1$d de %2$d Presiona atrás una vez más para salir - Escalado de píxeles enteros - Usa el mayor factor de escala entero que quepa. Si la imagen de origen es demasiado grande, ajusta la imagen completa para evitar recortes. La resolución se configura por separado. - + Usa la mayor escala entera que cabe. Puede recortar los bordes. Si la imagen original supera el tamaño de salida, el escalado fraccional muestra la imagen completa. La resolución se configura por separado. + Entero + Ajustar + Antialiasing + \ No newline at end of file diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index d2682098c7..bddb2786e3 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1,4 +1,4 @@ - + Графиката на SteamVR спря DroidDeck ще се рестартира след %1$d секунди, за да нулира графиката и да отвори отново SteamVR. Текущата ви игра ще бъде затворена; незапазеният напредък не може да бъде възстановен. @@ -710,7 +710,10 @@ Мега Лента Заключване на място - Плъзнете HUD, за да го преместите; продължително натискане го заключва или отключва. Докато е заключен, екранните контроли под него продължават да работят. + Плъзнете HUD, за да го преместите. Докато е заключен, екранните контроли под него продължават да работят. + Продължително натискане + Свиване или разгъване + Заключване или отключване Залепване отстрани Пуснете HUD и той отива към по-близката страна на екрана. Бързо плъзване го хвърля в тази посока. Визия @@ -1145,7 +1148,7 @@ Лаб компилацията е изключена Създадена е за друга версия на DroidDeck. Запазена е в Актуализации. DroidDeck не стартира два пъти с нея - Агент + Dev Harness Агент Агентът работи Инсталирайте Claude Code в потребителското пространство на Linux, за да използвате агента. @@ -1315,6 +1318,7 @@ Ръчно въвеждане на адреса От компютър с ADB: Копиране на командата + Свържете шлема с компютър и отворете SideQuest. Изберете „Run ADB Command“, после „Custom Command“, въведете командата, показана по-долу, и изберете „Run Command“. Изберете на кой екран да се отворят настройките на Android. Основен екран Сдвоено. Търсене на порта за безжично отстраняване на грешки… @@ -1590,7 +1594,6 @@ Избор на папка за файловете на фронтенда на игрите Файловете на игрите са запазени в %1$s Файлове на фронтенда - Изчакай операцията със средата да приключи Изчакай инсталирането на инструмента за съвместимост да приключи Подготовка на инструментите за съвместимост @@ -1676,7 +1679,6 @@ Премахване на средата на Linux Настройките не можаха да се отворят на долния екран; отворени са на основния екран. Отваряне на „Опции за програмисти“ в настройките - Настройката на Android „Инсталиране на неизвестни приложения“ не можа да се отвори Проверката не можа да се извърши: %1$s Тази версия няма изтегляне за това копие на DroidDeck @@ -1686,12 +1688,10 @@ Изчакване на потвърждение от теб Актуализацията се провали Android не предложи инсталирането на актуализацията - Инсталирането на Decky се провали: %1$s Стартиране на импортирането на плъгина… Импортирането на плъгина се провали: %1$s Плъгинът е инсталиран. Рестартирай Steam, за да се зареди. - Все още не е проверено - докосни опресняване, за да провериш за нови драйвери Android + Linux: задава драйвера за дисплея заедно с него Android + Linux: задава драйвера за средата заедно с него @@ -1744,7 +1744,6 @@ проверката се провали Инсталирано: %1$s - избери го в който и да е от списъците, за да зададеш и двата драйвера Инсталирано: %1$s - избери го от менюто - Изчакай премахването на средата да приключи Игра тракпад @@ -1790,7 +1789,6 @@ Логът показва %1$d грешка „Function not implemented“: ускорението на proot чрез seccomp се проваля при помощен процес на това устройство. Пробвай %2$s → „%3$s“ (или „%4$s“) и стартирай отново. Логът показва %1$d грешки „Function not implemented“: ускорението на proot чрез seccomp се проваля при помощен процес на това устройство. Пробвай %2$s → „%3$s“ (или „%4$s“) и стартирай отново. - Плъгини Инсталирай ZIP с плъгин за следващата сесия на Steam. Изтегляне… @@ -2147,7 +2145,6 @@ Elite Dangerous Порт %1$d получава данни (%2$d пакета по %3$d байта), но във формат, който тази страница все още не може да чете. Друга програма вече използва порт %1$s, затова тази игра не може да се показва тук. - Премахване на средата на Linux Премахване на средата на Linux · %1$d запис @@ -2162,7 +2159,6 @@ Показва се, докато средата на Linux се инсталира или премахва Инсталиране на средата на Linux Премахване на средата на Linux - Средата на Linux не е инсталирана Каталогът няма контролна сума за %1$s Несъответствие в контролната сума - нищо не е променено @@ -2170,7 +2166,6 @@ AppImage не можа да бъде поставен Разопаковането се провали Инсталирането се провали - Настройката на Flatpak се провали (изход %1$d) Настройката на Flatpak не завърши Друга задача на магазина вече се изпълнява @@ -2189,7 +2184,6 @@ медийни кодеци средата %1$s средата %1$s %2$s - Файлът е твърде малък, за да бъде AppImage Файлът не може да бъде прочетен: %1$s Това не е AppImage (не е Linux програма) @@ -2204,7 +2198,6 @@ Разопаковане на %1$s AppImage не можа да бъде разопакован AppImage не можа да бъде разопакован: %1$s - Спри активната сесия, преди да инсталираш Decky Loader Изтеглянето на Decky Loader се провали Размерът на Decky Loader не съответства на метаданните на версията @@ -2253,13 +2246,11 @@ Импортираният плъгин не можа да бъде активиран Настройките на плъгина на Decky не можаха да бъдат обновени Съществуващият плъгин не можа да бъде възстановен - Идентичността на безжичното отстраняване на грешки не можа да бъде запазена Командата на ADB се провали (%1$d) Android не потвърди промяната на ограничението за дъщерни процеси: %1$s Няма запазено чифтосване за безжично отстраняване на грешки Въведи текущия IP адрес и порт за безжично отстраняване на грешки - Изтече времето за изчакване на изскачащия прозорец за чифтосване. Опитай отново от DroidDeck. Не можа да се търси изскачащият прозорец за чифтосване (%1$d). Проверете дали Wi-Fi е включен. Не можа да се търси изскачащият прозорец за чифтосване: %1$s @@ -2285,7 +2276,6 @@ Steam е готов Докосни, за да се върнеш в DroidDeck. Вече можеш да изключиш безжичното отстраняване на грешки. Настройката на безжичното отстраняване на грешки спря - Изтеглянето не успя Размерът на изтеглянето не съответстваше на публикуваното APK и беше отхвърлен - опитай отново Изтеглянето не съответстваше на контролната си сума и беше отхвърлено - опитай отново @@ -2298,13 +2288,11 @@ Изтегленото APK няма информация за подпис Изтегленото APK не е подписано с ключа за версии на DroidDeck Каталогът с актуализации отговори с HTTP %1$d - Стартиране на сесията… %1$d:%2$02d изминали · все още работи Изтегляне на актуализацията на клиента на Steam · %1$d%% Прилагане на актуализацията на клиента Steam… Изтегляне на клиента на Steam · %1$s - Вече тече инсталация на инструмент за съвместимост Спри активната сесия, преди да инсталираш инструменти за съвместимост Не беше намерена ARM64 версия на %1$s @@ -2324,7 +2312,6 @@ Инсталирането на %1$s се провали (код %2$d) %1$s не можа да бъде инсталиран Извличане на пакета droiddeck-esync - с помощни програми за Linux Само DLL файлове Оригинал (Proton е обновен след последната замяна) @@ -2347,13 +2334,11 @@ Изтеглянето не бе успешно: тази нощна версия може да е заменена с по-нова. Обновете списъка и опитайте отново. Този списък с пакети е отпреди въвеждането на контролни суми - обнови го и опитай отново Несъответствие в контролната сума - Линейно Най-близко Snapdragon GSR (качество) Само изостряне Автоматично (съответства на мащабирането) - Нищо не е приложено. Яснота на играта Изостряне с лек контраст - за всеки ден. @@ -2377,7 +2362,6 @@ Ясни пиксели за 2D и стари игри. Аниме контури Контури като в анимация плюс изостряне. - Не е GPU Adreno Системен драйвер PowerVR: съвместимостта варира според устройството Експериментално: RADV или системният драйвер Xclipse @@ -2402,7 +2386,6 @@ Не се поддържа: няма съвместим графичен бекенд за този GPU Работи през моста Mali, със собствения драйвер Vulkan на телефона Не се поддържа, когато мостът Mali е изключен: Turnip изисква графичен процесор Adreno (Snapdragon) - Достигнато е ограничението на GitHub за заявки - опитай отново по-късно GitHub отговори с HTTP %1$d Изтеглянето не успя @@ -2423,16 +2406,12 @@ Не е пакет с драйвери: няма manifest.json, посочващ драйвер за Android и за Linux Не е пакет с драйвери: %1$s сочи извън него Не е пакет с драйвери: при разопаковане надхвърля %1$d MB - SD карта Папка - Споделяне на логовете от сесията - изисква Android 10 или по-нова версия (слоеве на екрана с цветово пространство) този екран не отчита поддръжка на HDR този екран поддържа %1$s, не HDR10 - този GPU Ограничението за дъщерни процеси е включено Ограничението за дъщерни процеси не е зададено @@ -2506,7 +2485,6 @@ Копирано. Принудително SSBS Поддържа настройка за скоростта на процесора, която Wine непрекъснато изключва. Може да ускори Windows игрите на Snapdragon 8 Elite; при по-стари чипове промяната е малка. Прилага се при следващото стартиране на игра. - Магазини Steam Персонализирана @@ -2992,7 +2970,6 @@ Цвят на иконата Цвят на бутона Без икона - Проверка на вписването… Извличане на библиотеката ви… Извличане на списъка с игри… @@ -4029,10 +4006,8 @@ Показване на етикета Това разположение не можа да бъде импортирано Инсталира се чрез %1$s - Ален сняг Бели повърхности с червени акценти. - Саундтраци Музика Опции за възпроизвеждане @@ -4109,7 +4084,9 @@ Показани %1$d от %2$d Натиснете отново „Назад“, за да излезете - Целочислено мащабиране - Използва най-големия цял коефициент на мащабиране, който се побира. Ако източникът е твърде голям, побира цялото изображение, за да избегне изрязване. Разделителната способност се настройва отделно. - + Използва най-големия цял коефициент на мащабиране, който се побира. Възможно е изрязване на краищата. Ако източникът е по-голям от изхода, дробното мащабиране показва цялото изображение. Разделителната способност се настройва отделно. + Цяло число + Побиране + Заглаждане на ръбовете + \ No newline at end of file diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index dd9d5a5794..008b70f6b7 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,4 +1,4 @@ - + Grafika SteamVR přestala fungovat DroidDeck se za %1$d s restartuje, aby resetoval grafiku a znovu otevřel SteamVR. Spuštěná hra se zavře; neuložený postup nelze obnovit. @@ -357,7 +357,7 @@ Po hře se vrátit do DroidDeck 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. Předběžné ukládání shaderů - 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. + 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. Opravit klienta Steam 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. Klient Steam se znovu stáhne při dalším spuštění Steamu. @@ -714,7 +714,10 @@ Mega Lišta Zamknout na místě - 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í. + Přetažením HUD přesunete. Když je zamknutý, ovládací prvky na obrazovce pod ním dál fungují. + Dlouhý stisk + Sbalit nebo rozbalit + Zamknout nebo odemknout Přichytit ke stranám Pusťte HUD a přesune se k bližší straně obrazovky. Rychlým švihnutím ho hodíte tím směrem. Vzhled @@ -1151,7 +1154,7 @@ Laboratorní sestavení vypnuto Bylo vytvořeno pro jinou verzi aplikace DroidDeck. Zůstává v Aktualizacích. DroidDeck se na něm dvakrát nespustil. - Agent + Dev Harness Agent Agent pracuje Chcete-li používat agenta, nainstalujte Claude Code v uživatelském prostředí Linuxu. @@ -1329,6 +1332,7 @@ Zadat adresu ručně Z počítače s ADB: Kopírovat příkaz + Připojte headset k počítači a otevřete SideQuest. Zvolte „Run ADB Command“, pak „Custom Command“, opište příkaz zobrazený níže a vyberte „Run Command“. Vyberte, na kterém displeji se má otevřít Nastavení Androidu. Hlavní obrazovka Spárováno. Hledání portu Bezdrátového ladění… @@ -1606,7 +1610,6 @@ Vybrat složku pro soubory her frontendu Soubory hry uloženy do %1$s Soubory frontendu - Počkejte, až skončí operace s runtime Počkejte, až skončí instalace nástroje kompatibility Příprava nástrojů kompatibility @@ -1702,7 +1705,6 @@ Odstraňování runtime Linuxu Nepodařilo se otevřít Nastavení na spodní obrazovce; otevřelo se na hlavní obrazovce. Otevřít Možnosti pro vývojáře v Nastavení - Nepodařilo se otevřít nastavení Androidu „Instalace neznámých aplikací“ Nepodařilo se zkontrolovat: %1$s Toto sestavení nemá stažení pro tuto kopii DroidDecku @@ -1712,12 +1714,10 @@ Čeká na vaše potvrzení Aktualizace se nezdařila Android nenabídl instalaci aktualizace - Instalace Decky se nezdařila: %1$s Spouštění importu pluginu… Import pluginu se nezdařil: %1$s Plugin nainstalován. Restartujte Steam, aby se načetl. - Zatím nezkontrolováno - klepnutím na obnovit vyhledáte nové ovladače Android + Linux: zároveň nastaví ovladač zobrazení Android + Linux: zároveň nastaví ovladač runtime @@ -1776,7 +1776,6 @@ kontrola se nezdařila Nainstalováno %1$s - vyberte ho v kterémkoli seznamu pro nastavení obou ovladačů Nainstalováno %1$s - vyberte ho v nabídce - Počkejte, až skončí odstranění runtime Hra touchpad @@ -1826,7 +1825,6 @@ V logu je %1$d chyb „Function not implemented“: akcelerace seccomp v proot zde selhává u pomocné funkce na tomto zařízení. Zkuste %2$s → „%3$s“ (nebo „%4$s“) a spusťte to znovu. V logu je %1$d chyb „Function not implemented“: akcelerace seccomp v proot zde selhává u pomocné funkce na tomto zařízení. Zkuste %2$s → „%3$s“ (nebo „%4$s“) a spusťte to znovu. - Pluginy Nainstalujte ZIP s pluginem pro další relaci Steamu. Stahování… @@ -2197,7 +2195,6 @@ Elite Dangerous 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. Port %1$s již používá jiný program, takže se zde tato hra nemůže zobrazit. - Odstraňování runtime Linuxu Odstraňování runtime Linuxu · %1$d položka @@ -2214,7 +2211,6 @@ Zobrazuje se při instalaci nebo odstraňování runtime Linuxu Instalace runtime Linuxu Odstraňování runtime Linuxu - Runtime Linuxu není nainstalován Katalog neobsahuje kontrolní součet pro %1$s Neshoda kontrolního součtu - nic se nezměnilo @@ -2222,7 +2218,6 @@ Nepodařilo se umístit AppImage Rozbalení se nezdařilo Instalace se nezdařila - Nastavení Flatpaku se nezdařilo (návratový kód %1$d) Nastavení Flatpaku se nedokončilo Běží jiná úloha obchodu @@ -2241,7 +2236,6 @@ multimediální kodeky runtime %1$s runtime %1$s %2$s - Soubor je příliš malý na to, aby byl AppImage Soubor nelze přečíst: %1$s Toto není AppImage (nejde o program pro Linux) @@ -2256,7 +2250,6 @@ Rozbalování %1$s AppImage se nepodařilo rozbalit AppImage se nepodařilo rozbalit: %1$s - Před instalací Decky Loader zastavte aktivní relaci Stažení Decky Loader se nezdařilo Velikost Decky Loader neodpovídala metadatům vydání @@ -2305,13 +2298,11 @@ Nepodařilo se aktivovat importovaný plugin Nepodařilo se aktualizovat nastavení pluginu Decky Nepodařilo se obnovit stávající plugin - Nepodařilo se uložit identitu bezdrátového ladění Příkaz ADB se nezdařil (%1$d) Android nepotvrdil změnu limitu procesů potomků: %1$s Není uloženo žádné párování bezdrátového ladění Zadejte aktuální IP adresu a port bezdrátového ladění - Čekání na vyskakovací okno pro párování vypršelo. Zkuste to znovu z DroidDecku. Nepodařilo se vyhledat vyskakovací okno pro párování (%1$d). Zkontrolujte, že je zapnutá Wi-Fi. Nepodařilo se vyhledat vyskakovací okno pro párování: %1$s @@ -2337,7 +2328,6 @@ Steam je připraven Klepnutím se vrátíte do DroidDecku. Bezdrátové ladění teď můžete vypnout. Nastavení bezdrátového ladění bylo zastaveno - Stahování selhalo Velikost stahování neodpovídala zveřejněnému APK a bylo zahozeno - zkuste to znovu Stahování neodpovídalo svému kontrolnímu součtu a bylo zahozeno - zkuste to znovu @@ -2350,13 +2340,11 @@ Stažené APK nemá žádné informace o podpisu Stažené APK není podepsáno vydávacím klíčem DroidDecku Katalog aktualizací odpověděl HTTP %1$d - Spouštění relace… %1$d:%2$02d uplynulo · stále pracuje Stahování aktualizace klienta Steam · %1$d%% Instaluje se aktualizace klienta Steam… Stahování klienta Steam · %1$s - Instalace nástroje kompatibility už běží Před instalací nástrojů kompatibility zastavte aktivní relaci Nepodařilo se najít vydání ARM64 pro %1$s @@ -2376,7 +2364,6 @@ Instalace %1$s se nezdařila (návratový kód %2$d) Nepodařilo se nainstalovat %1$s Stahování balíčku droiddeck-esync - s pomocnými nástroji pro Linux Jen DLL Původní (Proton byl od posledního přepnutí aktualizován) @@ -2399,13 +2386,11 @@ Stažení selhalo: tento noční build mohl být nahrazen novějším. Obnovte seznam a zkuste to znovu. Tento seznam balíčků předchází kontrolním součtům - obnovte ho a zkuste to znovu Neshoda kontrolního součtu - Lineární Nejbližší Snapdragon GSR (kvalita) Jen zaostření Automaticky (podle škálování) - Nic není použito. Herní jasnost Zaostření s trochou kontrastu - ten každodenní. @@ -2429,7 +2414,6 @@ Ostré pixely pro 2D a staré hry. Anime hrany Kreslené obrysy plus zaostření. - Není GPU Adreno Systémový ovladač PowerVR: kompatibilita se liší podle zařízení Experimentální: RADV nebo systémový ovladač Xclipse @@ -2454,7 +2438,6 @@ Nepodporováno: pro tento GPU není k dispozici kompatibilní grafický backend Běží přes most Mali na vlastním ovladači Vulkan telefonu S vypnutým mostem Mali není podporováno: Turnip potřebuje GPU Adreno (Snapdragon) - Byl dosažen limit požadavků GitHubu - zkuste to později GitHub odpověděl HTTP %1$d Stahování selhalo @@ -2475,16 +2458,12 @@ Není balíček ovladačů: chybí manifest.json s názvy ovladače pro Android a Linux Není balíček ovladačů: %1$s odkazuje mimo něj Není balíček ovladačů: po rozbalení přesáhne %1$d MB - SD karta Složka - Sdílet logy relace - vyžaduje Android 10 nebo novější (vrstvy displeje s barevným prostorem) tento displej neuvádí podporu HDR tento displej podporuje %1$s, ne HDR10 - toto GPU Limit procesů potomků je zapnutý Limit procesů potomků není nastavený @@ -2558,7 +2537,6 @@ Zkopírováno. Vynutit SSBS Udržuje zapnuté nastavení rychlosti CPU, které Wine stále vypíná. Může zrychlit Windows hry na Snapdragonu 8 Elite; na starších čipech je rozdíl malý. Použije se při příštím spuštění hry. - Obchody Steam Vlastní @@ -3050,7 +3028,6 @@ Barva ikony Barva tlačítka Bez ikony - Ověřování přihlášení… Načítání vaší knihovny… Načítání seznamu her… @@ -4109,10 +4086,8 @@ Zobrazit popisek Toto rozložení nelze importovat Instaluje se přes %1$s - Šarlatový sníh Bílé povrchy s červenými akcenty. - Soundtracky Hudba Možnosti přehrávání @@ -4189,7 +4164,9 @@ Zobrazeno %1$d z %2$d Stiskněte znovu zpět pro ukončení - Celočíselné škálování - Použije největší celočíselný násobek měřítka, který se vejde. Pokud je zdroj příliš velký, přizpůsobí celý obraz, aby nedošlo k oříznutí. Rozlišení se nastavuje samostatně. - + Použije největší celočíselné měřítko, které se vejde. Může oříznout okraje. Pokud je zdroj větší než výstup, zlomkové měřítko zobrazí celý obraz. Rozlišení se nastavuje samostatně. + Celé číslo + Přizpůsobit + Vyhlazování hran + \ No newline at end of file diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 9e1ef1ad76..13fed381f1 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1,4 +1,4 @@ - + SteamVR-grafikken stoppede DroidDeck genstarter om %1$d sekunder for at nulstille grafikken og åbne SteamVR igen. Dit kørende spil lukkes; ikke-gemte fremskridt kan ikke gendannes. @@ -357,7 +357,7 @@ Vend tilbage til DroidDeck efter et spil 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. Shader-forhåndscaching - 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. + 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. Reparer Steam-klienten 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. Steam-klienten downloades igen, næste gang Steam starter. @@ -710,7 +710,10 @@ Mega Bjælke Lås fast - 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. + Træk i HUD for at flytte det. Mens det er låst, virker skærmknapperne under det stadig. + Langt tryk + Skjul eller udvid + Lås eller frigør Fastgør til siderne Slip HUD\'en, så flytter den sig til skærmens nærmeste side. Et hurtigt stryg kaster den i den retning. Udseende @@ -1145,7 +1148,7 @@ Lab-build slået fra Den blev bygget til en anden version af DroidDeck. Den ligger stadig i Opdateringer. DroidDeck startede ikke på den to gange - Agent + Dev Harness Agent Agenten arbejder Installer Claude Code i Linux-brugermiljøet for at bruge agenten. @@ -1315,6 +1318,7 @@ Indtast adresse manuelt Fra en computer med ADB: Kopier kommando + Slut headsettet til en computer, og åbn SideQuest. Vælg “Run ADB Command” og derefter “Custom Command”, skriv kommandoen vist nedenfor, og vælg “Run Command”. Vælg, hvilken skærm Android-indstillinger skal åbnes på. Hovedskærm Parret. Finder porten for Trådløs fejlretning… @@ -1590,7 +1594,6 @@ Vælg en mappe til frontend-spilfiler Spilfiler gemt i %1$s Frontend-filer - Vent til runtime-handlingen er færdig Vent til installationen af kompatibilitetsværktøjet er færdig Forbereder kompatibilitetsværktøjer @@ -1676,7 +1679,6 @@ Fjerner Linux-runtime Kunne ikke åbne Indstillinger på den nederste skærm; åbnede den på hovedskærmen. Åbn Indstillinger for udviklere i Indstillinger - Kunne ikke åbne Androids indstilling ”Installer ukendte apps” Kunne ikke kontrollere: %1$s Denne build har ingen download til denne kopi af DroidDeck @@ -1686,12 +1688,10 @@ Venter på din bekræftelse Opdateringen mislykkedes Android tilbød ikke at installere opdateringen - Decky-installation mislykkedes: %1$s Starter import af plugin… Import af plugin mislykkedes: %1$s Plugin installeret. Genstart Steam for at indlæse det. - Ikke kontrolleret endnu - tryk på opdater for at søge efter nye drivere Android + Linux: angiver skærmdriveren samtidig Android + Linux: angiver runtime-driveren samtidig @@ -1744,7 +1744,6 @@ kontrol mislykkedes Installeret %1$s - vælg den i en af listerne for at angive begge drivere Installeret %1$s - vælg den i menuen - Vent til fjernelse af runtime er færdig Spil touchpad @@ -1790,7 +1789,6 @@ Loggen viser %1$d \"Function not implemented\"-fejl: proots seccomp-acceleration fejler i en hjælpeproces på denne enhed. Prøv %2$s → \"%3$s\" (eller \"%4$s\"), og start igen. Loggen viser %1$d \"Function not implemented\"-fejl: proots seccomp-acceleration fejler i en hjælpeproces på denne enhed. Prøv %2$s → \"%3$s\" (eller \"%4$s\"), og start igen. - Plugins Installer en plugin-ZIP til den næste Steam-session. Downloader… @@ -2147,7 +2145,6 @@ Elite Dangerous Port %1$d modtager data (%2$d pakker á %3$d bytes), men i et format, som denne side endnu ikke kan læse. Et andet program bruger allerede port %1$s, så det spil kan ikke vises her. - Fjerner Linux-runtime Fjerner Linux-runtime · %1$d element @@ -2162,7 +2159,6 @@ Vises, mens Linux-runtime installeres eller fjernes Installerer Linux-runtime Fjerner Linux-runtime - Linux-runtime er ikke installeret Kataloget har ingen tjeksum for %1$s Tjeksum stemmer ikke - intet blev ændret @@ -2170,7 +2166,6 @@ Kunne ikke placere AppImage Udpakning mislykkedes Installation mislykkedes - Flatpak-opsætning mislykkedes (afslutningskode %1$d) Flatpak-opsætning blev ikke afsluttet En anden butiksopgave er i gang @@ -2189,7 +2184,6 @@ mediecodecs %1$s-runtime %1$s-runtime %2$s - Filen er for lille til at være en AppImage Filen kan ikke læses: %1$s Dette er ikke en AppImage (det er ikke et Linux-program) @@ -2204,7 +2198,6 @@ Udpakker %1$s AppImage kunne ikke udpakkes AppImage kunne ikke udpakkes: %1$s - Stop den aktive session, før du installerer Decky Loader Download af Decky Loader mislykkedes Decky Loaders størrelse passede ikke med metadata for udgivelsen @@ -2253,13 +2246,11 @@ Kunne ikke aktivere det importerede plugin Kunne ikke opdatere Decky-pluginindstillinger Kunne ikke gendanne det eksisterende plugin - Kunne ikke gemme identitet til Trådløs fejlretning ADB-kommando mislykkedes (%1$d) Android bekræftede ikke, at procesgrænsen blev ændret: %1$s Ingen parring for Trådløs fejlretning er gemt Indtast den aktuelle IP-adresse og port for Trådløs fejlretning - Der opstod timeout under venten på parringsvinduet. Forsøg igen fra DroidDeck. Kunne ikke lede efter parringsvinduet (%1$d). Tjek at Wi-Fi er tændt. Kunne ikke lede efter parringsvinduet: %1$s @@ -2285,7 +2276,6 @@ Steam er klar Tryk for at gå tilbage til DroidDeck. Du kan slukke Trådløs fejlretning nu. Opsætning af Trådløs fejlretning stoppet - Hentningen mislykkedes Downloadets størrelse passede ikke med den udgivne APK og blev kasseret - forsøg igen Downloadet matchede ikke sin tjeksum og blev kasseret - forsøg igen @@ -2298,13 +2288,11 @@ Den downloadede APK har ingen signeringsoplysninger Den downloadede APK er ikke signeret med DroidDecks udgivelsesnøgle Opdateringskataloget svarede HTTP %1$d - Starter sessionen… %1$d:%2$02d forløbet · arbejder stadig Downloader Steam-klientopdateringen · %1$d%% Anvender Steam-klientopdateringen… Downloader Steam-klienten · %1$s - En installation af et kompatibilitetsværktøj er allerede i gang Stop den aktive session, før du installerer kompatibilitetsværktøjer Kunne ikke finde en ARM64-udgivelse af %1$s @@ -2324,7 +2312,6 @@ Installation af %1$s mislykkedes (afslutningskode %2$d) Kunne ikke installere %1$s Henter droiddeck-esync-pakken - med Linux-hjælpeprogrammer Kun DLL\'er Original (Proton opdateret siden sidste ombytning) @@ -2347,13 +2334,11 @@ Download mislykkedes: denne nightly kan være erstattet af en nyere build. Opdater listen, og prøv igen. Denne pakkeliste er ældre end tjeksummer - opdater den, og forsøg igen Tjeksum stemmer ikke - Lineær Nærmeste Snapdragon GSR (kvalitet) Kun skærpning Auto (matcher skalering) - Intet anvendt. Spilklarhed Skærpning med et strejf af kontrast - den til hver dag. @@ -2377,7 +2362,6 @@ Skarpe pixels til 2D og gamle titler. Anime-kant Toon-konturer plus skærpning. - Ikke en Adreno-GPU System-PowerVR-driver: Kompatibiliteten varierer afhængigt af enheden Eksperimentelt: RADV eller systemets Xclipse-driver @@ -2402,7 +2386,6 @@ Understøttes ikke: ingen kompatibel grafikbackend er tilgængelig for denne GPU Kører via Mali-broen på telefonens egen Vulkan-driver Understøttes ikke, når Mali-broen er slået fra: Turnip kræver en Adreno-GPU (Snapdragon) - GitHubs hastighedsgrænse blev nået - forsøg igen senere GitHub svarede HTTP %1$d Hentningen mislykkedes @@ -2423,16 +2406,12 @@ Ikke en driverpakke: ingen manifest.json, der angiver en android- og en linux-driver Ikke en driverpakke: %1$s peger uden for den Ikke en driverpakke: den udpakkes til mere end %1$d MB - SD-kort Mappe - Del sessionslogs - kræver Android 10 eller nyere (skærmlag med et farverum) denne skærm rapporterer ingen HDR-understøttelse denne skærm understøtter %1$s, ikke HDR10 - denne GPU Procesgrænse er tændt Procesgrænse er ikke sat @@ -2506,7 +2485,6 @@ Kopieret. Tving SSBS Bevarer en CPU-hastighedsindstilling, som Wine hele tiden slår fra. Kan gøre Windows-spil hurtigere på Snapdragon 8 Elite; lille ændring set på ældre chips. Træder i kraft ved næste spilstart. - Butikker Steam Brugerdefineret @@ -2992,7 +2970,6 @@ Ikonfarve Knapfarve Intet ikon - Kontrollerer login… Henter dit bibliotek… Henter spilliste… @@ -4029,10 +4006,8 @@ Vis etiket Dette layout kunne ikke importeres Installeres via %1$s - Skarlagensne Hvide overflader med røde accenter. - Soundtracks Musik Afspilningsindstillinger @@ -4109,7 +4084,9 @@ Vist %1$d af %2$d Tryk tilbage igen for at afslutte - Heltalsskalering - Bruger den største hele skaleringsfaktor, der kan være der. Hvis kilden er for stor, tilpasses hele billedet for at undgå beskæring. Opløsningen indstilles separat. - + Bruger den største hele skalering, der kan være på skærmen. Kan beskære kanterne. Hvis kilden er større end outputtet, viser brøkbaseret skalering hele billedet. Opløsningen indstilles separat. + Heltal + Tilpas + Kantudjævning + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b062adf353..40f17501cb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + SteamVR-Grafik ausgefallen DroidDeck startet in %1$d Sekunden neu, um die Grafik zurückzusetzen und SteamVR wieder zu öffnen. Dein laufendes Spiel wird geschlossen; nicht gespeicherter Fortschritt lässt sich nicht wiederherstellen. @@ -357,7 +357,7 @@ Nach einem Spiel zu DroidDeck zurückkehren 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. Shader-Vorab-Caching - 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. + 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. Steam-Client reparieren 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. Der Steam-Client wird beim nächsten Start von Steam erneut heruntergeladen. @@ -710,7 +710,10 @@ Mega Leiste Position sperren - Ziehe das HUD, um es zu verschieben; langes Drücken sperrt oder entsperrt es. Solange es gesperrt ist, funktionieren die Bildschirmsteuerungen darunter weiter. + Ziehe das HUD, um es zu verschieben. Solange es gesperrt ist, funktionieren die Bildschirmsteuerungen darunter weiter. + Langes Drücken + Ein- oder ausklappen + Sperren oder entsperren An Seiten einrasten Lass das HUD los, und es springt an die nähere Bildschirmseite. Ein Wischen wirft es in diese Richtung. Aussehen @@ -1137,7 +1140,7 @@ Lab-Build deaktiviert Er wurde für eine andere Version von DroidDeck erstellt. Er bleibt in Updates erhalten. DroidDeck ist damit zweimal nicht gestartet - Agent + Dev Harness Agent Agent arbeitet Installiere Claude Code in der Linux-Umgebung, um den Agenten zu verwenden. @@ -1307,6 +1310,7 @@ Adresse manuell eingeben Von einem Computer mit ADB: Befehl kopieren + Verbinde das Headset mit einem Computer und öffne SideQuest. Wähle „Run ADB Command“, dann „Custom Command“, tippe den unten gezeigten Befehl ein und wähle „Run Command“. Wähle, auf welchem Display die Android-Einstellungen geöffnet werden. Hauptbildschirm Gekoppelt. Suche den Port für Debugging über WLAN… @@ -1582,7 +1586,6 @@ Ordner für Frontend-Spieldateien auswählen Spieldateien gespeichert unter %1$s Frontend-Dateien - Warte, bis der Vorgang an der Laufzeit abgeschlossen ist Warte, bis die Installation des Kompatibilitätstools abgeschlossen ist Kompatibilitätstools werden vorbereitet @@ -1668,7 +1671,6 @@ Linux-Laufzeit wird entfernt Die Einstellungen ließen sich nicht auf dem unteren Bildschirm öffnen und wurden auf dem Hauptbildschirm geöffnet. Entwickleroptionen in den Einstellungen öffnen - Die Android-Einstellung „Unbekannte Apps installieren“ konnte nicht geöffnet werden Prüfung nicht möglich: %1$s Dieser Build hat keinen Download für diese DroidDeck-Installation @@ -1678,12 +1680,10 @@ Warte auf deine Bestätigung Das Update ist fehlgeschlagen Android hat die Installation des Updates nicht angeboten - Decky-Installation fehlgeschlagen: %1$s Plugin-Import wird gestartet… Plugin-Import fehlgeschlagen: %1$s Plugin installiert. Starte Steam neu, um es zu laden. - Noch nicht geprüft - tippe auf Aktualisieren, um nach neuen Treibern zu suchen Android + Linux: legt den Anzeigetreiber gleich mit fest Android + Linux: legt den Laufzeittreiber gleich mit fest @@ -1736,7 +1736,6 @@ Prüfung fehlgeschlagen %1$s installiert - wähle ihn in einer der beiden Listen, um beide Treiber festzulegen %1$s installiert - wähle ihn im Menü aus - Warte, bis die Laufzeit entfernt ist Spiel Touchpad @@ -1782,7 +1781,6 @@ Das Protokoll zeigt %1$d Fehler „Function not implemented“: Die seccomp-Beschleunigung von proot lässt auf diesem Gerät einen Helfer scheitern. Versuche %2$s → „%3$s“ (oder „%4$s“) und starte neu. Das Protokoll zeigt %1$d Fehler „Function not implemented“: Die seccomp-Beschleunigung von proot lässt auf diesem Gerät einen Helfer scheitern. Versuche %2$s → „%3$s“ (oder „%4$s“) und starte neu. - Plugins Installiere eine Plugin-ZIP für die nächste Steam-Sitzung. Wird heruntergeladen… @@ -2139,7 +2137,6 @@ Elite Dangerous Port %1$d empfängt Daten (%2$d Pakete mit %3$d Bytes), aber in einem Format, das diese Seite noch nicht lesen kann. Ein anderes Programm verwendet bereits Port %1$s, daher kann dieses Spiel hier nicht angezeigt werden. - Linux-Laufzeit wird entfernt Linux-Laufzeit wird entfernt · %1$d Eintrag @@ -2154,7 +2151,6 @@ Wird angezeigt, während die Linux-Laufzeit installiert oder entfernt wird Linux-Laufzeit wird installiert Linux-Laufzeit wird entfernt - Die Linux-Laufzeit ist nicht installiert Der Katalog hat keine Prüfsumme für %1$s Prüfsumme stimmt nicht überein - es wurde nichts geändert @@ -2162,7 +2158,6 @@ Das AppImage konnte nicht abgelegt werden Entpacken fehlgeschlagen Installation fehlgeschlagen - Flatpak-Einrichtung fehlgeschlagen (Exit-Code %1$d) Flatpak-Einrichtung wurde nicht abgeschlossen Eine andere Store-Aufgabe läuft @@ -2181,7 +2176,6 @@ Mediencodecs %1$s-Laufzeit %1$s-Laufzeit %2$s - Die Datei ist zu klein für ein AppImage Die Datei kann nicht gelesen werden: %1$s Dies ist kein AppImage (es ist kein Linux-Programm) @@ -2196,7 +2190,6 @@ %1$s wird entpackt Das AppImage konnte nicht entpackt werden Das AppImage konnte nicht entpackt werden: %1$s - Beende die aktive Sitzung, bevor du Decky Loader installierst Download von Decky Loader fehlgeschlagen Die Größe von Decky Loader stimmt nicht mit den Release-Metadaten überein @@ -2245,13 +2238,11 @@ Das importierte Plugin konnte nicht aktiviert werden Decky-Plugin-Einstellungen konnten nicht aktualisiert werden Das vorhandene Plugin konnte nicht wiederhergestellt werden - Identität für Debugging über WLAN konnte nicht gespeichert werden ADB-Befehl fehlgeschlagen (%1$d) Android hat nicht bestätigt, dass das Limit für untergeordnete Prozesse geändert wurde: %1$s Keine Kopplung für Debugging über WLAN gespeichert Aktuelle IP-Adresse & Port von Debugging über WLAN eingeben - Zeitüberschreitung beim Warten auf das Kopplungs-Pop-up. Versuche es erneut über DroidDeck. Suche nach dem Kopplungs-Pop-up nicht möglich (%1$d). Prüfe, ob WLAN aktiviert ist. Suche nach dem Kopplungs-Pop-up nicht möglich: %1$s @@ -2277,7 +2268,6 @@ Steam ist bereit Tippe, um zu DroidDeck zurückzukehren. Du kannst Debugging über WLAN jetzt deaktivieren. Einrichtung von Debugging über WLAN abgebrochen - Download fehlgeschlagen Der Download hatte nicht die Größe der veröffentlichten APK und wurde verworfen - versuche es erneut Der Download stimmte nicht mit seiner Prüfsumme überein und wurde verworfen - versuche es erneut @@ -2290,13 +2280,11 @@ Die heruntergeladene APK hat keine Signaturinformationen Die heruntergeladene APK ist nicht mit dem Release-Schlüssel von DroidDeck signiert Der Update-Katalog antwortete mit HTTP %1$d - Sitzung wird gestartet… %1$d:%2$02d vergangen · läuft noch Update des Steam-Clients wird heruntergeladen · %1$d %% Steam-Client-Update wird angewendet… Steam-Client wird heruntergeladen · %1$s - Es läuft bereits die Installation eines Kompatibilitätstools Beende die aktive Sitzung, bevor du Kompatibilitätstools installierst Kein ARM64-Release für %1$s gefunden @@ -2316,7 +2304,6 @@ Installation von %1$s fehlgeschlagen (Exit-Code %2$d) %1$s konnte nicht installiert werden droiddeck-esync-Paket wird abgerufen - mit Linux-Helfern nur DLLs Original (Proton seit dem letzten Austausch aktualisiert) @@ -2339,13 +2326,11 @@ Download fehlgeschlagen: Dieser Nightly-Build wurde vielleicht durch einen neueren ersetzt. Aktualisiere die Liste und versuche es erneut. Diese Paketliste stammt aus der Zeit vor Prüfsummen - aktualisiere sie und versuche es erneut Prüfsumme stimmt nicht überein - Linear Nächster Nachbar Snapdragon GSR (Qualität) Nur schärfen Auto (an Skalierung anpassen) - Nichts angewendet. Spielklarheit Schärfung mit etwas Kontrast - für jeden Tag. @@ -2369,7 +2354,6 @@ Scharfe Pixel für 2D und alte Titel. Anime-Kanten Cartoon-Konturen plus Schärfung. - Keine Adreno-GPU System-PowerVR-Treiber: Kompatibilität hängt vom Gerät ab Experimentell: RADV oder der System-Xclipse-Treiber @@ -2394,7 +2378,6 @@ Nicht unterstützt: Für diese GPU ist kein kompatibles Grafik-Backend verfügbar Läuft über die Mali-Brücke mit dem eigenen Vulkan-Treiber des Telefons Bei deaktivierter Mali-Brücke nicht unterstützt: Turnip benötigt eine Adreno-GPU (Snapdragon) - Das Rate-Limit von GitHub wurde erreicht - versuche es später erneut GitHub antwortete mit HTTP %1$d Download fehlgeschlagen @@ -2415,16 +2398,12 @@ Kein Treiber-Bundle: keine manifest.json, die einen Android- und einen Linux-Treiber nennt Kein Treiber-Bundle: %1$s zeigt nach außerhalb Kein Treiber-Bundle: entpackt mehr als %1$d MB - SD-Karte Ordner - Sitzungsprotokolle teilen - erfordert Android 10 oder neuer (Anzeigeebenen mit Farbraum) dieses Display meldet keine HDR-Unterstützung dieses Display unterstützt %1$s, aber nicht HDR10 - diese GPU Limit für untergeordnete Prozesse ist aktiv Limit für untergeordnete Prozesse ist nicht festgelegt @@ -2498,7 +2477,6 @@ Kopiert. SSBS erzwingen Hält eine CPU-Geschwindigkeitseinstellung aktiv, die Wine immer wieder abschaltet. Kann Windows-Spiele auf dem Snapdragon 8 Elite beschleunigen; auf älteren Chips kaum Unterschied. Gilt ab dem nächsten Spielstart. - Stores Steam Eigene @@ -2981,7 +2959,6 @@ Symbolfarbe Schaltflächenfarbe Kein Symbol - Anmeldung wird geprüft… Bibliothek wird abgerufen… Spieleliste wird abgerufen… @@ -4029,10 +4006,8 @@ Beschriftung anzeigen Dieses Layout konnte nicht importiert werden Wird über %1$s installiert - Scharlachroter Schnee Weiße Oberflächen mit roten Akzenten. - Soundtracks Musik Wiedergabeoptionen @@ -4109,7 +4084,9 @@ Angezeigt %1$d von %2$d Noch einmal zurück drücken zum Beenden - Ganzzahlige Skalierung - Verwendet den größten ganzzahligen Skalierungsfaktor, der passt. Ist die Quelle zu groß, wird das gesamte Bild eingepasst, um Beschneidung zu vermeiden. Die Auflösung wird separat eingestellt. - + Verwendet die größte passende ganzzahlige Skalierung. Bildschirmränder können abgeschnitten werden. Ist die Quelle größer als die Ausgabe, zeigt eine gebrochene Skalierung das vollständige Bild. Die Auflösung wird separat eingestellt. + Ganzzahlig + Anpassen + Kantenglättung + \ No newline at end of file diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index cc1cdd3ab4..ed3372012b 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1,4 +1,4 @@ - + Τα γραφικά του SteamVR σταμάτησαν Το DroidDeck θα κάνει επανεκκίνηση σε %1$d δευτερόλεπτα για να επαναφέρει τα γραφικά και να ανοίξει ξανά το SteamVR. Το παιχνίδι που εκτελείται θα κλείσει· η μη αποθηκευμένη πρόοδος δεν μπορεί να ανακτηθεί. @@ -710,7 +710,10 @@ Μέγα Λωρίδα Κλείδωμα θέσης - Σύρετε το HUD για να το μετακινήσετε· ένα παρατεταμένο πάτημα το κλειδώνει ή το ξεκλειδώνει. Όσο είναι κλειδωμένο, τα χειριστήρια οθόνης από κάτω του εξακολουθούν να λειτουργούν. + Σύρετε το HUD για να το μετακινήσετε. Όσο είναι κλειδωμένο, τα χειριστήρια οθόνης από κάτω του εξακολουθούν να λειτουργούν. + Παρατεταμένο πάτημα + Σύμπτυξη ή ανάπτυξη + Κλείδωμα ή ξεκλείδωμα Προσκόλληση στα πλάγια Αφήστε το HUD και μετακινείται στην πιο κοντινή πλευρά της οθόνης. Μια γρήγορη κίνηση το πετάει προς εκείνη την κατεύθυνση. Εμφάνιση @@ -1145,7 +1148,7 @@ Η έκδοση Lab απενεργοποιήθηκε Δημιουργήθηκε για άλλη έκδοση του DroidDeck. Διατηρείται στις Ενημερώσεις. Το DroidDeck δεν ξεκίνησε με αυτό δύο φορές - Πράκτορας + Dev Harness Πράκτορας Ο πράκτορας εργάζεται Εγκατέστησε το Claude Code στο περιβάλλον χρήστη του Linux για να χρησιμοποιήσεις τον πράκτορα. @@ -1315,6 +1318,7 @@ Μη αυτόματη εισαγωγή διεύθυνσης Από υπολογιστή με ADB: Αντιγραφή εντολής + Συνδέστε το headset σε υπολογιστή και ανοίξτε το SideQuest. Επιλέξτε «Run ADB Command», μετά «Custom Command», πληκτρολογήστε την εντολή που εμφανίζεται παρακάτω και επιλέξτε «Run Command». Επιλέξτε σε ποια οθόνη θα ανοίξουν οι Ρυθμίσεις Android. Κύρια οθόνη Έγινε σύζευξη. Αναζήτηση θύρας Ασύρματου εντοπισμού σφαλμάτων… @@ -1590,7 +1594,6 @@ Επιλέξτε φάκελο για τα αρχεία παιχνιδιού της διεπαφής Τα αρχεία παιχνιδιού αποθηκεύτηκαν στο %1$s Αρχεία διεπαφής - Περιμένετε να ολοκληρωθεί η λειτουργία του runtime Περιμένετε να ολοκληρωθεί η εγκατάσταση του εργαλείου συμβατότητας Προετοιμασία εργαλείων συμβατότητας @@ -1676,7 +1679,6 @@ Κατάργηση του Linux runtime Δεν ήταν δυνατό το άνοιγμα των Ρυθμίσεων στην κάτω οθόνη· άνοιξαν στην κύρια οθόνη. Άνοιγμα Επιλογών προγραμματιστή στις Ρυθμίσεις - Δεν ήταν δυνατό το άνοιγμα της ρύθμισης του Android «Εγκατάσταση άγνωστων εφαρμογών» Δεν ήταν δυνατός ο έλεγχος: %1$s Αυτή η έκδοση δεν έχει λήψη για αυτό το αντίγραφο του DroidDeck @@ -1686,12 +1688,10 @@ Περιμένει να επιβεβαιώσετε Η ενημέρωση απέτυχε Το Android δεν πρότεινε την εγκατάσταση της ενημέρωσης - Η εγκατάσταση του Decky απέτυχε: %1$s Έναρξη εισαγωγής προσθέτου… Η εισαγωγή προσθέτου απέτυχε: %1$s Το πρόσθετο εγκαταστάθηκε. Κάντε επανεκκίνηση του Steam για να φορτωθεί. - Δεν έχει ελεγχθεί ακόμα - πατήστε ανανέωση για αναζήτηση νέων προγραμμάτων οδήγησης Android + Linux: ορίζει το πρόγραμμα οδήγησης οθόνης μαζί με αυτό Android + Linux: ορίζει το πρόγραμμα οδήγησης runtime μαζί με αυτό @@ -1744,7 +1744,6 @@ ο έλεγχος απέτυχε Εγκατεστημένο %1$s - επιλέξτε το σε οποιαδήποτε λίστα για να ορίσετε και τα δύο προγράμματα οδήγησης Εγκατεστημένο %1$s - επιλέξτε το στο μενού - Περιμένετε να ολοκληρωθεί η κατάργηση του runtime Παιχνίδι πινακίδα αφής @@ -1790,7 +1789,6 @@ Το αρχείο καταγραφής δείχνει %1$d σφάλμα «Function not implemented»: η επιτάχυνση seccomp του proot αποτυγχάνει σε έναν βοηθητικό μηχανισμό σε αυτή τη συσκευή. Δοκιμάστε %2$s → «%3$s» (ή «%4$s») και ξεκινήστε ξανά. Το αρχείο καταγραφής δείχνει %1$d σφάλματα «Function not implemented»: η επιτάχυνση seccomp του proot αποτυγχάνει σε έναν βοηθητικό μηχανισμό σε αυτή τη συσκευή. Δοκιμάστε %2$s → «%3$s» (ή «%4$s») και ξεκινήστε ξανά. - Πρόσθετα Εγκαταστήστε ένα ZIP προσθέτου για την επόμενη συνεδρία Steam. Γίνεται λήψη… @@ -2147,7 +2145,6 @@ Elite Dangerous Η θύρα %1$d λαμβάνει δεδομένα (%2$d πακέτα των %3$d byte), αλλά σε μορφή που αυτή η σελίδα δεν μπορεί ακόμα να διαβάσει. Ένα άλλο πρόγραμμα χρησιμοποιεί ήδη τη θύρα %1$s, οπότε αυτό το παιχνίδι δεν μπορεί να εμφανιστεί εδώ. - Κατάργηση του Linux runtime Κατάργηση του Linux runtime · %1$d εγγραφή @@ -2162,7 +2159,6 @@ Εμφανίζεται όσο το Linux runtime εγκαθίσταται ή καταργείται Εγκατάσταση του Linux runtime Κατάργηση του Linux runtime - Το Linux runtime δεν είναι εγκατεστημένο Ο κατάλογος δεν έχει checksum για το %1$s Αναντιστοιχία checksum - τίποτα δεν άλλαξε @@ -2170,7 +2166,6 @@ Δεν ήταν δυνατή η τοποθέτηση του AppImage Η εξαγωγή απέτυχε Η εγκατάσταση απέτυχε - Η ρύθμιση του Flatpak απέτυχε (έξοδος %1$d) Η ρύθμιση του Flatpak δεν ολοκληρώθηκε Μια άλλη εργασία καταστήματος εκτελείται ήδη @@ -2189,7 +2184,6 @@ codecs πολυμέσων runtime %1$s runtime %1$s %2$s - Το αρχείο είναι πολύ μικρό για να είναι AppImage Το αρχείο δεν μπορεί να αναγνωστεί: %1$s Αυτό δεν είναι AppImage (δεν είναι πρόγραμμα Linux) @@ -2204,7 +2198,6 @@ Εξαγωγή %1$s Δεν ήταν δυνατή η εξαγωγή του AppImage Δεν ήταν δυνατή η εξαγωγή του AppImage: %1$s - Διακόψτε την ενεργή συνεδρία πριν εγκαταστήσετε το Decky Loader Η λήψη του Decky Loader απέτυχε Το μέγεθος του Decky Loader δεν ταίριαζε με τα μεταδεδομένα της κυκλοφορίας @@ -2253,13 +2246,11 @@ Δεν ήταν δυνατή η ενεργοποίηση του εισαγόμενου προσθέτου Δεν ήταν δυνατή η ενημέρωση των ρυθμίσεων προσθέτων Decky Δεν ήταν δυνατή η επαναφορά του υπάρχοντος προσθέτου - Δεν ήταν δυνατή η αποθήκευση της ταυτότητας ασύρματου εντοπισμού σφαλμάτων Η εντολή ADB απέτυχε (%1$d) Το Android δεν επιβεβαίωσε ότι το όριο θυγατρικών διαδικασιών άλλαξε: %1$s Δεν υπάρχει αποθηκευμένη σύζευξη ασύρματου εντοπισμού σφαλμάτων Εισαγάγετε την τρέχουσα διεύθυνση IP & θύρα του ασύρματου εντοπισμού σφαλμάτων - Λήξη χρόνου αναμονής για το αναδυόμενο παράθυρο σύζευξης. Δοκιμάστε ξανά από το DroidDeck. Δεν ήταν δυνατή η αναζήτηση του αναδυόμενου παραθύρου σύζευξης (%1$d). Ελέγξτε ότι το Wi-Fi είναι ενεργό. Δεν ήταν δυνατή η αναζήτηση του αναδυόμενου παραθύρου σύζευξης: %1$s @@ -2285,7 +2276,6 @@ Το Steam είναι έτοιμο Πατήστε για να επιστρέψετε στο DroidDeck. Μπορείτε να απενεργοποιήσετε τον ασύρματο εντοπισμό σφαλμάτων τώρα. Η ρύθμιση ασύρματου εντοπισμού σφαλμάτων διακόπηκε - Η λήψη απέτυχε Το μέγεθος της λήψης δεν ταίριαζε με το δημοσιευμένο APK και απορρίφθηκε - δοκιμάστε ξανά Η λήψη δεν ταίριαζε με το άθροισμα ελέγχου της και απορρίφθηκε - δοκιμάστε ξανά @@ -2298,13 +2288,11 @@ Το ληφθέν APK δεν έχει πληροφορίες υπογραφής Το ληφθέν APK δεν είναι υπογεγραμμένο με το κλειδί κυκλοφορίας του DroidDeck Ο κατάλογος ενημερώσεων απάντησε με HTTP %1$d - Εκκίνηση της συνεδρίας… %1$d:%2$02d πέρασαν · ακόμα σε εξέλιξη Λήψη της ενημέρωσης του πελάτη Steam · %1$d%% Εφαρμογή της ενημέρωσης του πελάτη Steam… Λήψη του πελάτη Steam · %1$s - Μια εγκατάσταση εργαλείου συμβατότητας εκτελείται ήδη Διακόψτε την ενεργή συνεδρία πριν εγκαταστήσετε εργαλεία συμβατότητας Δεν βρέθηκε κυκλοφορία ARM64 για το %1$s @@ -2324,7 +2312,6 @@ Η εγκατάσταση του %1$s απέτυχε (έξοδος %2$d) Δεν ήταν δυνατή η εγκατάσταση του %1$s Λήψη πακέτου droiddeck-esync - με βοηθητικά Linux Μόνο DLL Αρχικό (το Proton ενημερώθηκε από την τελευταία εναλλαγή) @@ -2347,13 +2334,11 @@ Η λήψη απέτυχε: αυτή η νυχτερινή έκδοση ίσως αντικαταστάθηκε από νεότερη. Ανανεώστε τη λίστα και δοκιμάστε ξανά. Αυτή η λίστα πακέτων προηγείται των αθροισμάτων ελέγχου - ανανεώστε την και δοκιμάστε ξανά Αναντιστοιχία αθροίσματος ελέγχου - Γραμμικό Πλησιέστερο Snapdragon GSR (ποιότητα) Μόνο όξυνση Αυτόματο (αντιστοιχία κλιμάκωσης) - Δεν εφαρμόζεται τίποτα. Σαφήνεια παιχνιδιού Όξυνση με μια πινελιά αντίθεσης - το καθημερινό. @@ -2377,7 +2362,6 @@ Ευκρινή pixel για 2D και παλιά παιχνίδια. Περίγραμμα Anime Περιγράμματα τύπου toon συν όξυνση. - Δεν είναι GPU Adreno Πρόγραμμα οδήγησης PowerVR του συστήματος: η συμβατότητα διαφέρει ανά συσκευή Πειραματικό: RADV ή το πρόγραμμα οδήγησης Xclipse του συστήματος @@ -2402,7 +2386,6 @@ Δεν υποστηρίζεται: δεν υπάρχει συμβατό υποσύστημα γραφικών για αυτήν την GPU Λειτουργεί μέσω της γέφυρας Mali, πάνω στον ενσωματωμένο οδηγό Vulkan του τηλεφώνου Δεν υποστηρίζεται με τη γέφυρα Mali απενεργοποιημένη: το Turnip χρειάζεται GPU Adreno (Snapdragon) - Το όριο ρυθμού του GitHub ξεπεράστηκε - δοκιμάστε ξανά αργότερα Το GitHub απάντησε με HTTP %1$d Η λήψη απέτυχε @@ -2423,16 +2406,12 @@ Δεν είναι πακέτο προγραμμάτων οδήγησης: δεν υπάρχει manifest.json που να ονομάζει πρόγραμμα οδήγησης android και linux Δεν είναι πακέτο προγραμμάτων οδήγησης: το %1$s δείχνει έξω από αυτό Δεν είναι πακέτο προγραμμάτων οδήγησης: αποσυμπιέζεται σε περισσότερα από %1$d MB - Κάρτα SD Φάκελος - Κοινοποίηση αρχείων καταγραφής συνεδρίας - απαιτεί Android 10 ή νεότερο (επίπεδα οθόνης με χρωματικό χώρο) αυτή η οθόνη δεν αναφέρει υποστήριξη HDR αυτή η οθόνη υποστηρίζει %1$s, όχι HDR10 - αυτό το GPU Το όριο θυγατρικών διαδικασιών είναι ενεργό Το όριο θυγατρικών διαδικασιών δεν έχει οριστεί @@ -2506,7 +2485,6 @@ Αντιγράφηκε. Εξαναγκασμός SSBS Διατηρεί μια ρύθμιση ταχύτητας CPU που το Wine απενεργοποιεί συνεχώς. Μπορεί να κάνει τα παιχνίδια Windows πιο γρήγορα σε Snapdragon 8 Elite· μικρή διαφορά σε παλαιότερα chip. Ισχύει από την επόμενη εκκίνηση παιχνιδιού. - Καταστήματα Steam Προσαρμοσμένο @@ -2992,7 +2970,6 @@ Χρώμα εικονιδίου Χρώμα κουμπιού Χωρίς εικονίδιο - Έλεγχος σύνδεσης… Λήψη της βιβλιοθήκης σας… Λήψη λίστας παιχνιδιών… @@ -4029,10 +4006,8 @@ Εμφάνιση ετικέτας Δεν ήταν δυνατή η εισαγωγή αυτής της διάταξης Εγκαθίσταται μέσω %1$s - Κατακόκκινο χιόνι Λευκές επιφάνειες με κόκκινες λεπτομέρειες. - Soundtrack Μουσική Επιλογές αναπαραγωγής @@ -4109,7 +4084,9 @@ Εμφανίζονται %1$d από %2$d Πατήστε ξανά πίσω για έξοδο - Ακέραια κλιμάκωση - Χρησιμοποιεί τον μεγαλύτερο ακέραιο συντελεστή κλιμάκωσης που χωράει. Αν η πηγή είναι πολύ μεγάλη, προσαρμόζει ολόκληρη την εικόνα ώστε να αποφευχθεί η περικοπή. Η ανάλυση ρυθμίζεται ξεχωριστά. - + Χρησιμοποιεί τη μεγαλύτερη ακέραια κλίμακα που χωράει. Ενδέχεται να περικοπούν οι άκρες. Αν η πηγή είναι μεγαλύτερη από την έξοδο, η κλασματική κλιμάκωση εμφανίζει ολόκληρη την εικόνα. Η ανάλυση ρυθμίζεται ξεχωριστά. + Ακέραιος + Προσαρμογή + Εξομάλυνση ακμών + \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e206ed3c9d..ebd821ecc3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,4 +1,4 @@ - + Los gráficos de SteamVR se detuvieron DroidDeck se reiniciará en %1$d segundos para restablecer los gráficos y volver a abrir SteamVR. Tu juego en curso se cerrará; el progreso no guardado no se podrá recuperar. @@ -712,7 +712,10 @@ Mega Barra Fijar posición - 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. + Arrastra el HUD para moverlo. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando. + Pulsación larga + Contraer o expandir + Bloquear o desbloquear Ajustar a los lados Al soltar el HUD, se mueve al lado más cercano de la pantalla. Un gesto rápido lo lanza en esa dirección. Aspecto @@ -1148,7 +1151,7 @@ Compilación de laboratorio desactivada Se compiló para otra versión de DroidDeck. Se conserva en Actualizaciones. DroidDeck no se inició en dos ocasiones con esa compilación. - Agente + Dev Harness Agente El agente está trabajando Instala Claude Code en el espacio de usuario de Linux para usar el agente. @@ -1322,6 +1325,7 @@ Introducir dirección manualmente Desde un ordenador con ADB: Copiar comando + Conecta el visor a un ordenador y abre SideQuest. Elige «Run ADB Command» y luego «Custom Command», escribe el comando que aparece abajo y selecciona «Run Command». Elige en qué pantalla abrir los Ajustes de Android. Pantalla principal Vinculado. Buscando el puerto de la Depuración inalámbrica… @@ -1598,7 +1602,6 @@ Elige una carpeta para los archivos de juegos del frontend Archivos de juegos guardados en %1$s Archivos para frontends - Espera a que termine la operación del runtime Espera a que termine la instalación de la herramienta de compatibilidad Preparando las herramientas de compatibilidad @@ -1689,7 +1692,6 @@ Eliminando el runtime de Linux No se pudieron abrir los Ajustes en la pantalla inferior; se abrieron en la pantalla principal. Abre Opciones de desarrollador en Ajustes - No se pudo abrir el ajuste \"Instalar apps desconocidas\" de Android No se pudo comprobar: %1$s Esta versión no tiene descarga para esta copia de DroidDeck @@ -1699,12 +1701,10 @@ Esperando tu confirmación La actualización falló Android no ofreció instalar la actualización - Falló la instalación de Decky: %1$s Iniciando la importación del plugin… Falló la importación del plugin: %1$s Plugin instalado. Reinicia Steam para cargarlo. - Aún sin comprobar - toca actualizar para buscar controladores nuevos Android + Linux: define también el controlador de pantalla Android + Linux: define también el controlador de runtime @@ -1760,7 +1760,6 @@ falló la comprobación %1$s instalado - elígelo en cualquiera de las listas para definir ambos controladores %1$s instalado - elígelo en el menú - Espera a que termine la eliminación del runtime Juego touchpad @@ -1808,7 +1807,6 @@ El registro muestra %1$d errores \"Function not implemented\": la aceleración seccomp de proot hace fallar un proceso auxiliar en este dispositivo. Prueba %2$s → \"%3$s\" (o \"%4$s\") y vuelve a iniciar. El registro muestra %1$d errores \"Function not implemented\": la aceleración seccomp de proot hace fallar un proceso auxiliar en este dispositivo. Prueba %2$s → \"%3$s\" (o \"%4$s\") y vuelve a iniciar. - Plugins Instala un ZIP de plugin para la próxima sesión de Steam. Descargando… @@ -2172,7 +2170,6 @@ Elite Dangerous 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. Otro programa ya usa el puerto %1$s, así que ese juego no se puede mostrar aquí. - Eliminando el runtime de Linux Eliminando el runtime de Linux · %1$d elemento @@ -2188,7 +2185,6 @@ Se muestra mientras se instala o elimina el runtime de Linux Instalando el runtime de Linux Eliminando el runtime de Linux - El runtime de Linux no está instalado El catálogo no tiene suma de verificación para %1$s La suma de verificación no coincide - no se cambió nada @@ -2196,7 +2192,6 @@ No se pudo colocar el AppImage La extracción falló La instalación falló - La configuración de Flatpak falló (salida %1$d) La configuración de Flatpak no terminó Hay otra tarea de la tienda en curso @@ -2215,7 +2210,6 @@ códecs multimedia runtime de %1$s runtime de %1$s %2$s - El archivo es demasiado pequeño para ser un AppImage No se puede leer el archivo: %1$s Esto no es un AppImage (no es un programa de Linux) @@ -2230,7 +2224,6 @@ Extrayendo %1$s No se pudo extraer el AppImage No se pudo extraer el AppImage: %1$s - Detén la sesión activa antes de instalar Decky Loader Falló la descarga de Decky Loader El tamaño de Decky Loader no coincide con los metadatos de la versión @@ -2279,13 +2272,11 @@ No se pudo activar el plugin importado No se pudieron actualizar los ajustes de plugins de Decky No se pudo restaurar el plugin existente - No se pudo guardar la identidad de la Depuración inalámbrica Falló el comando ADB (%1$d) Android no confirmó el cambio del límite de procesos secundarios: %1$s No hay ninguna vinculación de Depuración inalámbrica guardada Introduce la dirección IP y el puerto actuales de la Depuración inalámbrica - Se agotó el tiempo de espera de la ventana de vinculación. Inténtalo de nuevo desde DroidDeck. No se pudo buscar la ventana de vinculación (%1$d). Comprueba que el Wi-Fi esté activado. No se pudo buscar la ventana de vinculación: %1$s @@ -2311,7 +2302,6 @@ Steam está listo Toca para volver a DroidDeck. Ya puedes desactivar la Depuración inalámbrica. Se detuvo la configuración de la Depuración inalámbrica - Error en la descarga El tamaño de la descarga no coincidía con el APK publicado y se descartó - inténtalo de nuevo La descarga no coincidía con su suma de verificación y se descartó - inténtalo de nuevo @@ -2324,13 +2314,11 @@ El APK descargado no tiene información de firma El APK descargado no está firmado con la clave de publicación de DroidDeck El catálogo de actualizaciones respondió HTTP %1$d - Iniciando la sesión… %1$d:%2$02d transcurridos · sigue en marcha Descargando la actualización del cliente de Steam · %1$d%% Aplicando la actualización del cliente de Steam… Descargando el cliente de Steam · %1$s - Ya se está instalando una herramienta de compatibilidad Detén la sesión activa antes de instalar herramientas de compatibilidad No se encontró una versión ARM64 de %1$s @@ -2350,7 +2338,6 @@ Falló la instalación de %1$s (salida %2$d) No se pudo instalar %1$s Descargando el paquete droiddeck-esync - con auxiliares de Linux Solo DLL Original (Proton se actualizó desde el último reemplazo) @@ -2373,13 +2360,11 @@ Error en la descarga: puede que esta compilación nocturna se haya sustituido por una más reciente. Actualiza la lista y vuelve a intentarlo. Esta lista de paquetes es anterior a las sumas de verificación - actualízala e inténtalo de nuevo La suma de verificación no coincide - Lineal Más cercano Snapdragon GSR (calidad) Solo nitidez Auto (según el escalado) - Sin efectos. Claridad Nitidez con un toque de contraste: el de todos los días. @@ -2403,7 +2388,6 @@ Píxeles nítidos para 2D y juegos antiguos. Bordes anime Contornos toon más nitidez. - La GPU no es Adreno Controlador PowerVR del sistema: la compatibilidad varía según el dispositivo Experimental: RADV o el controlador Xclipse del sistema @@ -2428,7 +2412,6 @@ No compatible: no hay un motor gráfico compatible disponible para esta GPU Se ejecuta a través del puente Mali, sobre el controlador Vulkan propio del teléfono No se admite con el puente Mali desactivado: Turnip necesita una GPU Adreno (Snapdragon) - Se alcanzó el límite de solicitudes de GitHub - inténtalo más tarde GitHub respondió HTTP %1$d Error en la descarga @@ -2449,16 +2432,12 @@ No es un paquete de controladores: no hay un manifest.json que indique un controlador android y uno linux No es un paquete de controladores: %1$s apunta fuera de él No es un paquete de controladores: ocupa más de %1$d MB al descomprimirse - Tarjeta SD Carpeta - Compartir registros de sesión - requiere Android 10 o posterior (capas de pantalla con espacio de color) esta pantalla no indica compatibilidad con HDR esta pantalla admite %1$s, no HDR10 - esta GPU El límite de procesos secundarios está activado El límite de procesos secundarios no está definido @@ -2532,7 +2511,6 @@ Copiado. Forzar SSBS Mantiene activado un ajuste de velocidad de la CPU que Wine sigue desactivando. Puede hacer más rápidos los juegos de Windows en Snapdragon 8 Elite; poco cambio en chips anteriores. Se aplica en el próximo inicio de un juego. - Tiendas Steam Personalizados @@ -3018,7 +2996,6 @@ Color del icono Color del botón Sin icono - Comprobando el inicio de sesión… Obteniendo tu biblioteca… Obteniendo la lista de juegos… @@ -4069,10 +4046,8 @@ Mostrar etiqueta No se ha podido importar esta disposición Se instala mediante %1$s - Nieve escarlata Superficies blancas con acentos rojos. - Bandas sonoras Música Opciones de reproducción @@ -4149,7 +4124,9 @@ Mostrados %1$d de %2$d Pulsa atrás una vez más para salir - Escalado de píxeles enteros - Usa el mayor factor de escala entero que quepa. Si la imagen de origen es demasiado grande, ajusta la imagen completa para evitar recortes. La resolución se configura por separado. - + Usa la mayor escala entera que cabe. Puede recortar los bordes. Si la imagen original supera el tamaño de salida, el escalado fraccional muestra la imagen completa. La resolución se configura por separado. + Entero + Ajustar + Suavizado de bordes + \ No newline at end of file diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 68e1bac5db..8bcb6fcce1 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1,4 +1,4 @@ - + SteamVR:n grafiikka pysähtyi DroidDeck käynnistyy uudelleen %1$d sekunnin kuluttua nollatakseen grafiikan ja avatakseen SteamVR:n uudelleen. Käynnissä oleva pelisi suljetaan; tallentamatonta edistymistä ei voi palauttaa. @@ -357,7 +357,7 @@ Palaa DroidDeckiin pelin jälkeen Kun DroidDeckistä tai muusta käynnistimestä aloittamasi peli sulkeutuu, Steam sulkeutuu hallitusti (pilvitallennukset valmistuvat ensin) ja palaat sinne. Pois: pysy Steamissa. Sävyttimien esivälimuistitus - 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. + 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. Korjaa Steam-asiakasohjelma 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. Steam-asiakasohjelma ladataan uudelleen, kun Steam käynnistyy seuraavan kerran. @@ -710,7 +710,10 @@ Mega Palkki Lukitse paikalleen - Siirrä HUD:ia vetämällä; pitkä painallus lukitsee tai vapauttaa sen. Lukittuna sen alla olevat näytön ohjaimet toimivat edelleen. + Siirrä HUD:ia vetämällä. Lukittuna sen alla olevat näytön ohjaimet toimivat edelleen. + Pitkä painallus + Tiivistä tai laajenna + Lukitse tai vapauta Kiinnitä sivuille Kun päästät HUDista irti, se siirtyy näytön lähempään reunaan. Nopea pyyhkäisy heittää sen siihen suuntaan. Ulkoasu @@ -1145,7 +1148,7 @@ Lab-versio poistettu käytöstä Se rakennettiin DroidDeckin toiselle versiolle. Se on tallessa Päivityksissä. DroidDeck ei käynnistynyt sillä kahdesti - Agentti + Dev Harness Agentti Agentti työskentelee Asenna Claude Code Linux-ympäristöön käyttääksesi agenttia. @@ -1315,6 +1318,7 @@ Syötä osoite manuaalisesti Tietokoneelta ADB:llä: Kopioi komento + Liitä lasit tietokoneeseen ja avaa SideQuest. Valitse ”Run ADB Command” ja sitten ”Custom Command”, kirjoita alla näkyvä komento ja valitse ”Run Command”. Valitse, millä näytöllä Android-asetukset avataan. Päänäyttö Pariutui. Etsitään Langattoman virheenkorjauksen porttia… @@ -1590,7 +1594,6 @@ Valitse kansio käyttöliittymän pelitiedostoille Pelitiedostot tallennettu kohteeseen %1$s Käyttöliittymän tiedostot - Odota, että ajoympäristötoiminto päättyy Odota, että yhteensopivuustyökalun asennus päättyy Valmistellaan yhteensopivuustyökaluja @@ -1676,7 +1679,6 @@ Poistetaan Linux-ajoympäristöä Asetuksia ei voitu avata alanäytöllä; avattiin sen sijaan päänäytöllä. Avaa Kehittäjäasetukset Asetuksissa - Androidin \"Tuntemattomien sovellusten asentaminen\" -asetusta ei voitu avata Tarkistus epäonnistui: %1$s Tälle versiolle ei ole latausta tähän DroidDeck-kopioon @@ -1686,12 +1688,10 @@ Odotetaan vahvistustasi Päivitys epäonnistui Android ei tarjonnut päivityksen asentamista - Deckyn asennus epäonnistui: %1$s Aloitetaan laajennuksen tuontia… Laajennuksen tuonti epäonnistui: %1$s Laajennus asennettu. Käynnistä Steam uudelleen, jotta se latautuu. - Ei tarkistettu vielä - napauta päivitä etsiäksesi uusia ajureita Android + Linux: asettaa näyttöajurin sen mukana Android + Linux: asettaa ajoympäristön ajurin sen mukana @@ -1744,7 +1744,6 @@ tarkistus epäonnistui Asennettu %1$s - valitse se kummasta tahansa listasta asettaaksesi molemmat ajurit Asennettu %1$s - valitse se valikosta - Odota, että ajoympäristön poisto päättyy Peli kosketuslevy @@ -1790,7 +1789,6 @@ Loki näyttää %1$d ”Function not implemented” -virheen: prootin seccomp-kiihdytys epäonnistuu laitteen apuohjelmassa. Kokeile %2$s → ”%3$s” (tai ”%4$s”) ja käynnistä uudelleen. Loki näyttää %1$d ”Function not implemented” -virhettä: prootin seccomp-kiihdytys epäonnistuu laitteen apuohjelmassa. Kokeile %2$s → ”%3$s” (tai ”%4$s”) ja käynnistä uudelleen. - Laajennukset Asenna laajennuksen ZIP-tiedosto seuraavaa Steam-istuntoa varten. Latautuu… @@ -2147,7 +2145,6 @@ Elite Dangerous Portti %1$d vastaanottaa dataa (%2$d pakettia, kukin %3$d tavua), mutta muodossa, jota tämä sivu ei vielä osaa lukea. Toinen ohjelma käyttää jo porttia %1$s, joten peliä ei voida näyttää täällä. - Poistetaan Linux-ajoympäristöä Poistetaan Linux-ajoympäristöä · %1$d kohta @@ -2162,7 +2159,6 @@ Näytetään, kun Linux-ajoympäristöä asennetaan tai poistetaan Asennetaan Linux-ajoympäristöä Poistetaan Linux-ajoympäristöä - Linux-ajoympäristöä ei ole asennettu Luettelossa ei ole tarkistussummaa kohteelle %1$s Tarkistussumma ei täsmää - mitään ei muutettu @@ -2170,7 +2166,6 @@ AppImagea ei voitu sijoittaa Purkaminen epäonnistui Asennus epäonnistui - Flatpak-asennus epäonnistui (poistumiskoodi %1$d) Flatpak-asennus ei valmistunut Toinen kauppatehtävä on käynnissä @@ -2189,7 +2184,6 @@ mediakoodekit %1$s-ajoympäristö %1$s-ajoympäristö %2$s - Tiedosto on liian pieni ollakseen AppImage Tiedostoa ei voida lukea: %1$s Tämä ei ole AppImage (se ei ole Linux-ohjelma) @@ -2204,7 +2198,6 @@ Puretaan %1$s AppImagea ei voitu purkaa AppImagea ei voitu purkaa: %1$s - Pysäytä käynnissä oleva istunto ennen Decky Loaderin asentamista Decky Loaderin lataus epäonnistui Decky Loaderin koko ei vastannut julkaisun metatietoja @@ -2253,13 +2246,11 @@ Tuotua laajennusta ei voitu ottaa käyttöön Deckyn laajennusasetuksia ei voitu päivittää Nykyistä laajennusta ei voitu palauttaa - Langattoman virheenkorjauksen tunnistetta ei voitu tallentaa ADB-komento epäonnistui (%1$d) Android ei vahvistanut, että lapsiprosessirajaa muutettiin: %1$s Langattoman virheenkorjauksen laiteparitusta ei ole tallennettu Anna langattoman virheenkorjauksen nykyinen IP-osoite ja portti - Paritusikkunan odotus aikakatkaistiin. Yritä uudelleen DroidDeckistä. Paritusikkunaa ei voitu etsiä (%1$d). Tarkista, että Wi-Fi on päällä. Paritusikkunaa ei voitu etsiä: %1$s @@ -2285,7 +2276,6 @@ Steam on valmis Napauta palataksesi DroidDeckiin. Voit sammuttaa langattoman virheenkorjauksen nyt. Langattoman virheenkorjauksen käyttöönotto pysähtyi - Lataus epäonnistui Latauksen koko ei vastannut julkaistua APK-tiedostoa, ja se hylättiin - yritä uudelleen Lataus ei vastannut tarkistussummaansa, ja se hylättiin - yritä uudelleen @@ -2298,13 +2288,11 @@ Ladatussa APK-tiedostossa ei ole allekirjoitustietoja Ladattu APK ei ole allekirjoitettu DroidDeckin julkaisuavaimella Päivitysluettelo vastasi HTTP %1$d - Käynnistetään istuntoa… %1$d:%2$02d kulunut · yhä käynnissä Ladataan Steam-asiakasohjelman päivitystä · %1$d %% Asennetaan Steam-asiakasohjelman päivitystä… Ladataan Steam-asiakasohjelmaa · %1$s - Yhteensopivuustyökalun asennus on jo käynnissä Pysäytä käynnissä oleva istunto ennen yhteensopivuustyökalujen asentamista ARM64-julkaisua kohteelle %1$s ei löytynyt @@ -2324,7 +2312,6 @@ %1$s-asennus epäonnistui (poistumiskoodi %2$d) Kohdetta %1$s ei voitu asentaa Haetaan droiddeck-esync-pakettia - Linux-apuohjelmien kanssa Vain DLL-tiedostot Alkuperäinen (Proton päivitetty viimeisimmän vaihdon jälkeen) @@ -2347,13 +2334,11 @@ Lataus epäonnistui: tämä yöversio on ehkä korvattu uudemmalla. Päivitä luettelo ja yritä uudelleen. Tämä pakettiluettelo on tarkistussummia vanhempi - päivitä se ja yritä uudelleen Tarkistussumma ei täsmää - Lineaarinen Lähin Snapdragon GSR (laatu) Vain terävöinti Automaattinen (sovita skaalaukseen) - Ei mitään käytössä. Pelin terävyys Terävöinti hieman kontrastilla - arkikäyttöön. @@ -2377,7 +2362,6 @@ Terävät pikselit 2D- ja vanhoille peleille. Anime-reunat Sarjakuvamaiset ääriviivat ja terävöinti. - Ei Adreno-grafiikkapiiri Järjestelmän PowerVR-ajuri: yhteensopivuus vaihtelee laitteen mukaan Kokeellinen: RADV tai järjestelmän Xclipse-ajuri @@ -2402,7 +2386,6 @@ Ei tuettu: tälle GPU:lle ei ole saatavilla yhteensopivaa grafiikkataustajärjestelmää Toimii Mali-sillan kautta puhelimen omalla Vulkan-ajurilla Ei tuettu, kun Mali-silta on pois päältä: Turnip toimii vain Adreno (Snapdragon) -grafiikkasuorittimella - GitHubin käyttörajoitus tuli vastaan - yritä myöhemmin uudelleen GitHub vastasi HTTP %1$d Lataus epäonnistui @@ -2423,16 +2406,12 @@ Ei ajuripaketti: ei manifest.json-tiedostoa, joka nimeäisi android- ja linux-ajurin Ei ajuripaketti: %1$s osoittaa sen ulkopuolelle Ei ajuripaketti: se purkautuu yli %1$d MB:n kokoiseksi - SD-kortti Kansio - Jaa istuntolokit - vaatii Android 10:n tai uudemman (näyttötasot väriavaruudella) tämä näyttö ei ilmoita HDR-tukea tämä näyttö tukee %1$s, ei HDR10:tä - tämä grafiikkapiiri Lapsiprosessiraja on päällä Lapsiprosessirajaa ei ole asetettu @@ -2506,7 +2485,6 @@ Kopioitu. Pakota SSBS Pitää päällä suoritintehoasetuksen, jonka Wine jatkuvasti sammuttaa. Voi nopeuttaa Windows-pelejä Snapdragon 8 Elite -piirillä; vanhemmilla piireillä vaikutus on pieni. Vaikuttaa seuraavasta pelin käynnistyksestä alkaen. - Kaupat Steam Mukautettu @@ -2992,7 +2970,6 @@ Kuvakkeen väri Painikkeen väri Ei kuvaketta - Tarkistetaan kirjautumista… Haetaan kirjastoasi… Haetaan peliluetteloa… @@ -4029,10 +4006,8 @@ Näytä nimi Tätä asettelua ei voitu tuoda Asennetaan sovelluksen %1$s kautta - Helakanpunainen lumi Valkoiset pinnat punaisin korostuksin. - Soundtrackit Musiikki Toistoasetukset @@ -4109,7 +4084,9 @@ Näkyvissä %1$d / %2$d Paina takaisin vielä kerran poistuaksesi - Kokonaislukuskaalaus - Käyttää suurinta mahtuvaa kokonaislukukerrointa. Jos lähdekuva on liian suuri, koko kuva sovitetaan rajauksen välttämiseksi. Tarkkuus määritetään erikseen. - + Käyttää suurinta kokonaislukukerrointa, joka mahtuu näyttöön. Reunat voivat rajautua. Jos lähde on tulostetta suurempi, murto-osaskaalaus näyttää koko kuvan. Resoluutio määritetään erikseen. + Kokonaisluku + Sovita + Reunanpehmennys + \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 2d19ea9451..d61e1076d0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,4 +1,4 @@ - + Le rendu graphique de SteamVR s\'est arrêté DroidDeck va redémarrer dans %1$d secondes pour réinitialiser le rendu graphique et rouvrir SteamVR. Votre jeu en cours sera fermé ; la progression non sauvegardée ne pourra pas être récupérée. @@ -357,7 +357,7 @@ Revenir à DroidDeck après un jeu 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. Pré-mise en cache des shaders - 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. + 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. Réparer le client Steam 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. Le client Steam sera retéléchargé au prochain démarrage de Steam. @@ -712,7 +712,10 @@ Méga Bandeau Verrouiller la position - 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. + Faites glisser le HUD pour le déplacer. Tant qu\'il est verrouillé, les commandes à l\'écran situées dessous restent utilisables. + Appui long + Réduire ou développer + Verrouiller ou déverrouiller Aimanter sur les côtés Relâchez le HUD et il rejoint le côté de l’écran le plus proche. Un geste rapide le lance dans cette direction. Apparence @@ -1148,7 +1151,7 @@ Version Lab désactivée Elle a été créée pour une autre version de DroidDeck. Elle est conservée dans Mises à jour. DroidDeck n\'a pas démarré dessus à deux reprises - Agent + Dev Harness Agent L\'agent travaille Installez Claude Code dans l\'environnement utilisateur Linux pour utiliser l\'agent. @@ -1321,6 +1324,7 @@ Saisir l\'adresse manuellement Utiliser ADB depuis un ordinateur : Copier la commande + Branchez le casque à un ordinateur et ouvrez SideQuest. Choisissez « Run ADB Command », puis « Custom Command », saisissez la commande affichée ci-dessous et sélectionnez « Run Command ». Choisissez l\'écran sur lequel ouvrir les paramètres Android. Écran principal Appairé. Recherche du port de débogage sans fil… @@ -1597,7 +1601,6 @@ Choisir un dossier pour les fichiers du jeu frontal Fichiers du jeu enregistrés dans %1$s Fichiers frontaux - Attendez la fin de l\'opération sur l\'environnement d\'exécution Attendez la fin de l\'installation de l\'outil de compatibilité Préparation des outils de compatibilité @@ -1688,7 +1691,6 @@ Suppression de l\'environnement d\'exécution Linux Impossible d\'ouvrir les paramètres sur l\'écran inférieur ; ils ont été ouverts sur l\'écran principal. Ouvrez les options pour les développeurs dans les paramètres - Impossible d\'ouvrir le paramètre Android « Installer des applis inconnues » Vérification impossible : %1$s Cette version ne propose aucun téléchargement pour cette copie de DroidDeck @@ -1698,12 +1700,10 @@ En attente de votre confirmation La mise à jour a échoué Android n\'a pas proposé d\'installer la mise à jour - Échec de l\'installation de Decky : %1$s Démarrage de l\'importation du plugin… Échec de l\'importation du plugin : %1$s Plugin installé. Redémarrez Steam pour le charger. - Pas encore vérifié - appuyez sur Actualiser pour rechercher de nouveaux pilotes Android + Linux : définit aussi le pilote d\'affichage Android + Linux : définit aussi le pilote d\'exécution @@ -1759,7 +1759,6 @@ échec de la vérification %1$s installé - choisissez-le dans l\'une ou l\'autre liste pour définir les deux pilotes %1$s installé - choisissez-le dans le menu - Attendez la fin de la suppression de l\'environnement d\'exécution Jeu pavé tactile @@ -1807,7 +1806,6 @@ Le journal indique %1$d erreurs « Function not implemented » : l\'accélération seccomp de proot fait échouer un utilitaire sur cet appareil. Essayez %2$s → « %3$s » (ou « %4$s ») et relancez. Le journal indique %1$d erreurs « Function not implemented » : l\'accélération seccomp de proot fait échouer un utilitaire sur cet appareil. Essayez %2$s → « %3$s » (ou « %4$s ») et relancez. - Plugins Installez un ZIP de plugin pour la prochaine session Steam. Téléchargement… @@ -2171,7 +2169,6 @@ Elite Dangerous 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. Un autre programme utilise déjà le port %1$s ; ce jeu ne peut donc pas s\'afficher ici. - Suppression de l\'environnement d\'exécution Linux Suppression de l\'environnement d\'exécution Linux · %1$d élément @@ -2187,7 +2184,6 @@ Affiché pendant l\'installation ou la suppression de l\'environnement d\'exécution Linux Installation de l\'environnement d\'exécution Linux Suppression de l\'environnement d\'exécution Linux - L\'environnement d\'exécution Linux n\'est pas installé Le catalogue n\'a pas de somme de contrôle pour %1$s Somme de contrôle incorrecte - rien n\'a été modifié @@ -2195,7 +2191,6 @@ Impossible de placer l\'AppImage Échec de l\'extraction Échec de l\'installation - Échec de la configuration de Flatpak (code %1$d) La configuration de Flatpak ne s\'est pas terminée Une autre tâche de la boutique est en cours @@ -2214,7 +2209,6 @@ codecs multimédias environnement d\'exécution %1$s environnement d\'exécution %1$s %2$s - Le fichier est trop petit pour être un AppImage Impossible de lire le fichier : %1$s Ce n\'est pas un AppImage (ce n\'est pas un programme Linux) @@ -2229,7 +2223,6 @@ Extraction de %1$s Impossible d\'extraire l\'AppImage Impossible d\'extraire l\'AppImage : %1$s - Arrêtez la session en cours avant d\'installer Decky Loader Échec du téléchargement de Decky Loader La taille de Decky Loader ne correspond pas aux métadonnées de la version @@ -2278,13 +2271,11 @@ Impossible d\'activer le plugin importé Impossible de mettre à jour les paramètres des plugins Decky Impossible de restaurer le plugin existant - Impossible d\'enregistrer l\'identité du débogage sans fil Échec de la commande ADB (%1$d) Android n\'a pas confirmé la modification de la limite des processus enfants : %1$s Aucun appairage de débogage sans fil n\'est enregistré Saisissez l\'adresse IP et le port actuels du débogage sans fil - Délai dépassé en attendant la fenêtre d\'appairage. Réessayez depuis DroidDeck. Impossible de rechercher la fenêtre d\'appairage (%1$d). Vérifiez que le Wi-Fi est activé. Impossible de rechercher la fenêtre d\'appairage : %1$s @@ -2310,7 +2301,6 @@ Steam est prêt Appuyez pour revenir à DroidDeck. Vous pouvez maintenant désactiver le débogage sans fil. Configuration du débogage sans fil interrompue - Échec du téléchargement La taille du téléchargement ne correspond pas à l\'APK publié ; il a été supprimé - réessayez Le téléchargement ne correspond pas à sa somme de contrôle et a été supprimé - réessayez @@ -2323,13 +2313,11 @@ L\'APK téléchargé ne contient aucune information de signature L\'APK téléchargé n\'est pas signé avec la clé de publication de DroidDeck Le catalogue des mises à jour a renvoyé HTTP %1$d - Démarrage de la session… %1$d:%2$02d écoulées · toujours en cours Téléchargement de la mise à jour du client Steam · %1$d%% Application de la mise à jour du client Steam… Téléchargement du client Steam · %1$s - Une installation d\'outil de compatibilité est déjà en cours Arrêtez la session en cours avant d\'installer des outils de compatibilité Aucune version ARM64 trouvée pour %1$s @@ -2349,7 +2337,6 @@ Échec de l\'installation de %1$s (code %2$d) Impossible d\'installer %1$s Récupération du pack droiddeck-esync - avec les utilitaires Linux DLL uniquement Original (Proton mis à jour depuis le dernier remplacement) @@ -2372,13 +2359,11 @@ Échec du téléchargement : cette version nightly a peut-être été remplacée par une plus récente. Actualisez la liste et réessayez. Cette liste de paquets est antérieure aux sommes de contrôle - actualisez-la et réessayez Somme de contrôle incorrecte - Linéaire Plus proche voisin Snapdragon GSR (qualité) Netteté seule Auto (selon la mise à l\'échelle) - Aucun effet appliqué. Clarté de jeu Netteté avec une pointe de contraste - pour tous les jours. @@ -2402,7 +2387,6 @@ Pixels nets pour la 2D et les vieux jeux. Contours anime Contours façon dessin animé et netteté accrue. - GPU non Adreno Pilote système PowerVR : la compatibilité varie selon chaque appareil Expérimental : RADV ou le pilote système Xclipse @@ -2427,7 +2411,6 @@ Non pris en charge : aucun moteur graphique compatible n’est disponible pour ce GPU Passe par le pont Mali, sur le pilote Vulkan du téléphone Non pris en charge lorsque le pont Mali est désactivé : Turnip nécessite un GPU Adreno (Snapdragon) - Limite de requêtes GitHub atteinte - réessayez plus tard GitHub a répondu HTTP %1$d Échec du téléchargement @@ -2448,16 +2431,12 @@ Ce n\'est pas un bundle de pilotes : aucun manifest.json désignant un pilote Android et un pilote Linux Ce n\'est pas un bundle de pilotes : %1$s pointe en dehors de celui-ci Ce n\'est pas un bundle de pilotes : il dépasse %1$d Mo une fois décompressé - Carte SD Dossier - Partager les journaux de session - nécessite Android 10 ou plus récent (couches d\'affichage avec espace colorimétrique) cet écran n\'indique aucune prise en charge HDR cet écran prend en charge %1$s, mais pas HDR10 - ce GPU Limite des processus enfants activée Limite des processus enfants non définie @@ -2531,7 +2510,6 @@ Copié. Forcer SSBS Maintient activé un réglage de vitesse du CPU que Wine désactive sans cesse. Peut accélérer les jeux Windows sur Snapdragon 8 Elite ; peu de différence constatée sur les puces plus anciennes. Prendra effet au prochain lancement du jeu. - Boutiques Steam Personnalisé @@ -3017,7 +2995,6 @@ Couleur de l\'icône Couleur du bouton Aucune icône - Vérification de la connexion… Récupération de votre bibliothèque… Récupération de la liste des jeux… @@ -4068,10 +4045,8 @@ Afficher le libellé Impossible d’importer cette disposition S’installe via %1$s - Neige écarlate Surfaces blanches avec des accents rouges. - Bandes originales Musique Options de lecture @@ -4148,7 +4123,9 @@ Affichés %1$d sur %2$d Appuyez à nouveau sur retour pour quitter - Mise à l’échelle entière - Utilise le plus grand facteur d’échelle entier possible. Si la source est trop grande, l’image entière est ajustée pour éviter le recadrage. La résolution se règle séparément. - + Utilise le plus grand facteur d’échelle entier adapté. Les bords peuvent être rognés. Si la source est plus grande que la sortie, la mise à l’échelle fractionnaire affiche l’image entière. La résolution se règle séparément. + Entier + Ajuster + Anticrénelage + \ No newline at end of file diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index a759cbf009..d9fac5e3c2 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1,4 +1,4 @@ - + SteamVR ग्राफ़िक्स रुक गए ग्राफ़िक्स रीसेट करने और SteamVR फिर से खोलने के लिए DroidDeck %1$d सेकंड में रीस्टार्ट होगा। आपका चल रहा गेम बंद हो जाएगा; बिना सेव की गई प्रोग्रेस वापस नहीं लाई जा सकती। @@ -357,7 +357,7 @@ गेम के बाद DroidDeck पर लौटें जब DroidDeck या किसी दूसरे लॉन्चर से शुरू किया गेम बंद होता है, तो Steam ठीक से बंद होता है (क्लाउड सेव पहले पूरे होते हैं) और आप वहीं लौट जाते हैं। बंद: Steam में ही रहें। शेडर प्री-कैशिंग - Steam आपके गेम के लिए पहले से बने शेडर डाउनलोड करता है और उन्हें बैकग्राउंड में प्रोसेस करता है, ताकि गेम कम अटकें। बंद करने पर डेटा, स्टोरेज और बैटरी बचती है; गेम खेलते समय ही शेडर बनाते हैं। यह Steam की Downloads > Shader Pre-Caching वाली ही सेटिंग है। अगले सेशन से लागू होता है। + Steam आपके गेम के लिए पहले से बने शेडर डाउनलोड करता है और उन्हें बैकग्राउंड में प्रोसेस करता है, ताकि गेम कम अटकें। बंद करने पर डेटा, स्टोरेज और बैटरी बचती है; गेम खेलते समय ही शेडर बनाते हैं। यह Steam की Downloads > Shader Pre-Caching वाली ही सेटिंग है। अगले सेशन से लागू होता है। Steam क्लाइंट रिपेयर करें अगली बार Steam शुरू होने पर Steam क्लाइंट फिर से डाउनलोड होता है। इसे इस्तेमाल करें जब Steam अपनी लोडिंग स्क्रीन पर अटका रह जाए। गेम, साइन-इन और सेटिंग बनी रहती हैं। अगली बार Steam शुरू होने पर Steam क्लाइंट फिर से डाउनलोड होगा। @@ -710,7 +710,10 @@ मेगा पट्टी जगह पर लॉक करें - HUD को खिसकाने के लिए उसे ड्रैग करें; देर तक दबाने से वह लॉक या अनलॉक होता है। लॉक रहने पर भी उसके नीचे के ऑन-स्क्रीन कंट्रोल काम करते रहते हैं। + HUD को खिसकाने के लिए उसे ड्रैग करें। लॉक रहने पर भी उसके नीचे के ऑन-स्क्रीन कंट्रोल काम करते रहते हैं। + देर तक दबाना + सिकोड़ें या फैलाएँ + लॉक या अनलॉक करें किनारों पर चिपकाएँ HUD छोड़ने पर यह स्क्रीन की पास वाली ओर चला जाता है। तेज़ी से झटकने पर यह उसी दिशा में जाता है। लुक @@ -1145,7 +1148,7 @@ लैब बिल्ड बंद कर दिया गया यह DroidDeck के किसी दूसरे वर्जन के लिए बनाया गया था। इसे अपडेट्स में रखा गया है। DroidDeck इस पर दो बार शुरू नहीं हुआ - एजेंट + Dev Harness एजेंट एजेंट काम कर रहा है एजेंट इस्तेमाल करने के लिए Linux यूज़रलैंड में Claude Code इंस्टॉल करें। @@ -1315,6 +1318,7 @@ एड्रेस खुद डालें ADB वाले कंप्यूटर से: कमांड कॉपी करें + हेडसेट को कंप्यूटर से जोड़ें और SideQuest खोलें। “Run ADB Command”, फिर “Custom Command” चुनें, नीचे दिखाया गया कमांड टाइप करें और “Run Command” चुनें। Android Settings किस डिस्प्ले पर खोलना है चुनें। मुख्य स्क्रीन पेयर हो गया। वायरलेस डीबगिंग का पोर्ट खोजा जा रहा है… @@ -1590,7 +1594,6 @@ फ़्रंटएंड गेम फ़ाइलों के लिए फ़ोल्डर चुनें गेम फ़ाइलें %1$s में सेव हुईं फ़्रंटएंड फ़ाइलें - रनटाइम ऑपरेशन खत्म होने का इंतज़ार करें कम्पैटिबिलिटी टूल इंस्टॉल खत्म होने का इंतज़ार करें कम्पैटिबिलिटी टूल तैयार हो रहे हैं @@ -1676,7 +1679,6 @@ Linux रनटाइम हटाया जा रहा है नीचे की स्क्रीन पर Settings नहीं खुल सकी; इसे मुख्य स्क्रीन पर खोला गया। Settings में डेवलपर विकल्प खोलें - Android की “Install unknown apps” सेटिंग नहीं खुल सकी जांच नहीं हो सकी: %1$s इस बिल्ड में DroidDeck की इस कॉपी के लिए कोई डाउनलोड नहीं है @@ -1686,12 +1688,10 @@ आपकी पुष्टि का इंतज़ार हो रहा है अपडेट विफल रहा Android ने अपडेट इंस्टॉल करने का विकल्प नहीं दिया - Decky इंस्टॉल विफल रहा: %1$s प्लगइन इंपोर्ट शुरू हो रहा है… प्लगइन इंपोर्ट विफल रहा: %1$s प्लगइन इंस्टॉल हो गया। इसे लोड करने के लिए Steam रीस्टार्ट करें। - अभी जांचा नहीं गया - नए ड्राइवर देखने के लिए रीफ़्रेश पर टैप करें Android + Linux: इसके साथ डिस्प्ले ड्राइवर सेट करता है Android + Linux: इसके साथ रनटाइम ड्राइवर सेट करता है @@ -1744,7 +1744,6 @@ जांच विफल रही इंस्टॉल है %1$s - दोनों ड्राइवर सेट करने के लिए इसे किसी भी लिस्ट में चुनें इंस्टॉल है %1$s - इसे मेनू में चुनें - रनटाइम हटाना खत्म होने का इंतज़ार करें गेम टचपैड @@ -1790,7 +1789,6 @@ लॉग में %1$d “Function not implemented” एरर दिखता है: इस डिवाइस पर proot का seccomp एक्सेलरेशन एक हेल्पर को फेल कर रहा है। %2$s → “%3$s” (या “%4$s”) आज़माएं और फिर से शुरू करें। लॉग में %1$d “Function not implemented” एरर दिखते हैं: इस डिवाइस पर proot का seccomp एक्सेलरेशन एक हेल्पर को फेल कर रहा है। %2$s → “%3$s” (या “%4$s”) आज़माएं और फिर से शुरू करें। - प्लगइन अगले Steam सेशन के लिए एक प्लगइन ZIP इंस्टॉल करें। डाउनलोड हो रहा है… @@ -2147,7 +2145,6 @@ Elite Dangerous पोर्ट %1$d पर डेटा आ रहा है (%3$d बाइट के %2$d पैकेट), लेकिन ऐसे फ़ॉर्मैट में जिसे यह पेज अभी पढ़ नहीं सकता। पोर्ट %1$s को कोई दूसरा प्रोग्राम पहले से इस्तेमाल कर रहा है, इसलिए वह गेम यहां नहीं दिख सकता। - Linux रनटाइम हटाया जा रहा है Linux रनटाइम हटाया जा रहा है · %1$d एंट्री @@ -2162,7 +2159,6 @@ Linux रनटाइम इंस्टॉल या हटाए जाते समय दिखता है Linux रनटाइम इंस्टॉल हो रहा है Linux रनटाइम हटाया जा रहा है - Linux रनटाइम इंस्टॉल नहीं है कैटलॉग में %1$s के लिए कोई चेकसम नहीं है चेकसम मेल नहीं खाया - कुछ नहीं बदला गया @@ -2170,7 +2166,6 @@ AppImage को नहीं रखा जा सका एक्सट्रैक्शन विफल रहा इंस्टॉल विफल रहा - Flatpak सेटअप विफल रहा (exit %1$d) Flatpak सेटअप पूरा नहीं हुआ कोई और स्टोर टास्क चल रहा है @@ -2189,7 +2184,6 @@ मीडिया कोडेक %1$s रनटाइम %1$s रनटाइम %2$s - यह फ़ाइल AppImage होने के लिए बहुत छोटी है फ़ाइल पढ़ी नहीं जा सकती: %1$s यह AppImage नहीं है (यह Linux प्रोग्राम नहीं है) @@ -2204,7 +2198,6 @@ %1$s एक्सट्रैक्ट हो रहा है AppImage एक्सट्रैक्ट नहीं हो सका AppImage एक्सट्रैक्ट नहीं हो सका: %1$s - Decky Loader इंस्टॉल करने से पहले चल रहा सेशन बंद करें Decky Loader डाउनलोड विफल रहा Decky Loader का आकार रिलीज़ मेटाडेटा से मेल नहीं खाया @@ -2253,13 +2246,11 @@ इंपोर्ट किए प्लगइन को चालू नहीं किया जा सका Decky प्लगइन सेटिंग अपडेट नहीं हो सकी मौजूदा प्लगइन वापस नहीं लाया जा सका - वायरलेस डीबगिंग पहचान सेव नहीं हो सकी ADB कमांड विफल रहा (%1$d) Android ने पुष्टि नहीं की कि चाइल्ड-प्रोसेस सीमा बदली गई: %1$s कोई वायरलेस डीबगिंग पेयरिंग सेव नहीं है मौजूदा वायरलेस डीबगिंग का IP एड्रेस और पोर्ट डालें - पेयरिंग पॉप-अप का इंतज़ार करते-करते समय खत्म हो गया। DroidDeck से फिर कोशिश करें। पेयरिंग पॉप-अप नहीं खोजा जा सका (%1$d)। जांचें कि Wi-Fi चालू है। पेयरिंग पॉप-अप नहीं खोजा जा सका: %1$s @@ -2285,7 +2276,6 @@ Steam तैयार है DroidDeck पर वापस जाने के लिए टैप करें। अब आप वायरलेस डीबगिंग बंद कर सकते हैं। वायरलेस डीबगिंग सेटअप रुक गया - डाउनलोड विफल डाउनलोड का आकार पब्लिश किए APK से मेल नहीं खाया और इसे हटा दिया गया - फिर कोशिश करें डाउनलोड अपने चेकसम से मेल नहीं खाया और इसे हटा दिया गया - फिर कोशिश करें @@ -2298,13 +2288,11 @@ डाउनलोड किए APK में कोई साइनिंग जानकारी नहीं है डाउनलोड किया APK DroidDeck की रिलीज़ कुंजी से साइन नहीं है अपडेट कैटलॉग ने HTTP %1$d जवाब दिया - सेशन शुरू हो रहा है… %1$d:%2$02d बीत गया · अभी भी काम हो रहा है Steam क्लाइंट अपडेट डाउनलोड हो रहा है · %1$d%% Steam क्लाइंट अपडेट लागू किया जा रहा है… Steam क्लाइंट डाउनलोड हो रहा है · %1$s - एक कम्पैटिबिलिटी टूल इंस्टॉल पहले से चल रहा है कम्पैटिबिलिटी टूल इंस्टॉल करने से पहले चल रहा सेशन बंद करें %1$s के लिए कोई ARM64 रिलीज़ नहीं मिली @@ -2324,7 +2312,6 @@ %1$s इंस्टॉलेशन विफल रहा (exit %2$d) %1$s इंस्टॉल नहीं हो सका droiddeck-esync पैक लिया जा रहा है - Linux हेल्पर के साथ सिर्फ़ DLL ओरिजिनल (पिछले स्वैप के बाद Proton अपडेट हुआ) @@ -2347,13 +2334,11 @@ डाउनलोड विफल: हो सकता है यह नाइटली बिल्ड किसी नए बिल्ड से बदल दिया गया हो। सूची रीफ़्रेश करें और फिर से कोशिश करें। यह पैकेज लिस्ट चेकसम से पुरानी है - इसे रीफ़्रेश करें और फिर कोशिश करें चेकसम मेल नहीं खाया - लीनियर निअरेस्ट Snapdragon GSR (क्वालिटी) सिर्फ़ शार्पन ऑटो (स्केलिंग से मेल) - कुछ लागू नहीं। गेम क्लैरिटी थोड़े कंट्रास्ट के साथ शार्पनिंग - रोज़ के लिए वाला। @@ -2377,7 +2362,6 @@ 2D और पुराने गेम के लिए साफ़ पिक्सल। एनिमे एज टून आउटलाइन के साथ शार्पनिंग। - Adreno GPU नहीं है सिस्टम PowerVR ड्राइवर: संगतता डिवाइस के अनुसार अलग-अलग होती है प्रायोगिक: RADV या सिस्टम Xclipse ड्राइवर @@ -2402,7 +2386,6 @@ समर्थित नहीं: इस GPU के लिए कोई संगत ग्राफ़िक्स बैकएंड उपलब्ध नहीं है Mali ब्रिज से होकर, फ़ोन के अपने Vulkan ड्राइवर पर चलता है Mali ब्रिज बंद होने पर यह समर्थित नहीं है: Turnip के लिए Adreno (Snapdragon) GPU ज़रूरी है - GitHub की रेट लिमिट पार हो गई - बाद में फिर कोशिश करें GitHub ने HTTP %1$d जवाब दिया डाउनलोड विफल @@ -2423,16 +2406,12 @@ यह ड्राइवर बंडल नहीं है: कोई manifest.json नहीं जो एक android और एक linux ड्राइवर का नाम ले यह ड्राइवर बंडल नहीं है: %1$s इसके बाहर इशारा करता है यह ड्राइवर बंडल नहीं है: यह %1$d MB से ज़्यादा में अनपैक होता है - SD कार्ड फ़ोल्डर - सेशन लॉग शेयर करें - Android 10 या नया चाहिए (कलर स्पेस वाली डिस्प्ले लेयर) यह डिस्प्ले HDR सपोर्ट नहीं बताता यह डिस्प्ले %1$s को सपोर्ट करता है, HDR10 को नहीं - यह GPU चाइल्ड-प्रोसेस सीमा चालू है चाइल्ड-प्रोसेस सीमा सेट नहीं है @@ -2506,7 +2485,6 @@ कॉपी हो गया। SSBS फ़ोर्स करें एक CPU स्पीड सेटिंग चालू रखता है जिसे Wine बार-बार बंद कर देता है। Snapdragon 8 Elite पर Windows गेम तेज़ हो सकते हैं; पुराने चिप पर बहुत कम फ़र्क़ दिखता है। अगली बार गेम लॉन्च होने पर लागू होता है। - स्टोर Steam कस्टम @@ -2992,7 +2970,6 @@ आइकॉन का रंग बटन का रंग कोई आइकॉन नहीं - साइन-इन जांचा जा रहा है… आपकी लाइब्रेरी लाई जा रही है… गेम लिस्ट लाई जा रही है… @@ -4029,10 +4006,8 @@ लेबल दिखाएँ यह लेआउट इम्पोर्ट नहीं किया जा सका %1$s के ज़रिए इंस्टॉल होता है - किरमिज़ी बर्फ लाल रंग की झलकियों वाली सफ़ेद सतहें। - साउंडट्रैक संगीत प्लेबैक विकल्प @@ -4109,7 +4084,9 @@ दिखाए गए %2$d में से %1$d बाहर निकलने के लिए फिर से बैक दबाएँ - पूर्णांक स्केलिंग - फिट होने वाले सबसे बड़े पूर्णांक स्केल का उपयोग करता है। स्रोत बहुत बड़ा होने पर काटने से बचाने के लिए पूरी छवि को फिट करता है। रिज़ॉल्यूशन अलग से सेट किया जाता है। - + स्क्रीन में समाने वाला सबसे बड़ा पूर्णांक स्केल उपयोग करता है। किनारे कट सकते हैं। यदि स्रोत आउटपुट से बड़ा है, तो भिन्नात्मक स्केलिंग पूरी छवि दिखाती है। रिज़ॉल्यूशन अलग से सेट होता है। + पूर्णांक + फ़िट + एंटी-अलियासिंग + \ No newline at end of file diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6f947cb350..9261430fec 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1,4 +1,4 @@ - + A SteamVR grafikája leállt A DroidDeck %1$d másodperc múlva újraindul, hogy visszaállítsa a grafikát, és újra megnyissa a SteamVR-t. A futó játék bezárul; a nem mentett előrehaladás nem állítható vissza. @@ -357,7 +357,7 @@ Visszatérés a DroidDeckbe játék után 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. Shader-előgyorsítótárazás - 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. + 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. Steam-kliens javítása 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. A Steam kliens újra letöltődik a Steam következő indításakor. @@ -710,7 +710,10 @@ Mega Sáv Rögzítés a helyén - 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. + Húzd a HUD-ot az áthelyezéshez. Rögzítve is működnek az alatta lévő képernyős vezérlők. + Hosszú nyomás + Összecsukás vagy kinyitás + Rögzítés vagy feloldás Igazítás az oldalakhoz Engedd el a HUD-ot, és a képernyő közelebbi oldalára ugrik. Egy gyors pöccintés abba az irányba dobja. Megjelenés @@ -1145,7 +1148,7 @@ A Lab build kikapcsolva A DroidDeck egy másik verziójához készült. A Frissítések tartalmazza. A DroidDeck kétszer nem indult el rajta - Ügynök + Dev Harness Ügynök Az ügynök dolgozik Az ügynök használatához telepítse a Claude Code alkalmazást a Linux felhasználói terébe. @@ -1315,6 +1318,7 @@ Cím kézi megadása Egy ADB-vel rendelkező számítógépről: Parancs másolása + Csatlakoztasd a headsetet egy számítógéphez, és nyisd meg a SideQuestet. Válaszd a „Run ADB Command”, majd a „Custom Command” lehetőséget, írd be az alább látható parancsot, és válaszd a „Run Command” gombot. Válassza ki, melyik kijelzőn nyíljon meg az Android Beállítások. Fő képernyő Párosítva. A vezeték nélküli hibakeresés portjának keresése… @@ -1590,7 +1594,6 @@ Mappa kiválasztása a frontend játékfájlokhoz A játékfájlok mentve: %1$s Frontend-fájlok - Várja meg a futtatókörnyezet-művelet befejezését Várja meg a kompatibilitási eszköz telepítésének befejezését Kompatibilitási eszközök előkészítése @@ -1676,7 +1679,6 @@ Linux futtatókörnyezet eltávolítása Nem sikerült megnyitni a Beállításokat az alsó képernyőn; a fő képernyőn nyílt meg. Fejlesztői beállítások megnyitása a Beállításokban - Nem sikerült megnyitni az Android „Ismeretlen alkalmazások telepítése” beállítását Nem sikerült ellenőrizni: %1$s Ez a build nem rendelkezik letöltéssel a DroidDeck ezen másolatához @@ -1686,12 +1688,10 @@ Megerősítésre várakozás A frissítés sikertelen Az Android nem ajánlotta fel a frissítés telepítését - A Decky telepítése sikertelen: %1$s Bővítmény importálásának indítása… A bővítmény importálása sikertelen: %1$s A bővítmény telepítve. Indítsa újra a Steamet a betöltéséhez. - Még nincs ellenőrizve – koppintson a frissítésre az új illesztőprogramok kereséséhez Android + Linux: ezzel együtt beállítja a megjelenítő-illesztőprogramot is Android + Linux: ezzel együtt beállítja a futtatókörnyezet illesztőprogramját is @@ -1744,7 +1744,6 @@ ellenőrzés sikertelen %1$s telepítve – válassza ki bármelyik listában mindkét illesztőprogram beállításához %1$s telepítve – válassza ki a menüben - Várja meg a futtatókörnyezet eltávolításának befejezését Játék érintőpad @@ -1790,7 +1789,6 @@ A napló %1$d „Function not implemented” hibát tartalmaz: a proot seccomp-gyorsítása elutasít egy segédfolyamatot ezen az eszközön. Próbálja ki ezt: %2$s → „%3$s” (vagy „%4$s”), majd indítsa el újra. A napló %1$d „Function not implemented” hibát tartalmaz: a proot seccomp-gyorsítása elutasít egy segédfolyamatot ezen az eszközön. Próbálja ki ezt: %2$s → „%3$s” (vagy „%4$s”), majd indítsa el újra. - Bővítmények Telepítsen egy bővítmény ZIP-et a következő Steam-munkamenethez. Letöltés… @@ -2147,7 +2145,6 @@ Elite Dangerous 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. 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. - Linux futtatókörnyezet eltávolítása Linux futtatókörnyezet eltávolítása · %1$d bejegyzés @@ -2162,7 +2159,6 @@ Megjelenik, amíg a Linux futtatókörnyezet telepítése vagy eltávolítása zajlik A Linux futtatókörnyezet telepítése A Linux futtatókörnyezet eltávolítása - A Linux futtatókörnyezet nincs telepítve A katalógusban nincs ellenőrzőösszeg a %1$s-hez Az ellenőrzőösszeg nem egyezik – semmi nem változott @@ -2170,7 +2166,6 @@ Nem sikerült elhelyezni az AppImage-et A kicsomagolás sikertelen A telepítés sikertelen - A Flatpak beállítása sikertelen (kilépési kód: %1$d) A Flatpak beállítása nem fejeződött be Egy másik áruházi feladat fut @@ -2189,7 +2184,6 @@ médiakodekek %1$s futtatókörnyezet %1$s futtatókörnyezet %2$s - A fájl túl kicsi ahhoz, hogy AppImage legyen A fájl nem olvasható: %1$s Ez nem egy AppImage (nem Linux-program) @@ -2204,7 +2198,6 @@ %1$s kicsomagolása Az AppImage-et nem sikerült kicsomagolni Az AppImage-et nem sikerült kicsomagolni: %1$s - Állítsa le az aktív munkamenetet a Decky Loader telepítése előtt A Decky Loader letöltése sikertelen A Decky Loader mérete nem egyezett a kiadás metaadataival @@ -2253,13 +2246,11 @@ Nem sikerült aktiválni az importált bővítményt Nem sikerült frissíteni a Decky bővítménybeállításokat Nem sikerült visszaállítani a meglévő bővítményt - Nem sikerült menteni a vezeték nélküli hibakeresés azonosítóját Az ADB-parancs sikertelen (%1$d) Az Android nem erősítette meg a gyermekfolyamat-korlát módosítását: %1$s Nincs mentett vezeték nélküli hibakeresés-párosítás Adja meg a vezeték nélküli hibakeresés jelenlegi IP-címét és portját - Időtúllépés a párosítási felugró ablakra várva. Próbálja újra a DroidDeckből. Nem sikerült megkeresni a párosítási felugró ablakot (%1$d). Ellenőrizze, hogy a Wi-Fi be van kapcsolva. Nem sikerült megkeresni a párosítási felugró ablakot: %1$s @@ -2285,7 +2276,6 @@ A Steam készen áll Koppintson a DroidDeckhez való visszatéréshez. A vezeték nélküli hibakeresést most kikapcsolhatja. A vezeték nélküli hibakeresés beállítása megállt - A letöltés nem sikerült A letöltés mérete nem egyezett a közzétett APK-val, és elvetésre került – próbálja újra A letöltés nem egyezett az ellenőrzőösszegével, és elvetésre került – próbálja újra @@ -2298,13 +2288,11 @@ A letöltött APK nem tartalmaz aláírási információt A letöltött APK nincs aláírva a DroidDeck kiadási kulcsával A frissítési katalógus HTTP %1$d választ adott - A munkamenet indítása… %1$d:%2$02d eltelt · még dolgozik A Steam-kliens frissítésének letöltése · %1$d%% A Steam-kliens frissítésének alkalmazása… A Steam-kliens letöltése · %1$s - Már fut egy kompatibilitási eszköz telepítése Állítsa le az aktív munkamenetet a kompatibilitási eszközök telepítése előtt Nem található ARM64-es kiadás a %1$s-hez @@ -2324,7 +2312,6 @@ A %1$s telepítése sikertelen (kilépési kód: %2$d) Nem sikerült telepíteni a %1$s-t droiddeck-esync csomag letöltése - Linux segédprogramokkal Csak DLL-ek Eredeti (a Proton frissült az utolsó csere óta) @@ -2347,13 +2334,11 @@ A letöltés sikertelen: lehet, hogy ezt a nightly buildet egy újabb váltotta. Frissítse a listát, és próbálja újra. Ez a csomaglista régebbi, mint az ellenőrzőösszegek – frissítse, és próbálja újra Az ellenőrzőösszeg nem egyezik - Lineáris Legközelebbi Snapdragon GSR (minőség) Csak élesítés Automatikus (illeszkedik a méretezéshez) - Semmi nincs alkalmazva. Játéktisztaság Élesítés egy csipetnyi kontraszttal – a mindennapi. @@ -2377,7 +2362,6 @@ Éles pixelek 2D-s és régi játékokhoz. Anime élek Rajzfilmes körvonalak plusz élesítés. - Nem Adreno GPU A rendszer PowerVR-illesztőprogramja: a kompatibilitás eszközönként változó Kísérleti: RADV vagy a rendszer Xclipse-illesztőprogramja @@ -2402,7 +2386,6 @@ Nem támogatott: nincs kompatibilis grafikus háttérrendszer ehhez a GPU-hoz A Mali hídon keresztül, a telefon saját Vulkan illesztőprogramján fut Nem támogatott, ha a Mali híd ki van kapcsolva: a Turnip Adreno (Snapdragon) GPU-t igényel - A GitHub korlátja elérve – próbálja újra később A GitHub HTTP %1$d választ adott A letöltés nem sikerült @@ -2423,16 +2406,12 @@ Nem illesztőprogram-csomag: nincs manifest.json, amely android és linux illesztőprogramot nevez meg Nem illesztőprogram-csomag: a %1$s rajta kívülre mutat Nem illesztőprogram-csomag: kicsomagolva több mint %1$d MB - SD-kártya Mappa - Munkamenet-naplók megosztása - Android 10 vagy újabb szükséges (színtérrel rendelkező megjelenítési rétegek) ez a kijelző nem jelez HDR-támogatást ez a kijelző a %1$s-t támogatja, nem a HDR10-et - ez a GPU A gyermekfolyamat-korlát be van kapcsolva A gyermekfolyamat-korlát nincs beállítva @@ -2506,7 +2485,6 @@ Másolva. SSBS kényszerítése Bekapcsolva tartja azt a CPU-sebesség-beállítást, amelyet a Wine folyton kikapcsol. Gyorsíthatja a Windows-os játékokat Snapdragon 8 Elite-n; régebbi chipeken alig van hatása. A következő játékindítástól érvényes. - Áruházak Steam Egyéni @@ -2992,7 +2970,6 @@ Ikon színe Gomb színe Nincs ikon - Bejelentkezés ellenőrzése… Könyvtárad lekérése… Játéklista lekérése… @@ -4029,10 +4006,8 @@ Címke megjelenítése Ez az elrendezés nem importálható A telepítés itt történik: %1$s - Skarlátvörös hó Fehér felületek piros kiemelésekkel. - Soundtrackek Zene Lejátszási beállítások @@ -4109,7 +4084,9 @@ Megjelenítve %1$d / %2$d Nyomd meg még egyszer a visszát a kilépéshez - Egész számú méretezés - A legnagyobb elférő egész számú méretezési tényezőt használja. Ha a forrás túl nagy, a teljes képet hozzáigazítja a levágás elkerüléséhez. A felbontás külön állítható. - + A legnagyobb elférő egész számú méretezést használja. A szélek levágódhatnak. Ha a forrás nagyobb a kimenetnél, a tört méretezés a teljes képet jeleníti meg. A felbontás külön állítható. + Egész szám + Igazítás + Élsimítás + \ No newline at end of file diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7ee19817c6..00dcfe8d3a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1,4 +1,4 @@ - + Grafis SteamVR berhenti DroidDeck akan dimulai ulang dalam %1$d detik untuk mereset grafis dan membuka kembali SteamVR. Game Anda yang sedang berjalan akan ditutup; progres yang belum disimpan tidak dapat dipulihkan. @@ -357,7 +357,7 @@ Kembali ke DroidDeck setelah bermain 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. Pra-cache shader - 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. + 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. Perbaiki klien Steam Mengunduh ulang klien Steam saat Steam dimulai lagi. Gunakan ini jika Steam tetap berada di layar pemuatannya. Gim, status masuk, dan setelan tetap disimpan. Klien Steam akan diunduh ulang saat Steam dimulai lagi. @@ -708,7 +708,10 @@ Mega Bilah Kunci posisi - Seret HUD untuk memindahkannya; tekan lama untuk mengunci atau membuka kuncinya. Saat terkunci, kontrol layar di bawahnya tetap berfungsi. + Seret HUD untuk memindahkannya. Saat terkunci, kontrol layar di bawahnya tetap berfungsi. + Tekan lama + Ciutkan atau perluas + Kunci atau buka kunci Tempel ke sisi Lepaskan HUD dan HUD akan pindah ke sisi layar yang lebih dekat. Jentikan cepat melemparnya ke arah itu. Tampilan @@ -1142,7 +1145,7 @@ Build Lab dinonaktifkan Build itu dibuat untuk versi DroidDeck lain. Disimpan di Pembaruan. DroidDeck gagal dimulai dengannya dua kali. - Agen + Dev Harness Agen Agen sedang bekerja Pasang Claude Code di lingkungan pengguna Linux untuk menggunakan agen. @@ -1309,6 +1312,7 @@ Masukkan alamat secara manual Dari komputer dengan ADB: Salin perintah + Hubungkan headset ke komputer dan buka SideQuest. Pilih “Run ADB Command”, lalu “Custom Command”, ketik perintah yang ditampilkan di bawah, dan pilih “Run Command”. Pilih tampilan tempat membuka Setelan Android. Layar utama Berhasil dipasangkan. Mencari port Debugging nirkabel… @@ -1583,7 +1587,6 @@ Pilih folder untuk file game frontend File game disimpan ke %1$s File frontend - Tunggu operasi runtime selesai Tunggu instalasi alat kompatibilitas selesai Menyiapkan alat kompatibilitas @@ -1664,7 +1667,6 @@ Menghapus runtime Linux Tidak dapat membuka Setelan di layar bawah; dibuka di layar utama. Buka Opsi Pengembang di Setelan - Tidak dapat membuka setelan Android “Instal aplikasi tidak dikenal” Tidak dapat memeriksa: %1$s Build ini tidak memiliki unduhan untuk salinan DroidDeck ini @@ -1674,12 +1676,10 @@ Menunggu konfirmasi Anda Pembaruan gagal Android tidak menawarkan untuk menginstal pembaruan - Instalasi Decky gagal: %1$s Memulai impor plugin… Impor plugin gagal: %1$s Plugin terinstal. Mulai ulang Steam untuk memuatnya. - Belum diperiksa - ketuk refresh untuk mencari driver baru Android + Linux: mengatur driver tampilan dengannya Android + Linux: mengatur driver runtime dengannya @@ -1729,7 +1729,6 @@ pemeriksaan gagal Terinstal %1$s - pilih di salah satu daftar untuk mengatur kedua driver Terinstal %1$s - pilih di menu - Tunggu penghapusan runtime selesai Game touchpad @@ -1773,7 +1772,6 @@ Log menunjukkan %1$d error “Function not implemented”: akselerasi seccomp proot gagal pada salah satu helper di perangkat ini. Coba %2$s → “%3$s” (atau “%4$s”) lalu mulai lagi. - Plugin Instal file ZIP plugin untuk sesi Steam berikutnya. Mengunduh… @@ -2123,7 +2121,6 @@ Elite Dangerous Port %1$d menerima data (%2$d paket berukuran %3$d byte), tetapi dalam format yang belum dapat dibaca halaman ini. Program lain sudah menggunakan port %1$s, jadi gim tersebut tidak dapat ditampilkan di sini. - Menghapus runtime Linux Menghapus runtime Linux · %1$d entri @@ -2137,7 +2134,6 @@ Ditampilkan saat runtime Linux diinstal atau dihapus Menginstal runtime Linux Menghapus runtime Linux - Runtime Linux tidak terinstal Katalog tidak memiliki checksum untuk %1$s Checksum tidak cocok - tidak ada yang diubah @@ -2145,7 +2141,6 @@ Tidak dapat menempatkan AppImage Ekstraksi gagal Instalasi gagal - Penyiapan Flatpak gagal (keluar %1$d) Penyiapan Flatpak tidak selesai Tugas toko lainnya sedang berjalan @@ -2164,7 +2159,6 @@ kodek media Runtime %1$s Runtime %1$s %2$s - File terlalu kecil untuk menjadi AppImage File tidak dapat dibaca: %1$s Ini bukan AppImage (bukan program Linux) @@ -2179,7 +2173,6 @@ Mengekstrak %1$s AppImage tidak dapat diekstrak AppImage tidak dapat diekstrak: %1$s - Hentikan sesi aktif sebelum menginstal Decky Loader Unduhan Decky Loader gagal Ukuran Decky Loader tidak sesuai dengan metadata rilis @@ -2228,13 +2221,11 @@ Tidak dapat mengaktifkan plugin yang diimpor Tidak dapat memperbarui setelan plugin Decky Tidak dapat memulihkan plugin yang ada - Tidak dapat menyimpan identitas Debugging nirkabel Perintah ADB gagal (%1$d) Android tidak mengonfirmasi bahwa batas proses turunan telah diubah: %1$s Tidak ada pemasangan Debugging nirkabel yang tersimpan Masukkan alamat IP & Port Debugging nirkabel saat ini - Waktu tunggu munculan pemasangan habis. Coba lagi dari DroidDeck. Tidak dapat mencari munculan pemasangan (%1$d). Pastikan Wi-Fi aktif. Tidak dapat mencari munculan pemasangan: %1$s @@ -2260,7 +2251,6 @@ Steam siap Ketuk untuk kembali ke DroidDeck. Anda bisa menonaktifkan Debugging nirkabel sekarang. Penyiapan Debugging nirkabel dihentikan - Unduhan gagal Ukuran unduhan tidak sesuai dengan APK yang dipublikasikan dan dibuang - coba lagi Unduhan tidak sesuai dengan checksum-nya dan dibuang - coba lagi @@ -2273,13 +2263,11 @@ APK yang diunduh tidak memiliki informasi penandatanganan APK yang diunduh tidak ditandatangani dengan kunci rilis DroidDeck Katalog pembaruan merespons HTTP %1$d - Memulai sesi… %1$d:%2$02d berlalu · masih berjalan Mengunduh pembaruan klien Steam · %1$d%% Menerapkan pembaruan klien Steam… Mengunduh klien Steam · %1$s - Instalasi alat kompatibilitas sedang berjalan Hentikan sesi aktif sebelum menginstal alat kompatibilitas Tidak dapat menemukan rilis ARM64 untuk %1$s @@ -2299,7 +2287,6 @@ Instalasi %1$s gagal (keluar %2$d) Tidak dapat menginstal %1$s Mengambil paket droiddeck-esync - dengan helper Linux Hanya DLL Asli (Proton diperbarui sejak penggantian terakhir) @@ -2322,13 +2309,11 @@ Unduhan gagal: build nightly ini mungkin sudah diganti dengan yang lebih baru. Segarkan daftar lalu coba lagi. Daftar paket ini dibuat sebelum adanya checksum - segarkan dan coba lagi Checksum tidak cocok - Linier Terdekat Snapdragon GSR (kualitas) Hanya penajaman Otomatis (sesuaikan skala) - Tidak ada yang diterapkan. Kejernihan Gim Penajaman dengan sedikit kontras - cocok untuk sehari-hari. @@ -2352,7 +2337,6 @@ Piksel tajam untuk gim 2D dan judul lawas. Tepi Anime Garis luar toon ditambah penajaman. - Bukan GPU Adreno Driver PowerVR sistem: kompatibilitas berbeda tiap perangkat Eksperimental: RADV atau driver Xclipse sistem @@ -2377,7 +2361,6 @@ Tidak didukung: tidak ada backend grafis yang kompatibel untuk GPU ini Berjalan lewat jembatan Mali, dengan driver Vulkan bawaan ponsel Tidak didukung saat jembatan Mali nonaktif: Turnip membutuhkan GPU Adreno (Snapdragon) - Batas kecepatan GitHub tercapai - coba lagi nanti GitHub merespons HTTP %1$d Unduhan gagal @@ -2398,16 +2381,12 @@ Bukan paket driver: tidak ada manifest.json yang menyebutkan driver android dan linux Bukan paket driver: %1$s mengarah ke luar paket Bukan paket driver: ukurannya setelah diekstrak lebih dari %1$d MB - Kartu SD Folder - Bagikan log sesi - memerlukan Android 10 atau yang lebih baru (lapisan tampilan dengan ruang warna) tampilan ini melaporkan tidak ada dukungan HDR tampilan ini mendukung %1$s, bukan HDR10 - GPU ini Batas proses turunan aktif Batas proses turunan belum diatur @@ -2481,7 +2460,6 @@ Disalin. Paksa SSBS Menjaga setelan kecepatan CPU yang terus dinonaktifkan oleh Wine. Dapat membuat gim Windows lebih cepat di Snapdragon 8 Elite; perubahan kecil terlihat pada chip yang lebih lama. Berlaku pada peluncuran gim berikutnya. - Toko Steam Khusus @@ -2964,7 +2942,6 @@ Warna ikon Warna tombol Tidak ada ikon - Memeriksa status masuk… Mengambil pustaka kamu… Mengambil daftar game… @@ -3999,10 +3976,8 @@ Tampilkan label Tata letak ini tidak dapat diimpor Diinstal melalui %1$s - Salju Kirmizi Permukaan putih dengan aksen merah. - Soundtrack Musik Opsi pemutaran @@ -4079,7 +4054,9 @@ Ditampilkan %1$d dari %2$d Tekan kembali sekali lagi untuk keluar - Penskalaan bilangan bulat - Menggunakan faktor skala bilangan bulat terbesar yang muat. Jika sumber terlalu besar, seluruh gambar disesuaikan agar tidak terpotong. Resolusi diatur secara terpisah. - + Menggunakan skala bilangan bulat terbesar yang muat. Tepi layar mungkin terpotong. Jika sumber lebih besar daripada keluaran, penskalaan pecahan menampilkan seluruh gambar. Resolusi diatur secara terpisah. + Bilangan bulat + Sesuaikan + Anti-aliasing + \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 17bdc0ded1..a3ca9a4562 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,4 +1,4 @@ - + Grafica di SteamVR interrotta DroidDeck si riavvierà tra %1$d secondi per ripristinare la grafica e riaprire SteamVR. Il gioco in esecuzione verrà chiuso; i progressi non salvati non potranno essere recuperati. @@ -357,7 +357,7 @@ Torna a DroidDeck dopo un gioco 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. Pre-caching degli shader - 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. + 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. Ripara il client Steam 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. Il client Steam verrà scaricato di nuovo al prossimo avvio di Steam. @@ -712,7 +712,10 @@ Mega Barra Blocca in posizione - 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. + Trascina l\'HUD per spostarlo. Mentre è bloccato, i controlli su schermo sotto di esso continuano a funzionare. + Pressione prolungata + Comprimi o espandi + Blocca o sblocca Aggancia ai lati Rilascia l\'HUD e si sposta sul lato più vicino dello schermo. Un gesto rapido lo lancia in quella direzione. Aspetto @@ -1140,7 +1143,7 @@ Build Lab disattivata È stata compilata per un\'altra versione di DroidDeck. È conservata in Aggiornamenti. DroidDeck non si è avviato con essa due volte - Agente + Dev Harness Agente L\'agente sta lavorando Installa Claude Code nella userland Linux per usare l\'agente. @@ -1313,6 +1316,7 @@ Inserisci l\'indirizzo manualmente Da un computer con ADB: Copia comando + Collega il visore a un computer e apri SideQuest. Scegli “Run ADB Command”, poi “Custom Command”, digita il comando mostrato sotto e seleziona “Run Command”. Scegli su quale schermo aprire le Impostazioni di Android. Schermo principale Accoppiato. Ricerca della porta del Debug wireless… @@ -1589,7 +1593,6 @@ Scegli una cartella per i file dei giochi del frontend File dei giochi salvati in %1$s File del frontend - Attendi la fine dell\'operazione sul runtime Attendi la fine dell\'installazione dello strumento di compatibilità Preparazione degli strumenti di compatibilità @@ -1680,7 +1683,6 @@ Rimozione del runtime Linux Impossibile aprire Impostazioni sullo schermo inferiore; aperte sullo schermo principale. Apri Opzioni sviluppatore in Impostazioni - Impossibile aprire l\'impostazione Android “Installa app sconosciute” Impossibile controllare: %1$s Questa build non ha un download per questa copia di DroidDeck @@ -1690,12 +1692,10 @@ In attesa della tua conferma Aggiornamento non riuscito Android non ha proposto di installare l\'aggiornamento - Installazione di Decky non riuscita: %1$s Avvio dell\'importazione del plugin… Importazione del plugin non riuscita: %1$s Plugin installato. Riavvia Steam per caricarlo. - Non ancora controllato - tocca aggiorna per cercare nuovi driver Android + Linux: imposta anche il driver video Android + Linux: imposta anche il driver del runtime @@ -1751,7 +1751,6 @@ controllo non riuscito Installato %1$s - sceglilo in uno dei due elenchi per impostare entrambi i driver Installato %1$s - sceglilo nel menu - Attendi la fine della rimozione del runtime Gioco touchpad @@ -1799,7 +1798,6 @@ Il log mostra %1$d errori “Function not implemented”: l\'accelerazione seccomp di proot fa fallire un helper su questo dispositivo. Prova %2$s → “%3$s” (o “%4$s”) e riavvia. Il log mostra %1$d errori “Function not implemented”: l\'accelerazione seccomp di proot fa fallire un helper su questo dispositivo. Prova %2$s → “%3$s” (o “%4$s”) e riavvia. - Plugin Installa uno ZIP di plugin per la prossima sessione Steam. Download… @@ -2163,7 +2161,6 @@ Elite Dangerous La porta %1$d riceve dati (%2$d pacchetti da %3$d byte), ma in un formato che questa pagina non sa ancora leggere. Un altro programma usa già la porta %1$s, quindi quel gioco non può essere mostrato qui. - Rimozione del runtime Linux Rimozione del runtime Linux · %1$d elemento @@ -2179,7 +2176,6 @@ Visibile durante l\'installazione o la rimozione del runtime Linux Installazione del runtime Linux Rimozione del runtime Linux - Il runtime Linux non è installato Il catalogo non ha un checksum per %1$s Checksum non corrispondente - non è stato modificato nulla @@ -2187,7 +2183,6 @@ Impossibile posizionare l\'AppImage Estrazione non riuscita Installazione non riuscita - Configurazione di Flatpak non riuscita (uscita %1$d) La configurazione di Flatpak non è stata completata È in corso un\'altra operazione del Negozio @@ -2206,7 +2201,6 @@ codec multimediali runtime %1$s runtime %1$s %2$s - Il file è troppo piccolo per essere un AppImage Impossibile leggere il file: %1$s Questo non è un AppImage (non è un programma Linux) @@ -2221,7 +2215,6 @@ Estrazione di %1$s Impossibile estrarre l\'AppImage Impossibile estrarre l\'AppImage: %1$s - Interrompi la sessione attiva prima di installare Decky Loader Download di Decky Loader non riuscito La dimensione di Decky Loader non corrisponde ai metadati della release @@ -2270,13 +2263,11 @@ Impossibile attivare il plugin importato Impossibile aggiornare le impostazioni dei plugin Decky Impossibile ripristinare il plugin esistente - Impossibile salvare l\'identità del debug wireless Comando ADB non riuscito (%1$d) Android non ha confermato la modifica del limite dei processi secondari: %1$s Nessun accoppiamento del debug wireless salvato Inserisci l\'indirizzo IP e la porta attuali del debug wireless - Tempo scaduto in attesa del popup di accoppiamento. Riprova da DroidDeck. Impossibile cercare il popup di accoppiamento (%1$d). Controlla che il Wi-Fi sia attivo. Impossibile cercare il popup di accoppiamento: %1$s @@ -2302,7 +2293,6 @@ Steam è pronto Tocca per tornare a DroidDeck. Ora puoi disattivare il debug wireless. Configurazione del debug wireless interrotta - Download non riuscito La dimensione del download non corrispondeva all\'APK pubblicato ed è stato scartato - riprova Il download non corrispondeva al suo checksum ed è stato scartato - riprova @@ -2315,13 +2305,11 @@ L\'APK scaricato non ha informazioni di firma L\'APK scaricato non è firmato con la chiave di release di DroidDeck Il catalogo degli aggiornamenti ha risposto HTTP %1$d - Avvio della sessione… %1$d:%2$02d trascorsi · ancora in corso Download dell\'aggiornamento del client Steam · %1$d%% Applicazione dell\'aggiornamento del client Steam… Download del client Steam · %1$s - È già in corso l\'installazione di uno strumento di compatibilità Interrompi la sessione attiva prima di installare strumenti di compatibilità Impossibile trovare una release ARM64 per %1$s @@ -2341,7 +2329,6 @@ Installazione di %1$s non riuscita (uscita %2$d) Impossibile installare %1$s Recupero del pacchetto droiddeck-esync - con helper Linux Solo DLL Originale (Proton aggiornato dopo l\'ultima sostituzione) @@ -2364,13 +2351,11 @@ Download non riuscito: questa build nightly potrebbe essere stata sostituita da una più recente. Aggiorna l’elenco e riprova. Questo elenco di pacchetti è anteriore ai checksum - aggiornalo e riprova Checksum non corrispondente - Lineare Più vicino Snapdragon GSR (qualità) Solo nitidezza Auto (segue il ridimensionamento) - Nessun effetto applicato. Chiarezza di gioco Nitidezza con un tocco di contrasto - quello per tutti i giorni. @@ -2394,7 +2379,6 @@ Pixel nitidi per il 2D e i titoli più vecchi. Contorni anime Contorni da cartone animato più nitidezza. - Non è una GPU Adreno Driver PowerVR di sistema: la compatibilità varia in base al dispositivo Sperimentale: RADV o il driver Xclipse di sistema @@ -2419,7 +2403,6 @@ Non supportata: nessun backend grafico compatibile disponibile per questa GPU Funziona tramite il bridge Mali, sul driver Vulkan del telefono Non supportato con il bridge Mali disattivato: Turnip richiede una GPU Adreno (Snapdragon) - Raggiunto il limite di richieste di GitHub - riprova più tardi GitHub ha risposto HTTP %1$d Download non riuscito @@ -2440,16 +2423,12 @@ Non è un pacchetto di driver: manca un manifest.json che indichi un driver Android e uno Linux Non è un pacchetto di driver: %1$s punta al di fuori di esso Non è un pacchetto di driver: una volta estratto supera %1$d MB - Scheda SD Cartella - Condividi log di sessione - richiede Android 10 o successivo (livelli di visualizzazione con spazio colore) questo schermo non segnala supporto HDR questo schermo supporta %1$s, non HDR10 - questa GPU Limite dei processi secondari attivo Limite dei processi secondari non impostato @@ -2523,7 +2502,6 @@ Copiato. Forza SSBS Mantiene attiva un\'impostazione di velocità della CPU che Wine continua a disattivare. Può rendere più veloci i giochi Windows su Snapdragon 8 Elite; poche differenze sui chip più vecchi. Si applica al prossimo avvio del gioco. - Negozi Steam Personalizzati @@ -3009,7 +2987,6 @@ Colore dell\'icona Colore del tasto Nessuna icona - Verifica dell\'accesso… Recupero della libreria… Recupero dell\'elenco giochi… @@ -4068,10 +4045,8 @@ Mostra etichetta Impossibile importare questo layout Si installa tramite %1$s - Neve scarlatta Superfici bianche con accenti rossi. - Colonne sonore Musica Opzioni di riproduzione @@ -4148,7 +4123,9 @@ Mostrati %1$d di %2$d Premi di nuovo indietro per uscire - Ridimensionamento intero - Usa il più grande fattore di scala intero che entra nello schermo. Se la sorgente è troppo grande, adatta l’intera immagine per evitare ritagli. La risoluzione si configura separatamente. - + Usa il massimo fattore di scala intero che entra nello schermo. I bordi potrebbero essere tagliati. Se la sorgente è più grande dell\'output, la scalatura frazionaria mostra l\'intera immagine. La risoluzione si configura separatamente. + Intero + Adatta + Antialiasing + \ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index cf9e3e333d..57cbc6756b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1,4 +1,4 @@ - + SteamVR のグラフィックが停止しました グラフィックをリセットして SteamVR を開き直すため、DroidDeck は%1$d秒後に再起動します。実行中のゲームは終了し、保存されていない進行状況は復元できません。 @@ -357,7 +357,7 @@ ゲーム終了後にDroidDeckへ戻る DroidDeckや他のランチャーから起動したゲームを閉じると、Steamが正しく終了し(クラウドセーブの同期を先に完了)、起動元に戻ります。オフ:Steamに留まります。 シェーダーの事前キャッシュ - Steamがゲーム用にビルド済みのシェーダーをダウンロードしてバックグラウンドで処理するため、ゲームのカクつきが減ります。オフにするとデータ通信量、ストレージ、バッテリーを節約できますが、ゲームはプレイ中にシェーダーをビルドします。Steamの「ダウンロード」>「シェーダーの事前キャッシュ」と同じ設定です。次回のセッションから適用されます。 + Steamがゲーム用にビルド済みのシェーダーをダウンロードしてバックグラウンドで処理するため、ゲームのカクつきが減ります。オフにするとデータ通信量、ストレージ、バッテリーを節約できますが、ゲームはプレイ中にシェーダーをビルドします。Steamの「ダウンロード」>「シェーダーの事前キャッシュ」と同じ設定です。次回のセッションから適用されます。 Steamクライアントを修復 次回Steamの起動時にSteamクライアントを再ダウンロードします。Steamが読み込み画面のまま進まない場合に使用してください。ゲーム、ログイン情報、設定は保持されます。 次回Steamの起動時にSteamクライアントを再ダウンロードします。 @@ -708,7 +708,10 @@ メガ バー 位置を固定 - HUDはドラッグで移動できます。長押しで固定または解除します。固定中も、下にある画面上のコントロールは使えます。 + HUDはドラッグで移動できます。固定中も、下にある画面上のコントロールは使えます。 + 長押し + 折りたたみ/展開 + 固定/解除 左右に吸着 HUD を離すと、画面の近い方の端に移動します。はじくとその方向へ飛びます。 外観 @@ -1142,7 +1145,7 @@ Lab ビルドをオフにしました 別のバージョンの DroidDeck 用にビルドされました。アップデートに保管されています。 そのビルドで DroidDeck が 2 回起動しませんでした - エージェント + Dev Harness エージェント エージェントが作業中です エージェントを使うには、Linux ユーザーランドに Claude Code をインストールしてください。 @@ -1309,6 +1312,7 @@ 手動でアドレスを入力 PCでADBを使用: コマンドをコピー + ヘッドセットをパソコンにつないで SideQuest を開きます。「Run ADB Command」→「Custom Command」を選び、下に表示されたコマンドを入力して「Run Command」を選びます。 Android設定をどの画面で開くか選択してください。 メイン画面 ペアリング済み。ワイヤレスデバッグのポートを検索中… @@ -1583,7 +1587,6 @@ フロントエンドゲームファイル用のフォルダを選択 ゲームファイルを %1$s に保存しました フロントエンドファイル - 実行環境の処理が完了するまでお待ちください 互換性ツールのインストールが完了するまでお待ちください 互換性ツールを準備しています @@ -1664,7 +1667,6 @@ Linux実行環境を削除中 下部画面で設定を開けなかったため、メイン画面で開きました。 設定で開発者向けオプションを開いてください - Androidの「不明なアプリのインストール」設定を開けませんでした 確認できませんでした:%1$s このビルドには、このDroidDeckコピー用のダウンロードがありません @@ -1674,12 +1676,10 @@ 確認を待機中 アップデートに失敗しました Androidがアップデートのインストールを表示しませんでした - Deckyのインストールに失敗しました:%1$s プラグインのインポートを開始中… プラグインのインポートに失敗しました:%1$s プラグインをインストールしました。読み込むにはSteamを再起動してください。 - 未確認 - 更新をタップして新しいドライバーを検索 Android + Linux:ディスプレイドライバーも一緒に設定されます Android + Linux:ランタイムドライバーも一緒に設定されます @@ -1729,7 +1729,6 @@ 確認に失敗 %1$sをインストールしました - どちらかの一覧で選択すると両方のドライバーが設定されます %1$sをインストールしました - メニューで選択してください - 実行環境の削除が完了するまでお待ちください ゲーム トラックパッド @@ -1773,7 +1772,6 @@ ログに「Function not implemented」エラーが%1$d件あります。このデバイスでは、prootのseccomp高速化が補助プロセスの処理に失敗しています。%2$s →「%3$s」(または「%4$s」)を試してから、もう一度起動してください。 - プラグイン 次回のSteamセッション用にプラグインのzipをインストールします。 ダウンロード中… @@ -2123,7 +2121,6 @@ Elite Dangerous ポート%1$dでデータを受信していますが(%3$dバイトのパケット%2$d個)、このページではまだ読み取れない形式です。 別のプログラムがすでにポート%1$sを使用しているため、そのゲームはここに表示できません。 - Linux実行環境を削除中 Linux実行環境を削除中 · %1$d項目 @@ -2137,7 +2134,6 @@ Linux実行環境のインストール中または削除中に表示 Linux実行環境をインストール中 Linux実行環境を削除中 - Linux実行環境がインストールされていません カタログに%1$sのチェックサムがありません チェックサムが一致しません - 何も変更されていません @@ -2145,7 +2141,6 @@ AppImageを配置できませんでした 展開に失敗しました インストールに失敗しました - Flatpakのセットアップに失敗しました(終了コード %1$d) Flatpakのセットアップが完了しませんでした 別のストアのタスクを実行中です @@ -2164,7 +2159,6 @@ メディアコーデック %1$sランタイム %1$s実行環境 %2$s - ファイルが小さすぎるため、AppImageではありません ファイルを読み取れません:%1$s AppImageではありません(Linuxプログラムではありません) @@ -2179,7 +2173,6 @@ %1$sを展開中 AppImageを展開できませんでした AppImageを展開できませんでした:%1$s - Decky Loaderをインストールする前に、実行中のセッションを停止してください Decky Loaderのダウンロードに失敗しました Decky Loaderのサイズがリリース情報と一致しません @@ -2228,13 +2221,11 @@ インポートしたプラグインを有効にできませんでした Deckyのプラグイン設定を更新できませんでした 既存のプラグインを復元できませんでした - ワイヤレスデバッグの識別情報を保存できませんでした ADBコマンドに失敗しました(%1$d) Androidは子プロセス制限の変更を確認しませんでした:%1$s ワイヤレスデバッグのペアリング情報が保存されていません 現在のワイヤレスデバッグのIPアドレスとポートを入力してください - ペアリングのポップアップを待機中にタイムアウトしました。DroidDeckからもう一度お試しください。 ペアリングのポップアップを検索できませんでした(%1$d)。Wi-Fiがオンになっているか確認してください。 ペアリングのポップアップを検索できませんでした:%1$s @@ -2260,7 +2251,6 @@ Steamの準備ができました タップしてDroidDeckに戻ります。ワイヤレスデバッグはオフにしてかまいません。 ワイヤレスデバッグのセットアップが中断しました - ダウンロードに失敗しました ダウンロードしたファイルのサイズが公開されているAPKと一致しないため、破棄しました。もう一度お試しください ダウンロードしたファイルがチェックサムと一致しないため、破棄しました。もう一度お試しください @@ -2273,13 +2263,11 @@ ダウンロードしたAPKに署名情報がありません ダウンロードしたAPKはDroidDeckのリリースキーで署名されていません アップデートカタログがHTTP %1$dを返しました - セッションを開始中… %1$d:%2$02d 経過 · 処理中 Steamクライアントのアップデートをダウンロード中 · %1$d%% Steam クライアントの更新を適用しています… Steamクライアントをダウンロード中 · %1$s - 互換性ツールのインストールはすでに実行中です 互換性ツールをインストールする前に、実行中のセッションを停止してください %1$sのARM64リリースが見つかりませんでした @@ -2299,7 +2287,6 @@ %1$sのインストールに失敗しました(終了コード %2$d) %1$sをインストールできませんでした droiddeck-esyncパックを取得中 - Linux補助プログラム付き DLLのみ 元(前回の置き換え以降にProtonが更新されました) @@ -2322,13 +2309,11 @@ ダウンロードに失敗しました:このナイトリービルドは新しいビルドに置き換えられた可能性があります。一覧を更新してもう一度お試しください。 このパッケージ一覧はチェックサム導入前のものです。更新してからもう一度お試しください チェックサムが一致しません - リニア ニアレスト Snapdragon GSR(品質) シャープのみ 自動(スケーリングに合わせる) - 何も適用されません。 ゲームクラリティ シャープ化に少しコントラストを加えた、普段使い向け。 @@ -2352,7 +2337,6 @@ 2Dや古いタイトル向けのくっきりしたピクセル。 アニメエッジ トゥーン輪郭線とシャープ化。 - Adreno GPUではありません システムの PowerVR ドライバー: 互換性はデバイスによって異なります 実験的: RADV またはシステムの Xclipse ドライバー @@ -2377,7 +2361,6 @@ サポート対象外:このGPUで利用できる互換グラフィックスバックエンドがありません Mali ブリッジを経由して、端末内蔵の Vulkan ドライバー上で動作します Mali ブリッジがオフの場合はサポートされません。Turnip には Adreno (Snapdragon) GPU が必要です - GitHubのレート制限に達しました。後でもう一度お試しください GitHubがHTTP %1$dを返しました ダウンロードに失敗しました @@ -2398,16 +2381,12 @@ ドライバーバンドルではありません:androidドライバーとlinuxドライバーを指定するmanifest.jsonがありません ドライバーバンドルではありません:%1$sがバンドルの外を指しています ドライバーバンドルではありません:展開後のサイズが%1$d MBを超えます - SDカード フォルダ - セッションログを共有 - Android 10以降が必要です(色空間付きのディスプレイレイヤー) このディスプレイはHDRに対応していません このディスプレイは%1$sに対応していますが、HDR10には対応していません - このGPU 子プロセス制限がオンです 子プロセス制限が未設定です @@ -2481,7 +2460,6 @@ コピーしました。 SSBSを強制 Wineがオフにし続けるCPUの速度設定をオンに保ちます。Snapdragon 8 EliteではWindowsゲームが速くなることがあります。古いチップではほとんど変化がありません。次のゲーム起動時に反映されます。 - ストア Steam カスタム @@ -2964,7 +2942,6 @@ アイコンの色 ボタンの色 アイコンなし - サインインを確認中… ライブラリを取得中… ゲームリストを取得中… @@ -3999,10 +3976,8 @@ ラベルを表示 このレイアウトをインポートできませんでした %1$s からインストールします - 緋色の雪 白いサーフェスに赤のアクセント。 - サウンドトラック 音楽 再生オプション @@ -4079,7 +4054,9 @@ 表示中 %2$d 中 %1$d もう一度戻るを押すと終了します - 整数スケーリング - 収まる最大の整数倍率を使用します。元の画像が大きすぎる場合は、切り抜きを避けるため画像全体を収めます。解像度は別途設定します。 - + 画面に収まる最大の整数倍率を使用します。画面の端が切れる場合があります。元画像が出力より大きい場合、小数倍率で画像全体を表示します。解像度は別途設定します。 + 整数 + 画面に合わせる + アンチエイリアス + \ No newline at end of file diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index de071aeb46..be30c1a1df 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1,4 +1,4 @@ - + SteamVR 그래픽 중지됨 그래픽을 초기화하고 SteamVR을 다시 열기 위해 %1$d초 후 DroidDeck이 다시 시작됩니다. 실행 중인 게임은 종료되며, 저장하지 않은 진행 상황은 복구할 수 없습니다. @@ -357,7 +357,7 @@ 게임 종료 후 DroidDeck으로 돌아가기 DroidDeck 또는 다른 런처에서 실행한 게임을 닫으면 Steam이 정상적으로 종료되고(클라우드 저장 동기화를 먼저 완료) 실행한 곳으로 돌아갑니다. 끄면 Steam에 머무릅니다. 셰이더 사전 캐싱 - Steam이 게임용으로 미리 빌드된 셰이더를 다운로드해 백그라운드에서 처리하므로 게임 끊김이 줄어듭니다. 끄면 데이터, 저장 공간, 배터리를 절약하지만 게임이 플레이 중에 셰이더를 빌드합니다. Steam의 다운로드 > 셰이더 사전 캐싱과 같은 설정입니다. 다음 세션에 적용됩니다. + Steam이 게임용으로 미리 빌드된 셰이더를 다운로드해 백그라운드에서 처리하므로 게임 끊김이 줄어듭니다. 끄면 데이터, 저장 공간, 배터리를 절약하지만 게임이 플레이 중에 셰이더를 빌드합니다. Steam의 다운로드 > 셰이더 사전 캐싱과 같은 설정입니다. 다음 세션에 적용됩니다. Steam 클라이언트 복구 다음에 Steam을 시작할 때 Steam 클라이언트를 다시 다운로드합니다. Steam이 로딩 화면에서 넘어가지 않을 때 사용하세요. 게임, 로그인 정보 및 설정은 유지됩니다. 다음에 Steam을 시작할 때 Steam 클라이언트를 다시 다운로드합니다. @@ -708,7 +708,10 @@ 메가 바 위치 고정 - HUD를 드래그하여 이동하고, 길게 눌러 고정하거나 해제합니다. 고정된 동안에도 아래에 있는 화면 컨트롤은 계속 작동합니다. + HUD를 드래그하여 이동합니다. 고정된 동안에도 아래에 있는 화면 컨트롤은 계속 작동합니다. + 길게 누르기 + 접기 또는 펼치기 + 고정 또는 해제 양옆에 맞추기 HUD를 놓으면 화면에서 더 가까운 쪽으로 이동합니다. 튕기면 그 방향으로 이동합니다. 외관 @@ -1142,7 +1145,7 @@ Lab 빌드 사용 중지 다른 버전의 DroidDeck용으로 빌드되었습니다. 업데이트에 보관되어 있습니다. 이 빌드로 DroidDeck을 두 번 시작하지 못했습니다. - 에이전트 + Dev Harness 에이전트 에이전트가 작업 중입니다 에이전트를 사용하려면 Linux 사용자 영역에 Claude Code를 설치하세요. @@ -1309,6 +1312,7 @@ 수동으로 주소 입력 PC에서 ADB 사용: 명령 복사 + 헤드셋을 컴퓨터에 연결하고 SideQuest를 엽니다. “Run ADB Command”, “Custom Command”를 차례로 선택하고 아래에 표시된 명령을 입력한 뒤 “Run Command”를 선택하세요. Android 설정을 어느 화면에서 열지 선택하세요. 메인 화면 페어링됨. 무선 디버깅 포트를 찾는 중… @@ -1583,7 +1587,6 @@ 프론트엔드 게임 파일용 폴더 선택 게임 파일이 %1$s에 저장되었습니다 프론트엔드 파일 - 런타임 작업이 끝날 때까지 기다려 주세요 호환성 도구 설치가 끝날 때까지 기다려 주세요 호환성 도구 준비 중 @@ -1664,7 +1667,6 @@ Linux 런타임 제거 중 하단 화면에서 설정을 열 수 없어 메인 화면에서 열었습니다. 설정에서 개발자 옵션을 여세요 - Android의 \"출처를 알 수 없는 앱 설치\" 설정을 열 수 없습니다 확인할 수 없음: %1$s 이 빌드에는 이 DroidDeck 복사본용 다운로드가 없습니다 @@ -1674,12 +1676,10 @@ 확인 대기 중 업데이트 실패 Android에서 업데이트 설치를 진행하지 않았습니다 - Decky 설치 실패: %1$s 플러그인 가져오기 시작 중… 플러그인 가져오기 실패: %1$s 플러그인이 설치되었습니다. 불러오려면 Steam을 다시 시작하세요. - 아직 확인하지 않음 - 새로 고침을 탭하여 새 드라이버를 찾으세요 Android + Linux: 디스플레이 드라이버도 함께 설정 Android + Linux: 런타임 드라이버도 함께 설정 @@ -1729,7 +1729,6 @@ 확인 실패 %1$s 설치됨 - 두 목록 중 어디에서든 선택하면 두 드라이버가 모두 설정됩니다 %1$s 설치됨 - 메뉴에서 선택하세요 - 런타임 제거가 끝날 때까지 기다려 주세요 게임 터치패드 @@ -1773,7 +1772,6 @@ 로그에 \"Function not implemented\" 오류가 %1$d개 있습니다. 이 기기에서 proot의 seccomp 가속이 보조 프로세스를 실패시키고 있습니다. %2$s → \"%3$s\"(또는 \"%4$s\")를 시도한 후 다시 시작하세요. - 플러그인 다음 Steam 세션에 사용할 플러그인 ZIP을 설치합니다. 다운로드 중… @@ -2123,7 +2121,6 @@ Elite Dangerous 포트 %1$d에서 데이터를 받고 있지만(%3$d바이트 패킷 %2$d개), 이 페이지가 아직 읽을 수 없는 형식입니다. 다른 프로그램이 이미 포트 %1$s을(를) 사용하고 있어 해당 게임을 여기에 표시할 수 없습니다. - Linux 런타임 제거 중 Linux 런타임 제거 중 · 항목 %1$d개 @@ -2137,7 +2134,6 @@ Linux 런타임을 설치하거나 제거하는 동안 표시 Linux 런타임 설치 중 Linux 런타임 제거 중 - Linux 런타임이 설치되지 않았습니다 카탈로그에 %1$s의 체크섬이 없습니다 체크섬이 일치하지 않습니다. 변경된 내용은 없습니다 @@ -2145,7 +2141,6 @@ AppImage를 배치할 수 없습니다 압축 해제 실패 설치 실패 - Flatpak 설정 실패(종료 코드 %1$d) Flatpak 설정이 완료되지 않았습니다 다른 스토어 작업이 진행 중입니다 @@ -2164,7 +2159,6 @@ 미디어 코덱 %1$s 런타임 %1$s 런타임 %2$s - 파일이 너무 작아 AppImage가 아닙니다 파일을 읽을 수 없습니다: %1$s AppImage가 아닙니다(Linux 프로그램이 아님) @@ -2179,7 +2173,6 @@ %1$s 압축 해제 중 AppImage의 압축을 풀 수 없습니다 AppImage의 압축을 풀 수 없습니다: %1$s - Decky Loader를 설치하기 전에 실행 중인 세션을 중지하세요 Decky Loader 다운로드 실패 Decky Loader 크기가 릴리스 정보와 일치하지 않습니다 @@ -2228,13 +2221,11 @@ 가져온 플러그인을 활성화할 수 없습니다 Decky 플러그인 설정을 업데이트할 수 없습니다 기존 플러그인을 복원할 수 없습니다 - 무선 디버깅 ID를 저장할 수 없습니다 ADB 명령 실패(%1$d) Android에서 하위 프로세스 제한 변경을 확인하지 않았습니다: %1$s 저장된 무선 디버깅 페어링이 없습니다 현재 무선 디버깅의 IP 주소 및 포트를 입력하세요 - 페어링 팝업을 기다리는 시간이 초과되었습니다. DroidDeck에서 다시 시도하세요. 페어링 팝업을 찾을 수 없습니다(%1$d). Wi-Fi가 켜져 있는지 확인하세요. 페어링 팝업을 찾을 수 없습니다: %1$s @@ -2260,7 +2251,6 @@ Steam 준비 완료 탭하여 DroidDeck으로 돌아가세요. 이제 무선 디버깅을 꺼도 됩니다. 무선 디버깅 설정이 중단되었습니다 - 다운로드 실패 다운로드 크기가 배포된 APK와 일치하지 않아 삭제했습니다. 다시 시도하세요 다운로드한 파일이 체크섬과 일치하지 않아 삭제했습니다. 다시 시도하세요 @@ -2273,13 +2263,11 @@ 다운로드한 APK에 서명 정보가 없습니다 다운로드한 APK가 DroidDeck 릴리스 키로 서명되지 않았습니다 업데이트 카탈로그 응답: HTTP %1$d - 세션 시작 중… %1$d:%2$02d 경과 · 아직 진행 중 Steam 클라이언트 업데이트 다운로드 중 · %1$d%% Steam 클라이언트 업데이트 적용 중… Steam 클라이언트 다운로드 중 · %1$s - 호환성 도구를 이미 설치하고 있습니다 호환성 도구를 설치하기 전에 실행 중인 세션을 중지하세요 %1$s의 ARM64 릴리스를 찾을 수 없습니다 @@ -2299,7 +2287,6 @@ %1$s 설치 실패(종료 코드 %2$d) %1$s을(를) 설치할 수 없습니다 droiddeck-esync 팩 받는 중 - Linux 도우미 포함 DLL만 원본(마지막 교체 이후 Proton 업데이트됨) @@ -2322,13 +2309,11 @@ 다운로드 실패: 이 나이틀리 빌드가 더 새로운 빌드로 교체되었을 수 있습니다. 목록을 새로 고친 후 다시 시도하세요. 이 패키지 목록은 체크섬 도입 이전의 것입니다. 새로 고친 후 다시 시도하세요 체크섬 불일치 - 선형 최근접 Snapdragon GSR(품질) 샤프닝 전용 자동(스케일링에 맞춤) - 적용된 효과 없음. 게임 선명도 샤프닝에 약간의 대비를 더한 일상용 프리셋. @@ -2352,7 +2337,6 @@ 2D 및 고전 게임을 위한 또렷한 픽셀. 애니메 윤곽 툰 윤곽선과 샤프닝. - Adreno GPU가 아님 시스템 PowerVR 드라이버: 기기에 따라 호환성이 다릅니다 실험 기능: RADV 또는 시스템 Xclipse 드라이버 @@ -2377,7 +2361,6 @@ 지원되지 않음: 이 GPU에서 사용할 수 있는 호환 그래픽 백엔드가 없습니다 Mali 브리지를 거쳐 휴대전화 자체 Vulkan 드라이버에서 실행됩니다. Mali 브리지가 꺼져 있으면 지원되지 않습니다: Turnip에는 Adreno(스냅드래곤) GPU가 필요합니다. - GitHub 요청 한도에 도달했습니다. 나중에 다시 시도하세요 GitHub 응답: HTTP %1$d 다운로드 실패 @@ -2398,16 +2381,12 @@ 드라이버 번들이 아닙니다: android 및 linux 드라이버를 지정하는 manifest.json이 없습니다 드라이버 번들이 아닙니다: %1$s이(가) 번들 외부를 가리킵니다 드라이버 번들이 아닙니다: 압축을 풀면 %1$d MB를 초과합니다 - SD 카드 폴더 - 세션 로그 공유 - Android 10 이상 필요(색 공간을 지원하는 디스플레이 레이어) 이 디스플레이는 HDR을 지원하지 않습니다 이 디스플레이는 HDR10이 아닌 %1$s 형식을 지원합니다 - 이 GPU 하위 프로세스 제한 켜짐 하위 프로세스 제한 설정되지 않음 @@ -2481,7 +2460,6 @@ 복사했습니다. SSBS 강제 Wine이 계속 끄는 CPU 속도 설정을 켜 둡니다. Snapdragon 8 Elite에서 Windows 게임이 빨라질 수 있으며, 이전 칩에서는 변화가 거의 없습니다. 다음 게임 실행 시 적용됩니다. - 스토어 Steam 사용자 정의 @@ -2964,7 +2942,6 @@ 아이콘 색상 버튼 색상 아이콘 없음 - 로그인 확인 중… 라이브러리를 가져오는 중… 게임 목록을 가져오는 중… @@ -3999,10 +3976,8 @@ 라벨 표시 이 레이아웃을 가져올 수 없습니다 %1$s을(를) 통해 설치합니다 - 진홍빛 눈 빨간색 포인트가 있는 흰색 표면. - 사운드트랙 음악 재생 옵션 @@ -4079,7 +4054,9 @@ 표시됨 %2$d 중 %1$d 한 번 더 뒤로를 누르면 종료됩니다 - 정수 배율 조정 - 화면에 맞는 가장 큰 정수 배율을 사용합니다. 원본이 너무 크면 잘림을 방지하기 위해 전체 이미지를 맞춥니다. 해상도는 별도로 설정합니다. - + 화면에 맞는 가장 큰 정수 배율을 사용합니다. 화면 가장자리가 잘릴 수 있습니다. 원본이 출력보다 크면 소수 배율로 전체 이미지를 표시합니다. 해상도는 별도로 설정합니다. + 정수 + 화면에 맞춤 + 안티앨리어싱 + \ No newline at end of file diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 5ebec82c3a..28e6c4027c 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1,4 +1,4 @@ - + Grafik SteamVR terhenti DroidDeck akan dimulakan semula dalam %1$d saat untuk menetapkan semula grafik dan membuka SteamVR sekali lagi. Permainan yang sedang berjalan akan ditutup; kemajuan yang belum disimpan tidak dapat dipulihkan. @@ -357,7 +357,7 @@ Kembali ke DroidDeck selepas permainan 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. Pra-cache shader - 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. + 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. Baik pulih klien Steam Memuat turun semula klien Steam pada permulaan Steam seterusnya. Gunakan jika Steam tersekat pada skrin pemuatannya. Permainan, log masuk dan tetapan dikekalkan. Klien Steam akan dimuat turun semula pada permulaan Steam seterusnya. @@ -708,7 +708,10 @@ Mega Jalur Kunci di tempat - Seret HUD untuk mengalihkannya; tekan lama untuk mengunci atau membuka kuncinya. Semasa dikunci, kawalan skrin di bawahnya masih berfungsi. + Seret HUD untuk mengalihkannya. Semasa dikunci, kawalan skrin di bawahnya masih berfungsi. + Tekan lama + Kuncupkan atau kembangkan + Kunci atau buka kunci Lekap ke sisi Lepaskan HUD dan ia akan beralih ke sisi skrin yang lebih dekat. Kuis pantas melemparkannya ke arah itu. Rupa @@ -1142,7 +1145,7 @@ Binaan Lab dimatikan Ia dibina untuk versi DroidDeck yang lain. Ia disimpan dalam Kemas Kini. DroidDeck tidak dimulakan padanya dua kali - Ejen + Dev Harness Ejen Ejen sedang bekerja Pasang Claude Code dalam ruang pengguna Linux untuk menggunakan ejen. @@ -1309,6 +1312,7 @@ Masukkan alamat secara manual Daripada komputer dengan ADB: Salin arahan + Sambungkan set kepala ke komputer dan buka SideQuest. Pilih “Run ADB Command”, kemudian “Custom Command”, taip perintah yang dipaparkan di bawah dan pilih “Run Command”. Pilih paparan mana untuk membuka Tetapan Android. Skrin utama Digandingkan. Mencari port Debugging Wayarles… @@ -1583,7 +1587,6 @@ Pilih folder untuk fail permainan frontend Fail permainan disimpan ke %1$s Fail frontend - Tunggu operasi masa jalan selesai Tunggu pemasangan alat keserasian selesai Menyediakan alat keserasian @@ -1664,7 +1667,6 @@ Mengalih keluar masa jalan Linux Tidak dapat membuka Tetapan pada skrin bawah; dibuka pada skrin utama. Buka Pilihan pembangun dalam Tetapan - Tidak dapat membuka tetapan “Pasang apl tidak diketahui” Android Tidak dapat menyemak: %1$s Binaan ini tidak mempunyai muat turun untuk salinan DroidDeck ini @@ -1674,12 +1676,10 @@ Menunggu pengesahan anda Kemas kini gagal Android tidak menawarkan untuk memasang kemas kini - Pemasangan Decky gagal: %1$s Memulakan import pemalam… Import pemalam gagal: %1$s Pemalam dipasang. Mulakan semula Steam untuk memuatkannya. - Belum disemak - ketik segar semula untuk mencari pemacu baharu Android + Linux: menetapkan pemacu paparan sekali Android + Linux: menetapkan pemacu masa jalan sekali @@ -1729,7 +1729,6 @@ semakan gagal %1$s dipasang - pilih dalam mana-mana senarai untuk menetapkan kedua-dua pemacu %1$s dipasang - pilih dalam menu - Tunggu pengalihan keluar masa jalan selesai Permainan touchpad @@ -1773,7 +1772,6 @@ Log menunjukkan %1$d ralat “Function not implemented”: pecutan seccomp proot gagal pada pembantu di peranti ini. Cuba %2$s → “%3$s” (atau “%4$s”) dan mulakan semula. - Pemalam Pasang ZIP pemalam untuk sesi Steam seterusnya. Memuat turun… @@ -2123,7 +2121,6 @@ Elite Dangerous Port %1$d menerima data (%2$d paket bersaiz %3$d bait), tetapi dalam format yang belum dapat dibaca oleh halaman ini. Program lain sudah menggunakan port %1$s, jadi permainan itu tidak dapat dipaparkan di sini. - Mengalih keluar masa jalan Linux Mengalih keluar masa jalan Linux · %1$d entri @@ -2137,7 +2134,6 @@ Dipaparkan semasa masa jalan Linux dipasang atau dialih keluar Memasang masa jalan Linux Mengalih keluar masa jalan Linux - Masa jalan Linux belum dipasang Katalog tidak mempunyai checksum untuk %1$s Checksum tidak sepadan - tiada apa yang diubah @@ -2145,7 +2141,6 @@ Tidak dapat meletakkan AppImage Pengekstrakan gagal Pemasangan gagal - Persediaan Flatpak gagal (keluar %1$d) Persediaan Flatpak tidak selesai Tugas kedai lain sedang berjalan @@ -2164,7 +2159,6 @@ kodek media masa jalan %1$s masa jalan %1$s %2$s - Fail terlalu kecil untuk menjadi AppImage Fail tidak dapat dibaca: %1$s Ini bukan AppImage (ia bukan program Linux) @@ -2179,7 +2173,6 @@ Mengekstrak %1$s AppImage tidak dapat diekstrak AppImage tidak dapat diekstrak: %1$s - Hentikan sesi aktif sebelum memasang Decky Loader Muat turun Decky Loader gagal Saiz Decky Loader tidak sepadan dengan metadata keluaran @@ -2228,13 +2221,11 @@ Tidak dapat mengaktifkan pemalam yang diimport Tidak dapat mengemas kini tetapan pemalam Decky Tidak dapat memulihkan pemalam sedia ada - Tidak dapat menyimpan identiti Debugging Wayarles Arahan ADB gagal (%1$d) Android tidak mengesahkan had proses anak telah ditukar: %1$s Tiada gandingan Debugging Wayarles disimpan Masukkan alamat IP & Port Debugging Wayarles semasa - Masa tamat menunggu tetingkap timbul gandingan. Cuba lagi daripada DroidDeck. Tidak dapat mencari tetingkap timbul gandingan (%1$d). Semak Wi-Fi dihidupkan. Tidak dapat mencari tetingkap timbul gandingan: %1$s @@ -2260,7 +2251,6 @@ Steam sedia Ketik untuk kembali ke DroidDeck. Anda boleh matikan Debugging Wayarles sekarang. Persediaan Debugging Wayarles terhenti - Muat turun gagal Saiz muat turun tidak sepadan dengan APK yang diterbitkan dan telah dibuang - cuba lagi Muat turun tidak sepadan dengan checksumnya dan telah dibuang - cuba lagi @@ -2273,13 +2263,11 @@ APK yang dimuat turun tidak mempunyai maklumat tandatangan APK yang dimuat turun tidak ditandatangani dengan kunci keluaran DroidDeck Katalog kemas kini menjawab HTTP %1$d - Memulakan sesi… %1$d:%2$02d berlalu · masih berjalan Memuat turun kemas kini klien Steam · %1$d%% Memasang kemas kini klien Steam… Memuat turun klien Steam · %1$s - Pemasangan alat keserasian sudah berjalan Hentikan sesi aktif sebelum memasang alat keserasian Tidak dapat mencari keluaran ARM64 untuk %1$s @@ -2299,7 +2287,6 @@ Pemasangan %1$s gagal (keluar %2$d) Tidak dapat memasang %1$s Mengambil pek droiddeck-esync - dengan pembantu Linux DLL sahaja Asal (Proton dikemas kini sejak penukaran terakhir) @@ -2322,13 +2309,11 @@ Muat turun gagal: binaan nightly ini mungkin telah diganti dengan yang lebih baharu. Segarkan semula senarai dan cuba lagi. Senarai pakej ini mendahului checksum - segarkan dan cuba lagi Checksum tidak sepadan - Linear Terdekat Snapdragon GSR (kualiti) Ketajaman sahaja Auto (sepadan penskalaan) - Tiada yang digunakan. Kejelasan Permainan Ketajaman dengan sedikit kontras - yang harian. @@ -2352,7 +2337,6 @@ Piksel tajam untuk 2D dan tajuk lama. Tepi Anime Garis luar kartun tambah ketajaman. - Bukan GPU Adreno Pemandu sistem PowerVR: keserasian berbeza mengikut peranti Eksperimen: RADV atau pemandu sistem Xclipse @@ -2377,7 +2361,6 @@ Tidak disokong: tiada backend grafik yang serasi tersedia untuk GPU ini Berjalan melalui jambatan Mali, menggunakan pemandu Vulkan asal telefon Tidak disokong apabila jambatan Mali dimatikan: Turnip memerlukan GPU Adreno (Snapdragon) - Had kadar GitHub dicapai - cuba lagi kemudian GitHub menjawab HTTP %1$d Muat turun gagal @@ -2398,16 +2381,12 @@ Bukan gabungan pemacu: tiada manifest.json yang menamakan pemacu android dan linux Bukan gabungan pemacu: %1$s menunjuk ke luar darinya Bukan gabungan pemacu: ia mengembang lebih daripada %1$d MB - Kad SD Folder - Kongsi log sesi - memerlukan Android 10 atau lebih baharu (lapisan paparan dengan ruang warna) paparan ini melaporkan tiada sokongan HDR paparan ini menyokong %1$s, bukan HDR10 - GPU ini Had proses anak dihidupkan Had proses anak tidak ditetapkan @@ -2481,7 +2460,6 @@ Disalin. Paksa SSBS Mengekalkan tetapan kelajuan CPU yang sentiasa dimatikan oleh Wine. Boleh melajukan permainan Windows pada Snapdragon 8 Elite; sedikit perubahan dilihat pada cip lama. Berkuat kuasa pada pelancaran permainan seterusnya. - Kedai Steam Tersuai @@ -2964,7 +2942,6 @@ Warna ikon Warna butang Tiada ikon - Menyemak log masuk… Mengambil pustaka anda… Mengambil senarai permainan… @@ -3999,10 +3976,8 @@ Tunjukkan label Susun atur ini tidak dapat diimport Dipasang melalui %1$s - Salji Merah Skarlet Permukaan putih dengan aksen merah. - Runut bunyi Muzik Pilihan main balik @@ -4079,7 +4054,9 @@ Dipaparkan %1$d daripada %2$d Tekan kembali sekali lagi untuk keluar - Penskalaan integer - Menggunakan faktor skala integer terbesar yang muat. Jika sumber terlalu besar, keseluruhan imej disesuaikan untuk mengelakkan pemotongan. Resolusi ditetapkan secara berasingan. - + Menggunakan skala nombor bulat terbesar yang muat. Tepi skrin mungkin terpotong. Jika sumber lebih besar daripada output, penskalaan pecahan memaparkan keseluruhan imej. Resolusi ditetapkan secara berasingan. + Integer + Muat + Anti-aliasing + \ No newline at end of file diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f0ff8fa5d5..2195bf2092 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1,4 +1,4 @@ - + SteamVR-grafikken stoppet DroidDeck starter på nytt om %1$d sekunder for å tilbakestille grafikken og åpne SteamVR igjen. Spillet som kjører, lukkes, og ulagret fremdrift kan ikke gjenopprettes. @@ -357,7 +357,7 @@ Gå tilbake til DroidDeck etter et spill 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. Forhåndsbufring av shadere - 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. + 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. Reparer Steam-klienten Laster ned Steam-klienten igjen neste gang Steam starter. Bruk dette hvis Steam blir hengende på lasteskjermen. Spill, innlogging og innstillinger beholdes. Steam-klienten lastes ned igjen neste gang Steam starter. @@ -710,7 +710,10 @@ Mega Linje Lås på plass - 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. + Dra HUD-en for å flytte den. Mens den er låst, fungerer skjermkontrollene under den fortsatt. + Langt trykk + Skjul eller utvid + Lås eller lås opp Fest til sidene Slipp HUD-en, så flytter den seg til nærmeste side av skjermen. Et raskt sveip kaster den den veien. Utseende @@ -1145,7 +1148,7 @@ Lab-bygget er slått av Det ble bygget for en annen versjon av DroidDeck. Det ligger fortsatt i Oppdateringer. DroidDeck klarte ikke å starte med det to ganger - Agent + Dev Harness Agent Agenten jobber Installer Claude Code i Linux-brukermiljøet for å bruke agenten. @@ -1315,6 +1318,7 @@ Skriv inn adresse manuelt Fra en datamaskin med ADB: Kopier kommando + Koble headsettet til en datamaskin og åpne SideQuest. Velg «Run ADB Command», deretter «Custom Command», skriv inn kommandoen vist nedenfor og velg «Run Command». Velg hvilken skjerm Android-innstillinger skal åpnes på. Hovedskjerm Koblet sammen. Finner porten for trådløs feilsøking… @@ -1590,7 +1594,6 @@ Velg en mappe for frontend-spillfiler Spillfiler lagret i %1$s Frontend-filer - Vent til kjøretidsoperasjonen er ferdig Vent til installasjonen av kompatibilitetsverktøyet er ferdig Gjør kompatibilitetsverktøy klare @@ -1676,7 +1679,6 @@ Fjerner Linux-kjøretid Kunne ikke åpne Innstillinger på den nedre skjermen; åpnet den på hovedskjermen. Åpne Utvikleralternativer i Innstillinger - Kunne ikke åpne Androids innstilling «Installer ukjente apper» Kunne ikke sjekke: %1$s Denne builden har ingen nedlasting for denne kopien av DroidDeck @@ -1686,12 +1688,10 @@ Venter på at du bekrefter Oppdateringen mislyktes Android tilbød ikke å installere oppdateringen - Decky-installasjon mislyktes: %1$s Starter import av programtillegg… Import av programtillegg mislyktes: %1$s Programtillegg installert. Start Steam på nytt for å laste det. - Ikke sjekket ennå – trykk oppdater for å se etter nye drivere Android + Linux: setter skjermdriveren med den Android + Linux: setter kjøretidsdriveren med den @@ -1744,7 +1744,6 @@ sjekk mislyktes Installert %1$s – velg den i begge lister for å angi begge driverne Installert %1$s – velg den i menyen - Vent til fjerning av kjøretiden er ferdig Spill styreflate @@ -1790,7 +1789,6 @@ Loggen viser %1$d «Function not implemented»-feil: prootens seccomp-akselerasjon feiler en hjelper på denne enheten. Prøv %2$s → «%3$s» (eller «%4$s») og start på nytt. Loggen viser %1$d «Function not implemented»-feil: prootens seccomp-akselerasjon feiler en hjelper på denne enheten. Prøv %2$s → «%3$s» (eller «%4$s») og start på nytt. - Programtillegg Installer en programtillegg-ZIP for neste Steam-sesjon. Laster ned… @@ -2147,7 +2145,6 @@ Elite Dangerous Port %1$d mottar data (%2$d pakker på %3$d byte), men i et format denne siden ikke kan lese ennå. Et annet program bruker allerede port %1$s, så det spillet kan ikke vises her. - Fjerner Linux-kjøretid Fjerner Linux-kjøretid · %1$d oppføring @@ -2162,7 +2159,6 @@ Vises mens Linux-kjøretiden installeres eller fjernes Installerer Linux-kjøretiden Fjerner Linux-kjøretiden - Linux-kjøretiden er ikke installert Katalogen har ingen sjekksum for %1$s Sjekksum stemmer ikke – ingenting ble endret @@ -2170,7 +2166,6 @@ Kunne ikke plassere AppImage-filen Utpakking mislyktes Installasjon mislyktes - Flatpak-oppsett mislyktes (avslutningskode %1$d) Flatpak-oppsettet ble ikke fullført En annen butikkoppgave kjører @@ -2189,7 +2184,6 @@ mediekodeker %1$s-kjøretid %1$s-kjøretid %2$s - Filen er for liten til å være en AppImage Filen kan ikke leses: %1$s Dette er ikke en AppImage (det er ikke et Linux-program) @@ -2204,7 +2198,6 @@ Pakker ut %1$s AppImage-filen kunne ikke pakkes ut AppImage-filen kunne ikke pakkes ut: %1$s - Avslutt den aktive sesjonen før du installerer Decky Loader Nedlasting av Decky Loader mislyktes Decky Loader-størrelsen stemte ikke med utgivelsens metadata @@ -2253,13 +2246,11 @@ Kunne ikke aktivere det importerte programtillegget Kunne ikke oppdatere innstillingene for Decky-programtillegget Kunne ikke gjenopprette det eksisterende programtillegget - Kunne ikke lagre identiteten for trådløs feilsøking ADB-kommandoen mislyktes (%1$d) Android bekreftet ikke at grensen for underprosesser ble endret: %1$s Ingen kobling for trådløs feilsøking er lagret Skriv inn dagens IP-adresse og port for trådløs feilsøking - Tidsavbrudd ved venting på koblingsvarselet. Prøv igjen fra DroidDeck. Kunne ikke se etter koblingsvarselet (%1$d). Kontroller at Wi-Fi er på. Kunne ikke se etter koblingsvarselet: %1$s @@ -2285,7 +2276,6 @@ Steam er klar Trykk for å gå tilbake til DroidDeck. Du kan slå av trådløs feilsøking nå. Oppsettet for trådløs feilsøking stoppet - Nedlastingen mislyktes Nedlastingens størrelse stemte ikke med den publiserte APK-en og ble forkastet – prøv igjen Nedlastingen stemte ikke med sjekksummen og ble forkastet – prøv igjen @@ -2298,13 +2288,11 @@ Den nedlastede APK-en har ingen signeringsinformasjon Den nedlastede APK-en er ikke signert med DroidDecks utgivelsesnøkkel Oppdateringskatalogen svarte HTTP %1$d - Starter sesjonen… %1$d:%2$02d gått · fortsatt i gang Laster ned Steam-klientoppdateringen · %1$d%% Installerer Steam-klientoppdateringen… Laster ned Steam-klienten · %1$s - En installasjon av et kompatibilitetsverktøy kjører allerede Avslutt den aktive sesjonen før du installerer kompatibilitetsverktøy Fant ingen ARM64-utgivelse for %1$s @@ -2324,7 +2312,6 @@ Installasjonen av %1$s mislyktes (avslutningskode %2$d) Kunne ikke installere %1$s Henter droiddeck-esync-pakke - med Linux-hjelpere Bare DLL-er Original (Proton oppdatert siden siste bytte) @@ -2347,13 +2334,11 @@ Nedlastingen mislyktes: denne nightly-versjonen kan være erstattet av en nyere. Oppdater listen og prøv igjen. Denne pakkelisten er eldre enn sjekksummene – oppdater den og prøv igjen Sjekksummen stemmer ikke - Lineær Nærmeste Snapdragon GSR (kvalitet) Bare skarphet Auto (følger skalering) - Ingenting brukt. Spillklarhet Skarphet med et snev kontrast – den for hver dag. @@ -2377,7 +2362,6 @@ Skarpe piksler for 2D og gamle titler. Anime-kant Tegnefilm-konturer pluss skarphet. - Ikke en Adreno-GPU PowerVR-driver fra systemet: kompatibiliteten varierer med enheten Eksperimentelt: RADV eller Xclipse-driver fra systemet @@ -2402,7 +2386,6 @@ Støttes ikke: ingen kompatibel grafikkbackend er tilgjengelig for denne GPU-en Kjører via Mali-broen, på telefonens egen Vulkan-driver Støttes ikke når Mali-broen er av: Turnip krever en Adreno-GPU (Snapdragon) - GitHubs hastighetsgrense ble nådd – prøv igjen senere GitHub svarte HTTP %1$d Nedlastingen mislyktes @@ -2423,16 +2406,12 @@ Ikke en driverpakke: ingen manifest.json som nevner en android- og en linux-driver Ikke en driverpakke: %1$s peker utenfor den Ikke en driverpakke: den pakkes ut til mer enn %1$d MB - SD-kort Mappe - Del sesjonslogger - krever Android 10 eller nyere (skjermlag med et fargerom) denne skjermen rapporterer ingen HDR-støtte denne skjermen støtter %1$s, ikke HDR10 - denne GPU-en Grensen for underprosesser er på Grensen for underprosesser er ikke angitt @@ -2506,7 +2485,6 @@ Kopiert. Tvungen SSBS Holder en CPU-hastighetsinnstilling som Wine stadig slår av. Kan gjøre Windows-spill raskere på Snapdragon 8 Elite; lite endring sett på eldre brikker. Gjelder fra neste spilløkt. - Butikker Steam Egendefinert @@ -2992,7 +2970,6 @@ Ikonfarge Knappefarge Ikke noe ikon - Kontrollerer innlogging… Henter biblioteket ditt… Henter spilliste… @@ -4029,10 +4006,8 @@ Vis etikett Kunne ikke importere dette oppsettet Installeres via %1$s - Skarlagenssnø Hvite flater med røde aksenter. - Lydspor Musikk Avspillingsalternativer @@ -4109,7 +4084,9 @@ Vist %1$d av %2$d Trykk tilbake én gang til for å avslutte - Heltallsskalering - Bruker den største hele skaleringsfaktoren som får plass. Hvis kilden er for stor, tilpasses hele bildet for å unngå beskjæring. Oppløsningen stilles inn separat. - + Bruker den største heltallsskalaen som får plass. Kan beskjære skjermkantene. Hvis kilden er større enn utdataene, viser brøkbasert skalering hele bildet. Oppløsningen stilles inn separat. + Heltall + Tilpass + Kantutjevning + \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index cfd17efa7b..fa50b066ba 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1,4 +1,4 @@ - + Grafische weergave van SteamVR gestopt DroidDeck start over %1$d seconden opnieuw om de grafische weergave te resetten en SteamVR weer te openen. Je game wordt gesloten; niet-opgeslagen voortgang kan niet worden hersteld. @@ -357,7 +357,7 @@ Na een game terug naar DroidDeck 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. Shaders vooraf cachen - 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. + 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. Steam-client repareren 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. De Steam-client wordt opnieuw gedownload bij de volgende start van Steam. @@ -710,7 +710,10 @@ Mega Balk Vastzetten - Sleep de HUD om hem te verplaatsen; lang drukken zet hem vast of los. Zolang hij vastzit, blijven de schermknoppen eronder werken. + Sleep de HUD om hem te verplaatsen. Zolang hij vastzit, blijven de schermknoppen eronder werken. + Lang drukken + Samenvouwen of uitklappen + Vastzetten of losmaken Vastklikken aan zijkanten Laat de HUD los en hij gaat naar de dichtstbijzijnde kant van het scherm. Met een snelle veeg gooi je hem die kant op. Weergave @@ -1145,7 +1148,7 @@ Lab-build uitgeschakeld Deze build is gebouwd voor een andere versie van DroidDeck. Hij wordt bewaard in Updates. DroidDeck is er twee keer niet mee opgestart. - Agent + Dev Harness Agent De agent is aan het werk Installeer Claude Code in de Linux-gebruikersomgeving om de agent te gebruiken. @@ -1315,6 +1318,7 @@ Adres handmatig invoeren Vanaf een computer met ADB: Opdracht kopiëren + Sluit de headset aan op een computer en open SideQuest. Kies ‘Run ADB Command’ en dan ‘Custom Command’, typ de hieronder getoonde opdracht en selecteer ‘Run Command’. Kies op welk scherm Android-instellingen wordt geopend. Hoofdscherm Gekoppeld. Poort van Draadloos debuggen zoeken… @@ -1590,7 +1594,6 @@ Kies een map voor frontend-gamebestanden Gamebestanden opgeslagen in %1$s Frontend-bestanden - Wacht tot de runtime-bewerking klaar is Wacht tot de installatie van de compatibiliteitstool klaar is Compatibiliteitstools voorbereiden @@ -1676,7 +1679,6 @@ Linux-runtime verwijderen Kan Instellingen niet openen op het onderste scherm; geopend op het hoofdscherm. Open Ontwikkelaarsopties in Instellingen - Kan de Android-instelling “Onbekende apps installeren” niet openen Kan niet controleren: %1$s Deze build heeft geen download voor deze versie van DroidDeck @@ -1686,12 +1688,10 @@ Wachten op je bevestiging De update is mislukt Android heeft niet aangeboden om de update te installeren - Installatie van Decky mislukt: %1$s Plug-in importeren… Importeren van plug-in mislukt: %1$s Plug-in geïnstalleerd. Start Steam opnieuw om hem te laden. - Nog niet gecontroleerd - tik op vernieuwen om nieuwe drivers te zoeken Android + Linux: stelt ook de weergavedriver in Android + Linux: stelt ook de runtimedriver in @@ -1744,7 +1744,6 @@ controle mislukt %1$s geïnstalleerd - kies hem in een van beide lijsten om beide drivers in te stellen %1$s geïnstalleerd - kies hem in het menu - Wacht tot de runtime is verwijderd Game touchpad @@ -1790,7 +1789,6 @@ Het log toont %1$d fout “Function not implemented”: de seccomp-versnelling van proot laat op dit apparaat een hulpprogramma falen. Probeer %2$s → “%3$s” (of “%4$s”) en start opnieuw. Het log toont %1$d fouten “Function not implemented”: de seccomp-versnelling van proot laat op dit apparaat een hulpprogramma falen. Probeer %2$s → “%3$s” (of “%4$s”) en start opnieuw. - Plug-ins Installeer een plug-in-ZIP voor de volgende Steam-sessie. Downloaden… @@ -2147,7 +2145,6 @@ Elite Dangerous Poort %1$d ontvangt gegevens (%2$d pakketten van %3$d bytes), maar in een formaat dat deze pagina nog niet kan lezen. Een ander programma gebruikt poort %1$s al, dus die game kan hier niet worden getoond. - Linux-runtime verwijderen Linux-runtime verwijderen · %1$d item @@ -2162,7 +2159,6 @@ Verschijnt tijdens het installeren of verwijderen van de Linux-runtime Linux-runtime installeren Linux-runtime verwijderen - De Linux-runtime is niet geïnstalleerd De catalogus heeft geen checksum voor %1$s Checksum komt niet overeen - er is niets gewijzigd @@ -2170,7 +2166,6 @@ Kan de AppImage niet plaatsen Uitpakken mislukt Installatie mislukt - Flatpak instellen mislukt (exitcode %1$d) Flatpak instellen is niet voltooid Er loopt al een andere winkeltaak @@ -2189,7 +2184,6 @@ mediacodecs %1$s-runtime %1$s-runtime %2$s - Het bestand is te klein voor een AppImage Het bestand kan niet worden gelezen: %1$s Dit is geen AppImage (het is geen Linux-programma) @@ -2204,7 +2198,6 @@ %1$s uitpakken De AppImage kan niet worden uitgepakt De AppImage kan niet worden uitgepakt: %1$s - Stop de actieve sessie voordat je Decky Loader installeert Downloaden van Decky Loader mislukt De grootte van Decky Loader kwam niet overeen met de metadata van de release @@ -2253,13 +2246,11 @@ Kan de geïmporteerde plug-in niet activeren Kan de instellingen van de Decky-plug-in niet bijwerken Kan de bestaande plug-in niet herstellen - Kan de identiteit voor draadloze foutopsporing niet opslaan ADB-opdracht mislukt (%1$d) Android heeft niet bevestigd dat de limiet voor onderliggende processen is gewijzigd: %1$s Er is geen koppeling voor draadloze foutopsporing opgeslagen Voer het huidige IP-adres en de poort voor draadloze foutopsporing in - Wachten op de pop-up met de koppelcode duurde te lang. Probeer het opnieuw vanuit DroidDeck. Kan niet naar de pop-up met de koppelcode zoeken (%1$d). Controleer of wifi aan staat. Kan niet naar de pop-up met de koppelcode zoeken: %1$s @@ -2285,7 +2276,6 @@ Steam is klaar Tik om terug te gaan naar DroidDeck. Je kunt draadloze foutopsporing nu uitschakelen. Instellen van draadloze foutopsporing gestopt - Downloaden mislukt De downloadgrootte kwam niet overeen met de gepubliceerde APK en is verwijderd - probeer het opnieuw De download kwam niet overeen met de checksum en is verwijderd - probeer het opnieuw @@ -2298,13 +2288,11 @@ De gedownloade APK heeft geen ondertekeningsinformatie De gedownloade APK is niet ondertekend met de release-sleutel van DroidDeck De updatecatalogus antwoordde met HTTP %1$d - Sessie wordt gestart… %1$d:%2$02d verstreken · nog bezig Update van de Steam-client downloaden · %1$d%% Update van de Steam-client toepassen… Steam-client downloaden · %1$s - Er wordt al een compatibiliteitstool geïnstalleerd Stop de actieve sessie voordat je compatibiliteitstools installeert Kan geen ARM64-release vinden voor %1$s @@ -2324,7 +2312,6 @@ Installeren van %1$s is mislukt (afsluitcode %2$d) Kan %1$s niet installeren Pakket droiddeck-esync ophalen - met Linux-hulpprogramma’s Alleen DLL’s Origineel (Proton bijgewerkt sinds de laatste wissel) @@ -2347,13 +2334,11 @@ Download mislukt: deze nightly is mogelijk vervangen door een nieuwere build. Vernieuw de lijst en probeer het opnieuw. Deze pakketlijst is ouder dan de checksums - vernieuw de lijst en probeer het opnieuw Checksum komt niet overeen - Lineair Dichtstbijzijnde Snapdragon GSR (kwaliteit) Alleen verscherpen Automatisch (volgt de schaling) - Niets toegepast. Game-helderheid Verscherpen met een vleugje contrast - de dagelijkse optie. @@ -2377,7 +2362,6 @@ Scherpe pixels voor 2D- en oudere games. Anime-lijnen Contourlijnen plus verscherping. - Geen Adreno-GPU PowerVR-systeemdriver: de compatibiliteit verschilt per apparaat Experimenteel: RADV of de Xclipse-systeemdriver @@ -2402,7 +2386,6 @@ Niet ondersteund: er is geen compatibele grafische backend beschikbaar voor deze GPU Loopt via de Mali-brug, op de eigen Vulkan-driver van het toestel Niet ondersteund met de Mali-brug uitgeschakeld: Turnip heeft een Adreno (Snapdragon)-GPU nodig - De ratelimiet van GitHub is bereikt - probeer het later opnieuw GitHub antwoordde met HTTP %1$d Downloaden mislukt @@ -2423,16 +2406,12 @@ Geen driverbundel: geen manifest.json dat een android- en een linux-driver noemt Geen driverbundel: %1$s wijst buiten de bundel Geen driverbundel: na uitpakken is dit groter dan %1$d MB - SD-kaart Map - Sessielogs delen - vereist Android 10 of nieuwer (schermlagen met een kleurruimte) dit scherm geeft geen ondersteuning voor HDR aan dit scherm ondersteunt %1$s, niet HDR10 - deze GPU Limiet voor onderliggende processen staat aan Limiet voor onderliggende processen is niet ingesteld @@ -2506,7 +2485,6 @@ Gekopieerd. SSBS forceren Houdt een CPU-snelheidsinstelling aan die Wine steeds uitschakelt. Kan Windows-games sneller maken op Snapdragon 8 Elite; op oudere chips is weinig verschil te zien. Geldt bij de volgende gamestart. - Winkels Steam Aangepast @@ -2992,7 +2970,6 @@ Pictogramkleur Knopkleur Geen pictogram - Aanmelding controleren… Je bibliotheek ophalen… Gamelijst ophalen… @@ -4029,10 +4006,8 @@ Label tonen Deze indeling kan niet worden geïmporteerd Wordt geïnstalleerd via %1$s - Scharlakenrode sneeuw Witte oppervlakken met rode accenten. - Soundtracks Muziek Afspeelopties @@ -4109,7 +4084,9 @@ Getoond %1$d van %2$d Druk nog één keer op terug om af te sluiten - Gehele-getallenschaal - Gebruikt de grootste gehele schaalfactor die past. Als de bron te groot is, wordt de volledige afbeelding passend gemaakt om bijsnijden te voorkomen. De resolutie wordt apart ingesteld. - + Gebruikt de grootste passende gehele schaalfactor. Schermranden kunnen worden afgesneden. Als de bron groter is dan de uitvoer, toont fractionele schaling de volledige afbeelding. De resolutie wordt apart ingesteld. + Geheel getal + Passend + Anti-aliasing + \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index e8e5c335e9..08ca3aef85 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,4 +1,4 @@ - + Grafika SteamVR przestała działać DroidDeck uruchomi się ponownie za %1$d s, aby zresetować grafikę i ponownie otworzyć SteamVR. Uruchomiona gra zostanie zamknięta; niezapisanego postępu nie da się przywrócić. @@ -357,7 +357,7 @@ Wracaj do DroidDeck po grze 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. Wstępne buforowanie shaderów - 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. + 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. Napraw klienta Steam Pobiera klienta Steam ponownie przy następnym uruchomieniu Steam. Użyj, jeśli Steam utknie na ekranie wczytywania. Gry, logowanie i ustawienia zostaną zachowane. Klient Steam zostanie pobrany ponownie przy następnym uruchomieniu Steam. @@ -714,7 +714,10 @@ Mega Pasek Zablokuj w miejscu - 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. + Przeciągnij HUD, aby go przesunąć. Gdy jest zablokowany, sterowanie ekranowe pod nim nadal działa. + Długie naciśnięcie + Zwiń lub rozwiń + Zablokuj lub odblokuj Przyciągaj do boków Puść HUD, a przesunie się do bliższego boku ekranu. Szybki ruch rzuca go w tę stronę. Wygląd @@ -1151,7 +1154,7 @@ Kompilacja Lab wyłączona Została zbudowana dla innej wersji DroidDeck. Znajduje się w Aktualizacjach. DroidDeck dwukrotnie nie uruchomił się na niej. - Agent + Dev Harness Agent Agent pracuje Zainstaluj Claude Code w przestrzeni użytkownika Linux, aby korzystać z agenta. @@ -1329,6 +1332,7 @@ Wpisz adres ręcznie Z komputera z ADB: Kopiuj polecenie + Podłącz gogle do komputera i otwórz SideQuest. Wybierz „Run ADB Command”, potem „Custom Command”, wpisz polecenie widoczne poniżej i wybierz „Run Command”. Wybierz, na którym ekranie otworzyć Ustawienia Androida. Ekran główny Sparowano. Wyszukiwanie portu debugowania bezprzewodowego… @@ -1606,7 +1610,6 @@ Wybierz folder na pliki gier dla frontendów Pliki gier zapisano w %1$s Pliki frontendów - Poczekaj na zakończenie operacji na środowisku Poczekaj na zakończenie instalacji narzędzia zgodności Przygotowywanie narzędzi zgodności @@ -1702,7 +1705,6 @@ Usuwanie środowiska Linux Nie udało się otworzyć Ustawień na dolnym ekranie; otwarto je na ekranie podstawowym. Otwórz Opcje programisty w Ustawieniach - Nie udało się otworzyć ustawienia systemu Android „Instalowanie nieznanych aplikacji” Nie udało się sprawdzić: %1$s Ta wersja nie ma pliku do pobrania dla tej kopii DroidDeck @@ -1712,12 +1714,10 @@ Oczekiwanie na Twoje potwierdzenie Aktualizacja nie powiodła się Android nie zaproponował instalacji aktualizacji - Instalacja Decky nie powiodła się: %1$s Rozpoczynanie importu wtyczki… Import wtyczki nie powiódł się: %1$s Zainstalowano wtyczkę. Uruchom ponownie Steam, aby ją wczytać. - Jeszcze nie sprawdzono – dotknij odświeżania, aby poszukać nowych sterowników Android + Linux: ustawia też sterownik wyświetlania Android + Linux: ustawia też sterownik środowiska @@ -1776,7 +1776,6 @@ błąd sprawdzania Zainstalowano %1$s – wybierz go na dowolnej liście, aby ustawić oba sterowniki Zainstalowano %1$s – wybierz go w menu - Poczekaj na zakończenie usuwania środowiska Gra touchpad @@ -1826,7 +1825,6 @@ Log zawiera %1$d błędów „Function not implemented”: przyspieszenie seccomp w proot zawodzi przy procesie pomocniczym na tym urządzeniu. Wybierz %2$s → „%3$s” (lub „%4$s”) i uruchom ponownie. Log zawiera %1$d błędu „Function not implemented”: przyspieszenie seccomp w proot zawodzi przy procesie pomocniczym na tym urządzeniu. Wybierz %2$s → „%3$s” (lub „%4$s”) i uruchom ponownie. - Wtyczki Zainstaluj wtyczkę z pliku ZIP na następną sesję Steam. Pobieranie… @@ -2197,7 +2195,6 @@ Elite Dangerous Port %1$d odbiera dane (%2$d pakietów po %3$d bajtów), ale w formacie, którego ta strona jeszcze nie odczytuje. Port %1$s jest już używany przez inny program, więc tej gry nie da się tu pokazać. - Usuwanie środowiska Linux Usuwanie środowiska Linux · %1$d wpis @@ -2214,7 +2211,6 @@ Wyświetlane podczas instalowania lub usuwania środowiska Linux Instalowanie środowiska Linux Usuwanie środowiska Linux - Środowisko Linux nie jest zainstalowane Katalog nie zawiera sumy kontrolnej dla %1$s Niezgodna suma kontrolna – niczego nie zmieniono @@ -2222,7 +2218,6 @@ Nie udało się umieścić pliku AppImage Wypakowywanie nie powiodło się Instalacja nie powiodła się - Konfiguracja Flatpak nie powiodła się (kod %1$d) Konfiguracja Flatpak nie została ukończona Trwa inne zadanie sklepu @@ -2241,7 +2236,6 @@ kodeków multimedialnych środowiska %1$s środowiska %1$s %2$s - Plik jest za mały jak na AppImage Nie można odczytać pliku: %1$s To nie jest AppImage (to nie jest program dla systemu Linux) @@ -2256,7 +2250,6 @@ Wypakowywanie %1$s Nie udało się wypakować AppImage Nie udało się wypakować AppImage: %1$s - Zatrzymaj aktywną sesję przed instalacją Decky Loader Pobieranie Decky Loader nie powiodło się Rozmiar Decky Loader nie zgadza się z metadanymi wydania @@ -2305,13 +2298,11 @@ Nie udało się aktywować zaimportowanej wtyczki Nie udało się zaktualizować ustawień wtyczek Decky Nie udało się przywrócić istniejącej wtyczki - Nie udało się zapisać tożsamości debugowania bezprzewodowego Polecenie ADB nie powiodło się (%1$d) Android nie potwierdził zmiany limitu procesów podrzędnych: %1$s Brak zapisanego parowania debugowania bezprzewodowego Wpisz bieżący adres IP i port z ekranu Debugowanie bezprzewodowe - Upłynął limit czasu oczekiwania na okienko parowania. Spróbuj ponownie z poziomu DroidDeck. Nie udało się wyszukać okienka parowania (%1$d). Sprawdź, czy Wi-Fi jest włączone. Nie udało się wyszukać okienka parowania: %1$s @@ -2337,7 +2328,6 @@ Steam jest gotowy Dotknij, aby wrócić do DroidDeck. Możesz już wyłączyć debugowanie bezprzewodowe. Konfiguracja debugowania bezprzewodowego została przerwana - Pobieranie nie powiodło się Rozmiar pobranego pliku nie zgadzał się z opublikowanym APK, więc go odrzucono – spróbuj ponownie Pobrany plik nie zgadzał się z sumą kontrolną, więc go odrzucono – spróbuj ponownie @@ -2350,13 +2340,11 @@ Pobrany APK nie zawiera informacji o podpisie Pobrany APK nie jest podpisany kluczem wydań DroidDeck Katalog aktualizacji odpowiedział HTTP %1$d - Uruchamianie sesji… Minęło %1$d:%2$02d · nadal trwa Pobieranie aktualizacji klienta Steam · %1$d%% Instalowanie aktualizacji klienta Steam… Pobieranie klienta Steam · %1$s - Instalacja narzędzia zgodności już trwa Zatrzymaj aktywną sesję przed instalacją narzędzi zgodności Nie znaleziono wydania ARM64 dla %1$s @@ -2376,7 +2364,6 @@ Instalacja %1$s nie powiodła się (kod %2$d) Nie udało się zainstalować %1$s Pobieranie pakietu droiddeck-esync - z modułami pomocniczymi Linux tylko biblioteki DLL Oryginał (Proton zaktualizowany od ostatniej zamiany) @@ -2399,13 +2386,11 @@ Pobieranie nie powiodło się: ta wersja nightly mogła zostać zastąpiona nowszą. Odśwież listę i spróbuj ponownie. Ta lista pakietów jest starsza niż sumy kontrolne – odśwież ją i spróbuj ponownie Niezgodna suma kontrolna - Liniowy Najbliższy sąsiad Snapdragon GSR (jakość) Tylko wyostrzanie Auto (zgodnie ze skalowaniem) - Bez efektów. Wyrazistość Wyostrzenie z odrobiną kontrastu – na co dzień. @@ -2429,7 +2414,6 @@ Ostre piksele dla gier 2D i starych tytułów. Krawędzie anime Kreskówkowe kontury i wyostrzenie. - To nie jest GPU Adreno Systemowy sterownik PowerVR: kompatybilność zależy od urządzenia Eksperymentalne: RADV lub systemowy sterownik Xclipse @@ -2454,7 +2438,6 @@ Nieobsługiwany: brak zgodnego zaplecza graficznego dla tego GPU Działa przez mostek Mali, na własnym sterowniku Vulkan telefonu Nieobsługiwane przy wyłączonym moście Mali: Turnip wymaga GPU Adreno (Snapdragon) - Osiągnięto limit zapytań GitHub – spróbuj ponownie później GitHub odpowiedział HTTP %1$d Pobieranie nie powiodło się @@ -2475,16 +2458,12 @@ To nie jest pakiet sterowników: brak manifest.json wskazującego sterownik Android i Linux To nie jest pakiet sterowników: %1$s wskazuje poza niego To nie jest pakiet sterowników: po rozpakowaniu przekracza %1$d MB - Karta SD Folder - Udostępnij logi sesji - wymaga systemu Android 10 lub nowszego (warstwy wyświetlania z przestrzenią barw) ten wyświetlacz nie zgłasza obsługi HDR ten wyświetlacz obsługuje %1$s, ale nie HDR10 - ten GPU Limit procesów podrzędnych jest włączony Limit procesów podrzędnych nie jest ustawiony @@ -2558,7 +2537,6 @@ Skopiowano. Wymuś SSBS Utrzymuje ustawienie szybkości CPU, które Wine wciąż wyłącza. Może przyspieszyć gry Windows na Snapdragon 8 Elite; na starszych chipsetach niewielka różnica. Działa od następnego uruchomienia gry. - Sklepy Steam Własna @@ -3050,7 +3028,6 @@ Kolor ikony Kolor przycisku Brak ikony - Sprawdzanie logowania… Pobieranie biblioteki… Pobieranie listy gier… @@ -4109,10 +4086,8 @@ Pokaż etykietę Nie można zaimportować tego układu Instalacja przez %1$s - Szkarłatny śnieg Białe powierzchnie z czerwonymi akcentami. - Ścieżki dźwiękowe Muzyka Opcje odtwarzania @@ -4189,7 +4164,9 @@ Pokazane %1$d z %2$d Naciśnij wstecz jeszcze raz, aby wyjść - Skalowanie całkowite - Używa największego całkowitego współczynnika skalowania, który się mieści. Jeśli źródło jest zbyt duże, dopasowuje cały obraz, aby uniknąć przycinania. Rozdzielczość ustawia się osobno. - + Używa największej całkowitej skali, która się mieści. Krawędzie ekranu mogą zostać przycięte. Jeśli źródło jest większe niż wynik, skalowanie ułamkowe wyświetla cały obraz. Rozdzielczość ustawia się osobno. + Liczba całkowita + Dopasuj + Wygładzanie krawędzi + \ No newline at end of file diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ab4d2b72ca..ecbfd10091 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1,4 +1,4 @@ - + Os gráficos do SteamVR pararam O DroidDeck vai reiniciar dentro de %1$d segundos para repor os gráficos e reabrir o SteamVR. O jogo em execução será fechado; o progresso não guardado não pode ser recuperado. @@ -357,7 +357,7 @@ Voltar ao DroidDeck após um jogo 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. Pré-cache de shaders - 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. + 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. Reparar cliente Steam 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. O cliente Steam será transferido novamente na próxima vez que o Steam iniciar. @@ -712,7 +712,10 @@ Mega Barra Bloquear posição - 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. + Arraste o HUD para o mover. Enquanto estiver bloqueado, os controlos no ecrã por baixo dele continuam a funcionar. + Toque longo + Recolher ou expandir + Bloquear ou desbloquear Encaixar nas laterais Solte o HUD e ele vai para a lateral mais próxima do ecrã. Um gesto rápido lança-o nessa direção. Aspeto @@ -1140,7 +1143,7 @@ Compilação Lab desativada Foi compilada para outra versão do DroidDeck. Está guardada em Atualizações. O DroidDeck não arrancou com ela duas vezes - Agente + Dev Harness Agente O agente está a trabalhar Instale o Claude Code no espaço de utilizador do Linux para usar o agente. @@ -1313,6 +1316,7 @@ Introduzir endereço manualmente A partir de um computador com ADB: Copiar comando + Ligue os óculos a um computador e abra o SideQuest. Escolha “Run ADB Command”, depois “Custom Command”, escreva o comando apresentado abaixo e selecione “Run Command”. Escolha em que ecrã abrir as Definições do Android. Ecrã principal Sincronizado. A procurar a porta da Depuração sem fios… @@ -1589,7 +1593,6 @@ Escolha uma pasta para os ficheiros de jogos do frontend Ficheiros de jogos guardados em %1$s Ficheiros para frontends - Aguarde que a operação do runtime termine Aguarde que a instalação da ferramenta de compatibilidade termine A preparar as ferramentas de compatibilidade @@ -1680,7 +1683,6 @@ A remover o runtime Linux Não foi possível abrir as Definições no ecrã inferior; foram abertas no ecrã principal. Abra as Opções de programador nas Definições - Não foi possível abrir a definição «Instalar apps desconhecidas» do Android Não foi possível verificar: %1$s Esta versão não tem transferência para esta cópia do DroidDeck @@ -1690,12 +1692,10 @@ A aguardar a sua confirmação A atualização falhou O Android não ofereceu a instalação da atualização - Falha na instalação do Decky: %1$s A iniciar a importação do plugin… Falha na importação do plugin: %1$s Plugin instalado. Reinicie o Steam para o carregar. - Ainda não verificado - toque em atualizar para procurar novos controladores Android + Linux: define também o controlador de ecrã Android + Linux: define também o controlador do runtime @@ -1751,7 +1751,6 @@ falha na verificação %1$s instalado - escolha-o em qualquer das listas para definir ambos os controladores %1$s instalado - escolha-o no menu - Aguarde que a remoção do runtime termine Jogo painel tátil @@ -1799,7 +1798,6 @@ O registo mostra %1$d erros «Function not implemented»: a aceleração seccomp do proot está a fazer falhar um processo auxiliar neste dispositivo. Experimente %2$s → «%3$s» (ou «%4$s») e inicie novamente. O registo mostra %1$d erros «Function not implemented»: a aceleração seccomp do proot está a fazer falhar um processo auxiliar neste dispositivo. Experimente %2$s → «%3$s» (ou «%4$s») e inicie novamente. - Plugins Instale um ZIP de plugin para a próxima sessão do Steam. A transferir… @@ -2163,7 +2161,6 @@ Elite Dangerous 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. Outro programa já utiliza a porta %1$s, por isso esse jogo não pode aparecer aqui. - A remover o runtime Linux A remover o runtime Linux · %1$d entrada @@ -2179,7 +2176,6 @@ Aparece enquanto o runtime Linux é instalado ou removido A instalar o runtime Linux A remover o runtime Linux - O runtime Linux não está instalado O catálogo não tem soma de verificação para %1$s A soma de verificação não corresponde - nada foi alterado @@ -2187,7 +2183,6 @@ Não foi possível colocar a AppImage Falha na extração Falha na instalação - Falha na configuração do Flatpak (saída %1$d) A configuração do Flatpak não terminou Está em curso outra tarefa da loja @@ -2206,7 +2201,6 @@ codecs multimédia runtime %1$s runtime %1$s %2$s - O ficheiro é demasiado pequeno para ser uma AppImage Não é possível ler o ficheiro: %1$s Isto não é uma AppImage (não é um programa Linux) @@ -2221,7 +2215,6 @@ A extrair %1$s Não foi possível extrair a AppImage Não foi possível extrair a AppImage: %1$s - Pare a sessão ativa antes de instalar o Decky Loader Falha na transferência do Decky Loader O tamanho do Decky Loader não corresponde aos metadados da versão @@ -2270,13 +2263,11 @@ Não foi possível ativar o plugin importado Não foi possível atualizar as definições de plugins do Decky Não foi possível restaurar o plugin existente - Não foi possível guardar a identidade da depuração sem fios O comando ADB falhou (%1$d) O Android não confirmou a alteração do limite de processos secundários: %1$s Não há nenhuma sincronização de depuração sem fios guardada Introduza o endereço IP e a porta atuais da depuração sem fios - Tempo esgotado à espera da janela de sincronização. Tente novamente a partir do DroidDeck. Não foi possível procurar a janela de sincronização (%1$d). Verifique se o Wi-Fi está ativado. Não foi possível procurar a janela de sincronização: %1$s @@ -2302,7 +2293,6 @@ O Steam está pronto Toque para voltar ao DroidDeck. Já pode desativar a depuração sem fios. A configuração da depuração sem fios parou - A transferência falhou O tamanho da transferência não correspondia ao APK publicado e foi descartada - tente novamente A transferência não correspondia à soma de verificação e foi descartada - tente novamente @@ -2315,13 +2305,11 @@ O APK transferido não tem informações de assinatura O APK transferido não está assinado com a chave de lançamento do DroidDeck O catálogo de atualizações respondeu HTTP %1$d - A iniciar a sessão… %1$d:%2$02d decorridos · ainda a trabalhar A transferir a atualização do cliente Steam · %1$d%% A aplicar a atualização do cliente Steam… A transferir o cliente Steam · %1$s - Já está em curso a instalação de uma ferramenta de compatibilidade Pare a sessão ativa antes de instalar ferramentas de compatibilidade Não foi possível encontrar uma versão ARM64 de %1$s @@ -2341,7 +2329,6 @@ Falha na instalação de %1$s (saída %2$d) Não foi possível instalar %1$s A obter o pacote droiddeck-esync - com auxiliares Linux Só DLLs Original (Proton atualizado desde a última troca) @@ -2364,13 +2351,11 @@ A transferência falhou: esta versão nightly pode ter sido substituída por uma mais recente. Atualize a lista e tente novamente. Esta lista de pacotes é anterior às somas de verificação - atualize-a e tente novamente A soma de verificação não corresponde - Linear Mais próximo Snapdragon GSR (qualidade) Só nitidez Automático (acompanha a escala) - Nada aplicado. Clareza de jogo Nitidez com um toque de contraste - a do dia a dia. @@ -2394,7 +2379,6 @@ Píxeis nítidos para 2D e jogos antigos. Contornos anime Contornos de desenho animado mais nitidez. - Não é uma GPU Adreno Controlador PowerVR do sistema: a compatibilidade varia consoante o dispositivo Experimental: RADV ou o controlador Xclipse do sistema @@ -2419,7 +2403,6 @@ Não suportada: não está disponível um backend gráfico compatível para esta GPU Corre através da ponte Mali, com o controlador Vulkan do próprio telemóvel Não suportado com a ponte Mali desativada: o Turnip precisa de uma GPU Adreno (Snapdragon) - Foi atingido o limite de pedidos do GitHub - tente novamente mais tarde O GitHub respondeu HTTP %1$d A transferência falhou @@ -2440,16 +2423,12 @@ Não é um pacote de controladores: não há manifest.json que indique um controlador Android e um Linux Não é um pacote de controladores: %1$s aponta para fora dele Não é um pacote de controladores: descompactado ocupa mais de %1$d MB - Cartão SD Pasta - Partilhar registos da sessão - requer Android 10 ou mais recente (camadas de ecrã com espaço de cor) este ecrã não indica suporte HDR este ecrã suporta %1$s, não HDR10 - esta GPU O limite de processos secundários está ativado O limite de processos secundários não está definido @@ -2523,7 +2502,6 @@ Copiado. Forçar SSBS Mantém ativa uma definição de velocidade da CPU que o Wine está sempre a desativar. Pode tornar os jogos Windows mais rápidos no Snapdragon 8 Elite; pouca diferença nos chips mais antigos. Aplica-se no próximo arranque do jogo. - Lojas Steam Personalizados @@ -3009,7 +2987,6 @@ Cor do ícone Cor do botão Sem ícone - A verificar o início de sessão… A obter a tua biblioteca… A obter a lista de jogos… @@ -4068,10 +4045,8 @@ Mostrar etiqueta Não foi possível importar este esquema Instala-se através de %1$s - Neve Escarlate Superfícies brancas com detalhes vermelhos. - Bandas sonoras Música Opções de reprodução @@ -4148,7 +4123,9 @@ Mostrados %1$d de %2$d Prima novamente o botão Voltar para sair - Escala por números inteiros - Utiliza o maior fator de escala inteiro que couber. Se a imagem de origem for demasiado grande, ajusta a imagem completa para evitar cortes. A resolução é configurada separadamente. - + Usa a maior escala inteira que cabe. Pode cortar as margens do ecrã. Se a origem for maior do que a saída, a escala fracionária apresenta a imagem completa. A resolução é configurada separadamente. + Inteiro + Ajustar + Suavização de serrilhado + \ No newline at end of file diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index c142d435e8..940f40dfe6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1,4 +1,4 @@ - + Os gráficos do SteamVR pararam O DroidDeck vai reiniciar em %1$d segundos para redefinir os gráficos e reabrir o SteamVR. O jogo em execução será fechado; o progresso não salvo não poderá ser recuperado. @@ -357,7 +357,7 @@ Voltar ao DroidDeck após um jogo 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. Pré-cache de shaders - 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. + 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. Reparar o cliente Steam 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. O cliente Steam será baixado de novo na próxima vez que a Steam iniciar. @@ -712,7 +712,10 @@ Mega Barra Travar posição - Arraste o HUD para movê-lo; um toque longo o trava ou destrava. Enquanto estiver travado, os controles na tela embaixo dele continuam funcionando. + Arraste o HUD para movê-lo. Enquanto estiver travado, os controles na tela embaixo dele continuam funcionando. + Toque longo + Recolher ou expandir + Travar ou destravar Encaixar nas laterais Solte o HUD e ele vai para a lateral mais próxima da tela. Um gesto rápido o lança nessa direção. Aparência @@ -1147,7 +1150,7 @@ Build do Lab desativado Ele foi compilado para outra versão do DroidDeck. Está guardado em Atualizações. O DroidDeck não iniciou com ele duas vezes - Agente + Dev Harness Agente O agente está trabalhando Instale o Claude Code no espaço de usuário do Linux para usar o agente. @@ -1321,6 +1324,7 @@ Digitar endereço manualmente De um computador com ADB: Copiar comando + Conecte o headset a um computador e abra o SideQuest. Escolha “Run ADB Command”, depois “Custom Command”, digite o comando mostrado abaixo e selecione “Run Command”. Escolha em qual tela abrir as Configurações do Android. Tela principal Pareado. Procurando a porta da Depuração por Wi-Fi… @@ -1597,7 +1601,6 @@ Escolha uma pasta para os arquivos de jogo do frontend Arquivos de jogo salvos em %1$s Arquivos do frontend - Aguarde a operação do runtime terminar Aguarde a instalação da ferramenta de compatibilidade terminar Preparando as ferramentas de compatibilidade @@ -1688,7 +1691,6 @@ Removendo o runtime Linux Não foi possível abrir as Configurações na tela inferior; elas foram abertas na tela principal. Abra as Opções do desenvolvedor nas Configurações - Não foi possível abrir a configuração “Instalar apps desconhecidos” do Android Não foi possível verificar: %1$s Esta versão não tem download para esta cópia do DroidDeck @@ -1698,12 +1700,10 @@ Aguardando sua confirmação A atualização falhou O Android não ofereceu a instalação da atualização - Falha ao instalar o Decky: %1$s Iniciando a importação do plugin… Falha ao importar o plugin: %1$s Plugin instalado. Reinicie o Steam para carregá-lo. - Ainda não verificado - toque em atualizar para procurar novos drivers Android + Linux: define também o driver de vídeo Android + Linux: define também o driver do runtime @@ -1759,7 +1759,6 @@ falha na verificação %1$s instalado - escolha-o em qualquer uma das listas para definir os dois drivers %1$s instalado - escolha-o no menu - Aguarde a remoção do runtime terminar Jogo touchpad @@ -1807,7 +1806,6 @@ O log mostra %1$d erros “Function not implemented”: a aceleração seccomp do proot está falhando em um auxiliar neste dispositivo. Tente %2$s → “%3$s” (ou “%4$s”) e inicie de novo. O log mostra %1$d erros “Function not implemented”: a aceleração seccomp do proot está falhando em um auxiliar neste dispositivo. Tente %2$s → “%3$s” (ou “%4$s”) e inicie de novo. - Plugins Instale um ZIP de plugin para a próxima sessão do Steam. Baixando… @@ -2171,7 +2169,6 @@ Elite Dangerous 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. Outro programa já usa a porta %1$s, então esse jogo não pode aparecer aqui. - Removendo o runtime Linux Removendo o runtime Linux · %1$d entrada @@ -2187,7 +2184,6 @@ Aparece enquanto o runtime Linux é instalado ou removido Instalando o runtime Linux Removendo o runtime Linux - O runtime Linux não está instalado O catálogo não tem soma de verificação para %1$s A soma de verificação não confere - nada foi alterado @@ -2195,7 +2191,6 @@ Não foi possível colocar o AppImage no lugar Falha na extração Falha na instalação - Falha na configuração do Flatpak (código de saída %1$d) A configuração do Flatpak não terminou Outra tarefa da loja está em andamento @@ -2214,7 +2209,6 @@ codecs de mídia runtime %1$s runtime %1$s %2$s - O arquivo é pequeno demais para ser um AppImage Não é possível ler o arquivo: %1$s Isto não é um AppImage (não é um programa Linux) @@ -2229,7 +2223,6 @@ Extraindo %1$s Não foi possível extrair o AppImage Não foi possível extrair o AppImage: %1$s - Pare a sessão ativa antes de instalar o Decky Loader Falha no download do Decky Loader O tamanho do Decky Loader não corresponde aos metadados da versão @@ -2278,13 +2271,11 @@ Não foi possível ativar o plugin importado Não foi possível atualizar as configurações de plugins do Decky Não foi possível restaurar o plugin existente - Não foi possível salvar a identidade da depuração por Wi-Fi Falha no comando ADB (%1$d) O Android não confirmou a alteração do limite de processos filhos: %1$s Nenhum pareamento de depuração por Wi-Fi salvo Digite o endereço IP e a porta atuais da depuração por Wi-Fi - Tempo esgotado esperando o pop-up de pareamento. Tente novamente pelo DroidDeck. Não foi possível procurar o pop-up de pareamento (%1$d). Verifique se o Wi-Fi está ativado. Não foi possível procurar o pop-up de pareamento: %1$s @@ -2310,7 +2301,6 @@ O Steam está pronto Toque para voltar ao DroidDeck. Você já pode desativar a depuração por Wi-Fi. A configuração da depuração por Wi-Fi parou - Falha no download O tamanho do download não corresponde ao APK publicado, e ele foi descartado - tente de novo O download não corresponde à soma de verificação e foi descartado - tente de novo @@ -2323,13 +2313,11 @@ O APK baixado não tem informações de assinatura O APK baixado não está assinado com a chave de versões do DroidDeck O catálogo de atualizações respondeu HTTP %1$d - Iniciando a sessão… %1$d:%2$02d decorridos · ainda em andamento Baixando a atualização do cliente Steam · %1$d%% Aplicando a atualização do cliente Steam… Baixando o cliente Steam · %1$s - Já há uma instalação de ferramenta de compatibilidade em andamento Pare a sessão ativa antes de instalar ferramentas de compatibilidade Não foi possível encontrar uma versão ARM64 de %1$s @@ -2349,7 +2337,6 @@ Falha na instalação do %1$s (código de saída %2$d) Não foi possível instalar o %1$s Buscando o pacote droiddeck-esync - com auxiliares Linux só DLLs Original (Proton atualizado desde a última troca) @@ -2372,13 +2359,11 @@ Falha no download: esta versão nightly pode ter sido substituída por uma mais nova. Atualize a lista e tente de novo. Esta lista de pacotes é anterior às somas de verificação - atualize-a e tente de novo A soma de verificação não confere - Linear Vizinho mais próximo Snapdragon GSR (qualidade) Só nitidez Automático (acompanha a escala) - Nada aplicado. Clareza Nitidez com um toque de contraste - o do dia a dia. @@ -2402,7 +2387,6 @@ Pixels nítidos para jogos 2D e antigos. Contorno anime Contornos de desenho animado e nitidez. - Não é uma GPU Adreno Driver PowerVR do sistema: a compatibilidade varia por dispositivo Experimental: RADV ou o driver Xclipse do sistema @@ -2427,7 +2411,6 @@ Não suportada: nenhum backend gráfico compatível está disponível para esta GPU Funciona pela ponte Mali, no driver Vulkan nativo do aparelho Sem suporte com a ponte Mali desativada: o Turnip precisa de uma GPU Adreno (Snapdragon) - O limite de requisições do GitHub foi atingido - tente mais tarde O GitHub respondeu HTTP %1$d Falha no download @@ -2448,16 +2431,12 @@ Não é um pacote de drivers: não há manifest.json indicando um driver android e um linux Não é um pacote de drivers: %1$s aponta para fora dele Não é um pacote de drivers: extraído, ele ocupa mais de %1$d MB - Cartão SD Pasta - Compartilhar logs da sessão - requer Android 10 ou mais recente (camadas de exibição com espaço de cores) esta tela não informa suporte a HDR esta tela é compatível com %1$s, não com HDR10 - esta GPU O limite de processos filhos está ativado O limite de processos filhos não está definido @@ -2531,7 +2510,6 @@ Copiado. Forçar SSBS Mantém ativada uma configuração de velocidade da CPU que o Wine fica desativando. Pode deixar jogos do Windows mais rápidos no Snapdragon 8 Elite; pouca mudança em chips mais antigos. Vale a partir da próxima vez que um jogo for iniciado. - Lojas Steam Personalizado @@ -3017,7 +2995,6 @@ Cor do ícone Cor do botão Sem ícone - Verificando login… Buscando sua biblioteca… Buscando lista de jogos… @@ -4076,10 +4053,8 @@ Mostrar rótulo Não foi possível importar este layout Instala-se através de %1$s - Neve Escarlate Superfícies brancas com detalhes em vermelho. - Trilhas sonoras Música Opções de reprodução @@ -4156,7 +4131,9 @@ Exibidos %1$d de %2$d Pressione o botão Voltar novamente para sair - Escala por números inteiros - Usa o maior fator de escala inteiro que couber. Se a imagem de origem for grande demais, ajusta a imagem completa para evitar cortes. A resolução é configurada separadamente. - + Usa a maior escala inteira que cabe. Pode cortar as bordas da tela. Se a origem for maior que a saída, a escala fracionária exibe a imagem completa. A resolução é configurada separadamente. + Inteiro + Ajustar + Suavização de serrilhado + \ No newline at end of file diff --git a/app/src/main/res/values-ro/input_library.xml b/app/src/main/res/values-ro/input_library.xml index e277e65abf..5a3648d509 100644 --- a/app/src/main/res/values-ro/input_library.xml +++ b/app/src/main/res/values-ro/input_library.xml @@ -29,7 +29,7 @@ Cruce Trăgaci Gata - Anulează + Anulează ultima acțiune + Adaugă Trage pentru a muta. Trage de un colț pentru a redimensiona. Atinge Proprietăți pentru a atribui o acțiune. Editare pe ecranul secundar diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 747dbfd15b..41052aa32f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1,4 +1,4 @@ - + Grafica SteamVR s-a oprit DroidDeck va reporni în %1$d s pentru a reseta grafica și a redeschide SteamVR. Jocul care rulează se va închide; progresul nesalvat nu poate fi recuperat. @@ -357,7 +357,7 @@ Revino la DroidDeck după un joc 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. Pre-cache pentru shadere - 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. + 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. Repară clientul Steam 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. Clientul Steam va fi descărcat din nou la următoarea pornire a Steam. @@ -712,7 +712,10 @@ Mega Bară Blochează pe loc - 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. + Trage HUD-ul pentru a-l muta. Cât timp e blocat, comenzile de pe ecran de sub el funcționează în continuare. + Apăsare lungă + Restrânge sau extinde + Blochează sau deblochează Fixare în lateral Eliberează HUD-ul și se mută în partea mai apropiată a ecranului. Un gest rapid îl aruncă în acea direcție. Aspect @@ -1148,7 +1151,7 @@ Compilarea Lab dezactivată A fost construită pentru o altă versiune de DroidDeck. Este păstrată în Actualizări. DroidDeck nu a pornit pe ea de două ori - Agent + Dev Harness Agent Agentul lucrează Instalează Claude Code în spațiul utilizatorului Linux pentru a folosi agentul. @@ -1322,6 +1325,7 @@ Introdu adresa manual De pe un computer cu ADB: Copiază comanda + Conectează căștile la un computer și deschide SideQuest. Alege „Run ADB Command”, apoi „Custom Command”, scrie comanda afișată mai jos și selectează „Run Command”. Alege pe care afișaj se deschid Setările Android. Ecranul principal Asociat. Se caută portul de Depanare wireless… @@ -1598,7 +1602,6 @@ Alege un folder pentru fișierele frontend ale jocurilor Fișierele jocului salvate în %1$s Fișiere frontend - Așteaptă să se termine operația asupra mediului de execuție Așteaptă să se termine instalarea instrumentului de compatibilitate Se pregătesc instrumentele de compatibilitate @@ -1689,7 +1692,6 @@ Se elimină mediul de execuție Linux Setările nu au putut fi deschise pe ecranul de jos; au fost deschise pe ecranul principal. Deschide Opțiunile pentru dezvoltatori din Setări - Setarea Android „Instalează aplicații necunoscute” nu a putut fi deschisă Nu s-a putut verifica: %1$s Această versiune nu are o descărcare pentru această copie de DroidDeck @@ -1699,12 +1701,10 @@ Se așteaptă confirmarea ta Actualizarea a eșuat Android nu a oferit instalarea actualizării - Instalarea Decky a eșuat: %1$s Se pornește importul pluginului… Importul pluginului a eșuat: %1$s Plugin instalat. Repornește Steam pentru a-l încărca. - Neverificat încă - apasă reîmprospătare pentru a căuta drivere noi Android + Linux: setează driverul de afișaj odată cu el Android + Linux: setează driverul mediului de execuție odată cu el @@ -1760,7 +1760,6 @@ verificare eșuată Instalat %1$s - alege-l în orice listă pentru a seta ambele drivere Instalat %1$s - alege-l în meniu - Așteaptă să se termine eliminarea mediului de execuție Joc touchpad @@ -1808,7 +1807,6 @@ Jurnalul arată %1$d erori „Function not implemented”: accelerarea seccomp a proot nu reușește să ruleze un auxiliar pe acest dispozitiv. Încearcă %2$s → „%3$s” (sau „%4$s”) și pornește din nou. Jurnalul arată %1$d de erori „Function not implemented”: accelerarea seccomp a proot nu reușește să ruleze un auxiliar pe acest dispozitiv. Încearcă %2$s → „%3$s” (sau „%4$s”) și pornește din nou. - Pluginuri Instalează o arhivă ZIP cu un plugin pentru sesiunea Steam următoare. Se descarcă… @@ -2172,7 +2170,6 @@ Elite Dangerous 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ă. Alt program folosește deja portul %1$s, așa că acel joc nu poate fi afișat aici. - Se elimină mediul de execuție Linux Se elimină mediul de execuție Linux · %1$d intrare @@ -2188,7 +2185,6 @@ Apare cât timp mediul de execuție Linux este instalat sau eliminat Se instalează mediul de execuție Linux Se elimină mediul de execuție Linux - Mediul de execuție Linux nu este instalat Catalogul nu are o sumă de control pentru %1$s Sumă de control incorectă - nimic nu a fost modificat @@ -2196,7 +2192,6 @@ AppImage-ul nu a putut fi plasat Extragerea a eșuat Instalarea a eșuat - Configurarea Flatpak a eșuat (cod de ieșire %1$d) Configurarea Flatpak nu s-a terminat O altă sarcină a magazinului este în curs @@ -2215,7 +2210,6 @@ codecuri media mediul de execuție %1$s mediul de execuție %1$s %2$s - Fișierul este prea mic pentru a fi un AppImage Fișierul nu poate fi citit: %1$s Acesta nu este un AppImage (nu este un program Linux) @@ -2230,7 +2224,6 @@ Se extrage %1$s AppImage-ul nu a putut fi extras AppImage-ul nu a putut fi extras: %1$s - Oprește sesiunea activă înainte de a instala Decky Loader Descărcarea Decky Loader a eșuat Dimensiunea Decky Loader nu s-a potrivit cu metadatele versiunii @@ -2279,13 +2272,11 @@ Pluginul importat nu a putut fi activat Setările pluginului Decky nu au putut fi actualizate Pluginul existent nu a putut fi restaurat - Identitatea Depanării wireless nu a putut fi salvată Comanda ADB a eșuat (%1$d) Android nu a confirmat modificarea limitei proceselor-copil: %1$s Nicio asociere de Depanare wireless nu este salvată Introdu adresa IP și portul curente ale Depanării wireless - Timpul a expirat în așteptarea ferestrei de asociere. Încearcă din nou din DroidDeck. Fereastra de asociere nu a putut fi căutată (%1$d). Verifică dacă Wi-Fi-ul este activat. Fereastra de asociere nu a putut fi căutată: %1$s @@ -2311,7 +2302,6 @@ Steam este pregătit Apasă pentru a reveni la DroidDeck. Poți dezactiva acum Depanarea wireless. Configurarea Depanării wireless s-a oprit - Descărcarea a eșuat Dimensiunea descărcării nu s-a potrivit cu APK-ul publicat și a fost abandonată - încearcă din nou Descărcarea nu s-a potrivit cu suma sa de control și a fost abandonată - încearcă din nou @@ -2324,13 +2314,11 @@ APK-ul descărcat nu are informații de semnare APK-ul descărcat nu este semnat cu cheia de lansare a DroidDeck Catalogul de actualizări a răspuns cu HTTP %1$d - Se pornește sesiunea… %1$d:%2$02d scurse · încă se lucrează Se descarcă actualizarea clientului Steam · %1$d%% Se aplică actualizarea clientului Steam… Se descarcă clientul Steam · %1$s - O instalare a unui instrument de compatibilitate este deja în curs Oprește sesiunea activă înainte de a instala instrumente de compatibilitate Nu s-a găsit o versiune ARM64 pentru %1$s @@ -2350,7 +2338,6 @@ Instalarea %1$s a eșuat (cod de ieșire %2$d) %1$s nu a putut fi instalat Se obține pachetul droiddeck-esync - cu auxiliare Linux doar DLL-uri Original (Proton actualizat de la ultima comutare) @@ -2373,13 +2360,11 @@ Descărcarea a eșuat: această versiune nightly poate fi fost înlocuită cu una mai nouă. Reîmprospătează lista și încearcă din nou. Această listă de pachete e anterioară sumelor de control - reîmprospătează-o și încearcă din nou Sumă de control incorectă - Liniar Cel mai apropiat Snapdragon GSR (calitate) Doar claritate Automat (se potrivește cu scalarea) - Nimic aplicat. Claritate de joc Claritate cu puțin contrast - cea de zi cu zi. @@ -2403,7 +2388,6 @@ Pixeli clari pentru 2D și titluri vechi. Margini anime Contururi toon plus claritate. - Nu este un GPU Adreno Driverul de sistem PowerVR: compatibilitatea variază în funcție de dispozitiv Experimental: RADV sau driverul de sistem Xclipse @@ -2428,7 +2412,6 @@ Neacceptat: nu este disponibil un backend grafic compatibil pentru acest GPU Rulează prin puntea Mali, pe driverul Vulkan propriu al telefonului Nu este suportat cu puntea Mali dezactivată: Turnip necesită un GPU Adreno (Snapdragon) - S-a atins limita de solicitări a GitHub - încearcă din nou mai târziu GitHub a răspuns cu HTTP %1$d Descărcarea a eșuat @@ -2449,16 +2432,12 @@ Nu este un pachet de drivere: niciun manifest.json nu numește un driver android și unul linux Nu este un pachet de drivere: %1$s indică în afara lui Nu este un pachet de drivere: se despachetează la mai mult de %1$d MB - Card SD Folder - Partajează jurnalele sesiunii - necesită Android 10 sau mai nou (straturi de afișaj cu un spațiu de culoare) acest afișaj nu raportează suport HDR acest afișaj acceptă %1$s, nu HDR10 - acest GPU Limita proceselor-copil este activă Limita proceselor-copil nu este setată @@ -2532,7 +2511,6 @@ Copiat. Forțează SSBS Păstrează o setare de viteză a CPU-ului pe care Wine o dezactivează mereu. Poate face jocurile Windows mai rapide pe Snapdragon 8 Elite; schimbare mică observată pe cipuri mai vechi. Se aplică la următoarea lansare a jocului. - Magazine Steam Personalizat @@ -3021,7 +2999,6 @@ Culoarea pictogramei Culoarea butonului Fără pictogramă - Se verifică autentificarea… Se obține biblioteca ta… Se obține lista de jocuri… @@ -4069,10 +4046,8 @@ Afișează eticheta Acest aranjament nu a putut fi importat Se instalează prin %1$s - Zăpadă stacojie Suprafețe albe cu accente roșii. - Coloane sonore Muzică Opțiuni de redare @@ -4149,7 +4124,9 @@ Afișate %1$d din %2$d Apasă din nou înapoi pentru a ieși - Scalare cu numere întregi - Folosește cel mai mare factor întreg de scalare care încape. Dacă sursa este prea mare, adaptează întreaga imagine pentru a evita decuparea. Rezoluția se configurează separat. - + Folosește cea mai mare scară întreagă care încape. Marginile ecranului pot fi decupate. Dacă sursa este mai mare decât ieșirea, scalarea fracționară afișează imaginea completă. Rezoluția se configurează separat. + Număr întreg + Potrivire + Antialiasing + \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3defadddd2..f1cfd1a2de 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,4 +1,4 @@ - + Графика SteamVR перестала работать DroidDeck перезапустится через %1$d сек., чтобы сбросить графику и снова открыть SteamVR. Запущенная игра закроется; несохранённый прогресс восстановить не удастся. @@ -357,7 +357,7 @@ Возвращаться в DroidDeck после игры Когда игра, запущенная из DroidDeck или другого лаунчера, закрывается, Steam корректно завершает работу (сначала синхронизирует облачные сохранения), и вы возвращаетесь туда. Выкл.: остаётесь в Steam. Предварительное кэширование шейдеров - Steam скачивает готовые шейдеры для ваших игр и обрабатывает их в фоне, поэтому игры меньше подтормаживают. Если отключено, экономятся трафик, место и батарея; игры собирают шейдеры прямо во время игры. Это та же настройка, что и «Загрузки > Предварительное кэширование шейдеров» в Steam. Применится в следующей сессии. + Steam скачивает готовые шейдеры для ваших игр и обрабатывает их в фоне, поэтому игры меньше подтормаживают. Если отключено, экономятся трафик, место и батарея; игры собирают шейдеры прямо во время игры. Это та же настройка, что и «Загрузки > Предварительное кэширование шейдеров» в Steam. Применится в следующей сессии. Восстановить клиент Steam При следующем запуске Steam клиент будет скачан заново. Используйте, если Steam зависает на экране загрузки. Игры, вход и настройки сохраняются. Клиент Steam будет скачан заново при следующем запуске Steam. @@ -714,7 +714,10 @@ Мега Полоса Закрепить на месте - Перетащите HUD, чтобы переместить его; долгое нажатие закрепляет или открепляет его. Пока он закреплён, экранные элементы управления под ним продолжают работать. + Перетащите HUD, чтобы переместить его. Пока он закреплён, экранные элементы управления под ним продолжают работать. + Долгое нажатие + Свернуть или развернуть + Закрепить или открепить Прилипание к бокам Отпустите HUD, и он переместится к ближайшей стороне экрана. Резкий жест отбросит его в ту сторону. Внешний вид @@ -1151,7 +1154,7 @@ Лабораторная сборка отключена Сборка создана для другой версии DroidDeck. Она сохранена в «Обновления». DroidDeck дважды не запустился на ней - Агент + Dev Harness Агент Агент работает Установите Claude Code в пользовательской среде Linux, чтобы использовать агента. @@ -1329,6 +1332,7 @@ Ввести адрес вручную С компьютера через ADB: Копировать команду + Подключите шлем к компьютеру и откройте SideQuest. Выберите «Run ADB Command», затем «Custom Command», введите команду, показанную ниже, и нажмите «Run Command». Выберите экран для открытия настроек Android. Главный экран Сопряжено. Поиск порта отладки по Wi-Fi… @@ -1606,7 +1610,6 @@ Выбрать папку для файлов игры фронтенда Файлы игры сохранены в %1$s Файлы фронтенда - Дождитесь завершения операции со средой выполнения Дождитесь завершения установки инструмента совместимости Подготовка инструментов совместимости @@ -1702,7 +1705,6 @@ Удаление среды выполнения Linux Не удалось открыть настройки на нижнем экране; они открыты на главном экране. Откройте раздел «Для разработчиков» в настройках - Не удалось открыть настройку Android «Установка неизвестных приложений» Не удалось проверить: %1$s В этой сборке нет файла для этой копии DroidDeck @@ -1712,12 +1714,10 @@ Ожидание вашего подтверждения Ошибка обновления Android не предложил установить обновление - Ошибка установки Decky: %1$s Начало импорта плагина… Ошибка импорта плагина: %1$s Плагин установлен. Перезапустите Steam, чтобы загрузить его. - Еще не проверялось — нажмите «Обновить», чтобы найти новые драйверы Android + Linux: заодно задает драйвер дисплея Android + Linux: заодно задает драйвер среды выполнения @@ -1776,7 +1776,6 @@ ошибка проверки Установлен %1$s — выберите его в любом из списков, чтобы задать оба драйвера Установлен %1$s — выберите его в меню - Дождитесь завершения удаления среды выполнения Игра тачпад @@ -1826,7 +1825,6 @@ В журнале %1$d ошибок «Function not implemented»: ускорение seccomp в proot вызывает сбой вспомогательной программы на этом устройстве. Попробуйте %2$s → «%3$s» (или «%4$s») и запустите снова. В журнале %1$d ошибки «Function not implemented»: ускорение seccomp в proot вызывает сбой вспомогательной программы на этом устройстве. Попробуйте %2$s → «%3$s» (или «%4$s») и запустите снова. - Плагины Установите ZIP-архив плагина для следующей сессии Steam. Загрузка… @@ -2197,7 +2195,6 @@ Elite Dangerous Порт %1$d получает данные (пакетов: %2$d, размер: %3$d байт), но в формате, который эта страница пока не умеет читать. Порт %1$s уже занят другой программой, поэтому эта игра не может отображаться здесь. - Удаление среды выполнения Linux Удаление среды выполнения Linux · %1$d элемент @@ -2214,7 +2211,6 @@ Отображается во время установки или удаления среды выполнения Linux Установка среды выполнения Linux Удаление среды выполнения Linux - Среда выполнения Linux не установлена В каталоге нет контрольной суммы для %1$s Контрольная сумма не совпадает — ничего не изменено @@ -2222,7 +2218,6 @@ Не удалось разместить AppImage Ошибка распаковки Ошибка установки - Ошибка настройки Flatpak (код %1$d) Настройка Flatpak не завершилась Выполняется другая задача магазина @@ -2241,7 +2236,6 @@ медиакодеки среда выполнения %1$s среда выполнения %1$s %2$s - Файл слишком мал для AppImage Не удается прочитать файл: %1$s Это не AppImage (это не программа Linux) @@ -2256,7 +2250,6 @@ Распаковка %1$s Не удалось распаковать AppImage Не удалось распаковать AppImage: %1$s - Остановите текущую сессию перед установкой Decky Loader Ошибка загрузки Decky Loader Размер Decky Loader не совпадает с метаданными выпуска @@ -2305,13 +2298,11 @@ Не удалось активировать импортированный плагин Не удалось обновить настройки плагинов Decky Не удалось восстановить прежний плагин - Не удалось сохранить идентификатор для отладки по Wi-Fi Ошибка команды ADB (%1$d) Android не подтвердил изменение ограничения дочерних процессов: %1$s Нет сохраненного сопряжения для отладки по Wi-Fi Введите текущие IP-адрес и порт отладки по Wi-Fi - Время ожидания окна сопряжения истекло. Повторите попытку из DroidDeck. Не удалось найти окно сопряжения (%1$d). Убедитесь, что Wi-Fi включен. Не удалось найти окно сопряжения: %1$s @@ -2337,7 +2328,6 @@ Steam готов Нажмите, чтобы вернуться в DroidDeck. Теперь отладку по Wi-Fi можно отключить. Настройка отладки по Wi-Fi остановлена - Ошибка загрузки Размер загруженного файла не совпал с опубликованным APK, файл удален — повторите попытку Загруженный файл не совпал с контрольной суммой и был удален — повторите попытку @@ -2350,13 +2340,11 @@ В загруженном APK нет сведений о подписи Загруженный APK не подписан ключом релизов DroidDeck Каталог обновлений ответил HTTP %1$d - Запуск сессии… Прошло %1$d:%2$02d · работа продолжается Загрузка обновления клиента Steam · %1$d%% Применение обновления клиента Steam… Загрузка клиента Steam · %1$s - Инструмент совместимости уже устанавливается Остановите текущую сессию перед установкой инструментов совместимости Не найден выпуск %1$s для ARM64 @@ -2376,7 +2364,6 @@ Ошибка установки %1$s (код выхода %2$d) Не удалось установить %1$s Загрузка пакета droiddeck-esync - с помощниками Linux только DLL Оригинал (Proton обновлен после последней замены) @@ -2399,13 +2386,11 @@ Не удалось загрузить: возможно, эта ночная сборка заменена более новой. Обновите список и повторите попытку. Этот список пакетов создан до появления контрольных сумм — обновите его и повторите попытку Контрольная сумма не совпадает - Линейный Ближайший Snapdragon GSR (качество) Только резкость Авто (по масштабированию) - Без эффектов. Игровая четкость Резкость с легким добавлением контраста — на каждый день. @@ -2429,7 +2414,6 @@ Четкие пиксели для 2D и старых игр. Аниме-контуры Мультяшные контуры плюс резкость. - GPU не Adreno Системный драйвер PowerVR: совместимость зависит от устройства Экспериментально: RADV или системный драйвер Xclipse @@ -2454,7 +2438,6 @@ Не поддерживается: для этого GPU нет совместимого графического бэкенда Работает через мост Mali на собственном драйвере Vulkan телефона Не поддерживается без моста Mali: Turnip нужен GPU Adreno (Snapdragon) - Превышен лимит запросов GitHub — повторите попытку позже GitHub ответил HTTP %1$d Ошибка загрузки @@ -2475,16 +2458,12 @@ Не пакет драйверов: нет manifest.json с указанием драйверов для Android и Linux Не пакет драйверов: %1$s указывает за его пределы Не пакет драйверов: после распаковки занимает больше %1$d МБ - SD-карта Папка - Поделиться журналами сессии - требуется Android 10 или новее (слои дисплея с цветовым пространством) этот дисплей не сообщает о поддержке HDR этот дисплей поддерживает %1$s, но не HDR10 - этот GPU Ограничение дочерних процессов включено Ограничение дочерних процессов не задано @@ -2558,7 +2537,6 @@ Скопировано. Принудительный SSBS Удерживает включенной настройку скорости CPU, которую Wine постоянно отключает. Может ускорить игры Windows на Snapdragon 8 Elite; на старых чипах разница почти не заметна. Вступит в силу при следующем запуске игры. - Магазины Steam Свои @@ -3047,7 +3025,6 @@ Цвет значка Цвет кнопки Без значка - Проверка входа… Получение вашей библиотеки… Получение списка игр… @@ -4109,10 +4086,8 @@ Показывать подпись Не удалось импортировать эту раскладку Устанавливается через %1$s - Алый снег Белые поверхности с красными акцентами. - Саундтреки Музыка Параметры воспроизведения @@ -4189,7 +4164,9 @@ Показано %1$d из %2$d Нажмите «Назад» ещё раз, чтобы выйти - Целочисленное масштабирование - Использует наибольший целочисленный коэффициент масштабирования, который помещается. Если исходное изображение слишком велико, оно уменьшается целиком, чтобы избежать обрезки. Разрешение настраивается отдельно. - + Использует наибольший целочисленный масштаб, который помещается на экране. Края могут обрезаться. Если исходное изображение больше выходного, дробное масштабирование показывает его целиком. Разрешение настраивается отдельно. + Целое число + По размеру + Сглаживание + \ No newline at end of file diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 45b8583561..2b5b56881a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1,4 +1,4 @@ - + SteamVR-grafiken slutade fungera DroidDeck startar om om %1$d sekunder för att återställa grafiken och öppna SteamVR igen. Spelet som körs stängs; osparade framsteg kan inte återställas. @@ -357,7 +357,7 @@ Återgå till DroidDeck efter ett spel 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. Förhandscachning av shaders - 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. + 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. Reparera Steam-klienten 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. Steam-klienten laddas ned igen nästa gång Steam startar. @@ -710,7 +710,10 @@ Mega List Lås på plats - 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. + Dra HUD:en för att flytta den. När den är låst fungerar skärmkontrollerna under den fortfarande. + Långt tryck + Fäll ihop eller fäll ut + Lås eller lås upp Fäst mot sidorna Släpp HUD:en så flyttas den till skärmens närmaste sida. En snabb svepning kastar den åt det hållet. Utseende @@ -1145,7 +1148,7 @@ Lab-bygget avstängt Det byggdes för en annan version av DroidDeck. Det behålls i Uppdateringar. DroidDeck startade inte på det två gånger - Agent + Dev Harness Agent Agenten arbetar Installera Claude Code i Linux-användarmiljön för att använda agenten. @@ -1315,6 +1318,7 @@ Ange adress manuellt Från en dator med ADB: Kopiera kommando + Anslut headsetet till en dator och öppna SideQuest. Välj ”Run ADB Command” och sedan ”Custom Command”, skriv in kommandot som visas nedan och välj ”Run Command”. Välj vilken skärm Android-inställningar ska öppnas på. Huvudskärm Ihopkopplad. Letar efter porten för Trådlös felsökning… @@ -1590,7 +1594,6 @@ Välj en mapp för frontend-spelfiler Spelfiler sparade till %1$s Frontend-filer - Vänta tills åtgärden på körmiljön är klar Vänta tills installationen av kompatibilitetsverktyget är klar Förbereder kompatibilitetsverktyg @@ -1676,7 +1679,6 @@ Tar bort Linux-körmiljön Kunde inte öppna Inställningar på den nedre skärmen. Öppnade den på huvudskärmen i stället. Öppna Utvecklaralternativ i Inställningar - Det gick inte att öppna Androids inställning ”Installera okända appar” Kunde inte kontrollera: %1$s Den här versionen har ingen nedladdning för den här kopian av DroidDeck @@ -1686,12 +1688,10 @@ Väntar på att du bekräftar Uppdateringen misslyckades Android erbjöd inte att installera uppdateringen - Decky-installationen misslyckades: %1$s Startar import av plugin… Import av plugin misslyckades: %1$s Plugin installerad. Starta om Steam för att läsa in den. - Inte kontrollerat än - tryck på uppdatera för att söka efter nya drivrutiner Android + Linux: ställer in skärmdrivrutinen samtidigt Android + Linux: ställer in körmiljödrivrutinen samtidigt @@ -1744,7 +1744,6 @@ kontrollen misslyckades Installerad %1$s - välj den i endera listan för att ställa in båda drivrutinerna Installerad %1$s - välj den i menyn - Vänta tills borttagningen av körmiljön är klar Spel pekplatta @@ -1790,7 +1789,6 @@ Loggen visar %1$d ”Function not implemented”-fel: proots seccomp-acceleration misslyckas med en hjälpprocess på den här enheten. Prova %2$s → ”%3$s” (eller ”%4$s”) och starta igen. Loggen visar %1$d ”Function not implemented”-fel: proots seccomp-acceleration misslyckas med en hjälpprocess på den här enheten. Prova %2$s → ”%3$s” (eller ”%4$s”) och starta igen. - Plugins Installera en plugin-zip för nästa Steam-session. Laddar ned… @@ -2147,7 +2145,6 @@ Elite Dangerous 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. Ett annat program använder redan port %1$s, så det spelet kan inte visas här. - Tar bort Linux-körmiljön Tar bort Linux-körmiljön · %1$d post @@ -2162,7 +2159,6 @@ Visas medan Linux-körmiljön installeras eller tas bort Installerar Linux-körmiljön Tar bort Linux-körmiljön - Linux-körmiljön är inte installerad Katalogen har ingen kontrollsumma för %1$s Kontrollsumman stämmer inte - ingenting ändrades @@ -2170,7 +2166,6 @@ Kunde inte placera AppImage-filen Uppackningen misslyckades Installationen misslyckades - Flatpak-konfigurationen misslyckades (avslutningskod %1$d) Flatpak-konfigurationen slutfördes inte En annan butiksåtgärd pågår @@ -2189,7 +2184,6 @@ mediekodekar %1$s-körmiljö %1$s-körmiljö %2$s - Filen är för liten för att vara en AppImage Filen kan inte läsas: %1$s Det här är inte en AppImage (det är inte ett Linux-program) @@ -2204,7 +2198,6 @@ Packar upp %1$s AppImage-filen kunde inte packas upp AppImage-filen kunde inte packas upp: %1$s - Stoppa den aktiva sessionen innan du installerar Decky Loader Nedladdningen av Decky Loader misslyckades Storleken på Decky Loader matchade inte utgåvans metadata @@ -2253,13 +2246,11 @@ Kunde inte aktivera den importerade pluginen Kunde inte uppdatera inställningarna för Decky-plugin Kunde inte återställa den befintliga pluginen - Kunde inte spara identiteten för trådlös felsökning ADB-kommandot misslyckades (%1$d) Android bekräftade inte att gränsen för underprocesser ändrades: %1$s Ingen parkoppling för trådlös felsökning är sparad Ange den aktuella IP-adressen och porten för trådlös felsökning - Tidsgränsen överskreds när appen väntade på popup-fönstret för parkoppling. Försök igen från DroidDeck. Kunde inte söka efter popup-fönstret för parkoppling (%1$d). Kontrollera att Wi-Fi är på. Kunde inte söka efter popup-fönstret för parkoppling: %1$s @@ -2285,7 +2276,6 @@ Steam är redo Tryck för att gå tillbaka till DroidDeck. Du kan stänga av trådlös felsökning nu. Konfigurationen av trådlös felsökning avbröts - Hämtningen misslyckades Nedladdningens storlek matchade inte den publicerade APK-filen och förkastades - försök igen Nedladdningen matchade inte sin kontrollsumma och förkastades - försök igen @@ -2298,13 +2288,11 @@ Den nedladdade APK-filen har ingen signeringsinformation Den nedladdade APK-filen är inte signerad med DroidDecks nyckel för utgåvan Uppdateringskatalogen svarade HTTP %1$d - Startar sessionen… %1$d:%2$02d förflutit · arbetar fortfarande Laddar ned uppdateringen av Steam-klienten · %1$d %% Tillämpar uppdateringen av Steam-klienten… Laddar ned Steam-klienten · %1$s - En installation av ett kompatibilitetsverktyg pågår redan Stoppa den aktiva sessionen innan du installerar kompatibilitetsverktyg Kunde inte hitta en ARM64-utgåva av %1$s @@ -2324,7 +2312,6 @@ Installationen av %1$s misslyckades (avslutningskod %2$d) Kunde inte installera %1$s Hämtar droiddeck-esync-paket - med Linux-hjälpprogram Endast DLL-filer Original (Proton har uppdaterats sedan senaste bytet) @@ -2347,13 +2334,11 @@ Nedladdningen misslyckades: det här nattbygget kan ha ersatts av ett nyare. Uppdatera listan och försök igen. Den här paketlistan är från innan kontrollsummor fanns - uppdatera den och försök igen Kontrollsumman stämmer inte - Linjär Närmaste Snapdragon GSR (kvalitet) Endast skärpa Auto (matcha skalning) - Inget tillämpat. Spelklarhet Skärpa med en nypa kontrast - vardagsvalet. @@ -2377,7 +2362,6 @@ Skarpa pixlar för 2D och äldre titlar. Anime-kant Tecknade konturer plus skärpa. - Inte en Adreno-GPU System-PowerVR-drivrutin: kompatibiliteten varierar beroende på enhet Experimentellt: RADV eller systemets Xclipse-drivrutin @@ -2402,7 +2386,6 @@ Stöds inte: ingen kompatibel grafikbackend är tillgänglig för denna GPU Körs via Mali-bryggan, på telefonens egen Vulkan-drivrutin Stöds inte när Mali-bryggan är av: Turnip kräver en Adreno-GPU (Snapdragon) - GitHubs hastighetsgräns nåddes - försök igen senare GitHub svarade HTTP %1$d Hämtningen misslyckades @@ -2423,16 +2406,12 @@ Inte ett drivrutinspaket: ingen manifest.json som anger en android- och en linux-drivrutin Inte ett drivrutinspaket: %1$s pekar utanför det Inte ett drivrutinspaket: det packas upp till mer än %1$d MB - SD-kort Mapp - Dela sessionsloggar - kräver Android 10 eller senare (skärmlager med en färgrymd) den här skärmen rapporterar inget HDR-stöd den här skärmen stöder %1$s, inte HDR10 - den här GPU:n Gränsen för underprocesser är på Gränsen för underprocesser är inte inställd @@ -2506,7 +2485,6 @@ Kopierat. Tvinga SSBS Håller kvar en CPU-hastighetsinställning som Wine annars stänger av. Kan göra Windows-spel snabbare på Snapdragon 8 Elite; liten skillnad på äldre chip. Gäller från nästa spelstart. - Butiker Steam Egna @@ -2992,7 +2970,6 @@ Ikonfärg Knappfärg Ingen ikon - Kontrollerar inloggning… Hämtar ditt bibliotek… Hämtar spellista… @@ -4029,10 +4006,8 @@ Visa etikett Det gick inte att importera layouten Installeras via %1$s - Scharlakansröd snö Vita ytor med röda accenter. - Soundtracks Musik Uppspelningsalternativ @@ -4109,7 +4084,9 @@ Visade %1$d av %2$d Tryck tillbaka igen för att avsluta - Heltalsskalning - Använder den största hela skalningsfaktorn som får plats. Om källbilden är för stor anpassas hela bilden för att undvika beskärning. Upplösningen ställs in separat. - + Använder den största heltalsskalningen som får plats. Kan beskära skärmkanterna. Om källan är större än utdata visar bråkskalning hela bilden. Upplösningen ställs in separat. + Heltal + Anpassa + Kantutjämning + \ No newline at end of file diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 6a96c34838..72ede34020 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1,4 +1,4 @@ - + กราฟิกของ SteamVR หยุดทำงาน DroidDeck จะรีสตาร์ทใน %1$d วินาทีเพื่อรีเซ็ตกราฟิกและเปิด SteamVR อีกครั้ง เกมที่กำลังเล่นอยู่จะถูกปิด และความคืบหน้าที่ยังไม่ได้บันทึกจะกู้คืนไม่ได้ @@ -357,7 +357,7 @@ กลับไปที่ DroidDeck หลังเล่นเกม เมื่อเกมที่คุณเริ่มจาก DroidDeck หรือตัวเปิดเกมอื่นปิดลง Steam จะออกอย่างเรียบร้อย (บันทึกบนคลาวด์เสร็จก่อน) แล้วคุณจะกลับไปที่นั่น ปิด: อยู่ใน Steam ต่อ แคชเชเดอร์ล่วงหน้า - Steam จะดาวน์โหลดเชเดอร์ที่สร้างไว้แล้วสำหรับเกมของคุณและประมวลผลในเบื้องหลัง เกมจึงกระตุกน้อยลง การปิดช่วยประหยัดข้อมูล พื้นที่จัดเก็บ และแบตเตอรี่ โดยเกมจะสร้างเชเดอร์ระหว่างเล่นแทน เป็นการตั้งค่าเดียวกับ Downloads > Shader Pre-Caching ของ Steam มีผลในเซสชันถัดไป + Steam จะดาวน์โหลดเชเดอร์ที่สร้างไว้แล้วสำหรับเกมของคุณและประมวลผลในเบื้องหลัง เกมจึงกระตุกน้อยลง การปิดช่วยประหยัดข้อมูล พื้นที่จัดเก็บ และแบตเตอรี่ โดยเกมจะสร้างเชเดอร์ระหว่างเล่นแทน เป็นการตั้งค่าเดียวกับ Downloads > Shader Pre-Caching ของ Steam มีผลในเซสชันถัดไป ซ่อมแซมไคลเอนต์ Steam ดาวน์โหลดไคลเอนต์ Steam ใหม่อีกครั้งในครั้งถัดไปที่ Steam เริ่มทำงาน ใช้เมื่อ Steam ค้างอยู่ที่หน้าจอโหลด เกม การลงชื่อเข้าใช้ และการตั้งค่ายังคงอยู่ ไคลเอนต์ Steam จะถูกดาวน์โหลดใหม่อีกครั้งในครั้งถัดไปที่ Steam เริ่มทำงาน @@ -708,7 +708,10 @@ เมกะ แถบ ล็อกตำแหน่ง - ลาก HUD เพื่อย้าย กดค้างเพื่อล็อกหรือปลดล็อก ขณะล็อก ปุ่มควบคุมบนหน้าจอที่อยู่ด้านล่างยังใช้งานได้ + ลาก HUD เพื่อย้าย ขณะล็อก ปุ่มควบคุมบนหน้าจอที่อยู่ด้านล่างยังใช้งานได้ + กดค้าง + ย่อหรือขยาย + ล็อกหรือปลดล็อก ยึดติดด้านข้าง ปล่อย HUD แล้วจะย้ายไปด้านที่ใกล้กว่าของหน้าจอ ปัดเร็วๆ เพื่อเหวี่ยงไปทางนั้น รูปลักษณ์ @@ -1142,7 +1145,7 @@ ปิดบิลด์ Lab แล้ว บิลด์นี้สร้างสำหรับ DroidDeck เวอร์ชันอื่น และถูกเก็บไว้ใน Updates DroidDeck เริ่มด้วยบิลด์นี้ไม่สำเร็จ 2 ครั้ง - ผู้ช่วย + Dev Harness ผู้ช่วย ผู้ช่วยกำลังทำงาน ติดตั้ง Claude Code ในพื้นที่ผู้ใช้ Linux เพื่อใช้ผู้ช่วย @@ -1309,6 +1312,7 @@ กรอกที่อยู่ด้วยตัวเอง จากคอมพิวเตอร์ที่มี ADB: คัดลอกคำสั่ง + เชื่อมต่อแว่นกับคอมพิวเตอร์แล้วเปิด SideQuest เลือก “Run ADB Command” จากนั้น “Custom Command” พิมพ์คำสั่งที่แสดงด้านล่างแล้วเลือก “Run Command” เลือกหน้าจอที่จะเปิดการตั้งค่า Android หน้าจอหลัก จับคู่แล้ว กำลังค้นหาพอร์ตของ Wireless debugging… @@ -1583,7 +1587,6 @@ เลือกโฟลเดอร์สำหรับไฟล์เกมของฟรอนต์เอนด์ บันทึกไฟล์เกมไปยัง %1$s แล้ว ไฟล์ของฟรอนต์เอนด์ - รอให้การดำเนินการของรันไทม์เสร็จสิ้น รอให้การติดตั้งเครื่องมือความเข้ากันได้เสร็จสิ้น กำลังเตรียมเครื่องมือความเข้ากันได้ @@ -1664,7 +1667,6 @@ กำลังลบรันไทม์ Linux ไม่สามารถเปิดการตั้งค่าบนหน้าจอด้านล่างได้ จึงเปิดบนหน้าจอหลักแทน เปิดตัวเลือกสำหรับนักพัฒนาในการตั้งค่า - ไม่สามารถเปิดการตั้งค่า “Install unknown apps” ของ Android ได้ ไม่สามารถตรวจสอบได้: %1$s บิลด์นี้ไม่มีให้ดาวน์โหลดสำหรับสำเนานี้ของ DroidDeck @@ -1674,12 +1676,10 @@ กำลังรอให้คุณยืนยัน การอัปเดตล้มเหลว Android ไม่ได้เสนอให้ติดตั้งอัปเดต - ติดตั้ง Decky ล้มเหลว: %1$s กำลังเริ่มนำเข้าพลักอิน… นำเข้าพลักอินล้มเหลว: %1$s ติดตั้งพลักอินแล้ว รีสตาร์ท Steam เพื่อโหลด - ยังไม่ตรวจสอบ - แตะรีเฟรชเพื่อค้นหาไดรเวอร์ใหม่ Android + Linux: ตั้งไดรเวอร์แสดงผลไปด้วย Android + Linux: ตั้งไดรเวอร์รันไทม์ไปด้วย @@ -1729,7 +1729,6 @@ ตรวจสอบล้มเหลว ติดตั้ง %1$s แล้ว - เลือกจากรายการใดก็ได้เพื่อตั้งค่าไดรเวอร์ทั้งสอง ติดตั้ง %1$s แล้ว - เลือกจากเมนู - รอให้การลบรันไทม์เสร็จสิ้น เกม ทัชแพด @@ -1773,7 +1772,6 @@ ล็อกแสดงข้อผิดพลาด “Function not implemented” %1$d รายการ: การเร่งความเร็ว seccomp ของ proot ทำให้ตัวช่วยบนอุปกรณ์นี้ล้มเหลว ลอง %2$s → “%3$s” (หรือ “%4$s”) แล้วเริ่มใหม่ - พลักอิน ติดตั้งไฟล์ ZIP พลักอินสำหรับเซสชัน Steam ครั้งถัดไป กำลังดาวน์โหลด… @@ -2123,7 +2121,6 @@ Elite Dangerous พอร์ต %1$d ได้รับข้อมูล (%2$d แพ็กเก็ต ขนาด %3$d ไบต์) แต่อยู่ในรูปแบบที่หน้านี้ยังอ่านไม่ได้ มีโปรแกรมอื่นใช้พอร์ต %1$s อยู่แล้ว เกมนั้นจึงแสดงที่นี่ไม่ได้ - กำลังลบรันไทม์ Linux กำลังลบรันไทม์ Linux · %1$d รายการ @@ -2137,7 +2134,6 @@ แสดงขณะติดตั้งหรือลบรันไทม์ Linux กำลังติดตั้งรันไทม์ Linux กำลังลบรันไทม์ Linux - ยังไม่ติดตั้งรันไทม์ Linux แคตตาล็อกไม่มีค่าตรวจสอบสำหรับ %1$s ค่าตรวจสอบไม่ตรงกัน - ไม่มีการเปลี่ยนแปลงใด ๆ @@ -2145,7 +2141,6 @@ ไม่สามารถวาง AppImage ได้ การแตกไฟล์ล้มเหลว การติดตั้งล้มเหลว - การตั้งค่า Flatpak ล้มเหลว (ออกด้วยสถานะ %1$d) การตั้งค่า Flatpak ไม่เสร็จสมบูรณ์ มีงานสโตร์อื่นกำลังทำงานอยู่ @@ -2164,7 +2159,6 @@ ตัวแปลงรหัสสื่อ รันไทม์ %1$s รันไทม์ %1$s %2$s - ไฟล์มีขนาดเล็กเกินกว่าจะเป็น AppImage ไม่สามารถอ่านไฟล์ได้: %1$s นี่ไม่ใช่ AppImage (ไม่ใช่โปรแกรม Linux) @@ -2179,7 +2173,6 @@ กำลังแตกไฟล์ %1$s ไม่สามารถแตกไฟล์ AppImage ได้ ไม่สามารถแตกไฟล์ AppImage ได้: %1$s - หยุดเซสชันที่กำลังทำงานก่อนติดตั้ง Decky Loader ดาวน์โหลด Decky Loader ล้มเหลว ขนาด Decky Loader ไม่ตรงกับข้อมูลเมตาของรุ่นที่เผยแพร่ @@ -2228,13 +2221,11 @@ ไม่สามารถเปิดใช้พลักอินที่นำเข้าได้ ไม่สามารถอัปเดตการตั้งค่าพลักอินของ Decky ได้ ไม่สามารถคืนค่าพลักอินเดิมได้ - ไม่สามารถบันทึกข้อมูลประจำตัวของ Wireless debugging ได้ คำสั่ง ADB ล้มเหลว (%1$d) Android ไม่ได้ยืนยันว่าขีดจำกัดโพรเซสลูกถูกเปลี่ยน: %1$s ไม่มีการจับคู่ Wireless debugging ที่บันทึกไว้ กรอกที่อยู่ IP และพอร์ตปัจจุบันของ Wireless debugging - รอป๊อปอัปการจับคู่หมดเวลา ลองใหม่จาก DroidDeck ไม่สามารถค้นหาป๊อปอัปการจับคู่ได้ (%1$d) ตรวจสอบว่าเปิด Wi-Fi อยู่ ไม่สามารถค้นหาป๊อปอัปการจับคู่ได้: %1$s @@ -2260,7 +2251,6 @@ Steam พร้อมแล้ว แตะเพื่อกลับไปที่ DroidDeck คุณสามารถปิด Wireless debugging ได้แล้วตอนนี้ การตั้งค่า Wireless debugging หยุดแล้ว - ดาวน์โหลดไม่สำเร็จ ขนาดการดาวน์โหลดไม่ตรงกับ APK ที่เผยแพร่และถูกยกเลิก - ลองใหม่ การดาวน์โหลดไม่ตรงกับค่าตรวจสอบและถูกยกเลิก - ลองใหม่ @@ -2273,13 +2263,11 @@ APK ที่ดาวน์โหลดไม่มีข้อมูลการลงนาม APK ที่ดาวน์โหลดไม่ได้ลงนามด้วยคีย์รุ่นวางจำหน่ายของ DroidDeck แคตตาล็อกอัปเดตตอบกลับด้วย HTTP %1$d - กำลังเริ่มเซสชัน… ผ่านไป %1$d:%2$02d · ยังทำงานอยู่ กำลังดาวน์โหลดอัปเดตไคลเอนต์ Steam · %1$d%% กำลังติดตั้งอัปเดตไคลเอนต์ Steam… กำลังดาวน์โหลดไคลเอนต์ Steam · %1$s - มีการติดตั้งเครื่องมือความเข้ากันได้อื่นกำลังทำงานอยู่แล้ว หยุดเซสชันที่กำลังทำงานก่อนติดตั้งเครื่องมือความเข้ากันได้ ไม่พบรุ่นที่เผยแพร่แบบ ARM64 สำหรับ %1$s @@ -2299,7 +2287,6 @@ การติดตั้ง %1$s ล้มเหลว (ออกด้วยสถานะ %2$d) ไม่สามารถติดตั้ง %1$s ได้ กำลังดึงแพ็ก droiddeck-esync - พร้อมตัวช่วย Linux DLL เท่านั้น ต้นฉบับ (Proton ถูกอัปเดตตั้งแต่การสลับครั้งล่าสุด) @@ -2322,13 +2309,11 @@ ดาวน์โหลดไม่สำเร็จ: บิลด์ nightly นี้อาจถูกแทนที่ด้วยบิลด์ที่ใหม่กว่า รีเฟรชรายการแล้วลองอีกครั้ง รายการแพ็กเกจนี้เก่ากว่าระบบค่าตรวจสอบ - รีเฟรชแล้วลองใหม่ ค่าตรวจสอบไม่ตรงกัน - เชิงเส้น ใกล้ที่สุด Snapdragon GSR (คุณภาพ) เพิ่มความคมชัดเท่านั้น อัตโนมัติ (ตามอัตราขยาย) - ไม่ใช้เอฟเฟกต์ใด ๆ ความชัดของเกม เพิ่มความคมชัดพร้อมคอนทราสต์เล็กน้อย - ใช้งานทั่วไป @@ -2352,7 +2337,6 @@ พิกเซลคมชัดสำหรับเกม 2D และเกมรุ่นเก่า ขอบแอนิเมะ เส้นขอบแบบการ์ตูนพร้อมเพิ่มความคมชัด - ไม่ใช่ GPU Adreno ไดรเวอร์ PowerVR ของระบบ: ความเข้ากันได้แตกต่างกันตามอุปกรณ์ ทดลอง: RADV หรือไดรเวอร์ Xclipse ของระบบ @@ -2377,7 +2361,6 @@ ไม่รองรับ: ไม่มีแบ็กเอนด์กราฟิกที่เข้ากันได้สำหรับ GPU นี้ ทำงานผ่านบริดจ์ Mali บนไดรเวอร์ Vulkan ของเครื่องเอง ไม่รองรับเมื่อปิดบริดจ์ Mali: Turnip ต้องการ GPU Adreno (Snapdragon) - ติดขีดจำกัดอัตราของ GitHub - ลองใหม่ในหลัง GitHub ตอบกลับด้วย HTTP %1$d ดาวน์โหลดไม่สำเร็จ @@ -2398,16 +2381,12 @@ ไม่ใช่แพ็กไดรเวอร์: ไม่มี manifest.json ที่ระบุไดรเวอร์ android และ linux ไม่ใช่แพ็กไดรเวอร์: %1$s ชี้ไปนอกแพ็ก ไม่ใช่แพ็กไดรเวอร์: แตกไฟล์แล้วมีขนาดเกิน %1$d MB - การ์ด SD โฟลเดอร์ - แชร์ล็อกเซสชัน - ต้องใช้ Android 10 หรือใหม่กว่า (เลเยอร์แสดงผลที่มีพื้นที่สี) หน้าจอนี้ไม่รองรับ HDR หน้าจอนี้รองรับ %1$s ไม่ใช่ HDR10 - GPU นี้ ขีดจำกัดโพรเซสลูกเปิดอยู่ ยังไม่ตั้งค่าขีดจำกัดโพรเซสลูก @@ -2481,7 +2460,6 @@ คัดลอกแล้ว บังคับ SSBS คงการตั้งค่าความเร็ว CPU ที่ Wine มักปิดอยู่เสมอ อาจทำให้เกม Windows เร็วขึ้นบน Snapdragon 8 Elite แต่เห็นความเปลี่ยนแปลงน้อยบนชิปรุ่นเก่า มีผลในการเปิดเกมครั้งถัดไป - สโตร์ Steam กำหนดเอง @@ -2964,7 +2942,6 @@ สีไอคอน สีปุ่ม ไม่มีไอคอน - กำลังตรวจสอบการลงชื่อเข้าใช้… กำลังดึงข้อมูลคลังเกมของคุณ… กำลังดึงรายการเกม… @@ -3999,10 +3976,8 @@ แสดงป้ายกำกับ ไม่สามารถนำเข้าการจัดวางนี้ได้ ติดตั้งผ่าน %1$s - หิมะสีแดงชาด พื้นผิวสีขาวมีสีแดงเป็นสีเน้น - ซาวด์แทร็ก เพลง ตัวเลือกการเล่น @@ -4079,7 +4054,9 @@ ที่แสดง %1$d จาก %2$d กดกลับอีกครั้งเพื่อออก - การปรับขนาดจำนวนเต็ม - ใช้ตัวคูณการปรับขนาดจำนวนเต็มที่ใหญ่ที่สุดที่พอดี หากภาพต้นฉบับใหญ่เกินไป จะปรับภาพทั้งหมดให้พอดีเพื่อหลีกเลี่ยงการตัดภาพ โดยตั้งค่าความละเอียดแยกต่างหาก - + ใช้ตัวคูณจำนวนเต็มที่ใหญ่ที่สุดที่พอดีกับหน้าจอ ขอบภาพอาจถูกตัด หากภาพต้นฉบับใหญ่กว่าภาพขาออก การปรับขนาดแบบเศษส่วนจะแสดงภาพทั้งหมด โดยตั้งค่าความละเอียดแยกต่างหาก + จำนวนเต็ม + พอดีหน้าจอ + การลบรอยหยัก + \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 5cac17120b..b22e72c040 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,4 +1,4 @@ - + SteamVR grafikleri durdu DroidDeck, grafikleri sıfırlamak ve SteamVR\'ı yeniden açmak için %1$d saniye içinde yeniden başlayacak. Çalışan oyununuz kapanacak; kaydedilmemiş ilerleme geri yüklenemez. @@ -357,7 +357,7 @@ Oyundan sonra DroidDeck\'e dön 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. Gölgelendirici ön önbelleği - 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. + 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. Steam istemcisini onar 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. Steam istemcisi, Steam bir sonraki başlatıldığında yeniden indirilecek. @@ -710,7 +710,10 @@ Mega Şerit Yerinde kilitle - 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. + Taşımak için HUD\'u sürükleyin. Kilitliyken altındaki ekran kontrolleri çalışmaya devam eder. + Uzun basma + Daralt veya genişlet + Kilitle veya kilidini aç Yanlara yapıştır 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. Görünüm @@ -1137,7 +1140,7 @@ Lab derlemesi kapatıldı DroidDeck\'in başka bir sürümü için derlendi. Güncellemeler\'de saklanıyor. DroidDeck bu derlemeyle iki kez başlatılamadı - Ajan + Dev Harness Ajan Ajan çalışıyor Ajanı kullanmak için Claude Code\'u Linux kullanıcı alanına yükleyin. @@ -1307,6 +1310,7 @@ Adresi elle girin ADB\'li bir bilgisayardan: Komutu kopyala + Başlığı bir bilgisayara bağlayın ve SideQuest’i açın. “Run ADB Command”, ardından “Custom Command” seçin, aşağıda gösterilen komutu yazın ve “Run Command” seçin. Android Ayarları\'nın hangi ekranda açılacağını seçin. Ana ekran Eşleşti. Kablosuz hata ayıklama bağlantı noktası bulunuyor… @@ -1582,7 +1586,6 @@ Ön yüz oyun dosyaları için bir klasör seçin Oyun dosyaları şuraya kaydedildi: %1$s Ön yüz dosyaları - Çalışma ortamı işleminin bitmesini bekleyin Uyumluluk aracı yüklemesinin bitmesini bekleyin Uyumluluk araçları hazırlanıyor @@ -1668,7 +1671,6 @@ Linux çalışma ortamı kaldırılıyor Ayarlar alt ekranda açılamadı; ana ekranda açıldı. Ayarlar\'da Geliştirici seçeneklerini açın - Android\'in “Bilinmeyen uygulamaları yükle” ayarı açılamadı Kontrol edilemedi: %1$s Bu sürümde DroidDeck\'in bu kopyası için indirme yok @@ -1678,12 +1680,10 @@ Onayınız bekleniyor Güncelleme başarısız oldu Android güncellemeyi yüklemeyi önermedi - Decky yüklemesi başarısız oldu: %1$s Eklenti içe aktarma başlatılıyor… Eklenti içe aktarma başarısız oldu: %1$s Eklenti yüklendi. Etkinleştirmek için Steam\'i yeniden başlatın. - Henüz kontrol edilmedi - yeni sürücüleri aramak için yenile düğmesine dokunun Android + Linux: ekran sürücüsünü de birlikte ayarlar Android + Linux: çalışma ortamı sürücüsünü de birlikte ayarlar @@ -1736,7 +1736,6 @@ kontrol başarısız oldu %1$s yüklendi - iki sürücüyü de ayarlamak için listelerden birinde seçin %1$s yüklendi - menüden seçin - Çalışma ortamının kaldırılmasının bitmesini bekleyin Oyun dokunmatik yüzey @@ -1782,7 +1781,6 @@ Günlükte %1$d “Function not implemented” hatası görünüyor: proot\'un seccomp hızlandırması bu cihazda bir yardımcı işlemi bozuyor. %2$s → “%3$s” (veya “%4$s”) seçeneğini deneyip yeniden başlatın. Günlükte %1$d “Function not implemented” hatası görünüyor: proot\'un seccomp hızlandırması bu cihazda bir yardımcı işlemi bozuyor. %2$s → “%3$s” (veya “%4$s”) seçeneğini deneyip yeniden başlatın. - Eklentiler Sonraki Steam oturumu için bir eklenti ZIP dosyası yükleyin. İndiriliyor… @@ -2139,7 +2137,6 @@ Elite Dangerous %1$d portu veri alıyor (%3$d baytlık %2$d paket), ancak bu sayfanın henüz okuyamadığı bir biçimde. %1$s portunu zaten başka bir program kullanıyor, bu yüzden o oyun burada gösterilemez. - Linux çalışma ortamı kaldırılıyor Linux çalışma ortamı kaldırılıyor · %1$d öğe @@ -2154,7 +2151,6 @@ Linux çalışma ortamı yüklenirken veya kaldırılırken gösterilir Linux çalışma ortamı yükleniyor Linux çalışma ortamı kaldırılıyor - Linux çalışma ortamı yüklü değil Katalogda %1$s için sağlama toplamı yok Sağlama toplamı uyuşmuyor - hiçbir şey değiştirilmedi @@ -2162,7 +2158,6 @@ AppImage yerleştirilemedi Ayıklama başarısız oldu Yükleme başarısız oldu - Flatpak kurulumu başarısız oldu (çıkış %1$d) Flatpak kurulumu tamamlanmadı Başka bir mağaza görevi çalışıyor @@ -2181,7 +2176,6 @@ medya kodekleri %1$s çalışma ortamı %1$s çalışma ortamı %2$s - Dosya, AppImage olamayacak kadar küçük Dosya okunamıyor: %1$s Bu bir AppImage değil (Linux programı değil) @@ -2196,7 +2190,6 @@ %1$s ayıklanıyor AppImage ayıklanamadı AppImage ayıklanamadı: %1$s - Decky Loader\'ı yüklemeden önce etkin oturumu durdurun Decky Loader indirilemedi Decky Loader boyutu yayın meta verileriyle eşleşmedi @@ -2245,13 +2238,11 @@ İçe aktarılan eklenti etkinleştirilemedi Decky eklenti ayarları güncellenemedi Mevcut eklenti geri yüklenemedi - Kablosuz hata ayıklama kimliği kaydedilemedi ADB komutu başarısız oldu (%1$d) Android, alt süreç sınırının değiştirildiğini onaylamadı: %1$s Kayıtlı bir Kablosuz hata ayıklama eşleşmesi yok Geçerli Kablosuz hata ayıklama IP adresini ve bağlantı noktasını girin - Eşleştirme açılır penceresi beklenirken zaman aşımına uğradı. DroidDeck\'ten yeniden deneyin. Eşleştirme açılır penceresi aranamadı (%1$d). Wi-Fi\'nin açık olduğunu kontrol edin. Eşleştirme açılır penceresi aranamadı: %1$s @@ -2277,7 +2268,6 @@ Steam hazır DroidDeck\'e geri dönmek için dokunun. Kablosuz hata ayıklamayı şimdi kapatabilirsiniz. Kablosuz hata ayıklama kurulumu durdu - İndirme başarısız İndirme boyutu yayınlanan APK ile eşleşmedi ve atıldı - yeniden deneyin İndirme, sağlama toplamıyla eşleşmedi ve atıldı - yeniden deneyin @@ -2290,13 +2280,11 @@ İndirilen APK\'da imza bilgisi yok İndirilen APK, DroidDeck\'in yayın anahtarıyla imzalanmamış Güncelleme kataloğu HTTP %1$d yanıtı verdi - Oturum başlatılıyor… %1$d:%2$02d geçti · hâlâ çalışıyor Steam istemcisi güncellemesi indiriliyor · %1$d%% Steam istemcisi güncellemesi uygulanıyor… Steam istemcisi indiriliyor · %1$s - Zaten çalışan bir uyumluluk aracı yüklemesi var Uyumluluk araçlarını yüklemeden önce etkin oturumu durdurun %1$s için bir ARM64 yayını bulunamadı @@ -2316,7 +2304,6 @@ %1$s yüklemesi başarısız oldu (çıkış %2$d) %1$s yüklenemedi droiddeck-esync paketi getiriliyor - Linux yardımcılarıyla Yalnızca DLL\'ler Orijinal (son değişimden sonra Proton güncellendi) @@ -2339,13 +2326,11 @@ İndirme başarısız: bu nightly derleme daha yenisiyle değiştirilmiş olabilir. Listeyi yenileyip tekrar deneyin. Bu paket listesi sağlama toplamlarından önceki bir tarihe ait - yenileyip yeniden deneyin Sağlama toplamı uyuşmuyor - Doğrusal En yakın Snapdragon GSR (kalite) Yalnızca keskinleştirme Otomatik (ölçeklemeye göre) - Hiçbir şey uygulanmadı. Oyun Netliği Hafif kontrastla keskinleştirme - günlük kullanım için. @@ -2369,7 +2354,6 @@ 2D ve eski oyunlar için net pikseller. Anime Kenar Çizgi film konturları ve keskinleştirme. - Adreno GPU değil Sistem PowerVR sürücüsü: uyumluluk cihaza göre değişir Deneysel: RADV veya sistem Xclipse sürücüsü @@ -2394,7 +2378,6 @@ Desteklenmiyor: bu GPU için uyumlu bir grafik arka ucu yok Telefonun kendi Vulkan sürücüsü üzerinde, Mali köprüsü aracılığıyla çalışır Mali köprüsü kapalıyken desteklenmez: Turnip, Adreno (Snapdragon) GPU gerektirir - GitHub\'ın hız sınırına ulaşıldı - daha sonra yeniden deneyin GitHub HTTP %1$d yanıtı verdi İndirme başarısız @@ -2415,16 +2398,12 @@ Bir sürücü paketi değil: bir android ve bir linux sürücüsü belirten manifest.json yok Bir sürücü paketi değil: %1$s dışına işaret ediyor Bir sürücü paketi değil: %1$d MB\'den fazla alana açılıyor - SD kart Klasör - Oturum günlüklerini paylaş - Android 10 veya daha yenisi gerekir (renk uzayına sahip ekran katmanları) bu ekran HDR desteği bildirmiyor bu ekran HDR10 değil, %1$s destekliyor - bu GPU Alt süreç sınırı açık Alt süreç sınırı ayarlanmamış @@ -2498,7 +2477,6 @@ Kopyalandı. SSBS\'i zorla Wine\'ın sürekli kapattığı bir CPU hız ayarını açık tutar. Snapdragon 8 Elite\'te Windows oyunlarını hızlandırabilir; daha eski yongalarda pek fark görülmez. Bir sonraki oyun başlatmasında uygulanır. - Mağazalar Steam Özel @@ -2981,7 +2959,6 @@ Simge rengi Düğme rengi Simge yok - Oturum açma durumu kontrol ediliyor… Kitaplığın alınıyor… Oyun listesi alınıyor… @@ -4029,10 +4006,8 @@ Etiketi göster Bu düzen içe aktarılamadı %1$s üzerinden yüklenir - Kızıl Kar Kırmızı vurgulu beyaz yüzeyler. - Oyun müzikleri Müzik Oynatma seçenekleri @@ -4109,7 +4084,9 @@ Gösterilen %1$d / %2$d Çıkmak için bir kez daha geri basın - Tam sayı ölçeklendirme - Sığan en büyük tam sayı ölçekleme katsayısını kullanır. Kaynak çok büyükse kırpmayı önlemek için görüntünün tamamını sığdırır. Çözünürlük ayrı ayarlanır. - + Ekrana sığan en büyük tam sayı ölçeğini kullanır. Ekran kenarları kırpılabilir. Kaynak görüntü çıktıdan büyükse kesirli ölçekleme görüntünün tamamını gösterir. Çözünürlük ayrı ayarlanır. + Tam sayı + Sığdır + Kenar yumuşatma + \ No newline at end of file diff --git a/app/src/main/res/values-uk/input_library.xml b/app/src/main/res/values-uk/input_library.xml index c00c0b1a39..f2504dde51 100644 --- a/app/src/main/res/values-uk/input_library.xml +++ b/app/src/main/res/values-uk/input_library.xml @@ -29,7 +29,7 @@ Хрестовина Тригер Готово - Скасувати + Скасувати дію + Додати Перетягніть, щоб перемістити. Потягніть за кут, щоб змінити розмір. Торкніться «Властивості», щоб призначити дію. Редагування на другому екрані diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e8a3700511..5ed3e0dffe 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,4 +1,4 @@ - + Графіка SteamVR зупинилася DroidDeck перезапуститься через %1$d с, щоб скинути графіку й знову відкрити SteamVR. Запущену гру буде закрито; незбережений прогрес не вдасться відновити. @@ -357,7 +357,7 @@ Повертатися в DroidDeck після гри Коли гра, запущена з DroidDeck або іншого лаунчера, закривається, Steam коректно завершує роботу (спершу завершується збереження в хмару), і ви повертаєтеся туди. Вимкнено: залишатися в Steam. Попереднє кешування шейдерів - Steam завантажує готові шейдери для ваших ігор і обробляє їх у фоні, тож ігри менше підвисають. Вимкнення заощаджує трафік, місце й заряд батареї; натомість ігри збирають шейдери під час гри. Це те саме налаштування, що й «Завантаження > Попереднє кешування шейдерів» у Steam. Застосовується в наступному сеансі. + Steam завантажує готові шейдери для ваших ігор і обробляє їх у фоні, тож ігри менше підвисають. Вимкнення заощаджує трафік, місце й заряд батареї; натомість ігри збирають шейдери під час гри. Це те саме налаштування, що й «Завантаження > Попереднє кешування шейдерів» у Steam. Застосовується в наступному сеансі. Відновити клієнт Steam Повторно завантажує клієнт Steam під час наступного запуску Steam. Скористайтеся цим, якщо Steam не виходить з екрана завантаження. Ігри, вхід і налаштування зберігаються. Клієнт Steam буде повторно завантажено під час наступного запуску Steam. @@ -714,7 +714,10 @@ Мега Смуга Закріпити на місці - Перетягніть HUD, щоб перемістити його; довге натискання закріплює або відкріплює його. Поки його закріплено, екранні елементи керування під ним працюють і далі. + Перетягніть HUD, щоб перемістити його. Поки його закріплено, екранні елементи керування під ним працюють і далі. + Довге натискання + Згорнути або розгорнути + Закріпити або відкріпити Прилипання до боків Відпустіть HUD, і він переміститься до ближчого боку екрана. Різкий жест відкине його в той бік. Вигляд @@ -1151,7 +1154,7 @@ Збірку Lab вимкнено Її зібрано для іншої версії DroidDeck. Вона зберігається в «Оновленнях». DroidDeck двічі не запустився на цій збірці - Агент + Dev Harness Агент Агент працює Встановіть Claude Code у користувацькому середовищі Linux, щоб користуватися агентом. @@ -1329,6 +1332,7 @@ Ввести адресу вручну З комп’ютера з ADB: Копіювати команду + Підключіть шолом до комп’ютера й відкрийте SideQuest. Виберіть «Run ADB Command», потім «Custom Command», введіть команду, показану нижче, і виберіть «Run Command». Виберіть, на якому екрані відкрити налаштування Android. Головний екран Поєднано. Пошук порту бездротового налагодження… @@ -1606,7 +1610,6 @@ Виберіть папку для файлів ігор для фронтендів Файли ігор збережено в %1$s Файли для фронтендів - Дочекайтеся завершення операції із середовищем Дочекайтеся завершення встановлення інструмента сумісності Підготовка інструментів сумісності @@ -1702,7 +1705,6 @@ Видалення середовища Linux Не вдалося відкрити налаштування на нижньому екрані, тож їх відкрито на основному. Відкрийте «Параметри розробника» в налаштуваннях - Не вдалося відкрити налаштування Android «Встановлення невідомих додатків» Не вдалося перевірити: %1$s У цій збірці немає завантаження для вашої копії DroidDeck @@ -1712,12 +1714,10 @@ Очікування вашого підтвердження Не вдалося оновити Android не запропонував встановити оновлення - Не вдалося встановити Decky: %1$s Початок імпорту плагіна… Не вдалося імпортувати плагін: %1$s Плагін встановлено. Перезапустіть Steam, щоб завантажити його. - Ще не перевірено — натисніть «Оновити», щоб пошукати нові драйвери Android + Linux: заодно встановлює драйвер дисплея Android + Linux: заодно встановлює драйвер середовища @@ -1776,7 +1776,6 @@ помилка перевірки Встановлено %1$s — виберіть його в будь-якому зі списків, щоб задати обидва драйвери Встановлено %1$s — виберіть його в меню - Дочекайтеся завершення видалення середовища Гра тачпад @@ -1826,7 +1825,6 @@ У журналі %1$d помилок «Function not implemented»: прискорення seccomp у proot порушує роботу допоміжної програми на цьому пристрої. Спробуйте %2$s → «%3$s» (або «%4$s») і запустіть знову. У журналі %1$d помилки «Function not implemented»: прискорення seccomp у proot порушує роботу допоміжної програми на цьому пристрої. Спробуйте %2$s → «%3$s» (або «%4$s») і запустіть знову. - Плагіни Встановіть плагін із ZIP для наступного сеансу Steam. Завантаження… @@ -2197,7 +2195,6 @@ Elite Dangerous Порт %1$d отримує дані (пакетів: %2$d, по %3$d байт), але у форматі, який ця сторінка ще не вміє читати. Порт %1$s уже використовує інша програма, тому ця гра не може відображатися тут. - Видалення середовища Linux Видалення середовища Linux · %1$d запис @@ -2214,7 +2211,6 @@ Показується під час встановлення або видалення середовища Linux Встановлення середовища Linux Видалення середовища Linux - Середовище Linux не встановлено У каталозі немає контрольної суми для %1$s Контрольна сума не збігається — нічого не змінено @@ -2222,7 +2218,6 @@ Не вдалося розмістити AppImage Не вдалося розпакувати Не вдалося встановити - Не вдалося налаштувати Flatpak (код %1$d) Налаштування Flatpak не завершено Виконується інше завдання магазину @@ -2241,7 +2236,6 @@ медіакодеків середовища виконання %1$s середовища виконання %1$s %2$s - Файл замалий для AppImage Не вдається прочитати файл: %1$s Це не AppImage (це не програма для Linux) @@ -2256,7 +2250,6 @@ Розпакування %1$s Не вдалося розпакувати AppImage Не вдалося розпакувати AppImage: %1$s - Зупиніть активний сеанс, перш ніж встановлювати Decky Loader Не вдалося завантажити Decky Loader Розмір Decky Loader не збігся з метаданими випуску @@ -2305,13 +2298,11 @@ Не вдалося активувати імпортований плагін Не вдалося оновити налаштування плагінів Decky Не вдалося відновити наявний плагін - Не вдалося зберегти ідентифікаційні дані бездротового налагодження Команда ADB завершилася помилкою (%1$d) Android не підтвердив зміну обмеження дочірніх процесів: %1$s Немає збереженої прив’язки бездротового налагодження Введіть поточну IP-адресу та порт бездротового налагодження - Час очікування вікна прив’язки минув. Спробуйте ще раз із DroidDeck. Не вдалося знайти вікно прив’язки (%1$d). Перевірте, що Wi-Fi увімкнено. Не вдалося знайти вікно прив’язки: %1$s @@ -2337,7 +2328,6 @@ Steam готовий Торкніться, щоб повернутися до DroidDeck. Тепер можна вимкнути бездротове налагодження. Налаштування бездротового налагодження зупинено - Не вдалося завантажити Розмір завантаження не збігся з опублікованим APK, тож його відхилено - спробуйте ще раз Завантаження не збіглося з контрольною сумою, тож його відхилено - спробуйте ще раз @@ -2350,13 +2340,11 @@ Завантажений APK не містить інформації про підпис Завантажений APK не підписано ключем випуску DroidDeck Каталог оновлень відповів HTTP %1$d - Запуск сеансу… %1$d:%2$02d минуло · досі триває Завантаження оновлення клієнта Steam · %1$d%% Застосування оновлення клієнта Steam… Завантаження клієнта Steam · %1$s - Встановлення інструмента сумісності вже триває Зупиніть активний сеанс, перш ніж встановлювати інструменти сумісності Не вдалося знайти випуск ARM64 для %1$s @@ -2376,7 +2364,6 @@ Встановлення %1$s не вдалося (код виходу %2$d) Не вдалося встановити %1$s Отримання пакета droiddeck-esync - з допоміжними засобами Linux лише DLL Оригінал (Proton оновлено з часу останньої заміни) @@ -2399,13 +2386,11 @@ Не вдалося завантажити: можливо, цю нічну збірку замінено новішою. Оновіть список і спробуйте ще раз. Цей список пакетів створено до появи контрольних сум - оновіть його і спробуйте ще раз Контрольна сума не збіглася - Лінійний Найближчий Snapdragon GSR (якість) Лише різкість Автоматично (відповідно до масштабування) - Нічого не застосовано. Ігрова чіткість Різкість із ноткою контрасту - варіант на щодень. @@ -2429,7 +2414,6 @@ Чіткі пікселі для 2D та старих ігор. Аніме-контур Контури у стилі мультфільму плюс різкість. - Не GPU Adreno Системний драйвер PowerVR: сумісність залежить від пристрою Експериментально: RADV або системний драйвер Xclipse @@ -2454,7 +2438,6 @@ Не підтримується: для цього GPU немає сумісного графічного бекенда Працює через міст Mali на власному драйвері Vulkan телефону Не підтримується, коли міст Mali вимкнено: Turnip потребує GPU Adreno (Snapdragon) - Перевищено ліміт запитів GitHub - спробуйте пізніше GitHub відповів HTTP %1$d Не вдалося завантажити @@ -2475,16 +2458,12 @@ Не є набором драйверів: немає manifest.json із вказаними драйверами android і linux Не є набором драйверів: %1$s вказує за його межі Не є набором драйверів: розпаковується в обсяг понад %1$d MB - SD-карта Папка - Поділитися журналами сеансу - потрібен Android 10 або новіший (шари дисплея з кольоровим простором) цей дисплей не повідомляє про підтримку HDR цей дисплей підтримує %1$s, а не HDR10 - цей GPU Обмеження дочірніх процесів увімкнено Обмеження дочірніх процесів не задано @@ -2558,7 +2537,6 @@ Скопійовано. Примусовий SSBS Утримує увімкненим налаштування швидкості CPU, яке Wine постійно вимикає. Може прискорити ігри Windows на Snapdragon 8 Elite; на старших чипах зміни майже непомітні. Застосовується під час наступного запуску гри. - Магазини Steam Власна @@ -3050,7 +3028,6 @@ Колір значка Колір кнопки Без значка - Перевірка входу… Отримання вашої бібліотеки… Отримання списку ігор… @@ -4109,10 +4086,8 @@ Показувати підпис Не вдалося імпортувати цю розкладку Встановлюється через %1$s - Багряний сніг Білі поверхні з червоними акцентами. - Саундтреки Музика Параметри відтворення @@ -4189,7 +4164,9 @@ Показано %1$d з %2$d Натисніть «Назад» ще раз, щоб вийти - Цілочисельне масштабування - Використовує найбільший цілий коефіцієнт масштабування, який поміщається. Якщо вихідне зображення завелике, воно вміщується повністю без обрізання. Роздільна здатність налаштовується окремо. - + Використовує найбільший цілий масштаб, що вміщується. Краї екрана можуть обрізатися. Якщо джерело більше за вихідне зображення, дробове масштабування показує його повністю. Роздільна здатність налаштовується окремо. + Ціле число + За розміром + Згладжування + \ No newline at end of file diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 6bf128970a..6179086eb8 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,4 +1,4 @@ - + Đồ họa SteamVR đã dừng DroidDeck sẽ khởi động lại sau %1$d giây để đặt lại đồ họa và mở lại SteamVR. Game đang chạy sẽ bị đóng; tiến trình chưa lưu sẽ không thể khôi phục. @@ -357,7 +357,7 @@ Quay lại DroidDeck sau khi chơi 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. Lưu trước shader - 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. + 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. Sửa chữa client Steam 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. Client Steam sẽ được tải lại vào lần Steam khởi động kế tiếp. @@ -708,7 +708,10 @@ Mega Thanh Khóa vị trí - 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. + Kéo HUD để di chuyển. 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. + Nhấn giữ + Thu gọn hoặc mở rộng + Khóa hoặc mở khóa Bám vào cạnh trái/phải 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 đó. Giao diện @@ -1142,7 +1145,7 @@ Đã tắt bản dựng thử nghiệm Bản dựng này được tạo cho một phiên bản DroidDeck khác. Bản dựng vẫn được giữ trong Cập nhật. DroidDeck đã không khởi động được bằng bản dựng này hai lần - Trợ lý + Dev Harness Trợ lý Trợ lý đang xử lý Cài Claude Code trong môi trường người dùng Linux để sử dụng trợ lý. @@ -1309,6 +1312,7 @@ Nhập địa chỉ thủ công Từ một máy tính có ADB: Sao chép lệnh + Kết nối kính với máy tính và mở SideQuest. Chọn “Run ADB Command”, rồi “Custom Command”, nhập lệnh hiển thị bên dưới và chọn “Run Command”. Chọn màn hình để mở Android Settings. Màn hình chính Đã ghép nối. Đang tìm cổng Gỡ lỗi qua mạng không dây… @@ -1583,7 +1587,6 @@ Chọn một thư mục cho các tệp game frontend Đã lưu tệp game vào %1$s Tệp frontend - Chờ hoạt động runtime hoàn tất Chờ việc cài công cụ tương thích hoàn tất Đang chuẩn bị công cụ tương thích @@ -1664,7 +1667,6 @@ Đang gỡ runtime Linux Không thể mở Settings trên màn hình dưới; đã mở nó trên màn hình chính. Mở Developer options trong Settings - Không thể mở thiết lập \"Install unknown apps\" của Android Không thể kiểm tra: %1$s Bản build này không có tệp tải cho bản DroidDeck này @@ -1674,12 +1676,10 @@ Đang chờ bạn xác nhận Cập nhật thất bại Android không đề nghị cài bản cập nhật - Cài Decky thất bại: %1$s Đang bắt đầu nhập plugin… Nhập plugin thất bại: %1$s Đã cài plugin. Khởi động lại Steam để tải nó. - Chưa kiểm tra - nhấn làm mới để tìm driver mới Android + Linux: cùng đặt driver hiển thị Android + Linux: cùng đặt driver runtime @@ -1729,7 +1729,6 @@ kiểm tra thất bại Đã cài %1$s - chọn nó ở một trong hai danh sách để đặt cả hai driver Đã cài %1$s - chọn nó trong menu - Chờ việc gỡ runtime hoàn tất Game touchpad @@ -1773,7 +1772,6 @@ Log cho thấy %1$d lỗi \"Function not implemented\": khả năng tăng tốc seccomp của proot đang làm hỏng một helper trên thiết bị này. Hãy thử %2$s → \"%3$s\" (hoặc \"%4$s\") rồi khởi động lại. - Plugin Cài một tệp ZIP plugin cho phiên Steam kế tiếp. Đang tải… @@ -2123,7 +2121,6 @@ Elite Dangerous 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. 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. - Đang gỡ runtime Linux Đang gỡ runtime Linux · %1$d mục @@ -2137,7 +2134,6 @@ Hiển thị khi runtime Linux đang được cài hoặc gỡ Đang cài runtime Linux Đang gỡ runtime Linux - Runtime Linux chưa được cài Danh mục không có checksum cho %1$s Checksum không khớp - không có gì bị thay đổi @@ -2145,7 +2141,6 @@ Không thể đặt AppImage Giải nén thất bại Cài thất bại - Thiết lập Flatpak thất bại (mã thoát %1$d) Thiết lập Flatpak chưa hoàn tất Một tác vụ store khác đang chạy @@ -2164,7 +2159,6 @@ codec media runtime %1$s runtime %1$s %2$s - Tệp này quá nhỏ để là một AppImage Không thể đọc tệp: %1$s Đây không phải AppImage (không phải chương trình Linux) @@ -2179,7 +2173,6 @@ Đang giải nén %1$s Không thể giải nén AppImage Không thể giải nén AppImage: %1$s - Dừng phiên đang hoạt động trước khi cài Decky Loader Tải Decky Loader thất bại Kích thước Decky Loader không khớp với metadata của bản phát hành @@ -2228,13 +2221,11 @@ Không thể kích hoạt plugin đã nhập Không thể cập nhật thiết lập plugin Decky Không thể khôi phục plugin hiện có - Không thể lưu danh tính Gỡ lỗi qua mạng không dây Lệnh ADB thất bại (%1$d) Android không xác nhận giới hạn tiến trình con đã được đổi: %1$s Chưa có ghép nối Gỡ lỗi qua mạng không dây nào được lưu Nhập địa chỉ IP & cổng Gỡ lỗi qua mạng không dây hiện tại - Hết thời gian chờ cửa sổ bật lên ghép nối. Hãy thử lại từ DroidDeck. Không thể tìm cửa sổ bật lên ghép nối (%1$d). Kiểm tra Wi-Fi đã bật. Không thể tìm cửa sổ bật lên ghép nối: %1$s @@ -2260,7 +2251,6 @@ Steam đã sẵn sàng Nhấn để quay lại DroidDeck. Bạn có thể tắt Gỡ lỗi qua mạng không dây ngay bây giờ. Thiết lập Gỡ lỗi qua mạng không dây đã dừng - Tải xuống thất bại Kích thước tải xuống không khớp với APK đã phát hành và đã bị loại bỏ - hãy thử lại Tệp tải xuống không khớp checksum và đã bị loại bỏ - hãy thử lại @@ -2273,13 +2263,11 @@ APK đã tải xuống không có thông tin ký APK đã tải xuống không được ký bằng khóa phát hành của DroidDeck Danh mục cập nhật trả về HTTP %1$d - Đang khởi động phiên… %1$d:%2$02d đã trôi qua · vẫn đang xử lý Đang tải bản cập nhật client Steam · %1$d%% Đang áp dụng bản cập nhật ứng dụng Steam… Đang tải client Steam · %1$s - Một lượt cài công cụ tương thích đang chạy Dừng phiên đang hoạt động trước khi cài công cụ tương thích Không tìm thấy bản phát hành ARM64 cho %1$s @@ -2299,7 +2287,6 @@ Cài %1$s thất bại (mã thoát %2$d) Không thể cài %1$s Đang lấy pack droiddeck-esync - có trợ giúp Linux chỉ DLL Gốc (Proton đã cập nhật từ lần thay gần nhất) @@ -2322,13 +2309,11 @@ Tải xuống thất bại: bản nightly này có thể đã được thay bằng bản mới hơn. Hãy làm mới danh sách và thử lại. Danh sách gói này có trước checksum - hãy làm mới và thử lại Checksum không khớp - Tuyến tính Gần nhất Snapdragon GSR (chất lượng) Chỉ làm nét Tự động (khớp tỷ lệ) - Không áp dụng gì. Rõ nét trò chơi Làm nét với một chút tương phản - lựa chọn hàng ngày. @@ -2352,7 +2337,6 @@ Pixel sắc nét cho game 2D và các game cũ. Viền anime Viền hoạt hình cộng làm nét. - Không phải GPU Adreno Trình điều khiển PowerVR của hệ thống: khả năng tương thích tùy thiết bị Thử nghiệm: RADV hoặc trình điều khiển Xclipse của hệ thống @@ -2377,7 +2361,6 @@ Không được hỗ trợ: không có backend đồ họa tương thích cho GPU này Chạy qua cầu nối Mali, trên trình điều khiển Vulkan gốc của máy Không hỗ trợ khi tắt cầu nối Mali: Turnip cần GPU Adreno (Snapdragon) - Đã đạt giới hạn tốc độ của GitHub - hãy thử lại sau GitHub trả về HTTP %1$d Tải xuống thất bại @@ -2398,16 +2381,12 @@ Không phải gói driver: không có manifest.json ghi tên một driver android và một driver linux Không phải gói driver: %1$s trỏ ra ngoài nó Không phải gói driver: nó giải nén vượt quá %1$d MB - Thẻ SD Thư mục - Chia sẻ log phiên - cần Android 10 hoặc mới hơn (lớp hiển thị có không gian màu) màn hình này báo không hỗ trợ HDR màn hình này hỗ trợ %1$s, không phải HDR10 - GPU này Giới hạn tiến trình con đang bật Giới hạn tiến trình con chưa được đặt @@ -2481,7 +2460,6 @@ Đã sao chép. Buộc SSBS Giữ một thiết lập tốc độ CPU mà Wine liên tục tắt. Có thể giúp game Windows nhanh hơn trên Snapdragon 8 Elite; thay đổi ít thấy trên chip cũ hơn. Áp dụng vào lần game khởi động kế tiếp. - Cửa hàng game Steam Tùy chỉnh @@ -2964,7 +2942,6 @@ Màu biểu tượng Màu nút Không có biểu tượng - Đang kiểm tra đăng nhập… Đang lấy thư viện của bạn… Đang lấy danh sách trò chơi… @@ -3999,10 +3976,8 @@ Hiện nhãn Không thể nhập bố cục này Cài đặt qua %1$s - Tuyết đỏ thẫm Bề mặt trắng với điểm nhấn màu đỏ. - Nhạc nền Nhạc Tùy chọn phát @@ -4079,7 +4054,9 @@ Đang hiển thị %1$d trên %2$d Nhấn lại để thoát - Tỷ lệ nguyên - Sử dụng hệ số tỷ lệ nguyên lớn nhất có thể vừa màn hình. Nếu nguồn quá lớn, toàn bộ hình ảnh sẽ được thu vừa để tránh bị cắt. Độ phân giải được thiết lập riêng. - + Dùng tỷ lệ nguyên lớn nhất vừa với màn hình. Có thể cắt mép màn hình. Nếu ảnh nguồn lớn hơn đầu ra, tỷ lệ phân số sẽ hiển thị toàn bộ ảnh. Độ phân giải được thiết lập riêng. + Số nguyên + Vừa màn hình + Khử răng cưa + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 30911b00be..06b91530e2 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,4 +1,4 @@ - + SteamVR 图形已停止工作 DroidDeck 将在 %1$d 秒后重启,以重置图形并重新打开 SteamVR。正在运行的游戏将被关闭,未保存的进度无法恢复。 @@ -357,7 +357,7 @@ 游戏结束后返回 DroidDeck 从 DroidDeck 或其他启动器启动的游戏关闭后,Steam 会正常退出(先完成云存档同步),并返回启动位置。关闭:留在 Steam 中。 着色器预缓存 - Steam 会为你的游戏下载预编译的着色器并在后台处理,以减少游戏卡顿。关闭可节省流量、存储空间和电量;游戏会改为在运行时编译着色器。与 Steam 的“下载”>“着色器预缓存”为同一设置。下次会话时生效。 + Steam 会为你的游戏下载预编译的着色器并在后台处理,以减少游戏卡顿。关闭可节省流量、存储空间和电量;游戏会改为在运行时编译着色器。与 Steam 的“下载”>“着色器预缓存”为同一设置。下次会话时生效。 修复 Steam 客户端 下次启动 Steam 时重新下载 Steam 客户端。如果 Steam 一直停在加载画面,请使用此项。游戏、登录信息和设置都会保留。 下次启动 Steam 时将重新下载 Steam 客户端。 @@ -708,7 +708,10 @@ 超大 横条 锁定位置 - 拖动 HUD 可移动位置;长按可锁定或解锁。锁定时,下方的屏幕控件仍可使用。 + 拖动 HUD 可移动位置。锁定时,下方的屏幕控件仍可使用。 + 长按 + 折叠或展开 + 锁定或解锁 吸附到两侧 松开 HUD 后,它会移到屏幕较近的一侧。轻甩可将它甩向该方向。 外观 @@ -1225,7 +1228,7 @@ 实验构建已停用 它为其他版本的 DroidDeck 构建,已保留在更新中。 DroidDeck 在该构建上两次启动失败 - 智能体 + Dev Harness 智能体 智能体正在工作 在 Linux 用户空间中安装 Claude Code 才能使用智能体。 @@ -1392,6 +1395,7 @@ 手动输入地址 通过装有 ADB 的电脑: 复制命令 + 将头显连接到电脑并打开 SideQuest。依次选择“Run ADB Command”和“Custom Command”,输入下方显示的命令,然后选择“Run Command”。 选择在哪个屏幕上打开 Android 设置。 主屏幕 已配对。正在查找无线调试端口… @@ -1666,7 +1670,6 @@ 选择前端游戏文件的文件夹 游戏文件已保存到 %1$s 前端文件 - 请等待运行时操作完成 请等待兼容性工具安装完成 正在准备兼容性工具 @@ -1747,7 +1750,6 @@ 正在移除 Linux 运行时 无法在底部屏幕上打开设置,已改为在主屏幕上打开。 在设置中打开开发者选项 - 无法打开 Android 的“安装未知应用”设置 无法检查:%1$s 此构建没有适用于此 DroidDeck 副本的下载 @@ -1757,12 +1759,10 @@ 等待你确认 更新失败 Android 未提供安装此更新的选项 - Decky 安装失败:%1$s 正在开始导入插件… 插件导入失败:%1$s 插件已安装。重启 Steam 即可加载。 - 尚未检查 — 点按刷新以查找新驱动 Android + Linux:同时设置显示驱动 Android + Linux:同时设置运行时驱动 @@ -1806,7 +1806,6 @@ 检查失败 已安装 %1$s — 在任一列表中选择它即可同时设置两个驱动 已安装 %1$s — 请在菜单中选择它 - 请等待运行时移除完成 游戏 触控板 @@ -1850,7 +1849,6 @@ 日志中有 %1$d 个“Function not implemented”错误:proot 的 seccomp 加速在此设备上导致某个辅助进程失败。请尝试 %2$s → “%3$s”(或“%4$s”),然后重新启动。 - 插件 安装插件 ZIP 包,将在下次 Steam 会话中生效。 正在下载… @@ -2200,7 +2198,6 @@ Elite Dangerous 端口 %1$d 正在接收数据(%2$d 个 %3$d 字节的数据包),但其格式本页面暂时无法读取。 端口 %1$s 已被其他程序占用,因此该游戏无法在此显示。 - 正在移除 Linux 运行时 正在移除 Linux 运行时 · %1$d 项 @@ -2214,7 +2211,6 @@ 在安装或移除 Linux 运行时期间显示 正在安装 Linux 运行时 正在移除 Linux 运行时 - 未安装 Linux 运行时 目录中没有 %1$s 的校验和 校验和不匹配 — 未做任何更改 @@ -2222,7 +2218,6 @@ 无法放置 AppImage 解压失败 安装失败 - Flatpak 配置失败(退出代码 %1$d) Flatpak 配置未完成 另一个商店任务正在运行 @@ -2241,7 +2236,6 @@ 媒体编解码器 %1$s 运行时 %1$s 运行时 %2$s - 文件太小,不可能是 AppImage 无法读取文件:%1$s 这不是 AppImage(不是 Linux 程序) @@ -2256,7 +2250,6 @@ 正在解压 %1$s 无法解压该 AppImage 无法解压该 AppImage:%1$s - 安装 Decky Loader 前请先停止当前会话 Decky Loader 下载失败 Decky Loader 的大小与发布元数据不符 @@ -2305,13 +2298,11 @@ 无法启用导入的插件 无法更新 Decky 插件设置 无法恢复现有插件 - 无法保存无线调试身份信息 ADB 命令执行失败(%1$d) Android 未确认子进程限制已更改:%1$s 未保存任何无线调试配对 请输入当前的无线调试 IP 地址与端口 - 等待配对弹窗超时。请从 DroidDeck 重试。 无法查找配对弹窗(%1$d)。请检查 Wi-Fi 是否已开启。 无法查找配对弹窗:%1$s @@ -2337,7 +2328,6 @@ Steam 已就绪 点按即可返回 DroidDeck。现在可以关闭无线调试了。 无线调试配置已中止 - 下载失败 下载的文件大小与发布的 APK 不符,已丢弃 — 请重试 下载的文件与校验和不符,已丢弃 — 请重试 @@ -2350,13 +2340,11 @@ 下载的 APK 没有签名信息 下载的 APK 未使用 DroidDeck 的发布密钥签名 更新目录返回 HTTP %1$d - 正在启动会话… 已用时 %1$d:%2$02d · 仍在处理 正在下载 Steam 客户端更新 · %1$d%% 正在应用 Steam 客户端更新… 正在下载 Steam 客户端 · %1$s - 已有兼容性工具正在安装 安装兼容性工具前请先停止当前会话 找不到 %1$s 的 ARM64 发布版本 @@ -2376,7 +2364,6 @@ %1$s 安装失败(退出代码 %2$d) 无法安装 %1$s 正在获取 droiddeck-esync 包 - 含 Linux 辅助组件 仅 DLL 原件(上次替换后 Proton 已更新) @@ -2399,13 +2386,11 @@ 下载失败:此每夜版本可能已被更新的版本替换。请刷新列表后重试。 此软件包列表早于校验和功能 — 请刷新后重试 校验和不匹配 - 线性 最近邻 Snapdragon GSR(质量) 仅锐化 自动(匹配缩放) - 不应用任何效果。 游戏清晰 锐化并略增对比度 — 适合日常使用。 @@ -2429,7 +2414,6 @@ 为 2D 和老游戏提供清晰锐利的像素。 动漫描边 卡通描边加锐化。 - 不是 Adreno GPU 系统 PowerVR 驱动:兼容性因设备而异 实验性:RADV 或系统 Xclipse 驱动 @@ -2454,7 +2438,6 @@ 不受支持:没有适用于此 GPU 的兼容图形后端 通过 Mali 桥接运行,使用手机自带的 Vulkan 驱动 关闭 Mali 桥接时不受支持:Turnip 需要 Adreno(骁龙)GPU - 已达到 GitHub 的请求频率限制 — 请稍后重试 GitHub 返回 HTTP %1$d 下载失败 @@ -2475,16 +2458,12 @@ 不是驱动组合包:没有指定 Android 和 Linux 驱动的 manifest.json 不是驱动组合包:%1$s 指向包外 不是驱动组合包:解包后超过 %1$d MB - SD 卡 文件夹 - 分享会话日志 - 需要 Android 10 或更高版本(支持色彩空间的显示图层) 此显示器未报告支持 HDR 此显示器支持 %1$s,但不支持 HDR10 - 此 GPU 子进程限制已开启 子进程限制未设置 @@ -2558,7 +2537,6 @@ 已复制。 强制 SSBS 保持开启一项 Wine 会不断关闭的 CPU 速度设置。在骁龙 8 至尊版上可能让 Windows 游戏更快;在较旧芯片上变化不大。下次启动游戏时生效。 - 游戏商店 Steam 自定义 @@ -2964,7 +2942,6 @@ 图标颜色 按钮颜色 无图标 - 正在检查登录状态… 正在获取你的游戏库… 正在获取游戏列表… @@ -3999,10 +3976,8 @@ 显示标签 无法导入此布局 通过 %1$s 安装 - 猩红之雪 白色界面配红色点缀。 - 原声音乐 音乐 播放选项 @@ -4079,7 +4054,9 @@ 已显示 %1$d / %2$d 再按一次返回键退出 - 整数缩放 - 使用能够容纳的最大整数缩放倍数。如果源图像过大,则缩放整张图像以避免裁切。分辨率单独设置。 - + 使用屏幕可容纳的最大整数倍缩放,可能会裁切屏幕边缘。如果源图像大于输出尺寸,分数缩放会显示完整图像。分辨率需单独设置。 + 整数 + 适应 + 抗锯齿 + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b0e5a656a8..7425fa7d7c 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1,4 +1,4 @@ - + SteamVR 圖形已停止運作 DroidDeck 將於 %1$d 秒後重新啟動,以重設圖形並重新開啟 SteamVR。正在運行的遊戲會被關閉,未儲存的進度無法還原。 @@ -357,7 +357,7 @@ 遊戲結束後返回 DroidDeck 從 DroidDeck 或其他啟動器啟動的遊戲關閉後,Steam 會正常退出(先完成雲端存檔同步),並返回啟動位置。關閉:留在 Steam 中。 著色器預先快取 - Steam 會為你的遊戲下載預先編譯的著色器並在背景處理,讓遊戲較不卡頓。關閉可節省流動數據用量、儲存空間和電量;遊戲則會改為在執行時編譯著色器。與 Steam 的「下載」>「著色器預先快取」為同一個設定。下次工作階段生效。 + Steam 會為你的遊戲下載預先編譯的著色器並在背景處理,讓遊戲較不卡頓。關閉可節省流動數據用量、儲存空間和電量;遊戲則會改為在執行時編譯著色器。與 Steam 的「下載」>「著色器預先快取」為同一個設定。下次工作階段生效。 修復 Steam 用戶端 下次啟動 Steam 時重新下載 Steam 用戶端。如果 Steam 一直停留在載入畫面,請使用此功能。遊戲、登入資料和設定都會保留。 下次啟動 Steam 時會重新下載 Steam 用戶端。 @@ -708,7 +708,10 @@ 超大 橫條 鎖定位置 - 拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。 + 拖曳 HUD 可移動位置。鎖定時,下方的螢幕控制項仍可使用。 + 長按 + 摺疊或展開 + 鎖定或解鎖 貼齊兩側 放開 HUD 後,它會移到螢幕較近的一側。輕甩可將它甩向該方向。 外觀 @@ -1141,7 +1144,7 @@ 實驗版已關閉 它是為另一個 DroidDeck 版本建置的,現保留在「更新」。 DroidDeck 兩次都無法在該版本啟動 - 代理 + Dev Harness 代理 代理正在運作 在 Linux 用戶空間安裝 Claude Code,才可使用代理。 @@ -1308,6 +1311,7 @@ 手動輸入位址 在已安裝 ADB 的電腦上: 複製指令 + 將頭戴裝置連接到電腦並開啟 SideQuest。依次選擇「Run ADB Command」和「Custom Command」,輸入下方顯示的指令,然後選擇「Run Command」。 選擇要在哪個螢幕開啟 Android 設定。 主螢幕 已配對,正在尋找無線偵錯連接埠… @@ -1582,7 +1586,6 @@ 為前端遊戲檔案選擇資料夾 遊戲檔案已儲存至 %1$s 前端檔案 - 請等待運行環境操作完成 請等待兼容性工具安裝完成 正在準備兼容工具 @@ -1663,7 +1666,6 @@ 正在移除 Linux 運行環境 無法在下方螢幕開啟「設定」,已改為在主螢幕開啟。 在「系統設定」中開啟開發人員選項 - 無法開啟 Android 的「安裝不明應用程式」設定 無法檢查:%1$s 此版本沒有適用於此 DroidDeck 版本的下載 @@ -1673,12 +1675,10 @@ 正在等待你確認 更新失敗 Android 沒有提供安裝更新的選項 - Decky 安裝失敗:%1$s 正在開始匯入插件… 插件匯入失敗:%1$s 已安裝插件。請重新啟動 Steam 以載入。 - 尚未檢查 - 輕按重新整理以尋找新驅動程式 Android + Linux:同時設定顯示驅動程式 Android + Linux:同時設定運行環境驅動程式 @@ -1728,7 +1728,6 @@ 檢查失敗 已安裝 %1$s - 在任一清單中選擇即可同時設定兩個驅動程式 已安裝 %1$s - 請在選單中選擇 - 請等待運行環境移除完成 遊戲 觸控板 @@ -1772,7 +1771,6 @@ 記錄顯示 %1$d 個「Function not implemented」錯誤:proot 的 seccomp 加速令此裝置上的一個輔助程式失敗。請嘗試 %2$s →「%3$s」(或「%4$s」),然後重新啟動。 - 插件 安裝插件 ZIP,在下次 Steam 會話使用。 正在下載… @@ -2122,7 +2120,6 @@ Elite Dangerous 連接埠 %1$d 正在接收資料(%2$d 個 %3$d 位元組的封包),但此頁面目前還無法讀取這種格式。 其他程式已在使用連接埠 %1$s,因此該遊戲無法在此顯示。 - 正在移除 Linux 運行環境 正在移除 Linux 運行環境 · %1$d 個項目 @@ -2136,7 +2133,6 @@ 安裝或移除 Linux 運行環境時顯示 正在安裝 Linux 運行環境 正在移除 Linux 運行環境 - 尚未安裝 Linux 運行環境 目錄中沒有 %1$s 的校驗和 校驗和不符 - 未作任何更改 @@ -2144,7 +2140,6 @@ 無法放置 AppImage 解壓縮失敗 安裝失敗 - Flatpak 設定失敗(結束代碼 %1$d) Flatpak 設定未完成 另一項商店工作正在進行 @@ -2163,7 +2158,6 @@ 媒體編解碼器 %1$s 運行環境 %1$s 運行環境 %2$s - 檔案太小,不可能是 AppImage 無法讀取檔案:%1$s 這不是 AppImage(它不是 Linux 程式) @@ -2178,7 +2172,6 @@ 正在解壓縮 %1$s 無法解壓縮 AppImage 無法解壓縮 AppImage:%1$s - 請先停止目前的會話,再安裝 Decky Loader Decky Loader 下載失敗 Decky Loader 的大小與發佈中繼資料不符 @@ -2227,13 +2220,11 @@ 無法啟用已匯入的插件 無法更新 Decky 插件設定 無法還原現有插件 - 無法儲存無線偵錯身分 ADB 指令失敗(%1$d) Android 未確認子進程限制已更改:%1$s 沒有已儲存的無線偵錯配對 請輸入目前的無線偵錯 IP 位址和連接埠 - 等待配對彈出式視窗逾時,請在 DroidDeck 重試。 無法尋找配對彈出式視窗(%1$d)。請確認 Wi-Fi 已開啟。 無法尋找配對彈出式視窗:%1$s @@ -2259,7 +2250,6 @@ Steam 已準備就緒 輕按即可返回 DroidDeck。你現在可以關閉無線偵錯。 無線偵錯設定已停止 - 下載失敗 下載的大小與已發佈的 APK 不符,已被捨棄 - 請再試一次 下載的檔案與其校驗和不符,已被捨棄 - 請再試一次 @@ -2272,13 +2262,11 @@ 已下載的 APK 沒有簽署資料 已下載的 APK 並非使用 DroidDeck 的發佈金鑰簽署 更新目錄回應 HTTP %1$d - 正在啟動會話… 已過 %1$d:%2$02d · 仍在處理 正在下載 Steam 用戶端更新 · %1$d%% 正在套用 Steam 用戶端更新… 正在下載 Steam 用戶端 · %1$s - 已有兼容性工具正在安裝 請先停止目前的會話,再安裝兼容性工具 找不到 %1$s 的 ARM64 發佈版本 @@ -2298,7 +2286,6 @@ %1$s 安裝失敗(結束代碼 %2$d) 無法安裝 %1$s 正在下載 droiddeck-esync 套件 - 包含 Linux 輔助程式 只有 DLL 原始(上次替換後 Proton 已更新) @@ -2321,13 +2308,11 @@ 下載失敗:此每夜版本可能已被較新的版本取代。請重新整理清單後再試。 此軟件包清單早於校驗和推出 - 請重新整理後再試一次 校驗和不符 - 線性 最近鄰 Snapdragon GSR(品質) 只銳化 自動(配合縮放) - 沒有套用任何效果。 遊戲清晰 銳化並略增對比度 - 日常之選。 @@ -2351,7 +2336,6 @@ 為 2D 及舊遊戲提供銳利的像素。 動畫描邊 卡通描邊加上銳化。 - 不是 Adreno GPU 系統 PowerVR 驅動程式:相容性因裝置而異 實驗性:RADV 或系統 Xclipse 驅動程式 @@ -2374,7 +2358,6 @@ Adreno 850 實驗性支援:需要相容的實驗版顯示驅動程式及遊戲驅動程式;尚未在此裝置上驗證 低於已測試的硬件(Adreno 725 或更新):可能無法執行 不受支援:沒有適用於此 GPU 的兼容圖形後端 - 已達 GitHub 的速率限制 - 請稍後再試 GitHub 回應 HTTP %1$d 下載失敗 @@ -2395,16 +2378,12 @@ 不是驅動程式組合包:沒有指明 Android 和 Linux 驅動程式的 manifest.json 不是驅動程式組合包:%1$s 指向組合包以外 不是驅動程式組合包:解壓後超過 %1$d MB - SD 卡 資料夾 - 分享會話記錄 - 需要 Android 10 或更新版本(支援色彩空間的顯示圖層) 此螢幕沒有回報支援 HDR 此螢幕支援 %1$s,但不支援 HDR10 - 此 GPU 子進程限制已開啟 子進程限制未設定 @@ -2478,7 +2457,6 @@ 已複製。 強制 SSBS 讓一項 Wine 會不斷關閉的 CPU 速度設定保持開啟。在 Snapdragon 8 Elite 上可能令 Windows 遊戲更快;在較舊的晶片上變化不大。下次啟動遊戲時生效。 - 商店 Steam 自訂 @@ -2961,7 +2939,6 @@ 圖示顏色 按鈕顏色 沒有圖示 - 正在檢查登入狀態… 正在取得你的遊戲庫… 正在取得遊戲清單… @@ -3999,10 +3976,8 @@ 顯示標籤 無法匯入此佈局 透過 %1$s 安裝 - 緋紅之雪 白色表面配紅色點綴。 - 原聲帶 音樂 播放選項 @@ -4079,7 +4054,9 @@ 已顯示 %1$d / %2$d 再按一次返回鍵退出 - 整數縮放 - 使用可容納的最大整數縮放倍數。如果來源圖像太大,便縮放整張圖像以避免裁切。解像度會另外設定。 - + 使用螢幕可容納的最大整數倍縮放,可能會裁切螢幕邊緣。如果來源圖像大於輸出尺寸,分數縮放會顯示完整圖像。解像度需另外設定。 + 整數 + 配合畫面 + 抗鋸齒 + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 39ba5d5095..5346cf8bc6 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,4 +1,4 @@ - + SteamVR 圖形已停止運作 DroidDeck 將在 %1$d 秒後重新啟動,以重設圖形並重新開啟 SteamVR。執行中的遊戲會被關閉,未儲存的進度將無法復原。 @@ -357,7 +357,7 @@ 遊戲結束後返回 DroidDeck 從 DroidDeck 或其他啟動器啟動的遊戲關閉後,Steam 會正常退出(先完成雲端存檔同步),並返回啟動位置。關閉:留在 Steam 中。 著色器預先快取 - Steam 會為你的遊戲下載預先編譯的著色器並在背景處理,讓遊戲較不卡頓。關閉可節省數據用量、儲存空間和電量;遊戲則會改為在執行時編譯著色器。與 Steam 的「下載」>「著色器預先快取」為同一個設定。下次工作階段生效。 + Steam 會為你的遊戲下載預先編譯的著色器並在背景處理,讓遊戲較不卡頓。關閉可節省數據用量、儲存空間和電量;遊戲則會改為在執行時編譯著色器。與 Steam 的「下載」>「著色器預先快取」為同一個設定。下次工作階段生效。 修復 Steam 用戶端 下次啟動 Steam 時重新下載 Steam 用戶端。如果 Steam 一直停在載入畫面,請使用此功能。遊戲、登入狀態和設定都會保留。 下次啟動 Steam 時會重新下載 Steam 用戶端。 @@ -708,7 +708,10 @@ 超大 橫條 鎖定位置 - 拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。 + 拖曳 HUD 可移動位置。鎖定時,下方的螢幕控制項仍可使用。 + 長按 + 收合或展開 + 鎖定或解鎖 貼齊兩側 放開 HUD 後,它會移到螢幕較近的一側。輕甩可將它甩向該方向。 外觀 @@ -1141,7 +1144,7 @@ Lab 版本已關閉 它是為另一個 DroidDeck 版本建置的,目前保留在「更新」中。 DroidDeck 用它啟動失敗兩次 - AI 代理 + Dev Harness AI 代理 AI 代理正在處理 請在 Linux 使用者環境安裝 Claude Code,才能使用 AI 代理。 @@ -1308,6 +1311,7 @@ 手動輸入位址 使用電腦上的 ADB: 複製指令 + 將頭戴裝置連接到電腦並開啟 SideQuest。依序選擇「Run ADB Command」和「Custom Command」,輸入下方顯示的指令,然後選擇「Run Command」。 選擇在哪個螢幕上開啟 Android 設定。 主螢幕 已配對。正在尋找無線偵錯連接埠… @@ -1582,7 +1586,6 @@ 為前端遊戲檔案選擇資料夾 遊戲檔案已儲存到 %1$s 前端檔案 - 請等待執行環境作業完成 請等待相容性工具安裝完成 正在準備相容工具 @@ -1663,7 +1666,6 @@ 正在移除 Linux 執行環境 無法在底部螢幕開啟「設定」,已改在主螢幕上開啟。 在「Android 設定」中開啟開發人員選項 - 無法開啟 Android 的「安裝不明應用程式」設定 無法檢查:%1$s 此組建版本沒有適用於此 DroidDeck 複本的下載檔案 @@ -1673,12 +1675,10 @@ 等待你確認 更新失敗 Android 未提供安裝此更新的選項 - Decky 安裝失敗:%1$s 正在開始匯入外掛程式… 外掛程式匯入失敗:%1$s 外掛程式已安裝。請重新啟動 Steam 以載入。 - 尚未檢查 - 點擊重新整理以尋找新驅動程式 Android + Linux:同時設定顯示驅動程式 Android + Linux:同時設定執行環境驅動程式 @@ -1728,7 +1728,6 @@ 檢查失敗 已安裝 %1$s - 在任一清單中選擇它即可同時設定兩個驅動程式 已安裝 %1$s - 請在選單中選擇 - 請等待執行環境移除完成 遊戲 觸控板 @@ -1772,7 +1771,6 @@ 日誌中出現 %1$d 個「Function not implemented」錯誤:proot 的 seccomp 加速在這部裝置上導致輔助程式失敗。請嘗試 %2$s →「%3$s」(或「%4$s」),然後重新啟動。 - 外掛程式 安裝外掛程式 ZIP,供下次 Steam 工作階段使用。 正在下載… @@ -2122,7 +2120,6 @@ Elite Dangerous 連接埠 %1$d 正在接收資料(%2$d 個 %3$d 位元組的封包),但此頁面目前還無法讀取這種格式。 其他程式已在使用連接埠 %1$s,因此該遊戲無法在此顯示。 - 正在移除 Linux 執行環境 正在移除 Linux 執行環境 · %1$d 個項目 @@ -2136,7 +2133,6 @@ 在安裝或移除 Linux 執行環境時顯示 正在安裝 Linux 執行環境 正在移除 Linux 執行環境 - 尚未安裝 Linux 執行環境 目錄中沒有 %1$s 的校驗碼 校驗碼不符 - 未進行任何變更 @@ -2144,7 +2140,6 @@ 無法放置 AppImage 解壓縮失敗 安裝失敗 - Flatpak 設定失敗(結束代碼 %1$d) Flatpak 設定未完成 另一個商店工作正在執行 @@ -2163,7 +2158,6 @@ 媒體轉碼器 %1$s 執行環境 %1$s 執行環境 %2$s - 檔案太小,不可能是 AppImage 無法讀取檔案:%1$s 這不是 AppImage(不是 Linux 程式) @@ -2178,7 +2172,6 @@ 正在解壓縮 %1$s 無法解壓縮 AppImage 無法解壓縮 AppImage:%1$s - 安裝 Decky Loader 前,請先停止執行中的工作階段 Decky Loader 下載失敗 Decky Loader 的大小與發行版本中繼資料不符 @@ -2227,13 +2220,11 @@ 無法啟用匯入的外掛程式 無法更新 Decky 外掛程式設定 無法還原現有的外掛程式 - 無法儲存無線偵錯身分 ADB 指令失敗(%1$d) Android 未確認子處理程序限制已變更:%1$s 尚未儲存任何無線偵錯配對 請輸入目前的無線偵錯 IP 位址和連接埠 - 等待配對彈出視窗逾時。請從 DroidDeck 再試一次。 無法尋找配對彈出視窗(%1$d)。請確認 Wi-Fi 已開啟。 無法尋找配對彈出視窗:%1$s @@ -2259,7 +2250,6 @@ Steam 已就緒 點擊即可返回 DroidDeck。現在可以關閉無線偵錯了。 無線偵錯設定已停止 - 下載失敗 下載的大小與發布的 APK 不符,已捨棄 - 請再試一次 下載的檔案與校驗碼不符,已捨棄 - 請再試一次 @@ -2272,13 +2262,11 @@ 下載的 APK 沒有簽署資訊 下載的 APK 並非以 DroidDeck 的發行金鑰簽署 更新目錄回應 HTTP %1$d - 正在啟動工作階段… 已經過 %1$d:%2$02d · 仍在處理中 正在下載 Steam 用戶端更新 · %1$d%% 正在套用 Steam 用戶端更新… 正在下載 Steam 用戶端 · %1$s - 已有相容性工具正在安裝 安裝相容性工具前,請先停止執行中的工作階段 找不到 %1$s 的 ARM64 發行版本 @@ -2298,7 +2286,6 @@ %1$s 安裝失敗(結束代碼 %2$d) 無法安裝 %1$s 正在取得 droiddeck-esync 套件 - 含 Linux 輔助程式 僅 DLL 原始(上次換入後 Proton 已更新) @@ -2321,13 +2308,11 @@ 下載失敗:此每夜版本可能已被較新的版本取代。請重新整理清單後再試一次。 此套件清單早於校驗碼機制 - 請重新整理後再試一次 校驗碼不符 - 線性 最近鄰 Snapdragon GSR(品質) 僅銳化 自動(依縮放) - 未套用任何效果。 遊戲清晰 銳化並稍微提高對比 - 適合日常使用。 @@ -2351,7 +2336,6 @@ 為 2D 和老遊戲呈現銳利的像素。 動畫描邊 卡通描邊加上銳化。 - 不是 Adreno GPU 系統 PowerVR 驅動程式:相容性依裝置而異 實驗性:RADV 或系統 Xclipse 驅動程式 @@ -2374,7 +2358,6 @@ Adreno 850 實驗性支援:需要相容的實驗版顯示驅動程式及遊戲驅動程式;尚未在此裝置上驗證 低於已測試的硬體(Adreno 725 及更新機型):可能無法執行 不受支援:沒有適用於此 GPU 的相容圖形後端 - 已達 GitHub 速率限制 - 請稍後再試 GitHub 回應 HTTP %1$d 下載失敗 @@ -2395,16 +2378,12 @@ 不是驅動程式套件組合:沒有指定 Android 與 Linux 驅動程式的 manifest.json 不是驅動程式套件組合:%1$s 指向組合外部 不是驅動程式套件組合:解壓縮後超過 %1$d MB - SD 卡 資料夾 - 分享工作階段日誌 - 需要 Android 10 或更新版本(具備色彩空間的顯示圖層) 此顯示器未回報支援 HDR 此顯示器支援 %1$s,但不支援 HDR10 - 此 GPU 子處理程序限制已開啟 子處理程序限制未設定 @@ -2478,7 +2457,6 @@ 已複製。 強制 SSBS 讓一項 Wine 會不斷關閉的 CPU 速度設定保持開啟。在 Snapdragon 8 Elite 上可能讓 Windows 遊戲更快;在較舊的晶片上變化不大。下次啟動遊戲時生效。 - 遊戲商店 Steam 自訂 @@ -2961,7 +2939,6 @@ 圖示顏色 按鈕顏色 沒有圖示 - 正在檢查登入狀態… 正在取得你的遊戲庫… 正在取得遊戲清單… @@ -3999,10 +3976,8 @@ 顯示標籤 無法匯入此版面配置 透過 %1$s 安裝 - 緋紅之雪 白色表面搭配紅色點綴。 - 原聲帶 音樂 播放選項 @@ -4079,7 +4054,9 @@ 已顯示 %1$d / %2$d 再按一次返回鍵退出 - 整數縮放 - 使用可容納的最大整數縮放倍數。如果來源影像太大,會縮放整張影像以避免裁切。解析度會另外設定。 - + 使用螢幕可容納的最大整數倍縮放,可能會裁切螢幕邊緣。如果來源圖像大於輸出尺寸,分數縮放會顯示完整圖像。解析度需另外設定。 + 整數 + 符合畫面 + 抗鋸齒 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6cd371f148..a0c6c51a1e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -702,7 +702,7 @@ Its files are removed. It\'s in use, so the default takes over. Display Frame limit - Caps this game. The display switches to a refresh rate the cap divides evenly when it has one; other caps can look uneven. Steam games use Steam\'s Frame Limit in the Quick Access menu. + Remembered for this game, or for Desktop. The display switches to a refresh rate the cap divides evenly; other caps can look uneven. Black frame insertion Sharper motion: a black refresh follows every frame. Needs 100 Hz or more; the game runs at half the refresh rate and looks dimmer. Off while frame generation is on. Effects @@ -738,7 +738,10 @@ Mega Strip Lock in place - Drag the HUD to move it; a long press locks or unlocks it. While it is locked, on-screen controls under it still work. + Drag the HUD to move it. While it is locked, on-screen controls under it still work. + Long press + Collapse or expand + Lock or unlock Snap to sides Let go of the HUD and it moves to the nearer side of the screen. A flick throws it that way. Look @@ -846,6 +849,8 @@ Gamma Saturation FXAA (edge smoothing) + Anti-aliasing + SMAA Toon outlines CRT NTSC @@ -921,7 +926,7 @@ Controller Session Launcher - Setup + Settings ● All set %1$d of %2$d ready System check @@ -1214,7 +1219,7 @@ Lab build turned off It was built for another version of DroidDeck. It is kept in Updates. DroidDeck did not start on it twice - Agent + Dev Harness Agent Agent is working Compact chat in the session drawer @@ -1258,6 +1263,7 @@ Remove now Claude Code Codex + OpenCode DroidDeck source Download caches Changes that are not pushed are lost @@ -1364,6 +1370,12 @@ Pair Install Sign in + Free models + Add key + Paste your API key from opencode.ai/auth + Save + Free models, or a Zen key from opencode.ai/auth + Free models · add a Zen key for the rest PR #%1$d Not built for this copy of DroidDeck Updated %1$s @@ -1416,6 +1428,8 @@ Enter address manually From a computer with ADB: Copy command + SideQuest + Connect the headset to a computer and open SideQuest. Choose “Run ADB Command”, then “Custom Command”, type the command shown below and select “Run Command”. Choose which display to open Android Settings on. Main screen Paired. Finding the Wireless debugging port… @@ -1662,7 +1676,7 @@ Store Components Apps - Setup + Settings Updates Trinkets More @@ -2664,9 +2678,8 @@ Stretch to display Image scaling Integer scaling - Uses the largest whole-number scale that fits. If the source is too large, fits the full image to avoid cropping. Resolution is configured separately. + Uses the largest whole-number scale that fits. May crop screen edges. If the source is larger than the output, fractional scaling fits the full image. Resolution is configured separately. Fit - Auto Scaling filter Shared by Steam and Desktop. Applies live. Shared by Steam and Desktop. @@ -4231,4 +4244,40 @@ Shown %1$d of %2$d Press back once more to exit + Integer + Performance + Android memory + Search settings + No setting matches \"%1$s\" + Clear search + Settings + In-game menu + Steam or Desktop options (swipe up) + Steam quick menu (•••) + Logs + Tabs + Storage + Syncthing + Download settings + Developer tools + Agent, graphics logs and other tools for testing DroidDeck + Options + Steam defaults · used each time Steam starts + Desktop defaults · used each time Desktop starts + Defaults · used each time this mode starts + All settings + Applies to every mode + Set in Steam + Steam games use the Frame Limit in Steam\'s quick menu › Performance + Open + Report a problem + Shares this session\'s logs for a bug report + Back opens this menu · Back twice opens Steam\'s menu + Back opens this menu + %1$s opens this menu + Back twice opens this menu · Back once opens Steam\'s menu + Corner tap opens this menu + Double-tap the top-right corner, for devices without a Back button + Open the session menu + Settings need you diff --git a/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt new file mode 100644 index 0000000000..f34e2ad07c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt @@ -0,0 +1,155 @@ +package com.droiddeck.launcher.agent + +import com.droiddeck.launcher.agent.AgentHost.Entry +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.io.File +import java.nio.file.Files + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class OpenCodeTest { + private val session = "ses_1" + + private fun event(type: String, part: String) = """{"type":"$type","timestamp":1,"sessionID":"$session","part":$part}""" + + @Test fun turnsResumeByIdAndCarryModelPlanAndVariant() { + assertEquals(listOf(OpenCode.binary, "run", "--format", "json", "--auto", "--thinking", "--", "brief\n\nhi"), + OpenCode.turn("hi", null, AgentHarness.Options(brief = "brief"))) + assertEquals(listOf(OpenCode.binary, "run", "--format", "json", "--auto", "--thinking", "-s", "ses_1", "--agent", "plan", + "-m", "opencode/big-pickle", "--variant", "high", "--", "-hi"), + OpenCode.turn("-hi", "ses_1", AgentHarness.Options(model = "opencode/big-pickle", plan = true, brief = "brief", effort = "high"))) + } + + @Test fun textReasoningAndStepsBecomeEntries() { + OpenCode.turn("hi", null, AgentHarness.Options()) + assertEquals(session, OpenCode.parse(event("step_start", """{"type":"step-start"}"""))!!.conversation) + assertEquals(listOf(Entry.Said("x86_64")), OpenCode.parse(event("text", """{"type":"text","text":" x86_64\n"}"""))!!.entries) + assertEquals(listOf(Entry.Thought("why")), OpenCode.parse(event("reasoning", """{"type":"reasoning","text":"why"}"""))!!.entries) + val step = OpenCode.parse(event("step_finish", """{"reason":"tool-calls","tokens":{"total":7894,"input":6013,"output":89,"reasoning":0,"cache":{"write":0,"read":1792}},"cost":0.01}"""))!! + assertEquals(emptyList(), step.entries) + assertEquals(7894L, step.context) + val end = OpenCode.parse(event("step_finish", """{"reason":"stop","tokens":{"total":7927,"input":241,"output":6,"reasoning":2,"cache":{"write":0,"read":7680}},"cost":0.02}"""))!! + assertEquals(listOf(Entry.Finished(null)), end.entries) + assertEquals(AgentHost.Usage(0, 0.03, 6013L + 1792 + 241 + 7680, 89L + 6 + 2), end.usage!!.copy(costUsd = Math.round(end.usage!!.costUsd * 100) / 100.0)) + } + + @Test fun eachTurnCountsOnlyItsOwnSteps() { + OpenCode.turn("one", null, AgentHarness.Options()) + OpenCode.parse(event("step_finish", """{"reason":"stop","tokens":{"input":100,"output":10,"cache":{}},"cost":1}""")) + OpenCode.turn("two", session, AgentHarness.Options()) + val end = OpenCode.parse(event("step_finish", """{"reason":"stop","tokens":{"input":5,"output":1,"cache":{}},"cost":0}"""))!! + assertEquals(AgentHost.Usage(0, 0.0, 5, 1), end.usage) + } + + @Test fun toolsBecomeCallsWithTheirResults() { + val bash = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"bash","callID":"c1","state":{"status":"completed","input":{"command":"uname -m"},"output":"aarch64\n","metadata":{"exit":0}}}"""))!! + assertEquals(listOf(Entry.Used("c1", "Bash", "uname -m", "uname -m"), Entry.Result("c1", "aarch64\n", false)), bash.entries) + val failed = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"bash","callID":"c2","state":{"status":"completed","input":{"command":"false"},"output":"(no output)","metadata":{"exit":1}}}"""))!! + assertTrue((failed.entries[1] as Entry.Result).failed) + val edit = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"edit","callID":"c3","state":{"status":"completed","input":{"filePath":"/w/a.txt","oldString":"hi","newString":"bye"},"output":"Edit applied successfully."}}"""))!! + assertEquals(Entry.Used("c3", "Edit", "/w/a.txt", "/w/a.txt\n-hi\n+bye"), edit.entries[0]) + val write = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"write","callID":"c4","state":{"status":"completed","input":{"filePath":"/w/b.txt","content":"one\n"},"output":"Wrote file successfully."}}"""))!! + assertEquals("/w/b.txt\n+one", (write.entries[0] as Entry.Used).input) + val todo = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"todowrite","callID":"c5","state":{"status":"completed","input":{"todos":[{"content":"A","status":"completed"},{"content":"B","status":"in_progress"},{"content":"C","status":"pending"}]},"output":"[]"}}"""))!! + assertEquals("[x] A\n[~] B\n[ ] C", (todo.entries[0] as Entry.Used).input) + val read = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"read","callID":"c6","state":{"status":"error","input":{"filePath":"/nope"},"error":"File not found"}}"""))!! + assertEquals("Read", (read.entries[0] as Entry.Used).tool) + assertEquals("/nope", (read.entries[0] as Entry.Used).detail) + assertEquals(Entry.Result("c6", "File not found", true), read.entries[1]) + val running = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"bash","callID":"c7","state":{"status":"running","input":{"command":"sleep 9"}}}"""))!! + assertEquals(listOf(Entry.Used("c7", "Bash", "sleep 9", "sleep 9")), running.entries) + } + + @Test fun errorsEndTheTurn() { + assertEquals(listOf(Entry.Finished("Invalid credential")), OpenCode.parse( + """{"type":"error","sessionID":"ses_1","error":{"name":"APIError","data":{"message":"Invalid credential","statusCode":401}}}""")!!.entries) + assertEquals(listOf(Entry.Finished("UnknownError")), OpenCode.parse("""{"type":"error","error":{"name":"UnknownError"}}""")!!.entries) + assertNull(OpenCode.parse("not json")) + } + + @Test fun verboseModelListingGivesLabelsAndWindows() { + val output = """ + opencode/big-pickle + { + "id": "big-pickle", + "providerID": "opencode", + "name": "Big Pickle", + "status": "active", + "limit": { + "context": 200000, + "output": 128000 + } + } + opencode/old-free + { + "providerID": "opencode", + "name": "Old", + "status": "deprecated" + } + opencode-go/kimi-k3 + { + "providerID": "opencode-go", + "name": "Kimi K3", + "limit": { + "context": 262144 + } + } + """.trimIndent() + val (models, windows) = OpenCode.listModels(output) + assertEquals(listOf(AgentHarness.Model("opencode/big-pickle", "Big Pickle"), AgentHarness.Model("opencode-go/kimi-k3", "Kimi K3 · opencode-go")), models) + assertEquals(mapOf("opencode/big-pickle" to 200000L, "opencode-go/kimi-k3" to 262144L), windows) + } + + @Test fun modelsAndWindowComeFromTheCachedListing() { + val root = Files.createTempDirectory("rootfs").toFile() + assertEquals(emptyList(), OpenCode.models(root)) + File(root, "root/.cache/droiddeck/opencode-models").apply { parentFile!!.mkdirs() } + .writeText("opencode/big-pickle\n{\n \"providerID\": \"opencode\",\n \"name\": \"Big Pickle\",\n \"limit\": {\"context\": 200000}\n}\n") + assertEquals(listOf(AgentHarness.Model("opencode/big-pickle", "Big Pickle")), OpenCode.models(root)) + OpenCode.turn("hi", null, AgentHarness.Options(model = "opencode/big-pickle")) + assertEquals(200000L, OpenCode.usage(root, session)!!.window) + OpenCode.turn("hi", null, AgentHarness.Options()) + assertNull(OpenCode.usage(root, session)) + } + + @Test fun aSavedKeyKeepsOtherProvidersAndFreeIsItsOwnMark() { + val root = Files.createTempDirectory("rootfs").toFile() + assertFalse(OpenCode.hasKey(root)) + val auth = File(root, "root/.local/share/opencode/auth.json").apply { parentFile!!.mkdirs() } + auth.writeText("""{"openai":{"type":"oauth","refresh":"r"}}""") + assertFalse(OpenCode.hasKey(root)) + OpenCode.saveKey(root, " sk-zen \n") + val saved = JSONObject(auth.readText()) + assertEquals("r", saved.getJSONObject("openai").getString("refresh")) + assertEquals("sk-zen", saved.getJSONObject("opencode").getString("key")) + assertEquals("api", saved.getJSONObject("opencode").getString("type")) + assertTrue(OpenCode.hasKey(root)) + OpenCode.useFree(root) + assertTrue(File(root, "root/.config/opencode/.droiddeck-free").exists()) + } + + @Test fun anUnreadableAuthFileIsNotReplaced() { + val root = Files.createTempDirectory("rootfs").toFile() + val auth = File(root, "root/.local/share/opencode/auth.json").apply { parentFile!!.mkdirs() } + auth.writeText("{not json") + assertTrue(runCatching { OpenCode.saveKey(root, "sk-zen") }.isFailure) + assertEquals("{not json", auth.readText()) + assertFalse(OpenCode.hasKey(root)) + } + + @Test fun signInIsTheKeyOrTheFreeMark() { + val probe = OpenCode.signedIn.last() + assertTrue(probe.contains("/root/.local/share/opencode/auth.json")) + assertTrue(probe.contains("[ -e /root/.config/opencode/.droiddeck-free ]")) + assertTrue(probe.contains("models --verbose > /root/.cache/droiddeck/opencode-models.$$")) + assertEquals(listOf("/root/.local/bin/android-open", "https://opencode.ai/auth"), OpenCode.signIn) + } +} 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 d8626a3bb0..e0fcc5593a 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedExesTest.kt @@ -62,6 +62,36 @@ class AddedExesTest { assertEquals(1, AddedGames.scan(app).size) } + @Test fun aPickedSteamInstallSurvivesFullScansWithAndWithoutAManifest() { + for (manifestFirst in listOf(false, true)) { + val storage = tmp.newFolder("Library-$manifestFirst") + val pick = exe(File(storage, "steamapps/common/Example/Example.exe")) + val other = exe(File(storage, "steamapps/common/Other/Other.exe")) + val manifest = File(storage, "steamapps/appmanifest_123.acf") + exe(File(storage, "steamapps/common/Unselected/Unselected.exe")) + File(storage, "steamapps/appmanifest_456.acf").writeText("\"installdir\" \"Unselected\"") + SessionPrefs.setAddedGamesDirs(app, emptyList()) + SessionPrefs.setGameStorage(app, storage.path, "Card") + if (manifestFirst) manifest.writeText("\"installdir\" \"Example\"") + SessionPrefs.setAddedGameLaunch(app, pick.parentFile!!.path, "--custom") + val game = result(AddedGames.addExe(app, pick)) + assertEquals(pick.path, AddedExes.list(app).single { it.folder == game.folder.path }.exe) + assertEquals(game.appId, AddedGames.scan(app).single { it.folder == game.folder }.appId) + manifest.writeText("\"installdir\" \"Example\"") + val scanned = AddedGames.scan(app).single { it.folder == game.folder } + assertEquals(game.appId, scanned.appId) + assertEquals(pick.path, scanned.exe.path) + assertEquals("--custom", scanned.launchOptions) + assertTrue(AddedGames.scan(app).none { it.folder.name == "Unselected" }) + assertTrue(AddedGames.scan(app).any { it.exe == other }) + AddedGames.remove(app, game.folder) + assertTrue(AddedGames.scan(app).none { it.folder == game.folder }) + assertTrue(AddedGames.addExe(app, pick) is AddedGames.AddResult.Switched) + assertEquals(game.appId, AddedGames.scan(app).single { it.folder == game.folder }.appId) + AddedExes.drop(app, game.folder.path) + } + } + @Test fun anotherExeInTheSameGameSwitchesItsExe() { noGamesFolders() val first = onStorage("Games2/Hades/Hades.exe") diff --git a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudHostCollapseTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudHostCollapseTest.kt new file mode 100644 index 0000000000..531aa6d2c0 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudHostCollapseTest.kt @@ -0,0 +1,99 @@ +package com.droiddeck.launcher.hud + +import android.os.Looper +import android.os.SystemClock +import android.provider.Settings +import android.view.MotionEvent +import android.view.View +import android.view.ViewConfiguration +import android.widget.FrameLayout +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.ui.Motion +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode +import java.time.Duration +import java.util.function.BiConsumer + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], qualifiers = "xhdpi") +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class DroidDeckHudHostCollapseTest { + private fun animate(scale: Float) { + val app = RuntimeEnvironment.getApplication() + Settings.Global.putFloat(app.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, scale) + Motion.refresh(app) + } + + @Before fun noAnimation() = animate(0f) + + @After fun restoreAnimation() = animate(1f) + + private fun collapse(snap: String, hudX: Float, hudY: Float, pressX: Float, pressY: Float, layoutDuringCollapse: Boolean = false): Triple> { + val app = RuntimeEnvironment.getApplication() + SessionPrefs.setDroidDeckHudConfig(app, DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSnap" to snap) + ("hudSize" to "full"))) + SessionPrefs.setDroidDeckHudPosition(app, hudX, hudY) + val root = FrameLayout(app) + val host = DroidDeckHudHost(app) + host.attach(root, 0) + val hud = root.getChildAt(0) as DroidDeckHudView + hud.visibility = View.VISIBLE + hud.showForTest(DroidDeckHudPanelTest.SNAPSHOT, "DXVK", 0L) + val exactly = { size: Int -> View.MeasureSpec.makeMeasureSpec(size, View.MeasureSpec.EXACTLY) } + root.measure(exactly(2000), exactly(1000)) + root.layout(0, 0, 2000, 1000) + hud.x = hudX; hud.y = hudY + if (layoutDuringCollapse) { + @Suppress("UNCHECKED_CAST") + val collapse = DroidDeckHudView::class.java.getDeclaredField("onHoldListener").also { it.isAccessible = true }.get(hud) as BiConsumer + hud.setOnHoldListener { x, y -> + collapse.accept(x, y) + hud.requestLayout() + root.measure(exactly(2000), exactly(1000)) + root.layout(0, 0, 2000, 1000) + } + } + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, pressX, pressY, 0).also { root.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ViewConfiguration.getLongPressTimeout() + 300L)) + MotionEvent.obtain(down, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, pressX, pressY, 0).also { root.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(1000)) + root.measure(exactly(2000), exactly(1000)) + root.layout(0, 0, 2000, 1000) + shadowOf(Looper.getMainLooper()).idle() + val stored = DroidDeckHudConfig.load(app)["hudDock"].orEmpty() + return Triple(hud, stored, hud.x to hud.y) + } + + @Test fun withSnappingTheHudCollapsesIntoTheEdgeNearestWhereThePressBegan() { + assertEquals("top", collapse("1", 400f, 40f, 500f, 60f).second) + assertEquals("left", collapse("1", 20f, 300f, 40f, 500f).second) + assertEquals("right", collapse("1", 1500f, 300f, 1900f, 500f).second) + assertEquals("bottom", collapse("1", 400f, 700f, 500f, 980f).second) + } + + @Test fun withoutSnappingTheHudCollapsesWhereItWasTouched() { + val (hud, stored, at) = collapse("0", 600f, 300f, 700f, 350f) + assertEquals("float", stored) + assertEquals(DroidDeckHudDock.FLOAT, hud.dock) + val (tabW, tabH) = hud.dockTabSize() + assertEquals(700f - tabW / 2f, at.first, 2f) + assertEquals(350f - tabH / 2f, at.second, 2f) + } + + @Test fun aLayoutPassDuringTheCollapseKeepsTheTabWhereThePressPutIt() { + animate(1f) + val (hud, stored, at) = collapse("1", 600f, 300f, 700f, 350f, layoutDuringCollapse = true) + val (tabW, tabH) = hud.dockTabSize() + assertEquals("top", stored) + assertEquals(700f - tabW / 2f, SessionPrefs.droidDeckHudPosition(RuntimeEnvironment.getApplication())!!.first, 2f) + assertEquals(700f - tabW / 2f, at.first, 2f) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt index 5a534ceb3a..f638ea4afe 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt @@ -38,6 +38,74 @@ class DroidDeckHudPanelTest { assertEquals("1", DroidDeckHudConfig.DEFAULTS["hudLocked"]) } + @Test fun aLongPressCollapsesTheHudUnlessTheUserChoseToLockWithIt() { + assertEquals("collapse", DroidDeckHudConfig.DEFAULTS["hudHold"]) + for ((hold, locked) in listOf("collapse" to "1", "collapse" to "0", "lock" to "1", "lock" to "0")) { + val app = RuntimeEnvironment.getApplication() + val hud = DroidDeckHudView(app) + val parent = FrameLayout(app) + parent.addView(hud, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudHold" to hold) + ("hudLocked" to locked))) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val exactly = View.MeasureSpec.makeMeasureSpec(2000, View.MeasureSpec.EXACTLY) + parent.measure(exactly, exactly) + parent.layout(0, 0, 2000, 2000) + val holds = ArrayList>() + val locks = ArrayList() + hud.setOnHoldListener { x, y -> holds += x to y } + hud.setOnLockChangedListener { locks += it } + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, 30f, 20f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ViewConfiguration.getLongPressTimeout() + 300L)) + MotionEvent.obtain(down, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, 30f, 20f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idle() + if (hold == "collapse") { + assertEquals("$hold/$locked collapses from where the press began", listOf(30f to 20f), holds) + assertTrue("$hold/$locked leaves the lock alone", locks.isEmpty()) + } else { + assertTrue("$hold/$locked does not collapse", holds.isEmpty()) + assertEquals("$hold/$locked toggles the lock", listOf(locked != "1"), locks) + } + } + } + + @Test fun releasingTheFingerThatCollapsedTheHudDoesNotExpandItAgain() { + val app = RuntimeEnvironment.getApplication() + val hud = DroidDeckHudView(app) + val parent = FrameLayout(app) + parent.addView(hud, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + val config = DroidDeckHudConfig.DEFAULTS + ("hudSize" to "full") + hud.applyConfig(DroidDeckHudConfig.encode(config)) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val exactly = View.MeasureSpec.makeMeasureSpec(2000, View.MeasureSpec.EXACTLY) + parent.measure(exactly, exactly) + parent.layout(0, 0, 2000, 2000) + val docks = ArrayList() + hud.setOnDockChangedListener { docks += it } + hud.setOnHoldListener { _, _ -> hud.applyConfig(DroidDeckHudConfig.encode(config + ("hudDock" to "float"))) } + val down = SystemClock.uptimeMillis() + MotionEvent.obtain(down, down, MotionEvent.ACTION_DOWN, 30f, 20f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ViewConfiguration.getLongPressTimeout() + 300L)) + assertEquals(DroidDeckHudDock.FLOAT, hud.dock) + MotionEvent.obtain(down, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP, 30f, 20f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + shadowOf(Looper.getMainLooper()).idle() + assertTrue("the release of the collapsing press is not a tap on the tab: $docks", docks.isEmpty()) + val next = SystemClock.uptimeMillis() + MotionEvent.obtain(next, next, MotionEvent.ACTION_DOWN, 5f, 5f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + MotionEvent.obtain(next, next + 40, MotionEvent.ACTION_UP, 5f, 5f, 0).also { hud.dispatchTouchEvent(it); it.recycle() } + assertEquals("a later tap on the tab expands it", listOf("none"), docks) + } + + @Test fun aFloatingTabIsATabWithoutAnEdge() { + assertEquals(DroidDeckHudDock.FLOAT, DroidDeckHudDock.from("float")) + val hud = DroidDeckHudView(RuntimeEnvironment.getApplication()) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to "full") + ("hudDock" to "float"))) + hud.showForTest(SNAPSHOT, "DXVK", 0L) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + hud.measure(unspecified, unspecified) + assertTrue("a tab, not the panel: ${hud.measuredWidth}x${hud.measuredHeight}", hud.measuredWidth < 400 && hud.measuredHeight < 200) + } + @Test fun lowMetricsCanBeHiddenIndependentlyInEveryLayoutThatShowsThem() { val metrics = listOf("showLow1" to "1%", "showLow01" to "0.1%", "showLow001" to "0.01%") for (size in DroidDeckHudSize.values().filter { it != DroidDeckHudSize.PILL }) { @@ -331,7 +399,7 @@ class DroidDeckHudPanelTest { hud.passesTouchAt = { _, _ -> control } val locks = ArrayList() hud.setOnLockChangedListener { locks += it } - hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "0"))) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "0") + ("hudHold" to "lock"))) hud.showForTest(SNAPSHOT, "DXVK", 0L) val exactly = View.MeasureSpec.makeMeasureSpec(2000, View.MeasureSpec.EXACTLY) parent.measure(exactly, exactly) @@ -348,7 +416,7 @@ class DroidDeckHudPanelTest { 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"))) + hud.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudLocked" to "1") + ("hudHold" to "lock"))) touch() assertEquals("a locked HUD passes it to the control under it", 1, reached) control = false @@ -377,7 +445,7 @@ class DroidDeckHudPanelTest { assertEquals("a locked, docked HUD still answers a tap", listOf("none"), docks) } - private companion object { + internal 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), 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 c510dc72f3..7409d4558b 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/DualScreenTest.kt @@ -29,6 +29,26 @@ class DualScreenTest { assertFalse(DualScreen.isBuiltIn(5, "AYN Thor")) } + @Test @Config(sdk = [34]) fun selectedInternalAndExternalDisplaysCanBeUsed() { + withDisplay(INTERNAL, "Bottom screen") { internal -> + assertEquals(internal.displayId, DualScreen.selectedSessionDisplay(context, displays, Display.DEFAULT_DISPLAY, internal.displayId)?.displayId) + } + withDisplay(EXTERNAL, "HDMI Screen") { external -> + assertEquals(external.displayId, DualScreen.selectedSessionDisplay(context, displays, Display.DEFAULT_DISPLAY, external.displayId)?.displayId) + SessionPrefs.setDualScreenSessionMode(context, DualScreen.MODE_OFF) + assertNull(DualScreen.selectedSessionDisplay(context, displays, Display.DEFAULT_DISPLAY, external.displayId)) + SessionPrefs.setDualScreenSessionMode(context, DualScreen.MODE_AUTO) + } + } + + @Test @Config(sdk = [34]) fun missingOrRemovedSelectedDisplaysCannotBeUsed() { + assertNull(DualScreen.selectedSessionDisplay(context, displays, Display.DEFAULT_DISPLAY, Display.INVALID_DISPLAY)) + val id = ShadowDisplayManager.addDisplay("w640dp-h480dp", EXTERNAL) + shadowOf(displays.getDisplay(id)).setFlags(Display.FLAG_PRESENTATION) + ShadowDisplayManager.removeDisplay(id) + assertNull(DualScreen.selectedSessionDisplay(context, displays, Display.DEFAULT_DISPLAY, id)) + } + @Test fun knownModelsCountWhenTheTypeIsHidden() { assertTrue(DualScreen.isBuiltIn(null, "Retroid Pocket Duo")) assertTrue(DualScreen.isBuiltIn(null, " AYN Thor ")) diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt index 44ad82b904..a7a1138957 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt @@ -162,6 +162,23 @@ class InputLayoutToolsTest { assertEquals(label, emptyList>(), overlapping(elements, width, height)) } + private fun assertStickView(elements: List, width: Int, height: Int, label: String) { + for (control in listOf(InputControl.LS, InputControl.RS)) { + val stick = elements.first { it.control == control } + assertTrue("$label ${stick.id} keeps its widened travel width", stick.width * width >= stick.height * height * 1.25f - 1f) + assertTrue("$label ${stick.id} stays on screen", stick.x >= 0f && stick.x + stick.width <= 1.0001f) + } + } + + @Test fun sticksKeepTheirFullViewAtSurfaceEdges() { + for ((width, height) in listOf(2608 to 1200, 1920 to 1080, 1280 to 960)) { + ControllerPrefs.setLayout(context, width, height, mapOf("ls" to (0f to .5f), "rs" to (1f to .5f))) + val elements = LegacyGamepadLayout(context, width, height).elements() + assertStickView(elements, width, height, "$width x $height") + ControllerPrefs.resetLayout(context, width, height) + } + } + @Test @Config(qualifiers = "w833dp-h468dp-land-369dpi") fun buttonSizeKeepsTheGamepadShapeAtHandheldDensity() { for ((w, h) in listOf(1920 to 1080, 1920 to 1200)) { @@ -191,4 +208,10 @@ class InputLayoutToolsTest { } } } + + @Test @Config(qualifiers = "w745dp-h343dp-land-420dpi") + fun wideHighDensityGamepadKeepsItsShape() { + val elements = LegacyGamepadLayout(context, 2608, 1200).elements() + assertGamepadShape(elements, 2608, 1200, "2608 x 1200") + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt index 4bfa52f518..9c81655b0a 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputLibraryTest.kt @@ -592,4 +592,45 @@ class InputLibraryTest { assertEquals(old.preset(InputStockLayouts.TRACKPAD), upgraded.preset(InputStockLayouts.TRACKPAD)) assertEquals(InputStockLayouts.layouts().single { it.id == InputLibraries.DECK }.elements, upgraded.layouts.single { it.id == InputLibraries.DECK }.elements) } + + @Test fun stockSecondScreenPanelsKeepTapsClicking() { + val library = InputLibraries.read(context) + for (desktop in listOf(false, true)) for (panel in listOf(null, InputStockLayouts.TRACKPAD) + DeckPanel.entries.map { it.bindings }) { + val shown = library.panelLayout(desktop, panel)!!.elements + assertTrue(shown.isNotEmpty()) + assertFalse(library.compileActive(desktop, panel).showsMouseButton(InputRole.SECONDARY, shown, library.compileStock(desktop, panel))) + } + } + + @Test fun userBoundSecondScreenMouseButtonIsDetected() { + val stock = InputLibraries.read(context) + val grips = DeckPanel.GRIPS.bindings + val button = stock.panelLayout(false, grips)!!.elements.first { it.control.dimensions == 1 } + val bound = stock.withPreset(stock.preset(grips).copy(elements = mapOf(button.id to InputAction.MouseButton(272)))) + for (desktop in listOf(false, true)) { + assertTrue(bound.compileActive(desktop, grips).showsMouseButton(InputRole.SECONDARY, listOf(button), bound.compileStock(desktop, grips))) + assertFalse(bound.compileActive(desktop, grips).showsMouseButton(InputRole.PRIMARY, listOf(button), bound.compileStock(desktop, grips))) + } + val pad = stock.panelLayout(true, InputStockLayouts.TRACKPAD)!!.elements.single() + val rebound = stock.withPreset(stock.preset(InputStockLayouts.TRACKPAD).let { it.copy(clicks = it.clicks + (pad.id to InputAction.MouseButton(273))) }) + assertTrue(rebound.compileActive(true).showsMouseButton(InputRole.SECONDARY, listOf(pad), rebound.compileStock(true))) + } + + @Test fun copiedStockPanelsKeepTapsClickingUntilAMouseButtonIsAdded() { + val stock = InputLibraries.read(context) + for (desktop in listOf(false, true)) { + val source = stock.panelLayout(desktop, null)!! + val copied = stock.useLayout(stock.activeId(desktop), InputRole.SECONDARY, source.id, shared = false) + val layout = copied.activeLayout(desktop, InputRole.SECONDARY)!! + assertNotEquals(source.id, layout.id) + assertEquals(source.id, layout.origin) + assertFalse(copied.compileActive(desktop).showsMouseButton(InputRole.SECONDARY, layout.elements, copied.compileStock(desktop))) + val added = InputSurfaceElement(InputControl.A, .4f, .4f, .1f, .1f, id = "custom:added") + val grown = copied.withLayout(layout.copy(elements = layout.elements + added)) + val bindings = grown.activePart(desktop, InputRole.SECONDARY).bindings + val bound = grown.withPreset(grown.preset(bindings).let { it.copy(elements = it.elements + (added.id to InputAction.MouseButton(272))) }) + assertTrue(bound.compileActive(desktop).showsMouseButton(InputRole.SECONDARY, layout.elements + added, bound.compileStock(desktop))) + assertFalse(bound.compileActive(desktop).showsMouseButton(InputRole.SECONDARY, layout.elements, bound.compileStock(desktop))) + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt index 0a95382937..cfe027586a 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenLayoutTest.kt @@ -49,6 +49,83 @@ class OnScreenLayoutTest { } } + @Test @Config(qualifiers = "w745dp-h343dp-land-420dpi") + fun aBuiltInGamepadSavedAtTheDisplaySizeRegeneratesForTheMeasuredSurface() { + val saved = gamepad().copy(elements = LegacyGamepadLayout(context, 2608, 1200).elements(), aspect = 2608f / 1200) + val placed = OnScreenLayout.elements(context, saved, 2048, 1200, Rect()) + assertEquals(LegacyGamepadLayout(context, 2048, 1200).regenerate(saved.elements), placed) + } + + @Test @Config(qualifiers = "w745dp-h343dp-land-420dpi") + fun previouslyGeneratedEdgeSticksRegenerateWithoutOverridingCustomGeometry() { + val w = 2608 + val h = 1200 + ControllerPrefs.setLayout(context, w, h, mapOf("ls" to (0f to .5f), "rs" to (1f to .5f))) + val generator = LegacyGamepadLayout(context, w, h) + val old = generator.elements(previousStickGeometry = true) + val current = generator.elements() + assertTrue(old.filter { it.control == InputControl.LS || it.control == InputControl.RS }.zip(current.filter { it.control == InputControl.LS || it.control == InputControl.RS }).any { (a, b) -> kotlin.math.abs(a.width - b.width) > .01f }) + val saved = gamepad().copy(elements = old, aspect = w.toFloat() / h) + assertEquals(LegacyGamepadLayout(context, 2048, h).regenerate(old), OnScreenLayout.elements(context, saved, 2048, h, Rect())) + val custom = saved.copy(elements = old.map { if (it.id == "legacy:a") it.copy(x = .4f) else it }) + assertEquals(OnScreenLayout.fit(custom.elements, custom.aspect, 1f, 2048, h, Rect()), OnScreenLayout.elements(context, custom, 2048, h, Rect())) + } + + @Test fun savingTheEditorFrameKeepsEveryControlWhereTheEditorShowsIt() { + val w = 2608 + val h = 1200 + val layout = SavedInputLayout("custom", "Custom", listOf( + InputSurfaceElement(InputControl.A, .1f, .2f, .1f, .2f, "custom:a"), + InputSurfaceElement(InputControl.B, .7f, .6f, .1f, .2f, "custom:b")), aspect = 16f / 9f) + val displayed = OnScreenLayout.editorElements(context, layout, w, h, edited = true) + val moved = displayed.map { if (it.id == "custom:a") it.copy(x = .4f) else it } + val frame = OnScreenLayout.editorFrame(layout, moved + InputSurfaceElement(InputControl.X, .5f, .5f, .1f, .1f, "builtin:keyboard")) + assertEquals(layout.elements.map { it.id }, frame.map { it.id }) + val saved = layout.copy(elements = frame, aspect = w.toFloat() / h) + val game = OnScreenLayout.elements(context, saved, w, h, Rect()) + val editor = OnScreenLayout.editorElements(context, saved, w, h, edited = true) + for (shown in moved) { + assertArrayEquals(px(shown, w, h), px(game.first { it.id == shown.id }, w, h), .001f) + assertArrayEquals(px(shown, w, h), px(editor.first { it.id == shown.id }, w, h), .001f) + } + } + + @Test fun editorAndGameUseTheSamePixelRectsOnWideAndStandardScreens() { + val layout = gamepad() + for ((w, h) in listOf(2000 to 900, 1600 to 900)) { + val game = OnScreenLayout.elements(context, layout, w, h, Rect()) + val editor = OnScreenLayout.editorElements(context, layout, w, h) + assertEquals(game.map { it.id }, editor.map { it.id }) + game.zip(editor).forEach { (gameElement, editorElement) -> + assertArrayEquals(px(gameElement, w, h), px(editorElement, w, h), .001f) + } + } + } + + @Test fun editedGeneratedAndCustomLayoutsKeepTheirPixelRectsAcrossRefreshes() { + for ((w, h) in listOf(2000 to 900, 1600 to 900)) { + val generated = gamepad() + val generatedEdit = generated.elements.map { if (it.id == "legacy:a") it.copy(x = .3f, y = .4f, width = .12f, height = .12f) else it } + val generatedSaved = generated.copy(elements = generatedEdit, aspect = w.toFloat() / h) + val generatedPixels = px(OnScreenLayout.elements(context, generatedSaved, w, h, Rect()).first { it.id == "legacy:a" }, w, h) + val generatedRefresh = px(OnScreenLayout.editorElements(context, generatedSaved, w, h, edited = true).first { it.id == "legacy:a" }, w, h) + assertArrayEquals(generatedPixels, generatedRefresh, .001f) + + val custom = SavedInputLayout("custom", "Custom", listOf(InputSurfaceElement(InputControl.A, .3f, .4f, .12f, .12f)), aspect = w.toFloat() / h) + val customRefresh = OnScreenLayout.editorElements(context, custom, w, h, edited = true) + assertArrayEquals(px(customRefresh.single(), w, h), px(OnScreenLayout.editorElements(context, custom.copy(elements = customRefresh), w, h, edited = true).single(), w, h), .001f) + } + } + + @Test fun resetPositionsRestoresGeneratedGeometryAfterAnEdit() { + for ((w, h) in listOf(2000 to 900, 1600 to 900)) { + val original = gamepad() + val moved = original.copy(elements = original.elements.map { if (it.id == "legacy:a") it.copy(x = .3f) else it }, aspect = w.toFloat() / h) + val reset = LegacyGamepadLayout(context, w, h).regenerate(moved.elements) + assertEquals(LegacyGamepadLayout(context, w, h).regenerate(original.elements), OnScreenLayout.elements(context, moved.copy(elements = reset), w, h, Rect())) + } + } + @Test fun regenerationKeepsTheUsersButtonStylesAndRemovedButtons() { val layout = gamepad().let { g -> g.copy(elements = g.elements.filterNot { it.id == "legacy:y" }.map { if (it.id == "legacy:a") it.copy(opacity = .4f, icon = 0, name = "Jump") else it }) } val placed = OnScreenLayout.elements(context, layout, 2000, 1000, Rect()) diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenMouseButtonTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenMouseButtonTest.kt new file mode 100644 index 0000000000..aebe881c8a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenMouseButtonTest.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.input + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class OnScreenMouseButtonTest { + private val button = InputSurfaceElement(InputControl.A, .8f, .6f, .1f, .1f, id = "custom:left") + private val stick = InputSurfaceElement(InputControl.LS, .1f, .6f, .2f, .3f, id = "custom:stick") + private val legacyA = InputSurfaceElement(InputControl.A, .8f, .6f, .1f, .1f) + private val game = InputProfile.defaults(InputProfile.GAME) + private val desktop = InputProfile.defaults(InputProfile.DESKTOP) + private val overlay = InputControl.entries.map { InputSurfaceElement(it, .1f, .1f, .1f, .1f) } + + private fun profile(vararg elements: Pair, clicks: Map = emptyMap(), base: InputProfile = game) = + base.copy(elements = mapOf(InputRole.PRIMARY to elements.toMap()), clicks = mapOf(InputRole.PRIMARY to clicks)) + + @Test fun shownButtonBoundToAMouseButtonIsDetected() { + listOf(272, 273, 274).forEach { code -> + assertTrue(profile(button.id to InputAction.MouseButton(code)).showsMouseButton(InputRole.PRIMARY, listOf(stick, button), game)) + } + } + + @Test fun stickClickBoundToAMouseButtonIsDetected() { + val profile = profile(stick.id to InputAction.Native(), clicks = mapOf(stick.id to InputAction.MouseButton(272))) + assertTrue(profile.showsMouseButton(InputRole.PRIMARY, listOf(stick), game)) + } + + @Test fun legacyButtonUsesItsRoleBinding() { + val profile = game.withBinding(InputRole.PRIMARY, InputControl.A, InputAction.MouseButton(272)) + assertTrue(profile.showsMouseButton(InputRole.PRIMARY, listOf(legacyA), game)) + assertFalse(profile.showsMouseButton(InputRole.SECONDARY, listOf(legacyA), game)) + } + + @Test fun stockDesktopOverlayKeepsTapsClicking() { + assertFalse(desktop.showsMouseButton(InputRole.PRIMARY, overlay, desktop)) + } + + @Test fun userBoundMouseButtonInDesktopIsDetected() { + val rebound = desktop.withBinding(InputRole.PRIMARY, InputControl.X, InputAction.MouseButton(272)) + assertTrue(rebound.showsMouseButton(InputRole.PRIMARY, overlay, desktop)) + val stickClick = desktop.withBinding(InputRole.PRIMARY, InputControl.L3, InputAction.MouseButton(274)) + assertTrue(stickClick.showsMouseButton(InputRole.PRIMARY, overlay, desktop)) + assertTrue(profile(button.id to InputAction.MouseButton(272), base = desktop).showsMouseButton(InputRole.PRIMARY, overlay + button, desktop)) + } + + @Test fun desktopBindingsOnAGameBaseProfileAreUserPicked() { + val copied = desktop.copy(id = "custom") + assertTrue(copied.showsMouseButton(InputRole.PRIMARY, overlay, game)) + } + + @Test fun layoutWithoutAMouseButtonKeepsTapsClicking() { + val profile = profile(button.id to InputAction.Keys(listOf(57)), stick.id to InputAction.Pointer()) + assertFalse(profile.showsMouseButton(InputRole.PRIMARY, listOf(stick, button), game)) + assertFalse(game.showsMouseButton(InputRole.PRIMARY, listOf(legacyA, stick) + overlay, game)) + } + + @Test fun hiddenMouseButtonDoesNotCount() { + assertFalse(profile(button.id to InputAction.MouseButton(272)).showsMouseButton(InputRole.PRIMARY, listOf(stick), game)) + assertFalse(profile(button.id to InputAction.MouseButton(272)).showsMouseButton(InputRole.PRIMARY, emptyList(), game)) + } + + @Test fun physicalMouseBindingsDoNotCount() { + val profile = game.withBinding(InputRole.PHYSICAL, InputControl.A, InputAction.MouseButton(272)) + assertFalse(profile.showsMouseButton(InputRole.PRIMARY, listOf(legacyA), game)) + } + + @Test fun invalidMouseCodeDoesNotCount() { + assertFalse(profile(button.id to InputAction.MouseButton(1)).showsMouseButton(InputRole.PRIMARY, listOf(button), game)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt index ae46c9d5e3..b79e813a9e 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadPartialAxesTest.kt @@ -83,6 +83,117 @@ class PadPartialAxesTest { assertEquals(-0.6f, pad().rightY) } + @Test fun onlyRxRyAxesProvideTheRightStick() { + val device = device(MotionEvent.AXIS_RX, MotionEvent.AXIS_RY) + motion(device, MotionEvent.AXIS_RX to 0.6f, MotionEvent.AXIS_RY to -0.6f) + assertEquals(0.6f, pad().rightX) + assertEquals(-0.6f, pad().rightY) + } + + @Test fun rxRyStickWithoutZRzKeepsTriggersReleased() { + val device = device(MotionEvent.AXIS_RX, MotionEvent.AXIS_RY) + motion(device, MotionEvent.AXIS_RX to 0f, MotionEvent.AXIS_RY to 0f) + assertEquals(0f, pad().leftTrigger) + assertEquals(0f, pad().rightTrigger) + } + + @Test fun rxRyStickReadsDedicatedTriggerAxes() { + val device = device(MotionEvent.AXIS_RX, MotionEvent.AXIS_RY, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_RTRIGGER) + motion(device, MotionEvent.AXIS_RX to 0.6f, MotionEvent.AXIS_RY to 0f, + MotionEvent.AXIS_LTRIGGER to 0.4f, MotionEvent.AXIS_RTRIGGER to 0f) + assertEquals(0.6f, pad().rightX) + assertEquals(0.4f, pad().leftTrigger) + assertEquals(0f, pad().rightTrigger) + } + + @Test fun leftTriggerFallsBackToBrakeWhenDedicatedAxisIsZero() { + val device = device(MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_BRAKE) + motion(device, MotionEvent.AXIS_LTRIGGER to 0f, MotionEvent.AXIS_BRAKE to 0.7f) + assertEquals(0.7f, pad().leftTrigger) + } + + @Test fun rightTriggerFallsBackToGasWhenDedicatedAxisIsZero() { + val device = device(MotionEvent.AXIS_RTRIGGER, MotionEvent.AXIS_GAS) + motion(device, MotionEvent.AXIS_RTRIGGER to 0f, MotionEvent.AXIS_GAS to 0.8f) + assertEquals(0.8f, pad().rightTrigger) + } + + @Test fun onlyZRzAxesProvideTheRightStick() { + val device = device(MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ) + motion(device, MotionEvent.AXIS_Z to 0.6f, MotionEvent.AXIS_RZ to -0.6f) + assertEquals(0.6f, pad().rightX) + assertEquals(-0.6f, pad().rightY) + } + + @Test fun bothPairsUseThePairAtRestNearCentreAsTheStick() { + val device = device(MotionEvent.AXIS_RX, MotionEvent.AXIS_RY, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ) + motion(device, MotionEvent.AXIS_RX to -1f, MotionEvent.AXIS_RY to -1f, + MotionEvent.AXIS_Z to 0f, MotionEvent.AXIS_RZ to 0f) + assertEquals(0f, pad().rightX) + assertEquals(0f, pad().rightY) + motion(device, MotionEvent.AXIS_RX to 0.2f, MotionEvent.AXIS_RY to -0.3f, + MotionEvent.AXIS_Z to 0.7f, MotionEvent.AXIS_RZ to -0.8f) + assertEquals(0.7f, pad().rightX) + assertEquals(-0.8f, pad().rightY) + } + + @Test fun bothPairsUseRxRyAsStickWhenZRzRestAtMinimum() { + val device = device(MotionEvent.AXIS_RX, MotionEvent.AXIS_RY, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ) + motion(device, MotionEvent.AXIS_RX to 0f, MotionEvent.AXIS_RY to 0f, + MotionEvent.AXIS_Z to -1f, MotionEvent.AXIS_RZ to -1f) + assertEquals(0f, pad().rightX) + assertEquals(0f, pad().rightY) + assertEquals(0f, pad().leftTrigger) + assertEquals(0f, pad().rightTrigger) + motion(device, MotionEvent.AXIS_RX to 0.6f, MotionEvent.AXIS_RY to -0.6f, + MotionEvent.AXIS_Z to 1f, MotionEvent.AXIS_RZ to 1f) + assertEquals(0.6f, pad().rightX) + assertEquals(-0.6f, pad().rightY) + assertEquals(1f, pad().leftTrigger) + assertEquals(1f, pad().rightTrigger) + } + + @Test fun nonWiredZeroToOneSignedZTriggersNormalizeFromTheirRange() { + val device = device(MotionEvent.AXIS_RX, MotionEvent.AXIS_RY, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ, + zeroToOneAxes = setOf(MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ)) + motion(device, MotionEvent.AXIS_RX to 0f, MotionEvent.AXIS_RY to 0f, + MotionEvent.AXIS_Z to 0f, MotionEvent.AXIS_RZ to 0f) + assertEquals(0f, pad().leftTrigger) + assertEquals(0f, pad().rightTrigger) + motion(device, MotionEvent.AXIS_RX to 0.6f, MotionEvent.AXIS_RY to -0.6f, + MotionEvent.AXIS_Z to 1f, MotionEvent.AXIS_RZ to 1f) + assertEquals(1f, pad().leftTrigger) + assertEquals(1f, pad().rightTrigger) + } + + @Test fun movingFirstEventDoesNotLockTheWrongStickPair() { + val device = device(MotionEvent.AXIS_RX, MotionEvent.AXIS_RY, MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ) + motion(device, MotionEvent.AXIS_RX to 1f, MotionEvent.AXIS_RY to 0f, + MotionEvent.AXIS_Z to 0f, MotionEvent.AXIS_RZ to 0f) + assertEquals(0f, pad().rightX) + assertEquals(0f, pad().rightY) + motion(device, MotionEvent.AXIS_RX to 0f, MotionEvent.AXIS_RY to 0f, + MotionEvent.AXIS_Z to -1f, MotionEvent.AXIS_RZ to -1f) + motion(device, MotionEvent.AXIS_RX to 0.6f, MotionEvent.AXIS_RY to -0.6f, + MotionEvent.AXIS_Z to -1f, MotionEvent.AXIS_RZ to -1f) + assertEquals(0.6f, pad().rightX) + assertEquals(-0.6f, pad().rightY) + } + + @Test fun dedicatedRightTriggerWinsOverSignedRightTrigger() { + val device = device(MotionEvent.AXIS_RX, MotionEvent.AXIS_RY, MotionEvent.AXIS_Z, + MotionEvent.AXIS_RZ, MotionEvent.AXIS_RTRIGGER) + motion(device, MotionEvent.AXIS_RX to 0f, MotionEvent.AXIS_RY to 0f, + MotionEvent.AXIS_Z to -1f, MotionEvent.AXIS_RZ to -1f) + motion(device, MotionEvent.AXIS_RX to 0.6f, MotionEvent.AXIS_RY to -0.6f, + MotionEvent.AXIS_Z to -1f, MotionEvent.AXIS_RZ to -1f, + MotionEvent.AXIS_RTRIGGER to 0.7f) + assertEquals(0f, pad().leftTrigger) + assertEquals(0.7f, pad().rightTrigger) + assertEquals(0.6f, pad().rightX) + assertEquals(-0.6f, pad().rightY) + } + @Test fun sticksWithoutTriggerOrHatAxesPreserveAllDigitalControls() { val device = device() key(device, KeyEvent.KEYCODE_BUTTON_L2) @@ -208,14 +319,15 @@ class PadPartialAxesTest { try { assertTrue(bridge.onMotionEvent(event)) } finally { event.recycle() } } - private fun device(vararg axes: Int, wired: Boolean = false): InputDevice { + private fun device(vararg axes: Int, wired: Boolean = false, zeroToOneAxes: Set = emptySet()): InputDevice { val builder = InputDeviceBuilder.newBuilder().setId(60).setName("partial pad") .setDescriptor("partial-pad").setExternal(true) .setSources(InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_JOYSTICK) .setKeyboardType(InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC) .setVendorId(if (wired) 0x20d6 else 0).setProductId(if (wired) 0x2063 else 0) for (axis in axes.toList() + MotionEvent.AXIS_X) { - builder.addMotionRange(axis, InputDevice.SOURCE_JOYSTICK, -1f, 1f, 0f, 0f, 0f) + val min = if (axis in zeroToOneAxes) 0f else -1f + builder.addMotionRange(axis, InputDevice.SOURCE_JOYSTICK, min, 1f, 0f, 0f, 0f) } return builder.build().also { shadowOf(RuntimeEnvironment.getApplication().getSystemService(InputManager::class.java)).addInputDevice(it) diff --git a/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt index 60436eaabd..ea2d50c5fb 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/ScrollTouchGesturesTest.kt @@ -131,6 +131,50 @@ class ScrollTouchGesturesTest { assertEquals(listOf("move 400,300"), events) } + @Test fun tapsAndHoldsDoNotClickWhileClicksAreOff() { + gestures.clicks = false + touch(MotionEvent.ACTION_DOWN, 400f, 300f) + advance(80) + touch(MotionEvent.ACTION_UP, 400f, 300f) + advance(100) + touch(MotionEvent.ACTION_DOWN, 400f, 300f) + advance(600) + touch(MotionEvent.ACTION_UP, 402f, 301f) + advance(100) + assertEquals(listOf("move 400,300", "move 400,300"), events) + } + + @Test fun holdThenMoveScrollsWhileClicksAreOff() { + gestures.clicks = false + touch(MotionEvent.ACTION_DOWN, 400f, 800f) + advance(600) + touch(MotionEvent.ACTION_MOVE, 402f, 500f) + advance(200) + touch(MotionEvent.ACTION_UP, 402f, 500f) + advance(100) + assertEquals(300f, scrolledY, 0.01f) + assertEquals(listOf("move 400,800"), events) + } + + @Test fun turningClicksOffReleasesAClickInFlight() { + touch(MotionEvent.ACTION_DOWN, 400f, 300f) + advance(80) + touch(MotionEvent.ACTION_UP, 400f, 300f) + gestures.clicks = false + touch(MotionEvent.ACTION_DOWN, 400f, 300f) + advance(80) + touch(MotionEvent.ACTION_UP, 400f, 300f) + advance(100) + assertEquals(listOf("move 400,300", "left down", "left up", "move 400,300"), events) + events.clear() + gestures.clicks = true + touch(MotionEvent.ACTION_DOWN, 400f, 300f) + advance(80) + touch(MotionEvent.ACTION_UP, 400f, 300f) + advance(100) + assertEquals(listOf("move 400,300", "left down", "left up"), events) + } + @Test fun aSecondFingerDoesNotJumpTheScroll() { touch(MotionEvent.ACTION_DOWN, 400f, 900f) advance(100) 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 9956f1aa6d..566a091c42 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt @@ -1,9 +1,58 @@ package com.droiddeck.launcher.input import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue import org.junit.Test class SecondScreenModeTest { + @Test fun fallbackSelectionSurvivesRecreationAndRequestedDisplaySurvivesDisconnect() { + var saved = 2 + SecondScreenDisplays.selection(saved, listOf(3), false) { saved = it } + assertEquals(3, saved) + assertEquals(3, SecondScreenDisplays.selection(saved, listOf(3), true)) + SecondScreenDisplays.selection(saved, listOf(2), true) { saved = it } + assertEquals(3, saved) + } + + @Test fun keyboardFallsBackOnlyForADisconnectedRequestedDisplay() { + val taken: (Int) -> Boolean = { it == 2 } + val free: (Int) -> Boolean = { false } + assertTrue(SecondScreenDisplays.keyboardOnPrimary(true, 2, listOf(3), taken = free)) + assertTrue(SecondScreenDisplays.keyboardOnPrimary(true, 2, listOf(2, 3), taken = taken)) + assertFalse(SecondScreenDisplays.keyboardOnPrimary(true, 2, listOf(2, 3), taken = free)) + assertFalse(SecondScreenDisplays.keyboardOnPrimary(false, 2, listOf(3), taken = taken)) + assertFalse(SecondScreenDisplays.keyboardOnPrimary(true, -1, listOf(3), taken = taken)) + } + + @Test fun primaryFallbackRequiresVisibleActivity() { + for (available in listOf(emptyList(), listOf(2))) { + assertTrue(SecondScreenDisplays.keyboardOnPrimary(true, 2, available, true) { true }) + assertFalse(SecondScreenDisplays.keyboardOnPrimary(true, 2, available, false) { true }) + } + } + + @Test fun keyboardRouteIncludesOccupiedDisplayFallbackOnlyWhenEnabled() { + val fallback = SecondScreenDisplays.keyboardOnPrimary(true, 2, listOf(2)) { it == 2 } + assertTrue(fallback) + assertTrue(SecondScreenDisplays.routeKeyboard(true, true, false, false, fallback)) + assertFalse(SecondScreenDisplays.routeKeyboard(true, false, false, false, fallback)) + assertFalse(SecondScreenDisplays.routeKeyboard(false, true, false, false, fallback)) + assertFalse(SecondScreenDisplays.routeKeyboard(true, true, false, false, false)) + assertTrue(SecondScreenDisplays.routeKeyboard(true, true, true, false, false)) + assertTrue(SecondScreenDisplays.routeKeyboard(true, true, false, true, false)) + } + + @Test fun selectedGameDisplayIsNotReplacedWhenItDisconnects() { + assertEquals(2, SecondScreenDisplays.selection(2, listOf(3), true)) + assertEquals(2, SecondScreenDisplays.selection(2, emptyList(), true)) + assertEquals(2, SecondScreenDisplays.selection(2, listOf(3, 2), true)) + assertEquals(3, SecondScreenDisplays.selection(3, listOf(3), true)) + assertEquals(3, SecondScreenDisplays.selection(2, listOf(3), false)) + assertEquals(3, SecondScreenDisplays.selection(-1, listOf(3), true)) + assertEquals(-1, SecondScreenDisplays.selection(-1, emptyList(), false)) + } + @Test fun withNothingRememberedDeckPadsGetControlsAndOthersTheDashboard() { assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening(null, deckPad = true, dashboard = true)) assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = false, dashboard = true)) diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionFieldKeyboardTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionFieldKeyboardTest.kt new file mode 100644 index 0000000000..483c61f562 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionFieldKeyboardTest.kt @@ -0,0 +1,169 @@ +package com.droiddeck.launcher.input + +import android.view.KeyEvent +import android.view.WindowInsets +import com.droiddeck.launcher.SessionActivity +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class SessionFieldKeyboardTest { + private lateinit var activity: SessionActivity + private lateinit var keyboard: KeyboardHost + + @Before fun setUp() { + activity = Robolectric.buildActivity(SessionActivity::class.java).get() + keyboard = KeyboardHost(activity) + ReflectionHelpers.setField(activity, "keyboard", keyboard) + keyboard.onImeChanged = { visible -> + ReflectionHelpers.callInstanceMethod(activity, "onPrimaryImeChanged", + ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, visible)) + } + } + + @Test fun guestDismissalClosesOnlyTheGuestOwnedKeyboard() { + openFieldKeyboard() + call("dismissFieldKeyboard") + assertFalse(keyboard.shown) + call("showPrimaryKeyboard") + call("dismissFieldKeyboard") + assertTrue(keyboard.shown) + } + + @Test fun pauseHideThenManualReopenSurvivesGuestDismissal() { + openFieldKeyboard() + call("hidePrimaryKeyboard") + assertFalse(keyboard.shown) + call("showPrimaryKeyboard") + call("dismissFieldKeyboard") + assertTrue(keyboard.shown) + openFieldKeyboard() + call("dismissFieldKeyboard") + assertFalse(keyboard.shown) + } + + @Test fun manualToggleAndPcKeyboardRelinquishGuestOwnership() { + openFieldKeyboard() + call("togglePrimaryKeyboard") + call("togglePrimaryKeyboard") + call("dismissFieldKeyboard") + assertTrue(keyboard.shown) + openFieldKeyboard() + call("togglePcKeyboard") + call("showPrimaryKeyboard") + call("dismissFieldKeyboard") + assertTrue(keyboard.shown) + } + + @Test fun pendingGuestRequestWaitsForFocusAndCanBeDismissed() { + ReflectionHelpers.callInstanceMethod(activity, "setGameOnBottom", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, true)) + ReflectionHelpers.callInstanceMethod(activity, "setSelectedSecondScreenDisplay", ReflectionHelpers.ClassParameter.from(Int::class.javaPrimitiveType, 2)) + ReflectionHelpers.callInstanceMethod(activity, "setResumed", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, true)) + call("openBottomKeyboard") + ReflectionHelpers.callInstanceMethod(activity, "retryFieldKeyboard", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, false)) + assertFalse(keyboard.shown) + call("dismissFieldKeyboard") + ReflectionHelpers.callInstanceMethod(activity, "retryFieldKeyboard", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, true)) + assertFalse(keyboard.shown) + call("openBottomKeyboard") + ReflectionHelpers.callInstanceMethod(activity, "retryFieldKeyboard", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, true)) + assertTrue(keyboard.shown) + call("dismissFieldKeyboard") + assertFalse(keyboard.shown) + } + + @Config(sdk = [33]) + @Test fun staleHiddenEventFromEarlierHideKeepsNewGuestOwnership() { + call("showPrimaryKeyboard") + ime(true) + call("hidePrimaryKeyboard") + requestFieldKeyboard() + ime(false) + assertTrue(owned()) + ime(true) + call("dismissFieldKeyboard") + assertFalse(keyboard.shown) + } + + @Config(sdk = [33]) + @Test fun hiddenEventAfterGuestKeyboardShowsClearsOwnership() { + requestFieldKeyboard() + ime(true) + ime(false) + assertFalse(owned()) + call("showPrimaryKeyboard") + call("dismissFieldKeyboard") + assertTrue(keyboard.shown) + } + + @Config(sdk = [33]) + @Test fun guestRequestWhileKeyboardAlreadyVisibleClearsOnRealDismissal() { + call("showPrimaryKeyboard") + ime(true) + requestFieldKeyboard() + assertTrue(owned()) + ime(false) + assertFalse(owned()) + } + + @Test fun backDismissalWithoutImeInsetsClearsOwnership() { + requestFieldKeyboard() + assertTrue(owned()) + val t = System.currentTimeMillis() + keyboard.onKeyPreIme(KeyEvent.KEYCODE_BACK, KeyEvent(t, t, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK, 0)) + assertFalse(keyboard.shown) + assertFalse(owned()) + } + + @Test fun focusReturnSkipsPrimaryKeyboardWhenDestinationNoLongerPrimary() { + setFlag("setGameOnBottom", true) + selectDisplay(2) + setFlag("setResumed", true) + call("openBottomKeyboard") + retry(false) + setFlag("setGameOnBottom", false) + retry(true) + assertFalse(keyboard.shown) + assertFalse(owned()) + assertFalse(ReflectionHelpers.getField(activity, "pendingFieldKeyboard")) + } + + private fun requestFieldKeyboard() { + setFlag("setGameOnBottom", true) + selectDisplay(2) + setFlag("setResumed", true) + call("openBottomKeyboard") + retry(true) + assertTrue(keyboard.shown) + } + + private fun ime(visible: Boolean) { + keyboard.dispatchApplyWindowInsets(WindowInsets.Builder().setVisible(WindowInsets.Type.ime(), visible).build()) + } + + private fun owned() = ReflectionHelpers.getField(activity, "fieldKeyboardOnPrimary") + + private fun selectDisplay(id: Int) = ReflectionHelpers.callInstanceMethod(activity, "setSelectedSecondScreenDisplay", + ReflectionHelpers.ClassParameter.from(Int::class.javaPrimitiveType, id)) + + private fun retry(focus: Boolean) = ReflectionHelpers.callInstanceMethod(activity, "retryFieldKeyboard", + ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, focus)) + + private fun setFlag(name: String, value: Boolean) = ReflectionHelpers.callInstanceMethod(activity, name, + ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, value)) + + private fun openFieldKeyboard() { + ReflectionHelpers.setField(activity, "fieldKeyboardOnPrimary", true) + keyboard.show() + } + + private fun call(name: String) = ReflectionHelpers.callInstanceMethod(activity, name) +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/ShortcutsRelayTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ShortcutsRelayTest.kt index 2a8d99cd81..283951b5e0 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/ShortcutsRelayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/ShortcutsRelayTest.kt @@ -32,9 +32,10 @@ class ShortcutsRelayTest { private fun choose(value: String?) = Settings.Secure.putString(context.contentResolver, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, value) - private fun installCompanion() { + @Suppress("DEPRECATION") + private fun installCompanion(version: Int = Relay.VERSION) { val app = ApplicationInfo().apply { packageName = Relay.PACKAGE; uid = companionUid } - shadowOf(context.packageManager).installPackage(PackageInfo().apply { packageName = Relay.PACKAGE; applicationInfo = app }) + shadowOf(context.packageManager).installPackage(PackageInfo().apply { packageName = Relay.PACKAGE; applicationInfo = app; versionCode = version }) shadowOf(context.packageManager).setPackagesForUid(companionUid, Relay.PACKAGE) } @@ -84,6 +85,26 @@ class ShortcutsRelayTest { assertEquals(0, config(binder, companionUid)) } + @Test fun anOldCompanionIsOfferedAsAnUpdate() { + installCompanion(version = 1) + choose("${Relay.PACKAGE}/${Relay.SERVICE}") + assertTrue(SteamIntegration.shortcutsEnabled(context)) + assertFalse(SteamIntegration.read(context).shortcuts) + installCompanion() + assertTrue(SteamIntegration.read(context).shortcuts) + } + + @Test fun droidDeckHoldsTheRelayOnlyWhileAScreenIsStarted() { + installCompanion() + ShortcutsRelay.Holder.install(context) + val activity = Robolectric.buildActivity(android.app.Activity::class.java).create() + activity.start() + assertEquals(1, shadowOf(context).boundServiceConnections.size) + activity.stop() + shadowOf(android.os.Looper.getMainLooper()).idleFor(java.time.Duration.ofSeconds(2)) + assertEquals(0, shadowOf(context).boundServiceConnections.size) + } + @Test fun windowSnapshotsSurviveTheTrip() { val sent = mapOf(2 to listOf(Relay.Window(7, 1, 3, Rect(0, 0, 1080, 1240), "guest.app"), Relay.Window(8, 2, 1, Rect(1, 2, 3, 4), null))) val got = Relay.decode(Relay.encode(sent)) 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 2b84e3ae4d..c967ce02fd 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt @@ -262,6 +262,75 @@ class TouchpadGesturesTest { assertFalse(events.contains("left down")) } + @Test fun tapsDoNotClickWhileClicksAreOff() { + touchpad.clicks = false + tap() + advance(20) + tap() + advance(TouchTiming.HOLD_MS + 100) + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + advance(TouchTiming.HOLD_MS + 100) + touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) + advance(200) + assertFalse(events.any { it.endsWith(" down") }) + } + + @Test fun twoFingerTapDoesNotClickWhileClicksAreOff() { + touchpad.clicks = false + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + advance(10) + touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (400f to 300f), 2 to (600f to 310f)) + advance(60) + touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 300f), 2 to (600f to 310f)) + advance(10) + touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) + advance(200) + assertFalse(events.any { it.endsWith(" down") }) + } + + @Test fun pointerStillMovesWhileClicksAreOff() { + touchpad.clicks = false + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + advance(10) + touch(MotionEvent.ACTION_MOVE, 0, 1 to (440f to 300f)) + advance(10) + touch(MotionEvent.ACTION_UP, 0, 1 to (440f to 300f)) + assertTrue(events.contains("move")) + assertTrue(touchpad.x > 960f) + assertFalse(events.any { it.endsWith(" down") }) + } + + @Test fun tapsClickAgainOnceClicksAreBackOn() { + touchpad.clicks = false + tap() + advance(400) + touchpad.clicks = true + tap() + advance(200) + assertEquals(listOf("left down", "left up"), events) + } + + @Test fun aTapWhileClicksWereOffDoesNotStartADragOnceTheyAreBackOn() { + touchpad.clicks = false + tap() + advance(20) + touchpad.clicks = true + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + assertEquals(emptyList(), events) + advance(80) + touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) + advance(200) + assertEquals(listOf("left down", "left up"), events) + } + + @Test fun doubleTapStillDragsWhileClicksStayOn() { + tap() + advance(20) + touchpad.clicks = true + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + assertEquals(listOf("left down", "left up", "left down"), events) + } + private fun tap() { touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) advance(80) 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 23db657ed5..2534a85dd1 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt @@ -112,6 +112,40 @@ class BwrapSpawnerPlanTest { .put("cwd", "/app") .put("ops", JSONArray().apply { ops.forEach { put(it) } }) + @Test fun desktopSandboxesGetTheRuntimeGpuWithoutReplacingExplicitChoices() { + val lib = File(runtime, "usr/lib/aarch64-linux-gnu/libvulkan_freedreno.so") + lib.parentFile!!.mkdirs() + lib.writeText("") + val root = File(dir, "root").apply { mkdirs() } + for (session in listOf(emptyMap(), mapOf("BL_DESKTOP" to "1"), + mapOf("BL_DESKTOP" to "1", "GALLIUM_DRIVER" to "zink", "MESA_LOADER_DRIVER_OVERRIDE" to "zink"))) { + val env = session.toMutableMap() + val binds = BwrapSpawner.gpu(runtime.path, root, env, true)!! + assertTrue(binds.any { it.host == lib.canonicalPath && it.guest == "/run/droiddeck-gpu/libvulkan_freedreno.so" }) + assertEquals("/run/droiddeck-gpu/freedreno_icd.json", env["VK_DRIVER_FILES"]) + assertEquals("zink", env["GALLIUM_DRIVER"]) + assertEquals(session["BL_DESKTOP"], env["BL_DESKTOP"]) + } + for (choice in listOf(mapOf("VK_DRIVER_FILES" to "/custom/icd.json"), + mapOf("VK_ICD_FILENAMES" to ""), mapOf("LIBGL_ALWAYS_SOFTWARE" to "1"))) { + val env = (choice + ("BL_DESKTOP" to "1")).toMutableMap() + val original = env.toMap() + assertEquals(null, BwrapSpawner.gpu(runtime.path, root, env, true)) + assertEquals(original, env) + } + val env = mutableMapOf("BL_DESKTOP" to "1", "GALLIUM_DRIVER" to "llvmpipe") + assertTrue(BwrapSpawner.gpu(runtime.path, root, env, true)!!.isNotEmpty()) + assertEquals("llvmpipe", env["GALLIUM_DRIVER"]) + val gamescope = mutableMapOf("BL_DESKTOP" to "1", "LIBGL_ALWAYS_SOFTWARE" to "1", "GAMESCOPE_WAYLAND_DISPLAY" to "gamescope-0") + assertTrue(BwrapSpawner.gpu(runtime.path, root, gamescope, true)!!.isNotEmpty()) + val unavailable = mutableMapOf("BL_DESKTOP" to "1") + assertEquals(null, BwrapSpawner.gpu(runtime.path, root, unavailable, false)) + assertEquals(mapOf("BL_DESKTOP" to "1"), unavailable) + assertTrue(lib.delete()) + assertEquals(null, BwrapSpawner.gpu(runtime.path, root, unavailable, true)) + assertEquals(mapOf("BL_DESKTOP" to "1"), unavailable) + } + @Test fun buildsTheTreeFlatpakAsksFor() { val context = RuntimeEnvironment.getApplication() val info = Base64.encodeToString("[Application]\nname=org.example.Game\n".toByteArray(), Base64.NO_WRAP) diff --git a/app/src/test/java/com/droiddeck/launcher/session/LightPauseTest.kt b/app/src/test/java/com/droiddeck/launcher/session/LightPauseTest.kt new file mode 100644 index 0000000000..8e14b74147 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/LightPauseTest.kt @@ -0,0 +1,56 @@ +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 LightPauseTest { + @Test + fun theBounceAloneResumesLight() { + val pause = LightPause() + pause.paused(bounces = 3) + assertEquals(LightPause.Resume.LIGHT, pause.resumed(bounces = 4)) + assertFalse(pause.timedOut()) + } + + @Test + fun anUnrelatedPauseWithoutABounceCleansUpAtTheTimeout() { + val pause = LightPause() + pause.paused(bounces = 3) + assertTrue(pause.timedOut()) + assertEquals(LightPause.Resume.NORMAL, pause.resumed(bounces = 3)) + } + + @Test + fun aBounceWhileAnotherActivityHoldsThePauseStillCleansUpAtTheTimeout() { + val pause = LightPause() + pause.paused(bounces = 3) + assertTrue(pause.timedOut()) + assertEquals(LightPause.Resume.NORMAL, pause.resumed(bounces = 4)) + } + + @Test + fun aResumeBeforeTheTimeoutWithoutABounceCleansUpFirst() { + val pause = LightPause() + pause.paused(bounces = 3) + assertEquals(LightPause.Resume.CLEANUP_FIRST, pause.resumed(bounces = 3)) + assertFalse(pause.timedOut()) + } + + @Test + fun aStopAfterALightPauseCleansUpOnce() { + val pause = LightPause() + pause.paused(bounces = 3) + assertTrue(pause.stopped()) + assertFalse(pause.timedOut()) + assertEquals(LightPause.Resume.NORMAL, pause.resumed(bounces = 4)) + } + + @Test + fun aNormalPauseIsUntouched() { + val pause = LightPause() + assertFalse(pause.stopped()) + assertEquals(LightPause.Resume.NORMAL, pause.resumed(bounces = 0)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionRestartNoteTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionRestartNoteTest.kt new file mode 100644 index 0000000000..230afe7db9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionRestartNoteTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class SessionRestartNoteTest { + private val started = 1_731_100_000_000L + + @Test fun aBootAfterTheSessionBeganIsReportedAsARestart() { + val note = SessionArtifacts.restartNote(started, started + 20 * 60_000L) + assertNotNull(note) + assertTrue(note!!.startsWith("The device itself probably restarted")) + } + + @Test fun aBootBeforeTheSessionBeganMeansOnlyTheAppEnded() { + val note = SessionArtifacts.restartNote(started, started - 3 * 3_600_000L) + assertTrue(note!!.startsWith("The device does not appear to have restarted")) + } + + @Test fun clockCorrectionsWithinAMinuteAreNotARestart() { + val note = SessionArtifacts.restartNote(started, started + 30_000L) + assertTrue(note!!.startsWith("The device does not appear to have restarted")) + } + + @Test fun aFolderWithoutAStartTimeSaysNothing() { + assertNull(SessionArtifacts.restartNote(0L, started)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt index de082c7fe9..3d0e420001 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt @@ -85,4 +85,23 @@ class SessionScalingPrefsTest { SessionPrefs.setUpscaler(context, 1) assertEquals(0, prefs.getInt("upscaler", -1)) } + + private fun fpsContext(): Context = RuntimeEnvironment.getApplication().also { + it.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } + + @Test fun aFrameLimitStaysWithTheGameOrDesktopItWasSetIn() { + val ctx = fpsContext() + val game = SessionPrefs.fpsLimitKey(SessionService.MODE_RUN, "123") + val desktop = SessionPrefs.fpsLimitKey(SessionService.MODE_DESKTOP, null) + SessionPrefs.saveFpsLimit(ctx, game, 45) + SessionPrefs.saveFpsLimit(ctx, desktop, 30) + assertEquals(45, SessionPrefs.savedFpsLimit(ctx, game)) + assertEquals(30, SessionPrefs.savedFpsLimit(ctx, desktop)) + assertEquals(0, SessionPrefs.savedFpsLimit(ctx, SessionPrefs.fpsLimitKey(SessionService.MODE_RUN, "456"))) + assertEquals(null, SessionPrefs.fpsLimitKey(SessionService.MODE_STEAM, "123")) + assertEquals(null, SessionPrefs.fpsLimitKey(SessionService.MODE_RUN, "not-a-game")) + SessionPrefs.saveFpsLimit(ctx, game, 0) + assertEquals(0, SessionPrefs.savedFpsLimit(ctx, game)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/TopUnderPressureTest.kt b/app/src/test/java/com/droiddeck/launcher/session/TopUnderPressureTest.kt new file mode 100644 index 0000000000..ac0ec06843 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/TopUnderPressureTest.kt @@ -0,0 +1,25 @@ +package com.droiddeck.launcher.session + +import android.content.ComponentCallbacks2 +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class TopUnderPressureTest { + @Test + fun onlyRunningLevelsCountAsPressure() { + assertTrue(TopUnderPressure.isPressure(ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL)) + assertTrue(TopUnderPressure.isPressure(ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW)) + assertFalse(TopUnderPressure.isPressure(ComponentCallbacks2.TRIM_MEMORY_RUNNING_MODERATE)) + assertFalse(TopUnderPressure.isPressure(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN)) + } + + @Test + fun reclaimsOnlyDuringASessionShortlyAfterPressure() { + assertTrue(TopUnderPressure.shouldReclaim(10_000, 9_500, sessionRunning = true, finishing = false)) + assertFalse(TopUnderPressure.shouldReclaim(20_000, 9_500, sessionRunning = true, finishing = false)) + assertFalse(TopUnderPressure.shouldReclaim(10_000, 0, sessionRunning = true, finishing = false)) + assertFalse(TopUnderPressure.shouldReclaim(10_000, 9_500, sessionRunning = false, finishing = false)) + assertFalse(TopUnderPressure.shouldReclaim(10_000, 9_500, sessionRunning = true, finishing = true)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreCacheTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreCacheTest.kt index c01e4202f6..4366866c6b 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreCacheTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreCacheTest.kt @@ -42,4 +42,20 @@ class StoreCacheTest { val fresh = listOf(a) assertSame(fresh, mergeItems(null, fresh)) } + + @Test fun aSavedStoreLibraryRoundTripsWithItsStoreAndExtras() { + val games = listOf( + CatalogItem( + Store.UBISOFT, "4553", "Far Cry 3 Blood Dragon", "https://img/wide.jpg", tallImageUrl = "https://img/tall.jpg", + logoUrl = "https://img/logo.png", owned = true, sizeBytes = 2_000_000L, extra = mapOf("productId" to "205", "spaceId" to "abc"), + subscription = true, includedWith = "Ubisoft+", + ), + CatalogItem(Store.UBISOFT, "1", "No art", null), + ) + assertEquals(games, StoreLibraryCache.decode(Store.UBISOFT, StoreLibraryCache.encode(games))) + } + + @Test fun aSavedEmptyStoreLibraryStaysEmptyRatherThanUnknown() { + assertEquals(emptyList(), StoreLibraryCache.decode(Store.ROCKSTAR, StoreLibraryCache.encode(emptyList()))) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceEditorViewTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceEditorViewTest.kt new file mode 100644 index 0000000000..c74e5be155 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceEditorViewTest.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.ui + +import android.view.MotionEvent +import com.droiddeck.launcher.input.InputControl +import com.droiddeck.launcher.input.InputSurfaceElement +import com.droiddeck.launcher.input.OnScreenLayout +import com.droiddeck.launcher.input.SavedInputLayout +import org.junit.Assert.assertEquals +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], manifest = Config.NONE) +class InputSurfaceEditorViewTest { + private val context get() = RuntimeEnvironment.getApplication() + private val layout = SavedInputLayout("custom", "Custom", listOf(InputSurfaceElement(InputControl.A, .1f, .2f, .2f, .2f)), aspect = 2f) + + private fun view() = InputSurfaceEditorView(context).apply { + layout(0, 0, 1000, 1000) + sourceLayout = layout + aspect = layout.aspect + elements = layout.elements + snap = false + } + + private fun center() = OnScreenLayout.editorElements(context, layout, 1000, 1000).first().let { (it.x + it.width / 2) * 1000 to (it.y + it.height / 2) * 1000 } + @Suppress("UNCHECKED_CAST") + private fun InputSurfaceEditorView.rendered() = javaClass.getDeclaredField("visibleElements").also { it.isAccessible = true }.get(this) as List + + private fun InputSurfaceEditorView.touch(action: Int, x: Float, y: Float) { + MotionEvent.obtain(0, 10, action, x, y, 0).also { onTouchEvent(it); it.recycle() } + } + + @Test fun editingStartsInTheDisplayedFrame() { + val view = view() + var started: Pair, Float>? = null + view.onBeginEdit = { elements, aspect -> started = elements to aspect } + val (x, y) = center() + view.touch(MotionEvent.ACTION_DOWN, x, y) + view.touch(MotionEvent.ACTION_MOVE, x + 100f, y + 50f) + val (elements, aspect) = requireNotNull(started) + assertEquals(1f, aspect, .0001f) + assertEquals(OnScreenLayout.editorElements(context, layout, 1000, 1000), elements) + } + + @Test fun undoRestoresTheSavedFrameForHitTesting() { + val view = view() + var selection: String? = null + view.onSelect = { selection = it } + view.elements = layout.elements.map { it.copy(x = .5f) } + view.elements = layout.elements + val (x, y) = center() + view.touch(MotionEvent.ACTION_DOWN, x, y) + assertEquals("legacy:a", selection) + } + + @Test fun editorFramePreservesAddedAndRemovedDraftElements() { + val added = layout.elements + InputSurfaceElement(InputControl.B, .6f, .2f, .2f, .2f, id = "added") + val removed = layout.copy(elements = emptyList()) + assertEquals(added, OnScreenLayout.editorFrame(layout.copy(elements = added), added)) + assertEquals(emptyList(), OnScreenLayout.editorFrame(removed, emptyList())) + } + + @Test fun savedAspectRemainsStableForRenamesAndResizes() { + val view = view() + val renamed = layout.elements.map { it.copy(name = "Renamed") } + view.elements = renamed + view.aspect = 2f + assertEquals(OnScreenLayout.editorElements(context, layout.copy(elements = renamed, aspect = 2f), 1000, 1000), view.rendered()) + view.layout(0, 0, 800, 1000) + assertEquals(OnScreenLayout.editorElements(context, layout.copy(elements = renamed, aspect = 2f), 800, 1000), view.rendered()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt index 441bd32736..ff68527da7 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt @@ -41,23 +41,23 @@ class NavTabsTest { } @Test fun musicStartsInMore() { - assertEquals(listOf("steam", "games", "stores", "desktop", "components", "setup", "updates", "trinkets", NavTabs.MORE), navigationKeys(state())) - assertEquals(listOf("soundtracks"), NavTabs.more(state())) - assertEquals(setOf("soundtracks", "agent"), NavTabs.shelved) - assertTrue(com.droiddeck.launcher.agent.AgentTab.shown) + assertEquals(listOf("steam", "games", "stores", "downloads", "desktop", "components", "setup", "updates", "trinkets", NavTabs.MORE), navigationKeys(state())) + assertEquals(listOf("soundtracks", "storage", "sync"), NavTabs.more(state())) + assertEquals(setOf("soundtracks", "agent", "storage", "sync"), NavTabs.shelved) + assertFalse(com.droiddeck.launcher.agent.AgentTab.shown) } @Test fun showingMusicOnceKeepsItShownAfterReload() { place("soundtracks", TabPlace.BAR) NavTabs.load(ctx) - assertEquals(listOf("steam", "games", "soundtracks", "stores", "desktop", "components", "setup", "updates", "trinkets"), navigationKeys(state())) + assertEquals(listOf("steam", "games", "soundtracks", "stores", "downloads", "desktop", "components", "setup", "updates", "trinkets", NavTabs.MORE), navigationKeys(state())) } @Test fun shelvedTabsLeaveTheBarAndAddMoreAtTheEnd() { place("stores", TabPlace.MORE) place("components", TabPlace.MORE) val s = state() - assertEquals(listOf("components", "soundtracks", "stores"), NavTabs.more(s)) + assertEquals(listOf("components", "soundtracks", "stores", "storage", "sync"), NavTabs.more(s)) assertEquals(NavTabs.MORE, navigationKeys(s).last()) assertFalse("stores" in navigationKeys(s)) } @@ -73,6 +73,7 @@ class NavTabsTest { @Test fun disabledStoresFeatureReadsAsHidden() { assertEquals(TabPlace.HIDDEN, NavTabs.place(state(storesOn = false), "stores")) + assertEquals(TabPlace.HIDDEN, NavTabs.place(state(storesOn = false), "downloads")) } @Test fun movingSwapsWithTheNextVisibleTabAndPersists() { @@ -84,25 +85,37 @@ class NavTabsTest { } @Test fun tabsMissingFromASavedOrderSlotInAfterTheirDefaultNeighbour() { - assertEquals(listOf("updates", "trinkets", "steam", "games", "soundtracks", "stores", "desktop", "agent", "components", "android-apps", "setup"), + assertEquals(listOf("updates", "trinkets", "steam", "games", "soundtracks", "stores", "downloads", "desktop", "agent", "components", "android-apps", "storage", "sync", "setup"), NavTabs.arrange(listOf("updates", "steam"))) - assertEquals(listOf("games", "soundtracks", "steam", "setup", "stores", "desktop", "agent", "components", "android-apps", "updates", "trinkets"), + assertEquals(listOf("games", "soundtracks", "steam", "setup", "stores", "downloads", "desktop", "agent", "components", "android-apps", "storage", "sync", "updates", "trinkets"), NavTabs.arrange(listOf("games", "steam", "setup", "stores", "desktop", "components", "android-apps", "updates", "bogus"))) } + @Test fun storageAndSyncJoinMoreForUsersWithASavedLayout() { + ctx.getSharedPreferences("session", Context.MODE_PRIVATE).edit() + .putString("navTabOrder", "steam,games,soundtracks,stores,desktop,agent,components,android-apps,setup,updates") + .putString("navTabShelved", "soundtracks").commit() + NavTabs.load(ctx) + assertEquals(listOf("soundtracks", "storage", "sync"), NavTabs.more(state())) + place("sync", TabPlace.BAR) + NavTabs.load(ctx) + assertTrue("sync" in navigationKeys(state())) + } + @Test fun moreCarriesTheDownloadCountAndBadgesOfShelvedTabs() { - place("stores", TabPlace.MORE) + place("downloads", TabPlace.MORE) place("setup", TabPlace.MORE) val s = state(downloads = 3, setupReady = false) assertEquals(3, railCount(s, NavTabs.MORE)) assertTrue(railBadge(s, NavTabs.MORE)) - place("stores", TabPlace.BAR) + place("downloads", TabPlace.BAR) assertEquals(0, railCount(s, NavTabs.MORE)) - assertEquals(3, railCount(s, "stores")) + assertEquals(3, railCount(s, "downloads")) + assertEquals(0, railCount(s, "stores")) } - @Test fun sideRailShowsTheDownloadCountOnMoreWhenStoresIsShelved() { - place("stores", TabPlace.MORE) + @Test fun sideRailShowsTheDownloadCountOnMoreWhenDownloadsIsShelved() { + place("downloads", TabPlace.MORE) val s = state(downloads = 2) compose.setContent { DroidDeckTheme { @@ -111,13 +124,13 @@ class NavTabsTest { } } } - compose.onNodeWithTag("rail-stores").assertDoesNotExist() + compose.onNodeWithTag("rail-downloads").assertDoesNotExist() compose.onNode(hasTestTag("rail-more")).assertIsDisplayed() compose.onNode(hasText("2") and hasParentTag("rail-more"), useUnmergedTree = true).assertIsDisplayed() } @Test fun morePageListsShelvedTabsWithTheirCount() { - place("stores", TabPlace.MORE) + place("downloads", TabPlace.MORE) place("components", TabPlace.MORE) val s = state(downloads = 4) compose.setContent { @@ -127,9 +140,9 @@ class NavTabsTest { } } } - compose.onNodeWithTag("more-stores").assertIsDisplayed() + compose.onNodeWithTag("more-downloads").assertIsDisplayed() compose.onNodeWithTag("more-components").assertIsDisplayed() - compose.onNode(hasText("4") and hasParentTag("more-stores"), useUnmergedTree = true).assertIsDisplayed() + compose.onNode(hasText("4") and hasParentTag("more-downloads"), useUnmergedTree = true).assertIsDisplayed() } @Test fun backFromAShelvedTabReturnsToMore() { diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SettingsMapTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SettingsMapTest.kt new file mode 100644 index 0000000000..2bfc25c309 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/SettingsMapTest.kt @@ -0,0 +1,69 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.R +import java.io.File +import javax.xml.parsers.DocumentBuilderFactory +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class SettingsMapTest { + private val strings: Map by lazy { + File("src/main/res/values").listFiles { f -> f.extension == "xml" }.orEmpty().flatMap { file -> + val doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(file) + val nodes = doc.getElementsByTagName("string") + (0 until nodes.length).map { i -> + val n = nodes.item(i) + n.attributes.getNamedItem("name").nodeValue to n.textContent.replace("\\'", "'").replace("\\\"", "\"") + } + }.toMap() + } + + private val names: Map by lazy { + R.string::class.java.fields.associate { it.getInt(null) to it.name } + } + + private fun text(id: Int): String = strings.getValue(names.getValue(id)) + + private fun render(): String = buildString { + appendLine("# Where settings live") + appendLine() + appendLine("Generated from `SettingsIndex.kt` by `SettingsMapTest`. Run `UPDATE_SETTINGS_MAP=1 ./gradlew :app:testDebugUnitTest --tests '*SettingsMapTest*'` after changing the index.") + appendLine() + appendLine("Links of the form `droiddeck://settings/
` open a Settings section directly.") + appendLine() + SettingsIndex.entries.groupBy { it.place }.forEach { (place, entries) -> + appendLine("## ${text(place.title)}") + appendLine() + appendLine("| Setting | Where | Also matches |") + appendLine("| --- | --- | --- |") + entries.forEach { e -> + val where = listOfNotNull(text(place.title), e.within?.let(::text)).joinToString(" › ") + + (e.section?.let { " (`droiddeck://settings/${it.key}`)" } ?: "") + appendLine("| ${text(e.title)} | $where | ${e.words.joinToString(", ")} |") + } + appendLine() + } + } + + @Test + fun everyIndexedStringExists() { + SettingsIndex.entries.forEach { e -> + listOfNotNull(e.title, e.within).forEach { id -> assertTrue("missing string $id", names[id] in strings) } + } + SettingsSection.entries.forEach { assertTrue(names[it.title] in strings) } + } + + @Test + fun docsMatchIndex() { + val doc = File("../docs/settings-map.md") + val now = render() + if (System.getenv("UPDATE_SETTINGS_MAP") == "1") doc.writeText(now) + assertEquals("docs/settings-map.md is stale; regenerate it", now, doc.readText().replace("\r\n", "\n")) + } + + @Test + fun sectionKeysRoundTrip() { + SettingsSection.entries.forEach { assertEquals(it, SettingsSection.of(it.key)) } + } +} diff --git a/docs/development/low-memory.md b/docs/development/low-memory.md index 770fc80d11..48fd915cf3 100644 --- a/docs/development/low-memory.md +++ b/docs/development/low-memory.md @@ -20,6 +20,12 @@ retry delay, up to five minutes. After game exit, speculative launcher readback until the session is under any explicit RAM cap, pressure has subsided, and available RAM can cover twice the launcher's swap while leaving the headroom reserve. Normal demand paging continues while readback is deferred; Steam does not have to wait for the monitor to recover. +The same readback runs while the game is still running once the client has been in front of it +for five seconds (a game stuck on a black screen and left through Steam, or a long stay in the +Steam menu), under the same memory checks and only without an explicit RAM cap. Missing or +unreadable focus data never counts as the client in front. Demand paging +alone left the Steam library and menus blank for about half a minute in that case. The +client is compressed again 20 seconds after the game is back in front. Missing memory counters disable automatic pressure reclaim and speculative readback. Missing PSI alone still permits the `MemAvailable` fallback. No root settings, swap sizes, compression algorithms, Android process priorities or game-specific settings are changed. @@ -58,7 +64,7 @@ and the RAM cap are unaffected. The session request runs when real headroom falls below a quarter of RAM (bounded to 768–2560 MiB), or below one and a half times that with at least 1% `some` or `full avg10` memory stall. Real headroom subtracts positive growth in KGSL allocation, `Unevictable`, and -`Shmem` from `MemAvailable`; a rapid fall also qualifies near twice the headroom. The monitor +`Shmem` from `MemAvailable`; a rapid fall also qualifies below twice the headroom or two fifths of RAM, whichever is larger (a 15 GB Thor Max was killed with 5.3 GB still available while memory fell about 400 MB per tick). The monitor may first request page-out of idle Steam and hidden launchers, subject to the Performance setting and client reclaim limits. When both qualify, both requests are sent before waiting for either to complete, so a slow launcher acknowledgement does not delay the game request. Until the client @@ -69,9 +75,12 @@ finds different processes. The session request targets processes that loaded Requests are at least 30 seconds apart and need the same swap reserve as launcher requests. When the session has read back more than half of what the previous request compressed, that memory is in use: the request is skipped and the wait doubles, -up to five minutes. A request whose memory stayed compressed resets it to 30 seconds. Below half -the headroom the wait is ignored and only the 30-second spacing applies. The state resets when -the game exits. +up to five minutes. A completed request must also raise `MemAvailable` by at least one +sixteenth of the tier headroom, with a 16 MiB minimum; otherwise the same wait doubles because +the pass did not provide meaningful system headroom. A request whose memory stayed compressed or +whose available memory recovers resets the wait to 30 seconds. Below half the headroom the wait +is ignored and only the 30-second spacing applies, so critical pressure can still trigger a +request. The state resets when the game exits. Measured on a Retroid Pocket Duo (7.5 GiB, kernel 6.6, 6 GiB lzo-rle zram plus a 4 GiB swap file) entering the world in World of Warcraft: Forever, one run each: diff --git a/docs/development/steam-game-imports.md b/docs/development/steam-game-imports.md index 2e4a0cc3e7..52d69934fc 100644 --- a/docs/development/steam-game-imports.md +++ b/docs/development/steam-game-imports.md @@ -64,6 +64,17 @@ inherit those routes. Managed shortcuts are replaced; user-created shortcuts and unreadable shortcut files are preserved. Both routes use the existing ARM64 Proton registration. +## Adopting shared library folders + +At every session start, `droiddeck-steam-library` looks through `steamapps/common` of each +added library for non-empty folders no manifest names. A folder whose name is the +`config.installdir` of exactly one playable app in `appcache/appinfo.vdf` (the `game` +type wins over a demo; tools, DLC and ambiguous names are skipped) gets an +`appmanifest_.acf` with `Universe=1`, `StateFlags=4` and no build, so Steam verifies +the existing files and downloads only what differs. Existing manifests are never +rewritten, an app installed in another library is skipped, and only the added library is +written to. Ownership is not read before the client runs; Steam enforces the license. + ## Launcher artwork The installed Steam game scan lists each game's `appcache/librarycache/` diff --git a/docs/settings-map.md b/docs/settings-map.md new file mode 100644 index 0000000000..b9b42d5639 --- /dev/null +++ b/docs/settings-map.md @@ -0,0 +1,106 @@ +# Where settings live + +Generated from `SettingsIndex.kt` by `SettingsMapTest`. Run `UPDATE_SETTINGS_MAP=1 ./gradlew :app:testDebugUnitTest --tests '*SettingsMapTest*'` after changing the index. + +Links of the form `droiddeck://settings/
` open a Settings section directly. + +## Settings + +| Setting | Where | Also matches | +| --- | --- | --- | +| Linux runtime | Settings › Overview (`droiddeck://settings/overview`) | ubuntu, linux, repair, update | +| Child-process limit | Settings › Overview (`droiddeck://settings/overview`) | phantom, process, killed, background | +| Steam account | Settings › Overview (`droiddeck://settings/overview`) | steam, login, sign in | +| Override Steam's core choice | Settings › Performance (`droiddeck://settings/performance`) | steam client cores, cpu | +| Game cores | Settings › Performance (`droiddeck://settings/performance`) | cpu, pin, cores, affinity | +| Save power on steady games | Settings › Performance (`droiddeck://settings/performance`) | cpu | +| Threaded GL | Settings › Performance (`droiddeck://settings/performance`) | opengl, gl | +| Zink: lazy descriptors | Settings › Performance (`droiddeck://settings/performance`) | | +| Skip GL error checks | Settings › Performance (`droiddeck://settings/performance`) | | +| gamescope: realtime GPU queue | Settings › Performance (`droiddeck://settings/performance`) | gamescope | +| Hold the GPU at its top clock | Settings › Performance (`droiddeck://settings/performance`) | gpu, clock, max | +| RAM cap | Settings › Performance (`droiddeck://settings/performance`) | ram, memory | +| VRAM cap | Settings › Performance (`droiddeck://settings/performance`) | vram, memory | +| Compress idle game memory | Settings › Performance (`droiddeck://settings/performance`) | zram, swap, memory | +| Compress Steam while a game runs | Settings › Performance (`droiddeck://settings/performance`) | zram, swap, memory | +| Clear cached apps before a session | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, crash, sleep, killed | +| Background apps during a session | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, background apps | +| Memory readout | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, overlay | +| Turnip: sysmem rendering | Settings › Performance (`droiddeck://settings/performance`) | | +| Skip Steam's xalia helper | Settings › Performance (`droiddeck://settings/performance`) | | +| droiddeck-esync | Settings › Performance (`droiddeck://settings/performance`) | esync, sync, wine | +| droiddeck-fsync first | Settings › Performance (`droiddeck://settings/performance`) | fsync, sync, wine | +| droiddeck-ntsync | Settings › Performance (`droiddeck://settings/performance`) | ntsync, sync, wine | +| Run proot without seccomp | Settings › Performance (`droiddeck://settings/performance`) | proot | +| proot fast path | Settings › Performance (`droiddeck://settings/performance`) | proot | +| Run without proot (experimental) | Settings › Performance (`droiddeck://settings/performance`) | proot | +| Draw the cursor inside gamescope | Settings › Performance (`droiddeck://settings/performance`) | mouse, cursor | +| Host name | Settings › Performance (`droiddeck://settings/performance`) | name | +| Controller | Settings › Controller (`droiddeck://settings/controller`) | gamepad, buttons, mapping, profile, remap | +| Smart glasses | Settings › Smart glasses (`droiddeck://settings/glasses`) | xreal, viture, vr, ar | +| Theme | Settings › Launcher (`droiddeck://settings/launcher`) | color, dark | +| App scale | Settings › Launcher (`droiddeck://settings/launcher`) | size, zoom | +| App icon | Settings › Launcher (`droiddeck://settings/launcher`) | | +| Animations | Settings › Launcher (`droiddeck://settings/launcher`) | | +| Sidebar labels | Settings › Launcher (`droiddeck://settings/launcher`) | sidebar | +| Language | Settings › Launcher (`droiddeck://settings/launcher`) | translate | +| Use as Home screen | Settings › Launcher (`droiddeck://settings/launcher`) | home screen, launcher | +| Launcher orientation | Settings › Launcher (`droiddeck://settings/launcher`) | rotate, portrait | +| Session orientation | Settings › Launcher (`droiddeck://settings/launcher`) | rotate, portrait | +| Fullscreen | Settings › Launcher (`droiddeck://settings/launcher`) | | +| Dual screen launcher | Settings › Launcher (`droiddeck://settings/launcher`) | thor, second screen, bottom screen | +| Warn when storage is low | Settings › Launcher (`droiddeck://settings/launcher`) | | +| SteamGridDB API key | Settings › Launcher (`droiddeck://settings/launcher`) | artwork, steamgriddb | +| Source | Settings › Launcher (`droiddeck://settings/launcher`) | mirror, china | +| HTTP proxy | Settings › Launcher (`droiddeck://settings/launcher`) | | +| Latest session logs | Settings › Developer (`droiddeck://settings/developer`) | logs, log, bug, report, crash, zip | +| Session logs | Settings › Developer (`droiddeck://settings/developer`) | logs | +| Game debug logs | Settings › Developer (`droiddeck://settings/developer`) | logs, wine, proton | +| Enhanced diagnostics for next session | Settings › Developer (`droiddeck://settings/developer`) | logs | +| Reset all settings | Settings › Developer (`droiddeck://settings/developer`) | default | +| Developer tools | Settings › Developer (`droiddeck://settings/developer`) | agent, ai, claude, codex | +| Detailed graphics logs | Settings › Developer (`droiddeck://settings/developer`) | logs, gpu | + +## Tabs + +| Setting | Where | Also matches | +| --- | --- | --- | +| Storage | Tabs › Storage | sd card, space, uninstall, disk | +| Syncthing | Tabs › Syncthing | syncthing, saves | +| Download speed tier | Tabs › Downloads | download, speed, bandwidth, slow | +| Downloads at a time | Tabs › Downloads | download, parallel, queue, at once | +| Tabs | Tabs › More | tabs, hide, reorder, agent, stores, edit tabs | + +## In-game menu + +| Setting | Where | Also matches | +| --- | --- | --- | +| Frame limit | In-game menu › Display | fps, cap, limit, non-steam, desktop | +| Frame generation | In-game menu › Display | lsfg, lossless, fps | +| Scaling filter | In-game menu › Display | upscale, fsr, sharpness | +| Performance HUD | In-game menu › Performance HUD | fps, counter, overlay, performance | +| Touchscreen | In-game menu › Controller | touch, mouse, direct, touchpad, click | +| On-screen controls | In-game menu › Controller | on-screen, controls, touch controls, buttons | +| Steam touch layout | In-game menu › Controller | touch layout, edit layout, on-screen | +| PC keyboard | In-game menu › Controller | keyboard, typing | +| Report a problem | In-game menu › Session | logs, log, bug, crash, share, zip | +| Background behavior | In-game menu › Session | sleep, background, native, resume | + +## Steam quick menu (•••) + +| Setting | Where | Also matches | +| --- | --- | --- | +| Frame limit | Steam quick menu (•••) › Performance | fps, cap, limit, steam games | +| Performance | Steam quick menu (•••) | performance overlay, fps, counter, tdp | + +## Steam or Desktop options (swipe up) + +| Setting | Where | Also matches | +| --- | --- | --- | +| Session display | Steam or Desktop options (swipe up) › Display | resolution, scaling, hdr, refresh | +| Graphics drivers | Steam or Desktop options (swipe up) › Display | turnip, driver, gpu, adreno, mali | +| Offline mode | Steam or Desktop options (swipe up) › Steam | offline, steam | +| Microphone | Steam or Desktop options (swipe up) › Audio | microphone, voice | +| Background behavior | Steam or Desktop options (swipe up) › Session | sleep, background | +| Library | Steam or Desktop options (swipe up) › Library | second library, sd card, steam library | + diff --git a/docs/third-party/malibridge/README.md b/docs/third-party/malibridge/README.md index 97882e8a6e..213317a745 100644 --- a/docs/third-party/malibridge/README.md +++ b/docs/third-party/malibridge/README.md @@ -3,15 +3,15 @@ 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 +DroidDeck builds MaliBridge from the `external/MaliBridge` submodule, pinned at 64a3f22 +(v0.5.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 +layout, the socket wait and the DXVK choice for older Vulkan drivers) is ASEbrahim's work +from https://github.com/ASEbrahim/DroidDeck, kept under their name in this repository's history. MaliBridge's own credits, in its README, include: diff --git a/external/MaliBridge b/external/MaliBridge index 95a1e600a5..64a3f22354 160000 --- a/external/MaliBridge +++ b/external/MaliBridge @@ -1 +1 @@ -Subproject commit 95a1e600a51299294e06bb09db2db8cc509fe6a3 +Subproject commit 64a3f223547918315cad8773b20693459fd3a945 diff --git a/shortcuts/build.gradle b/shortcuts/build.gradle index b9e37dd89d..62f6a84201 100644 --- a/shortcuts/build.gradle +++ b/shortcuts/build.gradle @@ -9,9 +9,9 @@ android { defaultConfig { applicationId 'com.droiddeck.shortcuts' minSdkVersion 26 - targetSdkVersion 28 - versionCode 1 - versionName '1' + targetSdkVersion 34 + versionCode 3 + versionName '3' } sourceSets.main.java.srcDir('src/protocol/java') diff --git a/shortcuts/src/main/AndroidManifest.xml b/shortcuts/src/main/AndroidManifest.xml index 2409846f7b..bdeaa1c3b1 100644 --- a/shortcuts/src/main/AndroidManifest.xml +++ b/shortcuts/src/main/AndroidManifest.xml @@ -1,6 +1,12 @@ + + + + + + = 33) registerReceiver(packages, filter, Context.RECEIVER_NOT_EXPORTED); + else registerReceiver(packages, filter); receiving = true; bindAll(); } @@ -88,7 +89,8 @@ public class ShortcutsService extends AccessibilityService { if (linked) continue; Link link = new Link(component); try { - if (bindService(new Intent(Relay.ACTION).setComponent(component), link, Context.BIND_AUTO_CREATE)) links.add(link); + // No BIND_AUTO_CREATE: frontends read a running player as an open game, so the relay app decides when it runs. + if (bindService(new Intent(Relay.ACTION).setComponent(component), link, 0)) links.add(link); else unbindService(link); } catch (RuntimeException ignored) { } diff --git a/shortcuts/src/protocol/java/com/droiddeck/shortcuts/Relay.java b/shortcuts/src/protocol/java/com/droiddeck/shortcuts/Relay.java index 77f354d055..bc8b03b9b4 100644 --- a/shortcuts/src/protocol/java/com/droiddeck/shortcuts/Relay.java +++ b/shortcuts/src/protocol/java/com/droiddeck/shortcuts/Relay.java @@ -13,6 +13,7 @@ public final class Relay { public static final String SERVICE = PACKAGE + ".ShortcutsService"; public static final String ACTION = "com.droiddeck.shortcuts.RELAY"; public static final String DESCRIPTOR = "com.droiddeck.shortcuts.Relay"; + public static final int VERSION = 3; public static final int CONFIG = 1; public static final int KEY = 2; diff --git a/tools/fex/patches/0005-gl-thunk-forward-x-errors.patch b/tools/fex/patches/0005-gl-thunk-forward-x-errors.patch new file mode 100644 index 0000000000..c4641ab213 --- /dev/null +++ b/tools/fex/patches/0005-gl-thunk-forward-x-errors.patch @@ -0,0 +1,170 @@ +diff --git a/ThunkLibs/include/common/X11Manager.h b/ThunkLibs/include/common/X11Manager.h +index a0b1f9e..3843a5f 100644 +--- a/ThunkLibs/include/common/X11Manager.h ++++ b/ThunkLibs/include/common/X11Manager.h +@@ -24,7 +24,7 @@ using guest_size_t = size_t; + * guest display/connection. + */ + struct X11Manager { +- std::mutex mutex; ++ std::recursive_mutex mutex; + + // Maps guest connection to intermediary host connection + std::unordered_map connections; +@@ -68,18 +68,25 @@ struct X11Manager { + return it->second; + } + ++ _XDisplay* FindGuestDisplay(const _XDisplay* from) { ++ std::unique_lock lock(mutex); ++ for (auto& [guest, host] : displays) { ++ if (host == from) { ++ return guest; ++ } ++ } ++ return nullptr; ++ } ++ + guest_layout<_XDisplay*> HostToGuestDisplay(const _XDisplay* from) { + if (from == nullptr) { + return {.data = 0}; + } + +- std::unique_lock lock(mutex); +- for (auto& [guest, host] : displays) { +- if (host == from) { +- guest_layout<_XDisplay*> ret; +- ret.data = reinterpret_cast(guest); +- return ret; +- } ++ if (auto guest = FindGuestDisplay(from)) { ++ guest_layout<_XDisplay*> ret; ++ ret.data = reinterpret_cast(guest); ++ return ret; + } + + fprintf(stderr, "ERROR: Could not map host display %p back to guest\n", from); +@@ -106,6 +113,21 @@ struct X11Manager { + return func(Name); + } + ++ static XErrorHandler HostXSetErrorHandler(XErrorHandler Handler) { ++ static auto func = reinterpret_cast(dlsym(GetLibX11(), "XSetErrorHandler")); ++ return func(Handler); ++ } ++ ++ static void HostXLockDisplay(Display* a) { ++ static auto func = reinterpret_cast(dlsym(GetLibX11(), "XLockDisplay")); ++ func(a); ++ } ++ ++ static void HostXUnlockDisplay(Display* a) { ++ static auto func = reinterpret_cast(dlsym(GetLibX11(), "XUnlockDisplay")); ++ func(a); ++ } ++ + static XVisualInfo* HostXGetVisualInfo(Display* a, long b, XVisualInfo* c, int* d) { + static auto func = reinterpret_cast(dlsym(GetLibX11(), "XGetVisualInfo")); + return func(a, b, c, d); +@@ -114,6 +136,7 @@ struct X11Manager { + // NOTE: Struct pointers are replaced by void* to avoid involving data layout conversion here. + int (*GuestXSync)(void*, int) = nullptr; + void* (*GuestXGetVisualInfo)(void*, guest_long, void*, int*) = nullptr; ++ int (*GuestXErrorForward)(void*, guest_long, int, int, int) = nullptr; + + // XDisplayString internally just reads data from _XDisplay's internal struct definition. + // This breaks when data layout is different, so allow reading from a guest context instead. +diff --git a/ThunkLibs/libGL/libGL_Guest.cpp b/ThunkLibs/libGL/libGL_Guest.cpp +index b0eea5b..01eb801 100644 +--- a/ThunkLibs/libGL/libGL_Guest.cpp ++++ b/ThunkLibs/libGL/libGL_Guest.cpp +@@ -28,6 +28,8 @@ $end_info$ + + #include "thunkgen_guest_libGL.inl" + ++#include ++ + typedef void voidFunc(); + + // Maps OpenGL API function names to the address of a guest function which is +@@ -79,11 +81,26 @@ static void* malloc_wrapper(size_t size) { + return malloc(size); + } + ++static int ForwardXError(Display* display, long resourceid, int error_code, int request_code, int minor_code) { ++ xError error {}; ++ error.type = X_Error; ++ error.errorCode = error_code; ++ error.resourceID = resourceid; ++ error.majorCode = request_code; ++ error.minorCode = minor_code; ++ LockDisplay(display); ++ error.sequenceNumber = display->request; ++ int result = _XError(display, &error); ++ UnlockDisplay(display); ++ return result; ++} ++ + static void OnInit() { + fexfn_pack_GL_SetGuestMalloc((uintptr_t)malloc_wrapper, (uintptr_t)CallbackUnpack::Unpack); + fexfn_pack_GL_SetGuestXSync((uintptr_t)XSync, (uintptr_t)CallbackUnpack::Unpack); + fexfn_pack_GL_SetGuestXGetVisualInfo((uintptr_t)XGetVisualInfo, (uintptr_t)CallbackUnpack::Unpack); + fexfn_pack_GL_SetGuestXDisplayString((uintptr_t)XDisplayString, (uintptr_t)CallbackUnpack::Unpack); ++ fexfn_pack_GL_SetGuestXErrorForward((uintptr_t)ForwardXError, (uintptr_t)CallbackUnpack::Unpack); + } + + // libGL.so must pull in libX11.so as a dependency. Referencing some libX11 +diff --git a/ThunkLibs/libGL/libGL_Host.cpp b/ThunkLibs/libGL/libGL_Host.cpp +index dd3cec4..84efe41 100644 +--- a/ThunkLibs/libGL/libGL_Host.cpp ++++ b/ThunkLibs/libGL/libGL_Host.cpp +@@ -66,6 +66,28 @@ static void fexfn_impl_libGL_GL_SetGuestXDisplayString(uintptr_t GuestTarget, ui + MakeHostTrampolineForGuestFunctionAt(GuestTarget, GuestUnpacker, &x11_manager.GuestXDisplayString); + } + ++static XErrorHandler HostPreviousXErrorHandler = nullptr; ++ ++static int HostXErrorHandler(Display* HostDisplay, XErrorEvent* Event) { ++ auto GuestDisplay = x11_manager.FindGuestDisplay(HostDisplay); ++ if (!GuestDisplay || !x11_manager.GuestXErrorForward) { ++ return HostPreviousXErrorHandler ? HostPreviousXErrorHandler(HostDisplay, Event) : 0; ++ } ++ x11_manager.HostXUnlockDisplay(HostDisplay); ++ int Result = x11_manager.GuestXErrorForward(GuestDisplay, static_cast(Event->resourceid), Event->error_code, ++ Event->request_code, Event->minor_code); ++ x11_manager.HostXLockDisplay(HostDisplay); ++ return Result; ++} ++ ++static void fexfn_impl_libGL_GL_SetGuestXErrorForward(uintptr_t GuestTarget, uintptr_t GuestUnpacker) { ++ MakeHostTrampolineForGuestFunctionAt(GuestTarget, GuestUnpacker, &x11_manager.GuestXErrorForward); ++ auto Previous = x11_manager.HostXSetErrorHandler(HostXErrorHandler); ++ if (Previous != HostXErrorHandler) { ++ HostPreviousXErrorHandler = Previous; ++ } ++} ++ + #include "thunkgen_host_libGL.inl" + + auto fexfn_impl_libGL_glXGetProcAddress(const GLubyte* name) -> void (*)() { +diff --git a/ThunkLibs/libGL/libGL_interface.cpp b/ThunkLibs/libGL/libGL_interface.cpp +index 04a2d2b..b769cda 100644 +--- a/ThunkLibs/libGL/libGL_interface.cpp ++++ b/ThunkLibs/libGL/libGL_interface.cpp +@@ -26,6 +26,7 @@ void GL_SetGuestMalloc(uintptr_t, uintptr_t); + void GL_SetGuestXSync(uintptr_t, uintptr_t); + void GL_SetGuestXGetVisualInfo(uintptr_t, uintptr_t); + void GL_SetGuestXDisplayString(uintptr_t, uintptr_t); ++void GL_SetGuestXErrorForward(uintptr_t, uintptr_t); + template<> + struct fex_gen_config : fexgen::custom_guest_entrypoint, fexgen::custom_host_impl {}; + template<> +@@ -34,6 +35,8 @@ template<> + struct fex_gen_config : fexgen::custom_guest_entrypoint, fexgen::custom_host_impl {}; + template<> + struct fex_gen_config : fexgen::custom_guest_entrypoint, fexgen::custom_host_impl {}; ++template<> ++struct fex_gen_config : fexgen::custom_guest_entrypoint, fexgen::custom_host_impl {}; + + template + struct fex_gen_type {}; diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index 53da7ebaad..972a1b607e 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -125,9 +125,8 @@ if [ "$(cat /usr/share/droiddeck/kwin-compositor 2>/dev/null)" = opengl ]; then chmod 755 /run/droiddeck/kwin/kwin_wayland export PATH=/run/droiddeck/kwin:$PATH fi -if /usr/local/bin/droiddeck-pipewire start; then - eval "$(/usr/local/bin/droiddeck-pipewire env)" -else +# Plasma uses the rootfs libpipewire; the bundle's module and plugin paths leave it without a shell. +if ! /usr/local/bin/droiddeck-pipewire start; then echo "== pipewire: not running; screen capture has no picture" fi echo "== droiddeck-desktop: Plasma on $WAYLAND_DISPLAY" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent index 5ae8031e68..eb860e3222 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent @@ -391,18 +391,26 @@ class FocusWatcher(threading.Thread): x.close() except (OSError, AgentError) as e: log("focus snapshot failed: %s" % e) + self.publish({}) time.sleep(2) continue if tag_game_windows(snap): self.changed.set() continue - body = {k: v for k, v in snap.items() if k != "t"} - if body == self.last: - continue - self.last = body - self.seq += 1 - snap["seq"] = self.seq - write_json(self.path, snap) + self.publish(snap) + + def publish(self, snap): + body = {k: v for k, v in snap.items() if k != "t"} + if body == self.last: + return + try: + write_json(self.path, dict(snap, seq=self.seq + 1)) + except OSError as e: + log("focus publication failed: %s" % e) + self.changed.set() + return + self.seq += 1 + self.last = body def listen(self): while True: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks index 5cbf57b4aa..411a9c6bda 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-bookmarks @@ -67,7 +67,25 @@ def place_uri(uri): return uri -def update_places(path, libraries): +def removable_volumes(): + listing = os.environ.get("BL_DESKTOP_VOLUMES") + if not listing: + return {} + volumes = {} + for entry in json.loads(Path(listing).read_text()): + path = Path(entry["path"]) + if not path.is_absolute(): + continue + try: + with os.scandir(path): + pass + except OSError: + continue + volumes[path.as_uri()] = " ".join(str(entry["label"]).split()) or path.name + return volumes + + +def update_places(path, libraries, mark=MARK, icon_name="steam", id_prefix="droiddeck-steam-"): if path.is_file(): parser = ET.XMLParser(target=ET.TreeBuilder(insert_comments=True, insert_pis=True)) root = ET.fromstring(path.read_bytes(), parser=parser) @@ -80,10 +98,10 @@ def update_places(path, libraries): before = ET.tostring(root) seen = set() personal = {place_uri(b.get("href")) for b in root.findall("bookmark") - if b.find("info/metadata[@owner='" + KDE_OWNER + "']/" + MARK) is None} + if b.find("info/metadata[@owner='" + KDE_OWNER + "']/" + mark) is None} for bookmark in root.findall("bookmark"): metadata = bookmark.find("info/metadata[@owner='" + KDE_OWNER + "']") - if metadata is None or metadata.find(MARK) is None: + if metadata is None or metadata.find(mark) is None: continue uri = place_uri(bookmark.get("href")) if uri not in libraries or uri in seen or uri in personal: @@ -101,10 +119,10 @@ def update_places(path, libraries): ET.SubElement(bookmark, "title").text = label info = ET.SubElement(bookmark, "info") icon = ET.SubElement(info, "metadata", {"owner": "http://freedesktop.org"}) - ET.SubElement(icon, "{" + ICON_NS + "}icon", {"name": "steam"}) + ET.SubElement(icon, "{" + ICON_NS + "}icon", {"name": icon_name}) metadata = ET.SubElement(info, "metadata", {"owner": KDE_OWNER}) - ET.SubElement(metadata, "ID").text = "droiddeck-steam-" + hashlib.sha256(uri.encode()).hexdigest()[:16] - ET.SubElement(metadata, MARK).text = "true" + ET.SubElement(metadata, "ID").text = id_prefix + hashlib.sha256(uri.encode()).hexdigest()[:16] + ET.SubElement(metadata, mark).text = "true" ET.SubElement(metadata, "isSystemItem").text = "false" if ET.tostring(root) != before: atomic_write(path, ET.tostring(root, encoding="unicode", xml_declaration=True)) @@ -154,7 +172,9 @@ def main(): available = bool(label) and (LIBRARY / "steamapps").is_dir() update_bookmark(bookmarks_file(home, config), label if available else None) data = Path(os.environ.get("XDG_DATA_HOME") or home / ".local/share") - update_places(data / "user-places.xbel", steam_libraries(home, data)) + places = data / "user-places.xbel" + update_places(places, steam_libraries(home, data)) + update_places(places, removable_volumes(), "DroidDeckRemovableVolume", "drive-removable-media", "droiddeck-volume-") if __name__ == "__main__": diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic b/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic index d0ad7010c2..883996aa7d 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-epic @@ -1234,25 +1234,7 @@ def wait_for(check, timeout, step=0.1): def capped_log(path): - os.makedirs(os.path.dirname(path), exist_ok=True) - handle = open(path, "wb") - read, write = os.pipe() - - def pump(): - written = 0 - with os.fdopen(read, "rb") as source: - while True: - chunk = source.read1(65536) if hasattr(source, "read1") else source.read(65536) - if not chunk: - break - if written < LOG_CAP: - handle.write(chunk[:LOG_CAP - written]) - handle.flush() - written += len(chunk) - handle.close() - - threading.Thread(target=pump, daemon=True).start() - return write + return GAME_DEBUG["capped_log"](path, LOG_CAP)[0] class Session: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index af04761346..742cabc91a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -38,7 +38,7 @@ RUNTIMES = {SNIPER_APPID: ("sniper_platform_", "Steam Linux Runtime 3.0 (sniper" SLR4_APPID: ("steamrt4_platform_", "Steam Linux Runtime 4.0 (steamrt4")} MARKER = ".droiddeck-fex" LAYOUT = 1 -ROOTFS_LAYOUT = 4 +ROOTFS_LAYOUT = 10 BLOB_DIRS = re.compile(r"^(?:\.ref|[0-9a-f]{2})$") ROOTFS_LIBRARY_DIRS = ("lib", "lib64") ARCH_DIRS = ("x86_64-linux-gnu", "i386-linux-gnu") @@ -49,7 +49,15 @@ PROVIDED = frozenset(( "libnss_compat.so.2", "libnss_dns.so.2", "libnss_files.so.2", "libnss_hesiod.so.2", "libthread_db.so.1", "libmemusage.so", "libpcprofile.so", "libc_malloc_debug.so.0", "gconv", "libstdc++.so.6", "libgcc_s.so.1", "libssl.so.3", "libcrypto.so.3", + "libfreetype.so.6", "libpng16.so.16", "libbrotlidec.so.1", "libbrotlicommon.so.1", "libbz2.so.1.0", "libz.so.1", + "libwayland-client.so.0", "libwayland-egl.so.1", "libwayland-server.so.0", "libffi.so.8", + "libgbm.so.1", "libdrm.so.2", "libexpat.so.1", )) +PROVIDED_NEEDS = { + "libwayland-client.so.0": ("libffi.so.8",), + "libwayland-server.so.0": ("libffi.so.8",), + "libgbm.so.1": ("libdrm.so.2", "libexpat.so.1"), +} GLIBC_BUILD = re.compile(r"^(?:ld|lib[A-Za-z_]+)-2\.[0-9]+\.so$|^libSegFault\.so$") GUEST_LIBDIRS = (("x86_64", "lib/x86_64-linux-gnu"), ("i386", "lib/i386-linux-gnu")) PRELOAD_NAMES = ("libblsession.so", "libfakeinput.so") @@ -343,10 +351,14 @@ def stays_in_libraries(root, target, link): def mirror(source, provider, name, target, root): - if provider and name in PROVIDED and os.path.lexists(os.path.join(provider, name)): + usable_provider = provider and all(os.path.exists(os.path.join(provider, needed)) + for needed in (name,) + PROVIDED_NEEDS.get(name, ())) + if name in PROVIDED and usable_provider: clone(os.path.join(provider, name), os.path.join(target, name)) return path = os.path.join(source, name) + if not os.path.lexists(path): + return link = os.readlink(path) if os.path.islink(path) else None if link and GLIBC_BUILD.match(os.path.basename(link)): if name not in INTERPRETERS: @@ -365,6 +377,16 @@ def build_rootfs(base, provider): 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 "", os.path.realpath(provider), read_text(os.path.join(provider_files, MARKER)) or "") + for top in ("lib", "lib64"): + for arch in ARCH_DIRS: + for name in sorted(PROVIDED): + path = os.path.join(provider_files, top, arch, name) + try: + info = os.stat(path) + stamp += "\n%s %s %d %d %d %d" % (path, os.path.realpath(path), info.st_ino, info.st_size, + info.st_mtime_ns, info.st_ctime_ns) + except OSError: + stamp += "\n%s missing" % path if read_text(os.path.join(rootfs, MARKER)) == stamp: return False for entry in os.listdir(STATE): @@ -384,7 +406,7 @@ def build_rootfs(base, provider): if entry in ARCH_DIRS and os.path.isdir(path) and not os.path.islink(path): provided = os.path.join(provider_files, top, entry) os.makedirs(os.path.join(tmp, top, entry)) - for name in set(os.listdir(path)) | {name for name in PROVIDED if os.path.lexists(os.path.join(provided, name))}: + for name in set(os.listdir(path)) | {name for name in PROVIDED if os.path.exists(os.path.join(provided, name))}: mirror(path, provided, name, os.path.join(tmp, top, entry), tmp) else: mirror(source, None, entry, os.path.join(tmp, top), tmp) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-debug b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-debug index df2e704402..4c46cd07e3 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-debug +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-debug @@ -1,8 +1,11 @@ #!/usr/bin/python3 +import contextlib import json import os import re import sys +import tempfile +import threading from pathlib import Path GAME_DEBUG_CHANNELS = ( @@ -69,3 +72,74 @@ def apply_game_debug_logs(env, config=None, debug_dir=None): "WINEDEBUG": game_debug_channels(env.get("WINEDEBUG"), env.get("PROTON_LOG")), }) return result + + +def capped_log(path, limit, mirror=False): + os.makedirs(os.path.dirname(path), exist_ok=True) + handle = open(path, "wb") + try: + read, write = os.pipe() + except OSError: + handle.close() + raise + + def pump(): + remaining = limit + mirror_ok = mirror + with os.fdopen(read, "rb") as source, handle: + while True: + chunk = source.read1(65536) + if not chunk: + break + saved = chunk[:remaining] + remaining -= len(saved) + if saved: + try: + handle.write(saved) + handle.flush() + except (OSError, ValueError): + remaining = 0 + if mirror_ok: + try: + sys.stderr.write(chunk.decode("utf-8", "replace")) + sys.stderr.flush() + except (OSError, ValueError): + mirror_ok = False + + thread = threading.Thread(target=pump, daemon=True) + thread.start() + return write, thread + + +@contextlib.contextmanager +def desktop_program_logs(env): + program = env.get("DROIDDECK_DESKTOP_PROGRAM") + if program: + env = dict(env) + env.pop("DROIDDECK_DESKTOP_PROGRAM", None) + if not program or env.get("PROTON_LOG", "0") not in ("", "0"): + yield env, None + return + folder = session_debug_dir(env) + try: + if not os.path.isabs(folder) or not os.path.isdir(folder): + raise OSError("session log directory unavailable") + fd, path = tempfile.mkstemp(prefix="desktop-program-", suffix=".log", dir=folder) + os.close(fd) + output, thread = capped_log(path, 1024 * 1024, mirror=True) + except OSError as error: + print("droiddeck-game-env: desktop diagnostics unavailable (%s)" % error, file=sys.stderr) + yield env, None + return + try: + if env.get("WINEDEBUG", "-all") in ("", "-all"): + env["WINEDEBUG"] = "-all,err+all,+mscoree,+loaddll" + try: + print("droiddeck-game-env: desktop program %s; first 1048576 diagnostic bytes: %s" % (program, path), + file=sys.stderr, flush=True) + except OSError: + pass + yield env, output + finally: + os.close(output) + thread.join(timeout=1) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index ef73b33156..60edb67a1a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -2,6 +2,7 @@ import hashlib import json import os +import platform import re import runpy import signal @@ -753,6 +754,26 @@ def mark_install_scripts(command, env): scripts = [path for path in scripts if os.path.isfile(path)] if not scripts: return [] + data = env.get("STEAM_COMPAT_DATA_PATH") + tool = os.path.dirname(command[0]) + new_prefix = data and not os.path.isfile(os.path.join(data, "pfx", "system.reg")) + template = "default_pfx" + if env.get("PROTON_USE_ARM64", "1") == "1" and platform.machine() == "aarch64" and os.path.isdir(os.path.join(tool, "files/bin-arm64")): + template = "default_pfx_arm64" + if new_prefix and not os.path.isfile(os.path.join(tool, "files/share", template, "system.reg")): + try: + subprocess.run([command[0], "run", "cmd.exe", "/c", "exit", "0"], env=env, + stdout=sys.stderr, stderr=sys.stderr, timeout=120, check=False) + except (OSError, subprocess.SubprocessError) as error: + print("droiddeck-game-env: prefix initialization failed (%s)" % error, file=sys.stderr) + try: + wineserver = next((path for path in (os.path.join(tool, "files", name, "wineserver") for name in ("bin-arm64", "bin")) + if os.access(path, os.X_OK)), os.path.join(tool, "files/bin-arm64/wineserver")) + subprocess.run([wineserver, "-w"], env=dict(env, WINEPREFIX=os.path.join(data, "pfx")), + stdout=sys.stderr, stderr=sys.stderr, timeout=120, check=True) + except (OSError, subprocess.SubprocessError) as error: + print("droiddeck-game-env: wineserver wait failed (%s)" % error, file=sys.stderr) + return scripts try: subprocess.run([SEED_REDISTS, root], env=dict(env, DROIDDECK_SEED_SCRIPTS="\n".join(scripts)), stdout=sys.stderr, timeout=60, check=False) @@ -1157,11 +1178,22 @@ def diagnostic_game_exit(app_id, raw_code, source=None, wrapper_status=None): def start(launch, launch_env, digest, after=None, diagnostic_app_id=None): + with GAME_DEBUG["desktop_program_logs"](launch_env) as (env, output): + code = start_process(launch, env, digest, after, diagnostic_app_id, output) + if output is not None: + try: + print("droiddeck-game-env: desktop program exited with status %d" % code, file=sys.stderr, flush=True) + except OSError: + pass + return code + + +def start_process(launch, launch_env, digest, after=None, diagnostic_app_id=None, output=None): if len(launch) > 1 and launch[1] == "waitforexitandrun": ubisoft_composition_off(launch[0], launch_env) launch, launch_env = system_graphics_launch(launch, launch_env) - if after or diagnostic_app_id is not None: - process = subprocess.Popen(launch, env=launch_env) + if after or diagnostic_app_id is not None or output is not None: + process = subprocess.Popen(launch, env=launch_env, stderr=output) if diagnostic_app_id is not None: diagnostic_game_event("game_start", diagnostic_app_id) try: @@ -1338,7 +1370,7 @@ def main(): if fixed: print("droiddeck-game-env: replaced foreign-architecture system DLLs with this Proton's own: %s" % ", ".join(fixed), file=sys.stderr) - scripts = mark_install_scripts(command, env) + scripts = mark_install_scripts(command, effective_env) if scripts and install_scripts_done(scripts, env): print("droiddeck-game-env: install scripts already run in this prefix; evaluator skipped", file=sys.stderr) return 0 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open index d39942a2cc..fb74b3d970 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open @@ -417,7 +417,7 @@ def main(argv): say("%s: %s" % (cmd[0], error)) if status != 0 and time.monotonic() - started < QUICK_FAILURE: notify("%s did not start" % os.path.basename(path), - "It exited with status %d; the session's desktop.log says why." % status) + "desktop.log (%d)" % status) if what == "windows": try: subprocess.call([sys.executable, PROGRAMS]) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run index 6dfcbadb25..60e9631b0e 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run @@ -524,6 +524,8 @@ def main(argv): os.makedirs(target.compatdata, exist_ok=True) env = environment(os.environ, target, folder, root, window, game_id) env.update(extra) + if app is None and verb == VERB: + env["DROIDDECK_DESKTOP_PROGRAM"] = program say("%s with %s (%s), %s prefix %s%s" % (program, name, why, target.kind, target.compatdata, ", without the Steam client" if app is not None else "")) try: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 4d36d446d0..faf46d9142 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -887,8 +887,10 @@ case $mode in _bl_fall=$((_bl_sample_available - _bl_available)) [ "$_saved_growth" -gt "$_bl_growth" ] && _bl_growth=$_saved_growth [ "$_saved_fall" -gt "$_bl_fall" ] && _bl_fall=$_saved_fall - _bl_sample_at=$SECONDS _bl_sample_available=$_bl_available _bl_sample_gpu=$_bl_gpu - _bl_sample_unevictable=$_bl_unevictable _bl_sample_shmem=$_bl_shmem + if [ $((SECONDS - _bl_sample_at)) -ge 5 ]; then + _bl_sample_at=$SECONDS _bl_sample_available=$_bl_available _bl_sample_gpu=$_bl_gpu + _bl_sample_unevictable=$_bl_unevictable _bl_sample_shmem=$_bl_shmem + fi fi _bl_real_available=$_bl_available [ "$_bl_real_available" -ge 0 ] && _bl_real_available=$((_bl_real_available - _bl_growth)) @@ -898,6 +900,8 @@ case $mode in _bl_tier_headroom=$((_bl_mem_total / 4)) [ "$_bl_tier_headroom" -ge $((768 * 1024)) ] || _bl_tier_headroom=$((768 * 1024)) [ "$_bl_tier_headroom" -le $((2560 * 1024)) ] || _bl_tier_headroom=$((2560 * 1024)) + _bl_fall_headroom=$((_bl_tier_headroom * 2)) + [ "$_bl_fall_headroom" -ge $((_bl_mem_total * 2 / 5)) ] || _bl_fall_headroom=$((_bl_mem_total * 2 / 5)) _bl_swap_reserve=$((_bl_swap_total / 5)) [ "$_bl_swap_reserve" -ge $((256 * 1024)) ] || _bl_swap_reserve=$((256 * 1024)) } @@ -967,19 +971,20 @@ case $mode in [ "$_bl_mem_total" -gt 0 ] && [ "$_bl_available" -ge 0 ] && { [ "$_bl_real_available" -lt "$_bl_tier_headroom" ] || { [ "$_bl_psi" -ge 100 ] && [ "$_bl_real_available" -lt $((_bl_tier_headroom * 3 / 2)) ]; } || - { [ "$_bl_fall" -ge $((256 * 1024)) ] && [ "$_bl_real_available" -lt $((_bl_tier_headroom * 2)) ]; }; } + { [ "$_bl_fall" -ge $((256 * 1024)) ] && [ "$_bl_real_available" -lt "$_bl_fall_headroom" ]; }; } } bl_session_pressure() { bl_memory_read + bl_memory_critical || _bl_tier_backoff=30 _bl_tier_nogain=0 [ "$_bl_game" = 1 ] && bl_memory_critical || return 0 [ "${BL_ZRAM_IDLE:-1}" = 1 ] && bl_game_focused 0 || return 0 - local _wait=$_bl_tier_backoff _before _pids _targets + local _wait=$_bl_tier_backoff _before _available_before _pids _targets _gain _min_gain [ "$_bl_available" -ge $((_bl_headroom / 2)) ] || [ "$_bl_tier_pushed" -lt 0 ] || _wait=30 [ "$_bl_tier_at" -lt 0 ] || [ $((SECONDS - _bl_tier_at)) -ge "$_wait" ] || return 0 if [ "$_bl_tier_at" -ge 0 ] && [ "$_bl_tier_pushed" -gt 0 ]; then bl_tier_readback if [ "$_bl_tier_back" -le $((_bl_tier_pushed / 2)) ]; then - _bl_tier_backoff=30 + [ "${_bl_tier_nogain:-0}" = 1 ] || _bl_tier_backoff=30 else _bl_tier_backoff=$((_bl_tier_backoff * 2 > 300 ? 300 : _bl_tier_backoff * 2)) _bl_tier_at=$SECONDS _bl_tier_pushed=-1 @@ -995,11 +1000,24 @@ case $mode in step "zRAM: low-memory page-out skipped, swap headroom too small ($((_bl_swap_free / 1024)) MB free)" return 0 fi - _targets=("${_pids[@]}") _before=$_bl_swap + _targets=("${_pids[@]}") _before=$_bl_swap _available_before=$_bl_available bl_zram_send 1 "low memory (available $((_bl_real_available / 1024)) MB), compressing idle game memory" session bl_zram_usage "${_targets[@]}" > /dev/null _bl_tier_pushed=$((_bl_swap - _before)) bl_tier_note "${_targets[@]}" + if [ "${_bl_pageout_complete:-0}" = 1 ]; then + bl_memory_read + _gain=$((_bl_available - _available_before)) + _min_gain=$((_bl_tier_headroom / 16)) + [ "$_min_gain" -ge $((16 * 1024)) ] || _min_gain=$((16 * 1024)) + if [ "$_gain" -lt "$_min_gain" ]; then + _bl_tier_backoff=$((_bl_tier_backoff * 2 > 300 ? 300 : _bl_tier_backoff * 2)) + _bl_tier_at=$SECONDS _bl_tier_nogain=1 + step "zRAM: low-memory page-out gained only $((_gain / 1024)) MB available, next try in ${_bl_tier_backoff} s" + else + _bl_tier_nogain=0 + fi + fi } bl_proc_start() { local _s= @@ -1030,7 +1048,7 @@ case $mode in } bl_watch_nap() { local _i - if [ "$_bl_game" = 1 ] && [ "$_bl_available" -ge 0 ] && [ "$_bl_real_available" -lt $((_bl_tier_headroom * 2)) ]; then + if [ "$_bl_game" = 1 ] && [ "$_bl_available" -ge 0 ] && [ "$_bl_real_available" -lt "$_bl_fall_headroom" ]; then for _i in 1 2 3 4 5; do nap 1 bl_memory_read @@ -1104,7 +1122,7 @@ case $mode in local id id=$(sed -n 's/.*"focusedApp"[[:space:]]*:[[:space:]]*\([0-9][0-9]*\).*/\1/p' \ "$BL_LAUNCH_DIR/agent/focus.json" 2>/dev/null | head -1) - [ -n "$id" ] || return "${1:-1}" + [ -n "$id" ] || return "${1:-2}" case " ${_bl_apps-} " in *" $id "*) return 0 ;; esac @@ -1121,8 +1139,8 @@ case $mode in [ "$_bl_ram_cap" -gt 0 ] && { [ "$_bl_measured" -lt 0 ] || [ $((SECONDS - _bl_measured)) -ge 30 ]; } } _bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 - _bl_pressure_at=-1 _bl_pressure_backoff=30 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_pushed=0 _bl_tier_back=0 _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() - _bl_client_pending=0 _bl_client_reserve=0 _bl_client_targets=() + _bl_pressure_at=-1 _bl_pressure_backoff=30 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_nogain=0 _bl_tier_pushed=0 _bl_tier_back=0 _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() + _bl_client_pending=0 _bl_client_reserve=0 _bl_client_targets=() _bl_away= _bl_sample_at= _bl_sample_available=0 _bl_sample_gpu=0 _bl_sample_unevictable=0 _bl_sample_shmem=0 while kill -0 $$ 2>/dev/null; do bl_zram_scan @@ -1155,7 +1173,10 @@ case $mode in _bl_preserved_growth=$_bl_growth _bl_preserved_fall=$_bl_fall bl_session_pressure bl_client_pressure_finish - if [ "$_bl_game" = 1 ] && bl_game_focused; then + _bl_focus=1 + [ "$_bl_game" = 1 ] && { bl_game_focused && _bl_focus=0 || _bl_focus=$?; } + if [ "$_bl_game" = 1 ] && [ "$_bl_focus" = 0 ]; then + _bl_away= if [ "$_bl_since" -lt 0 ] || [ "$_bl_since_apps" != "$_bl_apps" ]; then _bl_since=$SECONDS _bl_since_apps=$_bl_apps fi @@ -1165,15 +1186,31 @@ case $mode in _bl_packed=$SECONDS fi elif [ "$_bl_game" != 1 ]; then + _bl_away= if [ "$_bl_packed" -ge 0 ]; then _bl_unpack=1 fi - _bl_since=-1 _bl_packed=-1 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_pushed=0 _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() + _bl_since=-1 _bl_packed=-1 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_nogain=0 _bl_tier_pushed=0 _bl_tier_targets=() _bl_tier_swaps=() _bl_tier_starts=() else _bl_since=-1 + if [ "$_bl_focus" = 1 ]; then + [ -n "${_bl_away-}" ] || _bl_away=$SECONDS + else + _bl_away= + fi + if [ "$_bl_packed" -ge 0 ]; then + _bl_unpack=1 + fi fi - if [ "$_bl_unpack" = 1 ] && [ "$_bl_game" = 0 ] && ! bl_over_cap && bl_client_can_readback; then - bl_zram_send 0 "memory recovered, reading the client back" client + if [ "$_bl_unpack" = 1 ] && + { [ "$_bl_game" = 0 ] || { [ "${_bl_ram_cap:-0}" = 0 ] && [ -n "${_bl_away-}" ] && [ $((SECONDS - _bl_away)) -ge 5 ]; }; } && + ! bl_over_cap && bl_client_can_readback; then + if [ "$_bl_game" = 0 ]; then + bl_zram_send 0 "memory recovered, reading the client back" client + else + bl_zram_send 0 "the client is in front of the game, reading it back" client + _bl_packed=-1 + fi _bl_unpack=0 fi bl_watch_nap diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games index ac8213d41e..e8e2ff4e61 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games @@ -1,9 +1,11 @@ #!/usr/bin/env python3 import ctypes as C +import functools import json import os from pathlib import Path import re +import runpy import shlex import subprocess import sys @@ -445,18 +447,22 @@ def park(steamapps): print(f"droiddeck-steam-games: {appid} is not here this session; its install is set aside until it is") +@functools.lru_cache(maxsize=1) +def compatibility(): + return runpy.run_path(os.path.join(os.path.dirname(os.path.abspath(__file__)), "steam-compatibility")) + + def seed_install(steam_root, game, appid): steamapps = Path(steam_root) / "steamapps" common = steamapps / "common" name = f"DroidDeck-{appid}" target = common / name source = Path(game["folder"]) - title = game["name"].replace("\\", "\\\\").replace('"', '\\"').replace("\n", " ").replace("\r", " ") - minimal = ('"AppState"\n{\n' + f' "appid" "{appid}"\n "Universe" "1"\n "name" "{title}"\n' - + f' "StateFlags" "4"\n "installdir" "{name}"\n' + '}\n') + manifest_text = compatibility()["manifest_text"] + minimal = manifest_text(appid, game["name"], name) legacy = minimal.replace(' "Universe" "1"\n', '') # Steam checks every file of an import with no build before updating it, from scratch each time it is interrupted. - bare = minimal[:-2] + ' "AutoUpdateBehavior" "1"\n}\n' + bare = manifest_text(appid, game["name"], name, True) build = installed_build(source, appid, name) if build is None: content = bare diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library index 5577e1aad7..2aeac02bb3 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-library @@ -2,8 +2,10 @@ import json import os import re +import runpy import sys +BIN_DIR = os.path.dirname(os.path.abspath(__file__)) LIBRARIES = (("/mnt/droiddeck-sd", os.environ.get("BL_LIBRARY_LABEL", "SD Card")),) MAIN_LABEL = "Internal Storage" @@ -50,6 +52,77 @@ def register(steam_root, library, label): return len(apps) +def installdirs(libraries): + found = set() + for library in libraries: + steamapps = os.path.join(library, "steamapps") + try: + names = os.listdir(steamapps) + except OSError: + continue + for name in names: + if not re.fullmatch(r"appmanifest_\d+\.acf", name): + continue + try: + with open(os.path.join(steamapps, name), encoding="utf-8", errors="replace") as f: + m = re.search(r'"installdir"\s+"([^"]*)"', f.read(), re.I) + except OSError: + continue + if m: + found.add(m.group(1)) + return found + + +def populated(path): + try: + with os.scandir(path) as entries: + return next(entries, None) is not None + except OSError: + return False + + +def adoptable(library, known): + common = os.path.join(library, "steamapps", "common") + try: + names = sorted(os.listdir(common)) + except OSError: + return [] + return [n for n in names if n not in known and not n.startswith(".") + and os.path.isdir(os.path.join(common, n)) and populated(os.path.join(common, n))] + + +def adopt(steam_root, library): + compat = runpy.run_path(os.path.join(BIN_DIR, "steam-compatibility")) + known = compat["libraries"](steam_root) + folders = adoptable(library, installdirs(known + [library])) + if not folders: + return 0 + entries = compat["appinfo_entries"](os.path.join(steam_root, "appcache", "appinfo.vdf")) + by_dir = {} + for app, info in entries.items(): + if app not in compat["NOT_GAMES"] and info["type"] in compat["PLAYABLE_TYPES"] and info["installdir"]: + by_dir.setdefault(info["installdir"], []).append((app, info)) + steamapps = os.path.join(library, "steamapps") + adopted = 0 + for folder in folders: + matches = by_dir.get(folder, []) + games = [m for m in matches if m[1]["type"] == "game"] or matches + if len(games) != 1: + continue + app, info = games[0] + if any(os.path.isfile(os.path.join(root, "steamapps", "appmanifest_%s.acf" % app)) + for root in known + [library]): + continue + try: + with open(os.path.join(steamapps, "appmanifest_%s.acf" % app), "x", encoding="utf-8") as f: + f.write(compat["manifest_text"](app, info["name"] or folder, folder, True)) + except OSError: + continue + adopted += 1 + print("droiddeck-steam-library: adopted %s as app %s in %s" % (folder, app, library)) + return adopted + + RETIRED = ("/mnt/bannerlator",) RENAMED = (("/mnt/bannerlator-sd", "/mnt/droiddeck-sd"),) @@ -176,6 +249,7 @@ def main(): managed = libraries is not None for library, label in libraries if managed else LIBRARIES: if os.path.isdir(os.path.join(library, "steamapps")): + adopt(steam_root, library) register(steam_root, library, label) relabel(steam_root, library, label) else: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index d4cb905f4c..98b533c79d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -7,6 +7,7 @@ import os import re import shlex import shutil +import stat import sys import time import subprocess @@ -291,6 +292,8 @@ def exited(argv, code=0): compat_data = os.environ.get("STEAM_COMPAT_DATA_PATH") if compat_data: (Path(compat_data) / "pfx" / ROCKSTAR_FOLDER / "launch.json").unlink(missing_ok=True) + for line in rockstar_launcher_log(compat_data): + log("rockstar launcher: " + line) return 0 if found is not None and str(found[1].get("store")) == "epic" and os.environ.get(EPIC_HANDLED) != "1" \ and os.access(EPIC_CLIENT, os.X_OK): @@ -320,6 +323,29 @@ ROCKSTAR_TITLES = {"gta3": "Grand Theft Auto III", "gtavc": "Grand Theft Auto: V "gta4": "Grand Theft Auto IV", "lanoire": "LANoireMTL"} +def rockstar_launcher_log(compat_data, limit=65536): + pfx = Path(compat_data) / "pfx" + target = pfx / ROCKSTAR_FOLDER + if not target.resolve().is_relative_to(pfx.resolve()): + return [] + path = target / "launcher.log" + try: + descriptor = os.open(path, os.O_RDONLY | os.O_NOFOLLOW | os.O_NONBLOCK) + except OSError: + return [] + try: + if not stat.S_ISREG(os.fstat(descriptor).st_mode): + return [] + with os.fdopen(descriptor, "rb", closefd=False) as source: + data = source.read(limit) + path.unlink(missing_ok=True) + except OSError: + return [] + finally: + os.close(descriptor) + return [line.strip() for line in data.decode("utf-8", "replace").splitlines() if line.strip()] + + def rockstar_sdk(folder, sidecar): if str(sidecar.get("id")) in ("gta4", "lanoire"): return True @@ -464,6 +490,7 @@ def prepare_rockstar(folder, sidecar, compat_data, launch_dir, proton="", ask_ap return "invalid-service-path" config = target / "launch.json" config.unlink(missing_ok=True) + (target / "launcher.log").unlink(missing_ok=True) legacy = str(sidecar.get("id")) in ROCKSTAR_TITLES sdk = rockstar_sdk(folder, sidecar) title = ROCKSTAR_TITLES.get(str(sidecar.get("id"))) diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index cf616c86fc..52a589d21d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -86,6 +86,7 @@ bl_run() { set -- /usr/local/bin/droiddeck-steamvr-game "$@" fi if [ -n "${BL_STORE_EXIT:-}" ]; then + trap : INT TERM HUP "$@" rc=$? /usr/local/bin/droiddeck-store-launch --exited --code "$rc" "${BL_STORE_ARGS[@]}" || true @@ -892,7 +893,10 @@ def appinfo_entries(path, wanted=None): deck = common.get("steam_deck_compatibility") configuration = deck.get("configuration") if isinstance(deck, dict) else None recommended = configuration.get("recommended_runtime", "") if isinstance(configuration, dict) else "" + config = info.get("config") if isinstance(info.get("config"), dict) else {} entry = { + "name": str(common.get("name", "")), + "installdir": str(config.get("installdir", "")), "oslist": {part.strip().lower() for part in str(common.get("oslist", "")).split(",") if part.strip()}, "osarch": str(common.get("osarch", "")).lower(), "type": str(common.get("type", "")).lower(), @@ -959,6 +963,13 @@ def native_targets(steam_root, apps): return targets +def manifest_text(appid, name, installdir, bare=False): + title = name.replace("\\", "\\\\").replace('"', '\\"').replace("\n", " ").replace("\r", " ") + text = ('"AppState"\n{\n' + f' "appid" "{appid}"\n "Universe" "1"\n "name" "{title}"\n' + + f' "StateFlags" "4"\n "installdir" "{installdir}"\n' + '}\n') + return text[:-2] + ' "AutoUpdateBehavior" "1"\n}\n' if bare else text + + def app_manifest(steam_root, app): for library in libraries(steam_root): try: diff --git a/tools/linuxfs/preload/noexec.c b/tools/linuxfs/preload/noexec.c index f77c15419c..5abeb93487 100644 --- a/tools/linuxfs/preload/noexec.c +++ b/tools/linuxfs/preload/noexec.c @@ -45,6 +45,7 @@ static size_t private_range(uintptr_t start, uintptr_t end, struct span *spans, char buf[4096]; size_t used = 0, count = 0; uintptr_t covered = start; + int file_backed = 0; int fd = open("/proc/self/maps", O_RDONLY | O_CLOEXEC); if (fd < 0) return 0; for (;;) { @@ -59,7 +60,13 @@ static size_t private_range(uintptr_t start, uintptr_t end, struct span *spans, char *p = line; uintptr_t lo = strtoull(p, &p, 16), hi = strtoull(p + 1, &p, 16); char perms[5] = {0}; - if (*p == ' ') memcpy(perms, p + 1, 4); + int inode = 0; + if (*p == ' ') { + memcpy(perms, p + 1, 4); + char *field = p + 5; + strtoull(field, &field, 16); + inode = *field && (field = strchr(field + 1, ' ')) && strtoull(field, NULL, 10); + } line = nl + 1; if (hi <= covered || lo >= end) continue; if (lo > covered || perms[3] != 'p' || count == cap) { @@ -68,11 +75,12 @@ static size_t private_range(uintptr_t start, uintptr_t end, struct span *spans, } spans[count].lo = covered; spans[count].hi = hi < end ? hi : end; + file_backed |= inode; spans[count].prot = (perms[0] == 'r' ? PROT_READ : 0) | (perms[1] == 'w' ? PROT_WRITE : 0) | (perms[2] == 'x' ? PROT_EXEC : 0); covered = spans[count++].hi; if (covered >= end) { close(fd); - return count; + return file_backed ? count : 0; } } used = strlen(line); diff --git a/tools/linuxfs/preload/zram.c b/tools/linuxfs/preload/zram.c index af62c29413..e271668bea 100644 --- a/tools/linuxfs/preload/zram.c +++ b/tools/linuxfs/preload/zram.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -20,11 +21,14 @@ #endif #define ZR_SWAPPED (1ULL << 62) #define ZR_BATCH 512 +#define ZR_FUTEX_WAIT 0 +#define ZR_FUTEX_WAKE 1 static long (*zr_sys)(long, ...); static unsigned long zr_page; static int zr_busy; static int zr_pending; +static int zr_worker; static char zr_maps[8192]; static uint64_t zr_entries[ZR_BATCH]; static struct iovec zr_iov[ZR_BATCH]; @@ -143,19 +147,36 @@ static void zr_ack(int done) { zr_sys(SYS_close, fd); } +static void zr_request(void) { + int mode = zr_mode(); + if (mode == 1) zr_ack(0); + if (mode >= 0) zr_walk(mode); + if (mode == 1) zr_ack(1); +} + +static void *zr_worker_main(void *unused) { + (void)unused; + prctl(PR_SET_NAME, "zr-worker", 0, 0, 0); + for (;;) { + while (!__atomic_exchange_n(&zr_pending, 0, __ATOMIC_SEQ_CST)) + zr_sys(SYS_futex, &zr_pending, ZR_FUTEX_WAIT, 0, NULL, NULL, 0); + zr_request(); + } + return NULL; +} + static void zr_handler(int sig, siginfo_t *info, void *context) { (void)sig; (void)context; if (info == NULL || info->si_code != SI_USER) return; int saved = errno; __atomic_store_n(&zr_pending, 1, __ATOMIC_SEQ_CST); - while (__atomic_load_n(&zr_pending, __ATOMIC_SEQ_CST) - && !__atomic_exchange_n(&zr_busy, 1, __ATOMIC_SEQ_CST)) { + if (__atomic_load_n(&zr_worker, __ATOMIC_ACQUIRE)) { + zr_sys(SYS_futex, &zr_pending, ZR_FUTEX_WAKE, 1, NULL, NULL, 0); + } else while (__atomic_load_n(&zr_pending, __ATOMIC_SEQ_CST) + && !__atomic_exchange_n(&zr_busy, 1, __ATOMIC_SEQ_CST)) { __atomic_store_n(&zr_pending, 0, __ATOMIC_SEQ_CST); - int mode = zr_mode(); - if (mode == 1) zr_ack(0); - if (mode >= 0) zr_walk(mode); - if (mode == 1) zr_ack(1); + zr_request(); __atomic_store_n(&zr_busy, 0, __ATOMIC_SEQ_CST); } errno = saved; @@ -164,6 +185,7 @@ static void zr_handler(int sig, siginfo_t *info, void *context) { static void zr_child(void) { __atomic_store_n(&zr_busy, 0, __ATOMIC_SEQ_CST); __atomic_store_n(&zr_pending, 0, __ATOMIC_SEQ_CST); + __atomic_store_n(&zr_worker, 0, __ATOMIC_RELEASE); } __attribute__((constructor)) static void zr_init(void) { @@ -184,5 +206,21 @@ __attribute__((constructor)) static void zr_init(void) { sa.sa_sigaction = zr_handler; sa.sa_flags = SA_SIGINFO | SA_RESTART; sigemptyset(&sa.sa_mask); - if (sigaction(SIGURG, &sa, NULL) == 0) pthread_atfork(NULL, NULL, zr_child); + if (sigaction(SIGURG, &sa, NULL) == 0) { + pthread_atfork(NULL, NULL, zr_child); + pthread_attr_t attr; + if (pthread_attr_init(&attr) == 0) { + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); + pthread_t thread; + sigset_t blocked; + sigset_t previous; + if (sigfillset(&blocked) == 0 && + pthread_sigmask(SIG_SETMASK, &blocked, &previous) == 0) { + if (pthread_create(&thread, &attr, zr_worker_main, NULL) == 0) + __atomic_store_n(&zr_worker, 1, __ATOMIC_RELEASE); + pthread_sigmask(SIG_SETMASK, &previous, NULL); + } + pthread_attr_destroy(&attr); + } + } } diff --git a/tools/nativeguest/hook/fileops.c b/tools/nativeguest/hook/fileops.c index 9ee7976505..2632f0eefb 100644 --- a/tools/nativeguest/hook/fileops.c +++ b/tools/nativeguest/hook/fileops.c @@ -423,6 +423,9 @@ ssize_t readlink(const char *pathname, char *buf, size_t bufsiz) { if (is_proc_self_exe(pathname)) { ssize_t exe_len = handle_proc_self_exe(buf, bufsiz); if (exe_len >= 0) return exe_len; + } else { + ssize_t exe_len = handle_proc_other_exe(pathname, buf, bufsiz); + if (exe_len >= 0) return exe_len; } static ssize_t (*orig_readlink)(const char *, char *, size_t) = NULL; if (!orig_readlink) orig_readlink = (ssize_t (*)(const char *, char *, size_t))dlsym(RTLD_NEXT, "readlink"); @@ -443,9 +446,16 @@ ssize_t readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz) { if (!orig_readlinkat) orig_readlinkat = (ssize_t (*)(int, const char *, char *, size_t))dlsym(RTLD_NEXT, "readlinkat"); DDNATV_AT_REMAP(dirfd, pathname); // after the remap: "proc/self/exe" relative to a descriptor for "/" is /proc/self/exe as well + { + ssize_t exe_len = handle_proc_exe_at(dirfd, pathname, buf, bufsiz); + if (exe_len >= 0) return exe_len; + } if (is_proc_self_exe(pathname)) { ssize_t exe_len = handle_proc_self_exe(buf, bufsiz); if (exe_len >= 0) return exe_len; + } else { + ssize_t exe_len = handle_proc_other_exe(pathname, buf, bufsiz); + if (exe_len >= 0) return exe_len; } char pbuf[PATH_MAX]; const char *target = (pathname && pathname[0] == '/') ? rewrite_path(pathname, pbuf, sizeof(pbuf)) : pathname; diff --git a/tools/nativeguest/hook/setup.c b/tools/nativeguest/hook/setup.c index b217bd4b45..24f8a81317 100644 --- a/tools/nativeguest/hook/setup.c +++ b/tools/nativeguest/hook/setup.c @@ -165,64 +165,188 @@ static int is_proc_self_exe(const char *path) { return 0; } +static void exe_from_cmdline(const char *cmdline_path, char *out, size_t outsz) { + int fd = open(cmdline_path, O_RDONLY | O_CLOEXEC); + if (fd < 0) return; + char cmdline[8192]; + ssize_t n = read(fd, cmdline, sizeof(cmdline) - 1); + close(fd); + if (n <= 0) return; + cmdline[n] = '\0'; + char *args[64] = {0}; + int ac = 0; + char *p = cmdline; + while (p < cmdline + n && ac < 64) { + args[ac++] = p; + p += strlen(p) + 1; + } + for (int i = 0; i < ac; i++) { + if (strcmp(args[i], "--argv0") == 0 && i + 2 < ac) { + ddnatv_copy_cstr(out, outsz, args[i + 2]); + return; + } + } + if (ac > 0 && args[0] && args[0][0] != '\0') ddnatv_copy_cstr(out, outsz, args[0]); +} + +static ssize_t copy_guest_exe(const char *real_exe, char *buf, size_t bufsiz) { + const char *out_path = real_exe; + if (g_ddnatv_root[0] != '\0') { + size_t rlen = g_ddnatv_root_len; + if (strncmp(real_exe, g_ddnatv_root, rlen) == 0 && + (real_exe[rlen] == '/' || real_exe[rlen] == '\0')) { + out_path = real_exe + rlen; + if (out_path[0] == '\0') out_path = "/"; + } + } + size_t len = strlen(out_path); + size_t copy_len = (len < bufsiz) ? len : bufsiz; + memcpy(buf, out_path, copy_len); + return (ssize_t)copy_len; +} + static ssize_t handle_proc_self_exe(char *buf, size_t bufsiz) { if (!buf || bufsiz == 0) { errno = EINVAL; return -1; } init_ddnatv_hook(); - if (g_real_exe[0] == '\0') { - int fd = open("/proc/self/cmdline", O_RDONLY); - if (fd >= 0) { - char cmdline[8192]; - ssize_t n = read(fd, cmdline, sizeof(cmdline) - 1); - close(fd); - if (n > 0) { - cmdline[n] = '\0'; - char *args[64] = {0}; - int ac = 0; - char *p = cmdline; - while (p < cmdline + n && ac < 64) { - args[ac++] = p; - p += strlen(p) + 1; - } - for (int i = 0; i < ac; i++) { - if (strcmp(args[i], "--argv0") == 0 && i + 2 < ac) { - strncpy(g_real_exe, args[i + 2], sizeof(g_real_exe) - 1); - g_real_exe[sizeof(g_real_exe) - 1] = '\0'; - break; - } - } - if (g_real_exe[0] == '\0' && ac > 0 && args[0] && args[0][0] != '\0') { - strncpy(g_real_exe, args[0], sizeof(g_real_exe) - 1); - g_real_exe[sizeof(g_real_exe) - 1] = '\0'; - } - } - } - } - - if (g_real_exe[0] != '\0') { - char stripped[PATH_MAX]; - const char *out_path = g_real_exe; - if (g_ddnatv_root[0] != '\0') { - size_t rlen = g_ddnatv_root_len; - if (strncmp(g_real_exe, g_ddnatv_root, rlen) == 0 && - (g_real_exe[rlen] == '/' || g_real_exe[rlen] == '\0')) { - out_path = g_real_exe + rlen; - if (out_path[0] == '\0') out_path = "/"; - } - } - strncpy(stripped, out_path, sizeof(stripped) - 1); - stripped[sizeof(stripped) - 1] = '\0'; - - size_t len = strlen(stripped); - size_t copy_len = (len < bufsiz) ? len : bufsiz; - memcpy(buf, stripped, copy_len); - return (ssize_t)copy_len; - } + if (g_real_exe[0] == '\0') exe_from_cmdline("/proc/self/cmdline", g_real_exe, sizeof(g_real_exe)); + if (g_real_exe[0] != '\0') return copy_guest_exe(g_real_exe, buf, bufsiz); return -1; } +static int is_ld_linux(const char *path); + +static ssize_t (*real_readlinkat_fn(void))(int, const char *, char *, size_t) { + static ssize_t (*fn)(int, const char *, char *, size_t) = NULL; + if (!fn) fn = (ssize_t (*)(int, const char *, char *, size_t))dlsym(RTLD_NEXT, "readlinkat"); + return fn; +} + +static int proc_env_value(pid_t pid, const char *key, char *out, size_t outsz) { + char path[64]; + snprintf(path, sizeof(path), "/proc/%d/environ", (int)pid); + int fd = open(path, O_RDONLY | O_CLOEXEC); + if (fd < 0) return 0; + size_t cap = 65536, used = 0, keylen = strlen(key); + char *env = malloc(cap + 1); + ssize_t got; + while (env && (got = read(fd, env + used, cap - used)) > 0) { + used += (size_t)got; + if (used == cap) { + char *bigger = cap < (8u << 20) ? realloc(env, cap * 2 + 1) : NULL; + if (!bigger) break; + env = bigger; + cap *= 2; + } + } + close(fd); + int found = 0; + if (env) { + env[used] = '\0'; + for (char *e = env; e < env + used; e += strlen(e) + 1) { + if (strncmp(e, key, keylen) == 0 && e[keylen] == '=' && e[keylen + 1] != '\0') { + ddnatv_copy_cstr(out, outsz, e + keylen + 1); + found = 1; + break; + } + } + free(env); + } + return found; +} + +// Overlay filesystems report a different device to stat() than in /proc//maps; the path, as the +// kernel resolved it, then stands in for the device. +static int proc_maps_file(pid_t pid, dev_t dev, ino_t ino, const char *resolved) { + char path[64]; + snprintf(path, sizeof(path), "/proc/%d/maps", (int)pid); + int fd = open(path, O_RDONLY | O_CLOEXEC); + if (fd < 0) return 0; + char chunk[4096], line[1024]; + size_t len = 0; + ssize_t got; + int found = 0; + while (!found && (got = read(fd, chunk, sizeof(chunk))) > 0) { + for (ssize_t i = 0; i < got && !found; i++) { + if (chunk[i] != '\n') { + if (len < sizeof(line) - 1) line[len++] = chunk[i]; + continue; + } + line[len] = '\0'; + len = 0; + unsigned long long offset, inode; + unsigned int major_nr, minor_nr; + int name_at = 0; + if (sscanf(line, "%*s %*s %llx %x:%x %llu %n", &offset, &major_nr, &minor_nr, &inode, &name_at) == 4 && + offset == 0 && inode == (unsigned long long)ino && + (makedev(major_nr, minor_nr) == dev || (resolved && name_at > 0 && strcmp(line + name_at, resolved) == 0))) { + found = 1; + } + } + } + close(fd); + return found; +} + +// The kernel's /proc//exe of every other guest program is the loader that started it. KWin +// grants privileged Wayland interfaces by matching that path to a desktop file's Exec, so it is the +// program the loader runs, as for the calling process. A process can set its environment and +// arguments, so the program they name counts only if that process has the file mapped from its start. +static ssize_t handle_proc_other_exe(const char *path, char *buf, size_t bufsiz) { + if (!path || !buf || bufsiz == 0 || strncmp(path, "/proc/", 6) != 0) return -1; + const char *p = path + 6; + if (*p < '1' || *p > '9') return -1; + while (*p >= '0' && *p <= '9') p++; + if (strcmp(p, "/exe") != 0) return -1; + pid_t pid = (pid_t)atoi(path + 6); + if (pid == getpid()) return -1; + init_ddnatv_hook(); + if (g_ddnatv_root[0] == '\0') return -1; + ssize_t (*real_readlinkat)(int, const char *, char *, size_t) = real_readlinkat_fn(); + static int (*real_fstatat)(int, const char *, struct stat *, int) = NULL; + if (!real_fstatat) real_fstatat = (int (*)(int, const char *, struct stat *, int))dlsym(RTLD_NEXT, "fstatat"); + if (!real_readlinkat || !real_fstatat) return -1; + char loader[PATH_MAX]; + ssize_t n = real_readlinkat(AT_FDCWD, path, loader, sizeof(loader) - 1); + if (n <= 0) return -1; + loader[n] = '\0'; + const char *base = strrchr(loader, '/'); + base = base ? base + 1 : loader; + if (strcmp(base, "libddexec.so") != 0 && !is_ld_linux(loader)) return -1; + + char real_exe[PATH_MAX] = ""; + if (!proc_env_value(pid, "DDNATV_REAL_EXE", real_exe, sizeof(real_exe))) { + char cmdline[64]; + snprintf(cmdline, sizeof(cmdline), "/proc/%d/cmdline", (int)pid); + exe_from_cmdline(cmdline, real_exe, sizeof(real_exe)); + } + static char *(*real_realpath)(const char *, char *) = NULL; + if (!real_realpath) real_realpath = (char *(*)(const char *, char *))dlsym(RTLD_NEXT, "realpath"); + struct stat st; + char resolved[PATH_MAX]; + if (real_exe[0] != '/' || real_fstatat(AT_FDCWD, real_exe, &st, 0) != 0) return -1; + if (!real_realpath || !real_realpath(real_exe, resolved)) resolved[0] = '\0'; + if (!proc_maps_file(pid, st.st_dev, st.st_ino, resolved[0] ? resolved : NULL)) return -1; + return copy_guest_exe(real_exe, buf, bufsiz); +} + +// readlinkat(>, "exe"), as the absolute path would be answered. +static ssize_t handle_proc_exe_at(int dirfd, const char *pathname, char *buf, size_t bufsiz) { + if (!pathname || pathname[0] == '/' || dirfd == AT_FDCWD || strcmp(pathname, "exe") != 0) return -1; + ssize_t (*real_readlinkat)(int, const char *, char *, size_t) = real_readlinkat_fn(); + if (!real_readlinkat) return -1; + char link[64], dir[PATH_MAX], full[PATH_MAX]; + snprintf(link, sizeof(link), "/proc/self/fd/%d", dirfd); + ssize_t n = real_readlinkat(AT_FDCWD, link, dir, sizeof(dir) - 1); + if (n <= 0) return -1; + dir[n] = '\0'; + if (strncmp(dir, "/proc/", 6) != 0 || snprintf(full, sizeof(full), "%s/exe", dir) >= (int)sizeof(full)) return -1; + if (is_proc_self_exe(full)) return handle_proc_self_exe(buf, bufsiz); + return handle_proc_other_exe(full, buf, bufsiz); +} + static const char *rewrite_path(const char *path, char *buffer, size_t bufsize) { if (!path) return NULL; // Relative paths must NEVER be rewritten to rootfs root diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index 7593ff6a9e..ebb7c9fda8 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -102,6 +102,12 @@ Added by DroidDeck: `libblsession.so`'s robust.c never sees: `libopenvr_api.so` opens it `RTLD_DEEPBIND`. Steam aborted on "futex robust_list not initialized by pthreads" as soon as SteamVR was registered. +- `0029-proc-pid-root-guest.patch` - `/proc//root` of a tracee resolved to the rootfs's host + path, which does not exist inside the guest, so opening it failed with `ENOENT`. It now reads + as `/`, like `exe` and `cwd` read as guest paths. xdg-desktop-portal opens it for every caller to + tell sandboxed apps from host ones, so every portal request failed with "Unable to open + /proc//root", Sunshine's screen capture included. + Prototype (inert unless `PROOT_FASTPATH` is set; see `docs/development/proot-performance.md`): - `0014-fastpath-trampoline.patch` - with `PROOT_FASTPATH`, every `SECCOMP_RET_TRACE` in the filter diff --git a/tools/proot/patches/0029-proc-pid-root-guest.patch b/tools/proot/patches/0029-proc-pid-root-guest.patch new file mode 100644 index 0000000000..c1d1821071 --- /dev/null +++ b/tools/proot/patches/0029-proc-pid-root-guest.patch @@ -0,0 +1,11 @@ +--- a/src/path/proc.c ++++ b/src/path/proc.c +@@ -112,7 +112,7 @@ + * of tracee->???. */ + SUBSTITUTE(exe, known_tracee->exe); + SUBSTITUTE(cwd, known_tracee->fs->cwd); +- SUBSTITUTE(root, get_root(known_tracee)); ++ SUBSTITUTE(root, "/"); + #undef SUBSTITUTE + return DEFAULT; + diff --git a/tools/release/sign-apk.sh b/tools/release/sign-apk.sh index 15fbb4e33c..0373e80ee5 100755 --- a/tools/release/sign-apk.sh +++ b/tools/release/sign-apk.sh @@ -29,7 +29,7 @@ else "$P=$pkg" "$P.androidx-startup=$pkg.androidx-startup" "$P.logs=$pkg.logs" \ "$P.pairingguide=$pkg.pairingguide" "$P.devicecode=$pkg.devicecode" "$P.pin=$pkg.pin" \ "$P.documents=$pkg.documents" "$P.home=$pkg.home" "$P.agent=$pkg.agent" \ - "$P.vr_recovery=$pkg.vr_recovery" "$P.dualscreen=$pkg.dualscreen" "$P.typing=$pkg.typing" \ + "$P.vr_recovery=$pkg.vr_recovery" "$P.dualscreen=$pkg.dualscreen" "$P.typing=$pkg.typing" "$P.keeptop=$pkg.keeptop" \ "$P.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION=$pkg.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" fi got=$("$BUILD_TOOLS/aapt" dump badging "$work/renamed.apk" | sed -n "s/^package: name='\([^']*\)'.*/\1/p") diff --git a/tools/release/validate_apk.py b/tools/release/validate_apk.py index 1e7e31f960..7a3fb67530 100644 --- a/tools/release/validate_apk.py +++ b/tools/release/validate_apk.py @@ -2,13 +2,33 @@ import json import os import subprocess +import sys +import time from urllib.parse import urlencode from check_authorship import check_revision, event_violations -def api(path, *args): - return json.loads(subprocess.check_output(["gh", "api", path, *args], text=True)) +RATE_LIMIT_WAIT = 1800 + + +def rate_limit_wait(): + try: + reset = json.loads(subprocess.check_output(["gh", "api", "rate_limit"], text=True))["resources"]["core"]["reset"] + except (subprocess.CalledProcessError, KeyError, ValueError): + return 60 + return max(5, min(RATE_LIMIT_WAIT, reset - time.time() + 5)) + + +def api(path, *args, attempts=3): + for attempt in range(attempts): + done = subprocess.run(["gh", "api", path, *args], text=True, capture_output=True) + if done.returncode == 0: + return json.loads(done.stdout) + if "--method" in args or "rate limit" not in done.stderr.lower() or attempt == attempts - 1: + sys.stderr.write(done.stderr) + raise subprocess.CalledProcessError(done.returncode, done.args, done.stdout, done.stderr) + time.sleep(rate_limit_wait()) def compilation_state(run, jobs): diff --git a/tools/rockstar-launcher/README.md b/tools/rockstar-launcher/README.md index 62ae5642e6..020e21dcb7 100644 --- a/tools/rockstar-launcher/README.md +++ b/tools/rockstar-launcher/README.md @@ -6,7 +6,7 @@ The handoff is mode 0600, expires after 90 seconds and is deleted before startin GTA III, Vice City and San Andreas use body-length MTLX replies. GTA IV and L.A. Noire use total-length, terminated replies. Titles with installed Social Club metadata or SDK binaries use the SDK IPC adapter, including user-info, login, ticket, initialization and authorized title-state synchronization. The title metadata supplies the ROS identity and principal executable; it is checked against Rockstar's catalog before title authorization. Other titles retain Play and Steam shortcuts and attempt the normal executable launch path. -The SDK runtime is extracted from the game's own Social-Club-Setup.exe when present. Architecture-specific payloads are staged into the prefix, archive paths and sizes are checked, interrupted copies are retried, and both registry views are registered. The helper discovers launcher identity pipe names in the game executable and answers bounded INIT challenges from the launched process. No vendor executables or runtime files are bundled with this tool. SDK initialization has a 90-second deadline. SDK wire tests and fixture clients do not establish gameplay compatibility for every title; per-title ROS ticket exchange and secondary SDK channels remain unverified. +The SDK runtime is extracted from the game's own Social-Club-Setup.exe when present. Architecture-specific payloads are staged into the prefix, archive paths and sizes are checked, interrupted copies are retried, and both registry views are registered. The helper discovers launcher identity pipe names in the game executable and the executables beside it, because protected game executables resolve that name only at run time, and answers bounded INIT challenges from the launched process. No vendor executables or runtime files are bundled with this tool. SDK initialization has a 90-second deadline. SDK wire tests and fixture clients do not establish gameplay compatibility for every title; per-title ROS ticket exchange and secondary SDK channels remain unverified. GTA III defaults to full x87 precision for FEX before Wine starts, because reduced precision crashed new-game initialization on the test device. San Andreas defaults to WineD3D, because DXVK intermittently corrupted its textures; full precision and conservative memory ordering did not prevent that corruption. These defaults use DroidDeck's per-game settings and preserve explicit per-game overrides. diff --git a/tools/rockstar-launcher/src/identity.rs b/tools/rockstar-launcher/src/identity.rs index 795d56da1a..b059787b0d 100644 --- a/tools/rockstar-launcher/src/identity.rs +++ b/tools/rockstar-launcher/src/identity.rs @@ -1,5 +1,7 @@ -use std::collections::BTreeSet; +use std::collections::BTreeMap; +use std::fs::{self, File}; use std::io::{self, Read}; +use std::path::{Path, PathBuf}; const LIMIT: usize = 4096; @@ -10,7 +12,13 @@ fn invalid() -> io::Error { ) } -fn collect(bytes: &[u8], names: &mut BTreeSet) { +type Names = BTreeMap; + +const SCAN_LIMIT: u64 = 256 * 1024 * 1024; +const NAME_LIMIT: usize = 4; +const SIBLING_LIMIT: usize = 32; + +fn collect(bytes: &[u8], names: &mut Names) { let prefix = br"\\.\pipe\"; for (index, window) in bytes.windows(prefix.len()).enumerate() { if window != prefix { @@ -28,41 +36,95 @@ fn collect(bytes: &[u8], names: &mut BTreeSet) { { let name = std::str::from_utf8(name).unwrap(); if name.ends_with("LauncherPipe") || name.ends_with("Launcher_Pipe") { - names.insert(name.to_owned()); + names + .entry(name.to_ascii_lowercase()) + .or_insert_with(|| name.to_owned()); } } } } -pub fn pipe_names(reader: &mut impl Read) -> io::Result> { - let mut names = BTreeSet::new(); +pub fn title_pipe_names(exe: &Path) -> io::Result> { + discover(exe, SCAN_LIMIT) +} + +fn discover(exe: &Path, limit: u64) -> io::Result> { + let mut names = Names::new(); + let mut principal = limit; + scan(&mut File::open(exe)?, &mut names, &mut principal)?; + let mut extra = Names::new(); + let mut budget = limit; + for path in siblings(exe) { + if extra.len() >= NAME_LIMIT || budget == 0 { + break; + } + let Ok(mut file) = File::open(&path) else { + continue; + }; + if !file + .metadata() + .is_ok_and(|metadata| metadata.len() <= budget) + { + continue; + } + let mut own = Names::new(); + if scan(&mut file, &mut own, &mut budget).is_err() { + continue; + } + for (key, name) in own { + if extra.len() < NAME_LIMIT && !names.contains_key(&key) { + extra.entry(key).or_insert(name); + } + } + } + names.append(&mut extra); + Ok(names.into_values().collect()) +} + +fn siblings(exe: &Path) -> Vec { + let Some(entries) = exe.parent().and_then(|folder| fs::read_dir(folder).ok()) else { + return Vec::new(); + }; + let mut paths: Vec<_> = entries + .flatten() + .filter(|entry| entry.file_type().is_ok_and(|kind| kind.is_file())) + .map(|entry| entry.path()) + .filter(|path| { + path != exe + && path + .extension() + .is_some_and(|extension| extension.eq_ignore_ascii_case("exe")) + }) + .collect(); + paths.sort(); + paths.truncate(SIBLING_LIMIT); + paths +} + +fn scan(reader: &mut impl Read, names: &mut Names, budget: &mut u64) -> io::Result<()> { let mut carry = Vec::new(); let mut chunk = [0; 65536]; - let mut total = 0usize; loop { let count = reader.read(&mut chunk)?; if count == 0 { break; } - total += count; - if total > 256 * 1024 * 1024 { - return Err(invalid()); - } + *budget = budget.checked_sub(count as u64).ok_or_else(invalid)?; carry.extend_from_slice(&chunk[..count]); - collect(&carry, &mut names); + collect(&carry, names); for offset in 0..2 { let ascii: Vec<_> = carry[offset..] .chunks_exact(2) .map(|pair| if pair[1] == 0 { pair[0] } else { 0 }) .collect(); - collect(&ascii, &mut names); + collect(&ascii, names); } - if names.len() > 4 { + if names.len() > NAME_LIMIT { return Err(invalid()); } carry.drain(..carry.len().saturating_sub(256)); } - Ok(names.into_iter().collect()) + Ok(()) } pub fn exchange(reader: &mut impl Read) -> io::Result> { @@ -134,12 +196,165 @@ mod tests { } bytes.extend_from_slice(br"\\.\pipe\..\outsideLauncherPipe"); bytes.push(0); + let mut names = Names::new(); + scan(&mut Cursor::new(bytes), &mut names, &mut SCAN_LIMIT.clone()).unwrap(); assert_eq!( - pipe_names(&mut Cursor::new(bytes)).unwrap(), + names.into_values().collect::>(), ["GameLauncherPipe", "OtherLauncher_Pipe"] ); } + fn folder(name: &str) -> std::path::PathBuf { + let path = + std::env::temp_dir().join(format!("droiddeck-identity-{name}-{}", std::process::id())); + let _ = fs::remove_dir_all(&path); + fs::create_dir(&path).unwrap(); + path + } + + #[test] + fn title_names_include_sibling_launcher_executables() { + let root = folder("siblings"); + let game = root.join("Game.exe"); + fs::write(&game, b"MZ obfuscated").unwrap(); + fs::write( + root.join("TitleLauncher.exe"), + [br"MZ \\.\pipe\TitleLauncher_Pipe".as_slice(), b"\0"].concat(), + ) + .unwrap(); + fs::write( + root.join("Data.dat"), + [br"\\.\pipe\DataLauncher_Pipe".as_slice(), b"\0"].concat(), + ) + .unwrap(); + fs::create_dir(root.join("Folder.exe")).unwrap(); + let names = title_pipe_names(&game).unwrap(); + fs::remove_dir_all(&root).unwrap(); + assert_eq!(names, ["TitleLauncher_Pipe"]); + } + + fn executable(path: &Path, names: &[&str]) { + let mut bytes = b"MZ ".to_vec(); + for name in names { + bytes.extend_from_slice(br"\\.\pipe\"); + bytes.extend_from_slice(name.as_bytes()); + bytes.push(0); + } + fs::write(path, bytes).unwrap(); + } + + #[test] + fn title_names_keep_the_game_executable_names_and_limits() { + let root = folder("principal"); + let game = root.join("Game.exe"); + executable(&game, &["GameLauncherPipe"]); + fs::write(root.join("Tool.exe"), b"MZ plain").unwrap(); + assert_eq!(title_pipe_names(&game).unwrap(), ["GameLauncherPipe"]); + for index in 0..40 { + fs::write(root.join(format!("Extra{index:02}.exe")), b"MZ").unwrap(); + } + executable(&root.join("Zz.exe"), &["LateLauncher_Pipe"]); + let crowded = title_pipe_names(&game); + executable( + &game, + &[ + "ALauncherPipe", + "BLauncherPipe", + "CLauncherPipe", + "DLauncherPipe", + "ELauncherPipe", + ], + ); + let overfull = title_pipe_names(&game); + fs::remove_dir_all(&root).unwrap(); + assert_eq!(crowded.unwrap(), ["GameLauncherPipe"]); + assert!(overfull.is_err()); + } + + #[test] + fn title_names_skip_siblings_that_cannot_be_scanned() { + use std::os::unix::fs::PermissionsExt; + let root = folder("unscannable"); + let game = root.join("Game.exe"); + executable(&game, &["GameLauncherPipe"]); + let locked = root.join("Locked.exe"); + executable(&locked, &["LockedLauncher_Pipe"]); + fs::set_permissions(&locked, fs::Permissions::from_mode(0o000)).unwrap(); + let locked_open = File::open(&locked).is_ok(); + File::create(root.join("Huge.exe")) + .unwrap() + .set_len(SCAN_LIMIT + 1) + .unwrap(); + executable( + &root.join("Noisy.exe"), + &[ + "NALauncherPipe", + "NBLauncherPipe", + "NCLauncherPipe", + "NDLauncherPipe", + "NELauncherPipe", + ], + ); + let names = title_pipe_names(&game); + fs::remove_dir_all(&root).unwrap(); + let mut expected = vec!["GameLauncherPipe".to_owned()]; + if locked_open { + expected.push("LockedLauncher_Pipe".to_owned()); + } + assert_eq!(names.unwrap(), expected); + } + + #[test] + fn title_names_bound_the_bytes_read_from_siblings() { + let root = folder("budget"); + let game = root.join("Game.exe"); + executable(&game, &["GameLauncherPipe"]); + executable(&root.join("First.exe"), &["FirstLauncherPipe"]); + executable(&root.join("Second.exe"), &["SecondLauncherPipe"]); + let size = fs::metadata(root.join("First.exe")).unwrap().len(); + let names = discover(&game, size + 8); + fs::remove_dir_all(&root).unwrap(); + assert_eq!(names.unwrap(), ["FirstLauncherPipe", "GameLauncherPipe"]); + } + + #[test] + fn title_names_merge_case_insensitively_and_cap_sibling_names() { + let root = folder("merge"); + let game = root.join("Game.exe"); + executable( + &game, + &[ + "ALauncherPipe", + "BLauncherPipe", + "CLauncherPipe", + "GTAVLauncher_Pipe", + ], + ); + executable( + &root.join("A.exe"), + &["gtavLauncher_Pipe", "ELauncherPipe", "FLauncherPipe"], + ); + executable( + &root.join("B.exe"), + &["GLauncherPipe", "HLauncherPipe", "ILauncherPipe"], + ); + let names = title_pipe_names(&game); + fs::remove_dir_all(&root).unwrap(); + assert_eq!( + names.unwrap(), + [ + "ALauncherPipe", + "BLauncherPipe", + "CLauncherPipe", + "ELauncherPipe", + "FLauncherPipe", + "GLauncherPipe", + "GTAVLauncher_Pipe", + "HLauncherPipe" + ] + ); + } + #[test] fn identity_replies_echo_only_a_valid_challenge() { struct Split(R); diff --git a/tools/rockstar-launcher/src/main.rs b/tools/rockstar-launcher/src/main.rs index 0913c6d548..cc2d294218 100644 --- a/tools/rockstar-launcher/src/main.rs +++ b/tools/rockstar-launcher/src/main.rs @@ -146,14 +146,21 @@ fn run() -> Result> { None }; let mut identity_listeners = Vec::new(); + let mut identity_names = Vec::new(); if session.is_some() { - for name in - droiddeck_rockstar_launcher::identity::pipe_names(&mut std::fs::File::open(&exe)?)? - { - identity_listeners.push(Listener::new(&name, Duration::from_secs(90))?); + identity_names = droiddeck_rockstar_launcher::identity::title_pipe_names(&exe)?; + for name in &identity_names { + identity_listeners.push(Listener::new(name, Duration::from_secs(90))?); } } - log("launcher pipes created"); + log(&format!( + "launcher pipes created, identity: {}", + if identity_names.is_empty() { + "none".to_owned() + } else { + identity_names.join(", ") + } + )); let mut command = std::process::Command::new(exe); command.current_dir(workdir).args(args?); if session.is_some() { @@ -256,7 +263,9 @@ fn run() -> Result> { } let _ = result.send(outcome); }); - Ok(wait_for_game(&mut child, handshake)?.code().unwrap_or(1)) + let code = wait_for_game(&mut child, handshake)?.code().unwrap_or(1); + log(&format!("game exited with code {code}")); + Ok(code) } fn main() { diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index db2d3f80e1..bcc5e4768b 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -80,7 +80,7 @@ class ClientZramFocusTest(unittest.TestCase): def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self): source = SCRIPT.read_text() - start = source.index(' if [ "$_bl_game" = 1 ] && bl_game_focused; then') + start = source.index(' _bl_focus=1\n') stop = source.index(' bl_watch_nap\n', start) body = source[start:stop] harness = ''' @@ -125,7 +125,7 @@ bl_client_pressure_finish() { :; } bl_session_pressure() { :; } bl_client_can_pageout() { return 0; } bl_client_can_readback() { [ "${readback:-1}" = 1 ]; } -bl_game_focused() { [ "$focused" = 1 ]; } +bl_game_focused() { [ "$focused" = 1 ] && return 0; [ "$focused" = 2 ] && return 2; return 1; } bl_cap_due() { [ "$cap_due" = 1 ]; } bl_over_cap() { [ "$over_cap" = 1 ]; } bl_zram_send() { echo "send:$1:$3"; } @@ -199,6 +199,97 @@ echo "restored:$_bl_unpack" self.assertEqual('', result.stderr) self.assertEqual(['send:1:client', 'deferred:1', 'send:0:client', 'restored:0'], result.stdout.splitlines()) + def test_client_in_front_of_a_running_game_is_read_back_and_compressed_again_later(self): + result = run_bash(self.monitor_harness() + ''' +tick 0 1 1 0 0 +tick 20 1 1 0 0 +tick 25 1 0 0 0 +echo "away:$_bl_packed" +tick 30 1 0 0 0 +echo "read:$_bl_packed:$_bl_unpack" +tick 35 1 0 0 0 +tick 40 1 1 0 0 +tick 55 1 1 0 0 +tick 60 1 1 0 0 +echo "again:$_bl_packed" +tick 65 0 0 0 0 +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual(['send:1:client', 'away:20', 'send:0:client', 'read:-1:0', 'send:1:client', 'again:60', 'send:0:client'], + result.stdout.splitlines()) + + def test_unknown_focus_keeps_the_client_compressed(self): + result = run_bash(self.monitor_harness() + ''' +tick 0 1 1 0 0 +tick 20 1 1 0 0 +tick 25 1 2 0 0 +tick 40 1 2 0 0 +echo "unknown:$_bl_packed:$_bl_unpack" +tick 45 1 0 0 0 +tick 48 1 2 0 0 +tick 52 1 0 0 0 +tick 56 1 0 0 0 +echo "flicker:$_bl_packed" +tick 57 1 0 0 0 +echo "read:$_bl_packed" +tick 60 0 2 0 0 +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual(['send:1:client', 'unknown:20:1', 'flicker:20', 'send:0:client', 'read:-1'], + result.stdout.splitlines()) + + def test_a_short_look_at_the_client_keeps_it_compressed(self): + result = run_bash(self.monitor_harness() + ''' +tick 0 1 1 0 0 +tick 20 1 1 0 0 +tick 25 1 0 0 0 +tick 28 1 1 0 0 +tick 30 1 0 0 0 +tick 34 1 0 0 0 +echo "packed:$_bl_packed" +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual(['send:1:client', 'packed:20'], result.stdout.splitlines()) + + def test_client_in_front_waits_for_memory_and_a_ram_cap_keeps_it_compressed(self): + result = run_bash(self.monitor_harness() + ''' +tick 0 1 1 0 0 +tick 20 1 1 0 0 +readback=0 +tick 25 1 0 0 0 +tick 35 1 0 0 0 +echo "tight:$_bl_packed" +readback=1 +tick 40 1 0 0 0 +echo "eased:$_bl_packed" +_bl_ram_cap=1048576 +tick 60 1 1 0 0 +tick 80 1 1 0 0 +tick 85 1 0 0 0 +tick 100 1 0 0 0 +echo "capped:$_bl_packed" +tick 105 0 0 0 0 +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual(['send:1:client', 'tight:20', 'send:0:client', 'eased:-1', 'send:1:client', 'capped:80', 'send:0:client'], + result.stdout.splitlines()) + + def test_client_in_front_without_compression_reads_nothing_back(self): + result = run_bash(self.monitor_harness() + ''' +BL_ZRAM_CLIENT=0 +tick 0 1 1 0 0 +tick 25 1 0 0 0 +tick 40 1 0 0 0 +tick 45 0 0 0 0 +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual('', result.stdout) + def test_scan_keeps_the_running_game_and_ignores_steams_own_reaper(self): temp = tempfile.TemporaryDirectory() self.addCleanup(temp.cleanup) @@ -219,7 +310,8 @@ echo "restored:$_bl_unpack" %s check() { BL_DESKTOP=$1 BL_LAUNCH_DIR=$2 _bl_apps=$3 - if bl_game_focused; then echo yes; else echo no; fi + bl_game_focused + echo $? } check "" "$dir" " 413150" check "" "$dir" " 1245620" @@ -227,7 +319,10 @@ printf '%%s\\n' '{"focusedApp": 999}' > "$dir/agent/focus.json" check "" "$dir" " 413150" printf '%%s\\n' '{"focusedApp": 769}' > "$dir/agent/focus.json" check "" "$dir" " 413150" +printf '%%s\\n' '{"t": 2}' > "$dir/agent/focus.json" +check "" "$dir" " 413150" rm -f "$dir/agent/focus.json" +check "" "$dir" " 413150" check 1 "$dir" " 413150" check "" "" " 413150" ''' % focus @@ -238,7 +333,7 @@ check "" "" " 413150" (launch / 'agent' / 'focus.json').write_text('{"t": 1, "focusedApp": 413150}\n') result = run_bash('dir=%s\n%s' % (launch, script)) self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual(['yes', 'no', 'no', 'no', 'yes', 'yes'], result.stdout.splitlines()) + self.assertEqual(['0', '1', '1', '1', '2', '2', '0', '0'], result.stdout.splitlines()) @staticmethod def write_cmd(root, pid, args): diff --git a/tools/tests/test_desktop_bookmarks.py b/tools/tests/test_desktop_bookmarks.py index 4c53dc6894..802e10fe44 100644 --- a/tools/tests/test_desktop_bookmarks.py +++ b/tools/tests/test_desktop_bookmarks.py @@ -162,6 +162,80 @@ class DolphinPlacesTest(unittest.TestCase): self.assertEqual(1, len(root.findall("bookmark"))) self.assertEqual("My games", root.findtext("bookmark/title")) + def volumes(self, entries): + listing = self.home / "volumes.json" + listing.write_text(json.dumps(entries)) + os.environ["BL_DESKTOP_VOLUMES"] = str(listing) + return MODULE["removable_volumes"]() + + def update_volumes(self, volumes): + MODULE["update_places"](self.places, volumes, "DroidDeckRemovableVolume", "drive-removable-media", "droiddeck-volume-") + return ET.parse(self.places).getroot() + + def test_all_readable_volumes_without_steam_libraries(self): + card = self.home / "ABCD-1234" + usb = self.home / "USB café & " + card.mkdir() + usb.mkdir() + missing = self.home / "unplugged" + entries = [{"path": str(card), "label": "Card"}, {"path": str(usb), "label": "USB & "}, + {"path": str(missing), "label": "Gone"}, {"path": "relative", "label": "Invalid"}] + volumes = self.volumes(entries) + self.assertEqual({card.as_uri(): "Card", usb.as_uri(): "USB & "}, volumes) + root = self.update_volumes(volumes) + self.assertEqual(2, len(root.findall("bookmark"))) + self.assertEqual("USB & ", root.findall("bookmark")[1].findtext("title")) + self.assertFalse((card / "steamapps").exists()) + self.assertEqual("drive-removable-media", root.find("bookmark/info/metadata/{" + MODULE["ICON_NS"] + "}icon").get("name")) + + def test_main_adds_volumes_without_changing_gtk_or_steam_selection(self): + card = self.home / "card" + card.mkdir() + self.volumes([{"path": str(card), "label": "Card"}]) + with patch.object(Path, "home", return_value=self.home), patch.dict(os.environ, {"XDG_DATA_HOME": str(self.data)}): + MODULE["main"]() + root = ET.parse(self.places).getroot() + self.assertEqual({self.steam.as_uri(), card.as_uri()}, {b.get("href") for b in root.findall("bookmark")}) + self.assertFalse((self.home / ".config/gtk-3.0/bookmarks").exists()) + self.volumes([]) + MODULE["main"]() + root = ET.parse(self.places).getroot() + self.assertEqual([self.steam.as_uri()], [b.get("href") for b in root.findall("bookmark")]) + + def test_unreadable_volume_is_not_offered(self): + card = self.home / "card" + card.mkdir() + with patch("os.scandir", side_effect=PermissionError): + self.assertEqual({}, self.volumes([{"path": str(card), "label": "Card"}])) + + def test_volume_refresh_preserves_steam_personal_and_hidden_places(self): + card = self.home / "card" + card.mkdir() + self.update({self.steam.as_uri(): "Steam"}) + root = self.update_volumes({card.as_uri(): "Card"}) + volume = root.findall("bookmark")[1] + metadata = volume.find("info/metadata[@owner='http://www.kde.org']") + ET.SubElement(metadata, "IsHidden").text = "true" + ET.SubElement(root, "bookmark", {"href": "file:///root/Documents"}) + self.places.write_bytes(ET.tostring(root)) + root = self.update_volumes({card.as_uri(): "Renamed"}) + self.assertEqual("true", root.findall("bookmark")[1].findtext("info/metadata/IsHidden")) + before = self.places.read_bytes() + self.update_volumes({card.as_uri(): "Renamed"}) + self.assertEqual(before, self.places.read_bytes()) + self.update({self.steam.as_uri(): "Steam"}) + root = self.update_volumes({}) + self.assertEqual([self.steam.as_uri(), "file:///root/Documents"], [b.get("href") for b in root.findall("bookmark")]) + + def test_personal_volume_place_is_not_duplicated_or_removed(self): + card = self.home / "card" + card.mkdir() + self.places.write_text(f'My card') + before = self.places.read_bytes() + self.update_volumes({card.as_uri(): "Card"}) + self.update_volumes({}) + self.assertEqual(before, self.places.read_bytes()) + def test_invalid_xml_is_not_overwritten(self): self.places.write_text("unfinished") with self.assertRaises(ET.ParseError): diff --git a/tools/tests/test_desktop_open.py b/tools/tests/test_desktop_open.py index a7840cfa53..a0ce68cf30 100644 --- a/tools/tests/test_desktop_open.py +++ b/tools/tests/test_desktop_open.py @@ -709,6 +709,7 @@ class ProtonRunTest(Temp): self.assertEqual(entry, str(self.root / "compatibilitytools.d/droiddeck-proton-11-arm64/droiddeck-proton")) self.assertEqual(argv, [entry, "waitforexitandrun", str(program), "-fullscreen"]) self.assertEqual(env["SteamAppId"], "413150") + self.assertEqual(env["DROIDDECK_DESKTOP_PROGRAM"], str(program)) self.assertTrue((self.root / "steamapps/compatdata/413150").is_dir()) def run_main(self, argv): @@ -737,6 +738,7 @@ class ProtonRunTest(Temp): self.assertEqual((env["SteamAppId"], env["STEAM_COMPAT_DATA_PATH"]), ("413150", str(self.root / "steamapps/compatdata/413150"))) self.assertEqual(dirs, [str(program.parent)]) + self.assertNotIn("DROIDDECK_DESKTOP_PROGRAM", env) def test_without_steam_a_game_steam_cannot_start_is_refused(self): self.write("Steam/appcache/appinfo.vdf", appinfo({413150: STARDEW})) diff --git a/tools/tests/test_desktop_pipewire.py b/tools/tests/test_desktop_pipewire.py index 6de6b9e802..ecc4616af3 100644 --- a/tools/tests/test_desktop_pipewire.py +++ b/tools/tests/test_desktop_pipewire.py @@ -38,11 +38,9 @@ pipewire() { def test_desktop_serves_pipewire_before_plasma_and_stops_it_after(self): start = DESKTOP.index(HELPER + ' start') - env = DESKTOP.index(HELPER + ' env') plasma = DESKTOP.index('dbus-run-session -- startplasma-wayland') stop = DESKTOP.index(HELPER + ' stop') - self.assertLess(start, env) - self.assertLess(env, plasma) + self.assertLess(start, plasma) self.assertLess(plasma, stop) self.assertLess(stop, DESKTOP.index('droiddeck-steam-launch bigpicture')) @@ -58,16 +56,17 @@ pipewire() { self.assertNotIn('if [ "${BL_BOTTOM_DESKTOP:-0}" != 1 ]; then', DESKTOP) for bottom in (False, True): self.assertEqual(['call:start'], self.run_lifecycle_block( - 'if ' + HELPER + ' start', + 'if ! ' + HELPER + ' start', 'echo "== droiddeck-desktop: Plasma on $WAYLAND_DISPLAY"', bottom)) self.assertEqual(['call:stop'], self.run_lifecycle_block( HELPER + ' stop', 'echo "== droiddeck-desktop: Plasma ended ($rc)"', bottom)) - def test_successful_start_exports_the_client_environment(self): + def test_plasma_keeps_the_rootfs_pipewire_client_settings(self): + self.assertNotIn(HELPER + ' env', DESKTOP) for bottom in (False, True): - self.assertEqual(['call:start', 'env:set'], self.run_lifecycle_block( - 'if ' + HELPER + ' start', + self.assertEqual(['call:start', 'env:unset'], self.run_lifecycle_block( + 'if ! ' + HELPER + ' start', 'echo "== droiddeck-desktop: Plasma on $WAYLAND_DISPLAY"', bottom, probe_env=True)) def test_failed_start_reports_it_and_leaves_the_environment_alone(self): @@ -75,7 +74,7 @@ pipewire() { self.assertEqual( ['call:start', '== pipewire: not running; screen capture has no picture', 'env:unset'], self.run_lifecycle_block( - 'if ' + HELPER + ' start', + 'if ! ' + HELPER + ' start', 'echo "== droiddeck-desktop: Plasma on $WAYLAND_DISPLAY"', bottom, start_status=1, probe_env=True)) diff --git a/tools/tests/test_desktop_program_diagnostics.py b/tools/tests/test_desktop_program_diagnostics.py new file mode 100644 index 0000000000..02ae4cd41e --- /dev/null +++ b/tools/tests/test_desktop_program_diagnostics.py @@ -0,0 +1,121 @@ +import contextlib +import io +import os +from pathlib import Path +import runpy +import subprocess +import sys +import tempfile +import unittest + + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +DEBUG = runpy.run_path(str(BIN / "droiddeck-game-debug")) + + +class DesktopProgramDiagnosticsTest(unittest.TestCase): + def launch(self, folder, desktop=True, **settings): + env = dict(os.environ, BL_DEBUG_DIR=folder, WINEDEBUG="-all", PROTON_LOG="0") + env.pop("DROIDDECK_DESKTOP_PROGRAM", None) + if desktop: + env["DROIDDECK_DESKTOP_PROGRAM"] = "managed.exe" + env.update(settings) + child = "import os,sys; print(os.environ['WINEDEBUG']); sys.stderr.write('err:mscoree:CLRRuntimeInfo_GetRuntimeHost Wine Mono is not installed\\n'); sys.exit(7)" + wrapper = "import runpy,sys; g=runpy.run_path(sys.argv[1]); sys.exit(g['start']([sys.executable,'-c',sys.argv[2]],dict(__import__('os').environ),None))" + return subprocess.run([sys.executable, "-c", wrapper, str(BIN / "droiddeck-game-env"), child], + env=env, capture_output=True, text=True, timeout=15) + + def test_desktop_failure_keeps_reason_and_exit_status(self): + with tempfile.TemporaryDirectory() as folder: + result = self.launch(folder) + self.assertEqual(result.returncode, 7) + self.assertEqual(result.stdout.strip(), "-all,err+all,+mscoree,+loaddll") + logs = list(Path(folder).glob("desktop-program-*.log")) + self.assertEqual(len(logs), 1) + self.assertIn("Wine Mono is not installed", logs[0].read_text()) + self.assertIn("Wine Mono is not installed", result.stderr) + self.assertIn("exited with status 7", result.stderr) + + def test_games_and_explicit_debug_settings_stay_unchanged(self): + with tempfile.TemporaryDirectory() as folder: + ordinary = self.launch(folder, desktop=False) + self.assertEqual(ordinary.stdout.strip(), "-all") + self.assertEqual(list(Path(folder).glob("*.log")), []) + opted_in = self.launch(folder, PROTON_LOG="1", WINEDEBUG="+relay") + self.assertEqual(opted_in.stdout.strip(), "+relay") + self.assertEqual(list(Path(folder).glob("*.log")), []) + explicit = self.launch(folder, WINEDEBUG="-all,err+module") + self.assertEqual(explicit.stdout.strip(), "-all,err+module") + + def test_unavailable_log_directory_does_not_stop_program(self): + with tempfile.TemporaryDirectory() as folder: + result = self.launch(str(Path(folder) / "missing")) + self.assertEqual(result.returncode, 7) + self.assertEqual(result.stdout.strip(), "-all") + self.assertIn("diagnostics unavailable", result.stderr) + + def test_capped_log_drains_after_limit_and_preserves_following_output(self): + with tempfile.TemporaryDirectory() as folder: + path = Path(folder) / "program.log" + output, thread = DEBUG["capped_log"](str(path), 1024) + try: + child = subprocess.Popen([sys.executable, "-c", + "import os; os.write(2,b'x'*2097152); print('completed')"], + stderr=output, stdout=subprocess.PIPE, text=True) + stdout, _ = child.communicate(timeout=10) + self.assertEqual(child.returncode, 0) + self.assertEqual(stdout.strip(), "completed") + finally: + os.close(output) + thread.join(timeout=2) + self.assertFalse(thread.is_alive()) + self.assertEqual(path.read_bytes(), b"x" * 1024) + + def test_capped_log_continues_mirroring_after_file_limit_and_survives_mirror_errors(self): + with tempfile.TemporaryDirectory() as folder: + path = Path(folder) / "mirrored.log" + mirrored = io.StringIO() + with contextlib.redirect_stderr(mirrored): + output, thread = DEBUG["capped_log"](str(path), 4, mirror=True) + try: + os.write(output, b"abcdef") + finally: + os.close(output) + thread.join(timeout=2) + self.assertEqual(path.read_bytes(), b"abcd") + self.assertEqual(mirrored.getvalue(), "abcdef") + + def test_desktop_logs_have_unique_names_and_a_hard_byte_limit(self): + with tempfile.TemporaryDirectory() as folder, contextlib.redirect_stderr(io.StringIO()): + env = {"DROIDDECK_DESKTOP_PROGRAM": "managed.exe", "BL_DEBUG_DIR": folder} + for _ in range(2): + with DEBUG["desktop_program_logs"](env) as (launch_env, output): + self.assertNotIn("DROIDDECK_DESKTOP_PROGRAM", launch_env) + child = subprocess.Popen([sys.executable, "-c", "import os; os.write(2,b'x'*2097152)"], stderr=output) + self.assertEqual(child.wait(timeout=10), 0) + logs = list(Path(folder).glob("desktop-program-*.log")) + self.assertEqual(len(logs), 2) + self.assertTrue(all(path.stat().st_size == 1048576 for path in logs)) + + def test_broken_stderr_does_not_abort_launch_or_replace_exit_status(self): + class BrokenStderr: + def write(self, data): + raise BrokenPipeError("closed") + + def flush(self): + raise BrokenPipeError("closed") + + game_env = runpy.run_path(str(BIN / "droiddeck-game-env")) + with tempfile.TemporaryDirectory() as folder: + env = dict(os.environ, BL_DEBUG_DIR=folder, WINEDEBUG="-all", PROTON_LOG="0", + DROIDDECK_DESKTOP_PROGRAM="managed.exe") + with contextlib.redirect_stderr(BrokenStderr()): + code = game_env["start"]( + [sys.executable, "-c", "import sys; sys.stderr.write('err:child_line\\n'); sys.exit(7)"], + env, + None, + ) + self.assertEqual(code, 7) + logs = list(Path(folder).glob("desktop-program-*.log")) + self.assertEqual(len(logs), 1) + self.assertIn("err:child_line", logs[0].read_text()) diff --git a/tools/tests/test_droiddeck_agent.py b/tools/tests/test_droiddeck_agent.py index a1adca90c6..d6d640d887 100644 --- a/tools/tests/test_droiddeck_agent.py +++ b/tools/tests/test_droiddeck_agent.py @@ -867,6 +867,82 @@ const value = subscribe => { return e +class FocusSnapshotTest(unittest.TestCase): + def test_publication_failure_retries_unknown_and_recovers(self): + with tempfile.TemporaryDirectory() as directory: + path = Path(directory) / 'focus.json' + watcher = agent.FocusWatcher(path) + watcher.publish({'focusedApp': 42}) + write_json = agent.write_json + writes = [] + + def write(path, value): + writes.append(value) + if len(writes) == 1: + raise OSError('unavailable') + write_json(path, value) + + with patch.object(threading.Thread, 'start'), \ + patch.object(watcher.changed, 'wait', side_effect=[True, True, True, StopIteration]), \ + patch.object(agent, 'vr_scene_app', return_value=None), \ + patch.object(agent, 'focus_snapshot', side_effect=[OSError('unavailable'), OSError('unavailable'), {'focusedApp': 42}]), \ + patch.object(agent, 'write_json', side_effect=write), \ + patch.object(agent.time, 'sleep'), \ + patch.object(agent, 'log'): + with self.assertRaises(StopIteration): + watcher.run() + self.assertEqual(writes, [{'seq': 2}, {'seq': 2}, {'focusedApp': 42, 'seq': 3}]) + self.assertEqual(json.loads(path.read_text()), {'focusedApp': 42, 'seq': 3}) + + def test_successful_snapshot_write_failure_retries(self): + with tempfile.TemporaryDirectory() as directory: + path = Path(directory) / 'focus.json' + watcher = agent.FocusWatcher(path) + with patch.object(agent, 'write_json', side_effect=OSError('unavailable')), patch.object(agent, 'log'): + watcher.publish({'focusedApp': 42}) + self.assertIsNone(watcher.last) + self.assertEqual(watcher.seq, 0) + self.assertTrue(watcher.changed.is_set()) + watcher.publish({'focusedApp': 42}) + self.assertEqual(json.loads(path.read_text()), {'focusedApp': 42, 'seq': 1}) + + def test_collection_failure_invalidates_and_recovery_republishes(self): + for error in (OSError('unavailable'), agent.AgentError('X', 'unavailable')): + with self.subTest(error=type(error).__name__), tempfile.TemporaryDirectory() as directory: + path = Path(directory) / 'focus.json' + watcher = agent.FocusWatcher(path) + snapshot = {'focusedApp': 42, 't': 1} + watcher.publish(snapshot) + observed = [] + + def collect(): + observed.append(json.loads(path.read_text())) + if len(observed) == 1: + raise error + return dict(snapshot, t=2) + + with patch.object(threading.Thread, 'start'), \ + patch.object(watcher.changed, 'wait', side_effect=[True, True, StopIteration]), \ + patch.object(agent, 'vr_scene_app', return_value=None), \ + patch.object(agent, 'focus_snapshot', side_effect=collect), \ + patch.object(agent.time, 'sleep'), \ + patch.object(agent, 'log'): + with self.assertRaises(StopIteration): + watcher.run() + self.assertEqual(observed, [dict(snapshot, seq=1), {'seq': 2}]) + self.assertEqual(json.loads(path.read_text()), {'focusedApp': 42, 't': 2, 'seq': 3}) + + def test_unchanged_successful_focus_stays_valid(self): + with tempfile.TemporaryDirectory() as directory: + path = Path(directory) / 'focus.json' + watcher = agent.FocusWatcher(path) + watcher.publish({'focusedApp': 769, 't': 1}) + with patch.object(agent, 'write_json') as write: + watcher.publish({'focusedApp': 769, 't': 100}) + write.assert_not_called() + self.assertEqual(json.loads(path.read_text()), {'focusedApp': 769, 't': 1, 'seq': 1}) + + class VrFocusTest(unittest.TestCase): def test_scene_dashboard_and_external_focus_changes(self): focus = agent.VrSceneFocus() diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index 35c8201d58..10cce2770d 100644 --- a/tools/tests/test_droiddeck_fex.py +++ b/tools/tests/test_droiddeck_fex.py @@ -8,6 +8,7 @@ import shutil import stat import struct import subprocess +import sys import tempfile import unittest from pathlib import Path @@ -451,6 +452,331 @@ class PrepareTest(FexTestCase): self.assertIn("built the x86 runtime", self.quiet(FEX["prepare"])[1]) self.assertEqual(sorted(os.listdir(root.parent)), ["config", "lock", "rootfs", "status.json"]) + def test_wayland_and_its_ffi_dependency_come_from_the_newer_runtime(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + names = ("libwayland-client.so.0", "libwayland-cursor.so.0", "libwayland-egl.so.1", + "libwayland-server.so.0", "libffi.so.8") + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + for name in names: + base = sniper / "files/lib" / arch / name + if name != "libffi.so.8": + self.write(base, b"old ABI") + source = provider / "files/lib" / arch / name + self.write(str(source) + ".new", b"new ABI " + name.encode()) + os.symlink(name + ".new", source) + self.write(sniper / "files/lib" / arch / "libffi.so.7", b"old ffi") + fex, _ = self.quiet(FEX["prepare"]) + root = Path(fex["rootfs"]) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + for name in names: + library = root / "lib" / arch / name + expected = sniper if name == "libwayland-cursor.so.0" else provider + self.assertEqual(library.read_bytes(), b"old ABI" if expected == sniper else b"new ABI " + name.encode()) + self.assertEqual((root / "lib" / arch / "libffi.so.7").read_bytes(), b"old ffi") + self.assertEqual((sniper / "files/lib/x86_64-linux-gnu/libwayland-client.so.0").read_bytes(), b"old ABI") + + @unittest.skipUnless(shutil.which("cc"), "C compiler unavailable") + def test_bundled_library_resolves_the_new_wayland_symbol(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + base = sniper / "files/lib/x86_64-linux-gnu" + newer = provider / "files/lib/x86_64-linux-gnu" + source = self.tmp / "library.c" + self.write(newer / "libffi.so.8", b"ffi") + for folder, symbol in ((base, "wl_proxy_marshal"), (newer, "wl_proxy_marshal_flags")): + source.write_text("void *%s(void) { return 0; }\n" % symbol) + subprocess.run(["cc", "-shared", "-fPIC", "-nostdlib", "-Wl,-soname,libwayland-client.so.0", + "-o", str(folder / "libwayland-client.so.0"), str(source)], check=True, capture_output=True) + fex, _ = self.quiet(FEX["prepare"]) + root = Path(fex["rootfs"]) / "lib/x86_64-linux-gnu" + source.write_text("extern void *wl_proxy_marshal_flags(void);\nvoid *probe(void) { return wl_proxy_marshal_flags(); }\n") + probe = self.tmp / "libprobe.so" + subprocess.run(["cc", "-shared", "-fPIC", "-nostdlib", "-o", str(probe), str(source), + "-L" + str(newer), "-l:libwayland-client.so.0", "-Wl,-rpath," + str(root)], + check=True, capture_output=True) + command = [sys.executable, "-c", + "import ctypes,sys; " + "ctypes.CDLL(sys.argv[2], mode=ctypes.RTLD_GLOBAL) if len(sys.argv) > 2 else None; " + "ctypes.CDLL(sys.argv[1]).probe()", + str(probe)] + env = {k: v for k, v in os.environ.items() if not k.startswith("LD_")} + broken = subprocess.run(command + [str(base / "libwayland-client.so.0")], env=env, capture_output=True, text=True) + self.assertNotEqual(broken.returncode, 0) + self.assertIn("undefined symbol: wl_proxy_marshal_flags", broken.stderr) + fixed = subprocess.run(command, env=env, capture_output=True, text=True) + self.assertEqual(fixed.returncode, 0, fixed.stderr) + + def test_gbm_and_its_dependencies_use_the_newer_runtime_on_both_architectures(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + names = ("libgbm.so.1", "libdrm.so.2", "libexpat.so.1") + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + for name in names: + self.write(sniper / "files/lib" / arch / name, b"old ABI") + self.write(provider / "files/lib" / arch / name, b"new ABI " + name.encode()) + fex, _ = self.quiet(FEX["prepare"]) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + for name in names: + self.assertEqual((Path(fex["rootfs"]) / "lib" / arch / name).read_bytes(), b"new ABI " + name.encode()) + + def test_gbm_requires_usable_provider_dependencies_on_both_architectures(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + for name in ("libgbm.so.1", "libdrm.so.2"): + self.write(sniper / "files/lib" / arch / name, b"base") + self.write(provider / "files/lib" / arch / name, b"provider") + os.symlink("missing-expat.so", provider / "files/lib" / arch / "libexpat.so.1") + fex, _ = self.quiet(FEX["prepare"]) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + root = Path(fex["rootfs"]) / "lib" / arch + self.assertEqual((root / "libgbm.so.1").read_bytes(), b"base") + self.assertEqual((root / "libdrm.so.2").read_bytes(), b"provider") + + @unittest.skipUnless(shutil.which("cc"), "C compiler unavailable") + def test_bundled_library_resolves_the_new_gbm_symbol(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + base = sniper / "files/lib/x86_64-linux-gnu" + newer = provider / "files/lib/x86_64-linux-gnu" + source = self.tmp / "gbm.c" + self.write(newer / "libdrm.so.2", b"drm") + self.write(newer / "libexpat.so.1", b"expat") + for folder, symbol in ((base, "gbm_bo_create_with_modifiers"), (newer, "gbm_bo_create_with_modifiers2")): + source.write_text("void *%s(void) { return 0; }\n" % symbol) + subprocess.run(["cc", "-shared", "-fPIC", "-nostdlib", "-Wl,-soname,libgbm.so.1", + "-o", str(folder / "libgbm.so.1"), str(source)], check=True, capture_output=True) + fex, _ = self.quiet(FEX["prepare"]) + root = Path(fex["rootfs"]) / "lib/x86_64-linux-gnu" + source.write_text("extern void *gbm_bo_create_with_modifiers2(void);\n" + "void *probe(void) { return gbm_bo_create_with_modifiers2(); }\n") + probe = self.tmp / "libgbmprobe.so" + subprocess.run(["cc", "-shared", "-fPIC", "-nostdlib", "-o", str(probe), str(source), + "-L" + str(newer), "-l:libgbm.so.1", "-Wl,-rpath," + str(root)], + check=True, capture_output=True) + command = [sys.executable, "-c", + "import ctypes,sys; " + "ctypes.CDLL(sys.argv[2], mode=ctypes.RTLD_GLOBAL) if len(sys.argv) > 2 else None; " + "ctypes.CDLL(sys.argv[1]).probe()", + str(probe)] + env = {k: v for k, v in os.environ.items() if not k.startswith("LD_")} + broken = subprocess.run(command + [str(base / "libgbm.so.1")], env=env, capture_output=True, text=True) + self.assertNotEqual(broken.returncode, 0) + self.assertIn("undefined symbol: gbm_bo_create_with_modifiers2", broken.stderr) + fixed = subprocess.run(command, env=env, capture_output=True, text=True) + self.assertEqual(fixed.returncode, 0, fixed.stderr) + + def test_freetype_and_dependencies_use_the_newer_runtime_on_both_architectures(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + names = ("libfreetype.so.6", "libpng16.so.16", "libbrotlidec.so.1", + "libbrotlicommon.so.1", "libbz2.so.1.0", "libz.so.1") + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + for name in names: + self.write(sniper / "files/lib" / arch / name, b"base") + self.write(provider / "files/lib" / arch / name, b"new") + fex, _ = self.quiet(FEX["prepare"]) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + for name in names: + self.assertEqual((Path(fex["rootfs"]) / "lib" / arch / name).read_bytes(), b"new") + self.assertEqual((sniper / "files/lib" / arch / name).read_bytes(), b"base") + + @unittest.skipUnless(shutil.which("cc"), "C compiler unavailable") + def test_bundled_library_resolves_the_new_freetype_symbol(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + base = sniper / "files/lib/x86_64-linux-gnu" + newer = provider / "files/lib/x86_64-linux-gnu" + source = self.tmp / "freetype.c" + for folder, symbol in ((base, "FT_Init_FreeType"), (newer, "FT_Get_Color_Glyph_Paint")): + source.write_text("void *%s(void) { return 0; }\n" % symbol) + subprocess.run(["cc", "-shared", "-fPIC", "-nostdlib", "-Wl,-soname,libfreetype.so.6", + "-o", str(folder / "libfreetype.so.6"), str(source)], check=True, capture_output=True) + fex, _ = self.quiet(FEX["prepare"]) + root = Path(fex["rootfs"]) / "lib/x86_64-linux-gnu" + source.write_text("extern void *FT_Get_Color_Glyph_Paint(void);\nvoid *probe(void) { return FT_Get_Color_Glyph_Paint(); }\n") + probe = self.tmp / "libprobe.so" + subprocess.run(["cc", "-shared", "-fPIC", "-nostdlib", "-o", str(probe), str(source), + "-L" + str(newer), "-l:libfreetype.so.6", "-Wl,-rpath," + str(root)], + check=True, capture_output=True) + command = [sys.executable, "-c", + "import ctypes,sys; " + "ctypes.CDLL(sys.argv[2], mode=ctypes.RTLD_GLOBAL) if len(sys.argv) > 2 else None; " + "ctypes.CDLL(sys.argv[1]).probe()", str(probe)] + env = {k: v for k, v in os.environ.items() if not k.startswith("LD_")} + broken = subprocess.run(command + [str(base / "libfreetype.so.6")], env=env, capture_output=True, text=True) + self.assertNotEqual(broken.returncode, 0) + self.assertIn("undefined symbol: FT_Get_Color_Glyph_Paint", broken.stderr) + fixed = subprocess.run(command, env=env, capture_output=True, text=True) + self.assertEqual(fixed.returncode, 0, fixed.stderr) + + def test_missing_freetype_provider_keeps_base_on_both_architectures(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + self.graphics(sniper) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + self.write(sniper / "files/lib" / arch / "libfreetype.so.6", b"base") + fex, _ = self.quiet(FEX["prepare"]) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + self.assertEqual((Path(fex["rootfs"]) / "lib" / arch / "libfreetype.so.6").read_bytes(), b"base") + + def test_missing_provider_libraries_keep_the_base_runtime_libraries(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + self.graphics(sniper) + base = self.write(sniper / "files/lib/x86_64-linux-gnu/libwayland-client.so.0", b"base wayland") + fex, _ = self.quiet(FEX["prepare"]) + self.assertEqual((Path(fex["rootfs"]) / "lib/x86_64-linux-gnu/libwayland-client.so.0").read_bytes(), b"base wayland") + + def test_provider_symlinks_require_existing_targets_on_both_architectures(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + base = sniper / "files/lib" / arch + newer = provider / "files/lib" / arch + self.write(base / "libwayland-client.so.0", b"base") + os.symlink("missing-client.so", newer / "libwayland-client.so.0") + os.symlink("missing-ffi.so", newer / "libffi.so.8") + self.write(newer / "wayland-server-real.so", b"provider") + os.symlink("wayland-server-real.so", newer / "libwayland-server.so.0") + fex, _ = self.quiet(FEX["prepare"]) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + root = Path(fex["rootfs"]) / "lib" / arch + self.assertEqual((root / "libwayland-client.so.0").read_bytes(), b"base") + self.assertFalse(os.path.lexists(root / "libffi.so.8")) + self.assertFalse(os.path.lexists(root / "libwayland-server.so.0")) + + def test_wayland_requires_usable_provider_ffi_on_both_architectures(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + for ffi_state in ("missing", "dangling"): + with self.subTest(ffi_state=ffi_state): + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + base = sniper / "files/lib" / arch + newer = provider / "files/lib" / arch + for name in ("libwayland-client.so.0", "libwayland-server.so.0", "libwayland-cursor.so.0"): + self.write(base / name, b"base") + self.write(newer / name, b"provider") + if ffi_state == "dangling": + os.symlink("missing-ffi.so", newer / "libffi.so.8") + marker = self.home / ".local/share/droiddeck-fex/rootfs/.droiddeck-fex" + if marker.exists(): + marker.unlink() + fex, _ = self.quiet(FEX["prepare"]) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + root = Path(fex["rootfs"]) / "lib" / arch + for name in ("libwayland-client.so.0", "libwayland-server.so.0", "libwayland-cursor.so.0"): + self.assertEqual((root / name).read_bytes(), b"base") + self.assertFalse(os.path.lexists(root / "libffi.so.8")) + + def test_wayland_cursor_requires_usable_provider_client_on_both_architectures(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + for client_state in ("missing", "dangling"): + with self.subTest(client_state=client_state): + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + base = sniper / "files/lib" / arch + newer = provider / "files/lib" / arch + self.write(base / "libwayland-client.so.0", b"base client") + self.write(base / "libwayland-cursor.so.0", b"base cursor") + self.write(newer / "libwayland-cursor.so.0", b"provider cursor") + self.write(newer / "libffi.so.8", b"provider ffi") + if client_state == "dangling": + os.symlink("missing-client.so", newer / "libwayland-client.so.0") + marker = self.home / ".local/share/droiddeck-fex/rootfs/.droiddeck-fex" + if marker.exists(): + marker.unlink() + fex, _ = self.quiet(FEX["prepare"]) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + root = Path(fex["rootfs"]) / "lib" / arch + self.assertEqual((root / "libwayland-client.so.0").read_bytes(), b"base client") + self.assertEqual((root / "libwayland-cursor.so.0").read_bytes(), b"base cursor") + self.assertEqual((root / "libffi.so.8").read_bytes(), b"provider ffi") + + def test_restored_provider_clients_rebuild_the_rootfs_without_marker_changes(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + self.write(sniper / "files/lib" / arch / "libwayland-client.so.0", b"base") + self.write(provider / "files/lib" / arch / "libffi.so.8", b"ffi") + os.symlink("client-real.so", provider / "files/lib" / arch / "libwayland-client.so.0") + fex, _ = self.quiet(FEX["prepare"]) + for arch in ("x86_64-linux-gnu", "i386-linux-gnu"): + self.assertEqual((Path(fex["rootfs"]) / "lib" / arch / "libwayland-client.so.0").read_bytes(), b"base") + self.write(provider / "files/lib" / arch / "client-real.so", b"restored") + fex, said = self.quiet(FEX["prepare"]) + self.assertIn("built the x86 runtime", said) + self.assertEqual((Path(fex["rootfs"]) / "lib" / arch / "libwayland-client.so.0").read_bytes(), b"restored") + self.assertNotIn("built the x86 runtime", self.quiet(FEX["prepare"])[1]) + client = provider / "files/lib/i386-linux-gnu/client-real.so" + client.write_bytes(b"updated client") + fex, said = self.quiet(FEX["prepare"]) + self.assertIn("built the x86 runtime", said) + self.assertEqual((Path(fex["rootfs"]) / "lib/i386-linux-gnu/libwayland-client.so.0").read_bytes(), b"updated client") + + @unittest.skipUnless(shutil.which("cc"), "C compiler unavailable") + def test_base_cursor_works_with_guest_selected_old_client(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + provider = self.graphics(sniper) + base = sniper / "files/lib/x86_64-linux-gnu" + newer = provider / "files/lib/x86_64-linux-gnu" + source = self.tmp / "cursor.c" + self.write(newer / "libffi.so.8", b"ffi") + for folder, symbol in ((base, "wl_proxy_marshal"), (newer, "wl_proxy_marshal_flags")): + source.write_text("void %s(void) {}\n" % symbol) + subprocess.run(["cc", "-shared", "-fPIC", "-nostdlib", "-Wl,-soname,libwayland-client.so.0", + "-o", str(folder / "libwayland-client.so.0"), str(source)], check=True, capture_output=True) + source.write_text("extern void %s(void); void probe(void) { %s(); }\n" % (symbol, symbol)) + subprocess.run(["cc", "-shared", "-fPIC", "-nostdlib", "-o", str(folder / "libwayland-cursor.so.0"), + str(source), "-L" + str(folder), "-l:libwayland-client.so.0"], check=True, capture_output=True) + fex, _ = self.quiet(FEX["prepare"]) + cursor = Path(fex["rootfs"]) / "lib/x86_64-linux-gnu/libwayland-cursor.so.0" + command = [sys.executable, "-c", "import ctypes,sys; ctypes.CDLL(sys.argv[1], mode=ctypes.RTLD_GLOBAL); ctypes.CDLL(sys.argv[2]).probe()", str(base / "libwayland-client.so.0")] + env = {k: v for k, v in os.environ.items() if not k.startswith("LD_")} + broken = subprocess.run(command + [str(newer / "libwayland-cursor.so.0")], env=env, capture_output=True, text=True) + self.assertNotEqual(broken.returncode, 0) + self.assertIn("undefined symbol: wl_proxy_marshal_flags", broken.stderr) + fixed = subprocess.run(command + [str(cursor)], env=env, capture_output=True, text=True) + self.assertEqual(fixed.returncode, 0, fixed.stderr) + + def test_the_old_rootfs_layout_is_rebuilt(self): + self.fex_tool() + sniper = self.runtime() + FEX["materialize"](str(sniper)) + self.graphics(sniper) + with mock.patch.dict(G, {"ROOTFS_LAYOUT": 6}): + self.quiet(FEX["prepare"]) + _, said = self.quiet(FEX["prepare"]) + self.assertIn("built the x86 runtime", said) + self.assertNotIn("built the x86 runtime", self.quiet(FEX["prepare"])[1]) + def test_the_built_x86_runtime_holds_nothing_that_leaves_it(self): self.fex_tool() sniper = self.runtime() diff --git a/tools/tests/test_fex_gl_thunk_errors.py b/tools/tests/test_fex_gl_thunk_errors.py new file mode 100644 index 0000000000..3afa881e47 --- /dev/null +++ b/tools/tests/test_fex_gl_thunk_errors.py @@ -0,0 +1,474 @@ +import os +import re +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest +from unittest import mock + +PATCH = Path(__file__).resolve().parents[1] / "fex/patches/0005-gl-thunk-forward-x-errors.patch" + + +def added(path, start, end): + text = PATCH.read_text() + section = re.search(r"^diff --git a/%s .*?(?=^diff --git |\Z)" % re.escape(path), text, re.S | re.M) + lines = [line[1:] for line in section.group(0).splitlines() if line.startswith("+") and not line.startswith("+++")] + body = "\n".join(lines) + first = body.index(start) + last = body.index(end, first) + len(end) + return body[first:last] + + +HARNESS = r""" +#include +#include +#include +#include +#include +#include +#include +#include +using guest_long = long; + +static std::mutex host_user_lock; +static std::mutex guest_user_lock; +static void guest_lock(Display*) { guest_user_lock.lock(); } +static void guest_unlock(Display*) { guest_user_lock.unlock(); } +static _XLockPtrs guest_lock_fns {guest_lock, guest_unlock}; + +struct X11Manager { + MUTEX_SOURCE + std::map<_XDisplay*, _XDisplay*> displays; + FORWARD_SOURCE + FIND_SOURCE + static XErrorHandler HostXSetErrorHandler(XErrorHandler Handler) { return XSetErrorHandler(Handler); } + static void HostXLockDisplay(Display*) { host_user_lock.lock(); } + static void HostXUnlockDisplay(Display*) { host_user_lock.unlock(); } +}; + +static X11Manager x11_manager; +static int (*pending_forward)(void*, guest_long, int, int, int); + +template +static void MakeHostTrampolineForGuestFunctionAt(uintptr_t, uintptr_t, F** Func) { *Func = pending_forward; } + +static int guest_set_calls; +#define XSetErrorHandler(h) (guest_set_calls++, ::XSetErrorHandler(h)) +GUEST_SOURCE +#undef XSetErrorHandler + +HOST_SOURCE + +static Display* app_display; +static XErrorEvent app_event; +static int app_calls; +static int app_handler(Display* display, XErrorEvent* event) { + app_display = display; + app_event = *event; + app_calls++; + return 7; +} + +static int previous_calls; +static Display* previous_display; +static int previous_handler(Display* display, XErrorEvent*) { + previous_calls++; + previous_display = display; + return 3; +} + +static int guest_forward(void* display, guest_long resourceid, int error_code, int request_code, int minor_code) { + return ForwardXError(static_cast(display), resourceid, error_code, request_code, minor_code); +} + +static _XDisplay guest_connection; + +static int raise_on_host(XErrorHandler handler, Display* display, XErrorEvent* event) { + std::lock_guard held(host_user_lock); + return handler(display, event); +} + +int main(int argc, char** argv) { + auto host = reinterpret_cast(uintptr_t {0x1000}); + auto guest = &guest_connection; + auto other = reinterpret_cast(uintptr_t {0x3000}); + guest_connection.request = 44; + guest_connection.last_request_read = 44; + guest_connection.lock_fns = &guest_lock_fns; + x11_manager.displays[guest] = host; + pending_forward = guest_forward; + XSetErrorHandler(previous_handler); + fexfn_impl_libGL_GL_SetGuestXErrorForward(0, 0); + fexfn_impl_libGL_GL_SetGuestXErrorForward(0, 0); + XErrorHandler installed = XSetErrorHandler(nullptr); + XSetErrorHandler(installed); + + XErrorEvent event {}; + event.type = 0; + event.display = host; + event.resourceid = 0xffffffff; + event.serial = 9000; + event.error_code = 163; + event.request_code = 148; + event.minor_code = 0; + + XSetErrorHandler(app_handler); + if (argc > 1 && strcmp(argv[1], "reentry") == 0) { + std::unique_lock lock(x11_manager.mutex); + int reentry = raise_on_host(installed, host, &event); + printf("reentry=%d app_calls=%d\n", reentry, app_calls); + return 0; + } + if (argc > 1 && strcmp(argv[1], "crosslock") == 0) { + host_user_lock.lock(); + std::mutex ready_lock; + std::unique_lock ready(ready_lock); + std::condition_variable guest_held; + bool held = false; + std::thread other_thread([&] { + guest_user_lock.lock(); + { + std::lock_guard notify(ready_lock); + held = true; + } + guest_held.notify_one(); + host_user_lock.lock(); + host_user_lock.unlock(); + guest_user_lock.unlock(); + }); + guest_held.wait(ready, [&] { return held; }); + ready.unlock(); + int crossed = installed(host, &event); + host_user_lock.unlock(); + other_thread.join(); + printf("crosslock=%d app_calls=%d\n", crossed, app_calls); + return 0; + } + int owned = raise_on_host(installed, host, &event); + XErrorHandler after = XSetErrorHandler(installed); + int foreign = raise_on_host(installed, other, &event); + + printf("owned=%d app_calls=%d app_display_is_guest=%d serial=%lu error=%d request=%d minor=%d resource=%lx handler_kept=%d guest_set_calls=%d\n", + owned, app_calls, app_display == guest, app_event.serial, app_event.error_code, app_event.request_code, + app_event.minor_code, app_event.resourceid, after == app_handler, guest_set_calls); + printf("foreign=%d previous_calls=%d previous_display_is_other=%d\n", foreign, previous_calls, previous_display == other); + return 0; +} +""" + + +REAL_HARNESS = r""" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +using guest_long = long; + +struct X11Manager { + MUTEX_SOURCE + std::map<_XDisplay*, _XDisplay*> displays; + FORWARD_SOURCE + FIND_SOURCE + static XErrorHandler HostXSetErrorHandler(XErrorHandler Handler) { return XSetErrorHandler(Handler); } + static void HostXLockDisplay(Display* a) { XLockDisplay(a); } + static void HostXUnlockDisplay(Display* a) { XUnlockDisplay(a); } +}; + +static X11Manager x11_manager; +static int (*pending_forward)(void*, guest_long, int, int, int); + +template +static void MakeHostTrampolineForGuestFunctionAt(uintptr_t, uintptr_t, F** Func) { *Func = pending_forward; } + +GUEST_SOURCE + +HOST_SOURCE + +static Display* host; +static Display* guest; +static std::atomic app_calls; +static std::atomic guest_calls; +static unsigned long app_serial; +static int app_error; +static int app_minor; +static std::atomic forwarding_started {false}; + +static int guest_forward(void* display, guest_long resourceid, int error_code, int request_code, int minor_code) { + forwarding_started = true; + forwarding_started.notify_one(); + return ForwardXError(static_cast(display), resourceid, error_code, request_code, minor_code); +} + +static int app_handler(Display* display, XErrorEvent* event) { + if (display == guest) { + guest_calls++; + app_serial = event->serial; + app_error = event->error_code; + app_minor = event->minor_code; + } + app_calls++; + return 0; +} + +static bool host_usable_from_other_thread() { + std::atomic done {false}; + std::thread other([&] { + XNoOp(host); + XSync(host, False); + done = true; + }); + for (int i = 0; i < 300 && !done; i++) { + usleep(10000); + } + if (!done) { + return false; + } + other.join(); + return true; +} + +int main(int argc, char** argv) { + XInitThreads(); + host = XOpenDisplay(nullptr); + guest = XOpenDisplay(nullptr); + if (!host || !guest) { + return 2; + } + x11_manager.displays[guest] = host; + pending_forward = guest_forward; + XSetErrorHandler(app_handler); + fexfn_impl_libGL_GL_SetGuestXErrorForward(0, 0); + + if (argc > 1) { + auto library = dlopen("libGL.so.1", RTLD_NOW | RTLD_LOCAL); + if (!library) { + return 3; + } + auto choose = reinterpret_cast(dlsym(library, "glXChooseFBConfig")); + auto get_proc = reinterpret_cast(dlsym(library, "glXGetProcAddressARB")); + auto query = reinterpret_cast(dlsym(library, "glXQueryExtension")); + auto destroy = reinterpret_cast(dlsym(library, "glXDestroyContext")); + if (!choose || !get_proc || !query || !destroy) { + return 4; + } + auto create = reinterpret_cast(get_proc( + reinterpret_cast("glXCreateContextAttribsARB"))); + if (!create) { + return 5; + } + int error_base, event_base, count; + if (!query(host, &error_base, &event_base)) { + return 6; + } + const int config_attribs[] = {GLX_RENDER_TYPE, GLX_RGBA_BIT, GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, None}; + auto configs = choose(host, DefaultScreen(host), config_attribs, &count); + if (!configs || count == 0) { + return 7; + } + const int supported[] = {GLX_CONTEXT_MAJOR_VERSION_ARB, 2, GLX_CONTEXT_MINOR_VERSION_ARB, 1, None}; + auto initial = create(host, configs[0], nullptr, True, supported); + if (!initial) { + return 8; + } + destroy(host, initial); + if (strcmp(argv[1], "default") == 0) { + XSetErrorHandler(nullptr); + fexfn_impl_libGL_GL_SetGuestXErrorForward(0, 0); + } + const int unsupported[] = {GLX_CONTEXT_MAJOR_VERSION_ARB, 4, GLX_CONTEXT_MINOR_VERSION_ARB, 6, None}; + auto rejected = create(host, configs[0], nullptr, True, unsupported); + XSync(host, False); + auto fallback = create(host, configs[0], nullptr, True, supported); + printf("valid_config=1 rejected=%d guest_errors=%d bad_fbconfig=%d minor_zero=%d fallback=%d\n", + rejected == nullptr, guest_calls.load(), app_error == error_base + GLXBadFBConfig, + app_minor == 0, fallback != nullptr); + if (fallback) { + destroy(host, fallback); + } + XFree(configs); + fflush(stdout); + _exit(0); + } + + std::atomic guest_held {false}; + std::atomic host_reached {false}; + std::thread contender([&] { + XLockDisplay(guest); + guest_held = true; + forwarding_started.wait(false); + XNoOp(host); + XFlush(host); + host_reached = true; + XUnlockDisplay(guest); + }); + while (!guest_held) { + usleep(1000); + } + XFreePixmap(host, 1); + XSync(host, False); + contender.join(); + bool usable = host_usable_from_other_thread(); + printf("app_calls=%d guest_calls=%d host_reached=%d usable=%d serial_from_guest=%d\n", app_calls.load(), + guest_calls.load(), host_reached.load(), usable, app_serial != 0 && app_serial <= guest->request); + fflush(stdout); + _exit(0); +} +""" + + +def compile_cpp(source, output): + return subprocess.run(["c++", "-std=c++20", "-O1", "-Wall", "-Werror", "-pthread", "-o", str(output), str(source), "-lX11"], + capture_output=True, text=True) + + +@unittest.skipUnless(shutil.which("c++"), "needs c++") +class FexGlThunkErrorForwardTest(unittest.TestCase): + HARNESS_SOURCE = HARNESS + DEPENDENCY_HEADERS = ("X11/Xlibint.h",) + + @classmethod + def setUpClass(cls): + guest = added("ThunkLibs/libGL/libGL_Guest.cpp", "static int ForwardXError(", "\n}") + host = added("ThunkLibs/libGL/libGL_Host.cpp", "static XErrorHandler HostPreviousXErrorHandler", + " HostPreviousXErrorHandler = Previous;\n }\n}") + manager = "ThunkLibs/include/common/X11Manager.h" + mutex = added(manager, "std::", " mutex;") + forward = added(manager, "int (*GuestXErrorForward)", "= nullptr;") + find = added(manager, "_XDisplay* FindGuestDisplay(", " return nullptr;\n }") + cls.tmp = Path(tempfile.mkdtemp()) + cls.addClassCleanup(shutil.rmtree, cls.tmp) + probe = cls.tmp / "probe.cpp" + probe.write_text("".join(f"#include <{header}>\n" for header in cls.DEPENDENCY_HEADERS) + + "int main() { return 0; }\n") + if compile_cpp(probe, cls.tmp / "probe").returncode != 0: + raise unittest.SkipTest("needs the native development files for this harness") + source = cls.tmp / "harness.cpp" + source.write_text(cls.HARNESS_SOURCE.replace("MUTEX_SOURCE", mutex).replace("FORWARD_SOURCE", forward) + .replace("FIND_SOURCE", find).replace("GUEST_SOURCE", guest).replace("HOST_SOURCE", host)) + cls.program = cls.tmp / "harness" + result = compile_cpp(source, cls.program) + if result.returncode != 0: + raise AssertionError(result.stderr) + + def run_harness(self, *args): + try: + result = subprocess.run([str(self.program), *args], capture_output=True, text=True, timeout=10) + except subprocess.TimeoutExpired: + self.fail("the host error handler blocked") + self.assertEqual(result.returncode, 0, result.stderr) + return result.stdout.splitlines() + + def test_error_on_a_host_display_reaches_the_programs_handler(self): + owned = self.run_harness()[0] + self.assertIn("owned=7 app_calls=1 app_display_is_guest=1", owned) + self.assertIn("error=163 request=148 minor=0 resource=ffffffff", owned) + self.assertIn("handler_kept=1", owned) + + def test_forwarded_error_carries_the_programs_own_serial(self): + self.assertIn(" serial=44 ", self.run_harness()[0]) + + def test_forwarding_never_swaps_the_programs_handler(self): + self.assertIn("guest_set_calls=0", self.run_harness()[0]) + + def test_error_while_the_display_lock_is_held_does_not_block(self): + self.assertEqual(self.run_harness("reentry"), ["reentry=7 app_calls=1"]) + + def test_error_while_another_thread_holds_the_programs_display_lock_does_not_deadlock(self): + self.assertEqual(self.run_harness("crosslock"), ["crosslock=7 app_calls=1"]) + + def test_error_on_a_display_the_gl_thunk_does_not_own_keeps_the_previous_handler(self): + self.assertEqual(self.run_harness()[1], "foreign=3 previous_calls=1 previous_display_is_other=1") + + +@unittest.skipUnless(shutil.which("c++") and shutil.which("Xvfb"), "needs c++ and Xvfb") +class FexGlThunkErrorForwardRealXlibTest(FexGlThunkErrorForwardTest): + HARNESS_SOURCE = REAL_HARNESS + DEPENDENCY_HEADERS = ("GL/glx.h", "GL/glxext.h", "X11/Xmd.h", "GL/glxproto.h", "X11/Xlibint.h") + + @classmethod + def setUpClass(cls): + super().setUpClass() + read, write = os.pipe() + cls.server = subprocess.Popen(["Xvfb", "-displayfd", str(write), "-nolisten", "tcp", "-screen", "0", "64x64x24"], + pass_fds=(write,), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + os.close(write) + with os.fdopen(read) as stream: + number = stream.readline().strip() + if not number: + cls.server.kill() + cls.server.wait() + raise unittest.SkipTest("Xvfb did not start") + cls.display = ":" + number + + @classmethod + def tearDownClass(cls): + cls.server.terminate() + cls.server.wait() + + def run_real(self, *args, expected_returncode=0): + try: + result = subprocess.run([str(self.program), *args], capture_output=True, text=True, timeout=20, + env={**os.environ, "DISPLAY": self.display, "LIBGL_ALWAYS_SOFTWARE": "1", + "MESA_GL_VERSION_OVERRIDE": "4.5"}) + except subprocess.TimeoutExpired: + self.fail("the host error handler deadlocked") + self.assertEqual(result.returncode, expected_returncode, result.stderr) + return result.stdout.strip() + + def test_real_error_reaches_the_program_while_another_thread_holds_its_display(self): + self.assertEqual(self.run_real(), + "app_calls=1 guest_calls=1 host_reached=1 usable=1 serial_from_guest=1") + + def test_valid_config_with_unsupported_version_reaches_handler_and_allows_fallback(self): + self.assertEqual(self.run_real("glx"), + "valid_config=1 rejected=1 guest_errors=1 bad_fbconfig=1 minor_zero=1 fallback=1") + + def test_program_without_error_handler_keeps_default_fatal_behavior(self): + self.run_real("default", expected_returncode=1) + + test_error_on_a_host_display_reaches_the_programs_handler = None + test_forwarded_error_carries_the_programs_own_serial = None + test_forwarding_never_swaps_the_programs_handler = None + test_error_while_the_display_lock_is_held_does_not_block = None + test_error_while_another_thread_holds_the_programs_display_lock_does_not_deadlock = None + test_error_on_a_display_the_gl_thunk_does_not_own_keeps_the_previous_handler = None + + +class FexGlThunkDependencyProbeTest(unittest.TestCase): + def test_missing_glx_headers_skip_the_real_harness(self): + def compile_without_glx(source, output): + self.assertEqual(source.name, "probe.cpp") + self.assertIn("#include ", source.read_text()) + return subprocess.CompletedProcess([], 1, "", "missing GLX headers") + + with mock.patch(__name__ + ".compile_cpp", side_effect=compile_without_glx): + try: + with self.assertRaises(unittest.SkipTest): + FexGlThunkErrorForwardRealXlibTest.setUpClass() + finally: + FexGlThunkErrorForwardRealXlibTest.doClassCleanups() + + def test_real_harness_compile_errors_are_failures(self): + results = [subprocess.CompletedProcess([], 0, "", ""), + subprocess.CompletedProcess([], 1, "", "harness compile error")] + with mock.patch(__name__ + ".compile_cpp", side_effect=results): + try: + with self.assertRaisesRegex(AssertionError, "harness compile error"): + FexGlThunkErrorForwardRealXlibTest.setUpClass() + finally: + FexGlThunkErrorForwardRealXlibTest.doClassCleanups() + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index ad81472015..ac4d5e1927 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -803,11 +803,11 @@ class GameEnvironmentTest(unittest.TestCase): config.parent.mkdir(parents=True) config.write_text(json.dumps({"version": 1, "shared": {"PROTON_USE_ARM64": "1"}, "games": {"42": {"PROTON_USE_ARM64": "0"}}})) - seen_components, seen_repair, seen_start = [], [], [] + seen_components, seen_repair, seen_start, seen_mark = [], [], [], [] globals = MODULE["main"].__globals__ stubs = { "game_gpu": lambda env: env, - "mark_install_scripts": lambda command, env: [], + "mark_install_scripts": lambda command, env: seen_mark.append(env.copy()) or [], "install_scripts_done": lambda scripts, env: False, "scripts_digest": lambda scripts: None, "win_components": lambda *args: seen_components.append(args[3]) or "", @@ -844,6 +844,15 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(["0"], [env["PROTON_USE_ARM64"] for env in seen_components]) self.assertEqual(["0"], [env["PROTON_USE_ARM64"] for env in seen_repair]) self.assertEqual(["0"], [env["PROTON_USE_ARM64"] for env in seen_start]) + self.assertEqual(["0"], [env["PROTON_USE_ARM64"] for env in seen_mark]) + seen_mark.clear() + seen_start.clear() + command[1] = "run" + with patch.dict(os.environ, environment, clear=True), patch.object(sys, "argv", ["game-env", *command]), \ + patch.dict(globals, stubs): + self.assertEqual(MODULE["main"](), 7) + self.assertEqual(["1"], [env["PROTON_USE_ARM64"] for env in seen_mark]) + self.assertEqual(["1"], [env["PROTON_USE_ARM64"] for env in seen_start]) def test_keyboard_helper_is_off_unless_steam_keyboard_or_the_user_wants_it(self): cases = ( @@ -984,6 +993,9 @@ class GameEnvironmentTest(unittest.TestCase): def test_the_install_script_evaluator_gets_its_scripts_marked_first(self): with tempfile.TemporaryDirectory() as tmp: root = Path(tmp) + (root / "files/bin-arm64").mkdir(parents=True) + (root / "files/bin-arm64/wineserver").write_text("") + (root / "files/bin-arm64/wineserver").chmod(0o755) script = root / "legacycompat/evaluatorscript_409710.vdf" script.parent.mkdir(parents=True) script.write_text("{}") @@ -991,14 +1003,140 @@ class GameEnvironmentTest(unittest.TestCase): run = MODULE["mark_install_scripts"].__globals__["subprocess"].run MODULE["mark_install_scripts"].__globals__["subprocess"].run = lambda args, **kw: calls.append((args, kw["env"])) try: - env = {"STEAM_COMPAT_CLIENT_INSTALL_PATH": str(root)} - MODULE["mark_install_scripts"](["/proton", "run", str(root / "legacycompat/iscriptevaluator.exe"), "legacycompat\\evaluatorscript_409710.vdf"], env) + env = {"STEAM_COMPAT_CLIENT_INSTALL_PATH": str(root), "STEAM_COMPAT_DATA_PATH": str(root / "compatdata/409710")} + evaluator = [str(root / "proton"), "run", str(root / "legacycompat/iscriptevaluator.exe"), "legacycompat\\evaluatorscript_409710.vdf"] + MODULE["mark_install_scripts"](evaluator, env) MODULE["mark_install_scripts"](["/proton", "waitforexitandrun", "/game/Game.exe"], env) + self.assertEqual(len(calls), 3) + self.assertEqual(calls[0][0], [str(root / "proton"), "run", "cmd.exe", "/c", "exit", "0"]) + self.assertEqual(calls[0][1], env) + self.assertEqual(calls[1][0], [str(root / "files/bin-arm64/wineserver"), "-w"]) + self.assertEqual(calls[1][1]["WINEPREFIX"], str(root / "compatdata/409710/pfx")) + self.assertEqual(calls[1][1].get("DROIDDECK_SEED_SCRIPTS"), None) + self.assertEqual(calls[2][0][1], str(root)) + self.assertEqual(calls[2][1]["DROIDDECK_SEED_SCRIPTS"], str(script)) + (root / "compatdata/409710/pfx").mkdir(parents=True) + (root / "compatdata/409710/pfx/system.reg").write_text("") + calls.clear() + MODULE["mark_install_scripts"](evaluator, env) + self.assertEqual([args[0] for args, _ in calls], [MODULE["SEED_REDISTS"]]) finally: MODULE["mark_install_scripts"].__globals__["subprocess"].run = run - self.assertEqual(len(calls), 1) - self.assertEqual(calls[0][0][1], str(root)) - self.assertEqual(calls[0][1]["DROIDDECK_SEED_SCRIPTS"], str(script)) + + def test_the_install_script_seeder_runs_when_prefix_probe_times_out(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + (root / "files/bin-arm64").mkdir(parents=True) + (root / "files/bin-arm64/wineserver").write_text("") + (root / "files/bin-arm64/wineserver").chmod(0o755) + script = root / "legacycompat/evaluatorscript_409710.vdf" + script.parent.mkdir(parents=True) + script.write_text("{}") + calls = [] + run = MODULE["mark_install_scripts"].__globals__["subprocess"].run + + def fake_run(args, **kwargs): + calls.append((args, kwargs["env"])) + if len(calls) == 1: + raise subprocess.TimeoutExpired(args, 120) + + MODULE["mark_install_scripts"].__globals__["subprocess"].run = fake_run + try: + env = {"STEAM_COMPAT_CLIENT_INSTALL_PATH": str(root), "STEAM_COMPAT_DATA_PATH": str(root / "compatdata/409710")} + MODULE["mark_install_scripts"]([str(root / "proton"), "run", str(root / "legacycompat/iscriptevaluator.exe"), "legacycompat\\evaluatorscript_409710.vdf"], env) + self.assertEqual(calls[1][0], [str(root / "files/bin-arm64/wineserver"), "-w"]) + self.assertEqual(calls[2][0][0], MODULE["SEED_REDISTS"]) + finally: + MODULE["mark_install_scripts"].__globals__["subprocess"].run = run + + def test_the_install_script_seeder_skips_failed_wineserver_waits(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + script = root / "legacycompat/evaluatorscript_409710.vdf" + script.parent.mkdir(parents=True) + script.write_text("{}") + env = {"STEAM_COMPAT_CLIENT_INSTALL_PATH": str(root), "STEAM_COMPAT_DATA_PATH": str(root / "compatdata/409710")} + evaluator = [str(root / "proton"), "run", str(root / "legacycompat/iscriptevaluator.exe"), "legacycompat\\evaluatorscript_409710.vdf"] + wineserver = str(root / "files/bin-arm64/wineserver") + run = MODULE["mark_install_scripts"].__globals__["subprocess"].run + for failure in (subprocess.TimeoutExpired([wineserver, "-w"], 120), OSError("cannot start"), + subprocess.CalledProcessError(1, [wineserver, "-w"])): + with self.subTest(failure=type(failure).__name__): + calls = [] + + def fake_run(args, **kwargs): + calls.append((args, kwargs)) + if len(calls) == 2: + self.assertTrue(kwargs["check"]) + raise failure + + MODULE["mark_install_scripts"].__globals__["subprocess"].run = fake_run + try: + self.assertEqual(MODULE["mark_install_scripts"](evaluator, env), [str(script)]) + self.assertEqual(len(calls), 2) + self.assertEqual(calls[1][0], [wineserver, "-w"]) + self.assertEqual(calls[1][1]["env"]["WINEPREFIX"], str(root / "compatdata/409710/pfx")) + finally: + MODULE["mark_install_scripts"].__globals__["subprocess"].run = run + + def run_install_marker(self, root, env): + script = root / "legacycompat/evaluatorscript_409710.vdf" + script.parent.mkdir(parents=True, exist_ok=True) + script.write_text("{}") + calls = [] + module = MODULE["mark_install_scripts"].__globals__["subprocess"] + run = module.run + module.run = lambda args, **kw: calls.append((args, kw["env"])) + try: + evaluator = [str(root / "proton"), "run", str(root / "legacycompat/iscriptevaluator.exe"), "legacycompat\\evaluatorscript_409710.vdf"] + self.assertEqual(MODULE["mark_install_scripts"](evaluator, env), [str(script)]) + finally: + module.run = run + return calls + + def test_the_install_script_wait_finds_wineserver_in_files_bin(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + (root / "files/bin").mkdir(parents=True) + (root / "files/bin/wineserver").write_text("") + (root / "files/bin/wineserver").chmod(0o755) + calls = self.run_install_marker(root, {"STEAM_COMPAT_CLIENT_INSTALL_PATH": str(root), + "STEAM_COMPAT_DATA_PATH": str(root / "compatdata/409710")}) + self.assertEqual(calls[1][0], [str(root / "files/bin/wineserver"), "-w"]) + self.assertEqual(calls[2][0][0], MODULE["SEED_REDISTS"]) + + def test_the_install_script_seeder_skips_the_probe_without_compat_data(self): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + calls = self.run_install_marker(root, {"STEAM_COMPAT_CLIENT_INSTALL_PATH": str(root)}) + self.assertEqual([args[0] for args, _ in calls], [MODULE["SEED_REDISTS"]]) + + def test_the_install_script_seeder_checks_only_the_selected_template(self): + for machine in ("aarch64", "x86_64"): + for setting in (None, "1", "0", ""): + for arm64_bin in (False, True): + for template in ("default_pfx", "default_pfx_arm64"): + with self.subTest(machine=machine, setting=setting, arm64_bin=arm64_bin, template=template): + with tempfile.TemporaryDirectory() as tmp: + root = Path(tmp) + if arm64_bin: + (root / "files/bin-arm64").mkdir(parents=True) + reg = root / "files/share" / template / "system.reg" + reg.parent.mkdir(parents=True) + reg.write_text("") + env = {"STEAM_COMPAT_CLIENT_INSTALL_PATH": str(root), + "STEAM_COMPAT_DATA_PATH": str(root / "compatdata/409710")} + if setting is not None: + env["PROTON_USE_ARM64"] = setting + before = dict(env) + with patch("platform.machine", return_value=machine): + calls = self.run_install_marker(root, env) + selected = "default_pfx_arm64" if machine == "aarch64" and arm64_bin and setting in (None, "1") else "default_pfx" + expected = [MODULE["SEED_REDISTS"]] + if template != selected: + expected = [str(root / "proton"), str(root / ("files/bin-arm64/wineserver")), *expected] + self.assertEqual([args[0] for args, _ in calls], expected) + self.assertEqual(env, before) SCRIPT = ('"evaluatorscript" { "0" { "appid" "228980" "compat_installscript" { "run process" { ' '"x64 14.28.29334.0" { "hasrunkey" "HKEY_LOCAL_MACHINE\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\CommonRedist\\\\vcredist\\\\2019" ' diff --git a/tools/tests/test_memory_pressure.py b/tools/tests/test_memory_pressure.py index 29a2008866..1005ebe4dd 100644 --- a/tools/tests/test_memory_pressure.py +++ b/tools/tests/test_memory_pressure.py @@ -170,12 +170,13 @@ _bl_game=1 _bl_tier_at=-1 _bl_tier_backoff=30 _bl_tier_pushed=0 _bl_tier_back=0 _bl_pressure_at=-1 _bl_pressure_backoff=30 _bl_packed=-1 rss=$((1536 * 1024)) swap=0 pushed=$((1024 * 1024)) alive="999 321 654" started=100 complete=1 step() { :; } +meminfo=''' + repr(str(self.root / 'meminfo')) + ''' bl_game_focused() { [ "${focused:-1}" = 1 ]; } bl_proc_start() { _bl_start=; case " $alive " in *" $1 "*) _bl_start=$started; return 0 ;; esac; return 1; } nap() { echo "nap:$1"; } bl_session_others() { _bl_session=(321 654); } bl_zram_usage() { _bl_rss=$rss _bl_anon=${anon:-$rss} _bl_swap=$swap; } -bl_zram_send() { echo "send:$1:$3"; rss=$((rss - pushed)); swap=$((swap + pushed)); _bl_pageout_complete=$complete; } +bl_zram_send() { echo "send:$1:$3"; rss=$((rss - pushed)); swap=$((swap + pushed)); next_available=${available_after:-$(( $(awk '/^MemAvailable:/ { print $2 }' "$meminfo") / 1024 + 128 ))}; sed -i "s/^MemAvailable:.*/MemAvailable: $((next_available * 1024)) kB/" "$meminfo"; _bl_pageout_complete=$complete; } ''' + functions + '\nbl_memory_read\n' + body result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) self.assertEqual(0, result.returncode, result.stderr) @@ -204,6 +205,27 @@ SECONDS=30; bl_session_pressure self.memory(total=16384, available=3072, psi='1.23') self.assertEqual(['send:1:session'], self.run_policy('bl_session_pressure')) + def test_a_fast_fall_on_a_large_device_reclaims_above_the_fixed_headroom(self): + self.memory(total=15255, available=6176) + falling = self.root / 'falling' + falling.write_text( + f'MemTotal: {15255 * 1024} kB\nMemAvailable: {5367 * 1024} kB\n' + f'SwapTotal: {8192 * 1024} kB\nSwapFree: {6144 * 1024} kB\n') + meminfo = self.root / 'meminfo' + self.assertEqual(['send:1:session'], self.run_policy( + f'cp {falling} {meminfo}\nSECONDS=5; bl_session_pressure')) + + def test_a_fall_split_across_one_second_polls_still_reclaims(self): + self.memory(total=15255, available=6300) + steps = [] + for second, available in ((5, 6100), (6, 6020), (7, 5940), (8, 5860), (9, 5780)): + sample = self.root / f'meminfo-{second}' + sample.write_text( + f'MemTotal: {15255 * 1024} kB\nMemAvailable: {available * 1024} kB\n' + f'SwapTotal: {8192 * 1024} kB\nSwapFree: {6144 * 1024} kB\n') + steps.append(f'cp {sample} {self.root / "meminfo"}; SECONDS={second}; bl_session_pressure') + self.assertEqual(['send:1:session'], self.run_policy('\n'.join(steps))) + def test_no_game_does_not_compress_the_session(self): self.assertEqual([], self.run_policy('_bl_game=0; bl_session_pressure')) @@ -297,6 +319,57 @@ echo "backoff:$_bl_tier_backoff" _bl_tier_backoff=240 _bl_tier_at=0 _bl_tier_targets=(999) _bl_tier_swaps=($((1024 * 1024))) _bl_tier_starts=(100) _bl_tier_pushed=$((1024 * 1024)) swap=0 SECONDS=240; bl_session_pressure echo "backoff:$_bl_tier_backoff" +''')) + + def test_no_gain_pageout_doubles_the_tier_wait(self): + self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session', 'backoff:120'], self.run_policy(''' +available_after=1024 +SECONDS=0; bl_session_pressure +echo "backoff:$_bl_tier_backoff" +SECONDS=30; bl_session_pressure +SECONDS=60; bl_session_pressure +echo "backoff:$_bl_tier_backoff" +''')) + + def test_meaningful_available_gain_keeps_the_tier_wait(self): + self.assertEqual(['send:1:session', 'backoff:30', 'send:1:session', 'backoff:30'], self.run_policy(''' +available_after=1300 +SECONDS=0; bl_session_pressure +echo "backoff:$_bl_tier_backoff" +available_after=1600 +SECONDS=30; bl_session_pressure +echo "backoff:$_bl_tier_backoff" +''')) + + def test_recovered_available_memory_resets_the_tier_wait(self): + self.assertEqual(['send:1:session', 'backoff:60', 'backoff:30', 'send:1:session'], self.run_policy(''' +available_after=1024 +SECONDS=0; bl_session_pressure +echo "backoff:$_bl_tier_backoff" +available_after=2000 +sed -i "s/^MemAvailable:.*/MemAvailable: 2048000 kB/" "$meminfo" +SECONDS=30; bl_session_pressure +echo "backoff:$_bl_tier_backoff" +available_after=1024 +sed -i "s/^MemAvailable:.*/MemAvailable: 1048576 kB/" "$meminfo" +SECONDS=60; bl_session_pressure +''')) + + def test_critical_memory_still_compresses_after_a_no_gain_pass(self): + self.memory(available=512) + self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' +available_after=512 +SECONDS=0; bl_session_pressure +SECONDS=30; bl_session_pressure +''')) + + def test_a_no_gain_pass_still_skips_memory_the_game_read_back(self): + self.memory(available=512) + self.assertEqual(['send:1:session'], self.run_policy(''' +available_after=512 +SECONDS=0; bl_session_pressure +swap=0 +SECONDS=30; bl_session_pressure ''')) def test_nearly_out_of_memory_ignores_the_backoff_but_keeps_30_seconds(self): @@ -405,6 +478,23 @@ echo "targets:${_bl_tier_targets[*]}" alive="999 1234" SECONDS=30; bl_session_pressure echo "backoff:$_bl_tier_backoff" +''')) + + def test_read_back_wait_holds_above_the_critical_level(self): + self.assertEqual(['send:1:session', 't:60', 'send:1:session'], self.run_policy(''' +SECONDS=0; bl_session_pressure +swap=0 +SECONDS=30; bl_session_pressure +SECONDS=60; bl_session_pressure; echo t:60 +SECONDS=90; bl_session_pressure +''')) + + def test_a_no_gain_pageout_preserves_client_timestamps(self): + self.assertEqual(['send:1:session', 'backoff:60', 'client:-1:-1'], self.run_policy(''' +available_after=1024 +SECONDS=0; bl_session_pressure +echo "backoff:$_bl_tier_backoff" +echo "client:$_bl_pressure_at:$_bl_packed" ''')) def test_an_incomplete_pageout_does_not_restart_the_launcher_wait(self): @@ -455,7 +545,7 @@ class ReclaimDispatchTest(unittest.TestCase): source = source.replace('/tmp/.bl-zram', str(root / 'ctl')) monitor = SCRIPT.read_text() start = monitor.index(' _bl_preserved_growth=$_bl_growth', monitor.index('while kill -0 $$')) - stop = monitor.index(' if [ "$_bl_game" = 1 ] && bl_game_focused', start) + stop = monitor.index(' _bl_focus=1\n', start) cycle = monitor[start:stop] if body is None else body script = f''' set -u diff --git a/tools/tests/test_native_hook_proc_exe.py b/tools/tests/test_native_hook_proc_exe.py new file mode 100644 index 0000000000..fdf6e615ab --- /dev/null +++ b/tools/tests/test_native_hook_proc_exe.py @@ -0,0 +1,127 @@ +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +from tools.tests.test_usr2_preload import runner + +HOOK_BUILD = Path(__file__).resolve().parents[1] / "nativeguest/build.sh" + +PROBE = r""" +#include +#include +#include +#include + +int main(int argc, char **argv) { + for (int i = 1; i < argc; i++) { + char buf[4096]; + ssize_t n; + if (strncmp(argv[i], "at:", 3) == 0) { + int dfd = open(argv[i] + 3, O_RDONLY | O_DIRECTORY); + n = dfd >= 0 ? readlinkat(dfd, "exe", buf, sizeof(buf) - 1) : -1; + if (dfd >= 0) close(dfd); + } else { + n = readlink(argv[i], buf, sizeof(buf) - 1); + } + buf[n > 0 ? n : 0] = 0; + printf("%s\t%s\n", argv[i], n > 0 ? buf : "-"); + } + return 0; +} +""" + +SLEEPER = r""" +#include +#include +int main(void) { puts("ready"); fflush(stdout); sleep(60); return 0; } +""" + + +class NativeHookProcExeTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.cc, cls.prefix = runner() + if cls.cc is None: + raise unittest.SkipTest("no aarch64 compiler and runner") + cls.tmp = tempfile.TemporaryDirectory() + tmp = Path(cls.tmp.name) + cls.hook = tmp / "hook.so" + subprocess.run(["bash", str(HOOK_BUILD), str(cls.hook), cls.cc], check=True, capture_output=True) + for name, source in (("probe", PROBE), ("sleeper", SLEEPER)): + (tmp / f"{name}.c").write_text(source) + subprocess.run([cls.cc, "-O1", "-o", str(tmp / name), str(tmp / f"{name}.c")], check=True) + cls.root = tmp / "root" + (cls.root / "usr/bin").mkdir(parents=True) + cls.kwin = cls.root / "usr/bin/kwin_wayland" + shutil.copy(tmp / "sleeper", cls.kwin) + # The child's /proc//exe must name the loader, as DroidDeck's libddexec.so does. + cls.loader = tmp / "lib/libddexec.so" + cls.loader.parent.mkdir() + if cls.prefix: + shutil.copy(shutil.which(cls.prefix[0]), cls.loader) + cls.loader_args = list(cls.prefix[1:]) + else: + ld = next(p for p in ("/lib/ld-linux-aarch64.so.1", "/lib64/ld-linux-aarch64.so.1") if os.path.exists(p)) + shutil.copy(ld, cls.loader) + cls.loader_args = [] + + @classmethod + def tearDownClass(cls): + cls.tmp.cleanup() + + def start(self, loader, real_exe=None, program=None): + env = {k: v for k, v in os.environ.items() if k not in ("LD_PRELOAD", "DDNATV_REAL_EXE")} + if real_exe: + env["DDNATV_REAL_EXE"] = real_exe + program = program or Path(self.tmp.name) / "sleeper" + cmd = ([str(self.loader), *self.loader_args] if loader else list(self.prefix)) + [str(program)] + child = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE, text=True) + self.addCleanup(child.stdout.close) + self.addCleanup(child.wait) + self.addCleanup(child.kill) + self.assertEqual("ready", child.stdout.readline().strip()) + return child.pid + + def readlink(self, *paths): + hook_env = {"DDNATV_ROOT": str(self.root), "LD_PRELOAD": str(self.hook)} + env = {k: v for k, v in os.environ.items() if k != "LD_PRELOAD"} + if self.prefix: + cmd = list(self.prefix) + [arg for key, value in hook_env.items() for arg in ("-E", f"{key}={value}")] + else: + cmd = [] + env.update(hook_env) + out = subprocess.run(cmd + [str(Path(self.tmp.name) / "probe"), *paths], env=env, capture_output=True, + text=True, timeout=120) + self.assertEqual(out.returncode, 0, out.stderr) + return {line.split("\t")[0]: line.split("\t")[1] for line in out.stdout.splitlines()} + + def test_another_guest_program_names_the_program_its_loader_runs(self): + pid = self.start(loader=True, real_exe=str(self.kwin), program=self.kwin) + link = f"/proc/{pid}/exe" + self.assertEqual("/usr/bin/kwin_wayland", self.readlink(link)[link]) + + def test_a_descriptor_for_the_process_directory_gives_the_same_program(self): + pid = self.start(loader=True, real_exe=str(self.kwin), program=self.kwin) + at = f"at:/proc/{pid}" + self.assertEqual("/usr/bin/kwin_wayland", self.readlink(at)[at]) + + def test_a_program_named_only_in_the_environment_is_not_believed(self): + pid = self.start(loader=True, real_exe=str(self.kwin)) + link = f"/proc/{pid}/exe" + self.assertEqual(os.readlink(link), self.readlink(link)[link]) + + def test_a_process_not_started_by_the_loader_is_unchanged(self): + pid = self.start(loader=False, real_exe=str(self.kwin)) + link = f"/proc/{pid}/exe" + self.assertEqual(os.readlink(link), self.readlink(link)[link]) + + def test_a_loader_without_a_known_program_keeps_the_kernel_link(self): + pid = self.start(loader=True) + link = f"/proc/{pid}/exe" + self.assertEqual(os.readlink(link), self.readlink(link)[link]) + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_noexec_preload.py b/tools/tests/test_noexec_preload.py index 6b220fa20f..29cf383bc5 100644 --- a/tools/tests/test_noexec_preload.py +++ b/tools/tests/test_noexec_preload.py @@ -127,12 +127,14 @@ static void mapping(void *addr, char *out) { fclose(maps); } int main(int argc, char **argv) { - if (argc != 2) return 2; + if (argc < 2) return 2; + int anonymous = argc > 2; size_t page = sysconf(_SC_PAGESIZE); int fd = open(argv[1], O_RDONLY); - char *addr = mmap(NULL, page * 2, PROT_NONE, MAP_PRIVATE, fd, 0); - if (addr == MAP_FAILED || mmap(addr + page, page, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0) != addr + page) return 3; + char *addr = anonymous ? mmap(NULL, page * 2, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0) + : mmap(NULL, page * 2, PROT_NONE, MAP_PRIVATE, fd, 0); + if (addr == MAP_FAILED || (!anonymous && mmap(addr + page, page, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0) != addr + page)) return 3; addr[page] = 73; char before[1024], after[1024], tail_before[1024], tail_after[1024]; mapping(addr, before); @@ -214,6 +216,12 @@ class NoexecPreloadTest(unittest.TestCase): capture_output=True, text=True, check=True) self.assertEqual(result.stdout.strip(), "result -1 13 preserved 1 1 tail 73 calls 0 0 1") + def test_anonymous_memory_is_never_replaced(self): + env = dict(os.environ, LD_PRELOAD=f"{self.lib}:{self.failures}", ALLOW_FIXED="1") + result = subprocess.run([str(self.tmp / "failure_image"), str(self.code), "anonymous"], env=env, + capture_output=True, text=True, check=True) + self.assertEqual(result.stdout.strip(), "result -1 13 preserved 1 1 tail 73 calls 0 0 1") + @unittest.skipUnless(platform.machine() in RETURN_42, "needs a known host instruction set") def test_replacement_installs_executable_pages_without_final_mprotect(self): env = dict(os.environ, LD_PRELOAD=f"{self.lib}:{self.failures}", ALLOW_FIXED="1") diff --git a/tools/tests/test_steam_adopt.py b/tools/tests/test_steam_adopt.py new file mode 100644 index 0000000000..71f1ead653 --- /dev/null +++ b/tools/tests/test_steam_adopt.py @@ -0,0 +1,147 @@ +import importlib.machinery +import importlib.util +import runpy +import tempfile +import unittest +from pathlib import Path +from unittest.mock import patch + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +APPINFO = runpy.run_path(str(Path(__file__).with_name("test_droiddeck_fex.py")))["AppInfoTest"].appinfo + + +def load(name): + loader = importlib.machinery.SourceFileLoader(name.replace("-", "_"), str(BIN / name)) + spec = importlib.util.spec_from_loader(loader.name, loader) + module = importlib.util.module_from_spec(spec) + loader.exec_module(module) + return module + + +library = load("droiddeck-steam-library") + + +def record(kind, installdir, name): + return {"common": {"type": kind, "name": name}, "config": {"installdir": installdir}} + + +class AdoptTest(unittest.TestCase): + def setUp(self): + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + root = Path(temp.name) + self.steam = root / "Steam" + self.card = root / "card" + self.common = self.card / "steamapps/common" + self.common.mkdir(parents=True) + (self.steam / "appcache").mkdir(parents=True) + (self.steam / "steamapps").mkdir() + self.write_info({ + 10: record("Game", "Alpha", 'Alpha "Deluxe"'), + 20: record("Game", "Beta", "Beta"), + 30: record("Tool", "Proton Thing", "Proton Thing"), + 40: record("Game", "Shared", "Shared Game"), + 41: record("Demo", "Shared", "Shared Demo"), + 50: record("Game", "Twin", "Twin One"), + 51: record("Game", "Twin", "Twin Two"), + }) + for patcher in (patch.object(library, "BIN_DIR", str(BIN)), + patch("builtins.print")): + patcher.start() + self.addCleanup(patcher.stop) + + def write_info(self, apps): + (self.steam / "appcache/appinfo.vdf").write_bytes(APPINFO(apps)) + + def folder(self, name, files=("data.bin",)): + path = self.common / name + path.mkdir(parents=True, exist_ok=True) + for f in files: + (path / f).write_text("x") + + def manifest(self, app, root=None): + return (root or self.card) / ("steamapps/appmanifest_%s.acf" % app) + + def adopt(self): + return library.adopt(str(self.steam), str(self.card)) + + def test_matched_folder_gets_a_validating_manifest(self): + self.folder("Alpha") + self.assertEqual(self.adopt(), 1) + text = self.manifest(10).read_text() + for line in ('"appid" "10"', '"Universe" "1"', '"StateFlags" "4"', '"installdir" "Alpha"', + '"name" "Alpha \\"Deluxe\\""', '"AutoUpdateBehavior" "1"'): + self.assertIn(line, text) + self.assertNotIn("buildid", text) + self.assertNotIn("InstalledDepots", text) + + def test_existing_manifest_is_untouched(self): + self.folder("Alpha") + self.manifest(10).write_text("mine") + self.assertEqual(self.adopt(), 0) + self.assertEqual(self.manifest(10).read_text(), "mine") + + def test_unmatched_empty_and_hidden_folders_are_skipped(self): + self.folder("Unknown") + self.folder(".hidden") + (self.common / "Beta").mkdir() + (self.common / "file.txt").write_text("x") + self.assertEqual(self.adopt(), 0) + self.assertEqual(list((self.card / "steamapps").glob("appmanifest_*")), []) + + def test_unreadable_game_folder_is_skipped_without_aborting(self): + self.folder("Unreadable") + real = library.os.scandir + + def scandir(path): + if str(path).endswith("Unreadable"): + raise PermissionError(path) + return real(path) + + with patch.object(library.os, "scandir", scandir): + self.assertEqual(library.adoptable(str(self.card), set()), []) + + def test_tool_type_app_is_skipped(self): + self.folder("Proton Thing") + self.assertEqual(self.adopt(), 0) + self.assertFalse(self.manifest(30).exists()) + + def test_game_wins_over_demo_and_ambiguous_games_are_skipped(self): + self.folder("Shared") + self.folder("Twin") + self.assertEqual(self.adopt(), 1) + self.assertTrue(self.manifest(40).exists()) + self.assertFalse(self.manifest(41).exists()) + self.assertFalse(self.manifest(50).exists() or self.manifest(51).exists()) + + def test_app_installed_in_another_library_is_left_alone(self): + self.folder("Alpha") + other = self.steam / "steamapps/appmanifest_10.acf" + other.write_text('"AppState"\n{\n\t"appid"\t"10"\n\t"installdir"\t"Elsewhere"\n}\n') + self.assertEqual(self.adopt(), 0) + self.assertFalse(self.manifest(10).exists()) + self.assertEqual(len(list(self.steam.glob("steamapps/appmanifest_*"))), 1) + + def test_adoption_is_idempotent_and_only_touches_the_given_library(self): + self.folder("Alpha") + self.folder("Beta") + self.assertEqual(self.adopt(), 2) + first = {n: self.manifest(n).read_text() for n in (10, 20)} + self.assertEqual(self.adopt(), 0) + self.assertEqual({n: self.manifest(n).read_text() for n in (10, 20)}, first) + self.assertEqual(list(self.steam.glob("steamapps/appmanifest_*")), []) + + def test_main_adopts_every_registered_library(self): + self.folder("Beta") + listing = self.steam.parent / "libraries.json" + listing.write_text('[{"path": "%s", "label": "SD Card"}]' % self.card) + with patch.dict("os.environ", {"BL_STEAM_LIBRARIES": str(listing)}), \ + patch("sys.argv", ["droiddeck-steam-library", str(self.steam)]): + library.main() + self.assertTrue(self.manifest(20).exists()) + self.assertIn(str(self.card), (self.steam / "steamapps/libraryfolders.vdf").read_text()) + self.assertIn('"20"', (self.steam / "steamapps/libraryfolders.vdf").read_text()) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_steam_games.py b/tools/tests/test_steam_games.py index 13235e68b4..08ffc90935 100644 --- a/tools/tests/test_steam_games.py +++ b/tools/tests/test_steam_games.py @@ -5,6 +5,7 @@ import os from pathlib import Path import shutil import subprocess +import runpy import tempfile import unittest import zlib @@ -26,6 +27,15 @@ shortcuts = load('droiddeck-steam-shortcuts') library = load('droiddeck-steam-library') +class ManifestTextTest(unittest.TestCase): + def test_minimal_and_bare_text_is_exact(self): + build = runpy.run_path(str(BIN / 'steam-compatibility'))['manifest_text'] + minimal = ('"AppState"\n{\n "appid" "7"\n "Universe" "1"\n "name" "A \\"B\\" C D"\n' + ' "StateFlags" "4"\n "installdir" "DroidDeck-7"\n}\n') + self.assertEqual(minimal, build(7, 'A "B"\nC\rD', 'DroidDeck-7')) + self.assertEqual(minimal[:-2] + ' "AutoUpdateBehavior" "1"\n}\n', build(7, 'A "B"\nC\rD', 'DroidDeck-7', True)) + + class ImportsTest(unittest.TestCase): def setUp(self): self.temp = tempfile.TemporaryDirectory() diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index 36a1b7c9a1..ce7c33e305 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -1,6 +1,8 @@ import importlib.machinery import importlib.util import json +import shlex +import subprocess import os from pathlib import Path import tempfile @@ -317,6 +319,33 @@ class Launchers(unittest.TestCase): self.assertIn('bl_store_launch() {', compat.BL_STORE_SETUP) self.assertIn('waitforexitandrun', compat.BL_STORE_SETUP) + def run_store_game(self, game, store_exit=True): + with tempfile.TemporaryDirectory() as root: + hook = Path(root) / 'hook' + record = Path(root) / 'exited' + hook.write_text('#!/bin/sh\necho "$@" > "%s"\n' % record) + hook.chmod(0o755) + setup = compat.BL_STORE_SETUP.replace('/usr/local/bin/droiddeck-store-launch --exited', str(hook) + ' --exited') + script = setup + '\nBL_STORE_ARGS=(game.bat)\n%sbl_run sh -c %s\nexit 99\n' % ( + 'BL_STORE_EXIT=1\n' if store_exit else '', shlex.quote(game)) + done = subprocess.run(['bash', '-c', script], start_new_session=True, timeout=20) + return done.returncode, record.read_text().split() if record.exists() else None + + def test_a_store_game_ended_by_a_group_signal_still_reports_its_exit(self): + for signal_name, code in (('INT', '130'), ('TERM', '143'), ('HUP', '129')): + rc, hook = self.run_store_game('kill -%s 0; sleep 5' % signal_name) + self.assertEqual(['--exited', '--code', code, 'game.bat'], hook, signal_name) + self.assertEqual(int(code), rc, signal_name) + + def test_a_store_game_that_exits_by_itself_reports_its_code_once(self): + self.assertEqual((3, ['--exited', '--code', '3', 'game.bat']), self.run_store_game('exit 3')) + + def test_other_games_still_replace_the_wrapper_without_the_exit_hook(self): + self.assertEqual((4, None), self.run_store_game('exit 4', store_exit=False)) + rc, hook = self.run_store_game('kill -INT 0; sleep 5', store_exit=False) + self.assertIsNone(hook) + self.assertEqual(-2, rc) + if __name__ == '__main__': unittest.main() diff --git a/tools/tests/test_store_launch_rockstar.py b/tools/tests/test_store_launch_rockstar.py index fe7d808f2a..e17fa7b30b 100644 --- a/tools/tests/test_store_launch_rockstar.py +++ b/tools/tests/test_store_launch_rockstar.py @@ -6,7 +6,7 @@ import time import unittest from unittest.mock import patch -from test_store_launch import store +from test_store_launch import game, store class RockstarLaunch(unittest.TestCase): @@ -217,6 +217,70 @@ class RockstarLaunch(unittest.TestCase): self.assertEqual([], requests) self.assertFalse(config.exists()) + def test_each_launch_starts_a_fresh_launcher_log(self): + with tempfile.TemporaryDirectory() as root: + stale = [] + + def ask(channel, request, timeout): + stale.append((config.parent / 'launcher.log').exists()) + return answer + + folder, sidecar, prefix, service, answer = self.setup_game(root) + config = prefix / 'pfx' / store.ROCKSTAR_FOLDER / 'launch.json' + config.parent.mkdir(parents=True) + (config.parent / 'launcher.log').write_bytes(b'x' * 70000) + with patch.object(store, 'ROCKSTAR_SERVICE', service), patch.object(store, 'rockstar_registry', return_value=True): + result = store.prepare_rockstar(folder, sidecar, str(prefix), str(Path(root) / 'channel'), ask_app=ask) + self.assertEqual('ready', result) + self.assertEqual([False], stale) + + def exit_game(self, root, store_id, log_text=None, link=None): + folder = game(root, store_id=store_id, ident='gta5') + prefix = Path(root) / 'prefix' + target = prefix / 'pfx' / store.ROCKSTAR_FOLDER + target.mkdir(parents=True) + if log_text is not None: + (target / 'launcher.log').write_text(log_text) + if link is not None: + (target / 'launcher.log').symlink_to(link) + lines = [] + with patch.dict(os.environ, {'BL_LAUNCH_DIR': str(Path(root) / 'session'), 'STEAM_COMPAT_DATA_PATH': str(prefix)}), \ + patch.object(store, 'ask', return_value={'ok': True}), patch.object(store, 'log', lines.append): + self.assertEqual(0, store.main(['--exited', str(folder / '.droiddeck-launch.bat')])) + return lines, target / 'launcher.log' + + def test_launcher_log_reaches_the_session_log_when_the_game_exits(self): + with tempfile.TemporaryDirectory() as root: + text = 'launch handoff accepted\r\nlauncher pipes created, identity: none\r\n\r\ngame exited with code 0\r\n' + lines, path = self.exit_game(root, 'rockstar', log_text=text) + self.assertEqual(['rockstar launcher: launch handoff accepted', + 'rockstar launcher: launcher pipes created, identity: none', + 'rockstar launcher: game exited with code 0'], lines) + self.assertFalse(path.exists()) + + def test_launcher_log_relay_does_not_follow_links(self): + with tempfile.TemporaryDirectory() as root: + outside = Path(root) / 'outside.txt' + outside.write_text('private\n') + lines, path = self.exit_game(root, 'rockstar', link=outside) + self.assertEqual([], lines) + self.assertTrue(path.is_symlink()) + self.assertEqual('private\n', outside.read_text()) + + def test_other_stores_do_not_relay_the_launcher_log(self): + with tempfile.TemporaryDirectory() as root: + lines, path = self.exit_game(root, 'gog', log_text='launch handoff accepted\n') + self.assertFalse(any(line.startswith('rockstar launcher:') for line in lines)) + self.assertTrue(path.exists()) + + def test_relay_is_bounded(self): + with tempfile.TemporaryDirectory() as root: + prefix = Path(root) / 'prefix' + target = prefix / 'pfx' / store.ROCKSTAR_FOLDER + target.mkdir(parents=True) + (target / 'launcher.log').write_text('a' * 10 + '\n' + 'b' * 100 + '\n') + self.assertEqual(['a' * 10, 'b' * 5], store.rockstar_launcher_log(str(prefix), limit=16)) + def test_writes_both_registry_views_and_escapes_values(self): with tempfile.TemporaryDirectory() as root: folder, _, prefix, _, _ = self.setup_game(root) diff --git a/tools/tests/test_validate_apk.py b/tools/tests/test_validate_apk.py index 7bacefe74d..707779a9f6 100644 --- a/tools/tests/test_validate_apk.py +++ b/tools/tests/test_validate_apk.py @@ -130,3 +130,41 @@ class ValidateApkTest(unittest.TestCase): self.git("commit", "-qm", "Rename source") with contextlib.chdir(self.root): self.assertFalse(validate_apk.documentation_only(self.git("rev-parse", "HEAD"))) + + +class RateLimitTest(unittest.TestCase): + def call(self, results): + replies = list(results) + runs = [] + + def run(args, **kwargs): + runs.append(args) + code, out, err = replies.pop(0) + return subprocess.CompletedProcess(args, code, out, err) + + with patch.object(validate_apk.subprocess, "run", side_effect=run), \ + patch.object(validate_apk, "rate_limit_wait", return_value=7), \ + patch.object(validate_apk.time, "sleep") as sleep, \ + contextlib.redirect_stderr(open(os.devnull, "w")): + try: + return validate_apk.api("repos/x/pulls/1"), runs, sleep + except subprocess.CalledProcessError as error: + return error, runs, sleep + + def test_waits_for_the_rate_limit_then_retries(self): + result, runs, sleep = self.call([(1, "", "gh: API rate limit exceeded for installation."), (0, '{"number": 1}', "")]) + self.assertEqual(result, {"number": 1}) + self.assertEqual(len(runs), 2) + sleep.assert_called_once_with(7) + + def test_other_errors_fail_without_waiting(self): + result, runs, sleep = self.call([(1, "", "gh: Not Found (HTTP 404)")]) + self.assertIsInstance(result, subprocess.CalledProcessError) + self.assertEqual(len(runs), 1) + sleep.assert_not_called() + + def test_gives_up_after_the_last_attempt(self): + result, runs, sleep = self.call([(1, "", "API rate limit exceeded")] * 3) + self.assertIsInstance(result, subprocess.CalledProcessError) + self.assertEqual(len(runs), 3) + self.assertEqual(sleep.call_count, 2) diff --git a/tools/tests/test_vk_terminal_callers.py b/tools/tests/test_vk_terminal_callers.py index f0c7294ca2..582a6d84f5 100644 --- a/tools/tests/test_vk_terminal_callers.py +++ b/tools/tests/test_vk_terminal_callers.py @@ -90,7 +90,7 @@ int __android_log_print(int, const char *, const char *, ...); built = subprocess.run([cc, '-std=c11', '-Wall', '-Wextra', '-Werror', '-Wno-unused-parameter', '-Wno-missing-field-initializers', '-UNDEBUG', '-I', str(tmp), '-idirafter', str(headers), '-I', str(SOURCE.parent), - str(probe), '-pthread', '-o', str(cls.binary)], + str(probe), '-pthread', '-lm', '-o', str(cls.binary)], capture_output=True, text=True) if built.returncode: raise AssertionError(built.stdout + built.stderr) diff --git a/tools/tests/test_zram_preload.py b/tools/tests/test_zram_preload.py index 88d5c73020..59bc500ee4 100644 --- a/tools/tests/test_zram_preload.py +++ b/tools/tests/test_zram_preload.py @@ -1,5 +1,6 @@ import os from pathlib import Path +import signal import shutil import subprocess import tempfile @@ -9,6 +10,7 @@ PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" PROGRAM = r""" #define _GNU_SOURCE +#include #include #include #include @@ -17,12 +19,36 @@ PROGRAM = r""" #include #include #include +#include +#include +#include #include static const char *ctl; static size_t size, page; static volatile int stop; static unsigned char *shared; +static volatile sig_atomic_t urg_tid; +static volatile sig_atomic_t usr_tid; +static int urg_count, usr_count; +static int worker_tid; +static int worker_delivery; + +_Static_assert(__atomic_always_lock_free(sizeof(int), 0), "signal state must be lock-free"); + +static void signal_tid(int sig) { + sig_atomic_t tid = (sig_atomic_t)syscall(SYS_gettid); + if (tid == __atomic_load_n(&worker_tid, __ATOMIC_RELAXED)) + __atomic_store_n(&worker_delivery, 1, __ATOMIC_RELAXED); + if (sig == SIGURG) { + __atomic_store_n(&urg_tid, tid, __ATOMIC_RELAXED); + __atomic_add_fetch(&urg_count, 1, __ATOMIC_RELEASE); + } + if (sig == SIGUSR1) { + __atomic_store_n(&usr_tid, tid, __ATOMIC_RELAXED); + __atomic_add_fetch(&usr_count, 1, __ATOMIC_RELEASE); + } +} static long status(const char *key) { FILE *f = fopen("/proc/self/status", "r"); @@ -34,13 +60,37 @@ static long status(const char *key) { return v; } -static void request(char mode) { +static void send_request(char mode) { int fd = open(ctl, O_WRONLY | O_TRUNC); if (fd < 0 || write(fd, &mode, 1) != 1) exit(3); close(fd); kill(getpid(), SIGURG); } +static void wait_ack(void) { + char ack[256]; + snprintf(ack, sizeof(ack), "%s.ack.%d", ctl, getpid()); + for (int i = 0; i < 1200; i++) { + FILE *f = fopen(ack, "r"); + int done = 0; + if (f) { + done = fgetc(f) == '1'; + fclose(f); + } + if (done) return; + usleep(10000); + } + exit(5); +} + +static void request(char mode) { + send_request(mode); + if (mode == '1') { + wait_ack(); + } + usleep(1000000); +} + static uint64_t sum(const unsigned char *p, size_t n) { uint64_t s = 0; for (size_t i = 0; i < n; i += 64) s = s * 31 + p[i]; @@ -77,6 +127,106 @@ int main(int argc, char **argv) { sigaction(SIGURG, NULL, &sa); printf("handler %d\n", (sa.sa_flags & SA_SIGINFO) ? 1 : 0); if (argc > 4) { + if (!strcmp(argv[4], "signals")) { + struct sigaction signal_action; + memset(&signal_action, 0, sizeof(signal_action)); + signal_action.sa_handler = signal_tid; + sigemptyset(&signal_action.sa_mask); + sigaction(SIGURG, &signal_action, NULL); + sigaction(SIGUSR1, &signal_action, NULL); + printf("ready %d\n", getpid()); + fflush(stdout); + int id; + if (scanf("%d", &id) != 1) return 10; + __atomic_store_n(&worker_tid, id, __ATOMIC_RELAXED); + printf("armed 1\n"); + fflush(stdout); + for (int round = 1; round <= 100; round++) { + int i; + for (i = 0; i < 5000 && + (__atomic_load_n(&urg_count, __ATOMIC_ACQUIRE) < round || + __atomic_load_n(&usr_count, __ATOMIC_ACQUIRE) < round); i++) usleep(1000); + if (i == 5000) return 11; + printf("received %d\n", round); + fflush(stdout); + } + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + printf("urg %d\n", __atomic_load_n(&urg_tid, __ATOMIC_RELAXED)); + printf("usr %d\n", __atomic_load_n(&usr_tid, __ATOMIC_RELAXED)); + printf("worker %d\n", __atomic_load_n(&worker_delivery, __ATOMIC_RELAXED)); + return 0; + } else if (!strcmp(argv[4], "fork")) { + pid_t child = fork(); + if (child < 0) exit(6); + if (child == 0) { + request('0'); + request('1'); + _exit(0); + } + int status_code; + waitpid(child, &status_code, 0); + printf("childack %d\n", WIFEXITED(status_code) && WEXITSTATUS(status_code) == 0); + } else if (!strcmp(argv[4], "burst")) { + send_request('0'); + usleep(10000); + send_request('1'); + wait_ack(); + printf("burstack 1\n"); + } else if (!strcmp(argv[4], "timed-inline") || !strcmp(argv[4], "timed-inline-single")) { + pid_t child = fork(); + if (child < 0) exit(8); + if (child == 0) { + if (!strcmp(argv[4], "timed-inline-single")) { + if (munmap(data, size) || munmap(shared, size)) _exit(12); + data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + shared = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (data == MAP_FAILED || shared == MAP_FAILED) _exit(13); + for (size_t i = 0; i < size; i++) data[i] = (unsigned char)(i * 7 + i / 4096); + memset(shared, 0, size); + } + struct timespec start, end; + int fd = open(ctl, O_WRONLY | O_TRUNC); + if (fd < 0 || write(fd, "1", 1) != 1) _exit(9); + close(fd); + clock_gettime(CLOCK_MONOTONIC, &start); + int requests = !strcmp(argv[4], "timed-inline-single") ? 1 : 64; + for (int i = 0; i < requests; i++) { + send_request('1'); + } + clock_gettime(CLOCK_MONOTONIC, &end); + long elapsed = (end.tv_sec - start.tv_sec) * 1000L + + (end.tv_nsec - start.tv_nsec) / 1000000L; + printf("inline %ld\n", elapsed); + printf("inline_swap %ld\n", status("VmSwap:")); + fflush(stdout); + _exit(0); + } + int status_code; + if (waitpid(child, &status_code, 0) != child || !WIFEXITED(status_code) || WEXITSTATUS(status_code)) exit(14); + } else if (!strcmp(argv[4], "timed")) { + struct timespec previous, current, deadline; + long max_gap = 0; + int fd = open(ctl, O_WRONLY | O_TRUNC); + if (fd < 0 || write(fd, "1", 1) != 1) exit(7); + close(fd); + clock_gettime(CLOCK_MONOTONIC, &previous); + kill(getpid(), SIGURG); + deadline = previous; + deadline.tv_sec += 1; + for (;;) { + clock_gettime(CLOCK_MONOTONIC, ¤t); + long gap = (current.tv_sec - previous.tv_sec) * 1000L + + (current.tv_nsec - previous.tv_nsec) / 1000000L; + if (gap > max_gap) max_gap = gap; + previous = current; + if (current.tv_sec > deadline.tv_sec || + (current.tv_sec == deadline.tv_sec && current.tv_nsec >= deadline.tv_nsec)) break; + } + wait_ack(); + printf("gap %ld\n", max_gap); + printf("out %ld\n", status("VmSwap:")); + } else { unsigned char *ro = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); memset(ro, 0x5a, size); mprotect(ro, size, PROT_READ); @@ -84,6 +234,7 @@ int main(int argc, char **argv) { printf("elsewhere %ld\n", status("VmSwap:")); request('0'); printf("back %ld\n", status("VmSwap:")); + } } for (int c = 0; c < cycles; c++) { request('1'); @@ -173,6 +324,72 @@ class ZramPreloadTest(unittest.TestCase): self.assertEqual([1], out["intact"]) self.assertEqual(6, len(out["out"])) + def test_process_signals_do_not_reach_zram_worker(self): + environment = dict(os.environ, LD_PRELOAD=str(self.lib)) + process = subprocess.Popen([str(self.steam), str(self.ctl), "1", "0", "signals"], + env=environment, stdin=subprocess.PIPE, stdout=subprocess.PIPE, text=True) + try: + process.stdout.readline() + ready = process.stdout.readline().split() + self.assertEqual("ready", ready[0]) + worker = None + task_dir = Path("/proc") / ready[1] / "task" + for task in task_dir.iterdir(): + if (task / "comm").read_text().strip() == "zr-worker": + worker = int(task.name) + break + self.assertIsNotNone(worker) + self.assertEqual(os.sched_getscheduler(process.pid), os.sched_getscheduler(worker)) + process.stdin.write(f"{worker}\n") + process.stdin.flush() + self.assertEqual("armed 1", process.stdout.readline().strip()) + for _ in range(100): + os.kill(process.pid, signal.SIGURG) + os.kill(process.pid, signal.SIGUSR1) + self.assertEqual(f"received {_ + 1}", process.stdout.readline().strip()) + output, _ = process.communicate(timeout=10) + values = dict(line.split() for line in output.splitlines()) + self.assertNotEqual(0, int(values["urg"])) + self.assertNotEqual(0, int(values["usr"])) + self.assertEqual(0, int(values["worker"])) + self.assertNotEqual(worker, int(values["urg"])) + self.assertNotEqual(worker, int(values["usr"])) + finally: + if process.poll() is None: + process.kill() + process.wait() + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_signal_does_not_stall_the_main_thread(self): + out = self.run_program(None, 256, 0, "timed") + self.assertLess(out["gap"][0], 250) + self.assertGreater(out["out"][0], 32 * 1024) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_inline_pageout_exceeds_async_timing_tolerance(self): + out = self.run_program(None, 256, 0, "timed-inline") + self.assertGreater(out["inline"][0], 250) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_single_request_timing_control(self): + asynchronous = self.run_program(None, 48, 0, "timed") + self.assertGreater(asynchronous["out"][0], 32 * 1024) + inline = self.run_program(None, 48, 0, "timed-inline-single") + self.assertGreater(inline["inline_swap"][0], 32 * 1024) + if inline["inline"][0] <= 250: + self.skipTest("single inline request did not establish the 250 ms timing threshold") + self.assertGreater(inline["inline"][0], 250) + self.assertLess(asynchronous["gap"][0], 250) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_forked_child_still_acknowledges_pageout(self): + out = self.run_program(None, 48, 0, "fork") + self.assertEqual([1], out["childack"]) + + def test_worker_acknowledges_back_to_back_requests(self): + out = self.run_program(None, 48, 0, "burst") + self.assertEqual([1], out["burstack"]) + if __name__ == "__main__": unittest.main()