diff --git a/.github/workflows/build-desktop-kde.yml b/.github/workflows/build-desktop-kde.yml index 365e3d4f82..3d720dcb9e 100644 --- a/.github/workflows/build-desktop-kde.yml +++ b/.github/workflows/build-desktop-kde.yml @@ -60,11 +60,12 @@ jobs: - name: Build run: | set -euo pipefail - sudo apt-get update -qq && sudo apt-get install -y -qq zstd xz-utils gpgv >/dev/null - KDE_KWIN_OVERRIDE="$PWD/out/kwin" tools/desktop-kde/build.sh out + sudo apt-get update -qq && sudo apt-get install -y -qq zstd xz-utils gpgv gcc-aarch64-linux-gnu >/dev/null + KDE_KWIN_OVERRIDE="$PWD/out/kwin" DESKTOP_KDE_RELEASE_TAG='${{ inputs.tag }}' tools/desktop-kde/build.sh out cp out/kwin/desktop-kde.kwin.txt out/ echo "size $(stat -c %s out/desktop-kde.tar.zst) sha256 $(cat out/desktop-kde.sha256)" echo "language packs $(ls out/desktop-kde-i18n-*.tar.zst | wc -l)" + echo "pacman repository $(ls out/repo | wc -l) files, $(du -sm out/repo | cut -f1) MiB" - uses: actions/upload-artifact@v4 with: name: desktop-kde @@ -77,6 +78,7 @@ jobs: out/desktop-kde.sha256 out/desktop-kde.i18n.txt out/desktop-kde-i18n-*.tar.zst + out/repo/ - name: Publish if: github.event_name == 'workflow_dispatch' && inputs.tag != '' env: @@ -89,8 +91,10 @@ jobs: echo "::error::$TAG is already published in DroidDeck-Components, and published tags are never replaced: use a new tag" exit 1 fi - gh release create "$TAG" --latest=false --prerelease=false --title "$TAG" \ + prerelease=false + case $TAG in *-rc*) prerelease=true ;; esac + gh release create "$TAG" --latest=false --prerelease="$prerelease" --title "$TAG" \ --notes "KDE Plasma desktop package for DroidDeck's Linux runtime ($GITHUB_REPOSITORY tools/desktop-kde, $GITHUB_SHA). size $(stat -c %s out/desktop-kde.tar.zst), sha256 $(cat out/desktop-kde.sha256). desktop-kde.packages.txt lists the signature-checked Arch Linux ARM packages it was built from." \ out/desktop-kde.tar.zst out/desktop-kde.sha256 out/desktop-kde.packages.txt out/desktop-kde.kwin.txt \ - out/desktop-kde.i18n.txt out/desktop-kde-i18n-*.tar.zst - gh release edit "$TAG" --latest=false --prerelease=false + out/desktop-kde.i18n.txt out/desktop-kde-i18n-*.tar.zst out/repo/* + gh release edit "$TAG" --latest=false --prerelease="$prerelease" diff --git a/.github/workflows/build-ubuntu-runtime.yml b/.github/workflows/build-ubuntu-runtime.yml new file mode 100644 index 0000000000..f104e9cd7f --- /dev/null +++ b/.github/workflows/build-ubuntu-runtime.yml @@ -0,0 +1,95 @@ +name: Build Linux runtime (Ubuntu) + +on: + push: + paths: + - 'tools/ubuntu/**' + - '.github/workflows/build-ubuntu-runtime.yml' + workflow_dispatch: + inputs: + tag: + description: 'Release tag to publish as (e.g. ubuntu-r1); empty = artifact only' + required: false + default: '' + +permissions: + contents: read + +jobs: + debs: + runs-on: ubuntu-24.04-arm + timeout-minutes: 240 + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + - name: Build Mesa with KGSL and the patched KWin + run: | + set -euo pipefail + docker run --rm -v "$PWD:/work" -w /work ubuntu:26.04 bash tools/ubuntu/build-debs.sh /work/out/debs + sudo chown -R "$(id -u):$(id -g)" out + - uses: actions/upload-artifact@v4 + with: + name: ubuntu-runtime-debs + retention-days: 7 + compression-level: 0 + path: out/debs/ + rootfs: + needs: debs + runs-on: ubuntu-24.04-arm + timeout-minutes: 120 + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + - uses: actions/download-artifact@v4 + with: + name: ubuntu-runtime-debs + path: out/debs + - uses: actions/create-github-app-token@v2 + id: components-token + if: github.event_name == 'workflow_dispatch' && inputs.tag != '' + with: + app-id: ${{ vars.DROIDDECK_CI_APP_ID }} + private-key: ${{ secrets.DROIDDECK_CI_APP_KEY }} + owner: Droid-Deck + repositories: DroidDeck-Components + - name: Refuse a published tag + if: github.event_name == 'workflow_dispatch' && inputs.tag != '' + env: + GH_TOKEN: ${{ steps.components-token.outputs.token }} + run: | + if gh release view '${{ inputs.tag }}' -R Droid-Deck/DroidDeck-Components >/dev/null 2>&1; then + echo "::error::${{ inputs.tag }} is already published, and published tags are never replaced: use a new tag" + exit 1 + fi + - name: Build + run: | + set -euo pipefail + sudo apt-get update -qq && sudo apt-get install -y -qq zstd gpgv ubuntu-keyring >/dev/null + tag='${{ inputs.tag }}' + tools/ubuntu/build.sh out/debs out "${tag:-ubuntu-dev}" + - uses: actions/upload-artifact@v4 + with: + name: ubuntu-runtime + retention-days: 7 + compression-level: 0 + path: | + out/*.tar.zst + out/*.sha256 + out/*.packages.txt + - name: Publish + if: github.event_name == 'workflow_dispatch' && inputs.tag != '' + env: + GH_TOKEN: ${{ steps.components-token.outputs.token }} + GH_REPO: Droid-Deck/DroidDeck-Components + run: | + set -euo pipefail + TAG='${{ inputs.tag }}' + prerelease=false + case $TAG in *-rc*) prerelease=true ;; esac + gh release create "$TAG" --latest=false --prerelease="$prerelease" --title "$TAG" \ + --notes "Ubuntu 26.04 LTS arm64 runtime for DroidDeck ($GITHUB_REPOSITORY tools/ubuntu, $GITHUB_SHA): size $(stat -c %s "out/$TAG.tar.zst"), sha256 $(cat "out/$TAG.sha256"). $TAG-desktop.tar.zst is the Kubuntu Plasma desktop built on top of it, holding only what the runtime does not already have: size $(stat -c %s "out/$TAG-desktop.tar.zst"), sha256 $(cat "out/$TAG-desktop.sha256"). The .packages.txt files list every installed package and version." \ + "out/$TAG.tar.zst" "out/$TAG.sha256" "out/$TAG.packages.txt" \ + "out/$TAG-desktop.tar.zst" "out/$TAG-desktop.sha256" "out/$TAG-desktop.packages.txt" out/debs/*.deb + gh release edit "$TAG" --latest=false --prerelease="$prerelease" diff --git a/README.md b/README.md index ce30c25358..86ba1d832a 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Compatibility and performance vary by device; hardware validation is limited. De ## Credits and licence -GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. Its games install from Stores through Blizzard's own Agent and the local HTTP API it serves, driven the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) drives it, with the requests described on [wowdev.wiki](https://wowdev.wiki/Agent); how other launchers find, install and start Blizzard games was read in [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader, without taking their code. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. x86 AppImages packed with [sharun](https://github.com/VHSgunzo/sharun) by VHSgunzo (MIT) start because DroidDeck's own [FEX](https://github.com/FEX-Emu/FEX) build (MIT) puts the platform name under `AT_PLATFORM`, which sharun's [userland-execve](https://crates.io/crates/userland-execve) loader (MIT) requires; FEX filed it under `AT_BASE_PLATFORM`. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. The in-game performance HUD is [@The412Banner](https://github.com/The412Banner)'s [FusionHUD](https://github.com/The412Banner/FusionHUD) (GPL-3.0 with an attribution term), Bannerlator's HUD; its frame rate, frame times and readings are taken from the same sources, and worked out the same way, as Valve's [MangoHud](https://github.com/flightlessmango/MangoHud) build (MIT) that runs Steam's performance overlay in a DroidDeck session, with the frame times shared by gamescope patch 0125; when gamescope sends no frames for two seconds, the HUD counts the frames DroidDeck's compositor shows instead, which stop at the screen's refresh rate. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). [ReSkate](https://github.com/Dingo-Shenanigans/ReSkate) (GPL-3.0) by Dingo Shenanigans is set up with the Steam launch option from its README and starts at D3D12 feature level 12_1, as its game crashes at 12_2 here. See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. +GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. Its games install from Stores through Blizzard's own Agent and the local HTTP API it serves, driven the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) drives it, with the requests described on [wowdev.wiki](https://wowdev.wiki/Agent); how other launchers find, install and start Blizzard games was read in [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader, without taking their code. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. x86 AppImages packed with [sharun](https://github.com/VHSgunzo/sharun) by VHSgunzo (MIT) start because DroidDeck's own [FEX](https://github.com/FEX-Emu/FEX) build (MIT) puts the platform name under `AT_PLATFORM`, which sharun's [userland-execve](https://crates.io/crates/userland-execve) loader (MIT) requires; FEX filed it under `AT_BASE_PLATFORM`. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. The in-game performance HUD is [@The412Banner](https://github.com/The412Banner)'s [FusionHUD](https://github.com/The412Banner/FusionHUD) (GPL-3.0 with an attribution term), Bannerlator's HUD; its frame rate, frame times and readings are taken from the same sources, and worked out the same way, as Valve's [MangoHud](https://github.com/flightlessmango/MangoHud) build (MIT) that runs Steam's performance overlay in a DroidDeck session, with the frame times shared by gamescope patch 0125; when gamescope sends no frames for two seconds, the HUD counts the frames DroidDeck's compositor shows instead, which stop at the screen's refresh rate. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). [ReSkate](https://github.com/Dingo-Shenanigans/ReSkate) (GPL-3.0) by Dingo Shenanigans is set up with the Steam launch option from its README and starts at D3D12 feature level 12_1, as its game crashes at 12_2 here. The KDE desktop's pacman repository is a snapshot of [Arch Linux ARM](https://archlinuxarm.org)'s core, extra and alarm repositories and installs their signed packages with [pacman](https://gitlab.archlinux.org/pacman/pacman) (GPL-2.0-or-later). [KWin](https://invent.kde.org/plasma/kwin) (GPL-2.0-or-later) is patched to pass on the scroll source, wheel steps and scroll stops its nested backend's `wayland_backend.cpp` leaves as a TODO. How Qt apps handle wheel and cancelled touch events was read in [Qt](https://code.qt.io/cgit/qt/qtbase.git)'s `qwaylandinputdevice.cpp` and `qguiapplication.cpp` and [Konsole](https://invent.kde.org/utilities/konsole)'s `TerminalDisplay.cpp`, and KWin's texture upload crash was traced through [Mesa](https://gitlab.freedesktop.org/mesa/mesa)'s `u_threaded_context.c` and Zink's `zink_resource.c`, without taking their code. The desktop's Steam Keyboard window rule follows Valve's `steamdeck-kde-presets` with the update from [Bazzite](https://github.com/ublue-os/bazzite)'s `0001-steam-virtual-keyboard.patch`, so the keyboard stays above other windows without taking focus. See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them. diff --git a/app/src/main/assets/desktop-removal/kde-keep.txt.gzip b/app/src/main/assets/desktop-removal/kde-keep.txt.gzip index 99614abb6c..6c0c5e757d 100644 Binary files a/app/src/main/assets/desktop-removal/kde-keep.txt.gzip and b/app/src/main/assets/desktop-removal/kde-keep.txt.gzip differ diff --git a/app/src/main/assets/desktop-removal/kde-remove.tsv.gzip b/app/src/main/assets/desktop-removal/kde-remove.tsv.gzip index 3eae56100f..3500b056e8 100644 Binary files a/app/src/main/assets/desktop-removal/kde-remove.tsv.gzip and b/app/src/main/assets/desktop-removal/kde-remove.tsv.gzip differ diff --git a/app/src/main/assets/desktop-removal/sources.json b/app/src/main/assets/desktop-removal/sources.json index c185153b8a..2d4152e52e 100644 --- a/app/src/main/assets/desktop-removal/sources.json +++ b/app/src/main/assets/desktop-removal/sources.json @@ -3,31 +3,52 @@ "lxqt-r1": "c2bb860b3b1688287451e2495be5db313ec07f8c8af501dfac2768a9f417bc86", "desktop-kde-r1": "55747e75d0ec055ab7ea1e92a757f3be227cc3205bb9101f5b53cadef6318579", "desktop-kde-r2": "9ba832677b498654136c69d8c8330434d17e4d53cd099acac9bde3ba429b35bf", - "emulators-r1": "a1f4806a9663d28f424b4cab1277e0ede80a92e69de5bc063cdc8b45af220164" + "emulators-r1": "a1f4806a9663d28f424b4cab1277e0ede80a92e69de5bc063cdc8b45af220164", + "desktop-kde-r3": "8b7142fcec8d86143ae39fc14ffc86907d30d9a5b5a45f49cb1b55109d6fc4eb" }, "desktopApplications": { - "ark-26.08.1-1-aarch64.pkg.tar.xz": "93e2c2b75ff20cd29b4f312ed1979ef6f27255b93232b93bfcdb31239903c1d4", - "breeze-6.7.5-1-aarch64.pkg.tar.xz": "1d7f4eb9d8d234caaea23621909f5233d19462c2f058afeeb54bed7b81bd03bd", - "breeze-gtk-6.7.5-1-any.pkg.tar.xz": "a0f59bc4fc426879c8f8a97f6dcc707fb7d1b52913da5eb7e9db83777b6957b7", - "breeze-icons-6.30.0-1-aarch64.pkg.tar.xz": "4bae4689032501156687a227024e56554820747644953c67fc8d2e2b6b0b045a", - "dolphin-26.08.1-1-aarch64.pkg.tar.xz": "fef738ab8132d3eba1156b98c116699ce0a5efcb4cb462efbacdcf4c47f79a23", - "firefox-157.0.1-1-aarch64.pkg.tar.xz": "d142fdb8a339a65eca7cea6a2bba5b29202386166abd9d59851d6757c9eb2163", - "gwenview-26.08.1-1-aarch64.pkg.tar.xz": "a9dc7d5ab73fa677905d5a57248b1b9b404b6b16e862958cc7443d387f684a47", - "kate-26.08.1-1-aarch64.pkg.tar.xz": "acf50710042746f243a3b219a1ae0f788e338f3dd9d75093e8bb671a618b83b6", - "kde-cli-tools-6.7.5-1-aarch64.pkg.tar.xz": "af466398a912a994a97fadfe46aff401d88a90d7fdce7e843dc4218098fa38ac", - "kde-gtk-config-6.7.5-1-aarch64.pkg.tar.xz": "ba6cb4cb01dbb3f2c247f2f6973ede3b64c0849f89340217b51dfbf11cb8cb5c", - "kinfocenter-6.7.5-1-aarch64.pkg.tar.xz": "f3d5416db96b50f9a5b8a284d82ae21d834a8cce646010abdd7087491c399b0b", - "konsole-26.08.1-1-aarch64.pkg.tar.xz": "1ecf87c0d11d620ebe4aeafb02788e0d5f4fe9019ad9c5d9f1011c43237dd5ec", - "kscreen-6.7.5-1-aarch64.pkg.tar.xz": "8fbaa6fedf93edeba021a5416b551663654919b27c2ee237d696ec0b0ce7d5b7", - "kwin-6.7.5-1-aarch64.pkg.tar.xz": "a7535710c74b90359f80306134b2b7581132cbac508dc84b7e07ef275cc8c3fe", + "7zip-26.05-1-aarch64.pkg.tar.xz": "17569bafbc5bd1a044ca1db164b96cb15857a22a3575f36679de46e693ae285e", + "ark-26.08.2-1-aarch64.pkg.tar.xz": "b93cc90c4fc8a6cb0247fe8fb0f9de1c2074f5173fa2735d3d1959c9162c08f2", + "breeze-6.8.1-1-aarch64.pkg.tar.xz": "70a2ff3afd41602f184814af5c6e298ff84ef7cb7e5880ca7cb4f6fb28521511", + "breeze-gtk-6.8.1-1-any.pkg.tar.xz": "e92b9acf3155db22d4a288a43e8d95c20c72b8d8cffd028dd6800eb01a304bf0", + "breeze-icons-6.31.0-1-aarch64.pkg.tar.xz": "b252ef02395621b5891d72c5f7fccd1a1ead1ce770886e9fced4bf21e1130096", + "discover-6.8.1-1-aarch64.pkg.tar.xz": "64cfca615e7c18530c684325eb36a5c45e18c63b31f651335474f53b0178958c", + "dolphin-26.08.2-1-aarch64.pkg.tar.xz": "4b5f7a9212c88d47146b374742f67f5620ab128ad893d945721bb43501066b70", + "elisa-26.08.2-1-aarch64.pkg.tar.xz": "fd2df84a2905b59fba0ab1b7fadafe567c5a1dfd44d53ae4cd4996f683b83ba2", + "filelight-26.08.2-1-aarch64.pkg.tar.xz": "17f39435104baf0743ab508bdde6e8bd1b3417b025b67ca8f343032d2fdef3e6", + "firefox-158.0.1-1-aarch64.pkg.tar.xz": "4940e14c05522bfee8df901e1cfe81f56036c82e8f3d95f9f7a2a12e6b38d232", + "flatpak-kcm-6.8.1-1-aarch64.pkg.tar.xz": "3145601002fb87d61307949a3011a8f27a7b1e9851fc59835460f934f8e00098", + "git-2.56.0-1-aarch64.pkg.tar.xz": "b152a20edb215e98cada4b2dfbd02a9e925bda0b2de6ac1441e9e60b6698d3b5", + "gwenview-26.08.2-1-aarch64.pkg.tar.xz": "02aae3973ec0563022c89e312ce7696d05d33514101ae2a01df3275717929de2", + "htop-3.5.3-1-aarch64.pkg.tar.xz": "a58899bd2596d55575493509b3a5aa6f53075cb3d88bb6c712088c57068d9eb7", + "kate-26.08.2-1-aarch64.pkg.tar.xz": "89c21ad8e62d20961b13f8fac8d9f4d358b1a3feebed243f6412e4ad996d5e9e", + "kcalc-26.08.2-1-aarch64.pkg.tar.xz": "79b3303ccc5ae956e97313439456243e59f0b79a8166ca91606a25d1c9e41029", + "kde-cli-tools-6.8.1-1-aarch64.pkg.tar.xz": "b052e9c25e7d6896be67846696f14c9e00430c0445f358ee64cf2a8ea16aa2eb", + "kde-gtk-config-6.8.1-1-aarch64.pkg.tar.xz": "3095da034ac5fe8594165e3396f61f083b0c011cd96807146ddfb53690118608", + "kfind-26.08.2-1-aarch64.pkg.tar.xz": "b4108cc3bd9efd62970379aadb3cb22e99dd1f54873ff432392edd0a833bb393", + "kinfocenter-6.8.1-1-aarch64.pkg.tar.xz": "758882ef13a166205acab0e6bb96ce756d638d91e501db400cb579b9e1331d31", + "konsole-26.08.2-1-aarch64.pkg.tar.xz": "0cf27f69d1792a094d4a935f578c82f8151b2d359198d9cd32bfdbd8dec544e4", + "kscreen-6.8.1-1-aarch64.pkg.tar.xz": "72c948dfdebfef305623527de27274baf1a2328c87e71033fd852e386d9fdf5c", + "kwin-6.8.1-2-aarch64.pkg.tar.xz": "726c98a3f8682b487c2b313633edbd80aa8b20ff657a6b63bbb1b73454f6e0c4", + "less-1:710-1-aarch64.pkg.tar.xz": "8e1d4cbecf6d2ae734cfc1c5495367c0a9245f92dfd2bc03d4d0ab14f8b26ff2", + "man-db-2.13.1-2-aarch64.pkg.tar.xz": "67515751f848717e1f6d3470f57ad2ea6900ee07618fd2726b6fcaa695687e80", + "man-pages-6.19-1-any.pkg.tar.xz": "69df38f1a1aa35240d239ff82a2e067950ac394f23b8a6c7307580ccd7e95f07", "mpv-1:0.41.0-6-aarch64.pkg.tar.xz": "6c89d00736820210a3c7f32af4cf95d155191d463f9df8bd22137c45f30a554a", - "plasma-desktop-6.7.5-1-aarch64.pkg.tar.xz": "b266dd42cea965b5ab1cc1ae600877e9d3bc83ec642c61fe1669c4457e641a55", - "plasma-integration-6.7.5-1-aarch64.pkg.tar.xz": "daa96da14d9a4d12c0d9c0341e1be6836a9a437c469d61da5e9844d51e2606cf", - "plasma-pa-6.7.5-1-aarch64.pkg.tar.xz": "02dbefe9d3e0069b2bb37cac2a6be18b8f0a1887c87704a0716e7a9268eadcd8", - "plasma-workspace-6.7.5-1-aarch64.pkg.tar.xz": "3a1455857afaa9ccf342ab6167f0f15794ee9d248b0925398ea6f62f12730a86", - "spectacle-1:6.7.5-1-aarch64.pkg.tar.xz": "0c9837412ea6119edef18bcb0a8fceb74634cb35be0ca78b3e1dd1ff2443866e", - "systemsettings-6.7.5-1-aarch64.pkg.tar.xz": "b02b6a726857d5125c92d1ec95379216c7a3bc1f187a3b46e88c0d056b29ce70", - "xdg-desktop-portal-kde-6.7.5-1-aarch64.pkg.tar.xz": "2c57d17d34d577023eb9cd7b0fca1ba9163549afe60450f6271aa148af099ef2" + "okular-26.08.2-1-aarch64.pkg.tar.xz": "aef87cf74730d2345092184d7e9b14a0068ba4030de58564aa770506175cbf06", + "plasma-desktop-6.8.1-1-aarch64.pkg.tar.xz": "4b24662a2059b21ca98b5b35b72216f22c9e316057247ea018bf6318b07cfdb6", + "plasma-integration-6.8.1-1-aarch64.pkg.tar.xz": "514f7d2a96370814b9374d7c52e1873257af6e18190d130e5a8d3d6d1fffdc54", + "plasma-pa-6.8.1-1-aarch64.pkg.tar.xz": "13dff66d30072744c7870bd1a294ae96f0fee086a1533b8052d7dfc038d57c45", + "plasma-systemmonitor-6.8.1-1-aarch64.pkg.tar.xz": "551b7c1f24cd5df64de4f5ba199bc71c00e2924c16a8241b21c020584794e10d", + "plasma-workspace-6.8.1-1-aarch64.pkg.tar.xz": "4c713990aeab118d50865c818f9689ae7637dc6556e4a0e2fec5e0b348cdcd29", + "spectacle-1:6.8.1-1-aarch64.pkg.tar.xz": "0d697803bd0135701688be3869d4d99eec6b8b43ca761610da73f44cb77bfa5c", + "systemsettings-6.8.1-1-aarch64.pkg.tar.xz": "db528089fa328d67dadb50be3b822858238785d8c659a9ef95389b993efcb234", + "unrar-1:7.3.1-1-aarch64.pkg.tar.xz": "9883e19b1f1adfa430285191b1f96db4cc208608baebd955f3fe9fee92cd3bdd", + "unzip-6.0-23-aarch64.pkg.tar.xz": "edc91c7e4e400f20345439744262d1ceded104c78d940659a6b9876076ef33fc", + "wget-1.25.0-6-aarch64.pkg.tar.xz": "e2bf0067cca93877c737c7d48bc36fff32e184c7874829429b9473c10a12dd39", + "wl-clipboard-1:2.3.0-1-aarch64.pkg.tar.xz": "723a63b140e00085a533ebb1ec36fa9305b5e6cbd8fb80c0521fbeff77a72982", + "xclip-0.13-6-aarch64.pkg.tar.xz": "772ec9336b679b0ef277d1ef0b69b74777467239e16ec845af00c07fa849d166", + "xdg-desktop-portal-kde-6.8.1-1-aarch64.pkg.tar.xz": "8098c0ef0454335bb7c806049d66977c512657346222606737d72a7ae1de3146", + "zip-3.0-14-aarch64.pkg.tar.xz": "9887f177544021809d065d0298514e98f76b55f9120119f748f5a28c8bb51994" }, "legacyApplications": { "featherpad-1.6.3-1-aarch64.pkg.tar.xz": "fcac55215815c0b712453f9bcc09abfe4b518e36025a111a7a7598ef04913f3d", diff --git a/app/src/main/assets/desktop-removal/versions.txt b/app/src/main/assets/desktop-removal/versions.txt index b748992c0d..6264a79fa8 100644 --- a/app/src/main/assets/desktop-removal/versions.txt +++ b/app/src/main/assets/desktop-removal/versions.txt @@ -1,2 +1,3 @@ desktop-kde-r1 desktop-kde-r2 +desktop-kde-r3 diff --git a/app/src/main/cpp/fakeinput_steam.cpp b/app/src/main/cpp/fakeinput_steam.cpp index c446170fe9..9eb73a001c 100644 --- a/app/src/main/cpp/fakeinput_steam.cpp +++ b/app/src/main/cpp/fakeinput_steam.cpp @@ -93,6 +93,7 @@ static constexpr unsigned int FAKE_INPUT_MAJOR = 13; static constexpr unsigned int FAKE_INPUT_EVENT_MINOR_BASE = 64; static constexpr unsigned int FAKE_INPUT_JS_MINOR_BASE = 0; static constexpr int UINPUT_EVENT_BASE = 16; +static constexpr int MOUSE_EVENT_SLOT = 4; static constexpr int UINPUT_EVENT_LIMIT = 64; static constexpr uint32_t UINPUT_DESCRIPTION_MAGIC = 0x46495544; @@ -121,6 +122,12 @@ static constexpr size_t FAKE_INPUT_RING_HEADER_SIZE = static constexpr size_t FAKE_INPUT_RING_SIZE = FAKE_INPUT_RING_HEADER_SIZE + (FAKE_INPUT_RING_CAPACITY * FAKE_INPUT_EVENT_SIZE); +static constexpr size_t DECK_IMU_BLOCK_SIZE = 64; +static constexpr size_t FAKE_INPUT_RING_PAD_TYPE_OFFSET = 44; +static constexpr uint32_t PAD_TYPE_DECK = 0, PAD_TYPE_STEAM = 1, PAD_TYPE_XBOX = 2, PAD_TYPE_DS4 = 3, + PAD_TYPE_DUALSENSE = 4, PAD_TYPE_LAST = PAD_TYPE_DUALSENSE, + PAD_TYPE_MOUSE = 5; +static constexpr uint32_t PAD_TYPE_SET = 0x80000000u; struct UinputDescription { uint32_t magic; @@ -149,6 +156,7 @@ struct FakeController { size_t mapping_size = 0; bool closed = false; bool needs_keyframe = true; + bool mouse = false; ~FakeController() { if (ring) munmap(ring, mapping_size); @@ -607,7 +615,7 @@ open_fake_input_ring(const char *event, int flags) { int slot = get_event_number(event); bool virtual_pad = slot >= UINPUT_EVENT_BASE; std::string ring_path = virtual_pad ? uinput_ring_path(slot) : get_ring_path_for_slot(slot); - size_t mapping_size = virtual_pad ? UINPUT_FILE_SIZE : FAKE_INPUT_RING_SIZE; + size_t mapping_size = virtual_pad ? UINPUT_FILE_SIZE : FAKE_INPUT_RING_SIZE + DECK_IMU_BLOCK_SIZE; if (ring_path.empty()) { Logger::log("No input ring is configured for %s (slot %d)\n", event, slot); errno = ENODEV; @@ -651,9 +659,22 @@ open_fake_input_ring(const char *event, int flags) { controller->uinput = description; controller->mapping_size = mapping_size; controller->generation = ring_generation(ring); + if (!virtual_pad) { + uint32_t pad_type = __atomic_load_n( + reinterpret_cast(static_cast(mapping) + FAKE_INPUT_RING_SIZE + + FAKE_INPUT_RING_PAD_TYPE_OFFSET), + __ATOMIC_ACQUIRE); + controller->mouse = (pad_type & PAD_TYPE_SET) && (pad_type & ~PAD_TYPE_SET) == PAD_TYPE_MOUSE; + } SnapshotState snap; - if (read_snapshot(ring, snap) && snap.generation == controller->generation) - capture_keyframe(*controller, snap); + if (read_snapshot(ring, snap) && snap.generation == controller->generation) { + if (controller->mouse) { + controller->read_seq = snap.write_seq; + controller->needs_keyframe = false; + } else { + capture_keyframe(*controller, snap); + } + } { std::lock_guard guard(controller_mutex()); controller_map()[fd] = controller; @@ -1156,7 +1177,8 @@ struct DeckImu { uint32_t pad_type; uint32_t latency; }; -static_assert(offsetof(DeckImu, pad_type) == 44, "DeckImu::pad_type matches FakeInputWriter"); +static_assert(offsetof(DeckImu, pad_type) == FAKE_INPUT_RING_PAD_TYPE_OFFSET, + "DeckImu::pad_type matches FakeInputWriter and the ring reader"); static_assert(offsetof(DeckImu, latency) == 48, "DeckImu::latency matches FakeInputWriter"); static constexpr uint32_t LATENCY_CONTROLLER = 1, LATENCY_TOUCH = 2; static constexpr int LOW_LATENCY_REPORT_INTERVAL_US = 1000; @@ -1173,7 +1195,6 @@ struct DeckExtras { uint32_t controls = 0; }; static constexpr uint32_t DECK_IMU_MAGIC = 0x31554D49; -static constexpr size_t DECK_IMU_BLOCK_SIZE = 64; static_assert(sizeof(DeckImu) <= DECK_IMU_BLOCK_SIZE, "the IMU block is 64 bytes in the ring file"); struct TritonSharedData { @@ -1270,10 +1291,6 @@ static bool fake_deck_enabled() { return enabled == 1; } -static constexpr uint32_t PAD_TYPE_DECK = 0, PAD_TYPE_STEAM = 1, PAD_TYPE_XBOX = 2, PAD_TYPE_DS4 = 3, - PAD_TYPE_DUALSENSE = 4, PAD_TYPE_LAST = PAD_TYPE_DUALSENSE; -static constexpr uint32_t PAD_TYPE_SET = 0x80000000u; - __attribute__((visibility("hidden"))) static uint32_t session_pad_type() { static int type = -1; if (type < 0) { @@ -1408,6 +1425,12 @@ __attribute__((visibility("hidden"))) static bool is_withdrawn_pad_path(const ch if (strncmp(event, "event", 5) && strncmp(event, "js", 2)) return false; int number = get_event_number(event); if (number < 0 || number >= UINPUT_EVENT_BASE) return false; + if (number == MOUSE_EVENT_SLOT && !strncmp(event, "event", 5)) { + char *fake = from_real_to_fake_path(pathname); + bool exposed = fake && path_exists(fake); + free(fake); + return !exposed; + } return number == 0 || !process_is_steam_client(); } @@ -3351,6 +3374,85 @@ static int copy_ioctl_bits(int op, void *destination, const unsigned char (&bits return static_cast(size); } +static constexpr uint16_t MOUSE_VENDOR_ID = 0x1dd1; +static constexpr uint16_t MOUSE_PRODUCT_ID = 0x0004; + +static int ioctl_mouse(int op, void *argp) { + int type = (op >> 8 & 0xFF); + int number = (op >> 0 & 0xFF); + if (type != 0x45) { + errno = EINVAL; + return -1; + } + switch (number) { + case 0x01: { + int version = 65536; + memcpy(argp, &version, sizeof(int)); + return 0; + } + case 0x02: { + struct input_id id; + memset(&id, 0, sizeof(id)); + id.bustype = 0x03; + id.vendor = MOUSE_VENDOR_ID; + id.product = MOUSE_PRODUCT_ID; + id.version = 1; + memcpy(argp, &id, sizeof(id)); + return 0; + } + case 0x06: + if (argp && _IOC_SIZE(op)) snprintf(static_cast(argp), _IOC_SIZE(op), "DroidDeck Mouse"); + return 0; + case 0x07: + if (argp && _IOC_SIZE(op)) snprintf(static_cast(argp), _IOC_SIZE(op), "usb-droiddeck/mouse"); + return 0; + case 0x08: + if (argp && _IOC_SIZE(op)) static_cast(argp)[0] = '\0'; + return 0; + case 0x09: { + unsigned char bitmask[(INPUT_PROP_MAX + 8) / 8] = {}; + bitmask[INPUT_PROP_POINTER / 8] |= 1 << (INPUT_PROP_POINTER % 8); + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x18: { + unsigned char bitmask[(KEY_MAX + 8) / 8] = {}; + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x20: { + unsigned char bitmask[(EV_MAX + 8) / 8] = {}; + bitmask[EV_SYN / 8] |= 1 << (EV_SYN % 8); + bitmask[EV_KEY / 8] |= 1 << (EV_KEY % 8); + bitmask[EV_REL / 8] |= 1 << (EV_REL % 8); + bitmask[EV_MSC / 8] |= 1 << (EV_MSC % 8); + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x21: { + unsigned char bitmask[(KEY_MAX + 8) / 8] = {}; + for (int button = BTN_LEFT; button <= BTN_TASK; button++) + if (button <= BTN_MIDDLE || button == BTN_SIDE || button == BTN_EXTRA) + bitmask[button / 8] |= 1 << (button % 8); + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x22: { + unsigned char bitmask[(REL_MAX + 8) / 8] = {}; + for (uint16_t code : {REL_X, REL_Y, REL_WHEEL, REL_HWHEEL, REL_WHEEL_HI_RES, REL_HWHEEL_HI_RES}) + bitmask[code / 8] |= 1 << (code % 8); + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x23: { + unsigned char bitmask[(ABS_MAX + 8) / 8] = {}; + return copy_ioctl_bits(op, argp, bitmask); + } + case 0x35: { + unsigned char bitmask[(FF_MAX + 8) / 8] = {}; + return copy_ioctl_bits(op, argp, bitmask); + } + default: + errno = EINVAL; + return -1; + } +} + static bool wait_snapshot(std::shared_ptr fake, std::unique_lock &guard, SnapshotState &snap) { @@ -3417,6 +3519,13 @@ EXPORT int ioctl(int fd, ioctl_request_t op, ...) { int event_number = controller->second->slot; const UinputDescription *made = controller->second->uinput; + if (controller->second->mouse) { + int result = ioctl_mouse(op, argp); + if (result >= 0) return result; + guard.unlock(); + return forward_ioctl(fd, op, argp); + } + if (type == 0x45 && number == 0x1) { Logger::log("Hooking ioctl EVIOCGVERSION for event %s\n", event); int version = 65536; @@ -3680,6 +3789,12 @@ static ssize_t read_input(int fd, void *buf, size_t count) { if (fake.needs_keyframe || snap.resync_seq != fake.resync_seq || snap.write_seq < fake.read_seq || snap.write_seq - fake.read_seq > FAKE_INPUT_RING_CAPACITY) { + if (fake.mouse) { + fake.read_seq = snap.write_seq; + fake.resync_seq = snap.resync_seq; + fake.needs_keyframe = false; + continue; + } capture_keyframe(fake, snap); } else { size_t events = std::min(requested, snap.write_seq - fake.read_seq); diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 69c2e71871..e354eb0d67 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -503,6 +503,7 @@ struct active_touch { struct surface *surface; int pointer_fallback; }; static struct active_touch g_touch_points[MAX_TOUCH_POINTS]; static void touch_cancel_surface(struct surface *surface); static struct surface *g_grab; +static void publish_query_state(void); static struct surface *g_key_target; static struct surface *g_ime_click; static int g_input_pipe[2] = {-1, -1}; @@ -596,6 +597,7 @@ static void map_toplevel(struct surface *s) { raise_kept_on_top(); if (!g_desktop) g_key_target = s; apply_zorder(); + publish_query_state(); } static void unmap_toplevel(struct surface *s) { @@ -2432,6 +2434,7 @@ static const struct wl_touch_interface touch_impl = { .release = touch_release } static void touch_res_destroy(struct wl_resource *r) { for (int i = 0; i < g_ntouches; i++) if (g_touches[i].touch == r) { g_touches[i] = g_touches[--g_ntouches]; break; } + publish_query_state(); } static void seat_get_pointer(struct wl_client *c, struct wl_resource *r, uint32_t id) { @@ -2469,6 +2472,7 @@ static void seat_get_touch(struct wl_client *c, struct wl_resource *r, uint32_t g_touches[g_ntouches].focus = NULL; g_ntouches++; } + publish_query_state(); } static void seat_release(struct wl_client *c, struct wl_resource *r) { wl_resource_destroy(r); } static const struct wl_seat_interface seat_impl = { @@ -2584,6 +2588,7 @@ struct relative_pointer { static struct wl_list g_relative_pointers; static double g_ptr_x, g_ptr_y; +static int g_ptr_known; static double g_raw_x, g_raw_y; static int g_raw_valid; @@ -2648,6 +2653,7 @@ static void constraint_end(struct constraint *k, int tell_client, const char *wh constraint_origin(k, &ox, &oy); g_ptr_x = ox + k->hint_x; g_ptr_y = oy + k->hint_y; + g_ptr_known = 1; } g_raw_valid = 0; if (k->gave_keys) { @@ -2744,6 +2750,7 @@ static void constraints_surface_commit(struct surface *s) { constraint_origin(k, &ox, &oy); g_ptr_x = ox + k->hint_x; g_ptr_y = oy + k->hint_y; + g_ptr_known = 1; if (log_budget()) droiddeck_log("pointer", "position hint: pointer moved to %d,%d", (int)g_ptr_x, (int)g_ptr_y); } @@ -2938,6 +2945,7 @@ static void pointer_input(double x, double y, int relative, uint32_t button, int } if (k) confine_clamp(k, &x, &y); g_ptr_x = x; g_ptr_y = y; + g_ptr_known = 1; if (k) { target = k->surface; } else if (g_desktop) { @@ -2948,6 +2956,7 @@ static void pointer_input(double x, double y, int relative, uint32_t button, int if (button && !pressed) g_grab = NULL; } } + publish_query_state(); if (!target) return; struct wl_client *client = wl_resource_get_client(target->resource); @@ -2963,9 +2972,9 @@ static void pointer_input(double x, double y, int relative, uint32_t button, int // may have warped its cursor since the last motion (before taking lock, // or while releasing it), so that replay can become an unintended pan. // Absolute touch events still carry their position, including on clicks. - if (!(k && k->is_lock) && (!relative || dx != 0 || dy != 0)) + int rel_consumed = send_relative_motion(client, dx, dy); + if (!(k && k->is_lock) && !(relative && rel_consumed) && (!relative || dx != 0 || dy != 0)) for_each_pointer_of(client, sp) wl_pointer_send_motion(sp->ptr, t, fx, fy); - send_relative_motion(client, dx, dy); for_each_pointer_of(client, sp) { if (button) wl_pointer_send_button(sp->ptr, wl_display_next_serial(g_display), t, button, @@ -3104,6 +3113,63 @@ static struct surface *touch_target_at(double x, double y) { return g_grab ? g_grab : g_key_target; } +static pthread_mutex_t g_query_lock = PTHREAD_MUTEX_INITIALIZER; +struct query_snapshot { + int has_position; + int input_x, input_y; + int focus_takes_touch; +}; +static struct query_snapshot g_query = { 0, 0, 0, 1 }; + +static void publish_query_state(void) { + struct surface *target = g_key_target ? g_key_target : (g_grab ? g_grab : toplevel_at(g_ptr_x, g_ptr_y)); + int takes_touch = 1; + if (target) { + struct wl_client *client = wl_resource_get_client(target->resource); + struct seat_touch *st; + takes_touch = 0; + for_each_touch_of(client, st) takes_touch = 1; + } + int w = 0, h = 0, ow = 0, oh = 0, input_x = 0, input_y = 0, has_position = 0; + scene_size(&w, &h); + vkp_output_size(&ow, &oh); + if (g_ptr_known && w > 0 && h > 0) { + double ox, oy; + if (ow > 0 && oh > 0 && vkp_scene_to_output(g_ptr_x, g_ptr_y, &ox, &oy)) { + input_x = (int)(ox * INPUT_SPACE_W / ow); + input_y = (int)(oy * INPUT_SPACE_H / oh); + } else { + input_x = (int)(g_ptr_x * INPUT_SPACE_W / w); + input_y = (int)(g_ptr_y * INPUT_SPACE_H / h); + } + has_position = 1; + } + pthread_mutex_lock(&g_query_lock); + g_query.focus_takes_touch = takes_touch; + g_query.has_position = has_position; + g_query.input_x = input_x; + g_query.input_y = input_y; + pthread_mutex_unlock(&g_query_lock); +} + +int droiddeck_focus_takes_touch(void) { + pthread_mutex_lock(&g_query_lock); + int takes_touch = g_query.focus_takes_touch; + pthread_mutex_unlock(&g_query_lock); + return takes_touch; +} + +int droiddeck_cursor_input_pos(int *x, int *y) { + pthread_mutex_lock(&g_query_lock); + int has_position = g_query.has_position; + int input_x = g_query.input_x, input_y = g_query.input_y; + pthread_mutex_unlock(&g_query_lock); + if (!has_position) return 0; + *x = input_x; + *y = input_y; + return 1; +} + static void touch_down(int id, double x, double y) { if (id < 0 || id >= MAX_TOUCH_POINTS) return; struct surface *target = touch_target_at(x, y); @@ -3203,6 +3269,7 @@ static void deliver_touch(const struct input_msg *m) { else if (m->p1 == 1) touch_motion(m->p2, x, y); else if (m->p1 == 2) touch_up(m->p2, x, y); else if (m->p1 == 3) touch_cancel_all(); + publish_query_state(); } static void key_event(uint32_t evdev, int pressed); @@ -3220,10 +3287,10 @@ static void send_axis(struct seat_pointer *sp, uint32_t t, uint32_t axis, int va wl_pointer_send_axis(sp->ptr, t, axis, wl_fixed_from_double(value120 / 12.0)); } -static void axis_event(int vertical120, int horizontal120) { +static void axis_event(int vertical120, int horizontal120, int finger) { struct surface *target = g_active_constraint ? g_active_constraint->surface : g_desktop ? g_desktop : (g_grab ? g_grab : toplevel_at(g_ptr_x, g_ptr_y)); - if (!target || (!vertical120 && !horizontal120)) return; + if (!target || (!finger && !vertical120 && !horizontal120)) return; struct wl_client *client = wl_resource_get_client(target->resource); struct seat_pointer *sp; if (!pointer_for(client)) return; @@ -3232,16 +3299,33 @@ static void axis_event(int vertical120, int horizontal120) { uint32_t t = now_ms(); pointer_focus(target->resource, wl_fixed_from_double(g_ptr_x - tx), wl_fixed_from_double(g_ptr_y - ty)); for_each_pointer_of(client, sp) { - send_axis(sp, t, WL_POINTER_AXIS_VERTICAL_SCROLL, vertical120); - send_axis(sp, t, WL_POINTER_AXIS_HORIZONTAL_SCROLL, horizontal120); - if (wl_resource_get_version(sp->ptr) >= WL_POINTER_FRAME_SINCE_VERSION) + int version = wl_resource_get_version(sp->ptr); + if (!finger) { + send_axis(sp, t, WL_POINTER_AXIS_VERTICAL_SCROLL, vertical120); + send_axis(sp, t, WL_POINTER_AXIS_HORIZONTAL_SCROLL, horizontal120); + } else { + if (version >= WL_POINTER_AXIS_SOURCE_SINCE_VERSION) + wl_pointer_send_axis_source(sp->ptr, WL_POINTER_AXIS_SOURCE_FINGER); + if (!vertical120 && !horizontal120) { + if (version >= WL_POINTER_AXIS_STOP_SINCE_VERSION) { + wl_pointer_send_axis_stop(sp->ptr, t, WL_POINTER_AXIS_VERTICAL_SCROLL); + wl_pointer_send_axis_stop(sp->ptr, t, WL_POINTER_AXIS_HORIZONTAL_SCROLL); + } + } else { + if (vertical120) + wl_pointer_send_axis(sp->ptr, t, WL_POINTER_AXIS_VERTICAL_SCROLL, wl_fixed_from_double(vertical120 / 12.0)); + if (horizontal120) + wl_pointer_send_axis(sp->ptr, t, WL_POINTER_AXIS_HORIZONTAL_SCROLL, wl_fixed_from_double(horizontal120 / 12.0)); + } + } + if (version >= WL_POINTER_FRAME_SINCE_VERSION) wl_pointer_send_frame(sp->ptr); } wl_display_flush_clients(g_display); } static void scroll_event(int steps) { - axis_event(steps * 120, 0); + axis_event(steps * 120, 0, 0); } static int update_modifiers(uint32_t evdev, int pressed) { @@ -3337,7 +3421,8 @@ static int on_input_readable(int fd, uint32_t mask, void *data) { schedule_render(); break; case 10: break; - case 11: axis_event(m.p1, m.p2); break; + case 11: axis_event(m.p1, m.p2, 0); break; + case 12: axis_event(m.p1, m.p2, 1); break; case 20: stream_take(); break; case 21: if (!m.p1) stream_forget_all(); schedule_render(); break; default: deliver_pointer(&m); break; diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c index c917afbbab..8d6b3480a8 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -384,6 +384,13 @@ int vkp_output_to_scene(double ox, double oy, double *sx, double *sy) { return 1; } +int vkp_scene_to_output(double sx, double sy, double *ox, double *oy) { + if (!g_map.valid || g_map.kx <= 0 || g_map.ky <= 0) return 0; + *ox = sx * g_map.kx + g_map.off_x; + *oy = sy * g_map.ky + g_map.off_y; + return 1; +} + void vkp_output_size(int *w, int *h) { *w = (int)g_extent.width; *h = (int)g_extent.height; diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.h b/app/src/main/cpp/waylandcomp/src/vk_present.h index 7271f468b6..5cc06ddb32 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.h +++ b/app/src/main/cpp/waylandcomp/src/vk_present.h @@ -16,6 +16,7 @@ enum vkp_align { VKP_ALIGN_CENTER = 0, VKP_ALIGN_TOP = 1, VKP_ALIGN_BOTTOM = 2, void vk_present_set_scale_mode(int mode, int alignment); int vkp_game_picture_rect(float rect[4]); int vkp_output_to_scene(double ox, double oy, double *sx, double *sy); +int vkp_scene_to_output(double sx, double sy, double *ox, double *oy); void vkp_output_size(int *w, int *h); struct vkp_image; diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index fad36f2823..e3d0f5c5f4 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -27,6 +27,8 @@ extern int droiddeck_cursor_snapshot(int *out, int cap); extern int droiddeck_cursor_serial(void); extern int droiddeck_hud_frame_times(float *out, int len, int64_t *total); extern void droiddeck_wayland_send_key(int evdev, int state); +extern int droiddeck_focus_takes_touch(void); +extern int droiddeck_cursor_input_pos(int *x, int *y); extern void droiddeck_wayland_send_scene_input(int type, int a, int b); extern void droiddeck_wayland_vsync(int64_t frame_time_ns); extern void droiddeck_stream_set(int on); @@ -296,6 +298,25 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSendKey( droiddeck_wayland_send_key(evdev, state); } +JNIEXPORT jboolean JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeFocusTakesTouch( + JNIEnv *env, jclass clazz) { + (void)env; (void)clazz; + return droiddeck_focus_takes_touch() ? JNI_TRUE : JNI_FALSE; +} + +JNIEXPORT jboolean JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeCursorInputPos( + JNIEnv *env, jclass clazz, jintArray out) { + (void)clazz; + if (!out || (*env)->GetArrayLength(env, out) < 2) return JNI_FALSE; + int pos[2]; + if (!droiddeck_cursor_input_pos(&pos[0], &pos[1])) return JNI_FALSE; + jint jpos[2] = {pos[0], pos[1]}; + (*env)->SetIntArrayRegion(env, out, 0, 2, jpos); + return JNI_TRUE; +} + JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSendSceneInput( JNIEnv *env, jclass clazz, jint type, jint a, jint b) { diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 324941bd43..ca648e3f11 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -46,6 +46,7 @@ class App : Application() { com.droiddeck.launcher.glasses.Glasses.init(this) com.droiddeck.launcher.glasses.GlassesMenuMirror.initialize(this) BwrapSpawner.start(this) + com.droiddeck.launcher.runtime.RootSpawner.start(this) com.droiddeck.launcher.frontend.GameFileSync.start(this) com.droiddeck.launcher.stores.StoresState.init(this) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.gog.GogBackend) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 89dbba58b5..a4c50446c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -189,7 +189,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val steamTouchRetry = Runnable { updateOnScreenControls() } private var steamTouchOptions: com.droiddeck.launcher.input.SteamTouchConfig.Options? = null private var routedTouchMode = SessionPrefs.TOUCH_AUTO + private var touchRoute: com.droiddeck.launcher.input.TouchRouter.Route? = null private var keyboard: KeyboardHost? = null + private var desktopKeyboardButton: com.droiddeck.launcher.input.DesktopKeyboardButton? = null + private var lastUserPressMs = 0L + private var pressDownX = 0f + private var pressDownY = 0f + private var pressTravel = 0f + private var pressMoved = false private var controllerSettings by mutableStateOf(null) private val sessionClipboard by lazy { SessionClipboard(this) { @@ -199,11 +206,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var watching = true private lateinit var touchpad: TouchpadGestures private lateinit var directTouchHold: DirectTouchHold + private lateinit var twoFingerGestures: com.droiddeck.launcher.input.TwoFingerGestures private lateinit var threeFingerTap: com.droiddeck.launcher.input.ThreeFingerTap private lateinit var touchscreenGestures: TouchscreenGestures private var gestureConfig = com.droiddeck.launcher.input.TouchGestureConfig() private var gestureGame: String? = null private var gestureSettingsOpen by mutableStateOf(false) + private var directHoldBehavior by mutableStateOf(com.droiddeck.launcher.input.TouchGestureConfig.MOUSE_BEHAVIOR_CLICK) private var screenKeyPickerOpen by mutableStateOf(false) private var screenKeyBind: List? = null private var screenKeyDir: Int? = null @@ -234,6 +243,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val cursorHide = Runnable { cursorVisible = false } private var lastPadInputMs = 0L private val cursorBuf = IntArray(WaylandCompositor.CURSOR_BUF_INTS) + private val cursorPosBuf = IntArray(2) private var cursorSerial = 0 private var clientHidesCursor = false private var pointerLocked = false @@ -243,6 +253,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { gesturePointerReady = false pointerLocked = locked Log.i(TAG, "pointer lock " + if (locked) "taken by a program" else "released") + if (locked) openEvdevMouse() else closeEvdevMouse() padMouseCheckedAt = 0L if (::padMouse.isInitialized) padMouseMode() // Touchpad deltas are measured from the middle while locked (moveLockedPointer). @@ -257,7 +268,31 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var cursorHotX by mutableStateOf(0) private var cursorHotY by mutableStateOf(0) private var cursorImageScale by mutableStateOf(1f) - private val cursorResync = Runnable { if (syncClientCursor() && clientHidesCursor) cursorVisible = false } + private var cursorResyncIdle = 0 + private val cursorResync = object : Runnable { + override fun run() { + if (syncClientCursor() && clientHidesCursor) { + cursorVisible = false + return + } + if (touchDrivesPointer()) return + cursorResyncIdle = if (alignCursorToGuest()) 0 else cursorResyncIdle + 1 + if (!cursorVisible || pointerLocked) return + if (cursorResyncIdle > CURSOR_RESYNC_IDLE_TICKS) return + uiHandler.postDelayed(this, 60) + } + } + + private fun alignCursorToGuest(): Boolean { + if (pointerLocked || !CompositorHost.isStarted) return false + if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return false + if (surfaceView.width <= 0 || surfaceView.height <= 0) return false + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + if (kotlin.math.abs(x - cursorPos.x) < 0.75f && kotlin.math.abs(y - cursorPos.y) < 0.75f) return false + cursorPos = androidx.compose.ui.geometry.Offset(x, y) + return true + } private val uiHandler = Handler(Looper.getMainLooper()) private var pendingBackAction: Runnable? = null private val backQamInput = com.droiddeck.launcher.input.BackQamInput( @@ -342,6 +377,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var backActionsInverted by mutableStateOf(false) private var backDoubleTapMs by mutableStateOf(500) private var lowLatency by mutableStateOf(true) + private var evdevMouseOn by mutableStateOf(false) + private var directCursorOn by mutableStateOf(false) + private var mouseWriter: com.droiddeck.launcher.input.FakeInputWriter? = null + private var evdevMouseActive = false + private var lastMouseX = Float.NaN + private var lastMouseY = Float.NaN private var padType by mutableStateOf(SessionPrefs.CONTROLLER_DECK) private var pcKeyboardOpen by mutableStateOf(false) private var achievementsInFront by mutableStateOf(null) @@ -605,12 +646,35 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { keys.visibility = if (screenKeysShown) View.VISIBLE else View.GONE root.addView(keys) } - keyboard = KeyboardHost(this).also { root.addView(it) } - touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener) - directTouchHold = DirectTouchHold(PointerGestures.slop(this), pointerListener) { - WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + keyboard = KeyboardHost(this).also { host -> + host.onImeChanged = { updateDesktopKeyboardButton() } + root.addView(host) } + desktopKeyboardButton = com.droiddeck.launcher.input.DesktopKeyboardButton(this) { keyboard?.show() } + .also { root.addView(it) } + touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener) + directTouchHold = DirectTouchHold(PointerGestures.slop(this), pointerListener, directTouchSink) threeFingerTap = com.droiddeck.launcher.input.ThreeFingerTap(PointerGestures.slop(this) * 2) + twoFingerGestures = com.droiddeck.launcher.input.TwoFingerGestures(PointerGestures.slop(this) * 2, + object : com.droiddeck.launcher.input.TwoFingerGestures.Listener { + override fun cancelTouch() { + WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + directTouchHold.cancel() + scrollRestX = 0f + scrollRestY = 0f + } + override fun replay(event: MotionEvent) { + drawnRect()?.let { forwardTouch(event, it) } + } + override fun rightClick(x: Float, y: Float) { + pointerListener.onLongPress() + pointerListener.onButton(PointerGestures.BTN_RIGHT, true, x, y) + surfaceView.postDelayed({ pointerListener.onButton(PointerGestures.BTN_RIGHT, false, x, y) }, 50L) + } + override fun scrollStart(x: Float, y: Float) = scrollListener.onMove(x, y) + override fun scroll(dx: Float, dy: Float) = fingerScroll(dx, dy) + override fun scrollEnd() = fingerScrollEnd() + }) touchscreenGestures = TouchscreenGestures( ViewConfiguration.get(this).scaledTouchSlop.toFloat(), gestureOutput, ) @@ -746,6 +810,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi) { updatePointerCapture() } androidx.compose.runtime.LaunchedEffect(pipUi) { hud.setHidden(pipUi) } androidx.compose.runtime.LaunchedEffect(AgentGuest.steamKeyboard) { updateOnScreenControls() } + androidx.compose.runtime.LaunchedEffect(AgentGuest.desktopTextField) { onDesktopTextField(AgentGuest.desktopTextField) } + androidx.compose.runtime.LaunchedEffect(pipUi, pcKeyboardOpen) { updateDesktopKeyboardButton() } val keyboardRequestsSeen = androidx.compose.runtime.remember { intArrayOf(AgentGuest.keyboardRequests) } androidx.compose.runtime.LaunchedEffect(AgentGuest.keyboardRequests) { if (AgentGuest.keyboardRequests != keyboardRequestsSeen[0]) { @@ -1133,6 +1199,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { lowLatency = on applyLowLatency() }, + evdevMouse = evdevMouseOn, + onEvdevMouse = { on -> + SessionPrefs.setEvdevMouse(this@SessionActivity, on) + evdevMouseOn = on + if (on) { if (pointerLocked) openEvdevMouse() } else releaseEvdevMouse() + }, + directCursor = directCursorOn, + onDirectCursor = { on -> + SessionPrefs.setDirectCursor(this@SessionActivity, on) + directCursorOn = on + if (!on && directTouchCursorHidden()) cursorVisible = false + }, onOsc = { v -> SessionPrefs.setOscMode(this@SessionActivity, v) readPrefs() @@ -1156,6 +1234,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }, onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() }, onGestureSettings = { drawerOpen = false; gestureSettingsOpen = true }, + touchActive = drawerTouchMode(), + directHoldBehavior = directHoldBehavior, + onDirectHoldBehavior = { value -> + val base = com.droiddeck.launcher.input.GesturePrefs.read(this@SessionActivity, gestureGame) + com.droiddeck.launcher.input.GesturePrefs.save(this@SessionActivity, gestureGame, base.copy(directHoldBehavior = value)) + refreshGestureConfig() + }, onScreenKeys = { drawerOpen = false; screenKeys?.startEditing() }, screenKeysShown = screenKeysShown, onScreenKeysShown = { shown -> @@ -1683,6 +1768,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (touchMode != nextTouchMode) { if (::touchpad.isInitialized) touchpad.cancel() if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() if (::scrollTouch.isInitialized) scrollTouch.cancel() if (CompositorHost.isStarted) { WaylandCompositor.nativeSendTouch(3, -1, 0, 0) @@ -1704,6 +1790,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { backActionsInverted = SessionPrefs.backActionsInverted(this) backDoubleTapMs = SessionPrefs.backDoubleTapMs(this) lowLatency = SessionPrefs.lowLatency(this) + evdevMouseOn = SessionPrefs.evdevMouse(this) + if (!evdevMouseOn) releaseEvdevMouse() + directCursorOn = SessionPrefs.directCursor(this) padType = SessionPrefs.steamController(this) } @@ -2418,6 +2507,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { if (pipUi) return true + notePress(event) if (drawerOpen && PadBridge.isControllerMotionEvent(event)) { if (!drawerControllerActive) focusDrawer() drawerControllerActive = true @@ -2458,6 +2548,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun dispatchTouchEvent(event: MotionEvent): Boolean { if (pipUi) return true + notePress(event) if (event.actionMasked == MotionEvent.ACTION_DOWN && event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { drawerControllerActive = false gestureTouchStreamGate.reset() @@ -2585,6 +2676,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun refreshGestureConfig() { gestureConfig = com.droiddeck.launcher.input.GesturePrefs.read(this, gestureGame) + directHoldBehavior = gestureConfig.directHoldBehavior gestureTouchStreamGate.reset() if (::touchscreenGestures.isInitialized) touchscreenGestures.configure(gestureConfig) if (::directTouchHold.isInitialized) directTouchHold.configure(gestureConfig) @@ -2606,12 +2698,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun moveBy(dx: Float, dy: Float, relative: Boolean) { val rect = drawnRect() ?: return if (relative || pointerLocked) { - val scale = SessionState.outputSize.first / rect.width() - WaylandCompositor.sendPointerDelta(dx * scale, dy * scale) + val scale = sceneScale(rect) + sendSceneDelta(dx * scale, dy * scale) } else moveTo(gesturePointerX + dx, gesturePointerY + dy) } override fun button(code: Int, down: Boolean) { - WaylandCompositor.nativeSendSceneInput(3, code, if (down) 1 else 0) + sendSceneButton(code, down) } override fun prepareRelativePan() { if (pointerLocked) return @@ -2625,7 +2717,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (down) gestureKeysDown.add(code) else gestureKeysDown.remove(code) if (code !in guestKeysDown) WaylandCompositor.nativeSendKey(code, if (down) 1 else 0) } - override fun wheel(steps: Int) { WaylandCompositor.nativeSendSceneInput(4, steps, 0) } + override fun wheel(steps: Int) { sendSceneWheel(steps) } override fun showKeyboard() { uiHandler.post { touchscreenGestures.cancel(); togglePcKeyboard() } } override fun gesture(gesture: TouchscreenGestures.Gesture) { recognizedGesture = gesture @@ -2640,9 +2732,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { if (!pointerLocked) movePointer(x, y) - WaylandCompositor.nativeSendSceneInput(3, button, if (pressed) 1 else 0) + sendSceneButton(button, pressed) + } + override fun onWheel(steps: Int) { sendSceneWheel(steps) } + override fun onScroll(dx: Float, dy: Float) = fingerScroll(dx, dy) + override fun onScrollEnd() = fingerScrollEnd() + override fun onZoom(steps: Int) { + WaylandCompositor.nativeSendKey(KEY_LEFTCTRL, 1) + sendSceneWheel(steps) + WaylandCompositor.nativeSendKey(KEY_LEFTCTRL, 0) } - override fun onWheel(steps: Int) { WaylandCompositor.nativeSendSceneInput(4, steps, 0) } override fun onLongPress() { @Suppress("DEPRECATION") (getSystemService(VIBRATOR_SERVICE) as? android.os.Vibrator)?.vibrate(15) @@ -2710,10 +2809,37 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun scrollTouchMode(): Boolean = (routedTouchMode == SessionPrefs.TOUCH_AUTO || routedTouchMode == SessionPrefs.TOUCH_DIRECT) && padMouseMode() + private fun fingerScroll(dx: Float, dy: Float) { + val rect = drawnRect() ?: return + val out = SessionState.outputSize + scrollRestX += dx * out.first / rect.width() * AXIS_UNITS_PER_PIXEL + scrollRestY += dy * out.second / rect.height() * AXIS_UNITS_PER_PIXEL + val h = scrollRestX.toInt() + val v = scrollRestY.toInt() + if (h == 0 && v == 0) return + scrollRestX -= h + scrollRestY -= v + WaylandCompositor.nativeSendSceneInput(12, v, h) + } + + private fun fingerScrollEnd() { + scrollRestX = 0f + scrollRestY = 0f + WaylandCompositor.nativeSendSceneInput(12, 0, 0) + } + + private fun placeTouchpadAtGuest(rect: android.graphics.RectF) { + if (pointerLocked || !CompositorHost.isStarted || surfaceView.width <= 0 || surfaceView.height <= 0) return + if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + if (rect.contains(x, y)) touchpad.place(x, y) + } + private fun moveLockedPointer(x: Float, y: Float) { val rect = drawnRect() ?: return - val scale = SessionState.outputSize.first / rect.width() - WaylandCompositor.sendPointerDelta((x - rect.centerX()) * scale, (y - rect.centerY()) * scale) + val scale = sceneScale(rect) + sendSceneDelta((x - rect.centerX()) * scale, (y - rect.centerY()) * scale) touchpad.place(rect.centerX(), rect.centerY()) cursorVisible = false } @@ -2730,14 +2856,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { cursorPos = androidx.compose.ui.geometry.Offset(x, y) syncClientCursor() uiHandler.removeCallbacks(cursorResync) - uiHandler.postDelayed(cursorResync, 60) + cursorResyncIdle = 0 + if (!touchDrivesPointer()) uiHandler.postDelayed(cursorResync, 60) if (clientHidesCursor) { cursorVisible = false; return } + if (directTouchCursorHidden()) { cursorVisible = false; return } if (android.os.SystemClock.uptimeMillis() - lastPadInputMs < CURSOR_PAD_HOLD_MS) return cursorVisible = true uiHandler.removeCallbacks(cursorHide) if (SessionState.mode == SessionService.MODE_STEAM && SessionState.steamUi != "desktop") uiHandler.postDelayed(cursorHide, 2500) } + private fun touchDrivesPointer(): Boolean = + routedTouchMode == SessionPrefs.TOUCH_DIRECT || + (routedTouchMode == SessionPrefs.TOUCH_AUTO && !usingTouchpad()) + + private fun directTouchCursorHidden(): Boolean = !directCursorOn && touchDrivesPointer() + private fun syncClientCursor(): Boolean { if (!CompositorHost.isStarted) return false if (WaylandCompositor.nativeCursorSerial() == cursorSerial) return false @@ -3021,22 +3155,95 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { gesturePointerReady = false if (::touchpad.isInitialized) touchpad.cancel() if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() if (::scrollTouch.isInitialized) scrollTouch.cancel() - if (CompositorHost.isStarted) WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + if (CompositorHost.isStarted && + (deliversTouches(routedTouchMode) || deliversTouches(next))) + WaylandCompositor.nativeSendTouch(3, -1, 0, 0) if (next == SessionPrefs.TOUCH_OFF) cursorVisible = false gestureTouchStreamGate.reset() routedTouchMode = next + if (directTouchCursorHidden()) cursorVisible = false } + private fun deliversTouches(mode: String) = + mode == SessionPrefs.TOUCH_DIRECT || mode == SessionPrefs.TOUCH_AUTO + private fun usingTouchpad(): Boolean = when (routedTouchMode) { SessionPrefs.TOUCH_PAD -> true SessionPrefs.TOUCH_DIRECT -> false else -> SessionState.mode != SessionService.MODE_STEAM || SessionState.steamUi == "desktop" } + private fun drawerTouchMode(): String = when (routedTouchMode) { + SessionPrefs.TOUCH_GESTURES, SessionPrefs.TOUCH_DIRECT, + SessionPrefs.TOUCH_OFF, SessionPrefs.TOUCH_PAD -> routedTouchMode + else -> if (usingTouchpad()) SessionPrefs.TOUCH_PAD else SessionPrefs.TOUCH_DIRECT + } + private val gamePictureBounds = FloatArray(4) private var topPictureMapped = false + private fun sceneScale(rect: android.graphics.RectF): Float = + SessionState.outputSize.first / rect.width() + + private fun openEvdevMouse() { + if (evdevMouseActive || !evdevMouseOn) return + val writer = mouseWriter ?: com.droiddeck.launcher.input.FakeInputWriter( + File(LinuxRuntime.sessionRoot(this), "dev/input").absolutePath, + com.droiddeck.launcher.input.FakeInputWriter.MOUSE_SLOT, + ).also { mouseWriter = it } + if (!writer.open()) return + evdevMouseActive = true + lastMouseX = Float.NaN + lastMouseY = Float.NaN + Log.i(TAG, "raw mouse channel active (pointer locked)") + } + + private fun closeEvdevMouse() { + if (!evdevMouseActive) return + mouseWriter?.softRelease() + evdevMouseActive = false + Log.i(TAG, "raw mouse channel idle") + } + + private fun releaseEvdevMouse() { + evdevMouseActive = false + mouseWriter?.destroy() + mouseWriter = null + Log.i(TAG, "raw mouse channel removed") + } + + private fun sendSceneDelta(dx: Float, dy: Float) { + val writer = if (evdevMouseActive) mouseWriter else null + if (writer != null) writer.writeMouseDelta(dx, dy) + else WaylandCompositor.sendPointerDelta(dx, dy) + } + + private fun sendSceneButton(code: Int, down: Boolean) { + val writer = if (evdevMouseActive) mouseWriter else null + if (writer != null) writer.writeMouseButton(code.toShort(), down) + else WaylandCompositor.nativeSendSceneInput(3, code, if (down) 1 else 0) + } + + private fun sendSceneWheel(steps: Int) { + val writer = if (evdevMouseActive) mouseWriter else null + if (writer != null) writer.writeMouseWheel(-steps, 0, 120) + else WaylandCompositor.nativeSendSceneInput(4, steps, 0) + } + + private fun sendMouseDelta(x: Float, y: Float) { + cursorVisible = false + val previousX = lastMouseX + val previousY = lastMouseY + lastMouseX = x + lastMouseY = y + val rect = drawnRect() ?: return + if (previousX.isNaN() || previousY.isNaN()) return + val scale = sceneScale(rect) + sendSceneDelta((x - previousX) * scale, (y - previousY) * scale) + } + private fun drawnRect(): android.graphics.RectF? { val width = surfaceView.width.takeIf { it > 0 } ?: return null val height = surfaceView.height.takeIf { it > 0 } ?: return null @@ -3065,84 +3272,125 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) dismissTouch = false return true } - if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) return true - if (routedTouchMode == SessionPrefs.TOUCH_GESTURES) { - if (event.actionMasked == MotionEvent.ACTION_DOWN) gesturePointerReady = false - return touchscreenGestures.onTouch(event) - } - if (event.actionMasked == MotionEvent.ACTION_DOWN) { + val uiBlocking = drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended + if (event.actionMasked == MotionEvent.ACTION_DOWN && !uiBlocking && routedTouchMode != SessionPrefs.TOUCH_GESTURES) { scrollTouchGesture = scrollTouchMode() scrollRestX = 0f scrollRestY = 0f } - if (scrollTouchGesture) return scrollTouch.onTouch(event) - if (routedTouchMode == SessionPrefs.TOUCH_OFF) return true - if (SessionState.mode == SessionService.MODE_STEAM && SessionState.steamUi != "desktop") { - val wasActive = threeFingerTap.active - if (threeFingerTap.onTouch(event)) padBridge?.triggerSteamKeyboard() - if (threeFingerTap.active && !wasActive) { - if (usingTouchpad()) touchpad.cancel() else WaylandCompositor.nativeSendTouch(3, -1, 0, 0) - } - if (threeFingerTap.active || wasActive) return true + val snapshot = com.droiddeck.launcher.input.TouchRouter.Snapshot( + uiBlocking = uiBlocking, + mode = routedTouchMode, + scrollLayer = scrollTouchGesture, + steamSession = SessionState.mode == SessionService.MODE_STEAM, + steamDesktopUi = SessionState.steamUi == "desktop", + ) + val route = com.droiddeck.launcher.input.TouchRouter.decide(snapshot) + if (route != touchRoute) { + Log.i(TAG, "touch route $touchRoute -> $route (mode=$routedTouchMode steamUi=${SessionState.steamUi} scrollLayer=$scrollTouchGesture)") + touchRoute = route } - if (usingTouchpad()) { - val rect = drawnRect() ?: return false - if (touchpad.bounds != rect) { - val fresh = touchpad.bounds.width() <= 1f - touchpad.bounds = rect - if (fresh) touchpad.place(rect.centerX(), rect.centerY()) + return when (route) { + com.droiddeck.launcher.input.TouchRouter.Route.BLOCKED, + com.droiddeck.launcher.input.TouchRouter.Route.OFF -> true + com.droiddeck.launcher.input.TouchRouter.Route.GESTURES -> { + if (event.actionMasked == MotionEvent.ACTION_DOWN) gesturePointerReady = false + touchscreenGestures.onTouch(event) + } + com.droiddeck.launcher.input.TouchRouter.Route.SCROLL -> scrollTouch.onTouch(event) + else -> { + if (com.droiddeck.launcher.input.TouchRouter.steamKeyboardZone(snapshot)) { + val wasActive = threeFingerTap.active + if (threeFingerTap.onTouch(event)) padBridge?.triggerSteamKeyboard() + if (threeFingerTap.active && !wasActive) { + if (route == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD) touchpad.cancel() + else { + directTouchHold.cancel() + WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } + } + if (threeFingerTap.active || wasActive) return true + } + if (route == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD) { + val rect = drawnRect() ?: return false + if (touchpad.bounds != rect) { + val fresh = touchpad.bounds.width() <= 1f + touchpad.bounds = rect + if (fresh) touchpad.place(rect.centerX(), rect.centerY()) + } + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + touchpad.desktop = SessionState.mode == SessionService.MODE_DESKTOP + placeTouchpadAtGuest(rect) + } + touchpad.onTouch(event) + } else { + dispatchDirectTouch(event) + } } - return touchpad.onTouch(event) } + } + + private val directTouchSink = object : DirectTouchHold.Touch { + override fun down(pointerId: Int, x: Float, y: Float) = sendDirectTouch(0, pointerId, x, y) + override fun move(pointerId: Int, x: Float, y: Float) = sendDirectTouch(1, pointerId, x, y) + override fun up(pointerId: Int, x: Float, y: Float) = sendDirectTouch(2, pointerId, x, y) + override fun cancel() = WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } + + private fun sendDirectTouch(action: Int, pointerId: Int, x: Float, y: Float) { + val rect = drawnRect() ?: return + val cx = x.coerceIn(rect.left, rect.right) + val cy = y.coerceIn(rect.top, rect.bottom) + WaylandCompositor.nativeSendTouch(action, pointerId, + InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + showCursor(cx, cy) + } + + private fun dispatchDirectTouch(event: MotionEvent): Boolean { val rect = drawnRect() ?: return false if (event.actionMasked == MotionEvent.ACTION_DOWN) ignoreGameTouch = topPictureMapped && !rect.contains(event.x, event.y) if (ignoreGameTouch) { - if (event.actionMasked == MotionEvent.ACTION_DOWN) + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + directTouchHold.cancel() WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) ignoreGameTouch = false return true } - if (directTouchHold.onTouch(event)) return true - fun sendTouch(action: Int, index: Int) { - val x = event.getX(index).coerceIn(rect.left, rect.right) - val y = event.getY(index).coerceIn(rect.top, rect.bottom) - WaylandCompositor.nativeSendTouch(action, event.getPointerId(index), - InputSpace.x(x, surfaceView.width), InputSpace.y(y, surfaceView.height)) - } - when (event.actionMasked) { - MotionEvent.ACTION_DOWN -> { - WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + if (SessionState.mode == SessionService.MODE_DESKTOP && twoFingerGestures.onTouch(event)) return true + return forwardTouch(event, rect) + } + + private fun forwardTouch(event: MotionEvent, rect: android.graphics.RectF): Boolean { + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + showCursor(event.x.coerceIn(rect.left, rect.right), event.y.coerceIn(rect.top, rect.bottom)) + if (WaylandCompositor.nativeFocusTakesTouch()) { listOf(PointerGestures.BTN_LEFT, PointerGestures.BTN_RIGHT, PointerGestures.BTN_MIDDLE).forEach { WaylandCompositor.nativeSendSceneInput(3, it, 0) } - sendTouch(0, event.actionIndex) } - MotionEvent.ACTION_POINTER_DOWN -> sendTouch(0, event.actionIndex) - MotionEvent.ACTION_MOVE -> for (index in 0 until event.pointerCount) sendTouch(1, index) - MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> sendTouch(2, event.actionIndex) - MotionEvent.ACTION_CANCEL -> WaylandCompositor.nativeSendTouch(3, -1, 0, 0) - else -> return false } + directTouchHold.onTouch(event) return true } private fun onMouse(event: MotionEvent): Boolean { when (event.actionMasked) { MotionEvent.ACTION_HOVER_MOVE, MotionEvent.ACTION_MOVE, MotionEvent.ACTION_HOVER_ENTER -> - movePointer(event.x, event.y) + if (evdevMouseActive) sendMouseDelta(event.x, event.y) else movePointer(event.x, event.y) MotionEvent.ACTION_BUTTON_PRESS, MotionEvent.ACTION_BUTTON_RELEASE -> { - movePointer(event.x, event.y) + if (evdevMouseActive) sendMouseDelta(event.x, event.y) else movePointer(event.x, event.y) val button = when (event.actionButton) { MotionEvent.BUTTON_SECONDARY -> PointerGestures.BTN_RIGHT MotionEvent.BUTTON_TERTIARY -> PointerGestures.BTN_MIDDLE else -> PointerGestures.BTN_LEFT } - WaylandCompositor.nativeSendSceneInput(3, button, if (event.actionMasked == MotionEvent.ACTION_BUTTON_PRESS) 1 else 0) + sendSceneButton(button, event.actionMasked == MotionEvent.ACTION_BUTTON_PRESS) } MotionEvent.ACTION_SCROLL -> { val v = event.getAxisValue(MotionEvent.AXIS_VSCROLL) - if (v != 0f) WaylandCompositor.nativeSendSceneInput(4, -Math.round(v), 0) + if (v != 0f) sendSceneWheel(-Math.round(v)) } MotionEvent.ACTION_DOWN, MotionEvent.ACTION_UP -> {} else -> return false @@ -3165,6 +3413,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun onCapturedPointer(event: MotionEvent): Boolean { if (!pointerLocked || !event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE)) return false + notePress(event) when (event.actionMasked) { MotionEvent.ACTION_MOVE -> { var dx = event.x @@ -3173,7 +3422,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { dx += event.getHistoricalX(i) dy += event.getHistoricalY(i) } - WaylandCompositor.sendPointerDelta(dx, dy) + sendSceneDelta(dx, dy) } MotionEvent.ACTION_BUTTON_PRESS, MotionEvent.ACTION_BUTTON_RELEASE -> { val button = when (event.actionButton) { @@ -3181,11 +3430,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { MotionEvent.BUTTON_TERTIARY -> PointerGestures.BTN_MIDDLE else -> PointerGestures.BTN_LEFT } - WaylandCompositor.nativeSendSceneInput(3, button, if (event.actionMasked == MotionEvent.ACTION_BUTTON_PRESS) 1 else 0) + sendSceneButton(button, event.actionMasked == MotionEvent.ACTION_BUTTON_PRESS) } MotionEvent.ACTION_SCROLL -> { val v = event.getAxisValue(MotionEvent.AXIS_VSCROLL) - if (v != 0f) WaylandCompositor.nativeSendSceneInput(4, -Math.round(v), 0) + if (v != 0f) sendSceneWheel(-Math.round(v)) } MotionEvent.ACTION_DOWN, MotionEvent.ACTION_UP -> {} else -> return false @@ -3309,6 +3558,60 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }) } + private fun desktopTextInput() = + SessionState.mode == SessionService.MODE_DESKTOP && SessionState.running && !pipUi + + private fun notePress(event: MotionEvent) { + val touch = event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN) + when (event.actionMasked) { + MotionEvent.ACTION_DOWN, MotionEvent.ACTION_BUTTON_PRESS -> { + pressDownX = event.x + pressDownY = event.y + pressTravel = 0f + pressMoved = false + if (!touch) lastUserPressMs = android.os.SystemClock.uptimeMillis() + } + MotionEvent.ACTION_POINTER_DOWN -> pressMoved = true + MotionEvent.ACTION_MOVE -> if (touch || event.buttonState != 0) { + val moved = if (event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE)) { + pressTravel += kotlin.math.hypot(event.x, event.y) + pressTravel + } else { + kotlin.math.hypot(event.x - pressDownX, event.y - pressDownY) + } + if (moved >= android.view.ViewConfiguration.get(this).scaledTouchSlop * 2f) { + pressMoved = true + if (!touch) lastUserPressMs = 0L + } + } + MotionEvent.ACTION_UP, MotionEvent.ACTION_BUTTON_RELEASE -> { + val quick = !touch || event.eventTime - event.downTime < android.view.ViewConfiguration.getLongPressTimeout() + if (!pressMoved && quick) lastUserPressMs = android.os.SystemClock.uptimeMillis() + } + } + } + + private fun onDesktopTextField(focused: Boolean) { + val host = keyboard + if (host != null && desktopTextInput()) { + val tapped = android.os.SystemClock.uptimeMillis() - lastUserPressMs < TEXT_FIELD_TAP_MS + if (focused && tapped && resumed && !pcKeyboardOpen && + resources.configuration.hardKeyboardHidden != android.content.res.Configuration.HARDKEYBOARDHIDDEN_NO) host.show() + else if (!focused && host.shown) host.hide() + } + updateDesktopKeyboardButton() + } + + private fun updateDesktopKeyboardButton() { + val button = desktopKeyboardButton ?: return + val show = desktopTextInput() && AgentGuest.desktopTextField && !pcKeyboardOpen && + !(keyboard?.let { it.shown && (Build.VERSION.SDK_INT < 30 || it.imeShowing) } ?: false) + val visibility = if (show) View.VISIBLE else View.GONE + if (button.visibility == visibility) return + if (show) button.applyColors() + button.visibility = visibility + } + private fun keyboardCoversPad() = SessionState.mode == SessionService.MODE_STEAM && AgentGuest.steamKeyboard @@ -3398,6 +3701,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { touchpad.cancel() scrollTouch.cancel() directTouchHold.cancel() + twoFingerGestures.cancel() guestKeysDown.toList().forEach { sendGuestKey(it, false) } keyboard?.hide() sessionClipboard.stop() @@ -3525,6 +3829,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onScreenControls?.reload() controllerSettings = ControllerPrefs.read(this) resumed = true + updateDesktopKeyboardButton() com.droiddeck.launcher.input.HomeButtonShortcuts.attach(this, enabled = { resumed && window.decorView.hasWindowFocus() && !ended && !drawerOpen && !pcKeyboardOpen && @@ -3553,7 +3858,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel() if (::touchpad.isInitialized) touchpad.cancel() if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() uiHandler.removeCallbacks(clearRecognizedGesture) + uiHandler.removeCallbacks(cursorResync) gestureSettingsOpen = false drawerOpen = false pcKeyboardOpen = false @@ -3985,6 +4292,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { backQamInput.cancel() steamVrRecovery.close() uiHandler.removeCallbacks(steamTouchRetry) + uiHandler.removeCallbacks(cursorResync) + releaseEvdevMouse() if (runtimeRemovalBlocked) { super.onDestroy(); return } watching = false releaseDrawerDirection() @@ -4074,6 +4383,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { const val EXTRA_STEAMVR = "steamVr" const val EXTRA_REPAIR_RUNTIME = "repairRuntime" private const val LEAVE_TIMEOUT_MS = 1_500L + private const val TEXT_FIELD_TAP_MS = 1_000L private const val PAUSED_FRAME_MAX_EDGE = 1920f private const val PAUSED_FRAME_REDRAW_MS = 150L private const val TAG = "SessionActivity" @@ -4082,9 +4392,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val FEX_MISSING = "droiddeck-fex: x86 Linux programs need" private const val UNBUFFERED_SOURCES = InputDevice.SOURCE_CLASS_JOYSTICK or InputDevice.SOURCE_CLASS_TRACKBALL or InputDevice.SOURCE_CLASS_POSITION private const val CURSOR_PAD_HOLD_MS = 1200L + private const val CURSOR_RESYNC_IDLE_TICKS = 33 private const val PAD_MOUSE_CHECK_MS = 500L private const val PAD_SCROLL_POINTER_X = 0.985f private const val PAD_SCROLL_HEIGHTS_PER_S = 3f + private const val AXIS_UNITS_PER_PIXEL = 3f + private const val KEY_LEFTCTRL = 29 private const val DRAWER_HAT_THRESHOLD = 0.5f private const val DRAWER_STICK_ENTER_THRESHOLD = 0.55f private const val DRAWER_STICK_EXIT_THRESHOLD = 0.35f diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt index 8d621d1c1c..a89c14c66a 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentGuest.kt @@ -22,6 +22,8 @@ object AgentGuest { private set var steamKeyboard by mutableStateOf(false) private set + var desktopTextField by mutableStateOf(false) + private set var keyboardRequests by mutableIntStateOf(0) private set var keyboardDismissals by mutableIntStateOf(0) @@ -41,7 +43,7 @@ object AgentGuest { observer?.stopWatching() observer = null lastFocusKey = null - main.post { steamKeyboard = false } + main.post { steamKeyboard = false; desktopTextField = false } val dir = dir(context) dir.deleteRecursively() dir.mkdirs() @@ -56,6 +58,7 @@ object AgentGuest { } "focus.json" -> readJson(File(dir, path))?.let(::recordFocus) "keyboard.json" -> readJson(File(dir, path))?.let { recordKeyboard(this, it) } + "ime.json" -> readJson(File(dir, path))?.let { recordTextField(this, it) } "keyboard-request.json" -> readJson(File(dir, path))?.let { recordKeyboardRequest(this) } "keyboard-dismiss.json" -> readJson(File(dir, path))?.let { recordKeyboardDismiss(this) } } @@ -68,7 +71,7 @@ object AgentGuest { synchronized(lock) { observer?.stopWatching() observer = null - main.post { steamKeyboard = false } + main.post { steamKeyboard = false; desktopTextField = false } } } @@ -117,6 +120,15 @@ object AgentGuest { SessionEvents.record("keyboard.changed", mapOf("steamKeyboard" to showing, "seq" to snapshot.optInt("seq"))) } + private fun recordTextField(source: FileObserver, snapshot: JSONObject) { + val focused = snapshot.optBoolean("textField") + synchronized(lock) { + if (source !== observer) return + main.post { desktopTextField = focused } + } + SessionEvents.record("ime.changed", mapOf("textField" to focused, "seq" to snapshot.optInt("seq"))) + } + private fun recordFocus(snapshot: JSONObject) { val fields = linkedMapOf( "focusedApp" to snapshot.opt("focusedApp"), diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 9fb776447a..958e1c5ae2 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -274,7 +274,7 @@ object Library { Spec("duckstation", "DuckStation", "PS1", "/opt/appimages/duckstation.AppImage", listOf("ps1", "psx"), setOf("cue", "chd", "pbp", "iso", "bin", "img", "ecm", "m3u")), Spec("melonds", "melonDS", "DS", "/opt/appimages/melonds.AppImage", listOf("ds", "nds"), setOf("nds", "dsi"), atPanel = true), Spec("cemu", "Cemu", "Wii U", "/opt/appimages/cemu.AppImage", listOf("wiiu", "wii u"), setOf("wua", "wud", "wux", "rpx")), - Spec("ppsspp", "PPSSPP", "PSP", "/usr/bin/PPSSPPSDL", listOf("psp"), setOf("iso", "cso", "pbp", "chd")), + Spec("ppsspp", "PPSSPP", "PSP", "/usr/local/bin/PPSSPPSDL", listOf("psp"), setOf("iso", "cso", "pbp", "chd")), Spec("retroarch", "RetroArch", "many systems", "/usr/bin/retroarch", emptyList(), emptySet()), ) private fun displayTitle(name: String): String = diff --git a/app/src/main/java/com/droiddeck/launcher/input/DesktopKeyboardButton.kt b/app/src/main/java/com/droiddeck/launcher/input/DesktopKeyboardButton.kt new file mode 100644 index 0000000000..633d5a54f0 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/DesktopKeyboardButton.kt @@ -0,0 +1,118 @@ +package com.droiddeck.launcher.input + +import android.annotation.SuppressLint +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.RectF +import android.os.Build +import android.view.Gravity +import android.view.HapticFeedbackConstants +import android.view.MotionEvent +import android.view.View +import android.view.WindowInsets +import android.widget.FrameLayout +import com.droiddeck.launcher.R + +@SuppressLint("ViewConstructor") +class DesktopKeyboardButton(context: Context, private val onTap: () -> Unit) : View(context) { + + private val fill = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } + private val stroke = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE; strokeWidth = dp(1.5f) } + private val box = RectF() + private var idleFill = 0 + private var idleStroke = 0 + private var heldStroke = 0 + private var pressed = false + + init { + contentDescription = context.getString(R.string.second_show_keyboard) + isClickable = true + visibility = GONE + layoutParams = FrameLayout.LayoutParams(dp(SIZE).toInt(), dp(SIZE).toInt(), Gravity.BOTTOM or Gravity.START) + place(0, 0) + applyColors() + } + + private fun dp(value: Float) = value * resources.displayMetrics.density + + fun applyColors() { + val settings = ControllerPrefs.read(context) + val tint = settings.tint + val alpha = settings.opacity / 100f + fun light(a: Int, f: Float) = Color.argb( + (a * alpha).toInt(), + (Color.red(tint) + (255 - Color.red(tint)) * f).toInt(), + (Color.green(tint) + (255 - Color.green(tint)) * f).toInt(), + (Color.blue(tint) + (255 - Color.blue(tint)) * f).toInt(), + ) + idleFill = Color.argb(190, (Color.red(tint) * 0.12f).toInt(), (Color.green(tint) * 0.12f).toInt(), (Color.blue(tint) * 0.12f).toInt()) + idleStroke = light(150, 0.25f) + heldStroke = light(230, 0.7f) + invalidate() + } + + private fun place(left: Int, bottom: Int) { + val params = layoutParams as FrameLayout.LayoutParams + val marginStart = left + (dp(CENTER_X) - dp(SIZE) / 2f).toInt() + val marginBottom = bottom + (dp(CENTER_Y) - dp(SIZE) / 2f).toInt() + if (params.leftMargin == marginStart && params.bottomMargin == marginBottom) return + params.leftMargin = marginStart + params.bottomMargin = marginBottom + layoutParams = params + } + + override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { + val cutout = if (Build.VERSION.SDK_INT >= 28) insets.displayCutout else null + place(cutout?.safeInsetLeft ?: 0, cutout?.safeInsetBottom ?: 0) + return super.onApplyWindowInsets(insets) + } + + override fun onDraw(canvas: Canvas) { + val x = width / 2f + val y = height / 2f + fill.color = idleFill + canvas.drawCircle(x, y, dp(18f), fill) + stroke.color = if (pressed) heldStroke else idleStroke + canvas.drawCircle(x, y, dp(18f), stroke) + box.set(x - dp(10f), y - dp(7f), x + dp(10f), y + dp(7f)) + canvas.drawRoundRect(box, dp(2f), dp(2f), stroke) + for (row in 0..1) for (col in 0..2) { + val kx = x + dp(-6f + col * 5f) + val ky = y + dp(-3f + row * 4f) + canvas.drawLine(kx, ky, kx + dp(2f), ky, stroke) + } + canvas.drawLine(x - dp(5f), y + dp(4f), x + dp(5f), y + dp(4f), stroke) + } + + @SuppressLint("ClickableViewAccessibility") + override fun onTouchEvent(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { pressed = true; invalidate() } + MotionEvent.ACTION_UP -> { + val inside = event.x in 0f..width.toFloat() && event.y in 0f..height.toFloat() + pressed = false + invalidate() + if (inside) { + performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY) + performClick() + } + } + MotionEvent.ACTION_CANCEL -> { pressed = false; invalidate() } + } + return true + } + + override fun performClick(): Boolean { + super.performClick() + onTap() + return true + } + + private companion object { + const val SIZE = 52f + const val CENTER_X = 90f + const val CENTER_Y = 34f + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt index 8bf852fdbd..d38eb9758c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt @@ -8,52 +8,125 @@ import kotlin.math.abs class DirectTouchHold( private val slopPx: Float, private val listener: PointerGestures.Listener, - private val cancelTouch: () -> Unit, + private val touch: Touch, ) { + interface Touch { + fun down(pointerId: Int, x: Float, y: Float) + fun move(pointerId: Int, x: Float, y: Float) + fun up(pointerId: Int, x: Float, y: Float) + fun cancel() + } + private val handler = Handler(Looper.getMainLooper()) - private var x = 0f - private var y = 0f - private var consumed = false - private var pressed = false + private var downX = 0f + private var downY = 0f + private var downId = 0 private var delayMs = 0L + private var holdBehavior = TouchGestureConfig.MOUSE_BEHAVIOR_CLICK + private var forwarded = false + private var held = false + private var pressing = false + private var upX = 0f + private var upY = 0f + private var liftId = 0 + private var liftPending = false + private val lift = Runnable { + liftPending = false + if (forwarded) { + touch.up(liftId, upX, upY) + forwarded = false + } + } private val release = Runnable { - if (pressed) listener.onButton(PointerGestures.BTN_RIGHT, false, x, y) - pressed = false + if (pressing) listener.onButton(PointerGestures.BTN_RIGHT, false, downX, downY) + pressing = false } private val hold = Runnable { - cancelTouch() - consumed = true + held = true listener.onLongPress() - listener.onButton(PointerGestures.BTN_RIGHT, true, x, y) - pressed = true - handler.postDelayed(release, 50L) + listener.onButton(PointerGestures.BTN_RIGHT, true, downX, downY) + pressing = true + if (holdBehavior != TouchGestureConfig.MOUSE_BEHAVIOR_HOLD) handler.postDelayed(release, 50L) } fun configure(config: TouchGestureConfig) { cancel() - delayMs = if (config.longPressEnabled) config.longPressDelay.toLong().coerceAtLeast(1L) else 0L + delayMs = config.longPressDelay.toLong().coerceAtLeast(1L) + holdBehavior = config.directHoldBehavior } fun cancel() { handler.removeCallbacks(hold) handler.removeCallbacks(release) + handler.removeCallbacks(lift) + liftPending = false release.run() - consumed = false + if (forwarded) touch.cancel() + forwarded = false + held = false } fun onTouch(event: MotionEvent): Boolean { + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + if (liftPending) { + handler.removeCallbacks(lift) + lift.run() + } + cancel() + downX = event.x + downY = event.y + downId = event.getPointerId(0) + if (holdBehavior == TouchGestureConfig.MOUSE_BEHAVIOR_NONE) forwardDown() + else handler.postDelayed(hold, delayMs) + return true + } + if (held) { + when (event.actionMasked) { + MotionEvent.ACTION_UP -> { release.run(); held = false } + MotionEvent.ACTION_CANCEL -> cancel() + } + return true + } when (event.actionMasked) { - MotionEvent.ACTION_DOWN -> { - cancel() - x = event.x; y = event.y - if (delayMs > 0L) handler.postDelayed(hold, delayMs) + MotionEvent.ACTION_POINTER_DOWN -> { + handler.removeCallbacks(hold) + if (!forwarded) forwardDown() + val index = event.actionIndex + touch.down(event.getPointerId(index), event.getX(index), event.getY(index)) + } + MotionEvent.ACTION_MOVE -> { + if (!forwarded && (event.pointerCount > 1 || + abs(event.x - downX) > slopPx || abs(event.y - downY) > slopPx)) { + handler.removeCallbacks(hold) + forwardDown() + } + if (forwarded) for (index in 0 until event.pointerCount) + touch.move(event.getPointerId(index), event.getX(index), event.getY(index)) + } + MotionEvent.ACTION_POINTER_UP -> { + val index = event.actionIndex + touch.up(event.getPointerId(index), event.getX(index), event.getY(index)) + } + MotionEvent.ACTION_UP -> { + handler.removeCallbacks(hold) + if (!forwarded) forwardDown() + upX = event.x + upY = event.y + liftId = event.getPointerId(event.actionIndex) + liftPending = true + handler.postDelayed(lift, LIFT_MS) } - MotionEvent.ACTION_MOVE -> if (event.pointerCount > 1 || - abs(event.x - x) > slopPx || abs(event.y - y) > slopPx) handler.removeCallbacks(hold) - MotionEvent.ACTION_POINTER_DOWN, MotionEvent.ACTION_POINTER_UP, - MotionEvent.ACTION_UP -> handler.removeCallbacks(hold) MotionEvent.ACTION_CANCEL -> cancel() } - return consumed + return true + } + + private fun forwardDown() { + touch.down(downId, downX, downY) + forwarded = true + } + + private companion object { + const val LIFT_MS = 50L } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java b/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java index f140314dc0..46ce997984 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java +++ b/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java @@ -14,6 +14,7 @@ public class FakeInputWriter { public static final short EV_SYN = 0x00; public static final short EV_KEY = 0x01; + public static final short EV_REL = 0x02; public static final short EV_ABS = 0x03; public static final short EV_MSC = 0x04; @@ -52,7 +53,8 @@ public class FakeInputWriter { private static final int EVENT_SIZE = 24; static final int MAX_EVENTS_PER_UPDATE = 32; private static final int BUFFER_SIZE = EVENT_SIZE * MAX_EVENTS_PER_UPDATE; - private static final int MAX_FAKE_INPUT_SLOTS = 4; + private static final int MAX_FAKE_INPUT_SLOTS = 5; + public static final int MOUSE_SLOT = 4; private static final int RING_CAPACITY_EVENTS = 4096; private static final int RING_HEADER_SIZE = 64; @@ -88,6 +90,17 @@ public class FakeInputWriter { public static final int PAD_TYPE_XBOX = 2; public static final int PAD_TYPE_DS4 = 3; public static final int PAD_TYPE_DUALSENSE = 4; + public static final int PAD_TYPE_MOUSE = 5; + + public static final short REL_X = 0x00; + public static final short REL_Y = 0x01; + public static final short REL_HWHEEL = 0x06; + public static final short REL_WHEEL = 0x08; + public static final short REL_WHEEL_HI_RES = 0x0b; + public static final short REL_HWHEEL_HI_RES = 0x0c; + public static final short MOUSE_BTN_LEFT = 0x110; + public static final short MOUSE_BTN_RIGHT = 0x111; + public static final short MOUSE_BTN_MIDDLE = 0x112; private static volatile int padType = -1; private static volatile boolean tritonConnected = false; private static final int TRITON_OFFSET = RING_SIZE + 64; @@ -136,6 +149,8 @@ public class FakeInputWriter { private int prevThumbLX, prevThumbLY, prevThumbRX, prevThumbRY; private int prevTriggerL, prevTriggerR; private int prevHatX, prevHatY; + private final boolean[] prevMouseButtons = new boolean[3]; + private float pendingMouseX, pendingMouseY; private boolean hasChanges = false; private boolean pendingFullResend = false; private boolean forceResend = false; @@ -201,7 +216,7 @@ public class FakeInputWriter { return FakeInputRingPaths.ringFile(fakeInputDir, slot); } - private static void initializeRingHeader(ByteBuffer data) { + private static void initializeRingHeader(int slot, ByteBuffer data) { data.order(ByteOrder.LITTLE_ENDIAN); data.putInt(RING_MAGIC_OFFSET, RING_MAGIC); data.putInt(RING_VERSION_OFFSET, RING_VERSION); @@ -221,7 +236,7 @@ public class FakeInputWriter { data.putShort(IMU_ACCEL_OFFSET + (i * 2), (short) 0); } data.putInt(DECK_CONTROLS_OFFSET, 0); - int type = padType; + int type = slot == MOUSE_SLOT ? PAD_TYPE_MOUSE : padType; data.putInt(PAD_TYPE_OFFSET, type >= 0 ? PAD_TYPE_SET | type : 0); data.putInt(LATENCY_OFFSET, latency); data.putInt(TRITON_OFFSET, TRITON_MAGIC); @@ -312,7 +327,7 @@ public class FakeInputWriter { raf.setLength(RING_FILE_SIZE); channel = raf.getChannel(); ByteBuffer data = channel.map(FileChannel.MapMode.READ_WRITE, 0, RING_FILE_SIZE); - initializeRingHeader(data); + initializeRingHeader(slot, data); RingSlot ringSlot = new RingSlot(); ringSlot.data = data; @@ -745,6 +760,14 @@ public class FakeInputWriter { prevHatY = 0; writeEvent(EV_ABS, ABS_HAT0Y, 0); } + for (int i = 0; i < prevMouseButtons.length; i++) { + if (prevMouseButtons[i]) { + prevMouseButtons[i] = false; + writeEvent(EV_KEY, (short) (MOUSE_BTN_LEFT + i), 0); + } + } + pendingMouseX = 0; + pendingMouseY = 0; if (hasChanges) { writeEvent(EV_SYN, SYN_REPORT, 0); @@ -874,4 +897,64 @@ public class FakeInputWriter { public boolean isOpen() { return isOpen; } + + public synchronized void writeMouseDelta(float dx, float dy) { + if (!isOpen && !open()) + return; + pendingMouseX += dx; + pendingMouseY += dy; + int x = (int) Math.floor(pendingMouseX); + int y = (int) Math.floor(pendingMouseY); + if (x == 0 && y == 0) + return; + pendingMouseX -= x; + pendingMouseY -= y; + buffer.clear(); + hasChanges = false; + if (x != 0) writeEvent(EV_REL, REL_X, x); + if (y != 0) writeEvent(EV_REL, REL_Y, y); + writeEvent(EV_SYN, SYN_REPORT, 0); + buffer.flip(); + if (!flushBuffer()) + Log.e(TAG, "Mouse delta write error: fake input mmap ring unavailable"); + } + + public synchronized void writeMouseButton(short code, boolean pressed) { + if (code < MOUSE_BTN_LEFT || code > MOUSE_BTN_MIDDLE) + return; + int idx = code - MOUSE_BTN_LEFT; + if (!isOpen && !open()) + return; + if (prevMouseButtons[idx] == pressed) + return; + prevMouseButtons[idx] = pressed; + buffer.clear(); + hasChanges = false; + writeEvent(EV_KEY, code, pressed ? 1 : 0); + writeEvent(EV_SYN, SYN_REPORT, 0); + buffer.flip(); + if (!flushBuffer()) + Log.e(TAG, "Mouse button write error: fake input mmap ring unavailable"); + } + + public synchronized void writeMouseWheel(int verticalClicks, int horizontalClicks, int value120) { + if (verticalClicks == 0 && horizontalClicks == 0) + return; + if (!isOpen && !open()) + return; + buffer.clear(); + hasChanges = false; + if (verticalClicks != 0) { + writeEvent(EV_REL, REL_WHEEL, verticalClicks); + writeEvent(EV_REL, REL_WHEEL_HI_RES, verticalClicks * value120); + } + if (horizontalClicks != 0) { + writeEvent(EV_REL, REL_HWHEEL, horizontalClicks); + writeEvent(EV_REL, REL_HWHEEL_HI_RES, horizontalClicks * value120); + } + writeEvent(EV_SYN, SYN_REPORT, 0); + buffer.flip(); + if (!flushBuffer()) + Log.e(TAG, "Mouse wheel write error: fake input mmap ring unavailable"); + } } diff --git a/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt b/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt index 494533f434..ab2550a4a8 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/KeyboardHost.kt @@ -23,6 +23,9 @@ class KeyboardHost( private val map: KeyCharacterMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD) var shown = false private set + var imeShowing = false + private set + var onImeChanged: ((Boolean) -> Unit)? = null init { isFocusable = false @@ -42,6 +45,28 @@ class KeyboardHost( return KeyConnection() } + override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + val visible = insets.isVisible(WindowInsets.Type.ime()) + if (visible != imeShowing) { + imeShowing = visible + onImeChanged?.invoke(visible) + } + } + return super.onApplyWindowInsets(insets) + } + + override fun onKeyPreIme(keyCode: Int, event: KeyEvent): Boolean { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || keyCode != KeyEvent.KEYCODE_BACK || !shown) { + return super.onKeyPreIme(keyCode, event) + } + if (event.action == KeyEvent.ACTION_UP && !event.isCanceled) { + hide() + onImeChanged?.invoke(false) + } + return true + } + fun toggle() = if (shown && imeVisible()) hide() else show() private fun imeVisible() = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || diff --git a/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt index dab9ff6528..74b50a4526 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt @@ -1,104 +1,22 @@ package com.droiddeck.launcher.input -import android.os.Handler -import android.os.Looper -import android.view.MotionEvent import android.view.ViewConfiguration -import kotlin.math.abs -import kotlin.math.roundToInt -class PointerGestures( - private val slopPx: Float, - private val listener: Listener, -) { +class PointerGestures { interface Listener { fun onMove(x: Float, y: Float) fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) fun onWheel(steps: Int) fun onLongPress() - } - - private val handler = Handler(Looper.getMainLooper()) - private var downX = 0f - private var downY = 0f - private var downAt = 0L - private var moved = false - private var held = false - private var dragging = false - private var scrolling = false - private var scrollAnchorY = 0f - private val longPress = Runnable { - held = true - listener.onLongPress() - } - - fun onTouch(event: MotionEvent): Boolean { - when (event.actionMasked) { - MotionEvent.ACTION_DOWN -> { - downX = event.x; downY = event.y; downAt = event.eventTime - moved = false; held = false; dragging = false; scrolling = false - listener.onMove(event.x, event.y) - handler.postDelayed(longPress, HOLD_MS) - return true - } - MotionEvent.ACTION_POINTER_DOWN -> { - handler.removeCallbacks(longPress) - if (dragging) { listener.onButton(BTN_LEFT, false, event.x, event.y); dragging = false } - scrolling = true - scrollAnchorY = event.getY(0) - return true - } - MotionEvent.ACTION_MOVE -> { - if (scrolling) { - val dy = event.getY(0) - scrollAnchorY - val steps = (dy / SCROLL_STEP_PX).toInt() - if (steps != 0) { - listener.onWheel(-steps) - scrollAnchorY += steps * SCROLL_STEP_PX - } - return true - } - if (!moved && (abs(event.x - downX) > slopPx || abs(event.y - downY) > slopPx)) { - moved = true - handler.removeCallbacks(longPress) - if (held) { - dragging = true - listener.onButton(BTN_LEFT, true, downX, downY) - } - } - if (moved) listener.onMove(event.x, event.y) - return true - } - MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { - handler.removeCallbacks(longPress) - val cancelled = event.actionMasked == MotionEvent.ACTION_CANCEL - when { - scrolling -> {} - dragging -> listener.onButton(BTN_LEFT, false, event.x, event.y) - held && !moved && !cancelled -> { - listener.onButton(BTN_RIGHT, true, downX, downY) - listener.onButton(BTN_RIGHT, false, downX, downY) - } - !moved && !cancelled && event.eventTime - downAt < TAP_MS -> { - listener.onButton(BTN_LEFT, true, downX, downY) - listener.onButton(BTN_LEFT, false, downX, downY) - } - } - scrolling = false; dragging = false; held = false - return true - } - MotionEvent.ACTION_POINTER_UP -> return true - } - return false + fun onScroll(dx: Float, dy: Float) {} + fun onScrollEnd() {} + fun onZoom(steps: Int) {} } companion object { const val BTN_LEFT = 0x110 const val BTN_RIGHT = 0x111 const val BTN_MIDDLE = 0x112 - private const val HOLD_MS = 450L - private const val TAP_MS = 350L - private const val SCROLL_STEP_PX = 40f fun slop(context: android.content.Context) = ViewConfiguration.get(context).scaledTouchSlop.toFloat() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt index 3bb1c9c1ec..4f1ebc9bdd 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ScrollTouchGestures.kt @@ -86,27 +86,14 @@ class ScrollTouchGestures( lastY = startY tracker = VelocityTracker.obtain().also { it.addMovement(event) } listener.onMove(startX, startY) - handler.postDelayed(longPress, HOLD_MS) + handler.postDelayed(longPress, TouchTiming.HOLD_MS) } MotionEvent.ACTION_MOVE -> { val index = event.findPointerIndex(pointerId).takeIf { it >= 0 } ?: return true tracker?.addMovement(event) - val x = event.getX(index) - val y = event.getY(index) - if (!scrolling && !dragging && hypot(x - startX, y - startY) > slopPx) { - handler.removeCallbacks(longPress) - if (held) { - dragging = true - listener.onButton(PointerGestures.BTN_LEFT, true) - } else { - scrolling = true - vertical = abs(y - startY) >= abs(x - startX) - lastX = startX - lastY = startY - } - } - if (dragging) listener.onMove(x, y) - follow(event, x, y) + for (h in 0 until event.historySize) + sample(event.getHistoricalX(index, h), event.getHistoricalY(index, h), event.getHistoricalEventTime(h)) + sample(event.getX(index), event.getY(index), event.eventTime) } MotionEvent.ACTION_POINTER_UP -> { if (event.getPointerId(event.actionIndex) == pointerId) cancel() @@ -115,7 +102,7 @@ class ScrollTouchGestures( handler.removeCallbacks(longPress) if (pointerId == -1 || event.getPointerId(0) != pointerId) return true tracker?.addMovement(event) - follow(event, event.x, event.y) + follow(event.x, event.y, event.eventTime) when { scrolling -> tracker?.takeIf { event.eventTime - movedAt <= FLING_STILL_MS }?.let { t -> t.computeCurrentVelocity(1000) @@ -139,9 +126,26 @@ class ScrollTouchGestures( return true } - private fun follow(event: MotionEvent, x: Float, y: Float) { + private fun sample(x: Float, y: Float, t: Long) { + if (!scrolling && !dragging && hypot(x - startX, y - startY) > slopPx) { + handler.removeCallbacks(longPress) + if (held) { + dragging = true + listener.onButton(PointerGestures.BTN_LEFT, true) + } else { + scrolling = true + vertical = abs(y - startY) >= abs(x - startX) + lastX = startX + lastY = startY + } + } + if (dragging) listener.onMove(x, y) + follow(x, y, t) + } + + private fun follow(x: Float, y: Float, t: Long) { if (!scrolling || (x == lastX && y == lastY)) return - movedAt = event.eventTime + movedAt = t if (vertical) listener.onScroll(0f, lastY - y) else listener.onScroll(lastX - x, 0f) lastX = x lastY = y @@ -151,7 +155,7 @@ class ScrollTouchGestures( releaseClick() listener.onButton(button, true) clicked = button - handler.postDelayed(clickUp, CLICK_MS) + handler.postDelayed(clickUp, TouchTiming.CLICK_MS) } private fun releaseClick() { @@ -181,8 +185,6 @@ class ScrollTouchGestures( return if (pixels < 0) -units else units } - private const val HOLD_MS = 500L - private const val CLICK_MS = 50L private const val FLING_TIME_S = 0.45f private const val FLING_STOP_PX = 40f private const val FLING_STILL_MS = 60L diff --git a/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt b/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt index 4ec08bcb41..c29c772112 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SessionClipboard.kt @@ -16,13 +16,19 @@ class SessionClipboard(context: Context, private val hasFocus: () -> Boolean) { private val handler = Handler(Looper.getMainLooper()) private val hostFile = File(context.filesDir, "session/android-clipboard") private var active = false - private val androidListener = ClipboardManager.OnPrimaryClipChangedListener { refresh() } + private var published = false + private var shared: String? = null + private var echo: String? = null + private val androidListener = ClipboardManager.OnPrimaryClipChangedListener { refresh(changed = true) } private val guestListener = object : WaylandCompositor.ClipboardListener { override fun onGuestClipboardText(text: String) { handler.post { if (active && hasFocus() && WaylandCompositor.isClipboardListener(this)) { val current = clipboard.primaryClip?.takeIf { it.itemCount > 0 }?.getItemAt(0)?.text + shared = text + published = true if (current?.toString() != text) { + echo = text clipboard.setPrimaryClip(ClipData.newPlainText("DroidDeck", text)) } } @@ -46,17 +52,23 @@ class SessionClipboard(context: Context, private val hasFocus: () -> Boolean) { handler.removeCallbacksAndMessages(null) } - fun refresh() { + fun refresh(changed: Boolean = false) { if (!active || !hasFocus()) return val clip = clipboard.primaryClip - if (clip == null) { - publish(null) - } else if (clip.itemCount > 0) { - publish(clip.getItemAt(0).text?.toString()) + if (clip != null && clip.itemCount == 0) return + val text = clip?.getItemAt(0)?.text?.toString() + if (echo != null && text == echo) { + echo = null + return } + echo = null + if (!changed && published && text == shared) return + publish(text) } private fun publish(text: String?) { + published = true + shared = text WaylandCompositor.setClipboardText(text) val pending = File(hostFile.parentFile, "android-clipboard.pending") try { diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt index 8021536a9a..f386ebb179 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt @@ -15,6 +15,7 @@ data class TouchGestureConfig( val longPressAction: String = ACTION_RIGHT_CLICK, val longPressMouseBehavior: String = MOUSE_BEHAVIOR_HOLD, val longPressDelay: Int = DEFAULT_DELAY_MS, + val directHoldBehavior: String = MOUSE_BEHAVIOR_CLICK, val doubleTapEnabled: Boolean = true, val doubleTapDelay: Int = DEFAULT_DELAY_MS, val twoFingerDragEnabled: Boolean = true, @@ -50,6 +51,7 @@ data class TouchGestureConfig( put(KEY_LONG_PRESS_ACTION, longPressAction) put(KEY_LONG_PRESS_MOUSE_BEHAVIOR, longPressMouseBehavior) put(KEY_LONG_PRESS_DELAY, longPressDelay) + put(KEY_DIRECT_HOLD_BEHAVIOR, directHoldBehavior) put(KEY_DOUBLE_TAP_ENABLED, doubleTapEnabled) put(KEY_DOUBLE_TAP_DELAY, doubleTapDelay) put(KEY_TWO_FINGER_DRAG_ENABLED, twoFingerDragEnabled) @@ -85,6 +87,7 @@ data class TouchGestureConfig( const val MOUSE_BEHAVIOR_HOLD = "hold" const val MOUSE_BEHAVIOR_CLICK = "click" + const val MOUSE_BEHAVIOR_NONE = "none" const val MOUSE_DRAG_MOVEMENT_DIRECT = "direct" const val MOUSE_DRAG_MOVEMENT_RELATIVE = "relative" @@ -110,6 +113,7 @@ data class TouchGestureConfig( private const val KEY_LONG_PRESS_ACTION = "longPressAction" private const val KEY_LONG_PRESS_MOUSE_BEHAVIOR = "longPressMouseBehavior" private const val KEY_LONG_PRESS_DELAY = "longPressDelay" + private const val KEY_DIRECT_HOLD_BEHAVIOR = "directHoldBehavior" private const val KEY_DOUBLE_TAP_ENABLED = "doubleTapEnabled" private const val KEY_DOUBLE_TAP_DELAY = "doubleTapDelay" private const val KEY_TWO_FINGER_DRAG_ENABLED = "twoFingerDragEnabled" @@ -155,6 +159,9 @@ data class TouchGestureConfig( obj.optString(KEY_LONG_PRESS_MOUSE_BEHAVIOR, MOUSE_BEHAVIOR_HOLD) ), longPressDelay = obj.optInt(KEY_LONG_PRESS_DELAY, DEFAULT_DELAY_MS), + directHoldBehavior = normalizeDirectHoldBehavior( + obj.optString(KEY_DIRECT_HOLD_BEHAVIOR, MOUSE_BEHAVIOR_CLICK) + ), doubleTapEnabled = obj.optBoolean(KEY_DOUBLE_TAP_ENABLED, true), doubleTapDelay = obj.optInt(KEY_DOUBLE_TAP_DELAY, DEFAULT_DELAY_MS), twoFingerDragEnabled = obj.optBoolean(KEY_TWO_FINGER_DRAG_ENABLED, true), @@ -190,6 +197,10 @@ data class TouchGestureConfig( } } + private fun normalizeDirectHoldBehavior(value: String): String { + return if (value == MOUSE_BEHAVIOR_CLICK || value == MOUSE_BEHAVIOR_NONE) value else MOUSE_BEHAVIOR_HOLD + } + private fun normalizeMouseBehavior(value: String): String { return if (value == MOUSE_BEHAVIOR_CLICK) MOUSE_BEHAVIOR_CLICK else MOUSE_BEHAVIOR_HOLD } diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchRouter.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchRouter.kt new file mode 100644 index 0000000000..27cb87659e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchRouter.kt @@ -0,0 +1,31 @@ +package com.droiddeck.launcher.input + +import com.droiddeck.launcher.session.SessionPrefs + +object TouchRouter { + enum class Route { BLOCKED, GESTURES, SCROLL, OFF, TOUCHPAD, DIRECT } + + data class Snapshot( + val uiBlocking: Boolean, + val mode: String, + val scrollLayer: Boolean, + val steamSession: Boolean, + val steamDesktopUi: Boolean, + ) + + fun decide(s: Snapshot): Route { + if (s.uiBlocking) return Route.BLOCKED + if (s.mode == SessionPrefs.TOUCH_GESTURES) return Route.GESTURES + if (s.scrollLayer) return Route.SCROLL + if (s.mode == SessionPrefs.TOUCH_OFF) return Route.OFF + return if (touchpad(s)) Route.TOUCHPAD else Route.DIRECT + } + + fun steamKeyboardZone(s: Snapshot): Boolean = s.steamSession && !s.steamDesktopUi + + private fun touchpad(s: Snapshot): Boolean = when (s.mode) { + SessionPrefs.TOUCH_PAD -> true + SessionPrefs.TOUCH_DIRECT -> false + else -> !s.steamSession || s.steamDesktopUi + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchTiming.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchTiming.kt new file mode 100644 index 0000000000..8db3c95c98 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchTiming.kt @@ -0,0 +1,9 @@ +package com.droiddeck.launcher.input + +object TouchTiming { + const val HOLD_MS = 500L + const val TAP_MS = 300L + const val CLICK_MS = 30L + const val DOUBLE_TAP_MS = 300L + const val SCROLL_STEP_PX = 36f +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt index 47f0e4b64f..b03cd03b61 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt @@ -4,6 +4,7 @@ import android.os.Handler import android.os.Looper import android.view.MotionEvent import kotlin.math.abs +import kotlin.math.hypot class TouchpadGestures( private val slopPx: Float, @@ -15,6 +16,7 @@ class TouchpadGestures( private set var bounds: android.graphics.RectF = android.graphics.RectF(0f, 0f, 1f, 1f) var sensitivity = 1.15f + var desktop = false private val handler = Handler(Looper.getMainLooper()) private var lastX = 0f @@ -27,7 +29,11 @@ class TouchpadGestures( private var secondDownAt = 0L private var secondWasTap = false private var twoFingers = false + private var scrollAnchorX = 0f private var scrollAnchorY = 0f + private var fingers = 0 + private var pinching = false + private var pinchSpan = 0f private var scrolled = false private var anchorId = -1 private var anchorStartX = 0f @@ -52,7 +58,7 @@ class TouchpadGestures( releaseClick() listener.onButton(button, true, x, y) clicked = button - handler.postDelayed(clickUp, CLICK_MS) + handler.postDelayed(clickUp, TouchTiming.CLICK_MS) } private fun releaseClick() { @@ -79,6 +85,20 @@ class TouchpadGestures( y = py.coerceIn(bounds.top, bounds.bottom) } + private fun trackMove(px: Float, py: Float) { + val dx = px - lastX + val dy = py - lastY + lastX = px; lastY = py + travelled += abs(dx) + abs(dy) + if (travelled > slopPx) { + handler.removeCallbacks(longPress) + val speed = abs(dx) + abs(dy) + val gain = sensitivity * (1f + minOf(speed / 40f, 1.5f)) + place(x + dx * gain, y + dy * gain) + listener.onMove(x, y) + } + } + fun onTouch(event: MotionEvent): Boolean { when (event.actionMasked) { MotionEvent.ACTION_DOWN -> { @@ -86,18 +106,20 @@ class TouchpadGestures( lastX = event.x; lastY = event.y downAt = event.eventTime travelled = 0f; held = false; twoFingers = false; scrolled = false; secondWasTap = false + fingers = 1; pinching = false anchorId = event.getPointerId(0); moverId = -1; holdDrag = false; scrollLocked = false - if (event.eventTime - lastTapAt < DOUBLE_TAP_MS) { + if (event.eventTime - lastTapAt < TouchTiming.DOUBLE_TAP_MS) { dragging = true listener.onButton(PointerGestures.BTN_LEFT, true, x, y) } else { dragging = false - handler.postDelayed(longPress, HOLD_MS) + handler.postDelayed(longPress, TouchTiming.HOLD_MS) } return true } MotionEvent.ACTION_POINTER_DOWN -> { handler.removeCallbacks(longPress) + fingers = maxOf(fingers, event.pointerCount) val i = event.actionIndex if (moverId == -1 && event.getPointerId(i) != anchorId) { moverId = event.getPointerId(i) @@ -111,7 +133,9 @@ class TouchpadGestures( twoFingers = true secondDownAt = event.eventTime secondWasTap = true + scrollAnchorX = (event.getX(0) + event.getX(1)) / 2f scrollAnchorY = (event.getY(0) + event.getY(1)) / 2f + pinchSpan = span(event) return true } MotionEvent.ACTION_MOVE -> { @@ -146,29 +170,49 @@ class TouchpadGestures( } else if (holdDrag) { return true } - if (twoFingers && event.pointerCount >= 2) { - val mid = (event.getY(0) + event.getY(1)) / 2f - val dy = mid - scrollAnchorY - val steps = (dy / SCROLL_STEP_PX).toInt() - if (steps != 0) { - listener.onWheel(-steps) - scrollAnchorY += steps * SCROLL_STEP_PX + if (twoFingers && event.pointerCount >= 2 && desktop) { + if (fingers >= 3) return true + val span = span(event) + if (!scrolled && !pinching && abs(span - pinchSpan) > slopPx * PINCH_SLOPS) { + pinching = true + secondWasTap = false + pinchSpan = span + } + if (pinching) { + val steps = ((span - pinchSpan) / PINCH_STEP_PX).toInt() + if (steps != 0) { + listener.onZoom(-steps) + pinchSpan += steps * PINCH_STEP_PX + } + return true + } + val midX = (event.getX(0) + event.getX(1)) / 2f + val midY = (event.getY(0) + event.getY(1)) / 2f + val dx = scrollAnchorX - midX + val dy = scrollAnchorY - midY + if (scrolled || abs(dx) + abs(dy) > slopPx) { + listener.onScroll(dx, dy) + scrollAnchorX = midX; scrollAnchorY = midY scrolled = true secondWasTap = false } return true } - val dx = event.x - lastX - val dy = event.y - lastY - lastX = event.x; lastY = event.y - travelled += abs(dx) + abs(dy) - if (travelled > slopPx) { - handler.removeCallbacks(longPress) - val speed = (abs(dx) + abs(dy)) - val gain = sensitivity * (1f + minOf(speed / 40f, 1.5f)) - place(x + dx * gain, y + dy * gain) - listener.onMove(x, y) + if (twoFingers && event.pointerCount >= 2) { + val mid = (event.getY(0) + event.getY(1)) / 2f + val dy = mid - scrollAnchorY + val steps = (dy / TouchTiming.SCROLL_STEP_PX).toInt() + if (steps != 0) { + listener.onWheel(-steps) + scrollAnchorY += steps * TouchTiming.SCROLL_STEP_PX + scrolled = true + secondWasTap = false + } + return true } + for (h in 0 until event.historySize) + trackMove(event.getHistoricalX(0, h), event.getHistoricalY(0, h)) + trackMove(event.x, event.y) return true } MotionEvent.ACTION_POINTER_UP -> { @@ -194,7 +238,12 @@ class TouchpadGestures( event.findPointerIndex(anchorId).takeIf { it >= 0 && it != event.actionIndex }?.let { lastX = event.getX(it); lastY = event.getY(it) } - if (twoFingers && secondWasTap && event.eventTime - secondDownAt < TAP_MS && !scrolled) { + if (desktop && scrolled && event.pointerCount == 2) listener.onScrollEnd() + if (fingers >= 3) { + if (event.pointerCount == 2 && secondWasTap && !scrolled && event.eventTime - downAt < TouchTiming.TAP_MS * 2) + click(PointerGestures.BTN_MIDDLE) + if (event.pointerCount == 2) secondWasTap = false + } else if (twoFingers && secondWasTap && event.eventTime - secondDownAt < TouchTiming.TAP_MS && !scrolled) { click(PointerGestures.BTN_RIGHT) secondWasTap = false } @@ -206,29 +255,30 @@ class TouchpadGestures( when { dragging -> listener.onButton(PointerGestures.BTN_LEFT, false, x, y) twoFingers -> { - if (secondWasTap && !scrolled && !cancelled && event.eventTime - downAt < TAP_MS * 2) { + if (secondWasTap && !scrolled && !cancelled && event.eventTime - downAt < TouchTiming.TAP_MS * 2) { click(PointerGestures.BTN_RIGHT) } } - !cancelled && travelled <= slopPx && event.eventTime - downAt < TAP_MS -> { + !cancelled && travelled <= slopPx && event.eventTime - downAt < TouchTiming.TAP_MS -> { click(PointerGestures.BTN_LEFT) lastTapAt = event.eventTime } } dragging = false; held = false; twoFingers = false holdDrag = false; scrollLocked = false; anchorId = -1; moverId = -1 + pinching = false; fingers = 0 return true } } return false } + private fun span(event: MotionEvent): Float = + if (event.pointerCount < 2) 0f else hypot(event.getX(0) - event.getX(1), event.getY(0) - event.getY(1)) + companion object { - private const val HOLD_MS = 500L - private const val TAP_MS = 300L - private const val CLICK_MS = 50L - private const val DOUBLE_TAP_MS = 300L - private const val SCROLL_STEP_PX = 36f + private const val PINCH_SLOPS = 3f + private const val PINCH_STEP_PX = 60f private const val HOLD_DRAG_MOVER_SLOPS = 2f private const val HOLD_DRAG_ANCHOR_SLOPS = 0.5f } diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java b/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java index e71a14cd33..140b4ace41 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchscreenGestures.java @@ -36,7 +36,7 @@ public final class TouchscreenGestures { private final Output output; private final float doubleTapSlop; private TouchGestureConfig gestureConfig = new TouchGestureConfig(); - private static final int CLICK_DELAYED_TIME = 50; + private static final int CLICK_DELAYED_TIME = 30; private Runnable delayedPress, pendingHoldClickRelease; private Runnable pendingTapPress; private final ArrayDeque pendingTapClicks = new ArrayDeque<>(); diff --git a/app/src/main/java/com/droiddeck/launcher/input/TwoFingerGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/TwoFingerGestures.kt new file mode 100644 index 0000000000..9507728b25 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/TwoFingerGestures.kt @@ -0,0 +1,205 @@ +package com.droiddeck.launcher.input + +import android.os.Handler +import android.os.Looper +import android.view.MotionEvent +import kotlin.math.abs +import kotlin.math.hypot + +class TwoFingerGestures(private val slopPx: Float, private val listener: Listener) { + interface Listener { + fun cancelTouch() + fun replay(event: MotionEvent) + fun rightClick(x: Float, y: Float) + fun scrollStart(x: Float, y: Float) + fun scroll(dx: Float, dy: Float) + fun scrollEnd() + } + + private enum class State { IDLE, PENDING, CANDIDATE, TAPPED, HELD, SCROLLING, PASSING } + + private val handler = Handler(Looper.getMainLooper()) + private var state = State.IDLE + private var x = 0f + private var y = 0f + private var twoAt = 0L + private var startSpan = 0f + private var lastX = 0f + private var lastY = 0f + private val starts = HashMap>() + private val held = ArrayList() + private val hold = Runnable { + if (state != State.CANDIDATE) return@Runnable + state = State.HELD + drop() + listener.cancelTouch() + listener.rightClick(x, y) + } + private val release = Runnable { + if (state == State.PENDING) pass(State.IDLE) + } + + fun cancel() { + if (state == State.SCROLLING) listener.scrollEnd() + handler.removeCallbacks(hold) + handler.removeCallbacks(release) + drop() + state = State.IDLE + } + + fun onTouch(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + cancel() + starts.clear() + x = event.x + y = event.y + note(event, event.actionIndex) + state = State.PENDING + keep(event) + handler.postDelayed(release, LAND_MS) + return true + } + MotionEvent.ACTION_POINTER_DOWN -> { + note(event, event.actionIndex) + when (state) { + State.PENDING -> { + handler.removeCallbacks(release) + keep(event) + if (event.pointerCount != 2) { + pass(State.PASSING) + return true + } + state = State.CANDIDATE + twoAt = event.eventTime + startSpan = span(event) + lastX = midX(event) + lastY = midY(event) + handler.postDelayed(hold, HOLD_MS) + return true + } + State.CANDIDATE -> { + keep(event) + pass(State.PASSING) + return true + } + State.SCROLLING, State.HELD, State.TAPPED -> return true + else -> Unit + } + } + MotionEvent.ACTION_MOVE -> when (state) { + State.PENDING -> { + keep(event) + if (moved(event)) pass(State.IDLE) + return true + } + State.CANDIDATE -> { + if (event.pointerCount == 2 && moved(event)) { + handler.removeCallbacks(hold) + if (abs(span(event) - startSpan) > slopPx * 2) { + keep(event) + pass(State.PASSING) + return true + } + state = State.SCROLLING + drop() + listener.cancelTouch() + lastX = midX(event) + lastY = midY(event) + listener.scrollStart(lastX, lastY) + return true + } + keep(event) + return true + } + State.SCROLLING -> { + if (event.pointerCount >= 2) { + val mx = midX(event) + val my = midY(event) + listener.scroll(lastX - mx, lastY - my) + lastX = mx + lastY = my + } + return true + } + State.TAPPED, State.HELD -> return true + else -> Unit + } + MotionEvent.ACTION_POINTER_UP -> when (state) { + State.CANDIDATE -> { + handler.removeCallbacks(hold) + keep(event) + if (event.eventTime - twoAt < TAP_MS) { + state = State.TAPPED + drop() + return true + } + pass(State.PASSING) + return true + } + State.SCROLLING, State.HELD, State.TAPPED -> return true + else -> Unit + } + MotionEvent.ACTION_UP -> { + val was = state + if (was == State.PENDING) { + keep(event) + pass(State.IDLE) + return true + } + cancel() + when (was) { + State.TAPPED -> { + listener.cancelTouch() + listener.rightClick(x, y) + return true + } + State.SCROLLING, State.HELD -> return true + else -> Unit + } + } + MotionEvent.ACTION_CANCEL -> cancel() + } + return false + } + + private fun keep(event: MotionEvent) { + held += MotionEvent.obtain(event) + } + + private fun drop() { + held.forEach { it.recycle() } + held.clear() + } + + private fun pass(next: State) { + handler.removeCallbacks(release) + handler.removeCallbacks(hold) + state = next + val events = held.toList() + held.clear() + events.forEach { + listener.replay(it) + it.recycle() + } + } + + private fun note(event: MotionEvent, index: Int) { + starts[event.getPointerId(index)] = event.getX(index) to event.getY(index) + } + + private fun moved(event: MotionEvent): Boolean = (0 until event.pointerCount).any { i -> + val start = starts[event.getPointerId(i)] ?: return@any false + hypot(event.getX(i) - start.first, event.getY(i) - start.second) > slopPx + } + + private fun span(event: MotionEvent) = hypot(event.getX(1) - event.getX(0), event.getY(1) - event.getY(0)) + private fun midX(event: MotionEvent) = (event.getX(0) + event.getX(1)) / 2f + private fun midY(event: MotionEvent) = (event.getY(0) + event.getY(1)) / 2f + + companion object { + const val LAND_MS = 250L + const val TAP_MS = 350L + const val HOLD_MS = 500L + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt index 81fabd7f7d..d3ab2b546b 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -180,7 +180,8 @@ object BwrapSpawner { val env = LinkedHashMap() request.optJSONObject("env")?.let { e -> e.keys().forEach { k -> env[k] = e.getString(k) } } if (binds.any { it.guest == "/dev" }) gpu(rootfs, root, env)?.forEach { addBind(it) } - preload(session, rootfs, env).forEach { addBind(it) } + val libc = listOf("/usr/lib/aarch64-linux-gnu/libc.so.6", "/lib/aarch64-linux-gnu/libc.so.6").map { hostPath(binds, root.path, it) } + if (preloadFits(rootfs, libc.firstOrNull { File(it).isFile } ?: libc.first())) preload(session, rootfs, env).forEach { addBind(it) } zypakShims(binds, root, dir).forEach { addBind(it) } browserSandboxes(env) return Plan(root, binds, request.optString("cwd", "/").ifEmpty { "/" }, argv, env) @@ -188,16 +189,20 @@ object BwrapSpawner { private const val GPU_DIR = "/run/droiddeck-gpu" + private val LIB_DIRS = listOf("usr/lib/aarch64-linux-gnu", "usr/lib") + private val GPU_LIBS = listOf("libdisplay-info.so.3", "libdisplay-info.so.2", "libSPIRV-Tools.so", "libSPIRV-Tools-opt.so") + + private fun runtimeLib(rootfs: String, name: String): File? = + LIB_DIRS.map { File(rootfs, "$it/$name") }.firstOrNull { it.exists() } + private fun gpu(rootfs: String, root: File, env: MutableMap): List? { - val lib = File(rootfs, "usr/lib") - val driver = File(lib, "libvulkan_freedreno.so") - if (!driver.isFile || !File("/dev/kgsl-3d0").exists()) return null + val driver = runtimeLib(rootfs, "libvulkan_freedreno.so") + if (driver == null || !File("/dev/kgsl-3d0").exists()) return null if (env.containsKey("VK_ICD_FILENAMES") || env.containsKey("VK_DRIVER_FILES")) return null if (env["BL_DESKTOP"] == "1" && env["GAMESCOPE_WAYLAND_DISPLAY"] == null) return null - val binds = ArrayList() - for (name in listOf("libvulkan_freedreno.so", "libdisplay-info.so.3", "libSPIRV-Tools.so", "libSPIRV-Tools-opt.so")) { - val f = File(lib, name) - if (!f.exists()) { Log.w(TAG, "gpu: the runtime has no $name; apps draw on the CPU"); return null } + val binds = arrayListOf(Bind(driver.canonicalPath, "$GPU_DIR/libvulkan_freedreno.so")) + for (name in GPU_LIBS) { + val f = runtimeLib(rootfs, name) ?: continue binds.add(Bind(f.canonicalPath, "$GPU_DIR/$name")) } val icd = File(root.parentFile, "freedreno_icd.json") @@ -227,6 +232,27 @@ object BwrapSpawner { return binds } + private val GLIBC_RELEASE = Regex("release version 2\\.(\\d+)") + private val GLIBC_NEED = Regex("GLIBC_2\\.(\\d+)") + private val glibcMinors = java.util.concurrent.ConcurrentHashMap() + + private fun glibcMinor(file: File, pattern: Regex, pick: (Sequence) -> Int?): Int? { + val key = "${file.path}:${file.length()}:${file.lastModified()}:${pattern.pattern}" + glibcMinors[key]?.let { return it } + val text = runCatching { String(file.readBytes(), Charsets.ISO_8859_1) }.getOrNull() ?: return null + return pick(pattern.findAll(text).map { it.groupValues[1].toInt() })?.also { glibcMinors[key] = it } + } + + internal fun preloadFits(rootfs: String, sandboxLibc: String): Boolean { + val libc = File(sandboxLibc) + if (!libc.isFile) return true + val have = glibcMinor(libc, GLIBC_RELEASE) { it.firstOrNull() } ?: return true + val libs = FileUtils.readString(File(rootfs, "etc/ld.so.preload"))?.lines() + ?.map { it.trim() }?.filter { it.startsWith("/") } ?: return true + val need = libs.mapNotNull { File(rootfs + it).takeIf { f -> f.isFile }?.let { f -> glibcMinor(f, GLIBC_NEED) { m -> m.maxOrNull() } } }.maxOrNull() ?: return true + return have >= need + } + private const val PRELOAD_DIR = "/run/droiddeck-preload" private const val NET_LINK = "etc/droiddeck-net" @@ -321,7 +347,15 @@ object BwrapSpawner { catch (e: IOException) { } if (process.isAlive) { Log.i(TAG, "sandbox $id: its bwrap is gone; stopping it") - process.destroy() + if (pid > 0) { + runCatching { android.system.Os.kill(pid, android.system.OsConstants.SIGQUIT) } + } else { + process.destroy() + } + try { + if (!process.waitFor(3, java.util.concurrent.TimeUnit.SECONDS)) process.destroyForcibly() + } catch (_: InterruptedException) { + } } }, "bwrap-$id-watch").apply { isDaemon = true; start() } val buffer = ByteArray(16384) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt index 094564f5c7..4a4857634b 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -115,19 +115,27 @@ object DesktopCatalog { !File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/appmanifest_4427310.acf").isFile const val DESKTOP_ID = "desktop-kde" + const val EMULATORS_ID = "emulators" + private const val EMULATORS_SCRIPT = "/usr/local/bin/droiddeck-emulators" - fun desktopEntry(context: Context) = Entry( - DESKTOP_ID, context.getString(R.string.content_linux_desktop), 1, BuildConfig.DESKTOP_KDE_TAG, "tar", - BuildConfig.DESKTOP_KDE_URL, BuildConfig.DESKTOP_KDE_SHA256, BuildConfig.DESKTOP_KDE_SIZE, "", - "", "", - ) + fun desktopEntry(context: Context): Entry { + val pack = DesktopPack.info(LinuxRuntime.rootDir(context)) + return Entry( + DESKTOP_ID, context.getString(R.string.content_linux_desktop), 1, pack?.tag ?: BuildConfig.DESKTOP_KDE_TAG, "tar", + pack?.url ?: BuildConfig.DESKTOP_KDE_URL, pack?.sha256 ?: BuildConfig.DESKTOP_KDE_SHA256, + pack?.size ?: BuildConfig.DESKTOP_KDE_SIZE, "", "", "", + ) + } fun desktopInstalled(context: Context): Boolean = desktopInstalled(LinuxRuntime.rootDir(context)) + fun desktopFromPack(root: File): Boolean = DesktopPack.info(root) != null + fun desktopInstalled(root: File): Boolean = !File(root, DesktopRemoval.PENDING).exists() && File(root, "usr/bin/kwin_wayland").isFile && - FileUtils.readString(File(root, ".droiddeck-pkg-$DESKTOP_ID"))?.trim() == BuildConfig.DESKTOP_KDE_TAG + FileUtils.readString(File(root, ".droiddeck-pkg-$DESKTOP_ID"))?.trim() == + (DesktopPack.info(root)?.tag ?: BuildConfig.DESKTOP_KDE_TAG) fun desktopPresent(context: Context): Boolean { val root = LinuxRuntime.rootDir(context) @@ -169,6 +177,7 @@ object DesktopCatalog { listener: LinuxRuntimeInstaller.ProgressListener?): String? { val root = LinuxRuntime.rootDir(context) if (!root.isDirectory) return context.getString(R.string.deskpkg_runtime_missing) + if (entry.id == EMULATORS_ID && desktopFromPack(root)) return installEmulators(context, entry, cancelled, listener) if (entry.sha256.isEmpty()) return context.getString(R.string.deskpkg_no_checksum, entry.name) val download = downloadFile(context, entry) val journal = journal(root, entry.id) @@ -217,11 +226,12 @@ object DesktopCatalog { check(FileUtils.writeString(journal, entryJson(entry).toString())) { "Could not record the package installation" } keepDownload = true marker(context, entry.id).delete() + if (entry.id == DESKTOP_ID && desktopFromPack(root)) DesktopPack.prepareInstall(root) if (!LinuxRuntimeInstaller.extract(context, download, root, report)) return context.getString(R.string.deskpkg_extract_failed) } } if (entry.id == DESKTOP_ID) { - cleanLegacy(context, report) + if (desktopFromPack(root)) DesktopPack.finishInstall(root) else cleanLegacy(context, report) val pending = File(root, DesktopRemoval.PENDING) check(!pending.exists() || pending.delete()) { "Could not finish desktop installation" } } @@ -239,6 +249,47 @@ object DesktopCatalog { } } + private fun installEmulators(context: Context, entry: Entry, cancelled: Downloader.Cancellation?, + listener: LinuxRuntimeInstaller.ProgressListener?): String? { + val release = RuntimeInstallService.holdForPackage(context, context.getString(R.string.deskpkg_installing, entry.name)) + val stop = java.util.concurrent.atomic.AtomicBoolean(false) + val finished = java.util.concurrent.atomic.AtomicBoolean(false) + cancelled?.let { token -> + Thread({ + try { + while (!finished.get() && !stop.get()) { + if (token.getAsBoolean()) stop.set(true) else Thread.sleep(200) + } + } catch (_: InterruptedException) { + } + }, "emulators-cancel").apply { isDaemon = true; start() } + } + try { + var failure: String? = null + val status = GuestCommand.run(context, listOf("/bin/bash", EMULATORS_SCRIPT, "install"), logName = "emulators", + cancelled = stop) { line -> + when { + line.startsWith("== STEP ") -> { + val stage = context.getString(R.string.deskpkg_installing, line.removePrefix("== STEP ")) + RuntimeInstallService.packageProgress(stage, -1) + listener?.onProgress(stage, -1) + } + line.startsWith("== FAIL ") -> failure = line.removePrefix("== FAIL ") + } + } + if (stop.get()) return context.getString(R.string.user_apps_download_failed) + if (failure != null || status != 0) return context.getString(R.string.deskpkg_install_failed) + check(FileUtils.writeString(marker(context, entry.id), entry.version)) { "Could not finish package installation" } + return null + } catch (e: Exception) { + Log.e(TAG, "install ${entry.id}", e) + return e.message ?: context.getString(R.string.deskpkg_install_failed) + } finally { + finished.set(true) + release() + } + } + private fun unzipAppImage(zip: File, target: File): Boolean { try { java.util.zip.ZipInputStream(java.io.BufferedInputStream(java.io.FileInputStream(zip))).use { zin -> diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopFileRemoval.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopFileRemoval.kt index 6d2c42b018..19c6121592 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopFileRemoval.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopFileRemoval.kt @@ -73,10 +73,42 @@ internal object DesktopFileRemoval { } } + private val RECORD = Regex("[A-Za-z0-9@._+:-]+") + + fun desktopRecords(root: File): Set { + val list = safeFile(root, "usr/share/droiddeck/pacman/desktop-packages.txt") ?: return emptySet() + if (!Files.isRegularFile(list.toPath(), NOFOLLOW_LINKS)) return emptySet() + return list.readLines().mapNotNull { line -> + line.split(' ').takeIf { it.size == 2 }?.let { "${it[0]}-${it[1]}" }?.takeIf { RECORD.matches(it) && it != "." && it != ".." } + }.toSet() + } + + fun removeRecords(root: File, records: Set) { + val lib = File(root, "var/lib/pacman") + if (Files.isSymbolicLink(File(root, "var").toPath()) || Files.isSymbolicLink(lib.toPath())) return + val local = File(lib, "local") + if (!local.isDirectory || Files.isSymbolicLink(local.toPath())) return + for (record in records) { + if (!RECORD.matches(record) || record == "." || record == "..") continue + val dir = File(local, record) + if (Files.isSymbolicLink(dir.toPath()) || !dir.isDirectory) continue + for (file in dir.listFiles().orEmpty()) { + if (Files.isSymbolicLink(file.toPath()) || file.isFile) Files.delete(file.toPath()) + } + if (!dir.delete()) throw IOException("Cannot remove $dir") + } + for (name in listOf("sync/droiddeck.db", "droiddeck-desktop")) { + val file = File(lib, name) + if (Files.isSymbolicLink(file.toPath()) || file.isFile) Files.delete(file.toPath()) + } + } + fun runtimeFiles(root: File): Set = buildSet { val database = File(root, "var/lib/pacman/local") if (!database.isDirectory || Files.isSymbolicLink(database.toPath())) throw IOException("Runtime package database missing") + val desktop = desktopRecords(root) for (pkg in database.listFiles().orEmpty()) { + if (pkg.name in desktop) continue val files = File(pkg, "files") if (!pkg.isDirectory || Files.isSymbolicLink(pkg.toPath()) || !files.isFile || Files.isSymbolicLink(files.toPath())) continue var inFiles = false diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopPack.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopPack.kt new file mode 100644 index 0000000000..3b791c5794 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopPack.kt @@ -0,0 +1,178 @@ +package com.droiddeck.launcher.runtime + +import com.droiddeck.launcher.core.FileUtils +import com.droiddeck.launcher.core.Hashes +import java.io.File +import java.nio.file.Files +import java.nio.file.LinkOption +import java.nio.file.Paths +import java.nio.file.StandardCopyOption +import java.util.zip.GZIPInputStream +import org.json.JSONObject + +internal object DesktopPack { + const val INFO = "usr/share/droiddeck/desktop-pack.json" + const val META = "usr/share/droiddeck/desktop" + private const val MANIFEST = "$META/files.tsv.gz" + private const val ORIGINALS = "$META/originals" + private const val STATUS = "var/lib/dpkg/status" + private const val STATUS_BEFORE = "var/lib/dpkg/status.droiddeck" + private const val PACK_STATUS = "$META/dpkg-status" + + data class Info(val tag: String, val url: String, val sha256: String, val size: Long) + + data class Entry(val kind: Char, val type: Char, val size: Long, val value: String, val path: String) { + companion object { + fun parse(line: String): Entry? { + val parts = line.split('\t', limit = 5) + if (parts.size != 5 || parts[0].length != 1 || parts[1].length != 1) return null + return Entry(parts[0][0], parts[1][0], parts[2].toLongOrNull() ?: return null, parts[3], parts[4]) + } + } + } + + data class Result(val removed: Int, val restored: Int, val kept: Int) + + fun info(root: File): Info? = runCatching { + val json = JSONObject(FileUtils.readString(File(root, INFO)) ?: return null) + Info(json.getString("tag"), json.getString("url"), json.getString("sha256"), json.getLong("size")) + }.getOrNull() + + fun installed(root: File): Boolean = File(root, MANIFEST).isFile + + fun entries(root: File): List = + GZIPInputStream(File(root, MANIFEST).inputStream()).bufferedReader().use { reader -> + reader.lineSequence().mapNotNull(Entry::parse).toList() + } + + fun installedSize(root: File): Long = + if (installed(root)) entries(root).filter { it.kind == 'N' && it.type == 'F' }.sumOf { it.size } else 0L + + fun prepareInstall(root: File) { + val live = File(root, STATUS) + val before = File(root, STATUS_BEFORE) + if (!before.exists() && live.isFile) Files.copy(live.toPath(), before.toPath(), StandardCopyOption.COPY_ATTRIBUTES) + } + + fun finishInstall(root: File) { + for (entry in entries(root).filter { it.kind == 'R' }.sortedByDescending { it.path.length }) { + val file = inside(root, entry.path) ?: continue + if (entry.type == 'D') file.delete() else Files.deleteIfExists(file.toPath()) + } + val live = File(root, STATUS) + val packStatus = File(root, PACK_STATUS) + if (live.isFile && !packStatus.exists()) Files.copy(live.toPath(), packStatus.toPath()) + val before = File(root, STATUS_BEFORE) + val runtime = File(File(root, ORIGINALS), STATUS) + if (before.isFile && runtime.isFile && live.isFile) { + writeStatus(live, mergeStatus(runtime.readText(), packStatus.readText(), before.readText())) + } + Files.deleteIfExists(before.toPath()) + } + + internal fun mergeStatus(base: String, target: String, mine: String): String { + val from = stanzas(base) + val into = LinkedHashMap(stanzas(target)) + val kept = stanzas(mine) + for ((key, stanza) in kept) { + if (from[key] != stanza && into[key] == from[key]) into[key] = stanza + } + for (key in from.keys) { + if (key !in kept && into[key] == from[key]) into.remove(key) + } + return into.values.joinToString("") { it + "\n\n" } + } + + private fun stanzas(text: String): Map { + val out = LinkedHashMap() + for (stanza in text.split(Regex("\n[ \t]*\n")).map { it.trim('\n') }.filter { it.isNotBlank() }) { + val fields = stanza.lines() + fun field(name: String) = fields.firstOrNull { it.startsWith("$name:") }?.substringAfter(':')?.trim().orEmpty() + out["${field("Package")}:${field("Architecture")}"] = stanza + } + return out + } + + private fun writeStatus(file: File, text: String) { + val part = LinuxRuntimeInstaller.partFile(file).toPath() + Files.deleteIfExists(part) + Files.copy(file.toPath(), part, StandardCopyOption.COPY_ATTRIBUTES) + Files.write(part, text.toByteArray(), java.nio.file.StandardOpenOption.TRUNCATE_EXISTING) + Files.move(part, file.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + } + + fun remove(root: File, progress: (Int) -> Unit = {}): Result { + val entries = entries(root) + var removed = 0 + var restored = 0 + var kept = 0 + val originals = File(root, ORIGINALS) + val live = File(root, STATUS) + val userStatus = if (live.isFile) live.readText() else null + for (entry in entries.filter { it.kind == 'C' || it.kind == 'R' }) { + val file = inside(root, entry.path) ?: continue + if (entry.type == 'D') { + file.mkdirs() + continue + } + if (entry.kind == 'C' && !entry.path.startsWith("var/lib/dpkg/") && !matchesOrMissing(file, entry)) { + kept++ + continue + } + val source = inside(originals, entry.path) ?: continue + val sourcePath = source.toPath() + if (!Files.exists(sourcePath, LinkOption.NOFOLLOW_LINKS)) continue + file.parentFile?.mkdirs() + val part = LinuxRuntimeInstaller.partFile(file).toPath() + Files.deleteIfExists(part) + if (Files.isSymbolicLink(sourcePath)) Files.createSymbolicLink(part, Files.readSymbolicLink(sourcePath)) + else Files.copy(sourcePath, part, StandardCopyOption.COPY_ATTRIBUTES) + if (Files.isDirectory(file.toPath(), LinkOption.NOFOLLOW_LINKS)) FileUtils.delete(file) + Files.move(part, file.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + restored++ + } + val added = entries.filter { it.kind == 'N' } + val directories = ArrayList() + added.forEachIndexed { index, entry -> + val file = inside(root, entry.path) + when { + file == null -> kept++ + entry.type == 'D' -> directories += file + matches(file, entry) -> { Files.deleteIfExists(file.toPath()); removed++ } + Files.exists(file.toPath(), LinkOption.NOFOLLOW_LINKS) -> kept++ + } + if (index % 2000 == 0) progress(index * 100 / added.size.coerceAtLeast(1)) + } + for (dir in directories.sortedByDescending { it.path.length }) { + if (Files.isDirectory(dir.toPath(), LinkOption.NOFOLLOW_LINKS) && dir.list()?.isEmpty() == true) dir.delete() + } + val packStatus = File(root, PACK_STATUS) + if (userStatus != null && packStatus.isFile && live.isFile) { + writeStatus(live, mergeStatus(packStatus.readText(), live.readText(), userStatus)) + } + FileUtils.delete(File(root, META)) + return Result(removed, restored, kept) + } + + private fun matchesOrMissing(file: File, entry: Entry) = + !Files.exists(file.toPath(), LinkOption.NOFOLLOW_LINKS) || matches(file, entry) + + private fun matches(file: File, entry: Entry): Boolean { + val path = file.toPath() + return when (entry.type) { + 'L' -> Files.isSymbolicLink(path) && Files.readSymbolicLink(path).toString() == entry.value + 'F' -> Files.isRegularFile(path, LinkOption.NOFOLLOW_LINKS) && file.length() == entry.size && + Hashes.sha256(file).equals(entry.value, ignoreCase = true) + else -> false + } + } + + internal fun inside(root: File, path: String): File? { + if (path.isEmpty() || path.startsWith("/")) return null + val normal = Paths.get(path).normalize() + if (normal.toString().isEmpty() || normal.startsWith("..")) return null + val parent = normal.parent + val dir = if (parent == null) root else com.droiddeck.launcher.core.ArchivePaths.inside(root, parent.toString()) ?: return null + return File(dir, normal.fileName.toString()) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt index ff244e6ad2..b050c5f7c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt @@ -18,8 +18,11 @@ internal object DesktopRemoval { private fun protected(context: Context, root: File) = DesktopFileRemoval.runtimeFiles(root) + lines(context, "emulators-keep.txt.gzip") - fun installedSize(context: Context): Long = - lines(context, "kde-remove.tsv.gzip").sumOf { line -> line.split('\t').getOrNull(1)?.toLongOrNull() ?: 0L } + fun installedSize(context: Context): Long { + val root = LinuxRuntime.rootDir(context) + if (DesktopPack.info(root) != null) return DesktopPack.installedSize(root) + return lines(context, "kde-remove.tsv.gzip").sumOf { line -> line.split('\t').getOrNull(1)?.toLongOrNull() ?: 0L } + } fun cleanLegacy(context: Context, listener: LinuxRuntimeInstaller.ProgressListener? = null) { val root = LinuxRuntime.rootDir(context) @@ -40,8 +43,12 @@ internal object DesktopRemoval { Log.i("DesktopRemoval", "LXQt: $result") } - fun remove(context: Context, listener: LinuxRuntimeInstaller.ProgressListener): String? = try { + fun remove(context: Context, listener: LinuxRuntimeInstaller.ProgressListener): String? { val root = LinuxRuntime.rootDir(context) + return if (DesktopPack.info(root) != null) removePack(context, root, listener) else removeLegacy(context, root, listener) + } + + private fun removeLegacy(context: Context, root: File, listener: LinuxRuntimeInstaller.ProgressListener): String? = try { val pending = File(root, PENDING) val marker = File(root, ".droiddeck-pkg-${DesktopCatalog.DESKTOP_ID}") val installing = DesktopCatalog.interrupted(root).firstOrNull { it.id == DesktopCatalog.DESKTOP_ID } @@ -50,12 +57,14 @@ internal object DesktopRemoval { check(version in versions && (installing == null || installing.version in versions)) { context.getString(R.string.desktop_removal_unknown) } val entries = lines(context, "kde-remove.tsv.gzip").map(DesktopFileRemoval.Entry::parse) val keep = protected(context, root) + val records = DesktopFileRemoval.desktopRecords(root) cleanLegacy(context, listener) FileUtils.writeString(pending, version!!) check(FileUtils.readString(pending)?.trim() == version) { "Could not reserve desktop removal" } if (marker.exists() && !marker.delete()) error("Could not clear desktop marker") val removing = context.getString(R.string.desktop_removing) val result = DesktopFileRemoval.remove(root, entries, keep) { listener.onProgress(removing, it) } + DesktopFileRemoval.removeRecords(root, records) for ((asset, path) in com.droiddeck.launcher.session.SessionFiles.DESKTOP_FILES) { val target = DesktopFileRemoval.safeFile(root, path) ?: continue if (!isRegularFile(target)) continue @@ -74,5 +83,29 @@ internal object DesktopRemoval { e.message ?: context.getString(R.string.deskpkg_install_failed) } + private fun removePack(context: Context, root: File, listener: LinuxRuntimeInstaller.ProgressListener): String? = try { + val pending = File(root, PENDING) + val marker = File(root, ".droiddeck-pkg-${DesktopCatalog.DESKTOP_ID}") + FileUtils.writeString(pending, DesktopPack.info(root)!!.tag) + check(pending.isFile) { "Could not reserve desktop removal" } + if (marker.exists() && !marker.delete()) error("Could not clear desktop marker") + val removing = context.getString(R.string.desktop_removing) + for ((_, path) in com.droiddeck.launcher.session.SessionFiles.DESKTOP_FILES) { + DesktopFileRemoval.safeFile(root, path)?.takeIf { isRegularFile(it) }?.delete() + } + for (path in DESKTOP_STATE) DesktopPack.inside(root, path)?.let(FileUtils::delete) + val result = if (DesktopPack.installed(root)) DesktopPack.remove(root) { listener.onProgress(removing, it) } else null + DesktopCatalog.discardDesktopInstall(context) + if (!pending.delete()) error("Could not finish desktop removal") + Log.i("DesktopRemoval", "pack: $result") + listener.onProgress(context.getString(R.string.desktop_removed), 100) + null + } catch (e: Exception) { + Log.e("DesktopRemoval", "remove", e) + e.message ?: context.getString(R.string.deskpkg_install_failed) + } + + private val DESKTOP_STATE = listOf("var/lib/PackageKit", "var/cache/swcatalog") + private fun isRegularFile(file: File) = java.nio.file.Files.isRegularFile(file.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS) } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt index 5a72e9f228..7db52a9e24 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt @@ -43,7 +43,7 @@ object GuestCommand { val fastPathKey = if (fastPath && !fakeRoot && linkDir == null && ProotFastPath.enabled(context)) ProotFastPath.key(root, binds) else null cmd += listOf( "/usr/bin/env", "-i", "HOME=/root", "USER=root", "LANG=C.UTF-8", - "PATH=/usr/local/bin:/usr/bin:/bin", "XDG_RUNTIME_DIR=${LinuxRuntime.GUEST_RUNTIME_DIR}", + "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games", "XDG_RUNTIME_DIR=${LinuxRuntime.GUEST_RUNTIME_DIR}", "XDG_DATA_HOME=/root/.local/share", "FLATPAK_BWRAP=${FlatpakManager.BWRAP}", "DROIDDECK_BWRAP_SOCKET=${BwrapSpawner.socket(context)}", "XDG_DATA_DIRS=/root/.local/share/flatpak/exports/share:/usr/local/share:/usr/share", diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 7bef53729b..81f005ab7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -115,7 +115,7 @@ public final class LinuxRuntime { public static boolean isInstalled(Context context) { if (LinuxRuntimeInstaller.isRemoving() || LinuxRuntimeInstaller.hasRemovalPending(context)) return false; File root = rootDir(context); - return new File(root, "usr/bin/gamescope").isFile() + return (new File(root, "usr/bin/gamescope").isFile() || new File(root, "usr/games/gamescope").isFile()) && (new File(root, SESSION_SCRIPT.substring(1)).isFile() || new File(root, LegacyNames.SESSION_SCRIPT.substring(1)).isFile()) && (patchedProot(context) || rootfsProotReady(context)); @@ -487,12 +487,72 @@ public final class LinuxRuntime { + "\\" + host.version + "\\" + host.machine + "\\localdomain\\-1\\"; } - public static void writeAccounts(Context context) throws IOException { + public static synchronized void writeAccounts(Context context) throws IOException { File root = rootDir(context); int uid = Process.myUid(); - Files.write(new File(root, "etc/passwd").toPath(), - ("root:x:" + uid + ":" + uid + ":root:/root:/bin/bash\n").getBytes(StandardCharsets.UTF_8)); - Files.write(new File(root, "etc/group").toPath(), - ("root:x:" + uid + ":\n").getBytes(StandardCharsets.UTF_8)); + mergeAccounts(new File(root, "etc/passwd"), 2, + "root:x:" + uid + ":" + uid + ":root:/root:/bin/bash", "root:x:0:0:root:/root:/bin/bash", uid); + mergeAccounts(new File(root, "etc/group"), 2, + "root:x:" + uid + ":", "root:x:0:", uid); + File group = new File(root, "etc/group"); + String groups = new String(Files.readAllBytes(group.toPath()), StandardCharsets.UTF_8); + writeIfChanged(group, groups, withStorageGroups(groups)); + } + + private static final String[][] STORAGE_GROUPS = { + {"sdcard_rw", "1015"}, {"media_rw", "1023"}, {"everybody", "9997"}}; + + static String withStorageGroups(String groups) { + StringBuilder out = new StringBuilder(); + List present = new ArrayList<>(); + for (String line : groups.split("\n")) { + if (line.trim().isEmpty()) continue; + String[] fields = line.split(":", -1); + if (fields.length >= 4) { + for (String[] storage : STORAGE_GROUPS) { + if (fields[0].equals(storage[0])) present.add(storage[0]); + if (!fields[2].equals(storage[1])) continue; + present.add(storage[0]); + if (!java.util.Arrays.asList(fields[3].split(",")).contains("root")) { + fields[3] = fields[3].isEmpty() ? "root" : fields[3] + ",root"; + line = String.join(":", fields); + } + } + } + out.append(line).append('\n'); + } + for (String[] storage : STORAGE_GROUPS) { + if (!present.contains(storage[0])) { + out.append(storage[0]).append(":x:").append(storage[1]).append(":root\n"); + } + } + return out.toString(); + } + + static String mergedAccounts(String existing, int idField, String own, String zero, int uid) { + StringBuilder out = new StringBuilder(own).append('\n').append(zero).append('\n'); + if (existing == null) return out.toString(); + String ownId = Integer.toString(uid); + for (String line : existing.split("\n")) { + if (line.trim().isEmpty()) continue; + String[] fields = line.split(":", -1); + if (fields.length <= idField) continue; + if (fields[0].equals("root") || fields[idField].equals("0") || fields[idField].equals(ownId)) continue; + out.append(line).append('\n'); + } + return out.toString(); + } + + private static void mergeAccounts(File file, int idField, String own, String zero, int uid) throws IOException { + String existing = file.isFile() ? new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8) : null; + writeIfChanged(file, existing, mergedAccounts(existing, idField, own, zero, uid)); + } + + private static void writeIfChanged(File file, String existing, String merged) throws IOException { + if (merged.equals(existing)) return; + File staged = File.createTempFile(file.getName(), ".staged", file.getParentFile()); + Files.write(staged.toPath(), merged.getBytes(StandardCharsets.UTF_8)); + Files.move(staged.toPath(), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING, + java.nio.file.StandardCopyOption.ATOMIC_MOVE); } } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index 5975f6501a..ee3349405f 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -35,7 +35,7 @@ public final class LinuxRuntimeInstaller { private static final String TAG = "LinuxRuntimeInstaller"; public static final String CATALOG_URL = - "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/linuxfs.json"; + "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/linuxfs-ubuntu.json"; private static final String VERSION_FILE = ".version"; @@ -88,8 +88,20 @@ public final class LinuxRuntimeInstaller { return v == null ? null : v.trim(); } + private static String catalogUrl() { + if (!com.droiddeck.launcher.BuildConfig.DEBUG) return CATALOG_URL; + try { + Object value = Class.forName("android.os.SystemProperties").getMethod("get", String.class) + .invoke(null, "debug.droiddeck.linuxfs"); + if (value instanceof String && ((String) value).startsWith("http")) return (String) value; + } catch (ReflectiveOperationException e) { + Log.w(TAG, "catalog override: " + e); + } + return CATALOG_URL; + } + public static Release fetchRelease() { - String body = Downloader.downloadString(CATALOG_URL); + String body = Downloader.downloadString(catalogUrl()); if (body == null || body.isEmpty()) return null; try { JSONObject json = new JSONObject(body); @@ -292,7 +304,7 @@ public final class LinuxRuntimeInstaller { recoverInterruptedSwap(root, staging, old); if (!discard(staging, null) || !staging.mkdirs()) return false; if (listener != null) listener.onProgress(context.getString(R.string.rtinst_extracting), -1); - if (!extract(context, archive, staging, listener)) { + if (!extract(context, archive, staging, root, listener)) { RuntimeFileTree.delete(staging, null); return false; } @@ -346,7 +358,11 @@ public final class LinuxRuntimeInstaller { return false; } new File(root, CARRY_MARKER).delete(); + try { RuntimeFileTree.dropStaleState(root); } + catch (IOException e) { Log.w(TAG, "could not clear caches left by the previous runtime", e); } discard(old, null); + try { com.droiddeck.launcher.session.SessionFiles.INSTANCE.stage(context, root, false); } + catch (Exception e) { Log.w(TAG, "could not stage the session files into the new runtime", e); } return LinuxRuntime.isInstalled(context); } catch (Exception e) { Log.e(TAG, "install", e); @@ -513,6 +529,10 @@ public final class LinuxRuntimeInstaller { // Packages extract over the live runtime and their archives list a link before the file it // names, so a kill mid-way must leave neither a truncated file nor a link to a missing one. public static boolean extract(Context context, File archive, File destination, ProgressListener listener) { + return extract(context, archive, destination, destination, listener); + } + + static boolean extract(Context context, File archive, File destination, File linkRoot, ProgressListener listener) { long entries = 0; String extracting = context.getString(R.string.rtinst_extracting); java.util.LinkedHashMap links = new java.util.LinkedHashMap<>(); @@ -537,7 +557,7 @@ public final class LinuxRuntimeInstaller { links.remove(file); links.put(file, entry.getLinkName()); } else if (entry.isLink()) { - File target = ArchivePaths.inside(destination, entry.getLinkName()); + File target = hardLinkTarget(destination, entry.getLinkName()); if (target == null) { Log.w(TAG, "skipping hard link outside the rootfs: " + entry.getLinkName()); continue; @@ -548,11 +568,11 @@ public final class LinuxRuntimeInstaller { try { Files.createLink(part.toPath(), target.toPath()); } catch (IOException | UnsupportedOperationException e) { - if (target.isFile()) { + if (!l2sLink(target, part, destination, linkRoot) && target.isFile()) { Files.copy(target.toPath(), part.toPath(), StandardCopyOption.REPLACE_EXISTING); } } - if (part.exists()) place(part, file); + if (Files.exists(part.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) place(part, file); } else if (entry.isFile()) { links.remove(file); File part = partFile(file); @@ -589,6 +609,67 @@ public final class LinuxRuntimeInstaller { } } + static File hardLinkTarget(File destination, String name) throws IOException { + java.nio.file.Path path = java.nio.file.Paths.get(name).normalize(); + java.nio.file.Path last = path.getFileName(); + if (last == null || last.toString().isEmpty() || last.toString().equals("..")) return null; + java.nio.file.Path parent = path.getParent(); + File dir = parent == null ? destination : ArchivePaths.inside(destination, parent.toString()); + return dir == null ? null : new File(dir, last.toString()); + } + + private static final String L2S = ".l2s."; + + static boolean l2sLink(File target, File link) { + return l2sLink(target, link, null, null); + } + + static boolean l2sLink(File target, File link, File tree, File linkTree) { + java.nio.file.Path here = tree == null ? null : tree.toPath().toAbsolutePath().normalize(); + java.nio.file.Path there = linkTree == null ? here : linkTree.toPath().toAbsolutePath().normalize(); + java.util.function.UnaryOperator shown = path -> { + java.nio.file.Path p = path.toAbsolutePath().normalize(); + return here == null || !p.startsWith(here) ? p : there.resolve(here.relativize(p)); + }; + java.util.function.UnaryOperator actual = path -> { + java.nio.file.Path p = path.toAbsolutePath().normalize(); + return there == null || !p.startsWith(there) ? p : here.resolve(there.relativize(p)); + }; + try { + java.nio.file.Path original = target.toPath().toAbsolutePath().normalize(); + java.nio.file.Path intermediate; + if (Files.isSymbolicLink(original)) { + intermediate = actual.apply(Files.readSymbolicLink(original)); + if (!intermediate.getFileName().toString().startsWith(L2S) || !Files.isSymbolicLink(intermediate)) return false; + java.nio.file.Path fin = actual.apply(Files.readSymbolicLink(intermediate)); + String name = fin.getFileName().toString(); + int count = Integer.parseInt(name.substring(name.length() - 4)) + 1; + java.nio.file.Path next = fin.resolveSibling(name.substring(0, name.length() - 4) + String.format(java.util.Locale.ROOT, "%04d", count)); + Files.move(fin, next, StandardCopyOption.ATOMIC_MOVE); + Files.delete(intermediate); + Files.createSymbolicLink(intermediate, shown.apply(next)); + } else { + if (!Files.isRegularFile(original, java.nio.file.LinkOption.NOFOLLOW_LINKS)) return false; + java.nio.file.Path dir = original.getParent(); + String base = L2S + original.getFileName(); + int suffix = 1; + do { + intermediate = dir.resolve(base + String.format(java.util.Locale.ROOT, "%04d", suffix++)); + } while (Files.exists(intermediate, java.nio.file.LinkOption.NOFOLLOW_LINKS) && suffix < 1000); + java.nio.file.Path fin = dir.resolve(intermediate.getFileName() + ".0002"); + Files.move(original, fin, StandardCopyOption.ATOMIC_MOVE); + Files.createSymbolicLink(intermediate, shown.apply(fin)); + Files.createSymbolicLink(original, shown.apply(intermediate)); + } + Files.deleteIfExists(link.toPath()); + Files.createSymbolicLink(link.toPath(), shown.apply(intermediate)); + return true; + } catch (IOException | RuntimeException e) { + Log.w(TAG, "l2s link " + link + " -> " + target + ": " + e); + return false; + } + } + static File partFile(File file) { return new File(file.getParentFile(), ".dd-part-" + Integer.toHexString(file.getName().hashCode())); } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt new file mode 100644 index 0000000000..1138bab0de --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RootSpawner.kt @@ -0,0 +1,201 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import android.net.LocalServerSocket +import android.net.LocalSocket +import android.os.ParcelFileDescriptor +import android.os.Process +import android.util.Log +import com.droiddeck.launcher.core.HostProcess +import com.droiddeck.launcher.session.OrphanReaper +import com.droiddeck.launcher.session.SessionPrefs +import org.json.JSONObject +import java.io.DataInputStream +import java.io.DataOutputStream +import java.io.File +import java.io.FileDescriptor +import java.io.FileInputStream +import java.io.FileOutputStream +import java.io.IOException +import java.io.InputStream +import java.io.OutputStream +import java.util.concurrent.atomic.AtomicInteger + +object RootSpawner { + private const val TAG = "RootSpawner" + fun socket(context: Context): String = "${context.packageName}.root" + private val seq = AtomicInteger() + @Volatile private var server: LocalServerSocket? = null + + @Synchronized + fun start(context: Context) { + if (server != null) return + val app = context.applicationContext + val name = socket(app) + val socket = try { + LocalServerSocket(name) + } catch (e: IOException) { + Log.e(TAG, "cannot listen on $name", e) + return + } + server = socket + Thread({ + while (true) { + val client = try { socket.accept() } catch (e: IOException) { Log.e(TAG, "accept", e); break } + Thread({ serve(app, client) }, "root-${seq.get() + 1}").apply { isDaemon = true; start() } + } + }, "root-server").apply { isDaemon = true; start() } + } + + private fun serve(context: Context, client: LocalSocket) { + val id = seq.incrementAndGet() + val received = ArrayList() + client.use { + val out = DataOutputStream(client.outputStream) + try { + if (client.peerCredentials.uid != Process.myUid()) { + Log.w(TAG, "refused root for uid ${client.peerCredentials.uid}") + return + } + val input = DataInputStream(client.inputStream) + val kind = input.readUnsignedByte() + client.ancillaryFileDescriptors?.let { received.addAll(it) } + val body = ByteArray(input.readInt()).also { input.readFully(it) } + client.ancillaryFileDescriptors?.let { received.addAll(it) } + if (kind != 'R'.code) return + run(context, JSONObject(String(body, Charsets.UTF_8)), received, client, input, out, id) + } catch (e: Exception) { + Log.e(TAG, "root $id", e) + runCatching { + frame(out, 'E', (e.message ?: e.toString()).toByteArray()) + frame(out, 'X', "1".toByteArray()) + } + } finally { + received.forEach { fd -> runCatching { android.system.Os.close(fd) } } + } + } + } + + private class Stdio(val redirect: ProcessBuilder.Redirect?, val fd: FileDescriptor?, val dup: ParcelFileDescriptor?) + + private fun stdio(fd: FileDescriptor?, write: Boolean): Stdio { + if (fd == null) return Stdio(null, null, null) + val dup = try { ParcelFileDescriptor.dup(fd) } catch (e: IOException) { return Stdio(null, fd, null) } + val path = File("/proc/self/fd/${dup.fd}") + val opens = try { + if (write) FileOutputStream(path, true).close() else FileInputStream(path).close() + true + } catch (e: IOException) { false } + if (!opens) return Stdio(null, fd, dup) + val redirect = if (write) ProcessBuilder.Redirect.appendTo(path) else ProcessBuilder.Redirect.from(path) + return Stdio(redirect, fd, dup) + } + + private fun pump(from: InputStream, to: OutputStream, name: String) = + Thread({ + val buffer = ByteArray(16384) + try { + while (true) { + val n = from.read(buffer) + if (n < 0) break + to.write(buffer, 0, n) + to.flush() + } + } catch (e: IOException) { + } finally { + runCatching { to.close() } + } + }, name).apply { isDaemon = true; start() } + + private fun run(context: Context, request: JSONObject, fds: List, client: LocalSocket, + input: DataInputStream, out: DataOutputStream, id: Int) { + val root = LinuxRuntime.rootDir(context) + val argv = request.getJSONArray("argv").let { a -> (0 until a.length()).map { a.getString(it) } } + if (argv.isEmpty()) throw IOException("no command") + val cwd = request.optString("cwd", "/root").ifEmpty { "/root" } + val cmd = LinuxRuntime.prootPrefix(context, root, cwd, true) + cmd.add(1, "--link2symlink") + LinuxRuntime.lastBinds(context).filterNot { it.startsWith("/proc/self/fd/") }.forEach { cmd.add("-b"); cmd.add(it) } + cmd.add("/usr/bin/env") + cmd.add("-i") + request.optJSONObject("env")?.let { e -> e.keys().forEach { k -> cmd.add("$k=${e.getString(k)}") } } + cmd.addAll(argv) + val builder = ProcessBuilder(cmd).directory(root) + builder.environment().apply { + clear() + put("PROOT_LOADER", LinuxRuntime.prootLoader(context).path) + put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(context).path) + if (SessionPrefs.prootNoSeccomp(context)) put("PROOT_NO_SECCOMP", "1") + LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } + } + val streams = listOf(stdio(fds.getOrNull(0), false), stdio(fds.getOrNull(1), true), stdio(fds.getOrNull(2), true)) + try { + builder.redirectInput(streams[0].redirect ?: ProcessBuilder.Redirect.PIPE) + builder.redirectOutput(streams[1].redirect ?: ProcessBuilder.Redirect.PIPE) + builder.redirectError(streams[2].redirect ?: ProcessBuilder.Redirect.PIPE) + val process = builder.start() + val pid = HostProcess.pidOf(process) + OrphanReaper.keep(pid) + Log.i(TAG, "root $id pid $pid: ${argv.joinToString(" ")}") + synchronized(out) { frame(out, 'P', pid.toString().toByteArray()) } + val pumps = ArrayList() + if (streams[0].redirect == null) { + val fd = streams[0].fd + if (fd != null) pumps.add(pump(FileInputStream(fd), process.outputStream, "root-$id-in").also { it.isDaemon = true }) + else runCatching { process.outputStream.close() } + } + if (streams[1].redirect == null) pumps.add(pump(process.inputStream, + streams[1].fd?.let { FileOutputStream(it) } ?: OutputStream.nullOutputStream(), "root-$id-out")) + if (streams[2].redirect == null) pumps.add(pump(process.errorStream, + streams[2].fd?.let { FileOutputStream(it) } ?: OutputStream.nullOutputStream(), "root-$id-err")) + Thread({ + try { + while (true) { + val kind = input.readUnsignedByte() + val body = ByteArray(input.readInt()).also { input.readFully(it) } + if (kind == 'S'.code) String(body).trim().toIntOrNull()?.let { signal(pid, it) } + } + } catch (e: IOException) { + } + if (process.isAlive) { + Log.i(TAG, "root $id: its caller is gone; stopping it") + signal(pid, android.system.OsConstants.SIGHUP) + android.os.Process.sendSignal(pid, android.system.OsConstants.SIGQUIT) + } + }, "root-$id-watch").apply { isDaemon = true; start() } + val status = process.waitFor() + pumps.filter { it.name.endsWith("-out") || it.name.endsWith("-err") }.forEach { it.join(2000) } + OrphanReaper.release(pid) + Log.i(TAG, "root $id exited $status") + runCatching { synchronized(out) { frame(out, 'X', status.toString().toByteArray()) } } + } finally { + streams.forEach { s -> runCatching { s.dup?.close() } } + } + } + + private fun signal(top: Int, signal: Int) { + val parents = HashMap() + File("/proc").listFiles()?.forEach { dir -> + val pid = dir.name.toIntOrNull() ?: return@forEach + val stat = try { File(dir, "stat").readText() } catch (e: IOException) { return@forEach } + val fields = stat.substringAfterLast(')').trim().split(' ') + fields.getOrNull(1)?.toIntOrNull()?.let { parents[pid] = it } + } + val tree = HashSet() + var grew = true + while (grew) { + grew = false + for ((pid, parent) in parents) { + if (pid !in tree && (parent == top || parent in tree)) { tree.add(pid); grew = true } + } + } + tree.forEach { runCatching { android.os.Process.sendSignal(it, signal) } } + } + + private fun frame(out: DataOutputStream, kind: Char, payload: ByteArray) { + out.writeByte(kind.code) + out.writeInt(payload.size) + out.write(payload) + out.flush() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java index 42e7f5b110..169f510991 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java @@ -109,10 +109,39 @@ public final class RuntimeFileTree { static java.util.List existingUserPaths(File from, File to) throws IOException { java.util.List paths = new java.util.ArrayList<>(); - for (String rel : userPaths(from, to)) if (exists(safePath(from, rel).toPath())) paths.add(rel); + for (String rel : userPaths(from, to)) { + if (!exists(safePath(from, rel).toPath())) continue; + if (rel.startsWith("usr/share/applications/") && exists(safePath(to, rel).toPath())) continue; + paths.add(rel); + } return paths; } + private static final String[] STALE_HOME_STATE = { + ".local/share/droiddeck/pacman", ".cache/droiddeck/pacman-restore.log", + ".cache/appstream", ".cache/discover", ".cache/fontconfig", ".cache/kwin", ".cache/ksplash", + ".cache/ksvg-elements", ".cache/plasmashell", ".cache/kwinsession.kcache", ".cache/icon-cache.kcache", + }; + private static final String[] STALE_HOME_CACHE_PREFIXES = { + "mesa_shader_cache", "ksycoca", "plasma_theme_", "qtshadercache", "event-sound-cache.tdb.", + }; + + static void dropStaleState(File runtimeRoot) throws IOException { + File home = new File(runtimeRoot, "root"); + java.util.List stale = new java.util.ArrayList<>(java.util.Arrays.asList(STALE_HOME_STATE)); + for (String n : children(new File(home, ".cache"))) { + for (String prefix : STALE_HOME_CACHE_PREFIXES) { + if (n.startsWith(prefix)) { stale.add(".cache/" + n); break; } + } + } + IOException failed = null; + for (String rel : stale) { + try { delete(safePath(home, rel), null); } + catch (IOException e) { if (failed == null) failed = e; else failed.addSuppressed(e); } + } + if (failed != null) throw failed; + } + private static java.util.List children(File dir) throws IOException { java.util.List names = new java.util.ArrayList<>(); try (DirectoryStream entries = Files.newDirectoryStream(dir.toPath())) { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt index 19ca93d5f5..f334e6cc54 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeHealth.kt @@ -11,14 +11,15 @@ object RuntimeHealth { fun brokenLibraryLinks(context: Context): List = brokenLibraryLinks(LinuxRuntime.rootDir(context)) /** A complete runtime has no library link in usr/lib whose target is missing. */ - fun brokenLibraryLinks(root: File): List { - val lib = File(root, "usr/lib") - val names = lib.list() ?: return emptyList() - return names.sorted().filter { name -> - val path = File(lib, name).toPath() - Files.isSymbolicLink(path) && !resolves(root, path) + fun brokenLibraryLinks(root: File): List = + listOf("usr/lib", "usr/lib/aarch64-linux-gnu").flatMap { dir -> + val lib = File(root, dir) + val names = lib.list() ?: return@flatMap emptyList() + names.sorted().filter { name -> + val path = File(lib, name).toPath() + Files.isSymbolicLink(path) && !resolves(root, path) + }.map { if (dir == "usr/lib") it else "aarch64-linux-gnu/$it" } } - } private fun resolves(root: File, link: Path): Boolean = try { var path = link diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 1f82f0a9fd..89caccce9e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -25,6 +25,7 @@ object SessionFiles { "usr/local/bin/droiddeck-gpu" to "usr/local/bin/droiddeck-gpu", "usr/local/bin/droiddeck-desktop-gpu" to "usr/local/bin/droiddeck-desktop-gpu", "usr/local/bin/droiddeck-desktop-window-rules" to "usr/local/bin/droiddeck-desktop-window-rules", + "usr/local/bin/droiddeck-ime" to "usr/local/bin/droiddeck-ime", "usr/local/bin/kwin_wayland_wrapper" to "usr/local/bin/kwin_wayland_wrapper", "usr/lib/firefox/defaults/pref/droiddeck.js" to "usr/lib/firefox/defaults/pref/droiddeck.js", "etc/xdg/autostart/droiddeck-clipboard.desktop" to "etc/xdg/autostart/droiddeck-clipboard.desktop", @@ -32,7 +33,7 @@ object SessionFiles { /** Puts the session's files in place; [startsSession] is true only for the call that starts the Steam session. */ fun stage(context: Context, root: File, startsSession: Boolean = false) { - if (DesktopCatalog.desktopInstalled(root)) try { DesktopCatalog.cleanLegacy(context) } + if (DesktopCatalog.desktopInstalled(root) && !DesktopCatalog.desktopFromPack(root)) try { DesktopCatalog.cleanLegacy(context) } catch (e: Exception) { Log.w(TAG, "LXQt cleanup will retry next session", e) } GameEnvironmentStore.publish(context) WinComponents.publish(context) @@ -70,6 +71,16 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-launch" to "usr/local/bin/droiddeck-steam-launch", "usr/local/bin/droiddeck-desktop-games" to "usr/local/bin/droiddeck-desktop-games", "usr/local/bin/droiddeck-desktop-bookmarks" to "usr/local/bin/droiddeck-desktop-bookmarks", + "usr/local/bin/droiddeck-downloads" to "usr/local/bin/droiddeck-downloads", + "usr/local/bin/droiddeck-root" to "usr/local/bin/droiddeck-root", + "usr/local/bin/droiddeck-text" to "usr/local/bin/droiddeck-text", + "usr/local/bin/droiddeck-snapd" to "usr/local/bin/droiddeck-snapd", + "usr/local/bin/droiddeck-emulators" to "usr/local/bin/droiddeck-emulators", + "usr/local/bin/droiddeck-snap-run" to "usr/local/bin/droiddeck-snap-run", + "usr/local/bin/droiddeck-snap-confine" to "usr/local/bin/droiddeck-snap-confine", + "usr/local/bin/droiddeck-snapctl" to "usr/local/bin/droiddeck-snapctl", + "usr/local/bin/droiddeck-systemd-run" to "usr/local/bin/systemd-run", + "usr/local/bin/droiddeck-snap-cli" to "usr/local/bin/snap", "usr/local/bin/droiddeck-steam-shim" to "usr/local/bin/droiddeck-steam-shim", "usr/local/bin/droiddeck-steam-shortcuts" to "usr/local/bin/droiddeck-steam-shortcuts", "usr/local/bin/droiddeck-xbox" to "usr/local/bin/droiddeck-xbox", @@ -235,6 +246,7 @@ object SessionFiles { Log.e(TAG, "could not write steam-compatibility-label") } writeCjkFontConfig(root, etc) + writeDesktopStrings(context, File(etc, "droiddeck").apply { mkdirs() }) val droiddeckEtc = File(etc, "droiddeck").apply { mkdirs() } val stagedSocket = File(droiddeckEtc, "bwrap-socket.staged") if (!FileUtils.writeString(stagedSocket, BwrapSpawner.socket(context) + "\n") @@ -242,6 +254,12 @@ object SessionFiles { stagedSocket.delete() Log.e(TAG, "could not write bwrap-socket") } + val stagedRoot = File(droiddeckEtc, "root-socket.staged") + if (!FileUtils.writeString(stagedRoot, com.droiddeck.launcher.runtime.RootSpawner.socket(context) + "\n") + || !stagedRoot.renameTo(File(droiddeckEtc, "root-socket"))) { + stagedRoot.delete() + Log.e(TAG, "could not write root-socket") + } BootMovie.syncFromSteam(context) val startupMovie = BootMovie.prepare(context) @@ -586,6 +604,28 @@ object SessionFiles { * The fonts themselves are bind-mounted by LinuxRuntime.bindSystemFonts() into * /usr/local/share/fonts/android; here we only need to point fontconfig at them. */ + private val DESKTOP_STRINGS = listOf( + "desktop_restore_title" to R.string.desktop_restore_title, + "desktop_restore_body" to R.string.desktop_restore_body, + "desktop_restore_done_title" to R.string.desktop_restore_done_title, + "desktop_restore_done_body" to R.string.desktop_restore_done_body, + "desktop_restore_failed_title" to R.string.desktop_restore_failed_title, + "desktop_restore_failed_body" to R.string.desktop_restore_failed_body, + ) + + private fun writeDesktopStrings(context: Context, dir: File) { + val text = DESKTOP_STRINGS.joinToString("") { (key, id) -> + key + "=" + context.getString(id).replace("\\", "\\\\").replace("%", "%%").replace("\n", "\\n") + "\n" + } + val target = File(dir, "strings") + if (FileUtils.readString(target) == text) return + val staged = File(dir, "strings.staged") + if (!FileUtils.writeString(staged, text) || !staged.renameTo(target)) { + staged.delete() + Log.e(TAG, "could not write desktop strings") + } + } + private fun writeCjkFontConfig(root: File, etc: File) { try { val confDir = File(etc, "fonts/conf.d").apply { mkdirs() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 93e15126aa..aa100039cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -309,6 +309,18 @@ object SessionPrefs { prefs(context).edit().putBoolean("lowLatency", on).apply() } + fun evdevMouse(context: Context): Boolean = prefs(context).getBoolean("evdevMouse", false) + + fun setEvdevMouse(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("evdevMouse", on).apply() + } + + fun directCursor(context: Context): Boolean = prefs(context).getBoolean("directCursor", false) + + fun setDirectCursor(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("directCursor", on).apply() + } + fun backActionsInverted(context: Context): Boolean = prefs(context).getBoolean("backActionsInverted", false) fun setBackActionsInverted(context: Context, inverted: Boolean) { 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 c3f7bc9781..682b86c98d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -757,7 +757,7 @@ class SessionService : Service() { guest.add("DROIDDECK_BWRAP_SOCKET=" + com.droiddeck.launcher.runtime.BwrapSpawner.socket(this)) guest.add("HOME=/root") guest.add("USER=root") - guest.add("PATH=/usr/local/bin:/usr/bin:/bin") + guest.add("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games") guest.add("TERM=xterm-256color") guest.add("LANG=C.UTF-8") guest.add("BL_STEAM_LANGUAGE=" + SteamLanguage.forLocale( @@ -881,7 +881,7 @@ class SessionService : Service() { } private fun addControllerEnvironment(guest: MutableList, fakeInputDir: File, sessionDir: File) { - FakeInputWriter.prepareRingSlots(fakeInputDir, 4) + FakeInputWriter.prepareRingSlots(fakeInputDir, 5) val builtinPad = SessionPrefs.builtinPad(this) val hiddenPad = SessionState.mode == MODE_STEAM && !builtinPad && !com.droiddeck.launcher.input.PadBridge.anyControllerConnected() 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 39862c0823..28768454c3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt @@ -174,7 +174,7 @@ private fun DesktopDock( val pal = LocalPalette.current val narrow = LocalNarrowPane.current val available = s.emulators.filter { !it.installed } - val flatpaks = com.droiddeck.launcher.store.StoreState.installed + val flatpaks = com.droiddeck.launcher.store.StoreState.installed.filter { f -> apps.none { it.key == "flatpak:${f.id}" } } val keys = installed.map { "emu:${it.id}" } + apps.map { "user:${it.key}" } + flatpaks.map { "flatpak:${it.id}" } var lastAt by remember { mutableStateOf(null) } var dockAt by remember { mutableStateOf(null) } 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 9e4341b725..c47439bc03 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -153,6 +153,9 @@ import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenMode +import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_CLICK +import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_HOLD +import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_NONE import kotlinx.coroutines.flow.collect import java.util.Locale @@ -263,8 +266,15 @@ class DrawerActions( val onBackActionsInverted: (Boolean) -> Unit, val lowLatency: Boolean = true, val onLowLatency: (Boolean) -> Unit = {}, + val evdevMouse: Boolean = false, + val onEvdevMouse: (Boolean) -> Unit = {}, + val directCursor: Boolean = false, + val onDirectCursor: (Boolean) -> Unit = {}, val onTouch: (String) -> Unit, val onGestureSettings: () -> Unit = {}, + val touchActive: String = "", + val directHoldBehavior: String = MOUSE_BEHAVIOR_CLICK, + val onDirectHoldBehavior: (String) -> Unit = {}, val onScreenKeys: (() -> Unit)? = null, val onScreenLayouts: (() -> Unit)? = null, val screenKeysShown: Boolean = true, @@ -565,10 +575,20 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ChoiceRow(host, "touch", stringResource(R.string.mode_touch), null, listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.drawer_touch_auto, a.touchAuto), SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_direct), SessionPrefs.TOUCH_GESTURES to stringResource(R.string.mode_touch_gestures), SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), a.touchMode, chipModifier = focus.track(page, "touch"), onPick = a.onTouch) - if (a.touchMode == SessionPrefs.TOUCH_GESTURES) { - ActionRow(stringResource(R.string.gesture_settings), null, + if (a.touchActive == SessionPrefs.TOUCH_DIRECT) + ToggleRow(host, "direct-cursor", stringResource(R.string.drawer_direct_cursor), + null, a.directCursor, + chipModifier = focus.track(page, "direct-cursor"), onChange = a.onDirectCursor) + when (a.touchActive) { + SessionPrefs.TOUCH_GESTURES -> ActionRow(stringResource(R.string.gesture_settings), null, stringResource(R.string.ctrl_edit), a.onGestureSettings, modifier = focus.track(page, "gesture-settings")) + SessionPrefs.TOUCH_DIRECT -> ChoiceRow(host, "long-press", stringResource(R.string.gesture_long_press), null, + listOf(MOUSE_BEHAVIOR_NONE to stringResource(R.string.gesture_hold_left), + MOUSE_BEHAVIOR_CLICK to stringResource(R.string.gesture_right_click), + MOUSE_BEHAVIOR_HOLD to stringResource(R.string.gesture_hold_right)), + a.directHoldBehavior, chipModifier = focus.track(page, "long-press"), + onPick = a.onDirectHoldBehavior) } if (a.onScreenKeys != null) { SettingsRow(stringResource(R.string.screen_keys), null, stacked = narrow) { @@ -628,6 +648,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ToggleRow(host, "low-latency", stringResource(R.string.drawer_low_latency), stringResource(R.string.drawer_low_latency_hint), a.lowLatency, chipModifier = focus.track(page, "low-latency"), onChange = a.onLowLatency) + ToggleRow(host, "evdev-mouse", stringResource(R.string.drawer_evdev_mouse), + null, a.evdevMouse, + chipModifier = focus.track(page, "evdev-mouse"), onChange = a.onEvdevMouse) } SettingsGroup(stringResource(R.string.drawer_keyboard)) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(8.dp)) { 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 7aefad5738..a31847a333 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -167,6 +167,10 @@ public final class WaylandCompositor { public static native void nativeSendKey(int evdev, int state); + public static native boolean nativeFocusTakesTouch(); + + public static native boolean nativeCursorInputPos(int[] out); + public static native void nativeVsync(long frameTimeNanos); public static native int nativeCompositorTid(); @@ -323,9 +327,17 @@ public final class WaylandCompositor { nativeSendSceneInput(6, dx * 256, dy * 256); } + private static float pendingDeltaX, pendingDeltaY; + public static void sendPointerDelta(float dx, float dy) { - int x = Math.round(dx * 256f), y = Math.round(dy * 256f); + // Round-to-zero per event would drop slow motion entirely; carry the remainder. + pendingDeltaX += dx * 256f; + pendingDeltaY += dy * 256f; + int x = (int) Math.floor(pendingDeltaX); + int y = (int) Math.floor(pendingDeltaY); if (x == 0 && y == 0) return; + pendingDeltaX -= x; + pendingDeltaY -= y; nativeSendSceneInput(6, x, y); } } diff --git a/app/src/main/res/values-ar/gestures.xml b/app/src/main/res/values-ar/gestures.xml index 6e4aa54682..3c16961dca 100644 --- a/app/src/main/res/values-ar/gestures.xml +++ b/app/src/main/res/values-ar/gestures.xml @@ -2,7 +2,6 @@ الإيماءات إعدادات إيماءات اللمس - خصّص إيماءات الفأرة ولوحة المفاتيح. اختر الإيماءات كوضع للمس لاستخدامها. نقرة سحب بإصبع واحد ضغط مطوّل @@ -15,6 +14,8 @@ ضغط مستمر بثلاثة أصابع ضمّ الإصبعين أو إبعادهما للتكبير والتصغير إبقاء الزر مضغوطًا + إبقاء الزر الأيسر مضغوطًا + إبقاء الزر الأيمن مضغوطًا النقر مرة واحدة مهلة الضغط المستمر الفاصل بين النقرتين diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 9317b37934..aa5889da01 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -712,6 +712,8 @@ تبلغ وحدة التحكم بمعدل 1000 هرتز بدلًا من 250 هرتز. استهلاك معالج أعلى قليلًا. لمس بزمن استجابة منخفض تتجاوز اللمسات تجميع الإطارات، فيعمل اللمس في Steam بمعدل 1000 هرتز. استهلاك معالج أعلى قليلًا. + قناة فأرة خام + المؤشر لوحة مفاتيح الكمبيوتر Android الشاشة الثانية @@ -3339,6 +3341,12 @@ %d تطبيقًا %d تطبيق + جارٍ استعادة برامجك + إعادة تثبيت التطبيقات التي أضفتها بعد تحديث DroidDeck. + تمت استعادة البرامج + التطبيقات التي أضفتها مثبتة مرة أخرى. + تعذّرت استعادة بعض البرامج + راجع ‎~/.cache/droiddeck/apt-restore.log ثم جرّب sudo apt install في Konsole. اتصال USB بطيء %1$s متصل عبر %2$s (%3$s ميغابت/ث، حوالي %4$d ميغابايت/ث)، لذا ستُحمَّل الألعاب عليه ببطء. استخدم كابل USB 3 بسرعة 5 جيجابت/ث أو أكثر، أو جرّب قلب قابس USB-C، أو استخدم محركًا أسرع. %1$s متصل عبر %2$s (%3$s ميغابت/ث، حوالي %4$d ميغابايت/ث). لا يدعم منفذ USB في هذا الجهاز سرعة أعلى، لذا ستُحمَّل الألعاب عليه ببطء. قد تكون الذاكرة الداخلية أو بطاقة microSD أسرع. diff --git a/app/src/main/res/values-b+es+419/gestures.xml b/app/src/main/res/values-b+es+419/gestures.xml index 4f5f49779b..d65a5db548 100644 --- a/app/src/main/res/values-b+es+419/gestures.xml +++ b/app/src/main/res/values-b+es+419/gestures.xml @@ -2,7 +2,6 @@ Gestos Ajustes de gestos táctiles - Personaliza los gestos de ratón y teclado. Selecciona Gestos como modo táctil para usarlos. Toque Arrastre con un dedo Pulsación prolongada @@ -15,6 +14,8 @@ Pulsación sostenida con tres dedos Pellizcar para ampliar Mantener el botón pulsado + Mantener pulsado el botón izquierdo + Mantener pulsado el botón derecho Hacer clic una vez Tiempo de pulsación sostenida Intervalo de doble toque 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 49774c13b5..142d188043 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -723,6 +723,8 @@ El control informa a 1000 Hz en lugar de 250 Hz. Usa algo más de CPU. Táctil de baja latencia Los toques omiten la agrupación de fotogramas; los controles táctiles de Steam van a 1000 Hz. Usa algo más de CPU. + Canal de ratón sin procesar + Cursor Teclado de PC Android Segunda pantalla @@ -3186,6 +3188,12 @@ %d apps %d apps + Restaurando tu software + Reinstalando las apps que agregaste después de una actualización de DroidDeck. + Software restaurado + Las apps que agregaste están instaladas otra vez. + No se pudo restaurar parte del software + Revisa ~/.cache/droiddeck/apt-restore.log y luego prueba sudo apt install en Konsole. Conexión USB lenta %1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s), así que los juegos cargarán lento. Usa un cable USB 3 de 5 Gbps o más, prueba a voltear el conector USB-C o usa una unidad más rápida. %1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s). El puerto USB de este dispositivo no admite más velocidad, así que los juegos cargarán lento. El almacenamiento interno o una microSD pueden ser más rápidos. diff --git a/app/src/main/res/values-bg/gestures.xml b/app/src/main/res/values-bg/gestures.xml index 7c05b9b60e..15898ef0ec 100644 --- a/app/src/main/res/values-bg/gestures.xml +++ b/app/src/main/res/values-bg/gestures.xml @@ -2,7 +2,6 @@ Жестове Настройки на сензорните жестове - Настройте жестовете за мишка и клавиатура. За да ги използвате, изберете сензорен режим „Жестове“. Докосване Плъзгане с един пръст Продължително натискане @@ -15,6 +14,8 @@ Задържане с три пръста Мащабиране със събиране или раздалечаване на пръстите Задържане на бутона натиснат + Задържане на левия бутон + Задържане на десния бутон Еднократно щракване Закъснение за задържане Интервал за двойно докосване diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index af647544da..86342d6437 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -704,6 +704,8 @@ Контролерът докладва при 1000 Hz вместо 250 Hz. Малко повече CPU. Докосване с ниско закъснение Докосванията пропускат групирането на кадри; управлението с докосване в Steam работи при 1000 Hz. Малко повече CPU. + Суров канал за мишка + Курсор Клавиатура за компютър Android Втори екран @@ -3199,6 +3201,12 @@ %d приложение %d приложения + Възстановяване на софтуера ви + Преинсталиране на приложенията, които добавихте, след обновяване на DroidDeck. + Софтуерът е възстановен + Добавените от вас приложения са инсталирани отново. + Част от софтуера не можа да бъде възстановена + Вижте ~/.cache/droiddeck/apt-restore.log, след това опитайте sudo apt install в Konsole. Бавна USB връзка %1$s е свързан чрез %2$s (%3$s Mbps, около %4$d MB/s), затова игрите на него ще се зареждат бавно. Използвайте USB 3 кабел за 5 Gbps или повече, обърнете USB-C щекера или използвайте по-бързо устройство. %1$s е свързан чрез %2$s (%3$s Mbps, около %4$d MB/s). USB портът на това устройство не поддържа по-висока скорост, затова игрите ще се зареждат бавно. Вътрешната памет или microSD карта може да са по-бързи. diff --git a/app/src/main/res/values-cs/gestures.xml b/app/src/main/res/values-cs/gestures.xml index 4de0b61198..3b1b30f3a1 100644 --- a/app/src/main/res/values-cs/gestures.xml +++ b/app/src/main/res/values-cs/gestures.xml @@ -2,7 +2,6 @@ Gesta Nastavení dotykových gest - Přizpůsobte gesta myši a klávesnice. Chcete-li je používat, vyberte dotykový režim Gesta. Klepnutí Tažení jedním prstem Dlouhé stisknutí @@ -15,6 +14,8 @@ Podržení třemi prsty Přiblížení sevřením či rozevřením prstů Držet tlačítko stisknuté + Držet levé tlačítko + Držet pravé tlačítko Jednou kliknout Prodleva podržení Interval dvojitého klepnutí diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0e60fbeb76..4e90ebf0a3 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -708,6 +708,8 @@ Ovladač hlásí na 1000 Hz místo 250 Hz. O něco víc CPU. Dotek s nízkým zpožděním Doteky přeskakují dávkování snímků, takže ovládání dotykem ve Steamu běží na 1000 Hz. O něco víc CPU. + Surový kanál myši + Kurzor Klávesnice PC Android Druhá obrazovka @@ -3269,6 +3271,12 @@ %d aplikace %d aplikací + Obnovování vašeho softwaru + Přeinstalace aplikací, které jste přidali, po aktualizaci DroidDecku. + Software obnoven + Aplikace, které jste přidali, jsou znovu nainstalovány. + Část softwaru se nepodařilo obnovit + Podívejte se do ~/.cache/droiddeck/apt-restore.log a pak zkuste sudo apt install v Konsoli. Pomalé připojení USB %1$s je připojen přes %2$s (%3$s Mb/s, asi %4$d MB/s), takže hry na něm se budou načítat pomalu. Použijte kabel USB 3 s rychlostí 5 Gb/s nebo vyšší, zkuste otočit konektor USB-C nebo použijte rychlejší disk. %1$s je připojen přes %2$s (%3$s Mb/s, asi %4$d MB/s). Port USB tohoto zařízení rychleji neumí, takže hry na něm se budou načítat pomalu. Interní úložiště nebo karta microSD může být rychlejší. diff --git a/app/src/main/res/values-da/gestures.xml b/app/src/main/res/values-da/gestures.xml index fdac523a68..1fd863e0d2 100644 --- a/app/src/main/res/values-da/gestures.xml +++ b/app/src/main/res/values-da/gestures.xml @@ -2,7 +2,6 @@ Bevægelser Indstillinger for berøringsbevægelser - Tilpas muse- og tastaturbevægelser. Vælg Bevægelser som berøringstilstand for at bruge dem. Tryk Træk med én finger Langt tryk @@ -15,6 +14,8 @@ Hold med tre fingre Knib for at zoome Hold knappen nede + Hold venstre knap nede + Hold højre knap nede Klik én gang Forsinkelse før hold Interval for dobbelttryk diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 67b4f3f656..58b93da88d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -704,6 +704,8 @@ Controlleren rapporterer ved 1000 Hz i stedet for 250 Hz. Lidt mere CPU. Berøring med lav forsinkelse Berøringer springer billedsamling over; Steams berøringsstyring kører ved 1000 Hz. Lidt mere CPU. + Rå musekanal + Markør PC-tastatur Android Anden skærm @@ -3199,6 +3201,12 @@ %d app %d apps + Gendanner din software + Geninstallerer de apps, du tilføjede, efter en DroidDeck-opdatering. + Software gendannet + De apps, du tilføjede, er installeret igen. + Noget software kunne ikke gendannes + Se ~/.cache/droiddeck/apt-restore.log, og prøv derefter sudo apt install i Konsole. Langsom USB-forbindelse %1$s er tilsluttet via %2$s (%3$s Mbps, ca. %4$d MB/s), så spil på den indlæses langsomt. Brug et USB 3-kabel til 5 Gbps eller mere, prøv at vende USB-C-stikket, eller brug et hurtigere drev. %1$s er tilsluttet via %2$s (%3$s Mbps, ca. %4$d MB/s). Denne enheds USB-port kan ikke køre hurtigere, så spil på den indlæses langsomt. Intern lagerplads eller et microSD-kort kan være hurtigere. diff --git a/app/src/main/res/values-de/gestures.xml b/app/src/main/res/values-de/gestures.xml index 47532cd741..1c962d656d 100644 --- a/app/src/main/res/values-de/gestures.xml +++ b/app/src/main/res/values-de/gestures.xml @@ -2,7 +2,6 @@ Gesten Touchgesten-Einstellungen - Maus- und Tastaturgesten anpassen. Wähle Gesten als Touchmodus, um sie zu verwenden. Tippen Mit einem Finger ziehen Lange drücken @@ -15,6 +14,8 @@ Mit drei Fingern halten Zum Zoomen Finger zusammen- oder auseinanderziehen Taste gedrückt halten + Linke Taste gedrückt halten + Rechte Taste gedrückt halten Einmal klicken Halteverzögerung Doppeltipp-Intervall diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dab0115eac..b07b7261b2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -704,6 +704,8 @@ Der Controller meldet mit 1000 Hz statt 250 Hz. Die CPU-Last ist etwas höher. Touch mit geringer Latenz Touch überspringt das Zusammenfassen von Frames, Steam-Touch meldet mit 1000 Hz. Die CPU-Last ist etwas höher. + Roher Mauskanal + Zeiger PC-Tastatur Android Zweiter Bildschirm @@ -3199,6 +3201,12 @@ %d App %d Apps + Deine Software wird wiederhergestellt + Die Apps, die du hinzugefügt hast, werden nach einem DroidDeck-Update neu installiert. + Software wiederhergestellt + Die Apps, die du hinzugefügt hast, sind wieder installiert. + Manche Software konnte nicht wiederhergestellt werden + Sieh in ~/.cache/droiddeck/apt-restore.log nach und versuche dann sudo apt install in Konsole. Langsame USB-Verbindung %1$s ist über %2$s verbunden (%3$s Mbit/s, etwa %4$d MB/s), daher laden Spiele darauf langsam. Nutze ein USB-3-Kabel mit 5 Gbit/s oder mehr, dreh den USB-C-Stecker um oder verwende ein schnelleres Laufwerk. %1$s ist über %2$s verbunden (%3$s Mbit/s, etwa %4$d MB/s). Der USB-Anschluss dieses Geräts kann nicht schneller, daher laden Spiele darauf langsam. Interner Speicher oder eine microSD-Karte können schneller sein. diff --git a/app/src/main/res/values-el/gestures.xml b/app/src/main/res/values-el/gestures.xml index 22d20ba936..f0bdfe451f 100644 --- a/app/src/main/res/values-el/gestures.xml +++ b/app/src/main/res/values-el/gestures.xml @@ -2,7 +2,6 @@ Χειρονομίες Ρυθμίσεις χειρονομιών αφής - Προσαρμόστε τις χειρονομίες ποντικιού και πληκτρολογίου. Επιλέξτε Χειρονομίες ως λειτουργία αφής για να τις χρησιμοποιήσετε. Πάτημα Σύρσιμο με ένα δάχτυλο Παρατεταμένο πάτημα @@ -15,6 +14,8 @@ Κράτημα με τρία δάχτυλα Μεγέθυνση με τσίμπημα Διατήρηση του κουμπιού πατημένου + Διατήρηση αριστερού κουμπιού πατημένου + Διατήρηση δεξιού κουμπιού πατημένου Ένα κλικ Καθυστέρηση κρατήματος Διάστημα διπλού πατήματος diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 293248af54..fdabd194b5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -704,6 +704,8 @@ Το χειριστήριο αναφέρει στα 1000 Hz αντί για 250 Hz. Λίγο περισσότερο CPU. Αφή χαμηλής καθυστέρησης Οι αφές παρακάμπτουν την ομαδοποίηση καρέ, οπότε ο χειρισμός αφής του Steam τρέχει στα 1000 Hz. Λίγο περισσότερο CPU. + Ακατέργαστο κανάλι ποντικιού + Δείκτης Πληκτρολόγιο PC Android Δεύτερη οθόνη @@ -3199,6 +3201,12 @@ %d εφαρμογή %d εφαρμογές + Επαναφορά του λογισμικού σας + Επανεγκατάσταση των εφαρμογών που προσθέσατε μετά από ενημέρωση του DroidDeck. + Το λογισμικό επαναφέρθηκε + Οι εφαρμογές που προσθέσατε εγκαταστάθηκαν ξανά. + Δεν ήταν δυνατή η επαναφορά ορισμένου λογισμικού + Δείτε το ~/.cache/droiddeck/apt-restore.log και μετά δοκιμάστε sudo apt install στο Konsole. Αργή σύνδεση USB Η συσκευή %1$s συνδέεται μέσω %2$s (%3$s Mbps, περίπου %4$d MB/s), οπότε τα παιχνίδια θα φορτώνουν αργά. Χρησιμοποιήστε καλώδιο USB 3 των 5 Gbps ή περισσότερο, αναποδογυρίστε το βύσμα USB-C ή χρησιμοποιήστε ταχύτερο δίσκο. Η συσκευή %1$s συνδέεται μέσω %2$s (%3$s Mbps, περίπου %4$d MB/s). Η θύρα USB αυτής της συσκευής δεν υποστηρίζει μεγαλύτερη ταχύτητα, οπότε τα παιχνίδια θα φορτώνουν αργά. Ο εσωτερικός χώρος ή μια κάρτα microSD μπορεί να είναι ταχύτερα. diff --git a/app/src/main/res/values-es/gestures.xml b/app/src/main/res/values-es/gestures.xml index 4f5f49779b..d65a5db548 100644 --- a/app/src/main/res/values-es/gestures.xml +++ b/app/src/main/res/values-es/gestures.xml @@ -2,7 +2,6 @@ Gestos Ajustes de gestos táctiles - Personaliza los gestos de ratón y teclado. Selecciona Gestos como modo táctil para usarlos. Toque Arrastre con un dedo Pulsación prolongada @@ -15,6 +14,8 @@ Pulsación sostenida con tres dedos Pellizcar para ampliar Mantener el botón pulsado + Mantener pulsado el botón izquierdo + Mantener pulsado el botón derecho Hacer clic una vez Tiempo de pulsación sostenida Intervalo de doble toque diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 786d8a8490..6222774c08 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -708,6 +708,8 @@ El mando informa a 1000 Hz en lugar de 250 Hz. Usa algo más de CPU. Táctil de baja latencia Los toques omiten la agrupación de fotogramas; los controles táctiles de Steam van a 1000 Hz. Usa algo más de CPU. + Canal de ratón sin procesar + Cursor Teclado de PC Android Segunda pantalla @@ -3236,6 +3238,12 @@ %d aplicaciones %d aplicaciones + Restaurando tu software + Reinstalando las apps que añadiste tras una actualización de DroidDeck. + Software restaurado + Las apps que añadiste vuelven a estar instaladas. + No se ha podido restaurar parte del software + Consulta ~/.cache/droiddeck/apt-restore.log y después prueba sudo apt install en Konsole. Conexión USB lenta %1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s), así que los juegos cargarán despacio. Usa un cable USB 3 de 5 Gbps o más, prueba a girar el conector USB-C o usa una unidad más rápida. %1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s). El puerto USB de este dispositivo no va más rápido, así que los juegos cargarán despacio. El almacenamiento interno o una microSD pueden ser más rápidos. diff --git a/app/src/main/res/values-fi/gestures.xml b/app/src/main/res/values-fi/gestures.xml index c92357b99a..d575b7ff77 100644 --- a/app/src/main/res/values-fi/gestures.xml +++ b/app/src/main/res/values-fi/gestures.xml @@ -2,7 +2,6 @@ Eleet Kosketuseleiden asetukset - Mukauta hiiri- ja näppäimistöeleitä. Ota ne käyttöön valitsemalla kosketustilaksi Eleet. Napautus Veto yhdellä sormella Pitkä painallus @@ -15,6 +14,8 @@ Pito kolmella sormella Zoomaa nipistämällä Pidä painike painettuna + Pidä vasen painike painettuna + Pidä oikea painike painettuna Napsauta kerran Pidon viive Kaksoisnapautuksen aikaväli diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f51b200d8b..c3df952f81 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -704,6 +704,8 @@ Ohjain raportoi 1000 Hz:n taajuudella 250 Hz:n sijaan. Hieman enemmän CPU:ta. Matalan viiveen kosketus Kosketukset ohittavat ruutujen niputuksen, joten Steamin kosketusohjaus toimii 1000 Hz:llä. Hieman enemmän CPU:ta. + Raaka hiirikanava + Osoitin PC-näppäimistö Android Toinen näyttö @@ -3199,6 +3201,12 @@ %d sovellus %d sovellusta + Ohjelmistojasi palautetaan + Lisäämiäsi sovelluksia asennetaan uudelleen DroidDeck-päivityksen jälkeen. + Ohjelmistot palautettu + Lisäämäsi sovellukset on asennettu uudelleen. + Joitakin ohjelmistoja ei voitu palauttaa + Katso ~/.cache/droiddeck/apt-restore.log ja kokeile sitten sudo apt install Konsolessa. Hidas USB-yhteys %1$s on yhdistetty %2$s-yhteydellä (%3$s Mbps, noin %4$d Mt/s), joten pelit latautuvat hitaasti. Käytä vähintään 5 Gbps:n USB 3 -kaapelia, kokeile kääntää USB-C-liitin tai käytä nopeampaa asemaa. %1$s on yhdistetty %2$s-yhteydellä (%3$s Mbps, noin %4$d Mt/s). Tämän laitteen USB-portti ei ole nopeampi, joten pelit latautuvat hitaasti. Sisäinen tallennustila tai microSD-kortti voi olla nopeampi. diff --git a/app/src/main/res/values-fr/gestures.xml b/app/src/main/res/values-fr/gestures.xml index 031725fa1a..0f1870a762 100644 --- a/app/src/main/res/values-fr/gestures.xml +++ b/app/src/main/res/values-fr/gestures.xml @@ -2,7 +2,6 @@ Gestes Paramètres des gestes tactiles - Personnalisez les gestes de souris et de clavier. Sélectionnez Gestes comme mode tactile pour les utiliser. Appui Glissement à un doigt Appui prolongé @@ -15,6 +14,8 @@ Maintien à trois doigts Pincer pour zoomer Maintenir le bouton enfoncé + Maintenir le bouton gauche enfoncé + Maintenir le bouton droit enfoncé Cliquer une fois Délai de maintien Intervalle du double appui diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b039d1f32a..251391d716 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -708,6 +708,8 @@ La manette émet à 1000 Hz au lieu de 250 Hz. Un peu plus de CPU. Tactile à faible latence Les touchers ignorent le regroupement d\'images ; les commandes tactiles Steam passent à 1000 Hz. Un peu plus de CPU. + Canal souris brut + Curseur Clavier PC Android Deuxième écran @@ -3236,6 +3238,12 @@ %d applications %d applications + Restauration de vos logiciels + Réinstallation des applis que vous avez ajoutées après une mise à jour de DroidDeck. + Logiciels restaurés + Les applis que vous avez ajoutées sont de nouveau installées. + Certains logiciels n\'ont pas pu être restaurés + Consultez ~/.cache/droiddeck/apt-restore.log, puis essayez sudo apt install dans Konsole. Connexion USB lente %1$s est connecté en %2$s (%3$s Mbit/s, environ %4$d Mo/s), les jeux qu\'il contient se chargeront donc lentement. Utilisez un câble USB 3 de 5 Gbit/s ou plus, retournez la prise USB-C ou utilisez un disque plus rapide. %1$s est connecté en %2$s (%3$s Mbit/s, environ %4$d Mo/s). Le port USB de cet appareil ne va pas plus vite, les jeux se chargeront donc lentement. Le stockage interne ou une carte microSD peut être plus rapide. diff --git a/app/src/main/res/values-hi/gestures.xml b/app/src/main/res/values-hi/gestures.xml index 12bdd6381d..5eea6440b9 100644 --- a/app/src/main/res/values-hi/gestures.xml +++ b/app/src/main/res/values-hi/gestures.xml @@ -2,7 +2,6 @@ जेस्चर टच जेस्चर सेटिंग - माउस और कीबोर्ड जेस्चर बदलें। इस्तेमाल करने के लिए टच मोड में जेस्चर चुनें। टैप एक उँगली से खींचना देर तक दबाना @@ -15,6 +14,8 @@ तीन उँगलियों से दबाए रखना पिंच करके ज़ूम करें बटन दबाए रखें + बायाँ बटन दबाए रखें + दायाँ बटन दबाए रखें एक बार क्लिक करें दबाए रखने का विलंब दो टैप के बीच का अंतराल diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 9b349768ad..d05ac8d490 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -704,6 +704,8 @@ कंट्रोलर 250 Hz के बजाय 1000 Hz पर रिपोर्ट करता है। थोड़ा ज़्यादा CPU। कम लेटेंसी टच टच फ़्रेम बैचिंग छोड़ देते हैं, इसलिए Steam का टच कंट्रोल 1000 Hz पर चलता है। थोड़ा ज़्यादा CPU। + रॉ माउस चैनल + कर्सर पीसी कीबोर्ड Android दूसरी स्क्रीन @@ -3199,6 +3201,12 @@ %d ऐप %d ऐप + आपका सॉफ़्टवेयर वापस लाया जा रहा है + DroidDeck अपडेट के बाद आपके जोड़े गए ऐप्स फिर से इंस्टॉल किए जा रहे हैं। + सॉफ़्टवेयर वापस आ गया + आपके जोड़े गए ऐप्स फिर से इंस्टॉल हो गए हैं। + कुछ सॉफ़्टवेयर वापस नहीं लाया जा सका + ~/.cache/droiddeck/apt-restore.log देखें, फिर Konsole में sudo apt install आज़माएँ। धीमा USB कनेक्शन %1$s %2$s (%3$s Mbps, लगभग %4$d MB/s) से जुड़ा है, इसलिए इस पर गेम धीरे लोड होंगे। 5 Gbps या तेज़ USB 3 केबल इस्तेमाल करें, USB-C प्लग पलटकर देखें, या तेज़ ड्राइव इस्तेमाल करें। %1$s %2$s (%3$s Mbps, लगभग %4$d MB/s) से जुड़ा है। इस डिवाइस का USB पोर्ट इससे तेज़ नहीं चलता, इसलिए गेम धीरे लोड होंगे। आंतरिक स्टोरेज या microSD कार्ड तेज़ हो सकता है। diff --git a/app/src/main/res/values-hu/gestures.xml b/app/src/main/res/values-hu/gestures.xml index e5279c2e23..946b4351ac 100644 --- a/app/src/main/res/values-hu/gestures.xml +++ b/app/src/main/res/values-hu/gestures.xml @@ -2,7 +2,6 @@ Gesztusok Érintési gesztusok beállításai - Szabd testre az egér- és billentyűzetgesztusokat. Használatukhoz válaszd a Gesztusok érintési módot. Koppintás Húzás egy ujjal Hosszú nyomás @@ -15,6 +14,8 @@ Nyomva tartás három ujjal Csippentéses nagyítás Gomb nyomva tartása + Bal gomb nyomva tartása + Jobb gomb nyomva tartása Egyszeri kattintás Nyomva tartás késleltetése Dupla koppintás időköze diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b173fd19c6..d9bfd2783b 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -704,6 +704,8 @@ A kontroller 250 Hz helyett 1000 Hz-en jelent. Kicsit több CPU. Alacsony késleltetésű érintés Az érintések kihagyják a képkockák kötegelését, így a Steam érintésvezérlése 1000 Hz-en fut. Kicsit több CPU. + Nyers egércsatorna + Kurzor PC-billentyűzet Android Második képernyő @@ -3199,6 +3201,12 @@ %d alkalmazás %d alkalmazás + Szoftverek visszaállítása + A hozzáadott alkalmazások újratelepítése egy DroidDeck-frissítés után. + Szoftverek visszaállítva + A hozzáadott alkalmazások újra telepítve vannak. + Néhány szoftvert nem sikerült visszaállítani + Nézd meg a ~/.cache/droiddeck/apt-restore.log fájlt, majd próbáld a sudo apt install parancsot a Konsole-ban. Lassú USB-kapcsolat A(z) %1$s %2$s kapcsolaton csatlakozik (%3$s Mbps, kb. %4$d MB/s), ezért a rajta lévő játékok lassan töltődnek be. Használj legalább 5 Gbps-os USB 3 kábelt, fordítsd meg az USB-C csatlakozót, vagy használj gyorsabb meghajtót. A(z) %1$s %2$s kapcsolaton csatlakozik (%3$s Mbps, kb. %4$d MB/s). Az eszköz USB-portja nem tud gyorsabb lenni, ezért a játékok lassan töltődnek be. A belső tárhely vagy egy microSD-kártya gyorsabb lehet. diff --git a/app/src/main/res/values-in/gestures.xml b/app/src/main/res/values-in/gestures.xml index 3bf4b33e56..923583c756 100644 --- a/app/src/main/res/values-in/gestures.xml +++ b/app/src/main/res/values-in/gestures.xml @@ -2,7 +2,6 @@ Gestur Setelan gestur layar sentuh - Sesuaikan gestur mouse dan keyboard. Pilih Gestur sebagai mode sentuh untuk menggunakannya. Ketuk Seret dengan satu jari Tekan lama @@ -15,6 +14,8 @@ Tahan dengan tiga jari Cubit untuk memperbesar Tetap tekan tombol + Tetap tekan tombol kiri + Tetap tekan tombol kanan Klik sekali Jeda sebelum menahan Interval ketuk dua kali diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index f403919e1e..cf43704036 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -702,6 +702,8 @@ Pengontrol melapor pada 1000 Hz, bukan 250 Hz. Sedikit lebih banyak CPU. Sentuh latensi rendah Sentuhan melewati pengelompokan frame, jadi kontrol sentuh Steam berjalan pada 1000 Hz. Sedikit lebih banyak CPU. + Kanal mouse mentah + Kursor Keyboard PC Android Layar kedua @@ -3188,6 +3190,12 @@ %d aplikasi + Memulihkan perangkat lunak Anda + Menginstal ulang aplikasi yang Anda tambahkan setelah pembaruan DroidDeck. + Perangkat lunak dipulihkan + Aplikasi yang Anda tambahkan sudah terinstal lagi. + Beberapa perangkat lunak tidak dapat dipulihkan + Lihat ~/.cache/droiddeck/apt-restore.log, lalu coba sudo apt install di Konsole. Koneksi USB lambat %1$s terhubung melalui %2$s (%3$s Mbps, sekitar %4$d MB/s), jadi game di dalamnya akan dimuat lambat. Gunakan kabel USB 3 berkecepatan 5 Gbps atau lebih, coba balik colokan USB-C, atau gunakan drive yang lebih cepat. %1$s terhubung melalui %2$s (%3$s Mbps, sekitar %4$d MB/s). Port USB perangkat ini tidak bisa lebih cepat, jadi game akan dimuat lambat. Penyimpanan internal atau kartu microSD mungkin lebih cepat. diff --git a/app/src/main/res/values-it/gestures.xml b/app/src/main/res/values-it/gestures.xml index b9a3147f48..b3a530b239 100644 --- a/app/src/main/res/values-it/gestures.xml +++ b/app/src/main/res/values-it/gestures.xml @@ -2,7 +2,6 @@ Gesti Impostazioni dei gesti tattili - Personalizza i gesti di mouse e tastiera. Seleziona Gesti come modalità tattile per usarli. Tocco Trascinamento con un dito Pressione prolungata @@ -15,6 +14,8 @@ Pressione con tre dita Pizzica per ingrandire Tieni premuto il pulsante + Tieni premuto il pulsante sinistro + Tieni premuto il pulsante destro Clic singolo Ritardo della pressione Intervallo del doppio tocco diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 82c7900203..3730fa73de 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -706,6 +706,8 @@ Il controller invia dati a 1000 Hz invece di 250 Hz. Un po\' più di CPU. Touch a bassa latenza I tocchi saltano il raggruppamento dei frame; i controlli touch di Steam passano a 1000 Hz. Un po\' più di CPU. + Canale mouse grezzo + Cursore Tastiera PC Android Secondo schermo @@ -3234,6 +3236,12 @@ %d app %d app + Ripristino del software + Reinstallazione delle app che hai aggiunto dopo un aggiornamento di DroidDeck. + Software ripristinato + Le app che hai aggiunto sono di nuovo installate. + Non è stato possibile ripristinare alcuni software + Controlla ~/.cache/droiddeck/apt-restore.log, poi prova sudo apt install in Konsole. Connessione USB lenta %1$s è collegato tramite %2$s (%3$s Mbps, circa %4$d MB/s), quindi i giochi si caricheranno lentamente. Usa un cavo USB 3 da 5 Gbps o più, prova a girare il connettore USB-C o usa un\'unità più veloce. %1$s è collegato tramite %2$s (%3$s Mbps, circa %4$d MB/s). La porta USB di questo dispositivo non va più veloce, quindi i giochi si caricheranno lentamente. La memoria interna o una microSD potrebbero essere più veloci. diff --git a/app/src/main/res/values-ja/gestures.xml b/app/src/main/res/values-ja/gestures.xml index 961a4ec218..eca0f49101 100644 --- a/app/src/main/res/values-ja/gestures.xml +++ b/app/src/main/res/values-ja/gestures.xml @@ -2,7 +2,6 @@ ジェスチャー タッチジェスチャーの設定 - マウスとキーボードのジェスチャーを設定します。使用するにはタッチモードで「ジェスチャー」を選択してください。 タップ 1本指でドラッグ 長押し @@ -15,6 +14,8 @@ 3本指で長押し ピンチで拡大・縮小 ボタンを押したままにする + 左ボタンを押したままにする + 右ボタンを押したままにする 1回クリック 長押しの待ち時間 ダブルタップの間隔 diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a9f626ed2f..f829ce0016 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -704,6 +704,8 @@ コントローラーが 250 Hz ではなく 1000 Hz で報告されます。CPU 使用率がわずかに上がります。 低遅延タッチ タッチはフレームの結合を省略し、Steam のタッチは 1000 Hz で報告されます。CPU 使用率がわずかに上がります。 + 生のマウス経路 + カーソル PCキーボード Android セカンドスクリーン @@ -3175,6 +3177,12 @@ %d 個のアプリ + ソフトウェアを復元しています + DroidDeck の更新後、追加したアプリを再インストールしています。 + ソフトウェアを復元しました + 追加したアプリが再びインストールされました。 + 一部のソフトウェアを復元できませんでした + ~/.cache/droiddeck/apt-restore.log を確認してから、Konsole で sudo apt install を試してください。 USB 接続が低速です %1$s は %2$s(%3$s Mbps、約 %4$d MB/s)で接続されているため、ゲームの読み込みが遅くなります。5 Gbps 以上の USB 3 ケーブルを使うか、USB-C プラグを裏返すか、より高速なドライブを使ってください。 %1$s は %2$s(%3$s Mbps、約 %4$d MB/s)で接続されています。この端末の USB ポートはこれ以上速くならないため、ゲームの読み込みが遅くなります。内部ストレージや microSD カードの方が速い場合があります。 diff --git a/app/src/main/res/values-ko/gestures.xml b/app/src/main/res/values-ko/gestures.xml index 9f32380c4d..adae0128d8 100644 --- a/app/src/main/res/values-ko/gestures.xml +++ b/app/src/main/res/values-ko/gestures.xml @@ -2,7 +2,6 @@ 제스처 터치 제스처 설정 - 마우스와 키보드 제스처를 맞춤 설정합니다. 사용하려면 터치 모드에서 제스처를 선택하세요. 탭 한 손가락 드래그 길게 누르기 @@ -15,6 +14,8 @@ 세 손가락 길게 누르기 손가락을 모으거나 벌려 확대/축소 버튼을 누른 상태로 유지 + 왼쪽 버튼을 누른 상태로 유지 + 오른쪽 버튼을 누른 상태로 유지 한 번 클릭 길게 누르기 대기 시간 두 번 탭 간격 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index a1d53bb1d6..a9b940a42a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -704,6 +704,8 @@ 컨트롤러가 250 Hz 대신 1000 Hz로 보고됩니다. CPU 사용량이 약간 늘어납니다. 저지연 터치 터치가 프레임 병합을 건너뛰고 Steam 터치가 1000 Hz로 보고됩니다. CPU 사용량이 약간 늘어납니다. + 원시 마우스 채널 + 커서 PC 키보드 Android 보조 화면 @@ -3175,6 +3177,12 @@ 앱 %d개 + 소프트웨어 복원 중 + DroidDeck 업데이트 후 추가한 앱을 다시 설치하고 있습니다. + 소프트웨어 복원됨 + 추가한 앱이 다시 설치되었습니다. + 일부 소프트웨어를 복원하지 못했습니다 + ~/.cache/droiddeck/apt-restore.log를 확인한 다음 Konsole에서 sudo apt install을 시도하세요. USB 연결이 느립니다 %1$s이(가) %2$s(%3$s Mbps, 약 %4$d MB/s)로 연결되어 게임 로딩이 느립니다. 5 Gbps 이상의 USB 3 케이블을 사용하거나, USB-C 플러그를 뒤집어 꽂거나, 더 빠른 드라이브를 사용하세요. %1$s이(가) %2$s(%3$s Mbps, 약 %4$d MB/s)로 연결되어 있습니다. 이 기기의 USB 포트는 더 빠르게 동작하지 않아 게임 로딩이 느립니다. 내부 저장소나 microSD 카드가 더 빠를 수 있습니다. diff --git a/app/src/main/res/values-ms/gestures.xml b/app/src/main/res/values-ms/gestures.xml index 67f5d20911..d47bfc09e8 100644 --- a/app/src/main/res/values-ms/gestures.xml +++ b/app/src/main/res/values-ms/gestures.xml @@ -2,7 +2,6 @@ Gerak isyarat Tetapan gerak isyarat sentuhan - Sesuaikan gerak isyarat tetikus dan papan kekunci. Pilih Gerak isyarat sebagai mod sentuhan untuk menggunakannya. Ketik Seret dengan satu jari Tekan lama @@ -15,6 +14,8 @@ Tahan dengan tiga jari Cubit untuk zum Kekalkan butang ditekan + Kekalkan butang kiri ditekan + Kekalkan butang kanan ditekan Klik sekali Lengah sebelum menahan Sela ketikan dua kali diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 54f9d2bf89..136222f452 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -702,6 +702,8 @@ Pengawal melapor pada 1000 Hz dan bukan 250 Hz. Sedikit lebih banyak CPU. Sentuh kependaman rendah Sentuhan melangkau pengumpulan bingkai, jadi kawalan sentuh Steam berjalan pada 1000 Hz. Sedikit lebih banyak CPU. + Saluran tetikus mentah + Kursor Papan kekunci PC Android Skrin kedua @@ -3173,6 +3175,12 @@ %d apl + Memulihkan perisian anda + Memasang semula apl yang anda tambah selepas kemas kini DroidDeck. + Perisian dipulihkan + Apl yang anda tambah dipasang semula. + Sesetengah perisian tidak dapat dipulihkan + Lihat ~/.cache/droiddeck/apt-restore.log, kemudian cuba sudo apt install dalam Konsole. Sambungan USB perlahan %1$s disambungkan melalui %2$s (%3$s Mbps, kira-kira %4$d MB/s), jadi permainan padanya akan dimuatkan perlahan. Gunakan kabel USB 3 berkadar 5 Gbps atau lebih, cuba terbalikkan palam USB-C atau gunakan pemacu yang lebih pantas. %1$s disambungkan melalui %2$s (%3$s Mbps, kira-kira %4$d MB/s). Port USB peranti ini tidak boleh lebih pantas, jadi permainan akan dimuatkan perlahan. Storan dalaman atau kad microSD mungkin lebih pantas. diff --git a/app/src/main/res/values-nb/gestures.xml b/app/src/main/res/values-nb/gestures.xml index 4f41438505..ee01f0e3a5 100644 --- a/app/src/main/res/values-nb/gestures.xml +++ b/app/src/main/res/values-nb/gestures.xml @@ -2,7 +2,6 @@ Bevegelser Innstillinger for berøringsbevegelser - Tilpass muse- og tastaturbevegelser. Velg Bevegelser som berøringsmodus for å bruke dem. Trykk Dra med én finger Langt trykk @@ -15,6 +14,8 @@ Hold med tre fingre Knip for å zoome Hold knappen nede + Hold venstre knapp nede + Hold høyre knapp nede Klikk én gang Forsinkelse før hold Intervall for dobbelttrykk diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index da7aaae341..9f30307b75 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -704,6 +704,8 @@ Kontrolleren rapporterer ved 1000 Hz i stedet for 250 Hz. Litt mer CPU. Berøring med lav forsinkelse Berøringer hopper over bildeinnsamling; Steams berøringsstyring går ved 1000 Hz. Litt mer CPU. + Rå musekanal + Peker PC-tastatur Android Andre skjerm @@ -3199,6 +3201,12 @@ %d app %d apper + Gjenoppretter programvaren din + Installerer appene du la til på nytt etter en DroidDeck-oppdatering. + Programvare gjenopprettet + Appene du la til er installert igjen. + Noe programvare kunne ikke gjenopprettes + Se ~/.cache/droiddeck/apt-restore.log, og prøv deretter sudo apt install i Konsole. Treg USB-tilkobling %1$s er koblet til via %2$s (%3$s Mbps, ca. %4$d MB/s), så spill på den lastes inn tregt. Bruk en USB 3-kabel for 5 Gbps eller mer, prøv å snu USB-C-pluggen, eller bruk en raskere stasjon. %1$s er koblet til via %2$s (%3$s Mbps, ca. %4$d MB/s). USB-porten på denne enheten kan ikke gå raskere, så spill lastes inn tregt. Intern lagring eller et microSD-kort kan være raskere. diff --git a/app/src/main/res/values-nl/gestures.xml b/app/src/main/res/values-nl/gestures.xml index a970becd5c..007027c157 100644 --- a/app/src/main/res/values-nl/gestures.xml +++ b/app/src/main/res/values-nl/gestures.xml @@ -2,7 +2,6 @@ Gebaren Instellingen voor aanraakgebaren - Pas muis- en toetsenbordgebaren aan. Kies Gebaren als aanraakmodus om ze te gebruiken. Tikken Slepen met één vinger Lang indrukken @@ -15,6 +14,8 @@ Vasthouden met drie vingers Knijpen om te zoomen Knop ingedrukt houden + Linkermuisknop ingedrukt houden + Rechtermuisknop ingedrukt houden Eenmaal klikken Wachttijd voor vasthouden Interval voor dubbeltikken diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3f0c48f330..b637c5e1ee 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -704,6 +704,8 @@ De controller rapporteert op 1000 Hz in plaats van 250 Hz. Iets meer CPU. Aanraking met lage latentie Aanrakingen slaan framebundeling over; Steam-aanraakbediening op 1000 Hz. Iets meer CPU. + Ruw muiskanaal + Cursor Pc-toetsenbord Android Tweede scherm @@ -3199,6 +3201,12 @@ %d app %d apps + Je software wordt hersteld + De apps die je hebt toegevoegd worden na een DroidDeck-update opnieuw geïnstalleerd. + Software hersteld + De apps die je hebt toegevoegd zijn weer geïnstalleerd. + Sommige software kon niet worden hersteld + Bekijk ~/.cache/droiddeck/apt-restore.log en probeer daarna sudo apt install in Konsole. Trage USB-verbinding %1$s is verbonden via %2$s (%3$s Mbps, ongeveer %4$d MB/s), dus games erop laden traag. Gebruik een USB 3-kabel van 5 Gbps of sneller, draai de USB-C-stekker om of gebruik een snellere schijf. %1$s is verbonden via %2$s (%3$s Mbps, ongeveer %4$d MB/s). De USB-poort van dit apparaat kan niet sneller, dus games laden traag. Interne opslag of een microSD-kaart kan sneller zijn. diff --git a/app/src/main/res/values-pl/gestures.xml b/app/src/main/res/values-pl/gestures.xml index 8325469e7e..78fbf8cf1b 100644 --- a/app/src/main/res/values-pl/gestures.xml +++ b/app/src/main/res/values-pl/gestures.xml @@ -2,7 +2,6 @@ Gesty Ustawienia gestów dotykowych - Dostosuj gesty myszy i klawiatury. Aby ich używać, wybierz Gesty jako tryb dotyku. Stuknięcie Przeciąganie jednym palcem Długie naciśnięcie @@ -15,6 +14,8 @@ Przytrzymanie trzema palcami Uszczypnij, aby przybliżyć Trzymaj przycisk wciśnięty + Trzymaj lewy przycisk wciśnięty + Trzymaj prawy przycisk wciśnięty Kliknij raz Czas przytrzymania Odstęp podwójnego stuknięcia diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 6949a8506e..7c199ece11 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -708,6 +708,8 @@ Kontroler raportuje z częstotliwością 1000 Hz zamiast 250 Hz. Nieco więcej CPU. Dotyk o niskim opóźnieniu Dotknięcia pomijają łączenie klatek; sterowanie dotykiem Steam działa z 1000 Hz. Nieco więcej CPU. + Surowy kanał myszy + Kursor Klawiatura PC Android Drugi ekran @@ -3272,6 +3274,12 @@ %d aplikacji %d aplikacji + Przywracanie oprogramowania + Ponowna instalacja dodanych aplikacji po aktualizacji DroidDeck. + Oprogramowanie przywrócone + Dodane aplikacje są ponownie zainstalowane. + Nie udało się przywrócić części oprogramowania + Sprawdź ~/.cache/droiddeck/apt-restore.log, a potem spróbuj sudo apt install w Konsole. Wolne połączenie USB %1$s jest podłączony przez %2$s (%3$s Mb/s, około %4$d MB/s), więc gry na nim będą wczytywać się wolno. Użyj kabla USB 3 o przepustowości 5 Gb/s lub większej, odwróć wtyczkę USB-C albo użyj szybszego dysku. %1$s jest podłączony przez %2$s (%3$s Mb/s, około %4$d MB/s). Port USB tego urządzenia nie działa szybciej, więc gry będą wczytywać się wolno. Pamięć wewnętrzna lub karta microSD mogą być szybsze. diff --git a/app/src/main/res/values-pt-rPT/gestures.xml b/app/src/main/res/values-pt-rPT/gestures.xml index 2d8f3cf8ea..19b89be40f 100644 --- a/app/src/main/res/values-pt-rPT/gestures.xml +++ b/app/src/main/res/values-pt-rPT/gestures.xml @@ -2,7 +2,6 @@ Gestos Configurações de gestos de toque - Personalize os gestos de rato e teclado. Selecione Gestos como modo de toque para usá-los. Toque Arrastar com um dedo Toque longo @@ -15,6 +14,8 @@ Manter premido com três dedos Pinçar para ampliar Manter o botão premido + Manter o botão esquerdo premido + Manter o botão direito premido Clicar uma vez Tempo para manter premido Intervalo de toque duplo diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index b50107f660..5c52931671 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -706,6 +706,8 @@ O comando comunica a 1000 Hz em vez de 250 Hz. Um pouco mais de CPU. Toque de baixa latência Os toques ignoram o agrupamento de fotogramas; os controlos táteis do Steam passam a 1000 Hz. Um pouco mais de CPU. + Canal de rato em bruto + Cursor Teclado de PC Android Segundo ecrã @@ -3234,6 +3236,12 @@ %d aplicações %d aplicações + A restaurar o seu software + A reinstalar as apps que adicionou após uma atualização do DroidDeck. + Software restaurado + As apps que adicionou estão novamente instaladas. + Não foi possível restaurar algum software + Consulte ~/.cache/droiddeck/apt-restore.log e depois experimente sudo apt install no Konsole. Ligação USB lenta %1$s está ligado por %2$s (%3$s Mbps, cerca de %4$d MB/s), por isso os jogos vão carregar devagar. Use um cabo USB 3 de 5 Gbps ou mais, experimente virar a ficha USB-C ou use uma unidade mais rápida. %1$s está ligado por %2$s (%3$s Mbps, cerca de %4$d MB/s). A porta USB deste dispositivo não é mais rápida, por isso os jogos vão carregar devagar. O armazenamento interno ou um cartão microSD pode ser mais rápido. diff --git a/app/src/main/res/values-pt/gestures.xml b/app/src/main/res/values-pt/gestures.xml index c345617df7..42225990f6 100644 --- a/app/src/main/res/values-pt/gestures.xml +++ b/app/src/main/res/values-pt/gestures.xml @@ -2,7 +2,6 @@ Gestos Configurações de gestos de toque - Personalize os gestos de mouse e teclado. Selecione Gestos como modo de toque para usá-los. Toque Arrastar com um dedo Toque longo @@ -15,6 +14,8 @@ Manter pressionado com três dedos Pinçar para ampliar Manter o botão pressionado + Manter o botão esquerdo pressionado + Manter o botão direito pressionado Clicar uma vez Tempo para manter pressionado Intervalo de toque duplo diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2a39f9d91d..9991c8d9d1 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -706,6 +706,8 @@ O controle envia dados a 1000 Hz em vez de 250 Hz. Um pouco mais de CPU. Toque de baixa latência Os toques ignoram o agrupamento de quadros; os controles de toque da Steam vão a 1000 Hz. Um pouco mais de CPU. + Canal de mouse bruto + Cursor Teclado de PC Android Segunda tela @@ -3234,6 +3236,12 @@ %d apps %d apps + Restaurando seus programas + Reinstalando os apps que você adicionou após uma atualização do DroidDeck. + Programas restaurados + Os apps que você adicionou estão instalados de novo. + Não foi possível restaurar alguns programas + Veja ~/.cache/droiddeck/apt-restore.log e depois tente sudo apt install no Konsole. Conexão USB lenta %1$s está conectado por %2$s (%3$s Mbps, cerca de %4$d MB/s), então os jogos nele vão carregar devagar. Use um cabo USB 3 de 5 Gbps ou mais, tente virar o conector USB-C ou use uma unidade mais rápida. %1$s está conectado por %2$s (%3$s Mbps, cerca de %4$d MB/s). A porta USB deste aparelho não fica mais rápida, então os jogos vão carregar devagar. O armazenamento interno ou um cartão microSD pode ser mais rápido. diff --git a/app/src/main/res/values-ro/gestures.xml b/app/src/main/res/values-ro/gestures.xml index 6fb7b66fda..50ab4e0ab5 100644 --- a/app/src/main/res/values-ro/gestures.xml +++ b/app/src/main/res/values-ro/gestures.xml @@ -2,7 +2,6 @@ Gesturi Setări pentru gesturile tactile - Personalizează gesturile de mouse și tastatură. Selectează Gesturi ca mod tactil pentru a le folosi. Atingere Tragere cu un deget Apăsare lungă @@ -15,6 +14,8 @@ Menținere cu trei degete Apropie sau depărtează degetele pentru zoom Ține butonul apăsat + Ține butonul stâng apăsat + Ține butonul drept apăsat Un singur clic Durata până la menținere Intervalul atingerii duble diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 0731ecf801..401edd916c 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -706,6 +706,8 @@ Controllerul raportează la 1000 Hz în loc de 250 Hz. Consum CPU puțin mai mare. Atingere cu latență mică Atingerile sar peste gruparea cadrelor, deci controlul tactil Steam rulează la 1000 Hz. Consum CPU puțin mai mare. + Canal brut de mouse + Cursor Tastatură de PC Android Al doilea ecran @@ -3234,6 +3236,12 @@ %d aplicații %d de aplicații + Se restaurează software-ul + Se reinstalează aplicațiile adăugate de tine după o actualizare DroidDeck. + Software restaurat + Aplicațiile adăugate de tine sunt instalate din nou. + O parte din software nu a putut fi restaurată + Vezi ~/.cache/droiddeck/apt-restore.log, apoi încearcă sudo apt install în Konsole. Conexiune USB lentă %1$s este conectat prin %2$s (%3$s Mbps, aproximativ %4$d MB/s), așa că jocurile de pe el se vor încărca lent. Folosește un cablu USB 3 de 5 Gbps sau mai rapid, încearcă să întorci mufa USB-C sau folosește o unitate mai rapidă. %1$s este conectat prin %2$s (%3$s Mbps, aproximativ %4$d MB/s). Portul USB al acestui dispozitiv nu poate merge mai repede, așa că jocurile se vor încărca lent. Memoria internă sau un card microSD pot fi mai rapide. diff --git a/app/src/main/res/values-ru/gestures.xml b/app/src/main/res/values-ru/gestures.xml index bb758cb1b5..4c630b780d 100644 --- a/app/src/main/res/values-ru/gestures.xml +++ b/app/src/main/res/values-ru/gestures.xml @@ -2,7 +2,6 @@ Жесты Настройки сенсорных жестов - Настройте жесты мыши и клавиатуры. Чтобы использовать их, выберите режим касаний «Жесты». Касание Перетаскивание одним пальцем Долгое нажатие @@ -15,6 +14,8 @@ Удержание тремя пальцами Масштабирование щипком Удерживать кнопку нажатой + Удерживать левую кнопку нажатой + Удерживать правую кнопку нажатой Один щелчок Задержка удержания Интервал двойного касания diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7e108ca4ef..412f2ccc0d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -710,6 +710,8 @@ Контроллер опрашивается на 1000 Гц вместо 250 Гц. Немного больше нагрузки на CPU. Сенсор с низкой задержкой Касания идут без объединения кадров; сенсорное управление Steam работает на 1000 Гц. Немного больше нагрузки на CPU. + Сырой канал мыши + Курсор Клавиатура ПК Android Второй экран @@ -3271,6 +3273,12 @@ %d приложений %d приложения + Восстановление программ + Повторная установка добавленных вами приложений после обновления DroidDeck. + Программы восстановлены + Добавленные вами приложения снова установлены. + Не удалось восстановить часть программ + Посмотрите ~/.cache/droiddeck/apt-restore.log, затем попробуйте sudo apt install в Konsole. Медленное подключение USB %1$s подключён через %2$s (%3$s Мбит/с, около %4$d МБ/с), поэтому игры на нём будут загружаться медленно. Используйте кабель USB 3 на 5 Гбит/с или быстрее, попробуйте перевернуть разъём USB-C или возьмите более быстрый накопитель. %1$s подключён через %2$s (%3$s Мбит/с, около %4$d МБ/с). USB-порт этого устройства не работает быстрее, поэтому игры будут загружаться медленно. Внутренняя память или карта microSD могут быть быстрее. diff --git a/app/src/main/res/values-sv/gestures.xml b/app/src/main/res/values-sv/gestures.xml index a860712b49..e8034b112e 100644 --- a/app/src/main/res/values-sv/gestures.xml +++ b/app/src/main/res/values-sv/gestures.xml @@ -2,7 +2,6 @@ Gester Inställningar för pekgester - Anpassa mus- och tangentbordsgester. Välj Gester som pekläge för att använda dem. Tryck Dra med ett finger Långt tryck @@ -15,6 +14,8 @@ Håll med tre fingrar Nyp för att zooma Håll knappen nedtryckt + Håll vänster knapp nedtryckt + Håll höger knapp nedtryckt Klicka en gång Fördröjning före hållning Intervall för dubbeltryck diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 00827a7325..62832f0b63 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -704,6 +704,8 @@ Handkontrollen rapporterar i 1000 Hz i stället för 250 Hz. Något mer CPU. Pekning med låg latens Pekningar hoppar över bildrutebatchning; Steams pekstyrning går i 1000 Hz. Något mer CPU. + Rå muskanal + Markör PC-tangentbord Android Andra skärmen @@ -3199,6 +3201,12 @@ %d app %d appar + Återställer din programvara + Installerar om apparna du lade till efter en DroidDeck-uppdatering. + Programvaran återställd + Apparna du lade till är installerade igen. + Viss programvara kunde inte återställas + Se ~/.cache/droiddeck/apt-restore.log och prova sedan sudo apt install i Konsole. Långsam USB-anslutning %1$s är ansluten via %2$s (%3$s Mbit/s, cirka %4$d MB/s), så spel på den läses in långsamt. Använd en USB 3-kabel för 5 Gbit/s eller mer, prova att vända USB-C-kontakten eller använd en snabbare enhet. %1$s är ansluten via %2$s (%3$s Mbit/s, cirka %4$d MB/s). USB-porten på den här enheten kan inte gå snabbare, så spel läses in långsamt. Internt lagringsutrymme eller ett microSD-kort kan vara snabbare. diff --git a/app/src/main/res/values-th/gestures.xml b/app/src/main/res/values-th/gestures.xml index 0fedbbfa19..64ecde9057 100644 --- a/app/src/main/res/values-th/gestures.xml +++ b/app/src/main/res/values-th/gestures.xml @@ -2,7 +2,6 @@ ท่าทาง การตั้งค่าท่าทางสัมผัส - ปรับแต่งท่าทางเมาส์และแป้นพิมพ์ เลือกท่าทางเป็นโหมดสัมผัสเพื่อใช้งาน แตะ ลากด้วยหนึ่งนิ้ว กดค้าง @@ -15,6 +14,8 @@ กดค้างด้วยสามนิ้ว จีบนิ้วเพื่อซูม กดปุ่มค้างไว้ + กดปุ่มซ้ายค้างไว้ + กดปุ่มขวาค้างไว้ คลิกหนึ่งครั้ง ระยะเวลาก่อนกดค้าง ช่วงเวลาแตะสองครั้ง diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 01c0be6464..7bc1a73755 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -702,6 +702,8 @@ คอนโทรลเลอร์รายงานที่ 1000 Hz แทน 250 Hz ใช้ CPU เพิ่มขึ้นเล็กน้อย การสัมผัสความหน่วงต่ำ การสัมผัสข้ามการรวมเฟรม ทำให้ระบบสัมผัสของ Steam ทำงานที่ 1000 Hz ใช้ CPU เพิ่มขึ้นเล็กน้อย + ช่องเมาส์ดิบ + เคอร์เซอร์ แป้นพิมพ์พีซี Android หน้าจอที่สอง @@ -3173,6 +3175,12 @@ %d แอป + กำลังกู้คืนซอฟต์แวร์ของคุณ + กำลังติดตั้งแอปที่คุณเพิ่มไว้อีกครั้งหลังการอัปเดต DroidDeck + กู้คืนซอฟต์แวร์แล้ว + แอปที่คุณเพิ่มไว้ติดตั้งกลับมาแล้ว + กู้คืนซอฟต์แวร์บางส่วนไม่ได้ + ดู ~/.cache/droiddeck/apt-restore.log แล้วลองใช้ sudo apt install ใน Konsole การเชื่อมต่อ USB ช้า %1$s เชื่อมต่อผ่าน %2$s (%3$s Mbps ประมาณ %4$d MB/s) เกมในไดรฟ์นี้จึงโหลดช้า ใช้สาย USB 3 ที่รองรับ 5 Gbps ขึ้นไป ลองกลับด้านหัว USB-C หรือใช้ไดรฟ์ที่เร็วกว่า %1$s เชื่อมต่อผ่าน %2$s (%3$s Mbps ประมาณ %4$d MB/s) พอร์ต USB ของอุปกรณ์นี้เร็วกว่านี้ไม่ได้ เกมจึงโหลดช้า ที่เก็บข้อมูลภายในหรือการ์ด microSD อาจเร็วกว่า diff --git a/app/src/main/res/values-tr/gestures.xml b/app/src/main/res/values-tr/gestures.xml index 92ca99e015..df0186b2e9 100644 --- a/app/src/main/res/values-tr/gestures.xml +++ b/app/src/main/res/values-tr/gestures.xml @@ -2,7 +2,6 @@ Hareketler Dokunmatik hareket ayarları - Fare ve klavye hareketlerini özelleştirin. Kullanmak için dokunma modu olarak Hareketler\'i seçin. Dokunma Tek parmakla sürükleme Uzun basma @@ -15,6 +14,8 @@ Üç parmakla basılı tutma İki parmakla yakınlaştırma Düğmeyi basılı tut + Sol düğmeyi basılı tut + Sağ düğmeyi basılı tut Bir kez tıkla Basılı tutma gecikmesi Çift dokunma aralığı diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 39ba9c2edf..993d67150a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -704,6 +704,8 @@ Kumanda 250 Hz yerine 1000 Hz bildirir. CPU kullanımı biraz artar. Düşük gecikmeli dokunma Dokunmalar kare gruplamasını atlar; Steam dokunmatik kontrolleri 1000 Hz çalışır. CPU kullanımı biraz artar. + Ham fare kanalı + İmleç PC klavyesi Android İkinci ekran @@ -3201,6 +3203,12 @@ %d uygulama %d uygulama + Yazılımınız geri yükleniyor + Eklediğiniz uygulamalar DroidDeck güncellemesinden sonra yeniden yükleniyor. + Yazılım geri yüklendi + Eklediğiniz uygulamalar yeniden yüklendi. + Bazı yazılımlar geri yüklenemedi + ~/.cache/droiddeck/apt-restore.log dosyasına bakın, ardından Konsole\'da sudo apt install deneyin. Yavaş USB bağlantısı %1$s, %2$s üzerinden bağlı (%3$s Mbps, yaklaşık %4$d MB/sn), bu yüzden üzerindeki oyunlar yavaş yüklenecek. 5 Gbps veya daha hızlı bir USB 3 kablo kullanın, USB-C fişini ters çevirmeyi deneyin ya da daha hızlı bir sürücü kullanın. %1$s, %2$s üzerinden bağlı (%3$s Mbps, yaklaşık %4$d MB/sn). Bu cihazın USB bağlantı noktası daha hızlı çalışamıyor, bu yüzden oyunlar yavaş yüklenecek. Dahili depolama veya bir microSD kart daha hızlı olabilir. diff --git a/app/src/main/res/values-uk/gestures.xml b/app/src/main/res/values-uk/gestures.xml index 7ed3663c62..6ed58ef520 100644 --- a/app/src/main/res/values-uk/gestures.xml +++ b/app/src/main/res/values-uk/gestures.xml @@ -2,7 +2,6 @@ Жести Налаштування сенсорних жестів - Налаштуйте жести миші та клавіатури. Щоб використовувати їх, виберіть режим дотику «Жести». Дотик Перетягування одним пальцем Тривале натискання @@ -15,6 +14,8 @@ Утримання трьома пальцями Масштабування щипком Утримувати кнопку натиснутою + Утримувати ліву кнопку натиснутою + Утримувати праву кнопку натиснутою Одне клацання Затримка утримання Інтервал подвійного дотику diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e519812be9..7019983d54 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -708,6 +708,8 @@ Контролер звітує на 1000 Hz замість 250 Hz. Трохи більше навантаження на CPU. Дотик із низькою затримкою Дотики обходять групування кадрів, тож сенсорне керування Steam працює на 1000 Hz. Трохи більше навантаження на CPU. + Сирий канал миші + Курсор Клавіатура ПК Android Другий екран @@ -3269,6 +3271,12 @@ %d застосунків %d застосунку + Відновлення програм + Повторне встановлення доданих вами застосунків після оновлення DroidDeck. + Програми відновлено + Додані вами застосунки знову встановлено. + Не вдалося відновити частину програм + Перегляньте ~/.cache/droiddeck/apt-restore.log, потім спробуйте sudo apt install у Konsole. Повільне з’єднання USB %1$s під’єднано через %2$s (%3$s Мбіт/с, близько %4$d МБ/с), тому ігри на ньому завантажуватимуться повільно. Використайте кабель USB 3 на 5 Гбіт/с або швидший, спробуйте перевернути роз’єм USB-C або візьміть швидший накопичувач. %1$s під’єднано через %2$s (%3$s Мбіт/с, близько %4$d МБ/с). USB-порт цього пристрою не працює швидше, тому ігри завантажуватимуться повільно. Внутрішня пам’ять або карта microSD можуть бути швидшими. diff --git a/app/src/main/res/values-vi/gestures.xml b/app/src/main/res/values-vi/gestures.xml index 90196d5ae7..40bd8c9b7b 100644 --- a/app/src/main/res/values-vi/gestures.xml +++ b/app/src/main/res/values-vi/gestures.xml @@ -2,7 +2,6 @@ Cử chỉ Cài đặt cử chỉ cảm ứng - Tùy chỉnh cử chỉ chuột và bàn phím. Chọn Cử chỉ làm chế độ cảm ứng để sử dụng. Chạm Kéo bằng một ngón tay Nhấn giữ @@ -15,6 +14,8 @@ Giữ bằng ba ngón tay Chụm hoặc mở hai ngón tay để thu phóng Giữ nút được nhấn + Giữ nút trái được nhấn + Giữ nút phải được nhấn Nhấp một lần Độ trễ nhấn giữ Khoảng thời gian chạm hai lần diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index efc25f5a4d..eb05c25ac9 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -702,6 +702,8 @@ Tay cầm báo cáo ở 1000 Hz thay vì 250 Hz. Tốn thêm một chút CPU. Cảm ứng độ trễ thấp Cảm ứng bỏ qua việc gộp khung hình, nên điều khiển cảm ứng của Steam chạy ở 1000 Hz. Tốn thêm một chút CPU. + Kênh chuột thô + Con trỏ Bàn phím PC Android Màn hình thứ hai @@ -3173,6 +3175,12 @@ %d ứng dụng + Đang khôi phục phần mềm của bạn + Đang cài lại các ứng dụng bạn đã thêm sau khi cập nhật DroidDeck. + Đã khôi phục phần mềm + Các ứng dụng bạn đã thêm đã được cài lại. + Không thể khôi phục một số phần mềm + Xem ~/.cache/droiddeck/apt-restore.log, rồi thử sudo apt install trong Konsole. Kết nối USB chậm %1$s đang kết nối qua %2$s (%3$s Mbps, khoảng %4$d MB/s), nên trò chơi trên đó sẽ tải chậm. Hãy dùng cáp USB 3 tốc độ 5 Gbps trở lên, thử lật đầu cắm USB-C hoặc dùng ổ nhanh hơn. %1$s đang kết nối qua %2$s (%3$s Mbps, khoảng %4$d MB/s). Cổng USB của thiết bị này không thể nhanh hơn, nên trò chơi sẽ tải chậm. Bộ nhớ trong hoặc thẻ microSD có thể nhanh hơn. diff --git a/app/src/main/res/values-zh-rCN/gestures.xml b/app/src/main/res/values-zh-rCN/gestures.xml index 18f6c00ce4..69954db014 100644 --- a/app/src/main/res/values-zh-rCN/gestures.xml +++ b/app/src/main/res/values-zh-rCN/gestures.xml @@ -2,7 +2,6 @@ 手势 触屏手势设置 - 自定义鼠标和键盘手势。请选择“手势”触控模式以使用这些功能。 点按 单指拖动 长按 @@ -15,6 +14,8 @@ 三指按住 双指缩放 持续按住按钮 + 按住左键 + 按住右键 单击一次 按住延迟 双击间隔 diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 9dcbd81340..8beb9d8bf5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -704,6 +704,8 @@ 手柄以 1000 Hz 而非 250 Hz 上报。CPU 占用略高。 低延迟触控 触控跳过帧合并,Steam 触控以 1000 Hz 上报。CPU 占用略高。 + 原生鼠标通道 + 光标 PC 键盘 Android 副屏 @@ -3181,6 +3183,12 @@ %d 个应用 + 正在恢复你的软件 + DroidDeck 更新后正在重新安装你添加的应用。 + 软件已恢复 + 你添加的应用已重新安装。 + 部分软件无法恢复 + 请查看 ~/.cache/droiddeck/apt-restore.log,然后在 Konsole 中尝试 sudo apt install。 USB 连接速度慢 %1$s 通过 %2$s 连接(%3$s Mbps,约 %4$d MB/s),其中的游戏加载会很慢。请使用 5 Gbps 或更快的 USB 3 数据线,尝试翻转 USB-C 插头,或使用更快的硬盘。 %1$s 通过 %2$s 连接(%3$s Mbps,约 %4$d MB/s)。此设备的 USB 接口无法更快,游戏加载会很慢。内部存储或 microSD 卡可能更快。 diff --git a/app/src/main/res/values-zh-rHK/gestures.xml b/app/src/main/res/values-zh-rHK/gestures.xml index 45bbcc062f..7cd3314bca 100644 --- a/app/src/main/res/values-zh-rHK/gestures.xml +++ b/app/src/main/res/values-zh-rHK/gestures.xml @@ -2,7 +2,6 @@ 手勢 觸控手勢設定 - 自訂滑鼠與鍵盤手勢。請選擇「手勢」觸控模式以使用這些功能。 點按 單指拖曳 長按 @@ -15,6 +14,8 @@ 三指按住 雙指縮放 持續按住按鈕 + 按住左鍵 + 按住右鍵 按一下 按住延遲 連點兩下間隔 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 28f2d92f0c..e0ecff20e1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -704,6 +704,8 @@ 控制器以 1000 Hz 而非 250 Hz 回報。CPU 使用率略高。 低延遲觸控 觸控略過幀合併,Steam 觸控以 1000 Hz 回報。CPU 使用率略高。 + 原生滑鼠通道 + 游標 電腦鍵盤 Android 第二螢幕 @@ -3180,6 +3182,12 @@ %d 個應用程式 + 正在還原你的軟件 + DroidDeck 更新後正在重新安裝你加入的應用程式。 + 軟件已還原 + 你加入的應用程式已重新安裝。 + 部分軟件無法還原 + 請查看 ~/.cache/droiddeck/apt-restore.log,然後在 Konsole 中嘗試 sudo apt install。 USB 連線速度慢 %1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s),當中的遊戲載入會很慢。請使用 5 Gbps 或更快的 USB 3 線,嘗試反轉 USB-C 插頭,或使用更快的硬碟。 %1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s)。此裝置的 USB 埠無法更快,遊戲載入會很慢。內部儲存空間或 microSD 卡可能更快。 diff --git a/app/src/main/res/values-zh-rTW/gestures.xml b/app/src/main/res/values-zh-rTW/gestures.xml index 464f94d88e..7841fe7b48 100644 --- a/app/src/main/res/values-zh-rTW/gestures.xml +++ b/app/src/main/res/values-zh-rTW/gestures.xml @@ -2,7 +2,6 @@ 手勢 觸控手勢設定 - 自訂滑鼠與鍵盤手勢。請選擇「手勢」觸控模式以使用這些功能。 點按 單指拖曳 長按 @@ -15,6 +14,8 @@ 三指按住 雙指縮放 持續按住按鈕 + 按住左鍵 + 按住右鍵 按一下 按住延遲 連點兩下間隔 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index b9e95e8190..e9a2fde789 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -704,6 +704,8 @@ 控制器以 1000 Hz 而非 250 Hz 回報。CPU 使用率略高。 低延遲觸控 觸控略過影格合併,Steam 觸控以 1000 Hz 回報。CPU 使用率略高。 + 原生滑鼠通道 + 游標 電腦鍵盤 Android 第二螢幕 @@ -3180,6 +3182,12 @@ %d 個應用程式 + 正在還原你的軟體 + DroidDeck 更新後正在重新安裝你加入的應用程式。 + 軟體已還原 + 你加入的應用程式已重新安裝。 + 部分軟體無法還原 + 請查看 ~/.cache/droiddeck/apt-restore.log,然後在 Konsole 中嘗試 sudo apt install。 USB 連線速度慢 %1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s),其中的遊戲載入會很慢。請使用 5 Gbps 或更快的 USB 3 傳輸線,試著翻轉 USB-C 插頭,或使用更快的硬碟。 %1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s)。此裝置的 USB 連接埠無法更快,遊戲載入會很慢。內部儲存空間或 microSD 卡可能更快。 diff --git a/app/src/main/res/values/gestures.xml b/app/src/main/res/values/gestures.xml index 7c91324223..65f3a25b7c 100644 --- a/app/src/main/res/values/gestures.xml +++ b/app/src/main/res/values/gestures.xml @@ -2,7 +2,6 @@ Gestures Touch gesture settings - Customize mouse and keyboard gestures. Select Gestures as the touch mode to use them. Tap One-finger drag Long press @@ -15,6 +14,8 @@ Three-finger hold Pinch to zoom Keep button held + Hold left button + Hold right button Click once Hold delay Double-tap interval diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ef6481a465..cc9700e181 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -789,6 +789,8 @@ Pad reports at 1000 Hz instead of 250 Hz. Slightly more CPU. Low-latency touch Touches skip frame batching; Steam touch controls at 1000 Hz. Slightly more CPU. + Raw mouse channel + Cursor PC keyboard Android Second screen @@ -3423,6 +3425,12 @@ DroidDeck Home button Pass Home button presses to Steam Guide while a Steam session is focused and DroidDeck is the default Home app. Does not read screen content. Turn on Brightness in Setup → Steam integration + Restoring your software + Reinstalling the apps you added after a DroidDeck update. + Software restored + The apps you added are installed again. + Some software couldn\'t be restored + See ~/.cache/droiddeck/apt-restore.log, then try sudo apt install in Konsole. Native optimizations are unavailable. The download includes complete replacement files. Verify patch result Slow USB connection diff --git a/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt b/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt index 513ee330f3..9ef44f3607 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.input import android.os.Looper +import android.view.InputDevice import android.view.MotionEvent import java.time.Duration import org.junit.Assert.* @@ -13,68 +14,171 @@ import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) class DirectTouchHoldTest { - private val events = mutableListOf() + private val touches = mutableListOf() + private val buttons = mutableListOf() private val hold = DirectTouchHold(8f, object : PointerGestures.Listener { override fun onMove(x: Float, y: Float) {} override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { assertEquals(PointerGestures.BTN_RIGHT, button) - events += "$pressed at $x,$y" + buttons += "$pressed at $x,$y" } override fun onWheel(steps: Int) {} override fun onLongPress() {} - }) { events += "cancel touch" }.also { it.configure(TouchGestureConfig(longPressEnabled = true, longPressDelay = 500)) } + }, object : DirectTouchHold.Touch { + override fun down(pointerId: Int, x: Float, y: Float) { touches += "down $pointerId at $x,$y" } + override fun move(pointerId: Int, x: Float, y: Float) { touches += "move $pointerId at $x,$y" } + override fun up(pointerId: Int, x: Float, y: Float) { touches += "up $pointerId at $x,$y" } + override fun cancel() { touches += "cancel" } + }).also { it.configure(TouchGestureConfig(longPressEnabled = true, longPressDelay = 500)) } - @Test fun holdReleasesRawTouchBeforeClickAndConsumesTheLift() { - assertFalse(touch(MotionEvent.ACTION_DOWN)) - advance(500) - assertEquals(listOf("cancel touch", "true at 40.0,30.0"), events) - assertTrue(touch(MotionEvent.ACTION_UP)) + @Test fun holdClicksRightWithoutTouchingTheGame() { + touch(MotionEvent.ACTION_DOWN) + advance(400) + assertTrue(buttons.isEmpty()) + advance(100) + assertEquals(listOf("true at 40.0,30.0"), buttons) advance(50) - assertEquals("false at 40.0,30.0", events.last()) - assertFalse(touch(MotionEvent.ACTION_DOWN)) - hold.cancel() + assertEquals(listOf("true at 40.0,30.0", "false at 40.0,30.0"), buttons) + touch(MotionEvent.ACTION_MOVE, 44f) + touch(MotionEvent.ACTION_UP) + assertTrue(touches.isEmpty()) } - @Test fun stillHoldKeepsTheTouchWhenLongPressIsOff() { + @Test fun tapForwardsTheTouchWhenItLifts() { + touch(MotionEvent.ACTION_DOWN) + advance(100) + touch(MotionEvent.ACTION_UP, 50f) + assertEquals(listOf("down 0 at 40.0,30.0"), touches) + advance(50) + assertEquals(listOf("down 0 at 40.0,30.0", "up 0 at 50.0,30.0"), touches) + assertTrue(buttons.isEmpty()) + } + + @Test fun noneBehaviorForwardsTheTouchAtOnce() { + hold.configure(TouchGestureConfig(directHoldBehavior = TouchGestureConfig.MOUSE_BEHAVIOR_NONE)) + touch(MotionEvent.ACTION_DOWN) + assertEquals(listOf("down 0 at 40.0,30.0"), touches) + advance(600) + assertTrue(buttons.isEmpty()) + touch(MotionEvent.ACTION_MOVE, 60f) + assertEquals("move 0 at 60.0,30.0", touches.last()) + touch(MotionEvent.ACTION_UP, 60f) + advance(50) + assertEquals("up 0 at 60.0,30.0", touches.last()) + } + + @Test fun dragForwardsTheTouchOnceItMoves() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_MOVE, 60f) + assertEquals(listOf("down 0 at 40.0,30.0", "move 0 at 60.0,30.0"), touches) + advance(600) + assertTrue(buttons.isEmpty()) + touch(MotionEvent.ACTION_UP, 60f) + advance(50) + assertEquals("up 0 at 60.0,30.0", touches.last()) + } + + @Test fun dragKeepsForwardingWithinTheSlop() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_MOVE, 44f) + assertTrue(touches.isEmpty()) + touch(MotionEvent.ACTION_UP, 44f) + advance(50) + assertEquals(listOf("down 0 at 40.0,30.0", "up 0 at 44.0,30.0"), touches) + } + + @Test fun stillHoldClicksRightWithTheDefaultConfig() { hold.configure(TouchGestureConfig()) - assertFalse(touch(MotionEvent.ACTION_DOWN)) + touch(MotionEvent.ACTION_DOWN) advance(2000) - assertFalse(touch(MotionEvent.ACTION_MOVE)) - assertFalse(touch(MotionEvent.ACTION_UP)) - assertTrue(events.isEmpty()) + touch(MotionEvent.ACTION_MOVE) + assertEquals(listOf("true at 40.0,30.0", "false at 40.0,30.0"), buttons) + touch(MotionEvent.ACTION_UP) + assertTrue(touches.isEmpty()) } @Test fun longPressFollowsTheConfiguredDelay() { hold.configure(TouchGestureConfig(longPressEnabled = true, longPressDelay = 800)) touch(MotionEvent.ACTION_DOWN) advance(700) - assertTrue(events.isEmpty()) + assertTrue(buttons.isEmpty()) advance(100) - assertEquals(listOf("cancel touch", "true at 40.0,30.0"), events) + assertEquals(listOf("true at 40.0,30.0"), buttons) hold.cancel() } - @Test fun tapDragSecondFingerAndCancellationDoNotRightClick() { - for (action in listOf(MotionEvent.ACTION_UP, MotionEvent.ACTION_MOVE, - MotionEvent.ACTION_POINTER_DOWN, MotionEvent.ACTION_CANCEL)) { - touch(MotionEvent.ACTION_DOWN) - assertFalse(touch(action, 60f)) - advance(600) - assertTrue(events.isEmpty()) - hold.cancel() - } + @Test fun holdBehaviorKeepsTheButtonUntilTheLift() { + hold.configure(TouchGestureConfig(longPressDelay = 500, + directHoldBehavior = TouchGestureConfig.MOUSE_BEHAVIOR_HOLD)) + touch(MotionEvent.ACTION_DOWN) + advance(500) + assertEquals(listOf("true at 40.0,30.0"), buttons) + advance(1000) + assertEquals(listOf("true at 40.0,30.0"), buttons) + touch(MotionEvent.ACTION_UP) + assertEquals(listOf("true at 40.0,30.0", "false at 40.0,30.0"), buttons) + assertTrue(touches.isEmpty()) + } + + @Test fun secondFingerForwardsTheTouchAndDropsTheHold() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_POINTER_DOWN, 60f) + assertEquals(listOf("down 0 at 40.0,30.0", "down 0 at 60.0,30.0"), touches) + advance(600) + assertTrue(buttons.isEmpty()) + touch(MotionEvent.ACTION_UP, 60f) } @Test fun modeChangeCancelsPendingHoldAndReleasesAnActiveClick() { touch(MotionEvent.ACTION_DOWN) hold.cancel() advance(600) - assertTrue(events.isEmpty()) + assertTrue(buttons.isEmpty()) + assertTrue(touches.isEmpty()) touch(MotionEvent.ACTION_DOWN) advance(500) hold.cancel() + assertEquals(listOf("true at 40.0,30.0", "false at 40.0,30.0"), buttons) + } + + @Test fun cancelForwardsACancelWhenTheTouchIsLive() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_MOVE, 60f) + hold.cancel() + assertEquals(listOf("down 0 at 40.0,30.0", "move 0 at 60.0,30.0", "cancel"), touches) + } + + @Test fun cancelDropsAPendingLift() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_UP, 60f) + hold.cancel() advance(100) - assertEquals(listOf("cancel touch", "true at 40.0,30.0", "false at 40.0,30.0"), events) + assertEquals(listOf("down 0 at 40.0,30.0", "cancel"), touches) + } + + @Test fun aQuickSecondTapLiftsTheFirstInsteadOfCancellingIt() { + touch(MotionEvent.ACTION_DOWN) + touch(MotionEvent.ACTION_UP, 50f) + advance(20) + touch(MotionEvent.ACTION_DOWN, 60f) + touch(MotionEvent.ACTION_UP, 60f) + advance(50) + assertEquals( + listOf("down 0 at 40.0,30.0", "up 0 at 50.0,30.0", "down 0 at 60.0,30.0", "up 0 at 60.0,30.0"), + touches, + ) + } + + @Test fun theSecondFingerLiftsWithItsOwnId() { + multi(MotionEvent.ACTION_DOWN, 0, 0 to 40f) + multi(MotionEvent.ACTION_POINTER_DOWN, 1, 0 to 40f, 1 to 60f) + multi(MotionEvent.ACTION_POINTER_UP, 0, 0 to 40f, 1 to 60f) + multi(MotionEvent.ACTION_UP, 0, 1 to 60f) + advance(100) + assertEquals( + listOf("down 0 at 40.0,30.0", "down 1 at 60.0,30.0", "up 0 at 40.0,30.0", "up 1 at 60.0,30.0"), + touches, + ) } private fun advance(ms: Long) = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ms)) @@ -82,4 +186,23 @@ class DirectTouchHoldTest { val event = MotionEvent.obtain(0, 0, action, x, 30f, 0) return hold.onTouch(event).also { event.recycle() } } + private fun multi(action: Int, index: Int, vararg points: Pair): Boolean { + val properties = Array(points.size) { + MotionEvent.PointerProperties().apply { + id = points[it].first + toolType = MotionEvent.TOOL_TYPE_FINGER + } + } + val coords = Array(points.size) { + MotionEvent.PointerCoords().apply { + x = points[it].second + y = 30f + pressure = 1f + size = 1f + } + } + val event = MotionEvent.obtain(0, 0, action or (index shl MotionEvent.ACTION_POINTER_INDEX_SHIFT), + points.size, properties, coords, 0, 0, 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0) + return hold.onTouch(event).also { event.recycle() } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt index 7b33c71705..0cad8acbaf 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt @@ -220,7 +220,12 @@ class SessionGestureRoutingTest { override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { directButtons += button to pressed } override fun onWheel(steps: Int) {} override fun onLongPress() {} - }) {}.also { it.configure(config) } + }, object : DirectTouchHold.Touch { + override fun down(pointerId: Int, x: Float, y: Float) {} + override fun move(pointerId: Int, x: Float, y: Float) {} + override fun up(pointerId: Int, x: Float, y: Float) {} + override fun cancel() {} + }).also { it.configure(config) } setField("directTouchHold", directHold) launcherScroll = ScrollTouchGestures(8f, 50f, object : ScrollTouchGestures.Listener { override fun onMove(x: Float, y: Float) { scrollPositions += x to y } diff --git a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt index a036849b19..79c1398588 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt @@ -25,11 +25,14 @@ class TouchpadGesturesTest { private val listener = object : PointerGestures.Listener { override fun onMove(x: Float, y: Float) { events += "move" } override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { - val name = if (button == PointerGestures.BTN_RIGHT) "right" else "left" + val name = when (button) { PointerGestures.BTN_RIGHT -> "right"; PointerGestures.BTN_MIDDLE -> "middle"; else -> "left" } events += "$name ${if (pressed) "down" else "up"}" } override fun onWheel(steps: Int) { events += "wheel $steps" } override fun onLongPress() { events += "long press" } + override fun onScroll(dx: Float, dy: Float) { events += "scroll" } + override fun onScrollEnd() { events += "scroll end" } + override fun onZoom(steps: Int) { events += "zoom $steps" } } @Before fun setUp() { @@ -41,12 +44,58 @@ class TouchpadGesturesTest { @Test fun tapHoldsTheLeftButtonBeforeReleasingIt() { tap() assertEquals(listOf("left down"), events) - advance(40) + advance(TouchTiming.CLICK_MS - 10) assertEquals(listOf("left down"), events) advance(100) assertEquals(listOf("left down", "left up"), events) } + @Test fun threeFingerTapClicksTheMiddleButton() { + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + advance(10) + touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (400f to 300f), 2 to (600f to 310f)) + advance(10) + touch(MotionEvent.ACTION_POINTER_DOWN, 2, 1 to (400f to 300f), 2 to (600f to 310f), 3 to (800f to 320f)) + advance(60) + touch(MotionEvent.ACTION_POINTER_UP, 2, 1 to (400f to 300f), 2 to (600f to 310f), 3 to (800f to 320f)) + touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 300f), 2 to (600f to 310f)) + touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) + advance(100) + assertEquals(listOf("middle down", "middle up"), events) + } + + @Test fun desktopTwoFingerSlideScrollsSmoothlyAndStops() { + touchpad.desktop = true + touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) + advance(10) + touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (400f to 300f), 2 to (600f to 300f)) + for (step in 1..5) { + advance(16) + touch(MotionEvent.ACTION_MOVE, 0, 1 to (400f to 300f + step * 20f), 2 to (600f to 300f + step * 20f)) + } + touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 400f), 2 to (600f to 400f)) + touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 400f)) + advance(100) + assertTrue(events.contains("scroll")) + assertEquals("scroll end", events.last()) + assertFalse(events.any { it.startsWith("right") || it.startsWith("wheel") }) + } + + @Test fun desktopPinchZoomsWithoutScrolling() { + touchpad.desktop = true + touch(MotionEvent.ACTION_DOWN, 0, 1 to (500f to 300f)) + advance(10) + touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (500f to 300f), 2 to (600f to 300f)) + for (step in 1..6) { + advance(16) + touch(MotionEvent.ACTION_MOVE, 0, 1 to (500f - step * 30f to 300f), 2 to (600f + step * 30f to 300f)) + } + touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (320f to 300f), 2 to (780f to 300f)) + touch(MotionEvent.ACTION_UP, 0, 1 to (320f to 300f)) + advance(100) + assertTrue(events.isNotEmpty() && events.all { it.startsWith("zoom -") }) + } + @Test fun twoFingerTapHoldsTheRightButtonBeforeReleasingIt() { touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) advance(10) @@ -56,7 +105,7 @@ class TouchpadGesturesTest { advance(10) touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) assertEquals(listOf("right down"), events) - advance(30) + advance(TouchTiming.CLICK_MS - 20) assertEquals(listOf("right down"), events) advance(100) assertEquals(listOf("right down", "right up"), events) @@ -71,7 +120,7 @@ class TouchpadGesturesTest { advance(10) touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) assertEquals(listOf("right down"), events) - advance(40) + advance(TouchTiming.CLICK_MS - 10) assertEquals(listOf("right down"), events) advance(100) assertEquals(listOf("right down", "right up"), events) diff --git a/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt index ad85d62453..5c49c5265a 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/TouchscreenGesturesTest.kt @@ -82,9 +82,9 @@ class TouchscreenGesturesTest { @Test fun aVeryFastDoubleTapKeepsFullPressesAndAReleaseGap() { tap(); tap(); advance(250) assertEquals(4, leftClicks.size) - assertTrue(leftClicks[1].time - leftClicks[0].time >= 50) - assertTrue(leftClicks[2].time - leftClicks[1].time >= 50) - assertTrue(leftClicks[3].time - leftClicks[2].time >= 50) + assertTrue(leftClicks[1].time - leftClicks[0].time >= TouchTiming.CLICK_MS) + assertTrue(leftClicks[2].time - leftClicks[1].time >= TouchTiming.CLICK_MS) + assertTrue(leftClicks[3].time - leftClicks[2].time >= TouchTiming.CLICK_MS) } @Test fun doubleTapUsesTheFirstClickLocationDespiteNormalFingerDrift() { @@ -121,7 +121,7 @@ class TouchscreenGesturesTest { gestures.configure(TouchGestureConfig(tapEnabled = false)) tap(); tap(); advance(250) assertEquals(4, leftClicks.size) - assertTrue(leftClicks[2].time - leftClicks[1].time >= 50) + assertTrue(leftClicks[2].time - leftClicks[1].time >= TouchTiming.CLICK_MS) } @Test fun aRapidThirdTapDoesNotDiscardThePendingSecondClick() { @@ -285,11 +285,11 @@ class TouchscreenGesturesTest { @Test fun twoFingerTapKeepsItsPressAfterTheLastFingerLifts() { twoFingerTap() assertEquals(listOf("button 273 true"), buttons()) - advance(49) + advance(TouchTiming.CLICK_MS - 1) assertEquals(1, rightClicks.size) advance(1) assertEquals(listOf(true, false), rightClicks.map { it.down }) - assertEquals(50L, rightClicks[1].time - rightClicks[0].time) + assertEquals(TouchTiming.CLICK_MS, rightClicks[1].time - rightClicks[0].time) } @Test fun threeFingerKeyboardTapHasAnObservablePressAndReleases() { @@ -298,14 +298,14 @@ class TouchscreenGesturesTest { assertEquals(listOf("key 18 true"), events.filter { it.startsWith("key") }) advance(50) assertEquals(listOf("key 18 true", "key 18 false"), events.filter { it.startsWith("key") }) - assertEquals(50L, timedKeys.last().first - timedKeys.first().first) + assertEquals(TouchTiming.CLICK_MS, timedKeys.last().first - timedKeys.first().first) } @Test fun twoFingerKeyboardTapHasAnObservablePressAndReleases() { gestures.configure(TouchGestureConfig(twoFingerTapAction = "key_E")) twoFingerTap(); advance(50) assertEquals(listOf(true, false), timedKeys.map { it.third }) - assertEquals(50L, timedKeys.last().first - timedKeys.first().first) + assertEquals(TouchTiming.CLICK_MS, timedKeys.last().first - timedKeys.first().first) } @Test fun threeFingerMouseTapHasAnObservablePressAndReleases() { @@ -314,7 +314,7 @@ class TouchscreenGesturesTest { assertEquals(listOf("button 273 true"), buttons()) advance(50) assertEquals(listOf(true, false), rightClicks.map { it.down }) - assertEquals(50L, rightClicks[1].time - rightClicks[0].time) + assertEquals(TouchTiming.CLICK_MS, rightClicks[1].time - rightClicks[0].time) } @Test fun cancellingAMultiFingerTapReleasesItsButtonAndStopsCallbacks() { @@ -338,7 +338,7 @@ class TouchscreenGesturesTest { gestures.configure(TouchGestureConfig(tapAction = "right_click", doubleTapEnabled = false)) tap(); tap(); advance(250) assertEquals(listOf(true, false, true, false), rightClicks.map { it.down }) - assertTrue(rightClicks[2].time - rightClicks[1].time >= 50) + assertTrue(rightClicks[2].time - rightClicks[1].time >= TouchTiming.CLICK_MS) } @Test fun aFastTwoFingerSwipeDuringSettlingDoesNotClick() { diff --git a/app/src/test/java/com/droiddeck/launcher/input/TwoFingerGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TwoFingerGesturesTest.kt new file mode 100644 index 0000000000..ee39500c36 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/TwoFingerGesturesTest.kt @@ -0,0 +1,121 @@ +package com.droiddeck.launcher.input + +import android.os.Looper +import android.view.MotionEvent +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import java.time.Duration + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class TwoFingerGesturesTest { + private val calls = mutableListOf() + private val gestures = TwoFingerGestures(8f, object : TwoFingerGestures.Listener { + override fun cancelTouch() { calls += "cancel" } + override fun replay(event: MotionEvent) { calls += "replay ${event.actionMasked}" } + override fun rightClick(x: Float, y: Float) { calls += "right $x,$y" } + override fun scrollStart(x: Float, y: Float) { calls += "start $x,$y" } + override fun scroll(dx: Float, dy: Float) { calls += "scroll $dx,$dy" } + override fun scrollEnd() { calls += "end" } + }) + private var time = 1000L + private var downTime = 0L + private val a = 1 to (400f to 300f) + private val b = 2 to (500f to 300f) + + @Test fun tapRightClicksWhereTheFirstFingerLanded() { + assertTrue(touch(MotionEvent.ACTION_DOWN, 0, a)) + time += 20 + assertTrue(touch(MotionEvent.ACTION_POINTER_DOWN, 1, a, b)) + time += 80 + assertTrue(touch(MotionEvent.ACTION_POINTER_UP, 1, a, b)) + assertTrue(touch(MotionEvent.ACTION_UP, 0, a)) + assertEquals(listOf("cancel", "right 400.0,300.0"), calls) + } + + @Test fun holdRightClicksOnce() { + touch(MotionEvent.ACTION_DOWN, 0, a) + time += 20 + touch(MotionEvent.ACTION_POINTER_DOWN, 1, a, b) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(TwoFingerGestures.HOLD_MS + 10)) + time += 600 + assertTrue(touch(MotionEvent.ACTION_POINTER_UP, 1, a, b)) + assertTrue(touch(MotionEvent.ACTION_UP, 0, a)) + assertEquals(listOf("cancel", "right 400.0,300.0"), calls) + } + + @Test fun slidingTogetherScrollsLikeAWheel() { + touch(MotionEvent.ACTION_DOWN, 0, a) + time += 20 + touch(MotionEvent.ACTION_POINTER_DOWN, 1, a, b) + time += 20 + assertTrue(touch(MotionEvent.ACTION_MOVE, 0, 1 to (400f to 260f), 2 to (500f to 260f))) + assertTrue(touch(MotionEvent.ACTION_MOVE, 0, 1 to (400f to 200f), 2 to (500f to 200f))) + assertTrue(touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 200f), 2 to (500f to 200f))) + assertTrue(touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 200f))) + assertEquals(listOf("cancel", "start 450.0,260.0", "scroll 0.0,60.0", "end"), calls) + } + + @Test fun pinchPassesThroughForZoom() { + touch(MotionEvent.ACTION_DOWN, 0, a) + time += 20 + touch(MotionEvent.ACTION_POINTER_DOWN, 1, a, b) + assertTrue(touch(MotionEvent.ACTION_MOVE, 0, 1 to (350f to 300f), 2 to (550f to 300f))) + assertEquals(listOf("replay 0", "replay 5", "replay 2"), calls) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(TwoFingerGestures.HOLD_MS + 10)) + assertFalse(touch(MotionEvent.ACTION_MOVE, 0, 1 to (340f to 300f), 2 to (560f to 300f))) + assertFalse(touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (340f to 300f), 2 to (560f to 300f))) + assertFalse(touch(MotionEvent.ACTION_UP, 0, 1 to (340f to 300f))) + assertEquals(3, calls.size) + } + + @Test fun oneFingerTapIsReplayedOnRelease() { + assertTrue(touch(MotionEvent.ACTION_DOWN, 0, a)) + assertTrue(calls.isEmpty()) + time += 60 + assertTrue(touch(MotionEvent.ACTION_UP, 0, a)) + assertEquals(listOf("replay 0", "replay 1"), calls) + } + + @Test fun oneFingerStillIsReplayedAfterTheLandingWindow() { + assertTrue(touch(MotionEvent.ACTION_DOWN, 0, a)) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(TwoFingerGestures.LAND_MS + 10)) + assertEquals(listOf("replay 0"), calls) + time += 600 + assertFalse(touch(MotionEvent.ACTION_POINTER_DOWN, 1, a, b)) + assertFalse(touch(MotionEvent.ACTION_POINTER_UP, 1, a, b)) + assertFalse(touch(MotionEvent.ACTION_UP, 0, a)) + assertEquals(listOf("replay 0"), calls) + } + + @Test fun oneFingerDragIsReplayedOnceItMoves() { + touch(MotionEvent.ACTION_DOWN, 0, a) + time += 16 + assertTrue(touch(MotionEvent.ACTION_MOVE, 0, 1 to (402f to 300f))) + assertTrue(calls.isEmpty()) + time += 16 + assertTrue(touch(MotionEvent.ACTION_MOVE, 0, 1 to (440f to 300f))) + assertEquals(listOf("replay 0", "replay 2", "replay 2"), calls) + assertFalse(touch(MotionEvent.ACTION_MOVE, 0, 1 to (480f to 300f))) + assertFalse(touch(MotionEvent.ACTION_UP, 0, 1 to (480f to 300f))) + } + + private fun touch(action: Int, index: Int, vararg pointers: Pair>): Boolean { + if (action == MotionEvent.ACTION_DOWN) downTime = time + val properties = pointers.map { (id, _) -> + MotionEvent.PointerProperties().apply { this.id = id; toolType = MotionEvent.TOOL_TYPE_FINGER } + }.toTypedArray() + val coords = pointers.map { (_, at) -> + MotionEvent.PointerCoords().apply { x = at.first; y = at.second; pressure = 1f; size = 1f } + }.toTypedArray() + val masked = action or (index shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) + val event = MotionEvent.obtain(downTime, time, masked, pointers.size, properties, coords, 0, 0, 1f, 1f, 0, 0, 0, 0) + return gestures.onTouch(event).also { event.recycle() } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/AccountsMergeTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/AccountsMergeTest.kt new file mode 100644 index 0000000000..b0fd45a049 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/AccountsMergeTest.kt @@ -0,0 +1,47 @@ +package com.droiddeck.launcher.runtime + +import org.junit.Assert.assertEquals +import org.junit.Test + +class AccountsMergeTest { + private val own = "root:x:10123:10123:root:/root:/bin/bash" + private val zero = "root:x:0:0:root:/root:/bin/bash" + + @Test fun systemUsersSurvive() { + val existing = "root:x:0:0:root:/root:/bin/bash\ndaemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin\n_apt:x:42:65534::/nonexistent:/usr/sbin/nologin\nmessagebus:x:100:102::/nonexistent:/usr/sbin/nologin\n" + assertEquals("$own\n$zero\ndaemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin\n_apt:x:42:65534::/nonexistent:/usr/sbin/nologin\nmessagebus:x:100:102::/nonexistent:/usr/sbin/nologin\n", + LinuxRuntime.mergedAccounts(existing, 2, own, zero, 10123)) + } + + @Test fun anOldSingleLineFileIsReplacedOnce() { + val merged = LinuxRuntime.mergedAccounts("$own\n", 2, own, zero, 10123) + assertEquals("$own\n$zero\n", merged) + assertEquals(merged, LinuxRuntime.mergedAccounts(merged, 2, own, zero, 10123)) + } + + @Test fun anotherAppUidIsDropped() { + assertEquals("$own\n$zero\n", LinuxRuntime.mergedAccounts("root:x:10099:10099:root:/root:/bin/bash\n", 2, own, zero, 10123)) + } + + @Test fun noFileYet() { + assertEquals("$own\n$zero\n", LinuxRuntime.mergedAccounts(null, 2, own, zero, 10123)) + } + + @Test fun groupsKeepMembers() { + val existing = "root:x:0:\nsudo:x:27:\naudio:x:29:pulse\n" + assertEquals("root:x:10123:\nroot:x:0:\nsudo:x:27:\naudio:x:29:pulse\n", + LinuxRuntime.mergedAccounts(existing, 2, "root:x:10123:", "root:x:0:", 10123)) + } + + @Test fun storageGroupsAreAddedWithRoot() { + assertEquals("root:x:0:\nsudo:x:27:\nsdcard_rw:x:1015:root\nmedia_rw:x:1023:root\neverybody:x:9997:root\n", + LinuxRuntime.withStorageGroups("root:x:0:\nsudo:x:27:\n")) + } + + @Test fun existingStorageGroupsGainRootOnce() { + val existing = "root:x:0:\nmedia_rw:x:1023:pulse\nsdcard_rw:x:1015:root\nshared:x:9997:\n" + val updated = LinuxRuntime.withStorageGroups(existing) + assertEquals("root:x:0:\nmedia_rw:x:1023:pulse,root\nsdcard_rw:x:1015:root\nshared:x:9997:root\n", updated) + assertEquals(updated, LinuxRuntime.withStorageGroups(updated)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt index dfb3286511..befb456056 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt @@ -160,4 +160,25 @@ class BwrapSpawnerPlanTest { assertFalse(plan.binds.any { it.guest.startsWith("/app/bin/") }) assertFalse(File(dir, "zypak-wrapper").exists()) } + + @Test fun preloadsStayOutOfSandboxesWithAnOlderGlibc() { + val base = Files.createTempDirectory("glibc").toFile() + try { + val rootfs = File(base, "rootfs") + File(rootfs, "usr/local/lib").mkdirs() + File(rootfs, "etc").mkdirs() + File(rootfs, "etc/ld.so.preload").writeText("/usr/local/lib/libone.so\n/usr/local/lib/libtwo.so\n") + File(rootfs, "usr/local/lib/libone.so").writeText("x GLIBC_2.17 y GLIBC_2.34 z") + File(rootfs, "usr/local/lib/libtwo.so").writeText("GLIBC_2.38 GLIBC_2.25") + val old = File(base, "old-libc").apply { writeText("GNU C Library (Ubuntu GLIBC 2.23-0ubuntu11) stable release version 2.23, by Roland") } + val new = File(base, "new-libc").apply { writeText("GNU C Library (Ubuntu GLIBC 2.43-0ubuntu1) stable release version 2.43.") } + val same = File(base, "same-libc").apply { writeText("stable release version 2.38.") } + assertFalse(BwrapSpawner.preloadFits(rootfs.path, old.path)) + assertTrue(BwrapSpawner.preloadFits(rootfs.path, new.path)) + assertTrue(BwrapSpawner.preloadFits(rootfs.path, same.path)) + assertTrue(BwrapSpawner.preloadFits(rootfs.path, File(base, "missing").path)) + } finally { + base.deleteRecursively() + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopFileRemovalTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopFileRemovalTest.kt index 9040171c44..d2c303d131 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopFileRemovalTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopFileRemovalTest.kt @@ -76,4 +76,22 @@ class DesktopFileRemovalTest { file("var/lib/pacman/local/base-1/files", "%FILES%\nusr/\nusr/bin/\nusr/bin/gamescope\n\n%BACKUP%\netc/config\n") assertEquals(setOf("usr/bin/gamescope"), DesktopFileRemoval.runtimeFiles(root)) } + + @Test fun desktopPackageRecordsAreNotRuntimeFilesAndAreRemovedWithTheDesktop() { + file("var/lib/pacman/local/base-1/files", "%FILES%\nusr/bin/gamescope\n") + file("var/lib/pacman/local/kate-26.04.3-1/files", "%FILES%\nusr/bin/kate\n") + file("var/lib/pacman/local/kate-26.04.3-1/desc", "%NAME%\nkate\n") + file("var/lib/pacman/local/htop-3.5.3-1/files", "%FILES%\nusr/bin/htop\n") + file("var/lib/pacman/sync/droiddeck.db", "db") + file("var/lib/pacman/droiddeck-desktop", "stamp") + file("usr/share/droiddeck/pacman/desktop-packages.txt", "kate 26.04.3-1\n../../etc 1\n") + val records = DesktopFileRemoval.desktopRecords(root) + assertEquals(setOf("kate-26.04.3-1"), records) + assertEquals(setOf("usr/bin/gamescope", "usr/bin/htop"), DesktopFileRemoval.runtimeFiles(root)) + DesktopFileRemoval.removeRecords(root, records) + assertFalse(File(root, "var/lib/pacman/local/kate-26.04.3-1").exists()) + assertTrue(File(root, "var/lib/pacman/local/htop-3.5.3-1/files").exists()) + assertFalse(File(root, "var/lib/pacman/sync/droiddeck.db").exists()) + assertFalse(File(root, "var/lib/pacman/droiddeck-desktop").exists()) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopPackTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopPackTest.kt new file mode 100644 index 0000000000..1633139f3d --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopPackTest.kt @@ -0,0 +1,145 @@ +package com.droiddeck.launcher.runtime + +import com.droiddeck.launcher.core.FileUtils +import com.droiddeck.launcher.core.Hashes +import java.io.File +import java.nio.file.Files +import java.util.zip.GZIPOutputStream +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class DesktopPackTest { + private val parent = Files.createTempDirectory("pack").toFile() + private val root = File(parent, "root").apply { mkdirs() } + + @After fun tearDown() { FileUtils.delete(parent) } + + private fun file(path: String, text: String) = File(root, path).apply { parentFile?.mkdirs(); writeText(text) } + + private fun line(kind: Char, path: String): String { + val file = File(root, path) + return when { + Files.isSymbolicLink(file.toPath()) -> "$kind\tL\t0\t${Files.readSymbolicLink(file.toPath())}\t$path" + file.isDirectory -> "$kind\tD\t0\t-\t$path" + else -> "$kind\tF\t${file.length()}\t${Hashes.sha256(file)}\t$path" + } + } + + private fun manifest(lines: List) { + val target = File(root, "${DesktopPack.META}/files.tsv.gz").apply { parentFile?.mkdirs() } + GZIPOutputStream(target.outputStream()).bufferedWriter().use { w -> lines.forEach { w.write(it); w.write("\n") } } + } + + private fun installed(): List { + File(root, DesktopPack.INFO).apply { parentFile?.mkdirs() } + .writeText("""{"tag":"ubuntu-r1-desktop","url":"https://example.invalid/d.tar.zst","sha256":"00","size":5}""") + file("usr/bin/runtime-tool", "runtime") + file("${DesktopPack.META}/originals/var/lib/dpkg/status", "Package: bash\n") + file("${DesktopPack.META}/originals/etc/gone.conf", "removed by the desktop") + file("${DesktopPack.META}/originals/etc/group", "root:x:0:") + file("${DesktopPack.META}/originals/etc/hosts", "runtime hosts") + file("etc/group", "root:x:0:\nsddm:x:120:") + file("etc/hosts", "desktop hosts") + file("var/lib/dpkg/status", "Package: bash\n\nPackage: kwin\n") + file("usr/bin/kwin_wayland", "kwin") + file("usr/share/kwin/effect.qml", "effect") + file("usr/share/kwin/edited.qml", "original") + Files.createSymbolicLink(File(root, "usr/bin/kwin").toPath(), File("kwin_wayland").toPath()) + val lines = listOf( + line('N', "usr/share/kwin"), line('N', "usr/bin/kwin_wayland"), line('N', "usr/share/kwin/effect.qml"), + line('N', "usr/share/kwin/edited.qml"), line('N', "usr/bin/kwin"), line('C', "var/lib/dpkg/status"), line('C', "etc/group"), line('C', "etc/hosts"), + "R\tF\t22\tx\tetc/gone.conf", "N\tF\t1\tx\t../escape", + ) + file("usr/share/kwin/edited.qml", "changed by the user") + file("etc/hosts", "edited by the user") + file("var/lib/dpkg/status", "Package: bash\n\nPackage: kwin\n\nPackage: vlc\n") + return lines + } + + @Test fun readsThePackTheRuntimeNames() { + installed() + val info = DesktopPack.info(root)!! + assertEquals("ubuntu-r1-desktop", info.tag) + assertEquals(5L, info.size) + } + + @Test fun removingPutsTheRuntimeBackAndKeepsWhatTheUserChanged() { + manifest(installed()) + val result = DesktopPack.remove(root) + assertEquals("Package: bash\n", File(root, "var/lib/dpkg/status").readText()) + assertEquals("removed by the desktop", File(root, "etc/gone.conf").readText()) + assertEquals("root:x:0:", File(root, "etc/group").readText()) + assertEquals("edited by the user", File(root, "etc/hosts").readText()) + assertFalse(File(root, "usr/bin/kwin_wayland").exists()) + assertFalse(Files.exists(File(root, "usr/bin/kwin").toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) + assertFalse(File(root, "usr/share/kwin/effect.qml").exists()) + assertEquals("changed by the user", File(root, "usr/share/kwin/edited.qml").readText()) + assertTrue(File(root, "usr/share/kwin").isDirectory) + assertEquals("runtime", File(root, "usr/bin/runtime-tool").readText()) + assertFalse(File(root, DesktopPack.META).exists()) + assertFalse(DesktopPack.installed(root)) + assertEquals(3, result.removed) + assertEquals(3, result.restored) + assertEquals(3, result.kept) + } + + @Test fun emptiedDirectoriesGoAway() { + val lines = installed() + File(root, "usr/share/kwin/edited.qml").delete() + manifest(lines) + DesktopPack.remove(root) + assertFalse(File(root, "usr/share/kwin").exists()) + assertTrue(File(root, "usr/share").isDirectory) + } + + @Test fun finishingAnInstallDeletesWhatTheDesktopRemoved() { + file("etc/gone.conf", "runtime copy") + manifest(listOf("R\tF\t22\tx\tetc/gone.conf", "R\tF\t1\tx\t../outside")) + File(root.parentFile, "outside").writeText("keep") + DesktopPack.finishInstall(root) + assertFalse(File(root, "etc/gone.conf").exists()) + assertTrue(File(root.parentFile, "outside").exists()) + File(root.parentFile, "outside").delete() + } + + @Test fun theDesktopKeepsPackagesTheUserInstalledBeforeIt() { + val bash = "Package: bash\nArchitecture: arm64\nVersion: 5.2" + val vim = "Package: vim\nArchitecture: arm64\nVersion: 9" + val kwin = "Package: kwin\nArchitecture: arm64\nVersion: 6.6" + file("var/lib/dpkg/status", "$bash\n\n$vim\n\n") + DesktopPack.prepareInstall(root) + file("${DesktopPack.META}/originals/var/lib/dpkg/status", "$bash\n\n") + file("var/lib/dpkg/status", "$bash\n\n$kwin\n\n") + manifest(listOf(line('C', "var/lib/dpkg/status"))) + DesktopPack.finishInstall(root) + assertEquals("$bash\n\n$kwin\n\n$vim\n\n", File(root, "var/lib/dpkg/status").readText()) + assertFalse(File(root, "var/lib/dpkg/status.droiddeck").exists()) + + val vlc = "Package: vlc\nArchitecture: arm64\nVersion: 3" + file("var/lib/dpkg/status", "$bash\n\n$kwin\n\n$vim\n\n$vlc\n\n") + DesktopPack.remove(root) + assertEquals("$bash\n\n$vim\n\n$vlc\n\n", File(root, "var/lib/dpkg/status").readText()) + } + + @Test fun mergingKeepsTheTargetWhenBothSidesChangedAPackage() { + val base = "Package: a\nVersion: 1\n\nPackage: b\nVersion: 1\n\nPackage: c\nVersion: 1\n" + val target = "Package: a\nVersion: 2\n\nPackage: b\nVersion: 1\n\nPackage: c\nVersion: 1\n" + val mine = "Package: a\nVersion: 3\n\nPackage: b\nVersion: 3\n" + assertEquals("Package: a\nVersion: 2\n\nPackage: b\nVersion: 3\n\n", DesktopPack.mergeStatus(base, target, mine)) + } + + @Test fun pathsMayNotLeaveTheRuntime() { + assertNull(DesktopPack.inside(root, "../x")) + assertNull(DesktopPack.inside(root, "/etc/passwd")) + Files.createSymbolicLink(File(root, "link").toPath(), root.parentFile.toPath()) + assertNull(DesktopPack.inside(root, "link/x")) + assertEquals(File(root, "usr/x"), DesktopPack.inside(root, "usr/./x")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/L2sLinkTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/L2sLinkTest.kt new file mode 100644 index 0000000000..239acfae06 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/L2sLinkTest.kt @@ -0,0 +1,102 @@ +package com.droiddeck.launcher.runtime + +import com.droiddeck.launcher.core.FileUtils +import java.io.File +import java.nio.file.Files +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class L2sLinkTest { + private val dir = Files.createTempDirectory("l2s").toFile() + + @After fun tearDown() { FileUtils.delete(dir) } + + @Test fun aHardLinkBecomesProotsLinkLayout() { + val bin = File(dir, "usr/bin").apply { mkdirs() } + val coreutils = File(bin, "coreutils").apply { writeText("multicall") } + val tail = File(bin, "tail") + assertTrue(LinuxRuntimeInstaller.l2sLink(coreutils, tail)) + val intermediate = File(bin, ".l2s.coreutils0001") + assertEquals(intermediate.toPath(), Files.readSymbolicLink(coreutils.toPath())) + assertEquals(intermediate.toPath(), Files.readSymbolicLink(tail.toPath())) + assertEquals(File(bin, ".l2s.coreutils0001.0002").toPath(), Files.readSymbolicLink(intermediate.toPath())) + assertEquals("multicall", tail.readText()) + assertEquals("multicall", coreutils.readText()) + } + + @Test fun eachFurtherLinkRaisesTheCount() { + val bin = File(dir, "usr/bin").apply { mkdirs() } + val coreutils = File(bin, "coreutils").apply { writeText("multicall") } + assertTrue(LinuxRuntimeInstaller.l2sLink(coreutils, File(bin, "tail"))) + assertTrue(LinuxRuntimeInstaller.l2sLink(coreutils, File(bin, "head"))) + assertTrue(LinuxRuntimeInstaller.l2sLink(File(bin, "tail"), File(bin, "cat"))) + val final = File(bin, ".l2s.coreutils0001.0004") + assertTrue(final.isFile) + assertFalse(File(bin, ".l2s.coreutils0001.0002").exists()) + for (name in listOf("coreutils", "tail", "head", "cat")) assertEquals("multicall", File(bin, name).readText()) + } + + @Test fun aSecondFileWithTheSameNameGetsItsOwnChain() { + val a = File(dir, "a").apply { mkdirs() } + val existing = File(a, ".l2s.tool0001").apply { writeText("taken") } + val tool = File(a, "tool").apply { writeText("tool") } + assertTrue(LinuxRuntimeInstaller.l2sLink(tool, File(a, "alias"))) + assertEquals("taken", existing.readText()) + assertEquals(File(a, ".l2s.tool0002").toPath(), Files.readSymbolicLink(tool.toPath())) + assertEquals("tool", File(a, "alias").readText()) + } + + @Test fun linksMadeInStagingStillResolveAfterTheTreeIsRenamed() { + val staging = File(dir, "linuxfs.new") + val live = File(dir, "linuxfs") + val bin = File(staging, "usr/bin").apply { mkdirs() } + val cargo = File(staging, "usr/lib/cargo/bin/coreutils").apply { mkdirs() } + val coreutils = File(bin, "coreutils").apply { writeText("multicall") } + assertTrue(LinuxRuntimeInstaller.l2sLink(coreutils, File(cargo, "echo"), staging, live)) + assertTrue(LinuxRuntimeInstaller.l2sLink(File(cargo, "echo"), File(cargo, "cat"), staging, live)) + assertEquals(File(live, "usr/bin/.l2s.coreutils0001").toPath(), Files.readSymbolicLink(File(cargo, "echo").toPath())) + assertTrue(File(staging, "usr/bin/.l2s.coreutils0001.0003").isFile) + + assertTrue(staging.renameTo(live)) + + for (rel in listOf("usr/bin/coreutils", "usr/lib/cargo/bin/coreutils/echo", "usr/lib/cargo/bin/coreutils/cat")) + assertEquals(rel, "multicall", File(live, rel).readText()) + assertTrue(LinuxRuntimeInstaller.l2sLink(File(live, "usr/bin/coreutils"), File(live, "usr/bin/tail"))) + assertEquals("multicall", File(live, "usr/bin/tail").readText()) + assertTrue(File(live, "usr/bin/.l2s.coreutils0001.0004").isFile) + } + + @Test fun aHardLinkTargetMayAlreadyBeAnL2sLinkToTheFinalTree() { + val staging = File(dir, "linuxfs.new") + val live = File(dir, "linuxfs") + val bin = File(staging, "usr/bin").apply { mkdirs() } + File(bin, "coreutils").writeText("multicall") + assertTrue(LinuxRuntimeInstaller.l2sLink(File(bin, "coreutils"), File(bin, "["), staging, live)) + assertEquals(File(bin, "coreutils"), LinuxRuntimeInstaller.hardLinkTarget(staging, "./usr/bin/coreutils")) + assertTrue(LinuxRuntimeInstaller.l2sLink(LinuxRuntimeInstaller.hardLinkTarget(staging, "./usr/bin/coreutils"), File(bin, "ls"), staging, live)) + assertTrue(staging.renameTo(live)) + assertEquals("multicall", File(live, "usr/bin/ls").readText()) + } + + @Test fun aHardLinkTargetCannotLeaveTheTree() { + val tree = File(dir, "tree").apply { mkdirs() } + val outside = File(dir, "outside").apply { mkdirs() } + Files.createSymbolicLink(File(tree, "escape").toPath(), outside.toPath()) + assertEquals(null, LinuxRuntimeInstaller.hardLinkTarget(tree, "../outside/x")) + assertEquals(null, LinuxRuntimeInstaller.hardLinkTarget(tree, "escape/x")) + assertEquals(null, LinuxRuntimeInstaller.hardLinkTarget(tree, "..")) + assertEquals(File(tree, "x"), LinuxRuntimeInstaller.hardLinkTarget(tree, "./x")) + } + + @Test fun directoriesAndPlainSymlinksAreLeftAlone() { + val d = File(dir, "d").apply { mkdirs() } + assertFalse(LinuxRuntimeInstaller.l2sLink(d, File(dir, "e"))) + val target = File(dir, "t").apply { writeText("t") } + val link = File(dir, "link") + Files.createSymbolicLink(link.toPath(), target.toPath()) + assertFalse(LinuxRuntimeInstaller.l2sLink(link, File(dir, "other"))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt index d977ffb8cc..75ac195ae6 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt @@ -52,6 +52,47 @@ class RuntimeUserDataCarryTest { assertFalse("only DroidDeck's own menu entries are user data", File(staging, "usr/local/share/applications/other.desktop").exists()) } + @Test fun aMenuEntryTheNewRuntimeShipsIsNotCarried() { + val old = tmp.newFolder("old").also { + put(it, "root/save.dat", "mine") + put(it, "usr/share/applications/droiddeck-return-gaming.desktop", "old runtime") + put(it, "usr/share/applications/droiddeck-steam-x64.desktop", "made by the old desktop") + } + val staging = tmp.newFolder("new").also { + put(it, "root/.bashrc", "shipped") + put(it, "usr/share/applications/droiddeck-return-gaming.desktop", "new runtime") + } + + val paths = RuntimeFileTree.existingUserPaths(old, staging) + + assertTrue("root" in paths) + assertTrue("usr/share/applications/droiddeck-steam-x64.desktop" in paths) + assertFalse("usr/share/applications/droiddeck-return-gaming.desktop" in paths) + RuntimeFileTree.carryUserData(old, staging, false, paths) + assertEquals("new runtime", File(staging, "usr/share/applications/droiddeck-return-gaming.desktop").readText()) + } + + @Test fun cachesTiedToThePreviousRuntimeAreDropped() { + val root = tmp.newFolder("rt") + val keep = listOf("root/.cache/mozilla/cache2/entry", "root/.cache/droiddeck/session.log", + "root/.local/share/droiddeck/apt/packages.txt", "root/.local/share/Steam/steam.sh", "root/.config/kwinrc") + val drop = listOf("root/.local/share/droiddeck/pacman/packages.txt", "root/.cache/droiddeck/pacman-restore.log", + "root/.cache/mesa_shader_cache_db/index", "root/.cache/mesa_shader_cache/a/b", "root/.cache/appstream/x.xb", + "root/.cache/discover/c", "root/.cache/ksycoca6_en-POSIX_abc", "root/.cache/plasma_theme_Vapor.kcache", + "root/.cache/kwinsession.kcache", "root/.cache/qtshadercache-arm64-little_endian-lp64/s", + "root/.cache/event-sound-cache.tdb.1.aarch64-unknown-linux-gnu", "root/.cache/fontconfig/x.cache-9") + (keep + drop).forEach { put(root, it) } + + RuntimeFileTree.dropStaleState(root) + + keep.forEach { assertTrue(it, File(root, it).exists()) } + drop.forEach { assertFalse(it, File(root, it).exists()) } + } + + @Test fun droppingStateWithoutAHomeDoesNothing() { + RuntimeFileTree.dropStaleState(tmp.newFolder("empty")) + } + @Test fun aFailureHalfwayPutsEverythingBack() { val old = userTree() val staging = tmp.newFolder("new") diff --git a/tools/desktop-kde/README.md b/tools/desktop-kde/README.md index f2303b26fd..53c6c5531b 100644 --- a/tools/desktop-kde/README.md +++ b/tools/desktop-kde/README.md @@ -11,8 +11,30 @@ icon, Plasma's default bottom panel, and "Return to Gaming Mode" and Steam on th - `overlay/`: our files on top - system-wide KDE defaults in `/etc/xdg`, the Vapor theme and its layout script, the menu entries Steam and Return to Gaming Mode use. +pacman works on the desktop. `pacman-db.py` writes an install record for every package the desktop +ships into `/var/lib/pacman/local`, and builds the `droiddeck` repository: Arch Linux ARM's core, +extra and alarm databases as they were at build time, with the runtime's and the desktop's own +packages at the installed versions. The release carries that database (`droiddeck.db`) and the +packages `mirror.txt` names; everything else downloads from Arch Linux ARM as a `CacheServer`, so its +404s never disable a mirror. Installs therefore resolve against the desktop's exact Qt and KDE +versions, and `pacman -Syu` only ever moves packages the user added. + +- `/usr/local/bin/pacman` runs the real pacman with `/usr/share/droiddeck/pacman/pacman.conf`, first + copying in the shipped database and dropping the runtime's records for packages the desktop + replaced (`prepare`). As root it adds `--needed` to installs, so guides that reinstall + something the desktop has just skip it. +- `sudo`, `su` and `sudoedit` run commands as root: the session is the app's own Android user, and + `libdroiddeck-root.so` (`root/root.c`, preloaded by `sudo`) reports uid 0, accepts ownership + changes and shows the runtime's 0700 directories as 0755. It grants nothing the user lacked. +- `hooks/droiddeck-system.hook` refuses to remove or replace any runtime or desktop package; + `droiddeck-remember.hook` keeps the user's own packages in + `~/.local/share/droiddeck/pacman/packages.txt`, and `restore` (autostarted) reinstalls them after a + runtime update and upgrades them after a desktop update. Hooks that need systemd, udev, kernel + modules or an initramfs are masked. + `.github/workflows/build-desktop-kde.yml` builds it and, run with a new tag, publishes it as a -release in Droid-Deck/DroidDeck-Components. `release.env` pins the tag, sha256 and size the apk +release in Droid-Deck/DroidDeck-Components (tags with `-rc` are published as pre-releases for testing +before an app build points at them). `release.env` pins the tag, sha256 and size the apk installs (`DesktopCatalog.desktopEntry`); a published tag is never replaced, so a changed package is a new tag and a `release.env` update. @@ -20,6 +42,8 @@ At run time the desktop is started by `tools/linuxfs/desktop/droiddeck-desktop` at every session): Plasma's own `startplasma-wayland`, with KWin nested in the app's compositor through `kwin_wayland_wrapper`. The package's `kwin-compositor` marker selects OpenGL through Zink for KWin 6.8, which removed QPainter. Older packages retain their software compositor. +KWin runs without Gallium's threaded context and without overlay layers. With the threaded context, KWin crashed +uploading windows' shared-memory buffers by reading past their end, and the host shows only a single buffer. On Android the launcher explicitly selects the KGSL render node; the nested backend can use it when the host's dmabuf feedback cannot name a DRM device. Games and emulators from the menu go through `droiddeck-gpu`, and Steam goes back to the app as a Steam session. @@ -35,6 +59,9 @@ The behavior is enabled only with `DROIDDECK_NESTED_SCALE`, which the desktop sc `0002-select-explicit-nested-render-node.patch` lets that nested backend use one explicitly selected `KWIN_RENDER_NODES` device when host feedback cannot identify it. It does not guess between GPUs or change normal KWin device selection. +`0003-forward-nested-scroll-source.patch` passes the host's scroll source, wheel steps and scroll stops +through the nested backend, which upstream leaves as a TODO. Two-finger touch scrolling then reaches +apps as touchpad scrolling, and wheel steps stay whole clicks. `pins/mesa/desc` keeps Mesa 26.2.4 and its actual package dependencies ahead of the rolling repository metadata. Mesa 26.2.5 crashes in Zink shader compilation on Thor with the selected @@ -44,7 +71,7 @@ both build jobs verify the Arch Linux ARM signature and pinned SHA-256 as for ev The desktop workflow replaces the same-version `kwin_wayland` executable and `libkwin.so`; the rest comes from the signature-checked Arch packages. `desktop-kde.kwin.txt` records the source, patch, executable, library and build package hashes. Corresponding source is -https://download.kde.org/stable/plasma/6.8.0/kwin-6.8.0.tar.xz plus the patch in this repository. +https://download.kde.org/stable/plasma/6.8.2/kwin-6.8.2.tar.xz plus the patch in this repository. The inventories use `.gzip` rather than `.gz`: Android's asset packer expands `.gz` and strips its suffix. The shared local/CI runtime payload check verifies the exact APK names and bytes. diff --git a/tools/desktop-kde/build-kwin.sh b/tools/desktop-kde/build-kwin.sh index cff8d075fc..d3620257c9 100644 --- a/tools/desktop-kde/build-kwin.sh +++ b/tools/desktop-kde/build-kwin.sh @@ -6,7 +6,7 @@ here=$(cd "$(dirname "$0")" && pwd) source "$here/kwin.env" source "$here/mesa.env" version=$DESKTOP_KWIN_VERSION -source_sha=4bfaf31e29a8f9fdf231dc3bbb9b09b0ce07cae9fee7a01cfc86425ece796258 +source_sha=ea5e68d957c7d70abed97222a592d4445fda29129e20942658badd224ee138b4 mirror=https://fl.us.mirror.archlinuxarm.org/aarch64 builder=68B3537F39A313B3E574D06777193F152BDBE6A6 work=$(mktemp -d) @@ -52,6 +52,7 @@ sudo mount -t proc proc "$work/root/proc" sudo tar -xf "$work/kwin.tar.xz" -C "$work/root/build" sudo patch -d "$work/root/build/kwin-$version" -p1 < "$here/patches/0001-respect-nested-desktop-scale.patch" sudo patch -d "$work/root/build/kwin-$version" -p1 < "$here/patches/0002-select-explicit-nested-render-node.patch" +sudo patch -d "$work/root/build/kwin-$version" -p1 < "$here/patches/0003-forward-nested-scroll-source.patch" sudo chroot "$work/root" /usr/bin/env PATH=/usr/bin:/bin HOME=/root LC_ALL=C.UTF-8 \ /usr/bin/cmake -S "/build/kwin-$version" -B /build/out -G Ninja \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBEXECDIR=lib \ @@ -72,6 +73,7 @@ grep -aq DROIDDECK_NESTED_SCALE "$out/libkwin.so.$version" echo "KWin $version source sha256 $source_sha" echo "Patch sha256 $(sha256sum "$here/patches/0001-respect-nested-desktop-scale.patch" | cut -d' ' -f1)" echo "Render node patch sha256 $(sha256sum "$here/patches/0002-select-explicit-nested-render-node.patch" | cut -d' ' -f1)" + echo "Scroll source patch sha256 $(sha256sum "$here/patches/0003-forward-nested-scroll-source.patch" | cut -d' ' -f1)" echo "Executable sha256 $(sha256sum "$out/kwin_wayland" | cut -d' ' -f1)" echo "Library sha256 $(sha256sum "$out/libkwin.so.$version" | cut -d' ' -f1)" echo 'Build packages (Arch Linux ARM signatures verified):' diff --git a/tools/desktop-kde/build.sh b/tools/desktop-kde/build.sh index b8d8a0efca..04ad5fbb59 100755 --- a/tools/desktop-kde/build.sh +++ b/tools/desktop-kde/build.sh @@ -38,6 +38,12 @@ while read -r entry sum; do done < "$work/pkglist.txt" cp -a "$here/overlay/." "$work/root/" +mkdir -p "$work/root/usr/lib/droiddeck" +${CC_AARCH64:-aarch64-linux-gnu-gcc} -shared -fPIC -O2 -Wall -Wextra \ + -o "$work/root/usr/lib/droiddeck/libdroiddeck-root.so" "$here/root/root.c" -ldl +${STRIP_AARCH64:-aarch64-linux-gnu-strip} --strip-unneeded "$work/root/usr/lib/droiddeck/libdroiddeck-root.so" +python3 "$here/pacman-db.py" "$work/db" "$pkgs" "$work/pkglist.txt" "$here/runtime-packages.txt" \ + "$here/mirror.txt" "${DESKTOP_KDE_RELEASE_TAG:-}" "$work/root" "$out/repo" if [ -n "${KDE_KWIN_OVERRIDE:-}" ]; then kwin_package=$(awk '$1 ~ /^extra\/kwin-.*-aarch64\.pkg\.tar\./ {print $1}' "$work/pkglist.txt") @@ -61,7 +67,7 @@ if [ -d "$work/root/usr/share/locale" ]; then echo "i18n: $(wc -l < "$out/desktop-kde.i18n.txt") language packs" fi -rm -rf "$work/root/usr/share/doc" "$work/root/usr/share/man" "$work/root/usr/share/info" \ +rm -rf "$work/root/usr/share/doc" "$work/root/usr/share/info" \ "$work/root/usr/share/gtk-doc" "$work/root/usr/include" "$work/root/usr/lib/pkgconfig" \ "$work/root/usr/lib/cmake" "$work/root/usr/share/help" find "$work/root/usr/share/locale" -mindepth 1 -maxdepth 1 -type d ! -name 'en*' -exec rm -rf {} + 2>/dev/null || true diff --git a/tools/desktop-kde/kwin.env b/tools/desktop-kde/kwin.env index d6ef0cee96..6ad1968d5a 100644 --- a/tools/desktop-kde/kwin.env +++ b/tools/desktop-kde/kwin.env @@ -1 +1 @@ -DESKTOP_KWIN_VERSION=6.8.0 +DESKTOP_KWIN_VERSION=6.8.2 diff --git a/tools/desktop-kde/mirror.txt b/tools/desktop-kde/mirror.txt new file mode 100644 index 0000000000..ea885249fa --- /dev/null +++ b/tools/desktop-kde/mirror.txt @@ -0,0 +1,16 @@ +neovim +tmux +screen +rsync +jq +ripgrep +fd +bat +ncdu +btop +fastfetch +lsof +strace +python-pip +nodejs +npm diff --git a/tools/desktop-kde/overlay/etc/xdg/autostart/droiddeck-pacman-restore.desktop b/tools/desktop-kde/overlay/etc/xdg/autostart/droiddeck-pacman-restore.desktop new file mode 100644 index 0000000000..4263cc7c5d --- /dev/null +++ b/tools/desktop-kde/overlay/etc/xdg/autostart/droiddeck-pacman-restore.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Restore pacman packages +Exec=/usr/share/droiddeck/pacman/restore +NoDisplay=true +OnlyShowIn=KDE; +X-KDE-autostart-phase=2 diff --git a/tools/desktop-kde/overlay/usr/local/bin/pacman b/tools/desktop-kde/overlay/usr/local/bin/pacman new file mode 100755 index 0000000000..ddbfbb8c70 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/bin/pacman @@ -0,0 +1,31 @@ +#!/bin/bash +dir=/usr/share/droiddeck/pacman +[ -r "$dir/pacman.conf" ] || exec /usr/bin/pacman "$@" +"$dir/prepare" || exit 1 +install=0 +if [ "$(id -u)" = 0 ]; then + letters= install=1 + for arg in "$@"; do + case $arg in + --) break ;; + --sync) letters+=S ;; + --search|--info|--clean|--groups|--list|--print|--print-format|--downloadonly) install=0 ;; + --*) ;; + -*) letters+=${arg#-} ;; + esac + done + case $letters in *S*) ;; *) install=0 ;; esac + case $letters in *[sicglpw]*) install=0 ;; esac + [ "$install" = 1 ] && set -- --needed "$@" +fi +[ "$install" = 1 ] || exec /usr/bin/pacman --config "$dir/pacman.conf" "$@" +/usr/bin/pacman --config "$dir/pacman.conf" "$@" && exit 0 +status=$? +mapfile -t paths < <("$dir/adopt" "$@") +[ ${#paths[@]} -gt 0 ] || exit "$status" +overwrite=() +for path in "${paths[@]}"; do overwrite+=(--overwrite "$path"); done +/usr/bin/pacman --config "$dir/pacman.conf" "${overwrite[@]}" "$@" || exit +mapfile -t shared < <(/usr/bin/pacman --config "$dir/pacman.conf" -Qqd 2>/dev/null | grep -xF -f /var/lib/pacman/droiddeck-shared) +[ ${#shared[@]} -eq 0 ] || /usr/bin/pacman --config "$dir/pacman.conf" -D --asexplicit "${shared[@]}" >/dev/null +"$dir/remember" diff --git a/tools/desktop-kde/overlay/usr/local/bin/su b/tools/desktop-kde/overlay/usr/local/bin/su new file mode 100755 index 0000000000..02f2e55d73 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/bin/su @@ -0,0 +1,32 @@ +#!/bin/bash +login=0 command= shell= +while [ $# -gt 0 ]; do + case $1 in + -|-l|--login) login=1; shift ;; + -c|--command) [ $# -ge 2 ] || { echo "su: option requires an argument -- 'c'" >&2; exit 1; }; command=$2; shift 2 ;; + --command=*) command=${1#*=}; shift ;; + -s|--shell) [ $# -ge 2 ] || { echo "su: option requires an argument -- 's'" >&2; exit 1; }; shell=$2; shift 2 ;; + --shell=*) shell=${1#*=}; shift ;; + -m|-p|--preserve-environment|-P|--pty|-f|--fast) shift ;; + -h|--help) echo "usage: su [-] [-c command] [-s shell] [root]"; exit 0 ;; + -V|--version) echo "DroidDeck su: runs a root shell inside the DroidDeck desktop"; exit 0 ;; + --) shift; break ;; + -*) echo "su: invalid option -- '${1#-}'" >&2; exit 1 ;; + *) break ;; + esac +done +user=${1:-root} +[ $# -gt 0 ] && shift +case $user in + root|0|"$(id -un 2>/dev/null)") ;; + *) echo "su: user $user does not exist or the user entry does not contain all the required fields" >&2; exit 1 ;; +esac +args=() +[ "$login" = 1 ] && args+=(-i) +if [ -n "$shell" ]; then + if [ -n "$command" ]; then exec /usr/local/bin/sudo "${args[@]}" "$shell" -c "$command" "$@"; fi + exec /usr/local/bin/sudo "${args[@]}" "$shell" "$@" +fi +if [ -n "$command" ]; then exec /usr/local/bin/sudo "${args[@]}" -s "$command"; fi +[ "$login" = 1 ] && exec /usr/local/bin/sudo -i +exec /usr/local/bin/sudo -s diff --git a/tools/desktop-kde/overlay/usr/local/bin/sudo b/tools/desktop-kde/overlay/usr/local/bin/sudo new file mode 100755 index 0000000000..0f10f02e39 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/bin/sudo @@ -0,0 +1,94 @@ +#!/bin/bash +lib=/usr/lib/droiddeck/libdroiddeck-root.so +me=${0##*/} +usage() { + echo "usage: $me [-EHiknsSv] [-u user] [-g group] [-D directory] [--] command [arg ...]" + echo " $me -e file ..." +} +known_user() { + case $1 in + ''|root|0|'#0'|"$(id -un 2>/dev/null)"|"#$(id -ru 2>/dev/null)") return 0 ;; + esac + echo "$me: unknown user $1" >&2 + exit 1 +} + +login=0 shell=0 edit=0 background=0 dir= +[ "$me" = sudoedit ] && edit=1 +while [ $# -gt 0 ]; do + case $1 in + --) shift; break ;; + -h|--help) usage; exit 0 ;; + -V|--version) echo "DroidDeck sudo: runs commands as root inside the DroidDeck desktop"; exit 0 ;; + -l|--list) echo "User $(id -un 2>/dev/null) may run the following commands on $(uname -n):"; echo " (ALL : ALL) ALL"; exit 0 ;; + -v|--validate|-K|--remove-timestamp) exit 0 ;; + -k|--reset-timestamp) shift; [ $# -eq 0 ] && exit 0 ;; + -i|--login) login=1; shift ;; + -s|--shell) shell=1; shift ;; + -e|--edit) edit=1; shift ;; + -b|--background) background=1; shift ;; + -E|--preserve-env|--preserve-env=*|-H|--set-home|-n|--non-interactive|-S|--stdin|-P|--preserve-groups|-A|--askpass|-B|--bell|-N|--no-update) shift ;; + -u|--user|-g|--group) [ $# -ge 2 ] || { usage >&2; exit 1; }; known_user "$2"; shift 2 ;; + --user=*|--group=*) known_user "${1#*=}"; shift ;; + -u*|-g*) known_user "${1:2}"; shift ;; + -D|--chdir) [ $# -ge 2 ] || { usage >&2; exit 1; }; dir=$2; shift 2 ;; + --chdir=*) dir=${1#*=}; shift ;; + -p|--prompt|-C|--close-from|-r|--role|-t|--type|-T|--command-timeout|-R|--chroot) [ $# -ge 2 ] || { usage >&2; exit 1; }; shift 2 ;; + --prompt=*|--close-from=*|--role=*|--type=*|--command-timeout=*) shift ;; + -[A-Za-z][A-Za-z]*) + flags=${1#-}; shift + split=() + while [ -n "$flags" ]; do + split+=("-${flags:0:1}") + case ${flags:0:1} in + u|g|D|p|C|r|t|T|R) [ -n "${flags:1}" ] && split+=("${flags:1}"); flags= ;; + *) flags=${flags:1} ;; + esac + done + set -- "${split[@]}" "$@" + ;; + -*) echo "$me: invalid option -- '${1#-}'" >&2; usage >&2; exit 1 ;; + *) break ;; + esac +done + +if [ "$edit" = 1 ]; then + [ $# -gt 0 ] || { usage >&2; exit 1; } + editor=${SUDO_EDITOR:-${VISUAL:-${EDITOR:-nano}}} + exec $editor "$@" +fi + +if [ ! -r "$lib" ]; then + echo "$me: $lib is missing; reinstall the desktop from DroidDeck's Desktop page" >&2 + exit 1 +fi +case ":${LD_PRELOAD:-}:" in + *":$lib:"*) ;; + *) export LD_PRELOAD="$lib${LD_PRELOAD:+:$LD_PRELOAD}" ;; +esac +export SUDO_USER=${SUDO_USER:-$(id -un 2>/dev/null)} +export SUDO_UID=${SUDO_UID:-$(id -ru 2>/dev/null)} +export SUDO_GID=${SUDO_GID:-$(id -rg 2>/dev/null)} +export SUDO_COMMAND="$*" +[ -z "$dir" ] || cd "$dir" || exit 1 + +target_shell=$(getent passwd "$(id -un 2>/dev/null)" | cut -d: -f7) +target_shell=${target_shell:-/bin/bash} +if [ "$login" = 1 ]; then + cd "${HOME:-/root}" 2>/dev/null + if [ $# -gt 0 ]; then set -- "$target_shell" -l -c "$*"; else set -- "$target_shell" -l; fi +elif [ "$shell" = 1 ]; then + if [ $# -gt 0 ]; then set -- "${SHELL:-$target_shell}" -c "$*"; else set -- "${SHELL:-$target_shell}"; fi +elif [ $# -eq 0 ]; then + usage >&2 + exit 1 +elif ! command -v "$1" >/dev/null 2>&1; then + echo "$me: $1: command not found" >&2 + exit 1 +fi + +if [ "$background" = 1 ]; then + "$@" & + exit 0 +fi +exec "$@" diff --git a/tools/desktop-kde/overlay/usr/local/bin/sudoedit b/tools/desktop-kde/overlay/usr/local/bin/sudoedit new file mode 120000 index 0000000000..3b0e384e5a --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/bin/sudoedit @@ -0,0 +1 @@ +sudo \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/avahi-discover.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/avahi-discover.desktop new file mode 100644 index 0000000000..9b9f238121 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/avahi-discover.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Avahi Zeroconf Browser +Exec=/usr/bin/avahi-discover +Icon=network-wired +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/bssh.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/bssh.desktop new file mode 100644 index 0000000000..46c4ebc186 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/bssh.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Avahi SSH Server Browser +Exec=/usr/bin/bssh +Icon=network-wired +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/bvnc.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/bvnc.desktop new file mode 100644 index 0000000000..8aa9025476 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/bvnc.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Avahi VNC Server Browser +Exec=/usr/bin/bvnc +Icon=network-wired +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/foot-server.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/foot-server.desktop new file mode 100644 index 0000000000..77719ad7c6 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/foot-server.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Foot Server +Exec=foot --server +Icon=foot +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/footclient.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/footclient.desktop new file mode 100644 index 0000000000..bf59b5c19a --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/footclient.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Foot Client +Exec=footclient +Icon=foot +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/lstopo.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/lstopo.desktop new file mode 100644 index 0000000000..31fd6bd082 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/lstopo.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Hardware Locality lstopo +Exec=lstopo +Icon=hwloc +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/org.freedesktop.IBus.Setup.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/org.freedesktop.IBus.Setup.desktop new file mode 100644 index 0000000000..8e494cc191 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/org.freedesktop.IBus.Setup.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=IBus Preferences +Exec=ibus-setup +Icon=ibus-setup +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/qv4l2.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/qv4l2.desktop new file mode 100644 index 0000000000..f4e2dce807 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/qv4l2.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Qt V4L2 test Utility +Exec=qv4l2 +Icon=qv4l2 +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/local/share/applications/qvidcap.desktop b/tools/desktop-kde/overlay/usr/local/share/applications/qvidcap.desktop new file mode 100644 index 0000000000..3e01700fac --- /dev/null +++ b/tools/desktop-kde/overlay/usr/local/share/applications/qvidcap.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Qt V4L2 video capture utility +Exec=qvidcap +Icon=qvidcap +NoDisplay=true diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/adopt b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/adopt new file mode 100755 index 0000000000..7539159a14 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/adopt @@ -0,0 +1,117 @@ +#!/usr/bin/python3 +import hashlib +import os +import re +import subprocess +import sys +import tarfile + +SHARE = "/usr/share/droiddeck/pacman" +LIB = "/var/lib/pacman" +CACHE = "/var/cache/pacman/pkg" +SHARED = os.path.join(LIB, "droiddeck-shared") +SHARED_FILES = SHARED + "-files" + + +def owned(): + paths = set() + local = os.path.join(LIB, "local") + for entry in os.listdir(local): + try: + with open(os.path.join(local, entry, "files"), encoding="utf-8", errors="surrogateescape") as f: + lines = f.read().split("\n") + except OSError: + continue + reading = False + for line in lines: + if line.startswith("%"): + reading = line == "%FILES%" + elif reading and line: + paths.add(line.rstrip("/")) + return paths + + +def same(archive, member, path): + if member.issym(): + return os.path.islink(path) and os.readlink(path) == member.linkname + if not member.isfile() or os.path.islink(path) or not os.path.isfile(path): + return False + if os.path.getsize(path) != member.size: + return False + with archive.extractfile(member) as packaged, open(path, "rb") as installed: + return hashlib.file_digest(packaged, "sha256").digest() == hashlib.file_digest(installed, "sha256").digest() + + +def planned(args): + query = [] + for arg in args: + if arg == "--refresh" or arg == "--noconfirm": + continue + if re.fullmatch(r"-[A-Za-z]+", arg): + arg = arg.replace("y", "") + if arg == "-": + continue + query.append(arg) + run = subprocess.run(["/usr/bin/pacman", "--config", os.path.join(SHARE, "pacman.conf"), "--noconfirm", *query, + "--print", "--print-format", "%n %f"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, + text=True) + if run.returncode != 0: + return [] + return [line.split(" ", 1) for line in run.stdout.splitlines() if " " in line] + + +def main(): + targets = [(name, os.path.join(CACHE, os.path.basename(file))) for name, file in planned(sys.argv[1:])] + targets = [(name, path) for name, path in targets if os.path.isfile(path)] + if not targets: + return 0 + have = owned() + paths, names = [], [] + for name, path in targets: + found = False + with tarfile.open(path) as archive: + for member in archive: + if member.isdir() or member.name.startswith("."): + continue + if member.name in have or not os.path.lexists("/" + member.name) or os.path.isdir("/" + member.name): + continue + if not same(archive, member, "/" + member.name): + continue + paths.append("/" + member.name) + found = True + if found: + names.append(name) + if not paths: + return 0 + shared = set() + try: + with open(SHARED) as f: + shared = {line.strip() for line in f if line.strip()} + except OSError: + pass + with open(SHARED + ".tmp", "w") as f: + f.write("".join(f"{name}\n" for name in sorted(shared | set(names)))) + os.replace(SHARED + ".tmp", SHARED) + files = set() + try: + with open(SHARED_FILES, encoding="utf-8", errors="surrogateescape") as f: + files = {line.rstrip("\n") for line in f if line.strip()} + except OSError: + pass + with open(SHARED_FILES + ".tmp", "w", encoding="utf-8", errors="surrogateescape") as f: + f.write("".join(f"{path}\n" for path in sorted(files | set(paths)))) + os.replace(SHARED_FILES + ".tmp", SHARED_FILES) + print(f":: Other DroidDeck software already installed {len(paths)} files from {' '.join(names)}.", file=sys.stderr) + print(":: pacman will take them over and keep these packages installed so that software keeps working.", + file=sys.stderr) + for path in paths: + print(re.sub(r"([\\*?\[])", r"\\\1", path)) + return 0 + + +if __name__ == "__main__": + try: + sys.exit(main()) + except (OSError, tarfile.TarError) as e: + print(f"error: could not check for files other DroidDeck software installed: {e}", file=sys.stderr) + sys.exit(1) diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/10-openssh-mark-sshd-for-restart.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/10-openssh-mark-sshd-for-restart.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/10-openssh-mark-sshd-for-restart.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-binfmt.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-binfmt.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-binfmt.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-sysctl.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-sysctl.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/25-systemd-sysctl.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-system.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-system.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-system.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-user.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-user.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/30-systemd-daemon-reload-user.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-enqueue-marked.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-enqueue-marked.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-enqueue-marked.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-udev-reload.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-udev-reload.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/35-systemd-udev-reload.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/36-systemd-modules-load.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/36-systemd-modules-load.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/36-systemd-modules-load.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-depmod.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-depmod.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-depmod.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-mkinitcpio-remove.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-mkinitcpio-remove.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/60-mkinitcpio-remove.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/90-mkinitcpio-install.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/90-mkinitcpio-install.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/90-mkinitcpio-install.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/accounts-daemon-restart.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/accounts-daemon-restart.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/accounts-daemon-restart.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/dbus-reload.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/dbus-reload.hook new file mode 120000 index 0000000000..dc1dc0cde0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/dbus-reload.hook @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-remember.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-remember.hook new file mode 100644 index 0000000000..0469fefc23 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-remember.hook @@ -0,0 +1,11 @@ +[Trigger] +Operation = Install +Operation = Upgrade +Operation = Remove +Type = Package +Target = * + +[Action] +Description = Remembering the packages you installed... +When = PostTransaction +Exec = /usr/share/droiddeck/pacman/remember diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-restore.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-restore.hook new file mode 100644 index 0000000000..05254db4ef --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-restore.hook @@ -0,0 +1,9 @@ +[Trigger] +Operation = Upgrade +Type = Package +Target = * + +[Action] +Description = Putting back files other DroidDeck software needs... +When = PostTransaction +Exec = /usr/share/droiddeck/pacman/keep restore diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-save.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-save.hook new file mode 100644 index 0000000000..5b7b5d48fb --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared-save.hook @@ -0,0 +1,9 @@ +[Trigger] +Operation = Upgrade +Type = Package +Target = * + +[Action] +Description = Saving files other DroidDeck software needs... +When = PreTransaction +Exec = /usr/share/droiddeck/pacman/keep save diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared.hook b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared.hook new file mode 100644 index 0000000000..917ec22200 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/hooks/droiddeck-shared.hook @@ -0,0 +1,11 @@ +[Trigger] +Operation = Remove +Type = Package +Target = * + +[Action] +Description = Checking for files other DroidDeck software needs... +When = PreTransaction +Exec = /usr/share/droiddeck/pacman/shared +NeedsTargets +AbortOnFail diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/keep b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/keep new file mode 100755 index 0000000000..23117fe3eb --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/keep @@ -0,0 +1,26 @@ +#!/bin/bash +list=/var/lib/pacman/droiddeck-shared-files +store=/var/lib/pacman/droiddeck-shared-keep +[ -s "$list" ] || exit 0 +case $1 in + save) + mkdir -p "$store" + while IFS= read -r path; do + [ -e "$path" ] || [ -L "$path" ] || continue + mkdir -p "$store${path%/*}" + rm -f -- "$store$path" + cp -a -- "$path" "$store$path" + done < "$list" + ;; + restore) + [ -d "$store" ] || exit 0 + while IFS= read -r path; do + [ -e "$path" ] || [ -L "$path" ] && continue + [ -e "$store$path" ] || [ -L "$store$path" ] || continue + mkdir -p "${path%/*}" + cp -a -- "$store$path" "$path" + done < "$list" + rm -rf -- /var/lib/pacman/droiddeck-shared-keep + ;; +esac +exit 0 diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/prepare b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/prepare new file mode 100755 index 0000000000..5923ce87e0 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/prepare @@ -0,0 +1,55 @@ +#!/usr/bin/python3 +import hashlib +import os +import shutil +import sys + +SHARE = "/usr/share/droiddeck/pacman" +LIB = "/var/lib/pacman" +STATE = os.path.join(LIB, "droiddeck-desktop") + + +def digest(path): + with open(path, "rb") as f: + return hashlib.sha256(f.read()).hexdigest() + + +def main(): + for path in ("/var/cache/pacman/pkg", os.path.join(LIB, "sync"), "/etc/pacman.d/hooks", "/var/log"): + os.makedirs(path, exist_ok=True) + stamp = digest(os.path.join(SHARE, "desktop-packages.txt")) + " " + digest(os.path.join(SHARE, "droiddeck.db")) + try: + with open(STATE) as f: + if f.read().strip() == stamp: + return 0 + except OSError: + pass + want = dict(line.split() for line in open(os.path.join(SHARE, "desktop-packages.txt")) if line.strip()) + local = os.path.join(LIB, "local") + for entry in os.listdir(local): + desc = os.path.join(local, entry, "desc") + if not os.path.isfile(desc): + continue + name = version = None + with open(desc, encoding="utf-8", errors="replace") as f: + lines = f.read().split("\n") + for i, line in enumerate(lines[:-1]): + if line == "%NAME%": + name = lines[i + 1] + elif line == "%VERSION%": + version = lines[i + 1] + if name in want and version != want[name]: + shutil.rmtree(os.path.join(local, entry)) + shutil.copyfile(os.path.join(SHARE, "droiddeck.db"), os.path.join(LIB, "sync", "droiddeck.db")) + with open(STATE + ".tmp", "w") as f: + f.write(stamp + "\n") + os.replace(STATE + ".tmp", STATE) + return 0 + + +if __name__ == "__main__": + try: + sys.exit(main()) + except OSError as e: + print(f"error: could not prepare pacman's database: {e}", file=sys.stderr) + sys.exit(1) diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/refuse b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/refuse new file mode 100755 index 0000000000..b19dccaf8f --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/refuse @@ -0,0 +1,5 @@ +#!/bin/bash +packages=$(tr '\n' ' ') +echo "error: ${packages% } came with DroidDeck, so pacman can't remove or replace it." >&2 +echo "error: DroidDeck updates these itself; packages you installed with pacman are yours to change." >&2 +exit 1 diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/remember b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/remember new file mode 100755 index 0000000000..d798211a89 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/remember @@ -0,0 +1,15 @@ +#!/bin/bash +dir=/usr/share/droiddeck/pacman +state=/root/.local/share/droiddeck/pacman +mkdir -p "$state" +if [ -z "${DROIDDECK_PACMAN_RESTORING:-}" ] && explicit=$(/usr/bin/pacman --config "$dir/pacman.conf" -Qqe 2>/dev/null); then + printf '%s\n' "$explicit" | grep -vxF -f "$dir/system-packages.txt" > "$state/packages.txt.tmp" + if [ $? -le 1 ] && [ -f "$state/packages.txt.tmp" ]; then + mv -f "$state/packages.txt.tmp" "$state/packages.txt" + else + rm -f "$state/packages.txt.tmp" + fi +fi +[ -s "$state/restored" ] || sha256sum "$dir/droiddeck.db" | cut -d' ' -f1 > "$state/restored" +rm -f /var/cache/pacman/pkg/*.pkg.tar.* /var/cache/pacman/pkg/*.pkg.tar.*.sig 2>/dev/null +exit 0 diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/restore b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/restore new file mode 100755 index 0000000000..a1e6331afa --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/restore @@ -0,0 +1,37 @@ +#!/bin/bash +dir=/usr/share/droiddeck/pacman +state=/root/.local/share/droiddeck/pacman +list=$state/packages.txt +log=/root/.cache/droiddeck/pacman-restore.log +[ -s "$list" ] && [ -r "$dir/pacman.conf" ] || exit 0 +pacman() { /usr/local/bin/pacman "$@"; } +"$dir/prepare" || exit 0 +snapshot=$(sha256sum "$dir/droiddeck.db" | cut -d' ' -f1) +mapfile -t missing < <(grep -vxF -f <(pacman -Qq 2>/dev/null) "$list") +done_for=$(cat "$state/restored" 2>/dev/null) +[ ${#missing[@]} -eq 0 ] && [ "$done_for" = "$snapshot" ] && exit 0 +attempt="$snapshot ${missing[*]}" +[ "$(cat "$state/attempted" 2>/dev/null)" = "$attempt" ] && exit 0 +tries=$(cat "$state/tries" 2>/dev/null) +count=0 +[ "${tries#* }" = "$attempt" ] && count=${tries%% *} +count=$((count + 1)) +echo "$count $attempt" > "$state/tries" +[ "$count" -ge 3 ] && echo "$attempt" > "$state/attempted" +export DROIDDECK_PACMAN_RESTORING=1 +mkdir -p "${log%/*}" +notify() { notify-send -a DroidDeck -i system-software-update "$@" 2>/dev/null; } +notify "Restoring your packages" "Reinstalling software you added with pacman after a DroidDeck update." +export LD_PRELOAD="/usr/lib/droiddeck/libdroiddeck-root.so${LD_PRELOAD:+:$LD_PRELOAD}" +{ + date + ok=1 + [ "$done_for" = "$snapshot" ] || pacman -Su --noconfirm || ok=0 + [ ${#missing[@]} -eq 0 ] || pacman -S --needed --noconfirm "${missing[@]}" || ok=0 +} >> "$log" 2>&1 +if [ "$ok" = 1 ]; then + echo "$snapshot" > "$state/restored" + notify "Packages restored" "Your pacman packages are installed again." +else + notify "Some packages couldn't be restored" "See $log, then try sudo pacman -S in Konsole." +fi diff --git a/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/shared b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/shared new file mode 100755 index 0000000000..1cd211ba2a --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/droiddeck/pacman/shared @@ -0,0 +1,7 @@ +#!/bin/bash +list=/var/lib/pacman/droiddeck-shared +[ -s "$list" ] || exit 0 +mapfile -t packages < <(grep -xF -f "$list") +[ ${#packages[@]} -eq 0 ] && exit 0 +echo "error: ${packages[*]} shares files with other DroidDeck software, so pacman can't remove it." >&2 +exit 1 diff --git a/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE b/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE index a806a082e6..12938c69a7 100644 --- a/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE +++ b/tools/desktop-kde/overlay/usr/share/licenses/droiddeck-desktop/NOTICE @@ -8,8 +8,8 @@ Third-party files in DroidDeck's KDE desktop package (tools/desktop-kde/overlay) - steam.svg: Papirus icon theme (https://github.com/PapirusDevelopmentTeam/papirus-icon-theme), GPL-3.0. -- kwin_wayland: KWin 6.8.0, GPL-2.0-or-later. Built with DroidDeck's nested desktop scale patch. - Corresponding source: https://download.kde.org/stable/plasma/6.8.0/kwin-6.8.0.tar.xz and +- kwin_wayland: KWin 6.8.2, GPL-2.0-or-later. Built with DroidDeck's nested desktop scale patch. + Corresponding source: https://download.kde.org/stable/plasma/6.8.2/kwin-6.8.2.tar.xz and https://github.com/Droid-Deck/DroidDeck/tree/fix/kde-desktop-followups/tools/desktop-kde/patches (the source and patch hashes are recorded in desktop-kde.kwin.txt beside the package). diff --git a/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js index e27c370d3e..7598c22ab7 100644 --- a/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js +++ b/tools/desktop-kde/overlay/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js @@ -14,6 +14,14 @@ kickoff.currentConfigGroup = ["Shortcuts"]; kickoff.writeConfig("global", "Alt+F1"); kickoff.currentConfigGroup = ["General"]; kickoff.writeConfig("icon", "distributor-logo-steamdeck"); +kickoff.writeConfig("favorites", [ + "preferred://browser", + "applications:org.kde.dolphin.desktop", + "applications:org.kde.konsole.desktop", + "applications:org.kde.kate.desktop", + "applications:org.kde.discover.desktop", + "applications:systemsettings.desktop", +]); panel.addWidget("org.kde.plasma.pager"); @@ -24,6 +32,7 @@ tasks.writeConfig("launchers", [ "preferred://filemanager", "preferred://browser", "applications:org.kde.konsole.desktop", + "applications:org.kde.kate.desktop", ]); panel.addWidget("org.kde.plasma.marginsseparator"); diff --git a/tools/desktop-kde/overlay/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js b/tools/desktop-kde/overlay/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js new file mode 100644 index 0000000000..ee53846083 --- /dev/null +++ b/tools/desktop-kde/overlay/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js @@ -0,0 +1,11 @@ +panels().forEach(function (panel) { + panel.widgets("org.kde.plasma.icontasks").forEach(function (tasks) { + tasks.currentConfigGroup = ["General"]; + var launchers = tasks.readConfig("launchers"); + if (typeof launchers === "string") launchers = launchers.length ? launchers.split(",") : []; + if (launchers.indexOf("applications:org.kde.kate.desktop") < 0) { + launchers.push("applications:org.kde.kate.desktop"); + tasks.writeConfig("launchers", launchers); + } + }); +}); diff --git a/tools/desktop-kde/pacman-db.py b/tools/desktop-kde/pacman-db.py new file mode 100755 index 0000000000..ce2282e761 --- /dev/null +++ b/tools/desktop-kde/pacman-db.py @@ -0,0 +1,258 @@ +#!/usr/bin/env python3 +import base64 +import hashlib +import io +import os +import re +import subprocess +import sys +import tarfile +import time + +REPOS = ("core", "extra", "alarm") +FIELDS = ("NAME", "VERSION", "BASE", "DESC", "URL", "ARCH", "BUILDDATE", "INSTALLDATE", "PACKAGER", "SIZE", + "GROUPS", "LICENSE", "VALIDATION", "REPLACES", "DEPENDS", "OPTDEPENDS", "CONFLICTS", "PROVIDES", "XDATA") +PKGINFO = {"pkgname": "NAME", "pkgbase": "BASE", "pkgver": "VERSION", "pkgdesc": "DESC", "url": "URL", + "builddate": "BUILDDATE", "packager": "PACKAGER", "size": "SIZE", "arch": "ARCH", "license": "LICENSE", + "replaces": "REPLACES", "group": "GROUPS", "conflict": "CONFLICTS", "provides": "PROVIDES", + "depend": "DEPENDS", "optdepend": "OPTDEPENDS", "xdata": "XDATA"} +BLOCKED = re.compile(r"^(sudo|opendoas|doas|mkinitcpio.*|linux|linux-.*|.*-firmware|firmware-.*|grub|uboot-.*|" + r"raspberrypi-.*|archlinuxarm-keyring|pacman|pacman-mirrorlist)$") +ALARM = "http://mirror.archlinuxarm.org/aarch64" +RELEASES = "https://github.com/Droid-Deck/DroidDeck-Components/releases/download" +BUILDER = "68B3537F39A313B3E574D06777193F152BDBE6A6" + + +def read_entry(path): + fields, key = {}, None + for name in ("desc", "depends"): + file = os.path.join(path, name) + if not os.path.exists(file): + continue + for line in open(file, encoding="utf-8", errors="replace"): + line = line.rstrip("\n") + if line.startswith("%") and line.endswith("%") and len(line) > 2: + key = line.strip("%") + fields[key] = [] + elif line == "": + key = None + elif key: + fields[key].append(line) + return fields + + +def write_fields(fields, order): + out = [] + for key in order: + values = fields.get(key) + if values: + out.append("%" + key + "%\n" + "".join(v + "\n" for v in values)) + return "\n".join(out) + + +def dep_name(dep): + return re.split(r"[<>=]", dep, maxsplit=1)[0] + + +def asset_name(name): + return re.sub(r"[^A-Za-z0-9._-]", ".", name) + + +def package_members(path): + if path.endswith(".zst"): + data = subprocess.run(["zstd", "-dc", path], check=True, stdout=subprocess.PIPE).stdout + return tarfile.open(fileobj=io.BytesIO(data), mode="r:") + return tarfile.open(path) + + +def local_record(path, installed): + with package_members(path) as tar: + info, mtree, install, files = None, None, None, [] + for member in tar: + name = member.name.removeprefix("./") + if name == ".PKGINFO": + info = tar.extractfile(member).read().decode("utf-8", "replace") + elif name == ".MTREE": + mtree = tar.extractfile(member).read() + elif name == ".INSTALL": + install = tar.extractfile(member).read() + elif name in (".BUILDINFO", ".CHANGELOG") or not name: + continue + else: + files.append(name.rstrip("/") + ("/" if member.isdir() else "")) + if info is None or mtree is None: + raise SystemExit(f"{path}: no .PKGINFO or .MTREE") + fields, backup = {}, [] + for line in info.splitlines(): + if " = " not in line or line.startswith("#"): + continue + key, value = line.split(" = ", 1) + if key == "backup": + backup.append(value) + elif key in PKGINFO: + fields.setdefault(PKGINFO[key], []).append(value) + fields["INSTALLDATE"] = [str(installed)] + fields["VALIDATION"] = ["pgp"] + for dir_ in sorted({f.rsplit("/", 1)[0] + "/" for f in files if "/" in f.rstrip("/")}): + parts = dir_.rstrip("/").split("/") + for i in range(1, len(parts) + 1): + entry = "/".join(parts[:i]) + "/" + if entry not in files: + files.append(entry) + sums = {} + if backup: + with package_members(path) as tar: + for member in tar: + name = member.name.removeprefix("./") + if name in backup and member.isfile(): + sums[name] = hashlib.md5(tar.extractfile(member).read()).hexdigest() + listing = "%FILES%\n" + "".join(f + "\n" for f in sorted(set(files))) + if backup: + listing += "\n%BACKUP%\n" + "".join(f"{b}\t{sums.get(b, '')}\n" for b in backup) + return fields, listing, mtree, install + + +def fetch(dest, *urls): + for url in urls: + if subprocess.run(["curl", "-fsSL", "--retry", "6", "--retry-delay", "5", "--retry-all-errors", + "-o", dest, url]).returncode == 0: + return + raise SystemExit(f"could not download {os.path.basename(dest)}") + + +def main(): + dbdir, cache, pkglist, runtime_file, mirror_file, tag, root, repo = sys.argv[1:9] + here = os.path.dirname(os.path.abspath(__file__)) + installed = int(os.environ.get("SOURCE_DATE_EPOCH", time.time())) + + entries = {} + for source, path in [("extra", os.path.join(here, "pins"))] + [(r, os.path.join(dbdir, "x_" + r)) for r in REPOS]: + for entry in sorted(os.listdir(path)): + fields = read_entry(os.path.join(path, entry)) + name = fields.get("NAME", [None])[0] + if name and name not in entries: + entries[name] = (source, fields) + by_file = {fields["FILENAME"][0]: name for name, (_, fields) in entries.items()} + + runtime = dict(line.split() for line in open(runtime_file) if len(line.split()) == 2) + shipped = {} + for line in open(pkglist): + file = line.split()[0].split("/", 1)[1] + shipped[by_file[file]] = file + + local = os.path.join(root, "var/lib/pacman/local") + os.makedirs(local, exist_ok=True) + for name, file in sorted(shipped.items()): + fields, listing, mtree, install = local_record(os.path.join(cache, file), installed) + if fields["NAME"][0] != name: + raise SystemExit(f"{file}: .PKGINFO names {fields['NAME'][0]}, not {name}") + record = os.path.join(local, f"{name}-{fields['VERSION'][0]}") + os.makedirs(record, exist_ok=True) + with open(os.path.join(record, "desc"), "w") as out: + out.write(write_fields(fields, FIELDS)) + with open(os.path.join(record, "files"), "w") as out: + out.write(listing) + with open(os.path.join(record, "mtree"), "wb") as out: + out.write(mtree) + if install: + with open(os.path.join(record, "install"), "wb") as out: + out.write(install) + + system = set(runtime) | set(shipped) + available = {n for n in entries if not BLOCKED.match(n)} | system + providers = {} + for name in available: + if name in entries: + for p in entries[name][1].get("PROVIDES", []): + providers.setdefault(dep_name(p), name) + satisfied = set(system) + for name in system: + if name in entries: + satisfied.update(dep_name(p) for p in entries[name][1].get("PROVIDES", [])) + + wanted = [l.strip() for l in open(mirror_file) if l.strip() and not l.startswith("#")] + mirrored, queue = set(), list(wanted) + while queue: + dep = dep_name(queue.pop()) + if dep in satisfied: + continue + name = dep if dep in available and dep in entries else providers.get(dep) + if name is None: + raise SystemExit(f"mirror.txt: nothing in the repository provides {dep}") + if name in mirrored or name in system: + continue + mirrored.add(name) + queue.extend(entries[name][1].get("DEPENDS", [])) + + os.makedirs(repo, exist_ok=True) + for name in sorted(mirrored): + source, fields = entries[name] + file = fields["FILENAME"][0] + dest = os.path.join(repo, asset_name(file)) + if not os.path.exists(dest) or hashlib.sha256(open(dest, "rb").read()).hexdigest() != fields["SHA256SUM"][0]: + fetch(dest, f"{ALARM}/{source}/{file}") + if hashlib.sha256(open(dest, "rb").read()).hexdigest() != fields["SHA256SUM"][0]: + raise SystemExit(f"{file}: sha256 differs from the repository database's") + signature = fields.get("PGPSIG", [None])[0] + sig = dest + ".sig" + if signature: + with open(sig, "wb") as out: + out.write(base64.b64decode(signature)) + else: + fetch(sig, f"{ALARM}/{source}/{file}.sig") + check = subprocess.run(["gpgv", "--status-fd", "1", "--keyring", os.path.join(here, "archlinuxarm-builder.gpg"), + sig, dest], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, text=True).stdout + if not re.search(rf"^\[GNUPG:\] VALIDSIG .* {BUILDER}$", check, re.M): + raise SystemExit(f"{file}: no valid Arch Linux ARM Build System signature") + if not signature: + fields["PGPSIG"] = [base64.b64encode(open(sig, "rb").read()).decode()] + os.remove(sig) + print(f"pacman: {len(shipped)} install records, {len(mirrored)} mirrored packages, " + f"{sum(os.path.getsize(os.path.join(repo, asset_name(entries[n][1]['FILENAME'][0]))) for n in mirrored) // 1048576} MiB") + + order = ["FILENAME", "NAME", "BASE", "VERSION", "DESC", "GROUPS", "CSIZE", "ISIZE", "MD5SUM", "SHA256SUM", "PGPSIG", + "URL", "LICENSE", "ARCH", "BUILDDATE", "PACKAGER", "REPLACES", "CONFLICTS", "PROVIDES", "DEPENDS", + "OPTDEPENDS", "MAKEDEPENDS", "CHECKDEPENDS", "XDATA"] + buffer = io.BytesIO() + with tarfile.open(fileobj=buffer, mode="w:gz", format=tarfile.GNU_FORMAT) as db: + for name in sorted(available): + if name in entries and (name not in runtime or name in shipped or runtime[name] == entries[name][1]["VERSION"][0]): + fields = dict(entries[name][1]) + else: + fields = {"FILENAME": [f"{name}-{runtime[name]}-aarch64.pkg.tar.xz"], "NAME": [name], + "VERSION": [runtime[name]], "ARCH": ["aarch64"]} + if name in mirrored: + fields["FILENAME"] = [asset_name(fields["FILENAME"][0])] + data = write_fields(fields, order).encode() + folder = f"{name}-{fields['VERSION'][0]}" + info = tarfile.TarInfo(folder) + info.type, info.mode, info.mtime = tarfile.DIRTYPE, 0o755, installed + db.addfile(info) + info = tarfile.TarInfo(folder + "/desc") + info.size, info.mode, info.mtime = len(data), 0o644, installed + db.addfile(info, io.BytesIO(data)) + with open(os.path.join(repo, "droiddeck.db"), "wb") as out: + out.write(buffer.getvalue()) + + share = os.path.join(root, "usr/share/droiddeck/pacman") + os.makedirs(os.path.join(share, "hooks"), exist_ok=True) + with open(os.path.join(share, "droiddeck.db"), "wb") as out: + out.write(buffer.getvalue()) + with open(os.path.join(share, "system-packages.txt"), "w") as out: + out.write("".join(n + "\n" for n in sorted(system))) + with open(os.path.join(share, "desktop-packages.txt"), "w") as out: + out.write("".join(f"{n} {entries[n][1]['VERSION'][0]}\n" for n in sorted(shipped))) + with open(os.path.join(share, "hooks", "droiddeck-system.hook"), "w") as out: + out.write("[Trigger]\nOperation = Upgrade\nOperation = Remove\nType = Package\n") + out.write("".join(f"Target = {n}\n" for n in sorted(system))) + out.write("\n[Action]\nDescription = Keeping the packages DroidDeck installed...\nWhen = PreTransaction\n" + "Exec = /usr/share/droiddeck/pacman/refuse\nNeedsTargets\nAbortOnFail\n") + server = f"{RELEASES}/{tag}" if tag else f"{RELEASES}/unpublished" + template = open(os.path.join(here, "pacman.conf.in")).read() + with open(os.path.join(share, "pacman.conf"), "w") as out: + out.write(template.replace("@SERVER@", server).replace("@ALARM@", ALARM)) + print(f"pacman: repository {server}, {len(available)} packages ({len(system)} installed by DroidDeck)") + + +if __name__ == "__main__": + main() diff --git a/tools/desktop-kde/pacman.conf.in b/tools/desktop-kde/pacman.conf.in new file mode 100644 index 0000000000..f4cc4ca546 --- /dev/null +++ b/tools/desktop-kde/pacman.conf.in @@ -0,0 +1,22 @@ +[options] +RootDir = / +DBPath = /var/lib/pacman/ +CacheDir = /var/cache/pacman/pkg/ +LogFile = /var/log/pacman.log +GPGDir = /etc/pacman.d/gnupg/ +HookDir = /etc/pacman.d/hooks/ +HookDir = /usr/share/droiddeck/pacman/hooks/ +HoldPkg = pacman glibc +Architecture = aarch64 +Color +ParallelDownloads = 4 +DisableSandbox +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +NoExtract = usr/share/doc/* usr/share/gtk-doc/* usr/share/help/* + +[droiddeck] +Server = @SERVER@ +CacheServer = @ALARM@/extra +CacheServer = @ALARM@/core +CacheServer = @ALARM@/alarm diff --git a/tools/desktop-kde/patches/0003-forward-nested-scroll-source.patch b/tools/desktop-kde/patches/0003-forward-nested-scroll-source.patch new file mode 100644 index 0000000000..28036135a1 --- /dev/null +++ b/tools/desktop-kde/patches/0003-forward-nested-scroll-source.patch @@ -0,0 +1,67 @@ +--- a/src/backends/wayland/wayland_backend.cpp ++++ b/src/backends/wayland/wayland_backend.cpp +@@ -30,6 +30,9 @@ + + #include + ++#include ++#include ++ + #include + #include + #include +@@ -124,8 +127,31 @@ + } + Q_EMIT pointerButtonChanged(button, state, std::chrono::milliseconds(time), this); + }); +- // TODO: Send discreteDelta and source as well. +- connect(pointer, &Pointer::axisChanged, this, [this](quint32 time, Pointer::Axis nativeAxis, qreal delta) { ++ auto axisSource = std::make_shared(PointerAxisSource::Unknown); ++ auto axisDiscrete = std::make_shared>(); ++ connect(pointer, &Pointer::axisSourceChanged, this, [axisSource](Pointer::AxisSource source) { ++ switch (source) { ++ case Pointer::AxisSource::Wheel: ++ *axisSource = PointerAxisSource::Wheel; ++ break; ++ case Pointer::AxisSource::Finger: ++ *axisSource = PointerAxisSource::Finger; ++ break; ++ case Pointer::AxisSource::Continuous: ++ *axisSource = PointerAxisSource::Continuous; ++ break; ++ case Pointer::AxisSource::WheelTilt: ++ *axisSource = PointerAxisSource::WheelTilt; ++ break; ++ default: ++ *axisSource = PointerAxisSource::Unknown; ++ break; ++ } ++ }); ++ connect(pointer, &Pointer::axisDiscreteChanged, this, [axisDiscrete](Pointer::Axis nativeAxis, qint32 discreteDelta) { ++ (*axisDiscrete)[nativeAxis == Pointer::Axis::Vertical ? 0 : 1] = discreteDelta * 120; ++ }); ++ connect(pointer, &Pointer::axisChanged, this, [this, axisSource, axisDiscrete](quint32 time, Pointer::Axis nativeAxis, qreal delta) { + PointerAxis axis; + switch (nativeAxis) { + case Pointer::Axis::Horizontal: +@@ -137,10 +163,18 @@ + default: + Q_UNREACHABLE(); + } +- Q_EMIT pointerAxisChanged(axis, delta, 0, PointerAxisSource::Unknown, false, false, std::chrono::milliseconds(time), this); ++ qint32 &discrete = (*axisDiscrete)[nativeAxis == Pointer::Axis::Vertical ? 0 : 1]; ++ Q_EMIT pointerAxisChanged(axis, delta, discrete, *axisSource, false, false, std::chrono::milliseconds(time), this); ++ discrete = 0; ++ }); ++ connect(pointer, &Pointer::axisStopped, this, [this, axisSource](quint32 time, Pointer::Axis nativeAxis) { ++ const PointerAxis axis = nativeAxis == Pointer::Axis::Vertical ? PointerAxis::Vertical : PointerAxis::Horizontal; ++ Q_EMIT pointerAxisChanged(axis, 0, 0, *axisSource, false, false, std::chrono::milliseconds(time), this); + }); + +- connect(pointer, &Pointer::frame, this, [this]() { ++ connect(pointer, &Pointer::frame, this, [this, axisSource, axisDiscrete]() { ++ *axisSource = PointerAxisSource::Unknown; ++ axisDiscrete->fill(0); + Q_EMIT pointerFrame(this); + }); + diff --git a/tools/desktop-kde/release.env b/tools/desktop-kde/release.env index 7151b33260..ae32a2d18d 100644 --- a/tools/desktop-kde/release.env +++ b/tools/desktop-kde/release.env @@ -1,4 +1,4 @@ DESKTOP_KDE_REPO=Droid-Deck/DroidDeck-Components -DESKTOP_KDE_TAG=desktop-kde-r2 -DESKTOP_KDE_SHA256=9ba832677b498654136c69d8c8330434d17e4d53cd099acac9bde3ba429b35bf -DESKTOP_KDE_SIZE=846933224 +DESKTOP_KDE_TAG=desktop-kde-r3 +DESKTOP_KDE_SHA256=8b7142fcec8d86143ae39fc14ffc86907d30d9a5b5a45f49cb1b55109d6fc4eb +DESKTOP_KDE_SIZE=972598429 diff --git a/tools/desktop-kde/removal-manifests.py b/tools/desktop-kde/removal-manifests.py index 9c909dc84c..1089f9421d 100644 --- a/tools/desktop-kde/removal-manifests.py +++ b/tools/desktop-kde/removal-manifests.py @@ -4,6 +4,7 @@ Usage: removal-manifests.py + removal-manifests.py --add Removal includes desktop applications/themes and our overlay, not their shared dependencies. The KDE cache is verified against the published desktop-kde.packages.txt before use. The LXQt cache contains the signed application packages listed by desktop.packages.txt; @@ -63,10 +64,7 @@ def write(out, name, records): gz.write(('\n'.join(sorted(set(records))) + '\n').encode()) -def main(): - archives = [pathlib.Path(p) for p in sys.argv[1:5]] - cache, out, legacy_cache = map(pathlib.Path, sys.argv[5:8]) - here = pathlib.Path(__file__).resolve().parent +def application_paths(here, cache): seeds = {line.strip() for line in (here / 'seeds.txt').read_text().splitlines() if line.strip() and not line.startswith('#')} - SHARED_SEEDS packages = dict(line.split() for line in (cache / 'desktop-kde.packages.txt').read_text().splitlines()) selected = set() @@ -79,10 +77,39 @@ def main(): if sha(archive) != digest: raise ValueError(f'{filename}: source package checksum mismatch') with tarfile.open(archive) as tar: - selected.update(e.name.removeprefix('./').rstrip('/') for e in tar if not e.isdir()) + selected.update(e.name.removeprefix('./').rstrip('/') for e in tar if not e.isdir() and not e.name.removeprefix('./').startswith('.')) found.add(package) assert found == seeds, f'missing desktop packages: {seeds - found}' - selected.update(str(p.relative_to(here / 'overlay')) for p in (here / 'overlay').rglob('*') if p.is_file()) + selected.update(str(p.relative_to(here / 'overlay')) for p in (here / 'overlay').rglob('*') if p.is_file() or p.is_symlink()) + return selected, packages, seeds + + +def add(archive, tag, digest, cache, out): + here = pathlib.Path(__file__).resolve().parent + selected, packages, seeds = application_paths(here, cache) + inv = inventory(archive, digest) + generated = ('usr/share/droiddeck/pacman/', 'usr/lib/droiddeck/') + remove = gzip.decompress((out / 'kde-remove.tsv.gzip').read_bytes()).decode().splitlines() + keep = gzip.decompress((out / 'kde-keep.txt.gzip').read_bytes()).decode().splitlines() + remove += [record for path, record in inv.items() if path in selected or path.startswith(generated)] + keep += list(inv) + write(out, 'kde-remove.tsv.gzip', remove) + write(out, 'kde-keep.txt.gzip', keep) + versions = (out / 'versions.txt').read_text().split() + (out / 'versions.txt').write_text('\n'.join(dict.fromkeys(versions + [tag])) + '\n') + sources = json.loads((out / 'sources.json').read_text()) + sources['archives'][tag] = digest + sources['desktopApplications'] = {n: h for n, h in packages.items() if n.rsplit('-', 3)[0] in seeds} + (out / 'sources.json').write_text(json.dumps(sources, indent=2) + '\n') + print(tag, digest) + print('KDE removable paths', sum(path in selected or path.startswith(generated) for path in inv)) + + +def main(): + archives = [pathlib.Path(p) for p in sys.argv[1:5]] + cache, out, legacy_cache = map(pathlib.Path, sys.argv[5:8]) + here = pathlib.Path(__file__).resolve().parent + selected, packages, seeds = application_paths(here, cache) inventories = [inventory(p, pin[1]) for p, pin in zip(archives, PINS)] out.mkdir(parents=True, exist_ok=True) legacy_seeds = {line.strip() for line in (here / 'lxqt-applications.txt').read_text().splitlines() @@ -115,4 +142,7 @@ def main(): if __name__ == '__main__': - main() + if sys.argv[1:2] == ['--add']: + add(pathlib.Path(sys.argv[2]), sys.argv[3], sys.argv[4], pathlib.Path(sys.argv[5]), pathlib.Path(sys.argv[6])) + else: + main() diff --git a/tools/desktop-kde/root/root.c b/tools/desktop-kde/root/root.c new file mode 100644 index 0000000000..33c63271ac --- /dev/null +++ b/tools/desktop-kde/root/root.c @@ -0,0 +1,190 @@ +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include + +#define REAL(name) static __typeof__(name) *real_##name; if (!real_##name) real_##name = dlsym(RTLD_NEXT, #name) + +static uid_t real_uid(void) { return (uid_t)syscall(SYS_getuid); } +static gid_t real_gid(void) { return (gid_t)syscall(SYS_getgid); } + +uid_t getuid(void) { return 0; } +uid_t geteuid(void) { return 0; } +gid_t getgid(void) { return 0; } +gid_t getegid(void) { return 0; } + +int getresuid(uid_t *r, uid_t *e, uid_t *s) { + if (r) *r = 0; + if (e) *e = 0; + if (s) *s = 0; + return 0; +} + +int getresgid(gid_t *r, gid_t *e, gid_t *s) { + if (r) *r = 0; + if (e) *e = 0; + if (s) *s = 0; + return 0; +} + +int setuid(uid_t u) { (void)u; return 0; } +int seteuid(uid_t u) { (void)u; return 0; } +int setgid(gid_t g) { (void)g; return 0; } +int setegid(gid_t g) { (void)g; return 0; } +int setreuid(uid_t r, uid_t e) { (void)r; (void)e; return 0; } +int setregid(gid_t r, gid_t e) { (void)r; (void)e; return 0; } +int setresuid(uid_t r, uid_t e, uid_t s) { (void)r; (void)e; (void)s; return 0; } +int setresgid(gid_t r, gid_t e, gid_t s) { (void)r; (void)e; (void)s; return 0; } +int setgroups(size_t n, const gid_t *list) { (void)n; (void)list; return 0; } +int initgroups(const char *user, gid_t group) { (void)user; (void)group; return 0; } + +static int owner_result(int rc) { + if (rc != 0 && (errno == EPERM || errno == EINVAL)) { + errno = 0; + return 0; + } + return rc; +} + +int chown(const char *path, uid_t u, gid_t g) { + REAL(chown); + return owner_result(real_chown(path, u, g)); +} + +int lchown(const char *path, uid_t u, gid_t g) { + REAL(lchown); + return owner_result(real_lchown(path, u, g)); +} + +int fchown(int fd, uid_t u, gid_t g) { + REAL(fchown); + return owner_result(real_fchown(fd, u, g)); +} + +int fchownat(int dirfd, const char *path, uid_t u, gid_t g, int flags) { + REAL(fchownat); + return owner_result(real_fchownat(dirfd, path, u, g, flags)); +} + +static struct passwd *as_root_user(struct passwd *pw) { + if (pw && pw->pw_uid == real_uid()) { + pw->pw_uid = 0; + pw->pw_gid = 0; + } + return pw; +} + +static struct group *as_root_group(struct group *gr) { + if (gr && gr->gr_gid == real_gid()) gr->gr_gid = 0; + return gr; +} + +struct passwd *getpwuid(uid_t uid) { + REAL(getpwuid); + return as_root_user(real_getpwuid(uid == 0 ? real_uid() : uid)); +} + +struct passwd *getpwnam(const char *name) { + REAL(getpwnam); + return as_root_user(real_getpwnam(name)); +} + +struct passwd *getpwent(void) { + REAL(getpwent); + return as_root_user(real_getpwent()); +} + +int getpwuid_r(uid_t uid, struct passwd *pw, char *buf, size_t len, struct passwd **out) { + REAL(getpwuid_r); + int rc = real_getpwuid_r(uid == 0 ? real_uid() : uid, pw, buf, len, out); + if (rc == 0) as_root_user(*out); + return rc; +} + +int getpwnam_r(const char *name, struct passwd *pw, char *buf, size_t len, struct passwd **out) { + REAL(getpwnam_r); + int rc = real_getpwnam_r(name, pw, buf, len, out); + if (rc == 0) as_root_user(*out); + return rc; +} + +struct group *getgrgid(gid_t gid) { + REAL(getgrgid); + return as_root_group(real_getgrgid(gid == 0 ? real_gid() : gid)); +} + +struct group *getgrnam(const char *name) { + REAL(getgrnam); + return as_root_group(real_getgrnam(name)); +} + +int getgrgid_r(gid_t gid, struct group *gr, char *buf, size_t len, struct group **out) { + REAL(getgrgid_r); + int rc = real_getgrgid_r(gid == 0 ? real_gid() : gid, gr, buf, len, out); + if (rc == 0) as_root_group(*out); + return rc; +} + +int getgrnam_r(const char *name, struct group *gr, char *buf, size_t len, struct group **out) { + REAL(getgrnam_r); + int rc = real_getgrnam_r(name, gr, buf, len, out); + if (rc == 0) as_root_group(*out); + return rc; +} + +static int shown_mode(int rc, struct stat *st) { + if (rc == 0 && S_ISDIR(st->st_mode) && (st->st_mode & 0777) == 0700) st->st_mode = (st->st_mode & ~0777) | 0755; + return rc; +} + +int stat(const char *path, struct stat *st) { + REAL(stat); + return shown_mode(real_stat(path, st), st); +} + +int lstat(const char *path, struct stat *st) { + REAL(lstat); + return shown_mode(real_lstat(path, st), st); +} + +int fstat(int fd, struct stat *st) { + REAL(fstat); + return shown_mode(real_fstat(fd, st), st); +} + +int fstatat(int dirfd, const char *path, struct stat *st, int flags) { + REAL(fstatat); + return shown_mode(real_fstatat(dirfd, path, st, flags), st); +} + +int statx(int dirfd, const char *path, int flags, unsigned int mask, struct statx *st) { + REAL(statx); + int rc = real_statx(dirfd, path, flags, mask, st); + if (rc == 0 && S_ISDIR(st->stx_mode) && (st->stx_mode & 0777) == 0700) st->stx_mode = (st->stx_mode & ~0777) | 0755; + return rc; +} + +int stat64(const char *path, struct stat64 *st) { + REAL(stat64); + return shown_mode(real_stat64(path, st), (struct stat *)st); +} + +int lstat64(const char *path, struct stat64 *st) { + REAL(lstat64); + return shown_mode(real_lstat64(path, st), (struct stat *)st); +} + +int fstat64(int fd, struct stat64 *st) { + REAL(fstat64); + return shown_mode(real_fstat64(fd, st), (struct stat *)st); +} + +int fstatat64(int dirfd, const char *path, struct stat64 *st, int flags) { + REAL(fstatat64); + return shown_mode(real_fstatat64(dirfd, path, st, flags), (struct stat *)st); +} diff --git a/tools/desktop-kde/seeds.txt b/tools/desktop-kde/seeds.txt index ed61bd8eef..a920f9700c 100644 --- a/tools/desktop-kde/seeds.txt +++ b/tools/desktop-kde/seeds.txt @@ -26,3 +26,23 @@ noto-fonts-emoji xdg-utils firefox mpv +zip +unzip +7zip +unrar +less +man-db +man-pages +htop +wl-clipboard +xclip +git +wget +kcalc +okular +filelight +kfind +plasma-systemmonitor +elisa +discover +flatpak-kcm diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index 83b67d6225..e8f7444b60 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -11,6 +11,7 @@ export MOZ_DISABLE_CONTENT_SANDBOX=1 MOZ_DISABLE_GMP_SANDBOX=1 MOZ_DISABLE_RDD_S export MOZ_DISABLE_SOCKET_PROCESS_SANDBOX=1 MOZ_DISABLE_UTILITY_SANDBOX=1 export MOZ_SHM_NO_SEALS=1 export KWIN_COMPOSE=Q QT_QUICK_BACKEND=software LIBGL_ALWAYS_SOFTWARE=1 GALLIUM_DRIVER=llvmpipe +export KWIN_USE_OVERLAYS=0 [ -e /etc/mpv/mpv.conf ] || { mkdir -p /etc/mpv && echo gpu-sw=yes >/etc/mpv/mpv.conf; } 2>/dev/null for conf in client client-rt; do mkdir -p "/etc/pipewire/$conf.conf.d" && printf 'context.properties = {\n module.rt = false\n}\n' >"/etc/pipewire/$conf.conf.d/droiddeck-rt.conf" @@ -35,7 +36,7 @@ cat > /usr/share/applications/droiddeck-steam-x64.desktop <<'ENTRY' Type=Application Name=Steam x86-64 (FEX, experimental) Comment=Valve's x86-64 Linux client under FEX, in its own home with its own login -Exec=qterminal -e /usr/local/bin/droiddeck-steam-x64 +Exec=konsole -e /usr/local/bin/droiddeck-steam-x64 Icon=steam Categories=System; ENTRY @@ -43,6 +44,19 @@ python3 /usr/local/bin/droiddeck-pad-defaults 2>&1 | sed 's/^/[pads] /' ( while sleep 30; do python3 /usr/local/bin/droiddeck-pad-defaults 2>&1 | sed 's/^/[pads] /'; done ) & python3 /usr/local/bin/droiddeck-desktop-gpu 2>&1 | sed 's/^/[gpu] /' /usr/local/bin/droiddeck-desktop-window-rules 2>&1 | sed 's/^/[rules] /' +mkdir -p /usr/local/share/applications +cat > /usr/local/share/applications/droiddeck-ime.desktop <<'ENTRY' +[Desktop Entry] +Type=Application +Name=Android keyboard +Exec=/usr/local/bin/droiddeck-ime +NoDisplay=true +X-KDE-Wayland-VirtualKeyboard=true +ENTRY +input_method=$(kreadconfig6 --file kwinrc --group Wayland --key InputMethod 2>/dev/null) +case $input_method in + ''|*/droiddeck-ime.desktop) kwriteconfig6 --file kwinrc --group Wayland --key InputMethod /usr/local/share/applications/droiddeck-ime.desktop ;; +esac python3 /usr/local/bin/droiddeck-open --install 2>&1 | sed 's/^/[open] /' export APPIMAGE_EXTRACT_AND_RUN=1 [ -e /etc/xdg/kiorc ] || printf '[Executable scripts]\nbehaviourOnLaunch=execute\n' >/etc/xdg/kiorc 2>/dev/null @@ -55,6 +69,19 @@ if [ ! -e "$HOME/.config/droiddeck-desktop-icons" ]; then touch "$HOME/.config/droiddeck-desktop-icons" fi [ -f "$desktop_dir/Return.desktop" ] && cp -f /usr/share/applications/droiddeck-return-gaming.desktop "$desktop_dir/Return.desktop" 2>/dev/null +if command -v flatpak >/dev/null 2>&1 && [ ! -d /var/lib/pacman ]; then + FLATPAK_BWRAP=/usr/local/bin/droiddeck-bwrap flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo >/dev/null 2>&1 & +fi +skel_done=$HOME/.local/share/droiddeck/skel-copied +if [ -d /etc/skel ] && [ ! -e "$skel_done" ]; then + cp -rn /etc/skel/. "$HOME/" 2>/dev/null + mkdir -p "${skel_done%/*}" && : > "$skel_done" +fi +if [ -x /usr/lib/snapd/snap-confine ] && [ ! -d /var/lib/pacman ]; then + /usr/local/bin/droiddeck-snapd >/dev/null 2>&1 & + export XDG_DATA_DIRS=/var/lib/snapd/desktop:${XDG_DATA_DIRS:-/usr/local/share:/usr/share} + export PATH=$PATH:/snap/bin +fi update-mime-database /usr/share/mime >/dev/null 2>&1 & [ -f /usr/share/icons/hicolor/icon-theme.cache ] || gtk-update-icon-cache -q -t /usr/share/icons/hicolor 2>/dev/null & [ -f /usr/share/glib-2.0/schemas/gschemas.compiled ] || glib-compile-schemas /usr/share/glib-2.0/schemas 2>/dev/null @@ -82,6 +109,10 @@ if [ "$(cat /usr/share/droiddeck/kwin-compositor 2>/dev/null)" = opengl ]; then if [ -z "${KWIN_RENDER_NODES:-}" ] && [ -c /dev/dri/renderD0 ]; then export KWIN_RENDER_NODES=/dev/dri/renderD0 fi + mkdir -p /run/droiddeck/kwin + printf '#!/bin/sh\nGALLIUM_THREAD=0 exec /usr/bin/kwin_wayland "$@"\n' > /run/droiddeck/kwin/kwin_wayland + chmod 755 /run/droiddeck/kwin/kwin_wayland + export PATH=/run/droiddeck/kwin:$PATH fi echo "== droiddeck-desktop: Plasma on $WAYLAND_DISPLAY" dbus-run-session -- startplasma-wayland diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap index 2e84a695c2..d209ae16dd 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-bwrap @@ -1,5 +1,6 @@ #!/usr/bin/python3 import base64 +import fcntl import json import os import signal @@ -87,6 +88,7 @@ class Spec: self.info_fds = [] self.json_fds = [] self.keep_fds = [] + self.lock_files = [] self.command = [] self.argv0 = None @@ -159,6 +161,8 @@ def parse(argv): read_fd(int(args[0])) elif a == "--sync-fd": s.keep_fds.append(int(args[0])) + elif a == "--lock-file": + s.lock_files.append(args[0]) elif a == "--info-fd": s.info_fds.append(int(args[0])) elif a == "--json-status-fd": @@ -203,6 +207,31 @@ def remaps_nothing(s): return True +def host_path(s, path): + for op in reversed(s.ops): + if op["t"] != "bind": + continue + dest = op["dest"].rstrip("/") + if path == dest or path.startswith(dest + "/"): + return op["src"].rstrip("/") + path[len(dest):] + return path + + +def hold_locks(s): + for path in s.lock_files: + try: + fd = os.open(host_path(s, path), os.O_RDONLY) + except OSError as e: + sys.stderr.write("bwrap: Can't open lock file %s: %s\n" % (path, e.strerror)) + sys.exit(1) + try: + fcntl.lockf(fd, fcntl.LOCK_SH | fcntl.LOCK_NB) + except OSError as e: + sys.stderr.write("bwrap: Can't lock file %s: %s\n" % (path, e.strerror)) + sys.exit(1) + os.set_inheritable(fd, True) + + def report_pid(s, pid): for fd in s.info_fds: try: @@ -282,7 +311,7 @@ def run_by_app(s): if payload is None: break if kind == b"P": - report_pid(s, int(payload)) + report_pid(s, os.getpid()) elif kind == b"O": out.write(payload) out.flush() @@ -301,6 +330,7 @@ def run_by_app(s): def main(): s = parse(expand(sys.argv[1:])) + hold_locks(s) if remaps_nothing(s): run_here(s) else: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-downloads b/tools/linuxfs/overlay/usr/local/bin/droiddeck-downloads new file mode 100755 index 0000000000..ce34e85919 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-downloads @@ -0,0 +1,31 @@ +#!/bin/bash +free_name() { + local dir=$1 name=$2 base ext n=2 + [ -e "$dir/$name" ] || { echo "$name"; return; } + base=${name%.*} ext= + [ "$base" != "$name" ] && [ -n "$base" ] && ext=.${name##*.} || base=$name + while [ -e "$dir/$base ($n)$ext" ]; do n=$((n + 1)); done + echo "$base ($n)$ext" +} +share() { + local android=$HOME/Storage/$1 link=$HOME/$2 f + [ -d "$android" ] && [ -w "$android" ] || return 0 + [ "$(readlink "$link" 2>/dev/null)" = "$android" ] && return 0 + if [ -L "$link" ]; then + rm -f "$link" + elif [ -d "$link" ]; then + shopt -s dotglob nullglob + for f in "$link"/*; do + mv -n -- "$f" "$android/$(free_name "$android" "${f##*/}")" || return 1 + done + shopt -u dotglob nullglob + rmdir "$link" 2>/dev/null || mv "$link" "$link.old.$$" || return 1 + elif [ -e "$link" ]; then + mv "$link" "$link.old.$$" || return 1 + fi + ln -s "$android" "$link" +} +status=0 +share Download Downloads || status=1 +share Documents Documents || status=1 +exit $status diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-emulators b/tools/linuxfs/overlay/usr/local/bin/droiddeck-emulators new file mode 100755 index 0000000000..a937b4e8eb --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-emulators @@ -0,0 +1,22 @@ +#!/bin/bash +set -u +export FLATPAK_BWRAP=/usr/local/bin/droiddeck-bwrap +cores="libretro-core-info libretro-beetle-pce-fast libretro-beetle-psx libretro-beetle-vb libretro-beetle-wswan + libretro-bsnes-mercury-performance libretro-desmume libretro-gambatte libretro-genesisplusgx libretro-mgba + libretro-nestopia libretro-sameboy libretro-snes9x" +case "${1:-}" in +install) + echo "== STEP RetroArch" + droiddeck-root /usr/bin/apt-get update -q || { echo "== FAIL apt-get update"; exit 1; } + droiddeck-root /usr/bin/apt-get install -y -q retroarch retroarch-assets $cores || { echo "== FAIL apt-get install"; exit 1; } + echo "== STEP PPSSPP" + flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo || { echo "== FAIL flathub"; exit 1; } + flatpak install --user -y --noninteractive flathub org.ppsspp.PPSSPP || { echo "== FAIL org.ppsspp.PPSSPP"; exit 1; } + printf '#!/bin/sh\nexec /usr/local/bin/droiddeck-flatpak-run org.ppsspp.PPSSPP "$@"\n' > /usr/local/bin/PPSSPPSDL.new && + chmod 755 /usr/local/bin/PPSSPPSDL.new && mv -f /usr/local/bin/PPSSPPSDL.new /usr/local/bin/PPSSPPSDL || { echo "== FAIL PPSSPPSDL"; exit 1; } + ;; +*) + echo "usage: droiddeck-emulators install" >&2 + exit 2 + ;; +esac diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup index 534a4f7d38..974bdc56b1 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup @@ -5,6 +5,7 @@ step() { echo "== STEP $*"; } fail() { echo "== FAIL $*"; exit 1; } [ "$(id -u)" = 0 ] || fail "needs root: install Flatpak from the launcher's Store, which runs this as root" +if command -v pacman >/dev/null 2>&1; then PACKAGES="flatpak ostree appstream libxmlb libmalcontent libfyaml accountsservice composefs xdg-dbus-proxy" while read -r pkg probe; do [ -n "$pkg" ] || continue @@ -77,7 +78,13 @@ done mv -f "$WORK/installed.new" "$WORK/installed" find "$WORK/pkg" -type f -mtime +1 -delete 2>/dev/null -missing=$(for f in /usr/bin/flatpak /usr/lib/libflatpak.so.0 /usr/lib/libostree-1.so.1 /usr/bin/xdg-dbus-proxy; do +else + command -v flatpak >/dev/null 2>&1 || fail "Flatpak is missing from the runtime" + WORK=$(mktemp -d) + trap 'rm -rf "$WORK"' EXIT +fi +missing=$(for f in /usr/bin/flatpak /usr/lib/libflatpak.so.0 /usr/lib/libostree-1.so.1 /usr/lib/aarch64-linux-gnu/libflatpak.so.0 /usr/lib/aarch64-linux-gnu/libostree-1.so.1 /usr/bin/xdg-dbus-proxy; do + [ -e "$f" ] || continue ldd "$f" 2>&1 | grep -E 'not found|version .* not found' done | sort -u) [ -z "$missing" ] || { echo "$missing"; fail "Flatpak is missing libraries"; } @@ -97,7 +104,7 @@ Description=Central repository of Flatpak applications Icon=https://dl.flathub.org/repo/logo.svg GPGKey=mQINBFlD2sABEADsiUZUOYBg1UdDaWkEdJYkTSZD68214m8Q1fbrP5AptaUfCl8KYKFMNoAJRBXn9FbE6q6VBzghHXj/rSnA8WPnkbaEWR7xltOqzB1yHpCQ1l8xSfH5N02DMUBSRtD/rOYsBKbaJcOgW0K21sX+BecMY/AI2yADvCJEjhVKrjR9yfRX+NQEhDcbXUFRGt9ZT+TI5yT4xcwbvvTu7aFUR/dH7+wjrQ7lzoGlZGFFrQXSs2WI0WaYHWDeCwymtohXryF8lcWQkhH8UhfNJVBJFgCY8Q6UHkZG0FxMu8xnIDBMjBmSZKwKQn0nwzwM2afskZEnmNPYDI8nuNsSZBZSAw+ThhkdCZHZZRwzmjzyRuLLVFpOj3XryXwZcSefNMPDkZAuWWzPYjxS80cm2hG1WfqrG0Gl8+iX69cbQchb7gbEb0RtqNskTo9DDmO0bNKNnMbzmIJ3/rTbSahKSwtewklqSP/01o0WKZiy+n/RAkUKOFBprjJtWOZkc8SPXV/rnoS2dWsJWQZhuPPtv3tefdDiEyp7ePrfgfKxuHpZES0IZRiFI4J/nAUP5bix+srcIxOVqAam68CbAlPvWTivRUMRVbKjJiGXIOJ78wAMjqPg3QIC0GQ0EPAWwAOzzpdgbnG7TCQetaVV8rSYCuirlPYN+bJIwBtkOC9SWLoPMVZTwQARAQABtC5GbGF0aHViIFJlcG8gU2lnbmluZyBLZXkgPGZsYXRodWJAZmxhdGh1Yi5vcmc+iQJUBBMBCAA+FiEEblwF2XnHba+TwIE1QYTdTZB6fK4FAllD2sACGwMFCRLMAwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQQYTdTZB6fK5RJQ/+Ptd4sWxaiAW91FFk7+wmYOkEe1NY2UDNJjEEz34PNP/1RoxveHDt43kYJQ23OWaPJuZAbu+fWtjRYcMBzOsMCaFcRSHFiDIC9aTp4ux/mo+IEeyarYt/oyKb5t5lta6xaAqg7rwt65jW5/aQjnS4h7eFZ+dAKta7Y/fljNrOznUp81/SMcx4QA5G2Pw0hs4Xrxg59oONOTFGBgA6FF8WQghrpR7SnEe0FSEOVsAjwQ13Cfkfa7b70omXSWp7GWfUzgBKyoWxKTqzMN3RQHjjhPJcsQnrqH5enUu4Pcb2LcMFpzimHnUgb9ft72DP5wxfzHGAWOUiUXHbAekfq5iFks8cha/RST6wkxG3Rf44Zn09aOxh1btMcGL+5xb1G0BuCQnA0fP/kDYIPwh9z22EqwRQOspIcvGeLVkFeIfubxpcMdOfQqQnZtHMCabV5Q/Rk9K1ZGc8M2hlg8gHbXMFch2xJ0Wu72eXbA/UY5MskEeBgawTQnQOK/vNm7t0AJMpWK26Qg6178UmRghmeZDj9uNRc3EI1nSbgvmGlpDmCxaAGqaGL1zW4KPW5yN25/qeqXcgCvUjZLI9PNq3Kvizp1lUrbx7heRiSoazCucvHQ1VHUzcPVLUKKTkoTP8okThnRRRsBcZ1+jI4yMWIDLOCT7IW3FePr+3xyuy5eEo9a25Ag0EWUPa7AEQALT/CmSyZ8LWlRYQZKYw417p7Z2hxqd6TjwkwM3IQ1irumkWcTZBZIbBgrSOg6CcXD2oWydCQHWi9qaxhuhEl2bJL5LskmBcMxVdQeD0LLHd8QUnbnnIby8ocvWN1alPfvJFjCUTrmD22U1ycOzRw2lIe4kiQONbOZtdWrVImQQSndjFlisitbmlWHvHm2lOOYy8+GJB7YffVV193hmnBSJffCy4bvkuLxsI+n1DhOzc7MPV3z6HGk4HiEcF0yyt9tCYhpsxHFdBoq2h771HfAcS0s98EVAqYMFnf9em+4cnYpdI6mhIfS1FQiKl6DBAYA8tT3ggla00DurPo0JwX/zN+PaO5h/6O9aCZwV7G6rbkgMuqMergXaf8oP38gr0z+MqWnkfM63Bodq68GP4l4hd02BoFBbDf38TMuGQB14+twJMdfbAxo2MbgluvQgfwHfZ2ca6gyEY+9s/YD1gugLjV+S6CB51WkFNe1z4tAPgJZNxUcKCbeaHNbthl8Hks/pY9RCEseX/EdfzF18epbSjJMPh4DPQXbUoFwmyuYcoBOPmvZHNl9hK7B/1RP8w1ZrXk8qdupC0SNbafX7270B7lMMVImzZetGsM9ypXJ6llhp3FwW09iseNyGJGPsr/dvTMGDXqOPfU/9SAS1LSTY4K9PbRtdrBE318YX8mIk5ABEBAAGJBHIEGAEIACYWIQRuXAXZecdtr5PAgTVBhN1NkHp8rgUCWUPa7AIbAgUJEswDAAJACRBBhN1NkHp8rsF0IAQZAQgAHRYhBFSmzd2JGfsgQgDYrFYnAunj7X7oBQJZQ9rsAAoJEFYnAunj7X7oR6AP/0KYmiAFeqx14Z43/6s2gt3VhxlSd8bmcVV7oJFbMhdHBIeWBp2BvsUf00I0Zl14ZkwCKfLwbbORC2eIxvzJ+QWjGfPhDmS4XUSmhlXxWnYEveSek5Tde+fmu6lqKM8CHg5BNx4GWIX/vdLi1wWJZyhrUwwICAxkuhKxuP2Z1An48930eslTD2GGcjByc27+9cIZjHKa07I/aLffo04V+oMT9/tgzoquzgpVV4jwekADo2MJjhkkPveSNI420bgT+Q7Fi1l0X1aFUniBvQMsaBa27PngWm6xE2ZYvh7nWCdd5g0c0eLIHxWwzV1lZ4Ryx4ITO/VL25ItECcjhTRdYa64sA62MYSaB0x3eR+SihpgP3wSNPFu3MJo6FKTFdi4CBAEmpWHFW7FcRmd+cQXeFrHLN3iNVWryy0HK/CUEJmiZEmpNiXecl4vPIIuyF0zgSCztQtKoMr+injpmQGC/rF/ELBVZTUSLNB350S0Ztvw0FKWDAJSxFmoxt3xycqvvt47rxTrhi78nkk6jATKGyvP55sO+K7Q7Wh0DXA69hvPrYW2eu8jGCdVGxi6HX7L1qcfEd0378S71dZ3g9o6KKl1OsDWWQ6MJ6FGBZedl/ibRfs8p5+sbCX3lQSjEFy3rx6n0rUrXx8U2qb+RCLzJlmC5MNBOTDJwHPcX6gKsUcXZrEQALmRHoo3SrewO41RCr+5nUlqiqV3AohBMhnQbGzyHf2+drutIaoh7Rj80XRh2bkkuPLwlNPf+bTXwNVGse4bej7B3oV6Ae1N7lTNVF4Qh+1OowtGjmfJPWo0z1s6HFJVxoIof9z58Msvgao0zrKGqaMWaNQ6LUeC9g9Aj/9Uqjbo8X54aLiYs8Z1WNc06jKP+gv8AWLtv6CR+l2kLez1YMDucjm7v6iuCMVAmZdmxhg5I/X2+OM3vBsqPDdQpr2TPDLX3rCrSBiS0gOQ6DwN5N5QeTkxmY/7QO8bgLo/Wzu1iilH4vMKW6LBKCaRx5UEJxKpL4wkgITsYKneIt3NTHo5EOuaYk+y2+Dvt6EQFiuMsdbfUjs3seIHsghX/cbPJa4YUqZAL8C4OtVHaijwGo0ymt9MWvS9yNKMyT0JhN2/BdeOVWrHk7wXXJn/ZjpXilicXKPx4udCF76meE+6N2u/T+RYZ7fP1QMEtNZNmYDOfA6sViuPDfQSHLNbauJBo/n1sRYAsL5mcG22UDchJrlKvmK3EOADCQg+myrm8006LltubNB4wWNzHDJ0Ls2JGzQZCd/xGyVmUiidCBUrD537WdknOYE4FD7P0cHaM9brKJ/M8LkEH0zUlo73bY4XagbnCqve6PvQb5G2Z55qhWphd6f4B6DGed86zJEa/RhS REPO -if ! flatpak remote-list --user --columns=name 2>/dev/null | grep -qx flathub; then +if ! flatpak remote-list --columns=name 2>/dev/null | grep -qx flathub; then out=$(flatpak remote-add --user --if-not-exists flathub "$WORK/flathub.flatpakrepo" 2>&1) rc=$? echo "$out" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime b/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime new file mode 100755 index 0000000000..c96aa283bb --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-ime @@ -0,0 +1,140 @@ +#!/usr/bin/env python3 +import json +import os +import select +import socket +import struct +import sys +import time + +DISPLAY_ID = 1 +REGISTRY_ID = 2 +METHOD_ID = 3 +SETTLE = 0.15 + + +def wl_string(value): + data = value.encode() + b"\0" + return struct.pack("= 8: + obj, word = struct.unpack_from("> 16 + if size < 8 or len(self.buffer) < size: + break + out.append((obj, word & 0xFFFF, self.buffer[8:size])) + self.buffer = self.buffer[size:] + return out + + +class Report: + def __init__(self, directory): + self.directory = directory + self.seq = 0 + self.sent = None + + def write(self, field, hint=0, purpose=0): + state = (field, purpose) + if state == self.sent or not self.directory: + return + self.sent = state + self.seq += 1 + os.makedirs(self.directory, exist_ok=True) + target = os.path.join(self.directory, "ime.json") + temp = target + ".tmp" + fd = os.open(temp, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0o600) + with os.fdopen(fd, "w") as handle: + json.dump({"textField": field, "hint": hint, "purpose": purpose, "seq": self.seq}, handle) + os.replace(temp, target) + print(f"droiddeck-ime: text field {'focused' if field else 'left'}", file=sys.stderr, flush=True) + + +def connect(): + fd = os.environ.pop("WAYLAND_SOCKET", "") + if fd.isdigit(): + return socket.socket(socket.AF_UNIX, socket.SOCK_STREAM, fileno=int(fd)) + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.connect(os.path.join(os.environ["XDG_RUNTIME_DIR"], os.environ.get("WAYLAND_DISPLAY", "wayland-0"))) + return sock + + +def main(): + launch = os.environ.get("BL_LAUNCH_DIR", "") + report = Report(os.path.join(launch, "agent") if launch else "") + conn = Connection(connect()) + conn.send(DISPLAY_ID, 1, struct.pack("= pending: + pending = None + if current is None: + report.write(False) + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-root b/tools/linuxfs/overlay/usr/local/bin/droiddeck-root new file mode 100755 index 0000000000..95f5c6881d --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-root @@ -0,0 +1,94 @@ +#!/usr/bin/python3 +import array +import json +import os +import signal +import socket +import struct +import sys + +SOCKET_FILE = "/etc/droiddeck/root-socket" + + +def socket_name(): + name = os.environ.get("DROIDDECK_ROOT_SOCKET", "") + if not name: + try: + with open(SOCKET_FILE, encoding="utf-8") as f: + name = f.read().strip() + except OSError: + pass + return "\0" + (name or "com.droiddeck.launcher.root") + + +def frame(sock, kind, payload): + sock.sendall(kind.encode() + struct.pack(">i", len(payload)) + payload) + + +def read_exact(sock, n): + data = b"" + while len(data) < n: + chunk = sock.recv(n - len(data)) + if not chunk: + return None + data += chunk + return data + + +def main(argv): + if len(argv) < 2 or argv[1] in ("-h", "--help"): + print("usage: droiddeck-root [--check] command [arg ...]", file=sys.stderr) + return 2 + try: + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.connect(socket_name()) + except OSError as e: + print(f"droiddeck-root: DroidDeck's root service is not reachable: {e}", file=sys.stderr) + return 126 + if argv[1] == "--check": + return 0 + env = dict(os.environ) + for name in ("LD_PRELOAD", "PROOT_FASTPATH", "DROIDDECK_ROOT_SOCKET"): + env.pop(name, None) + for name in [k for k in env if k.startswith("PROOT_")]: + env.pop(name, None) + try: + cwd = os.getcwd() + except OSError: + cwd = "/root" + body = json.dumps({"argv": argv[1:], "env": env, "cwd": cwd}).encode() + fds = array.array("i", [0, 1, 2]) + sock.sendmsg([b"R" + struct.pack(">i", len(body))], [(socket.SOL_SOCKET, socket.SCM_RIGHTS, fds)]) + sock.sendall(body) + + def forward(signum, _frame): + try: + frame(sock, "S", str(signum).encode()) + except OSError: + pass + + for signum in (signal.SIGINT, signal.SIGTERM, signal.SIGHUP, signal.SIGQUIT, signal.SIGUSR1, signal.SIGUSR2): + signal.signal(signum, forward) + signal.signal(signal.SIGTSTP, signal.SIG_IGN) + status = 1 + while True: + try: + head = read_exact(sock, 5) + except InterruptedError: + continue + except OSError: + break + if head is None: + break + kind = chr(head[0]) + payload = read_exact(sock, struct.unpack(">i", head[1:])[0]) or b"" + if kind == "E": + print("droiddeck-root: " + payload.decode(errors="replace"), file=sys.stderr) + elif kind == "X": + status = int(payload.decode() or "1") + break + return status + + +if __name__ == "__main__": + sys.exit(main(sys.argv)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 4b45e854b1..9cf94c7a86 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -14,22 +14,48 @@ if [ -n "${BL_LOG:-}" ] && [ -z "${BL_INSIDE:-}" ]; then if [ "$(stat -c %s "$BL_LOG" 2>/dev/null || echo 0)" -gt 8388608 ]; then mv -f "$BL_LOG" "$BL_LOG.1" fi - exec > >({ dd of="$BL_LOG" oflag=append conv=notrunc iflag=count_bytes count="${BL_LOG_CAP:-268435456}" bs=65536 status=none; cat >/dev/null; }) 2>&1 + dd=$(command -v gnudd || echo dd) + exec > >({ "$dd" of="$BL_LOG" oflag=append conv=notrunc iflag=count_bytes count="${BL_LOG_CAP:-268435456}" bs=65536 status=none; cat >/dev/null; }) 2>&1 echo "== droiddeck-session $(date) mode=$mode $*" echo "== uid=$(id -u) size=${BL_WIDTH:-?}x${BL_HEIGHT:-?} icd=${VK_ICD_FILENAMES:-none}" echo "== gamescope: $(gamescope --version 2>&1 | head -1) at $(command -v gamescope)" echo "== rootfs: $(cat /.version 2>/dev/null || echo unversioned)" fi +write_system_bus_config() { + mkdir -p /run/dbus /usr/local/share/droiddeck + cat > /usr/local/share/droiddeck/system-bus.conf <<'BUSCONF' + + + system + unix:path=/run/dbus/system_bus_socket + EXTERNAL + /usr/share/droiddeck/system-services + + + + + + + +BUSCONF + rm -f /run/dbus/system_bus_socket +} + prepare_locale() { local dir=/usr/lib/locale stamp=/usr/lib/locale/.droiddeck-archive want have= pkg - pkg=(/var/lib/pacman/local/glibc-[0-9]*) - want=${pkg[0]##*/} + if [ -d /var/lib/pacman/local ]; then + pkg=(/var/lib/pacman/local/glibc-[0-9]*) + want=${pkg[0]##*/} + else + want=libc6-$(dpkg-query -W -f='${Version}' libc6 2>/dev/null) + fi [ -f "$stamp" ] && read -r have < "$stamp" [ "$have" = "$want" ] && [ -f "$dir/locale-archive" ] && [ ! "$dir/locale-archive" -nt "$stamp" ] && return 0 [ -d "$dir/C.utf8" ] && command -v localedef >/dev/null 2>&1 || return 0 DROIDDECK_LINK_RENAME=1 localedef --add-to-archive --replace "$dir/C.utf8" >/dev/null 2>&1 || return 0 - rm -f /usr/lib/gconv/gconv-modules.cache + rm -f /usr/lib/gconv/gconv-modules.cache /usr/lib/aarch64-linux-gnu/gconv/gconv-modules.cache command -v iconvconfig >/dev/null 2>&1 && iconvconfig >/dev/null 2>&1 printf '%s\n' "$want" > "$stamp" echo "== locale archive built for $want" @@ -65,7 +91,16 @@ if [ -z "${BL_INSIDE:-}" ]; then fi steam_update_stuck() { - [ "$1" -lt 60 ] || steam_updates=0 + local stamp + stamp=$(stat -c '%n %Y %s' "${steam_root:-}"/package/*.installed 2>/dev/null) + if [ "$1" -ge 60 ]; then + steam_updates=0 + steam_installs=0 + elif [ "$stamp" != "${steam_update_stamp-$stamp}" ] && [ "${steam_installs:-0}" -lt 5 ]; then + steam_updates=0 + steam_installs=$((${steam_installs:-0} + 1)) + fi + steam_update_stamp=$stamp steam_updates=$((steam_updates + 1)) [ "$steam_updates" -ge 3 ] } @@ -134,6 +169,7 @@ rm -f "${XDG_RUNTIME_DIR:-/run/droiddeck}/droiddeck-remote-play" /usr/local/bin/droiddeck-steamvr unregister >/dev/null 2>&1 || true if [ "$mode" = lxqt ] || [ "$mode" = desktop ]; then /usr/local/bin/droiddeck-desktop-bookmarks || true + /usr/local/bin/droiddeck-downloads || true fi export FLATPAK_BWRAP=/usr/local/bin/droiddeck-bwrap export XDG_DATA_DIRS=$XDG_DATA_HOME/flatpak/exports/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share} @@ -201,6 +237,20 @@ if [ -z "${BL_INSIDE:-}" ]; then step "starting the desktop" start_agent --no-focus [ -x /usr/local/bin/droiddeck-desktop ] || { echo "== the desktop package is not installed"; exit 66; } + if command -v dbus-daemon >/dev/null 2>&1 && command -v droiddeck-netmanager >/dev/null 2>&1; then + write_system_bus_config + dbus-daemon --config-file=/usr/local/share/droiddeck/system-bus.conf --nofork --nopidfile & + for _ in $(seq 1 50); do + [ -S /run/dbus/system_bus_socket ] && break + nap 0.1 + done + if [ -S /run/dbus/system_bus_socket ]; then + droiddeck-login1 --with-netmanager & + echo "== desktop: system bus up, network and power services running" + else + echo "== desktop: the system bus did not come up" + fi + fi cores=$(program_cores) if [ -n "$cores" ]; then echo "== desktop cores: $cores (the desktop and every program started from it)" @@ -842,23 +892,7 @@ case $mode in set -- "$@" "$_bl_url" fi if command -v dbus-daemon >/dev/null 2>&1 && command -v droiddeck-netmanager >/dev/null 2>&1; then - mkdir -p /run/dbus /usr/local/share/droiddeck - cat > /usr/local/share/droiddeck/system-bus.conf <<'BUSCONF' - - - system - unix:path=/run/dbus/system_bus_socket - EXTERNAL - - - - - - - -BUSCONF - rm -f /run/dbus/system_bus_socket + write_system_bus_config dbus-daemon --config-file=/usr/local/share/droiddeck/system-bus.conf --nofork --nopidfile & system_bus=$! for _ in $(seq 1 50); do @@ -998,6 +1032,8 @@ BUSCONF fi echo "== steam args: ${_bl_ui[*]} ${_bl_cdp[*]} ${_bl_lang[*]} -clientbeta $steam_channel -no-cef-sandbox -cef-ozone-platform=x11 ${_bl_cef[*]} $*$([ "$steam_x64" = 1 ] && echo ' (x86-64 client under FEX)')" steam_updates=0 + steam_installs=0 + steam_update_stamp=$(stat -c '%n %Y %s' "$steam_root"/package/*.installed 2>/dev/null) rm -f "$HOME/.bl-stop-requested" "$STEAMOS_STEAM_SHUTDOWN_SENTINEL" "$STEAMOS_STEAM_REBOOT_SENTINEL" steam_other_game_running() { local line value n open diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-cli b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-cli new file mode 100755 index 0000000000..a8defb454b --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-cli @@ -0,0 +1,15 @@ +#!/bin/bash +[ "${1:-}" = run ] || exec /usr/bin/snap "$@" +shift +while [ $# -gt 0 ]; do + case $1 in + --) shift; break ;; + -*) shift ;; + *) break ;; + esac +done +target=${1:?usage: snap run [.] [args...]} +shift +name=${target%%.*} +app=${target#*.} +exec /usr/local/bin/droiddeck-snap-run "$name" "$app" "$@" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-confine b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-confine new file mode 100755 index 0000000000..133eeeeb6b --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-confine @@ -0,0 +1,19 @@ +#!/bin/bash +while [ $# -gt 0 ]; do + case $1 in + --classic) shift ;; + --base) shift 2 ;; + --*) shift ;; + *) break ;; + esac +done +tag=${1:?security tag} +shift +[ "${1##*/}" = snap-exec ] && shift +app=${1:-} +shift +name=${tag#snap.} +name=${name%%.*} +app=${app#*.} +[ -n "$app" ] || app=$name +exec /usr/local/bin/droiddeck-snap-run "$name" "$app" "$@" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-run new file mode 100755 index 0000000000..6529005a24 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snap-run @@ -0,0 +1,139 @@ +#!/usr/bin/python3 +import os +import re +import shlex +import sys + +import yaml + +SNAP_DIR = "/snap" +HOST_DIRS = ("/etc", "/home", "/root", "/tmp", "/run", "/var/snap", "/var/lib/snapd", "/var/tmp", "/var/log", + "/media", "/mnt", "/snap", "/usr/src", "/lib/modules") + + +def load(name): + with open(f"{SNAP_DIR}/{name}/current/meta/snap.yaml") as f: + return yaml.safe_load(f) or {} + + +def expand(value, env): + return re.sub(r"\$\{?([A-Za-z_][A-Za-z0-9_]*)\}?", lambda m: env.get(m.group(1), ""), str(value)) + + +def provider_path(path, provider, revision): + snap = f"{SNAP_DIR}/{provider}/{revision}" + for var, value in (("$SNAP_DATA", f"/var/snap/{provider}/{revision}"), + ("$SNAP_COMMON", f"/var/snap/{provider}/common"), ("$SNAP", snap)): + if path == var or path.startswith(var + "/"): + return os.path.normpath(value + path[len(var):]) + return os.path.normpath(f"{snap}/{path}") + + +def content_binds(name, meta, env): + out = [] + for plug_name, plug in (meta.get("plugs") or {}).items(): + if not isinstance(plug, dict) or plug.get("interface") != "content" or not plug.get("target"): + continue + provider = (plug.get("default-provider") or "").split(":")[0] + if not provider or not os.path.isdir(f"{SNAP_DIR}/{provider}/current"): + continue + try: + slots = load(provider).get("slots") or {} + except OSError: + continue + revision = os.path.basename(os.path.realpath(f"{SNAP_DIR}/{provider}/current")) + target = expand(plug["target"], env) + for slot_name, slot in slots.items(): + if not isinstance(slot, dict) or slot.get("interface") != "content": + continue + if slot.get("content", slot_name) != plug.get("content", plug_name): + continue + nested = "source" in slot + reads = (slot.get("source") or {}).get("read") if nested else slot.get("read") + for path in reads or []: + source = provider_path(str(path), provider, revision) + out.append((plug_name, source, os.path.join(target, os.path.basename(source)) if nested else target)) + if not nested: + break + break + return out + + +def main(argv): + if len(argv) < 3: + print("usage: droiddeck-snap-run SNAP APP [ARG...]", file=sys.stderr) + return 2 + name, app, args = argv[1], argv[2], argv[3:] + meta = load(name) + spec = (meta.get("apps") or {}).get(app) + if spec is None: + print(f"error: snap \"{name}\" has no app \"{app}\"", file=sys.stderr) + return 1 + revision = os.path.basename(os.path.realpath(f"{SNAP_DIR}/{name}/current")) + home = os.environ.get("HOME", "/root") + snap = f"{SNAP_DIR}/{name}/{revision}" + env = dict(os.environ) + for k in ("LD_PRELOAD", "LD_LIBRARY_PATH"): + env.pop(k, None) + env.update({ + "SNAP": snap, "SNAP_NAME": name, "SNAP_INSTANCE_NAME": name, "SNAP_INSTANCE_KEY": "", + "SNAP_REVISION": revision, "SNAP_VERSION": str(meta.get("version", "")), "SNAP_ARCH": "arm64", + "SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl:/var/lib/snapd/lib/gl32:/var/lib/snapd/void", + "SNAP_DATA": f"/var/snap/{name}/{revision}", "SNAP_COMMON": f"/var/snap/{name}/common", + "SNAP_USER_DATA": f"{home}/snap/{name}/{revision}", "SNAP_USER_COMMON": f"{home}/snap/{name}/common", + "SNAP_REAL_HOME": home, "SNAP_UID": str(os.getuid()), "SNAP_EUID": str(os.geteuid()), + "SNAP_COOKIE": "", "SNAP_CONTEXT": "", "SNAP_REEXEC": "0", + }) + for d in (env["SNAP_USER_DATA"], env["SNAP_USER_COMMON"], env["SNAP_DATA"], env["SNAP_COMMON"]): + os.makedirs(d, exist_ok=True) + current = f"{home}/snap/{name}/current" + if os.path.realpath(current) != env["SNAP_USER_DATA"]: + try: + os.unlink(current) + except OSError: + pass + os.symlink(revision, current) + confinement = meta.get("confinement", "strict") + if confinement != "classic": + env["HOME"] = env["SNAP_USER_DATA"] + env["PATH"] = ":".join([f"{snap}/usr/sbin", f"{snap}/usr/bin", f"{snap}/sbin", f"{snap}/bin", + "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin", "/usr/games"]) + env["LD_LIBRARY_PATH"] = env["SNAP_LIBRARY_PATH"] + for scope in (meta.get("environment") or {}, spec.get("environment") or {}): + for k, v in scope.items(): + env[k] = expand(v, env) + command = shlex.split(expand(spec.get("command", ""), env)) + if command and not command[0].startswith("/"): + command[0] = f"{snap}/{command[0]}" + chain = [c if c.startswith("/") else f"{snap}/{c}" for c in (meta.get("command-chain") or []) + (spec.get("command-chain") or [])] + program = chain + command + args + if confinement == "classic": + os.execvpe(program[0], program, env) + base = meta.get("base") or "core" + root = f"{SNAP_DIR}/{base}/current" + if not os.path.isdir(root): + print(f"error: the base snap \"{base}\" is not installed; run: snap install {base}", file=sys.stderr) + return 1 + bwrap = ["/usr/local/bin/droiddeck-bwrap", "--bind", root, "/", "--dev-bind", "/dev", "/dev", "--proc", "/proc", + "--bind", "/sys", "/sys"] + for d in HOST_DIRS: + if os.path.isdir(d): + bwrap += ["--bind", d, d] + bwrap += ["--bind", "/", "/var/lib/snapd/hostfs"] + bwrap += ["--bind", "/dev/null", "/etc/ld.so.preload"] + binds = content_binds(name, meta, env) + for _, source, target in binds: + if os.path.isdir(source): + bwrap += ["--bind", source, target] + content = {k for k, v in (meta.get("plugs") or {}).items() if isinstance(v, dict) and v.get("interface") == "content"} + plugs = (set(meta.get("plugs") or {}) | set(spec.get("plugs") or [])) - content | {plug for plug, _, _ in binds} + env["DROIDDECK_SNAP_PLUGS"] = " ".join(sorted(plugs)) + bwrap += ["--bind", "/usr/local/bin/droiddeck-snapctl", "/usr/lib/snapd/snapctl"] + bwrap += ["--chdir", os.getcwd() if os.path.isdir(os.getcwd()) else env["HOME"], "--clearenv"] + for k, v in env.items(): + bwrap += ["--setenv", k, v] + os.execv(bwrap[0], bwrap + ["--"] + program) + + +if __name__ == "__main__": + sys.exit(main(sys.argv)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapctl b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapctl new file mode 100755 index 0000000000..4fffd789dc --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapctl @@ -0,0 +1,12 @@ +#!/bin/sh +case $1 in + is-connected) + shift + while [ $# -gt 1 ]; do shift; done + case " $DROIDDECK_SNAP_PLUGS " in + *" ${1:-} "*) exit 0 ;; + esac + exit 1 + ;; +esac +exit 0 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapd b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapd new file mode 100755 index 0000000000..7d3ce5317e --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-snapd @@ -0,0 +1,542 @@ +#!/usr/bin/python3 +import datetime +import hashlib +import http.server +import json +import os +import re +import shutil +import socketserver +import subprocess +import sys +import threading +import urllib.parse +import urllib.request + +STORE = "https://api.snapcraft.io/v2" +ARCH = "arm64" +SNAP_DIR = "/snap" +BIN_DIR = "/snap/bin" +LIB = "/var/lib/snapd" +STATE = LIB + "/droiddeck-state.json" +DESKTOP_DIR = LIB + "/desktop/applications" +SOCKETS = ("/run/snapd.socket", "/run/snapd-snap.socket") +FIND_FIELDS = ("title,summary,description,version,revision,confinement,base,publisher,license,contact,website," + "media,categories,store-url,download,type,channel,common-ids,links") +INFO_FIELDS = ("title,summary,description,version,revision,confinement,base,publisher,license,contact,website," + "media,categories,snap-id,store-url,download,type,channel-map,common-ids,links,created-at") +HEADERS = {"Snap-Device-Series": "16", "Snap-Device-Architecture": ARCH, "User-Agent": "snapd/2.70 droiddeck"} + +lock = threading.RLock() +install_lock = threading.Lock() +changes = {} +change_seq = [0] + + +def now(): + return datetime.datetime.now(datetime.timezone.utc).isoformat() + + +def load_state(): + try: + with open(STATE) as f: + return json.load(f) + except (OSError, ValueError): + return {"snaps": {}} + + +def save_state(state): + tmp = STATE + ".tmp" + with open(tmp, "w") as f: + json.dump(state, f, indent=1) + os.replace(tmp, STATE) + + +def store_get(path, params=None): + url = STORE + path + ("?" + urllib.parse.urlencode(params) if params else "") + req = urllib.request.Request(url, headers=HEADERS) + with urllib.request.urlopen(req, timeout=60) as r: + return json.load(r) + + +def publisher(p): + p = p or {} + return {"id": p.get("id", ""), "username": p.get("username", ""), "display-name": p.get("display-name", ""), + "validation": p.get("validation", "unproven")} + + +def media_of(snap): + out = [] + for m in snap.get("media") or []: + if m.get("type") in ("icon", "screenshot", "banner") and m.get("url"): + item = {"type": m["type"], "url": m["url"]} + if m.get("width"): + item["width"] = m["width"] + item["height"] = m.get("height", 0) + out.append(item) + return out + + +def icon_of(media): + return next((m["url"] for m in media if m["type"] == "icon"), "") + + +def from_store(name, snap, revision=None, channel=None): + media = media_of(snap) + rev = revision or snap.get("revision") or {} + out = { + "id": snap.get("snap-id", ""), "name": name, "title": snap.get("title") or name, + "summary": snap.get("summary", ""), "description": snap.get("description", ""), + "type": rev.get("type") or snap.get("type") or "app", "version": rev.get("version", ""), + "revision": str(rev.get("revision", "")), "channel": channel or "stable", + "confinement": rev.get("confinement") or "strict", "base": rev.get("base") or "", + "publisher": publisher(snap.get("publisher")), "developer": (snap.get("publisher") or {}).get("username", ""), + "license": snap.get("license", ""), "contact": snap.get("contact", ""), "website": snap.get("website", ""), + "media": media, "icon": icon_of(media), "store-url": snap.get("store-url", ""), + "download-size": (rev.get("download") or {}).get("size", 0), "status": "available", + "categories": [{"name": c.get("name", ""), "featured": bool(c.get("featured"))} for c in snap.get("categories") or []], + "common-ids": rev.get("common-ids") or snap.get("common-ids") or [], + "private": False, "devmode": False, "jailmode": False, "trymode": False, "apps": [], + } + return out + + +def installed_snap(name, entry): + snap = dict(entry["info"]) + snap["status"] = "active" + snap["install-date"] = entry.get("installed", now()) + snap["installed-size"] = entry.get("size", 0) + snap["revision"] = str(entry["revision"]) + snap["version"] = entry.get("version", snap.get("version", "")) + snap["tracking-channel"] = entry.get("channel", "latest/stable") + snap["channel"] = entry.get("channel", "latest/stable") + snap["mounted-from"] = f"{LIB}/snaps/{name}_{entry['revision']}.snap" + snap["apps"] = [{"name": a, "snap": name, "desktop-file": f"{DESKTOP_DIR}/{name}_{a}.desktop"} for a in entry.get("apps", [])] + return snap + + +def find(query, section=None, name_exact=False): + if name_exact: + try: + info = store_get(f"/snaps/info/{query}", {"architecture": ARCH, "fields": INFO_FIELDS}) + except Exception: + return [] + rev = next((c for c in info.get("channel-map", []) if c["channel"]["architecture"] == ARCH + and c["channel"]["risk"] == "stable"), None) + if not rev: + return [] + return [from_store(info["name"], dict(info["snap"], **{"snap-id": info.get("snap-id", "")}), rev, "stable")] + params = {"architecture": ARCH, "fields": FIND_FIELDS} + if query: + params["q"] = query + if section: + params["category"] = section + if not query and not section: + params["featured"] = "true" + result = store_get("/snaps/find", params) + out = [] + state = load_state() + for r in result.get("results", []): + snap = from_store(r["name"], dict(r.get("snap", {}), **{"snap-id": r.get("snap-id", "")}), r.get("revision")) + if r["name"] in state["snaps"]: + snap["status"] = "active" + snap["installed-size"] = state["snaps"][r["name"]].get("size", 0) + out.append(snap) + return out + + +def new_change(kind, summary, snaps): + with lock: + change_seq[0] += 1 + cid = str(change_seq[0]) + changes[cid] = {"id": cid, "kind": kind, "summary": summary, "status": "Doing", "ready": False, + "spawn-time": now(), "tasks": [{"id": cid + "-1", "kind": kind, "summary": summary, "status": "Doing", + "progress": {"label": "", "done": 0, "total": 1}, + "spawn-time": now()}], + "data": {"snap-names": snaps}} + return cid + + +def progress(cid, label, done, total): + with lock: + task = changes[cid]["tasks"][0] + task["progress"] = {"label": label, "done": done, "total": max(total, 1)} + task["summary"] = changes[cid]["summary"] + + +def finish(cid, err=None): + with lock: + c = changes[cid] + c["status"] = "Error" if err else "Done" + c["ready"] = True + c["ready-time"] = now() + c["tasks"][0]["status"] = c["status"] + if err: + c["err"] = err + + +def root_run(argv): + if os.getuid() == 0: + return subprocess.run(argv, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True) + return subprocess.run(["/usr/local/bin/droiddeck-root"] + argv, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, + text=True) + + +def snap_yaml(path): + try: + import yaml + with open(path) as f: + return yaml.safe_load(f) or {} + except Exception: + return {} + + +def download(cid, name, url, sha3, size, target): + tmp = target + ".partial" + h = hashlib.sha3_384() + req = urllib.request.Request(url, headers=HEADERS) + with urllib.request.urlopen(req, timeout=120) as r, open(tmp, "wb") as out: + done = 0 + while True: + chunk = r.read(1 << 20) + if not chunk: + break + out.write(chunk) + h.update(chunk) + done += len(chunk) + progress(cid, f"Download snap \"{name}\"", done, size) + if sha3 and h.hexdigest() != sha3: + os.unlink(tmp) + raise RuntimeError(f"{name}: downloaded snap does not match the store's sha3-384") + os.replace(tmp, target) + + +def write_desktop(name, rev, meta): + os.makedirs(DESKTOP_DIR, exist_ok=True) + gui = f"{SNAP_DIR}/{name}/{rev}/meta/gui" + apps = (meta.get("apps") or {}) + for app, spec in apps.items(): + source = os.path.join(gui, f"{app}.desktop") + if (spec or {}).get("daemon") or not os.path.isfile(source): + continue + command = name if app == name else f"{name}.{app}" + out = [] + with open(source, encoding="utf-8", errors="replace") as f: + for line in f: + if line.startswith("Exec="): + args = line[5:].strip().split(" ", 1) + rest = (" " + args[1]) if len(args) > 1 else "" + line = f"Exec={BIN_DIR}/{command}{rest}\n" + elif line.startswith("Icon="): + line = "Icon=" + line[5:].replace("${SNAP}", f"{SNAP_DIR}/{name}/current") + out.append(line) + out.append(f"X-SnapInstanceName={name}\n") + target = f"{DESKTOP_DIR}/{name}_{app}.desktop" + with open(target + ".tmp", "w", encoding="utf-8") as f: + f.writelines(out) + os.replace(target + ".tmp", target) + subprocess.run(["update-desktop-database", DESKTOP_DIR], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + + +def link_bins(name, meta): + os.makedirs(BIN_DIR, exist_ok=True) + apps = [] + for app, spec in (meta.get("apps") or {}).items(): + if (spec or {}).get("daemon"): + continue + command = name if app == name else f"{name}.{app}" + path = os.path.join(BIN_DIR, command) + with open(path + ".tmp", "w") as f: + f.write(f"#!/bin/sh\nexec /usr/local/bin/droiddeck-snap-run {name} {app} \"$@\"\n") + os.chmod(path + ".tmp", 0o755) + os.replace(path + ".tmp", path) + apps.append(app) + return apps + + +def remove_tree(top): + if os.path.isdir(top) and not os.path.islink(top): + os.chmod(top, 0o700) + for root, dirs, _ in os.walk(top): + for d in dirs: + path = os.path.join(root, d) + if not os.path.islink(path): + os.chmod(path, 0o700) + shutil.rmtree(top, ignore_errors=True) + + +def install_one(cid, name, channel, state, parents=()): + if name in state["snaps"] or name in parents: + return + info = store_get(f"/snaps/info/{name}", {"architecture": ARCH, "fields": INFO_FIELDS}) + risk = channel.split("/")[-1] if channel else "stable" + track = channel.split("/")[0] if channel and "/" in channel else "latest" + rev = next((c for c in info.get("channel-map", []) if c["channel"]["architecture"] == ARCH + and c["channel"]["risk"] == risk and c["channel"]["track"] == track), None) + if not rev: + raise RuntimeError(f"snap \"{name}\" has no {track}/{risk} release for {ARCH}") + number = rev["revision"] + os.makedirs(f"{LIB}/snaps", exist_ok=True) + blob = f"{LIB}/snaps/{name}_{number}.snap" + d = rev.get("download") or {} + with lock: + changes[cid]["summary"] = f"Install \"{name}\" snap" + download(cid, name, d["url"], d.get("sha3-384"), d.get("size", 0), blob) + progress(cid, f"Unpack snap \"{name}\"", 0, 1) + target = f"{SNAP_DIR}/{name}/{number}" + remove_tree(target) + os.makedirs(os.path.dirname(target), exist_ok=True) + r = root_run(["unsquashfs", "-q", "-n", "-no-xattrs", "-f", "-excludes", "-d", target, blob, "dev"]) + if r.returncode != 0: + raise RuntimeError(f"cannot unpack {name}: {r.stdout.strip()[-400:]}") + os.makedirs(f"{target}/dev", exist_ok=True) + current = f"{SNAP_DIR}/{name}/current" + if os.path.islink(current): + os.unlink(current) + os.symlink(str(number), current) + for sub in (f"/var/snap/{name}/{number}", f"/var/snap/{name}/common"): + os.makedirs(sub, exist_ok=True) + cur = f"/var/snap/{name}/current" + if os.path.islink(cur): + os.unlink(cur) + os.symlink(str(number), cur) + meta = snap_yaml(f"{target}/meta/snap.yaml") + entry = {"revision": number, "version": rev.get("version", ""), "channel": f"{track}/{risk}", + "installed": now(), "size": d.get("size", 0), "info": from_store(name, dict(info["snap"], **{"snap-id": info.get("snap-id", "")}), rev, f"{track}/{risk}"), + "base": meta.get("base") or ("core" if (meta.get("type") or "app") == "app" else ""), "apps": []} + base = meta.get("base") + if (meta.get("type") or "app") == "app": + install_one(cid, base or "core", "latest/stable", state, parents + (name,)) + for plug in (meta.get("plugs") or {}).values(): + if isinstance(plug, dict) and plug.get("interface") == "content" and plug.get("default-provider"): + provider = plug["default-provider"].split(":")[0] + install_one(cid, provider, "latest/stable", state, parents + (name,)) + entry["apps"] = link_bins(name, meta) + write_desktop(name, number, meta) + state["snaps"][name] = entry + save_state(state) + + +def remove_one(name, state): + entry = state["snaps"].pop(name, None) + if not entry: + raise RuntimeError(f"snap \"{name}\" is not installed") + for app in entry.get("apps", []): + command = name if app == name else f"{name}.{app}" + try: + os.unlink(os.path.join(BIN_DIR, command)) + except OSError: + pass + if os.path.isdir(DESKTOP_DIR): + for f in os.listdir(DESKTOP_DIR): + if f.startswith(name + "_") and f.endswith(".desktop"): + os.unlink(os.path.join(DESKTOP_DIR, f)) + subprocess.run(["update-desktop-database", DESKTOP_DIR], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + remove_tree(f"{SNAP_DIR}/{name}") + for f in os.listdir(f"{LIB}/snaps"): + if f.startswith(name + "_"): + os.unlink(os.path.join(f"{LIB}/snaps", f)) + save_state(state) + + +def run_change(cid, action, names, channel): + with install_lock: + apply_change(cid, action, names, channel) + + +def apply_change(cid, action, names, channel): + try: + state = load_state() + for name in names: + if action == "install": + install_one(cid, name, channel or "latest/stable", state) + elif action == "remove": + remove_one(name, state) + elif action == "refresh": + old = state["snaps"].get(name) + if old: + remove_one(name, state) + install_one(cid, name, old.get("channel", "latest/stable"), state) + else: + raise RuntimeError(f"unsupported action {action}") + finish(cid) + except Exception as e: + finish(cid, str(e)) + + +SECTIONS = ["featured", "art-and-design", "books-and-reference", "development", "devices-and-iot", "education", + "entertainment", "finance", "games", "health-and-fitness", "music-and-audio", "news-and-weather", + "personalisation", "photo-and-video", "productivity", "science", "security", "server-and-cloud", + "social", "utilities"] + + +class Handler(http.server.BaseHTTPRequestHandler): + protocol_version = "HTTP/1.1" + + def log_message(self, fmt, *args): + pass + + def address_string(self): + return "snapd" + + def reply(self, body, code=200, kind="sync"): + payload = {"type": kind, "status-code": code, "status": http.client.responses.get(code, "")} + payload.update(body) + data = json.dumps(payload).encode() + self.send_response(code) + self.send_header("Content-Type", "application/json") + self.send_header("Content-Length", str(len(data))) + self.end_headers() + self.wfile.write(data) + + def ok(self, result): + self.reply({"result": result}) + + def error(self, code, message, kind=""): + self.reply({"result": {"message": message, "kind": kind}}, code, "error") + + def body(self): + n = int(self.headers.get("Content-Length") or 0) + raw = self.rfile.read(n) if n else b"{}" + try: + return json.loads(raw or b"{}") + except ValueError: + return {} + + def do_GET(self): + url = urllib.parse.urlsplit(self.path) + q = urllib.parse.parse_qs(url.query) + path = url.path + try: + if path == "/v2/system-info": + return self.ok({"series": "16", "version": "2.70+droiddeck", "build-id": "droiddeck", "os-release": {"id": "ubuntu", "version-id": "26.04"}, + "on-classic": True, "managed": False, "kernel-version": os.uname().release, + "locations": {"snap-mount-dir": SNAP_DIR, "snap-bin-dir": BIN_DIR}, + "refresh": {"timer": "00:00~24:00/4"}, "confinement": "partial", + "sandbox-features": {}, "architecture": ARCH}) + if path == "/v2/snaps": + state = load_state() + wanted = (q.get("snaps", [""])[0] or "").split(",") + snaps = [installed_snap(n, e) for n, e in state["snaps"].items() if not wanted[0] or n in wanted] + return self.ok(snaps) + m = re.fullmatch(r"/v2/snaps/([^/]+)", path) + if m: + state = load_state() + if m.group(1) in state["snaps"]: + return self.ok(installed_snap(m.group(1), state["snaps"][m.group(1)])) + return self.error(404, f"snap not installed", "snap-not-found") + if path == "/v2/find": + name = q.get("name", [None])[0] + query = name or q.get("q", [""])[0] + section = q.get("section", [None])[0] or q.get("category", [None])[0] + if section == "featured": + section = None + select = q.get("select", [""])[0] + if select == "refresh": + return self.ok([]) + if select == "private": + return self.ok([]) + return self.ok(find(query, section, bool(name))) + if path in ("/v2/sections",): + return self.ok(SECTIONS) + if path == "/v2/categories": + return self.ok([{"name": s} for s in SECTIONS if s != "featured"]) + m = re.fullmatch(r"/v2/changes/([^/]+)", path) + if m: + with lock: + c = changes.get(m.group(1)) + c = json.loads(json.dumps(c)) if c else None + return self.ok(c) if c else self.error(404, "cannot find change", "") + if path == "/v2/changes": + with lock: + return self.ok([json.loads(json.dumps(c)) for c in changes.values()]) + m = re.fullmatch(r"/v2/icons/([^/]+)/icon", path) + if m: + return self.icon(m.group(1)) + if path == "/v2/apps": + state = load_state() + apps = [{"snap": n, "name": a, "desktop-file": f"{DESKTOP_DIR}/{n}_{a}.desktop"} + for n, e in state["snaps"].items() for a in e.get("apps", [])] + return self.ok(apps) + if path in ("/v2/connections", "/v2/interfaces"): + return self.ok({"established": [], "plugs": [], "slots": []}) + if path in ("/v2/aliases", "/v2/users", "/v2/notices", "/v2/assertions/model"): + return self.ok({} if path == "/v2/aliases" else []) + return self.error(404, f"not found: {path}") + except Exception as e: + return self.error(500, str(e)) + + def icon(self, name): + state = load_state() + entry = state["snaps"].get(name) + if not entry: + return self.error(404, "not installed", "snap-not-found") + for candidate in ("meta/gui/icon.png", "meta/gui/icon.svg"): + path = f"{SNAP_DIR}/{name}/current/{candidate}" + if os.path.isfile(path): + with open(path, "rb") as f: + data = f.read() + self.send_response(200) + self.send_header("Content-Type", "image/svg+xml" if path.endswith("svg") else "image/png") + self.send_header("Content-Length", str(len(data))) + self.end_headers() + self.wfile.write(data) + return + return self.error(404, "no icon", "") + + def do_POST(self): + path = urllib.parse.urlsplit(self.path).path + body = self.body() + m = re.fullmatch(r"/v2/snaps/([^/]+)", path) + if m or path == "/v2/snaps": + names = [m.group(1)] if m else body.get("snaps") or [] + action = body.get("action", "") + channel = body.get("channel") or "" + if channel and "/" not in channel: + channel = "latest/" + channel + if action not in ("install", "remove", "refresh"): + return self.error(400, f"unsupported action \"{action}\"") + cid = new_change(f"{action}-snap", f"{action.capitalize()} {', '.join(names)}", names) + threading.Thread(target=run_change, args=(cid, action, names, channel), daemon=True).start() + return self.reply({"change": cid}, 202, "async") + m = re.fullmatch(r"/v2/changes/([^/]+)", path) + if m: + return self.error(400, "changes cannot be aborted") + if path in ("/v2/login", "/v2/logout", "/v2/snapctl"): + return self.error(400, "not supported by DroidDeck's snap service") + return self.error(404, f"not found: {path}") + + def do_PUT(self): + return self.do_POST() + + +class Server(socketserver.ThreadingMixIn, socketserver.UnixStreamServer): + daemon_threads = True + + def get_request(self): + conn, _ = self.socket.accept() + return conn, ("snapd", 0) + + +def serve(path): + try: + os.unlink(path) + except OSError: + pass + server = Server(path, Handler) + os.chmod(path, 0o666) + server.serve_forever() + + +def main(): + for d in (LIB, SNAP_DIR, BIN_DIR, DESKTOP_DIR, LIB + "/snaps"): + os.makedirs(d, exist_ok=True) + threads = [threading.Thread(target=serve, args=(p,), daemon=True) for p in SOCKETS] + for t in threads: + t.start() + for t in threads: + t.join() + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch index 731f64dc20..7867eeed93 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch @@ -39,6 +39,7 @@ if [ "$ui" = desktop ] && [ "${BL_DESKTOP:-}" = 1 ]; then echo "droiddeck-steam-launch: the desktop client did not become ready" >&2 exit 69 fi + [ "$url" = steam://exit ] && exit 0 export BL_INSIDE=1 BL_STEAM_UI=desktop exec /usr/local/bin/droiddeck-session steam "${url:-steam://open/library}" fi diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim index 3e319a460e..6ba870b14e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shim @@ -6,6 +6,7 @@ if [ "${BL_DESKTOP:-}" = 1 ]; then for arg in "$@"; do case $arg in steam://*) url=$arg ;; + -shutdown) url=steam://exit ;; -gamepadui|-bigpicture) ui=bigpicture ;; esac done diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-systemd-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-systemd-run new file mode 100755 index 0000000000..3fa4e2fd4e --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-systemd-run @@ -0,0 +1,57 @@ +#!/usr/bin/python3 +import os +import sys + +REAL = "/usr/bin/systemd-run" +VALUED = {"-u", "--unit", "-p", "--property", "--description", "--slice", "-E", "--setenv", + "--working-directory", "--uid", "--gid", "--nice", "-H", "--host", "-M", "--machine", + "--on-active", "--on-boot", "--on-startup", "--on-unit-active", "--on-unit-inactive", + "--on-calendar", "--path-property", "--socket-property", "--timer-property", "--service-type", + "--shell", "--slice-inherit"} + + +def main(argv): + args = argv[1:] + if "--user" not in args: + os.execv(REAL, [REAL] + args) + env = dict(os.environ) + cwd = None + foreground = False + i = 0 + while i < len(args): + a = args[i] + if a == "--": + i += 1 + break + if not a.startswith("-"): + break + name, _, inline = a.partition("=") + value = inline if inline else (args[i + 1] if name in VALUED and i + 1 < len(args) else "") + if name in ("-E", "--setenv") and "=" in value: + k, _, v = value.partition("=") + env[k] = v + elif name == "--working-directory": + cwd = value + elif name in ("--scope", "--wait", "-W", "--pipe", "-P", "-t", "--pty"): + foreground = True + i += 1 if inline or name not in VALUED else 2 + command = args[i:] + if not command: + os.execv(REAL, [REAL] + args) + if cwd: + os.chdir(cwd) + if foreground: + os.execvpe(command[0], command, env) + if os.fork() == 0: + os.setsid() + null = os.open(os.devnull, os.O_RDWR) + os.dup2(null, 0) + try: + os.execvpe(command[0], command, env) + except OSError: + os._exit(127) + return 0 + + +if __name__ == "__main__": + sys.exit(main(sys.argv)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-text b/tools/linuxfs/overlay/usr/local/bin/droiddeck-text new file mode 100755 index 0000000000..9bbf0305e2 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-text @@ -0,0 +1,7 @@ +#!/bin/bash +key=$1 +shift +line=$(grep -m1 "^$key=" /etc/droiddeck/strings 2>/dev/null) +text=${line#*=} +[ -n "$line" ] || text=$key +printf "$text\n" "$@" diff --git a/tools/linuxfs/preload/robust.c b/tools/linuxfs/preload/robust.c index fa4cebaf76..74324f5453 100644 --- a/tools/linuxfs/preload/robust.c +++ b/tools/linuxfs/preload/robust.c @@ -338,6 +338,26 @@ static int execveat_is_execve(const long *args) { return path[0] == '/' || (int)args[0] == AT_FDCWD; } +static long openat2_call(const long *args) { + if (!real_syscall) { + real_syscall = (long (*)(long, ...)) dlsym(RTLD_NEXT, "syscall"); + } + if (!__atomic_load_n(&openat2_missing, __ATOMIC_RELAXED)) { + long fd = real_syscall(SYS_openat2, args[0], args[1], args[2], args[3]); + if (fd != -1 || errno != ENOSYS) { + return fd; + } + __atomic_store_n(&openat2_missing, 1, __ATOMIC_RELAXED); + } + return openat2_via_openat(args); +} + +int bl_openat2(int dirfd, const char *path, void *how, size_t size) __asm__("openat2"); +int bl_openat2(int dirfd, const char *path, void *how, size_t size) { + long args[6] = {dirfd, (long)path, (long)how, (long)size, 0, 0}; + return (int)openat2_call(args); +} + int bl_writewatch_syscall(long number, const long *args, long (*real)(long, ...), long *rc) __attribute__((visibility("hidden"))); long syscall(long number, ...) { @@ -369,14 +389,7 @@ long syscall(long number, ...) { return handled; } if (number == SYS_openat2) { - if (!__atomic_load_n(&openat2_missing, __ATOMIC_RELAXED)) { - long fd = real_syscall(number, args[0], args[1], args[2], args[3]); - if (fd != -1 || errno != ENOSYS) { - return fd; - } - __atomic_store_n(&openat2_missing, 1, __ATOMIC_RELAXED); - } - return openat2_via_openat(args); + return openat2_call(args); } if (number == SYS_openat) { return path_open((int)args[0], (const char *)args[1], (int)args[2], args[3]); diff --git a/tools/linuxfs/preload/webhelper.c b/tools/linuxfs/preload/webhelper.c index af478c99af..9494872797 100644 --- a/tools/linuxfs/preload/webhelper.c +++ b/tools/linuxfs/preload/webhelper.c @@ -1,6 +1,7 @@ #define _GNU_SOURCE #include #include +#include #ifndef WEBHELPER_DEFAULT #define WEBHELPER_DEFAULT "--no-zygote --in-process-gpu -AudioServiceOutOfProcess" @@ -25,8 +26,30 @@ static char *join_features(const char *have, const char *add) { return strcat(out, add); } +static char *const *chromium_argv(const char *path, char *const argv[]) { + const char *slash = path ? strrchr(path, '/') : NULL; + if (!slash || !argv || !argv[0]) return argv; + int argc = 0; + for (; argv[argc]; argc++) + if (argc && (!strncmp(argv[argc], "--type=", 7) || !strcmp(argv[argc], "--no-sandbox"))) return argv; + size_t dir = (size_t)(slash - path) + 1; + char *sandbox = malloc(dir + sizeof "chrome-sandbox"); + if (!sandbox) return argv; + memcpy(sandbox, path, dir); + strcpy(sandbox + dir, "chrome-sandbox"); + int chromium = access(sandbox, F_OK) == 0; + free(sandbox); + if (!chromium) return argv; + char **out = calloc((size_t)argc + 2, sizeof *out); + if (!out) return argv; + out[0] = argv[0]; + out[1] = (char *)"--no-sandbox"; + for (int i = 1; i < argc; i++) out[i + 1] = argv[i]; + return out; +} + __attribute__((visibility("hidden"))) char *const *bl_webhelper_argv(const char *path, char *const argv[]) { - if (!is_webhelper_browser(path, argv)) return argv; + if (!is_webhelper_browser(path, argv)) return chromium_argv(path, argv); const char *spec = getenv("BL_WEBHELPER_ARGS"); if (!spec || !*spec) spec = WEBHELPER_DEFAULT; if (!strcmp(spec, "stock")) return argv; diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index a0faf47043..c5924c0fe2 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -39,8 +39,8 @@ Ported from WinNative (`main`, 53836ca9, "Fix/performance and vac"): - `0007-proc-self-thread-group.patch` - tracees track their thread group, `/proc/self` names it instead of the calling thread, and `/proc/thread-self` resolves to `/proc//task/`. - `0008-fchmodat2-openat2.patch` - `fchmodat2` paths are translated (honouring - `AT_SYMLINK_NOFOLLOW`), `openat2` answers `ENOSYS` so callers fall back to the translated - `openat`, and syscall numbers past the end of a table are rejected instead of read. + `AT_SYMLINK_NOFOLLOW`), and syscall numbers past the end of a table are rejected instead of read. + Its `openat2` answer is replaced by `0019`. - `0009-tracee-relatives-sweep.patch` - tracees count their children, so a terminating thread with no children or ptracees no longer walks every tracee; the per-stop memory collector is emptied instead of freed and reallocated. @@ -114,6 +114,20 @@ Prototype (inert unless `PROOT_FASTPATH` is set; see `docs/development/proot-per SM8850 (adb shell): `stat` 25.3 -> 0.6 us, `open+close` 25.3 -> 0.9 us, ENOENT 22.9 -> 1.6 us, 8 threads `stat`ing 89k -> 3.6M/s; equivalence suite (`bench/equiv.py`) byte-identical to proot. +- `0019-openat2-emulation.patch` - `openat2` without `resolve` flags runs as a translated `openat` + with the same flag and mode checks as the kernel. Any `resolve` flag still answers `ENOSYS`, + because PRoot cannot confine symlinks or mounts, so callers keep their own confined fallback. +- `0022-fake-root-statx-owners.patch` - with `0013` dropping the `statx` exit stop, fake root never + rewrote the owner `statx` returns, so files read as owned by the app's uid while the process was + root. Rust's `metadata` and GNU `stat` use `statx`, so uutils' `test -w` (Ubuntu's `/usr/bin/test`) + said root could not write to its own directories and apt's AppStream hook never built Discover's + catalog. fake_id0 keeps that exit stop when it fakes ids; identity-only mode is unchanged. +- `0023-reused-pid-new-child.patch` - when a thread that is not its process's leader calls `execve`, + the kernel retires that thread's ID without reporting an exit, so PRoot keeps its entry. Once the + IDs wrap (32768 on many Android kernels) a new child can get that ID, and PRoot aborted on the + assertion that a new child has no state, ending the whole session. Chromium-based programs such as + Steam's client do this. PRoot now retires the stale entry and sets the new child up from scratch. + Old kernel fixes: - `0015-lost-fork-events.patch` - works around a problem reported on Xiaomi's msm 4.14 kernel: diff --git a/tools/proot/patches/0019-openat2-emulation.patch b/tools/proot/patches/0019-openat2-emulation.patch new file mode 100644 index 0000000000..1a1f7b0152 --- /dev/null +++ b/tools/proot/patches/0019-openat2-emulation.patch @@ -0,0 +1,72 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 14:12:04 -0400 +Subject: [PATCH] syscall: emulate openat2 through a translated openat + +--- + src/syscall/enter.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 49 insertions(+), 2 deletions(-) + +diff --git a/src/syscall/enter.c b/src/syscall/enter.c +index 121c742..66b9e6b 100644 +--- a/src/syscall/enter.c ++++ b/src/syscall/enter.c +@@ -491,9 +491,56 @@ int translate_syscall_enter(Tracee *tracee) + status = translate_path2(tracee, dirfd, path, SYSARG_2, REGULAR); + break; + +- case PR_openat2: +- status = -ENOSYS; ++ case PR_openat2: { ++ struct { uint64_t flags; uint64_t mode; uint64_t resolve; } how; ++ word_t size = peek_reg(tracee, CURRENT, SYSARG_4); ++ ++ if (size < sizeof(how) || size > 4096) { ++ status = size < sizeof(how) ? -EINVAL : -E2BIG; ++ break; ++ } ++ status = read_data(tracee, &how, peek_reg(tracee, CURRENT, SYSARG_3), sizeof(how)); ++ if (status < 0) ++ break; ++ if ((how.resolve & ~(uint64_t) 0x3f) != 0 ++ || ((how.resolve & 0x08) != 0 && (how.resolve & 0x10) != 0) ++ || (how.mode != 0 && (how.flags & (O_CREAT | __O_TMPFILE)) == 0) ++ || (how.flags >> 32) != 0) { ++ status = -EINVAL; ++ break; ++ } ++ if ((how.resolve & 0x20) != 0) { ++ status = -EAGAIN; ++ break; ++ } ++ if ((how.resolve & 0x1f) != 0) { ++ status = -ENOSYS; ++ break; ++ } ++#ifdef __ANDROID__ ++ if ((how.flags & __O_TMPFILE) != 0) { ++ status = -EOPNOTSUPP; ++ break; ++ } ++#endif ++ dirfd = peek_reg(tracee, CURRENT, SYSARG_1); ++ status = get_sysarg_path(tracee, path, SYSARG_2); ++ if (status < 0) ++ break; ++ ++ if ( ((how.flags & O_NOFOLLOW) != 0) ++ || ((how.flags & O_EXCL) != 0 && (how.flags & O_CREAT) != 0)) ++ status = translate_path2(tracee, dirfd, path, SYSARG_2, SYMLINK); ++ else ++ status = translate_path2(tracee, dirfd, path, SYSARG_2, REGULAR); ++ if (status < 0) ++ break; ++ ++ set_sysnum(tracee, PR_openat); ++ poke_reg(tracee, SYSARG_3, how.flags); ++ poke_reg(tracee, SYSARG_4, how.mode); + break; ++ } + + + diff --git a/tools/proot/patches/0020-l2s-visible-exe.patch b/tools/proot/patches/0020-l2s-visible-exe.patch new file mode 100644 index 0000000000..45ba5d2dca --- /dev/null +++ b/tools/proot/patches/0020-l2s-visible-exe.patch @@ -0,0 +1,123 @@ +From 771667d739c8501729b4037a7377793fd16e908e Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 14:12:37 -0400 +Subject: [PATCH] execve: show the linked name as /proc/self/exe for + link2symlink files + +--- + src/execve/enter.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 92 insertions(+) + +diff --git a/src/execve/enter.c b/src/execve/enter.c +index c562d14..f185e9a 100644 +--- a/src/execve/enter.c ++++ b/src/execve/enter.c +@@ -592,6 +592,96 @@ static inline const char *get_loader_path(const Tracee *tracee) + * translate_load_*(). This function returns -errno if an error + * occured, otherwise 0. + */ ++static bool is_l2s_name(const char *path) ++{ ++ const char *name = strrchr(path, '/'); ++ ++ name = name != NULL ? name + 1 : path; ++ return strncmp(name, ".l2s.", 5) == 0 || strncmp(name, ".proot.l2s.", 11) == 0; ++} ++ ++static void lexical_path(char path[PATH_MAX]) ++{ ++ char result[PATH_MAX]; ++ char *component; ++ char *next; ++ size_t length = 0; ++ ++ for (component = path; *component != '\0'; component = next) { ++ size_t size; ++ ++ while (*component == '/') ++ component++; ++ next = strchrnul(component, '/'); ++ size = next - component; ++ if (size == 0 || (size == 1 && component[0] == '.')) ++ continue; ++ if (size == 2 && component[0] == '.' && component[1] == '.') { ++ while (length > 0 && result[length - 1] != '/') ++ length--; ++ if (length > 0) ++ length--; ++ continue; ++ } ++ result[length++] = '/'; ++ memcpy(result + length, component, size); ++ length += size; ++ } ++ if (length == 0) ++ result[length++] = '/'; ++ result[length] = '\0'; ++ strcpy(path, result); ++} ++ ++static void visible_exe(Tracee *tracee, const char *user_path, char exe[PATH_MAX]) ++{ ++ char path[PATH_MAX]; ++ char host[PATH_MAX]; ++ char target[PATH_MAX]; ++ char *slash; ++ ssize_t length; ++ int i; ++ ++ if (user_path[0] == '/') { ++ if (strlen(user_path) >= PATH_MAX) ++ return; ++ strcpy(path, user_path); ++ } ++ else if (join_paths(2, path, tracee->fs->cwd, user_path) < 0) ++ return; ++ lexical_path(path); ++ ++ for (i = 0; i < 40; i++) { ++ if (translate_path(tracee, host, AT_FDCWD, path, false) < 0) ++ return; ++ if (is_l2s_name(host)) ++ break; ++ length = readlink(host, target, PATH_MAX - 1); ++ if (length < 0) ++ return; ++ target[length] = '\0'; ++ if (is_l2s_name(target)) ++ break; ++ if (target[0] == '/') ++ strcpy(path, target); ++ else { ++ slash = strrchr(path, '/'); ++ *slash = '\0'; ++ if (translate_path(tracee, host, AT_FDCWD, path[0] != '\0' ? path : "/", true) < 0) ++ return; ++ if (detranslate_path(tracee, host, NULL) < 0) ++ return; ++ if (join_paths(2, path, host, target) < 0) ++ return; ++ } ++ lexical_path(path); ++ } ++ if (i == 40) ++ return; ++ ++ strcpy(exe, path); ++} ++ + int translate_execve_enter(Tracee *tracee) + { + char user_path[PATH_MAX]; +@@ -642,6 +732,8 @@ int translate_execve_enter(Tracee *tracee) + strcpy(new_exe, host_path); + status = detranslate_path(tracee, new_exe, NULL); + if (status >= 0) { ++ if (is_l2s_name(new_exe)) ++ visible_exe(tracee, user_path, new_exe); + talloc_unlink(tracee, tracee->new_exe); + tracee->new_exe = talloc_strdup(tracee, new_exe); + } +-- +2.43.0 + diff --git a/tools/proot/patches/0021-fake-root-real-fifo-errors.patch b/tools/proot/patches/0021-fake-root-real-fifo-errors.patch new file mode 100644 index 0000000000..cb5b120962 --- /dev/null +++ b/tools/proot/patches/0021-fake-root-real-fifo-errors.patch @@ -0,0 +1,30 @@ +From 4486efde6200dc8a8df4097a868b65e449d20e82 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 14:12:47 -0400 +Subject: [PATCH] fake_id0: report real errors for FIFO and socket mknod + +--- + src/extension/fake_id0/fake_id0.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/extension/fake_id0/fake_id0.c b/src/extension/fake_id0/fake_id0.c +index 5c8a8cd..dc28529 100644 +--- a/src/extension/fake_id0/fake_id0.c ++++ b/src/extension/fake_id0/fake_id0.c +@@ -940,7 +940,12 @@ static int handle_sysexit_end(Tracee *tracee, Config *config) + case PR_setgroups32: + #endif + case PR_mknod: +- case PR_mknodat: ++ case PR_mknodat: { ++ mode_t mode = peek_reg(tracee, ORIGINAL, sysnum == PR_mknod ? SYSARG_2 : SYSARG_3); ++ if (S_ISFIFO(mode) || S_ISSOCK(mode) || S_ISREG(mode) || (mode & S_IFMT) == 0) ++ return 0; ++ return handle_perm_err_exit_end(tracee, config, false); ++ } + case PR_capset: + case PR_chmod: + case PR_chown: +-- +2.43.0 + diff --git a/tools/proot/patches/0022-fake-root-statx-owners.patch b/tools/proot/patches/0022-fake-root-statx-owners.patch new file mode 100644 index 0000000000..07cf3f0104 --- /dev/null +++ b/tools/proot/patches/0022-fake-root-statx-owners.patch @@ -0,0 +1,24 @@ +From facb0f6476b374cb9bdb07e388936f4ca0a829ce Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 15:17:52 -0400 +Subject: [PATCH] fake_id0: keep the statx exit stop so owners stay faked + +--- + src/extension/fake_id0/fake_id0.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/extension/fake_id0/fake_id0.c b/src/extension/fake_id0/fake_id0.c +index dc28529..a5ee018 100644 +--- a/src/extension/fake_id0/fake_id0.c ++++ b/src/extension/fake_id0/fake_id0.c +@@ -349,6 +349,7 @@ static FilteredSysnum filtered_sysnums[] = { + { PR_stat64, FILTER_SYSEXIT }, + { PR_statfs, FILTER_SYSEXIT }, + { PR_statfs64, FILTER_SYSEXIT }, ++ { PR_statx, FILTER_SYSEXIT }, + FILTERED_SYSNUM_END, + }; + +-- +2.43.0 + diff --git a/tools/proot/patches/0023-reused-pid-new-child.patch b/tools/proot/patches/0023-reused-pid-new-child.patch new file mode 100644 index 0000000000..ec4cbe5a46 --- /dev/null +++ b/tools/proot/patches/0023-reused-pid-new-child.patch @@ -0,0 +1,51 @@ +From 3e47c091e500b274b255d9b8d326236744aa4347 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 16:27:14 -0400 +Subject: [PATCH] tracee: replace a stale tracee when the kernel reuses its pid + for a new child + +--- + src/tracee/tracee.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c +index 5029bbc..cbadaec 100644 +--- a/src/tracee/tracee.c ++++ b/src/tracee/tracee.c +@@ -57,6 +57,8 @@ static Tracees buckets[TRACEE_BUCKETS]; + + static bool terminations_pending = false; + ++static Tracees reused_pid_tracees; ++ + static Tracees *bucket_of(pid_t pid) + { + return &buckets[(unsigned int) pid % TRACEE_BUCKETS]; +@@ -599,6 +601,24 @@ static int new_child_setup(Tracee *parent, unsigned long pid, word_t clone_flags + Tracee *child; + + child = get_tracee(parent, (pid_t) pid, true); ++ if (child != NULL ++ && (child->exe != NULL ++ || child->fs->cwd != NULL ++ || child->qemu != NULL ++ || child->glue != NULL ++ || child->parent != NULL ++ || child->as_ptracee.ptracer != NULL)) { ++ note(parent, WARNING, USER, ++ "pid %lu was reused before its previous task was released", ++ pid); ++ LIST_REMOVE(child, bucket_link); ++ LIST_INSERT_HEAD(&reused_pid_tracees, child, bucket_link); ++ if (child->as_ptracee.ptracer != NULL) ++ detach_from_ptracer(child); ++ child->terminated = true; ++ terminations_pending = true; ++ child = new_tracee((pid_t) pid); ++ } + if (child == NULL) { + note(parent, WARNING, SYSTEM, "running out of memory"); + return -ENOMEM; +-- +2.43.0 + diff --git a/tools/release/check_session_assets.py b/tools/release/check_session_assets.py index aa1985121c..8556f83fea 100644 --- a/tools/release/check_session_assets.py +++ b/tools/release/check_session_assets.py @@ -10,7 +10,7 @@ SESSION_FILES = OVERLAY.parents[2] / 'app/src/main/java/com/droiddeck/launcher/s def check_extraction(overlay, source): - deployed = set(re.findall(r'"(usr/local/bin/droiddeck-[^"]+)"\s+to\s+"\1"', source)) + deployed = set(re.findall(r'"(usr/local/bin/droiddeck-[^"]+)"\s+to\s+"usr/local/bin/[^"/]+"', source)) return ['not extracted at session start: ' + path.relative_to(overlay).as_posix() for path in sorted((overlay / 'usr/local/bin').glob('droiddeck-*')) if path.relative_to(overlay).as_posix() not in deployed] diff --git a/tools/tests/test_apt_remember.py b/tools/tests/test_apt_remember.py new file mode 100644 index 0000000000..541918fc54 --- /dev/null +++ b/tools/tests/test_apt_remember.py @@ -0,0 +1,74 @@ +import hashlib +import os +import subprocess +import tempfile +import unittest +from pathlib import Path + +REMEMBER = Path(__file__).resolve().parents[1] / "ubuntu/overlay-runtime/usr/share/droiddeck/apt/remember" + + +class AptRememberTest(unittest.TestCase): + def setUp(self): + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + self.top = Path(temp.name) + self.dir = self.top / "share/apt" + self.state = self.top / "state" + self.etc = self.top / "etc/apt" + self.keys = self.top / "keyrings" + self.autostart = self.top / "autostart" + for d in (self.dir, self.etc / "sources.list.d", self.keys, self.autostart, self.top / "bin"): + d.mkdir(parents=True) + (self.dir / "system-manual.txt").write_text("base\n") + (self.dir / "runtime-id").write_text("new\n") + system = self.keys / "ubuntu-archive.gpg" + system.write_text("system key") + (self.dir / "system-sources.txt").write_text("%s %s\n" % (system, hashlib.sha256(b"system key").hexdigest())) + apt_mark = self.top / "bin/apt-mark" + apt_mark.write_text("#!/bin/sh\nprintf 'base\\nvlc\\n'\n") + apt_mark.chmod(0o755) + script = REMEMBER.read_text() + script = script.replace("/usr/share/droiddeck/apt", str(self.dir)) + script = script.replace("/root/.local/share/droiddeck/apt", str(self.state)) + script = script.replace("/etc/xdg/autostart", str(self.autostart)) + script = script.replace("/usr/share/keyrings", str(self.keys)) + script = script.replace("/etc/apt", str(self.etc)) + self.script = self.top / "remember" + self.script.write_text(script) + + def run_remember(self): + env = dict(os.environ, PATH="%s:%s" % (self.top / "bin", os.environ["PATH"])) + env.pop("DROIDDECK_APT_RESTORING", None) + subprocess.run(["bash", str(self.script)], env=env, check=True, timeout=30) + + def test_user_sources_and_keys_outside_etc_apt_are_kept(self): + (self.etc / "sources.list").write_text("deb http://example.invalid stable main\n") + (self.keys / "example.gpg").write_text("user key") + self.run_remember() + self.assertEqual("vlc\n", (self.state / "packages.txt").read_text()) + self.assertTrue((self.state / "sources/sources.list").is_file()) + self.assertEqual("user key", (self.state / "keyrings" / ("%s_example.gpg" % str(self.keys).lstrip("/").replace("/", "_"))).read_text()) + self.assertFalse(any("ubuntu-archive" in p.name for p in (self.state / "keyrings").iterdir())) + + def test_the_previous_runtime_snapshot_waits_for_the_desktop_restore(self): + (self.autostart / "droiddeck-apt-restore.desktop").write_text("") + self.state.mkdir() + (self.state / "packages.txt").write_text("old-app\n") + (self.state / "restored").write_text("old\n") + self.run_remember() + self.assertEqual("old-app\n", (self.state / "packages.txt").read_text()) + (self.state / "attempted").write_text("new\n") + self.run_remember() + self.assertEqual("vlc\n", (self.state / "packages.txt").read_text()) + + def test_without_the_desktop_the_snapshot_follows_the_runtime(self): + self.state.mkdir() + (self.state / "packages.txt").write_text("old-app\n") + (self.state / "restored").write_text("old\n") + self.run_remember() + self.assertEqual("vlc\n", (self.state / "packages.txt").read_text()) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_bwrap_lock.py b/tools/tests/test_bwrap_lock.py new file mode 100644 index 0000000000..6bd39dd31e --- /dev/null +++ b/tools/tests/test_bwrap_lock.py @@ -0,0 +1,107 @@ +import json +import os +import runpy +import socket +import struct +import subprocess +import sys +import tempfile +import threading +import unittest +from pathlib import Path + +BWRAP = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-bwrap" + +PROBE = """ +import fcntl, os, sys +fd = os.open(sys.argv[1], os.O_RDWR) +try: + fcntl.lockf(fd, fcntl.LOCK_EX | fcntl.LOCK_NB) +except OSError: + print("held") +else: + print("free") +""" + + +class BwrapLockFileTest(unittest.TestCase): + def setUp(self): + self.shim = runpy.run_path(str(BWRAP)) + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.instance = Path(self.temp.name) / "instance" + self.instance.mkdir() + (self.instance / ".ref").write_text("") + + def spec(self, *extra): + argv = ["--ro-bind", str(self.instance), "/run/user/1000/.flatpak/7", *extra, "--", "true"] + return self.shim["parse"](argv) + + def probe(self): + return subprocess.run([sys.executable, "-c", PROBE, str(self.instance / ".ref")], + capture_output=True, text=True, timeout=30, check=True).stdout.strip() + + def test_sandbox_paths_resolve_through_the_binds(self): + spec = self.spec() + self.assertEqual(str(self.instance / ".ref"), self.shim["host_path"](spec, "/run/user/1000/.flatpak/7/.ref")) + self.assertEqual("/etc/hosts", self.shim["host_path"](spec, "/etc/hosts")) + + def test_the_instance_lock_is_held_while_the_sandbox_runs(self): + spec = self.spec("--lock-file", "/run/user/1000/.flatpak/7/.ref") + self.assertEqual("free", self.probe()) + self.shim["hold_locks"](spec) + self.assertEqual("held", self.probe()) + + def test_without_a_lock_file_nothing_is_locked(self): + self.shim["hold_locks"](self.spec()) + self.assertEqual("free", self.probe()) + + def test_the_lock_survives_exec(self): + script = ( + "import runpy, sys; shim = runpy.run_path(sys.argv[1]); " + "spec = shim['parse'](['--ro-bind', sys.argv[2], '/run/user/1000/.flatpak/7', " + "'--lock-file', '/run/user/1000/.flatpak/7/.ref', '--', 'true']); " + "shim['hold_locks'](spec); " + "import os; os.execv(sys.executable, [sys.executable, '-c', " + "'import subprocess, sys; print(subprocess.run([sys.executable, \"-c\", sys.argv[1], sys.argv[2]], " + "capture_output=True, text=True).stdout.strip())', sys.argv[3], sys.argv[4]])" + ) + out = subprocess.run([sys.executable, "-c", script, str(BWRAP), str(self.instance), PROBE, + str(self.instance / ".ref")], capture_output=True, text=True, timeout=30, check=True) + self.assertEqual("held", out.stdout.strip()) + + +class BwrapReportedPidTest(unittest.TestCase): + def test_flatpak_is_given_the_wrapper_so_killing_it_ends_the_whole_sandbox(self): + name = "droiddeck-bwrap-test-%d" % os.getpid() + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind("\0" + name) + server.listen(1) + self.addCleanup(server.close) + + def answer(): + conn, _ = server.accept() + with conn: + head = conn.recv(5) + size = struct.unpack(">I", head[1:])[0] + while size > 0: + size -= len(conn.recv(size)) + for kind, payload in ((b"P", b"424242"), (b"X", b"0")): + conn.sendall(kind + struct.pack(">I", len(payload)) + payload) + + thread = threading.Thread(target=answer, daemon=True) + thread.start() + read_end, write_end = os.pipe() + env = dict(os.environ, DROIDDECK_BWRAP_SOCKET=name) + proc = subprocess.Popen([sys.executable, str(BWRAP), "--ro-bind", "/", "/elsewhere", "--info-fd", + str(write_end), "--", "true"], env=env, pass_fds=[write_end]) + os.close(write_end) + info = os.read(read_end, 4096) + os.close(read_end) + self.assertEqual(0, proc.wait(30)) + thread.join(5) + self.assertEqual({"child-pid": proc.pid}, json.loads(info)) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_desktop_ime.py b/tools/tests/test_desktop_ime.py new file mode 100644 index 0000000000..7062e8c09b --- /dev/null +++ b/tools/tests/test_desktop_ime.py @@ -0,0 +1,104 @@ +import json +import os +from pathlib import Path +import socket +import struct +import subprocess +import tempfile +import time +import unittest + +IME = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-ime' + + +def message(obj, opcode, payload=b''): + return struct.pack('= seq: + return snapshot + time.sleep(0.02) + self.fail('ime.json never reached seq %d' % seq) + + def test_focus_and_blur_are_reported(self): + self.server.sendall(message(3, 0, struct.pack(' +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef SYS_openat2 +#define SYS_openat2 437 +#endif + +struct how { uint64_t flags, mode, resolve; }; + +int main(int argc, char **argv) { + struct sock_filter filter[] = { + BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, nr)), + BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, SYS_openat2, 0, 1), + BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ERRNO | ENOSYS), + BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW), + }; + struct sock_fprog prog = {sizeof(filter) / sizeof(filter[0]), filter}; + if (argc < 3 || prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) || prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog)) return 3; + int (*call)(int, const char *, struct how *, size_t) = (int (*)(int, const char *, struct how *, size_t))dlsym(RTLD_DEFAULT, "openat2"); + if (!call) return 4; + int dir = open(argv[1], O_PATH | O_DIRECTORY | O_CLOEXEC); + struct how h = {O_WRONLY | O_CREAT | O_EXCL | O_CLOEXEC, 0644, 0x08}; + int fd = call(dir, argv[2], &h, sizeof(h)); + if (fd < 0) { + printf("ERR %d\n", errno); + return 1; + } + printf("OK\n"); + return close(fd); +} +""" + RAW_LOOKUP = r""" #define _GNU_SOURCE #include @@ -326,6 +369,12 @@ class Openat2PreloadTest(unittest.TestCase): LD_PRELOAD="%s:%s" % (cls.lib, cls.tmp / "real/libblfastpath.so"))) except subprocess.TimeoutExpired: cls.fex = None + wrapper = cls.tmp / "wrapper.c" + wrapper.write_text(WRAPPER) + subprocess.run(["cc", "-O2", "-Wall", "-Werror", "-o", str(cls.tmp / "wrapper"), str(wrapper), "-ldl"], check=True) + (cls.tmp / "extract").mkdir() + cls.wrapper = subprocess.run([str(cls.tmp / "wrapper"), str(cls.tmp / "extract"), "file"], capture_output=True, + text=True, timeout=20, env=dict(os.environ, LD_PRELOAD=str(cls.lib))) (cls.tmp / "fex-lookup").mkdir() shutil.copy(cls.tmp / "raw_lookup", cls.tmp / "fex-lookup/FEX") try: @@ -373,6 +422,10 @@ class Openat2PreloadTest(unittest.TestCase): self.assertEqual(self.fex.returncode, 0, self.fex.stderr) self.assertEqual(self.fex.stdout, "inside\n") + def test_the_libc_openat2_wrapper_creates_files_without_openat2(self): + self.assertEqual(self.wrapper.returncode, 0, self.wrapper.stdout + self.wrapper.stderr) + self.assertTrue((self.tmp / "extract/file").exists()) + def test_the_kernel_agrees(self): if self.kernel is None: self.skipTest("this kernel or sandbox has no openat2") diff --git a/tools/tests/test_pacman_shared_files.py b/tools/tests/test_pacman_shared_files.py new file mode 100644 index 0000000000..775688a97d --- /dev/null +++ b/tools/tests/test_pacman_shared_files.py @@ -0,0 +1,71 @@ +import io +import os +import runpy +import subprocess +import tarfile +import tempfile +import unittest +from pathlib import Path + +PACMAN = Path(__file__).resolve().parents[1] / "desktop-kde/overlay/usr/share/droiddeck/pacman" + + +class PacmanSharedFilesTest(unittest.TestCase): + def setUp(self): + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + self.top = Path(temp.name) + + def keep(self, action): + lib = self.top / "lib" + lib.mkdir(exist_ok=True) + script = (PACMAN / "keep").read_text().replace("/var/lib/pacman", str(lib)) + subprocess.run(["bash", "-c", script, "keep", action], check=True, timeout=30) + return lib + + def test_an_upgrade_that_drops_a_shared_file_gets_it_back(self): + shared = self.top / "usr/lib/libshared.so" + shared.parent.mkdir(parents=True) + shared.write_text("shared") + lib = self.top / "lib" + lib.mkdir() + (lib / "droiddeck-shared-files").write_text("%s\n%s\n" % (shared, self.top / "usr/lib/never-there")) + self.keep("save") + shared.unlink() + self.keep("restore") + self.assertEqual("shared", shared.read_text()) + self.assertFalse((self.top / "usr/lib/never-there").exists()) + self.assertFalse((lib / "droiddeck-shared-keep").exists()) + + def test_a_backup_for_a_file_still_missing_survives_the_next_save(self): + shared = self.top / "usr/lib/libshared.so" + shared.parent.mkdir(parents=True) + shared.write_text("shared") + lib = self.top / "lib" + lib.mkdir() + (lib / "droiddeck-shared-files").write_text("%s\n" % shared) + self.keep("save") + shared.unlink() + self.keep("save") + self.keep("restore") + self.assertEqual("shared", shared.read_text()) + + def test_only_identical_files_are_taken_over(self): + adopt = runpy.run_path(str(PACMAN / "adopt"), run_name="adopt") + package = io.BytesIO() + with tarfile.open(fileobj=package, mode="w") as archive: + for name, data in (("same", b"one"), ("different", b"two")): + info = tarfile.TarInfo(name) + info.size = len(data) + archive.addfile(info, io.BytesIO(data)) + (self.top / "same").write_bytes(b"one") + (self.top / "different").write_bytes(b"other") + package.seek(0) + with tarfile.open(fileobj=package) as archive: + members = {m.name: m for m in archive} + self.assertTrue(adopt["same"](archive, members["same"], str(self.top / "same"))) + self.assertFalse(adopt["same"](archive, members["different"], str(self.top / "different"))) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_session_assets.py b/tools/tests/test_session_assets.py index 14052c9d3a..5f7f8675d1 100644 --- a/tools/tests/test_session_assets.py +++ b/tools/tests/test_session_assets.py @@ -43,3 +43,10 @@ class SessionAssetsTest(unittest.TestCase): assets.check_extraction(self.overlay, '')) mapping = '"usr/local/bin/droiddeck-login1" to "usr/local/bin/droiddeck-login1"' self.assertEqual([], assets.check_extraction(self.overlay, mapping)) + + def test_helper_extracted_under_another_name_counts(self): + mapping = '"usr/local/bin/droiddeck-login1" to "usr/local/bin/login1"' + self.assertEqual([], assets.check_extraction(self.overlay, mapping)) + mapping = '"usr/local/bin/droiddeck-login1" to "usr/local/bin/sub/login1"' + self.assertEqual(['not extracted at session start: usr/local/bin/droiddeck-login1'], + assets.check_extraction(self.overlay, mapping)) diff --git a/tools/tests/test_session_log.py b/tools/tests/test_session_log.py index baf5064848..19dbb27165 100644 --- a/tools/tests/test_session_log.py +++ b/tools/tests/test_session_log.py @@ -9,8 +9,8 @@ SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/d def log_redirect(): - match = re.search(r"^\s*(exec > >\(.*\) 2>&1)$", SESSION.read_text(), re.M) - return match.group(1) + match = re.search(r"^\s*(dd=.*)\n\s*(exec > >\(.*\) 2>&1)$", SESSION.read_text(), re.M) + return "%s\n%s" % match.groups() class SessionLogTest(unittest.TestCase): diff --git a/tools/tests/test_steam_desktop_launch.py b/tools/tests/test_steam_desktop_launch.py index 1e40f8e98a..4100b3e79c 100644 --- a/tools/tests/test_steam_desktop_launch.py +++ b/tools/tests/test_steam_desktop_launch.py @@ -57,6 +57,23 @@ class DesktopSteamLaunchTest(unittest.TestCase): self.assertEqual(result.stdout.splitlines()[-1], 'steam://rungameid/501590') self.assertFalse((self.session / 'steam-launch').exists()) + def test_exit_without_a_running_client_starts_nothing(self): + result = self.launch('desktop', 'steam://exit') + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(result.stdout, '') + self.assertFalse((self.session / 'steam-launch').exists()) + + def test_shim_turns_shutdown_into_exit_url(self): + launch = self.root / 'record-launch' + launch.write_text('#!/bin/bash\nprintf "%s\\n" "$@"\n') + launch.chmod(0o755) + shim = self.root / 'shim' + shim.write_text((BIN / 'droiddeck-steam-shim').read_text().replace( + '/usr/local/bin/droiddeck-steam-launch', str(launch))) + result = subprocess.run(['bash', str(shim), '-shutdown'], env=self.env, text=True, capture_output=True) + self.assertEqual(result.returncode, 0, result.stderr) + self.assertEqual(result.stdout.splitlines(), ['desktop', 'steam://exit']) + def test_second_click_forwards_without_another_supervisor(self): lock = self.root / 'cache/droiddeck/steam-desktop.lock' lock.parent.mkdir(parents=True) diff --git a/tools/tests/test_steam_restart_cap.py b/tools/tests/test_steam_restart_cap.py index 1763bc77f1..d8c3e63d33 100644 --- a/tools/tests/test_steam_restart_cap.py +++ b/tools/tests/test_steam_restart_cap.py @@ -1,5 +1,7 @@ import re +import shlex import subprocess +import tempfile import unittest from pathlib import Path @@ -20,6 +22,30 @@ class SteamRestartCapTest(unittest.TestCase): return subprocess.run(["bash", "-c", script], capture_output=True, text=True, timeout=30, check=True).stdout.split() + def installs(self, *steps): + function = stuck_function() + self.assertIsNotNone(function, "droiddeck-session has no steam_update_stuck()") + with tempfile.TemporaryDirectory() as root: + script = function + "steam_root=%s\nmkdir -p \"$steam_root/package\"\n" % shlex.quote(root) + script += "installed=\"$steam_root/package/steam_client_linuxarm64.installed\"\n" + script += "echo 0 > \"$installed\"\nsteam_updates=0\nsteam_installs=0\n" + script += "steam_update_stamp=$(stat -c '%n %Y %s' \"$steam_root\"/package/*.installed)\n" + for n, installed in enumerate(steps, 1): + if installed: + script += "printf '%%0%dd' 0 > \"$installed\"\n" % (n + 1) + script += "if steam_update_stuck 10; then echo stop; else echo restart; fi\n" + return subprocess.run(["bash", "-c", script], capture_output=True, text=True, timeout=30, + check=True).stdout.split() + + def test_restarts_that_each_install_an_update_go_on(self): + self.assertEqual(["restart"] * 4, self.installs(True, False, True, False)) + + def test_an_update_that_never_installs_is_stopped_on_the_third(self): + self.assertEqual(["restart", "restart", "stop"], self.installs(False, False, False)) + + def test_installs_that_never_settle_are_stopped(self): + self.assertIn("stop", self.installs(*[True] * 12)) + def test_an_update_that_keeps_asking_at_once_is_stopped_on_the_third(self): self.assertEqual(["restart", "restart", "stop"], self.restarts(11, 13, 9)) diff --git a/tools/tests/test_su_wrapper.py b/tools/tests/test_su_wrapper.py new file mode 100644 index 0000000000..215420bdbb --- /dev/null +++ b/tools/tests/test_su_wrapper.py @@ -0,0 +1,53 @@ +import getpass +import os +import subprocess +import tempfile +import unittest +from pathlib import Path + +SU = Path(__file__).resolve().parents[1] / "ubuntu/overlay-runtime/usr/local/bin/su" + + +class SuWrapperTest(unittest.TestCase): + def setUp(self): + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + self.dir = Path(temp.name) + sudo = self.dir / "sudo" + sudo.write_text("#!/bin/bash\nprintf 'sudo'; printf ' <%s>' \"$@\"; echo\n") + sudo.chmod(0o755) + self.su = self.dir / "su" + self.su.write_text(SU.read_text().replace("/usr/local/bin/sudo", str(sudo))) + self.su.chmod(0o755) + + def run_su(self, *args): + env = dict(os.environ, SHELL="/bin/bash") + return subprocess.run([str(self.su), *args], capture_output=True, text=True, timeout=30, env=env) + + def test_a_command_after_the_user_reaches_the_root_shell(self): + out = self.run_su("root", "-c", "echo hi") + self.assertEqual("sudo <-s> \n", out.stdout) + + def test_the_current_user_is_not_elevated(self): + out = self.run_su(getpass.getuser(), "-c", "echo as-me") + if getpass.getuser() == "root": + self.assertEqual("sudo <-s> \n", out.stdout) + else: + self.assertEqual("as-me\n", out.stdout) + + def test_arguments_after_the_user_go_to_the_shell(self): + out = self.run_su("-", "root", "-c", "echo $0 $1", "zero", "one") + self.assertEqual("sudo <-i> <-c> \n", out.stdout) + + def test_other_users_are_refused(self): + out = self.run_su("droiddeck-nobody-here") + self.assertEqual(1, out.returncode) + self.assertEqual("", out.stdout) + + def test_plain_su_opens_a_root_shell(self): + self.assertEqual("sudo <-s>\n", self.run_su().stdout) + self.assertEqual("sudo <-i>\n", self.run_su("-").stdout) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/ubuntu/README.md b/tools/ubuntu/README.md new file mode 100644 index 0000000000..ceea395c55 --- /dev/null +++ b/tools/ubuntu/README.md @@ -0,0 +1,48 @@ +# The Linux runtime (Ubuntu) + +DroidDeck's Linux runtime: Ubuntu 26.04 LTS for arm64, with Kubuntu's Plasma desktop as a separate download, set up as +SteamOS's desktop mode (Valve's Vapor theme, the Steam Deck wallpaper, "Return to Gaming Mode" and +Steam on the desktop). The app installs it into `files/linuxfs` and runs it under its patched proot. + +- `build-debs.sh` (run in an `ubuntu:26.04` container on an arm64 runner) rebuilds two Ubuntu source + packages: Mesa with `-Dfreedreno-kmds=msm,kgsl`, so Turnip and freedreno reach Android's + `/dev/kgsl-3d0`, and KWin with `patches/kwin` (nested desktop scale, an explicit render node, + scroll source/discrete forwarding). Both get a `+droiddeck` version. `patches/mesa` adds KGSL + UBWC 5/6 (backported from upstream Mesa) and the KGSL device numbers for WSI (from + [Droid-Deck/Drivers](https://github.com/Droid-Deck/Drivers)). +- The runtime's built-in Vulkan driver is DroidDeck's DD-Turnip Linux build (`DD_TURNIP_URL` and + `DD_TURNIP_SHA256` in `base.env`): Ubuntu's Turnip is diverted to `libvulkan_freedreno.so.distrib` + because it lacks the Adreno 8xx fixes. Zink, EGL and llvmpipe stay Ubuntu's. +- `build.sh` verifies Ubuntu's base image (`base.env`: signed `SHA256SUMS` from cdimage plus the + pinned hash), chroots into it and runs `setup.sh` twice. The `runtime` stage is everything gaming + mode needs; it is packed as `.tar.zst`. The `desktop` stage then adds Plasma on top, and + `desktop-pack.py` packs only what that stage added or changed as `-desktop.tar.zst`, so the + desktop shares every runtime file instead of shipping its own copy. The runtime carries + `usr/share/droiddeck/desktop-pack.json` (tag, URL, hash, size) naming its matching desktop pack. +- `setup.sh runtime` installs `packages-runtime.txt` without recommends and the `+droiddeck` debs from + a local repository in `/var/lib/droiddeck/apt` (pinned at 1001 and held), then builds the + `droiddeck-runtime` package from `overlay-runtime/`. `setup.sh desktop` installs + `packages-desktop.txt`, Firefox from Mozilla's apt repository (`mozilla.asc`, fingerprint + 35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3) and builds `droiddeck-desktop` from `overlay-desktop/`. + Both packages are Protected, depend on `protected-*.txt`, own our files and divert any Ubuntu file + they replace, so apt neither removes the essentials nor overwrites our settings on upgrade. +- The desktop pack's `usr/share/droiddeck/desktop/files.tsv.gz` lists each path the desktop added + (N), changed (C) or removed (R), and `originals/` keeps the runtime's copies of changed and removed + files. Removing the desktop restores those and deletes the added files the user has not changed; + a runtime update replaces the tree, and the desktop is downloaded again when it is next opened. + +At run time: + +- `sudo`, `su`, `pkexec` and apt/aptitude (for commands that change the system) go through + `droiddeck-root`: the app runs them in a separate proot with `-0 --link2symlink`, passing the + caller's terminal, so dpkg gets root ownership emulation and hard links while the desktop keeps + the fast path. PackageKit (Discover) and polkit are started the same way by the session's system + bus (`/usr/share/droiddeck/system-services`). +- `apt/remember` (a `DPkg::Post-Invoke` hook) keeps the packages, sources and keys the user added in + `~/.local/share/droiddeck/apt`; `apt/restore` (autostarted) puts them back after a runtime update. +- The installer turns the image's hard links into proot's link2symlink layout, and proot shows the + linked name as `/proc/self/exe` (patch 0020), so Ubuntu's multi-call coreutils work. + +`.github/workflows/build-ubuntu-runtime.yml` builds it and, run with a new tag (`ubuntu-rN`), +publishes the runtime and its desktop pack in Droid-Deck/DroidDeck-Components; `linuxfs-ubuntu.json` there names the release the +app installs. diff --git a/tools/ubuntu/apt/apt.conf.d/50droiddeck b/tools/ubuntu/apt/apt.conf.d/50droiddeck new file mode 100644 index 0000000000..695a3c48c3 --- /dev/null +++ b/tools/ubuntu/apt/apt.conf.d/50droiddeck @@ -0,0 +1,5 @@ +APT::Install-Recommends "true"; +APT::Sandbox::User "root"; +Dpkg::Options { "--force-confdef"; "--force-confold"; }; +DPkg::Post-Invoke { "[ ! -x /usr/share/droiddeck/apt/remember ] || /usr/share/droiddeck/apt/remember"; }; +APT::Update::Post-Invoke { "[ ! -x /usr/share/droiddeck/apt/remember ] || /usr/share/droiddeck/apt/remember"; }; diff --git a/tools/ubuntu/apt/preferences.d/droiddeck b/tools/ubuntu/apt/preferences.d/droiddeck new file mode 100644 index 0000000000..33a7c36794 --- /dev/null +++ b/tools/ubuntu/apt/preferences.d/droiddeck @@ -0,0 +1,3 @@ +Package: plymouth plymouth-* grub-* initramfs-tools initramfs-tools-* cryptsetup-initramfs linux-image-* linux-headers-* linux-modules-* linux-generic* apport whoopsie +Pin: release * +Pin-Priority: -1 diff --git a/tools/ubuntu/base.env b/tools/ubuntu/base.env new file mode 100644 index 0000000000..3d5de326c6 --- /dev/null +++ b/tools/ubuntu/base.env @@ -0,0 +1,5 @@ +UBUNTU_BASE_URL=https://cdimage.ubuntu.com/ubuntu-base/releases/26.04/release/ubuntu-base-26.04.1-base-arm64.tar.gz +UBUNTU_BASE_SHA256=5a1906794ced63a71a8119c3f211ef5f0bbe0a243001b4bbd41fdf80c5b219fd +UBUNTU_CDIMAGE_KEY=843938DF228D22F7B3742BC0D94AA3F0EFE21092 +DD_TURNIP_URL=https://github.com/Droid-Deck/Drivers-CI/releases/download/DD-Turnip-v0.3.4/DD-Turnip-v0.3.4.zip +DD_TURNIP_SHA256=81db74cff1bf6568581cfd79203bec22f48856006aeac09e9e0a3eb3f9416fc1 diff --git a/tools/ubuntu/build-debs.sh b/tools/ubuntu/build-debs.sh new file mode 100755 index 0000000000..ab54b2e6d8 --- /dev/null +++ b/tools/ubuntu/build-debs.sh @@ -0,0 +1,36 @@ +#!/bin/bash +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +out=$(realpath -m "${1:?out dir}") +export DEBIAN_FRONTEND=noninteractive LANG=C.UTF-8 DEBEMAIL=maxjividen@gmail.com DEBFULLNAME=maxjivi05 +export DEB_BUILD_OPTIONS="nocheck noddebs parallel=$(nproc)" +sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources +apt-get update -qq +apt-get install -y -qq build-essential devscripts equivs patch >/dev/null +mkdir -p "$out" +work=$(mktemp -d) +cd "$work" + +apt-get source -qq mesa +cd mesa-*/ +sed -i '0,/GALLIUM_DRIVERS += freedreno/s//GALLIUM_DRIVERS += freedreno\n\tconfflags_GALLIUM += -Dfreedreno-kmds=msm,kgsl/' debian/rules +grep -q 'freedreno-kmds=msm,kgsl' debian/rules +for p in "$here"/patches/mesa/*.patch; do patch -p1 --forward < "$p"; done +dch -l +droiddeck -D resolute "Enable the KGSL kernel interface for freedreno and Turnip." +apt-get build-dep -y -qq ./ >/dev/null +dpkg-buildpackage -b -uc -us >"$work/mesa.log" 2>&1 || { tail -80 "$work/mesa.log"; exit 1; } +cd "$work" + +apt-get source -qq kwin +cd kwin-*/ +for p in "$here"/patches/kwin/*.patch; do patch -p1 --forward < "$p"; done +dch -l +droiddeck -D resolute "Scale nested outputs, open the selected render node, forward scroll details." +apt-get build-dep -y -qq ./ >/dev/null +dpkg-buildpackage -b -uc -us >"$work/kwin.log" 2>&1 || { tail -80 "$work/kwin.log"; exit 1; } +cd "$work" + +for deb in *.deb; do + case $deb in *-dbgsym_*) continue ;; esac + cp "$deb" "$out/" +done +ls -l "$out" diff --git a/tools/ubuntu/build.sh b/tools/ubuntu/build.sh new file mode 100755 index 0000000000..6c920efbc0 --- /dev/null +++ b/tools/ubuntu/build.sh @@ -0,0 +1,72 @@ +#!/bin/bash +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +debs=$(realpath "${1:?directory with the DroidDeck-built .deb files}") +out=$(realpath -m "${2:?out dir}") +runtime_id=${3:?runtime id, e.g. ubuntu-r1} +[ "$(uname -m)" = aarch64 ] || { echo 'the Ubuntu runtime needs a native arm64 runner' >&2; exit 1; } +source "$here/base.env" +fetch() { curl -fsSL --proto '=https' --proto-redir '=https' --retry 6 --retry-delay 5 --retry-all-errors -o "$1" "$2"; } +work=$(mktemp -d) +root=$work/root +cleanup() { + for m in dev/pts dev proc sys; do sudo umount "$root/$m" 2>/dev/null || true; done + sudo rm -rf "$work" +} +trap cleanup EXIT +mkdir -p "$root" "$out" +base=$work/base.tar.gz +fetch "$base" "$UBUNTU_BASE_URL" +fetch "$work/SHA256SUMS" "${UBUNTU_BASE_URL%/*}/SHA256SUMS" +fetch "$work/SHA256SUMS.gpg" "${UBUNTU_BASE_URL%/*}/SHA256SUMS.gpg" +gpgv --status-fd 1 --keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg "$work/SHA256SUMS.gpg" "$work/SHA256SUMS" 2>/dev/null \ + | grep -Eq "^\[GNUPG:\] VALIDSIG .* $UBUNTU_CDIMAGE_KEY\$" +grep -q "^$UBUNTU_BASE_SHA256 \*${UBUNTU_BASE_URL##*/}\$" "$work/SHA256SUMS" +echo "$UBUNTU_BASE_SHA256 $base" | sha256sum -c - >/dev/null + +sudo tar -xzf "$base" -C "$root" --numeric-owner +sudo cp /etc/resolv.conf "$root/etc/resolv.conf" +for m in dev dev/pts proc sys; do sudo mount --bind "/$m" "$root/$m"; done +sudo mkdir -p "$root/tmp/droiddeck/debs" +sudo cp -r "$here/." "$root/tmp/droiddeck/src" +sudo cp "$debs"/*.deb "$root/tmp/droiddeck/debs/" +base_url=${DESKTOP_BASE_URL:-https://github.com/Droid-Deck/DroidDeck-Components/releases/download/$runtime_id} +desktop_id=$runtime_id-desktop +stage() { + sudo chroot "$root" /bin/bash /tmp/droiddeck/src/setup.sh /tmp/droiddeck/debs "$runtime_id" "$1" +} +seal() { + for m in dev/pts dev proc sys; do sudo umount "$root/$m"; done + sudo rm -f "$root/etc/resolv.conf" + printf 'nameserver 1.1.1.1\nnameserver 8.8.8.8\n' | sudo tee "$root/etc/resolv.conf" >/dev/null +} +unseal() { + sudo cp /etc/resolv.conf "$root/etc/resolv.conf" + for m in dev dev/pts proc sys; do sudo mount --bind "/$m" "$root/$m"; done +} + +stage runtime +seal +sudo mv "$root/tmp/droiddeck" "$work/src-keep" +sudo chroot "$root" dpkg-query -W -f '${Package} ${Version}\n' > "$out/$runtime_id.packages.txt" +sudo tar -C "$root" --numeric-owner -cf "$work/runtime.tar" . +sudo python3 "$here/desktop-pack.py" manifest "$root" "$work/runtime.manifest" +unseal +sudo mv "$work/src-keep" "$root/tmp/droiddeck" +stage desktop +seal +sudo rm -rf "$root/tmp/droiddeck" +sudo chroot "$root" dpkg-query -W -f '${Package} ${Version}\n' > "$out/$desktop_id.packages.txt" +sudo python3 "$here/desktop-pack.py" pack "$root" "$work/runtime.manifest" "$work/runtime.tar" "$work/desktop.tar" "$work/meta" +sudo zstd -q -19 -T0 --rm "$work/desktop.tar" -o "$out/$desktop_id.tar.zst" +sudo chown "$(id -u):$(id -g)" "$out/$desktop_id.tar.zst" +sha256sum "$out/$desktop_id.tar.zst" | cut -d' ' -f1 > "$out/$desktop_id.sha256" + +mkdir -p "$work/stamp" +python3 "$here/desktop-pack.py" describe "$out/$desktop_id.tar.zst" "$base_url/$desktop_id.tar.zst" "$desktop_id" \ + "$work/stamp/usr/share/droiddeck/desktop-pack.json" +sudo tar -C "$work/stamp" --numeric-owner --owner=0 --group=0 -rf "$work/runtime.tar" ./usr/share/droiddeck/desktop-pack.json +sudo zstd -q -19 -T0 --rm "$work/runtime.tar" -o "$out/$runtime_id.tar.zst" +sudo chown "$(id -u):$(id -g)" "$out/$runtime_id.tar.zst" +sha256sum "$out/$runtime_id.tar.zst" | cut -d' ' -f1 > "$out/$runtime_id.sha256" +ls -l "$out" diff --git a/tools/ubuntu/desktop-pack.py b/tools/ubuntu/desktop-pack.py new file mode 100644 index 0000000000..794b8815e3 --- /dev/null +++ b/tools/ubuntu/desktop-pack.py @@ -0,0 +1,128 @@ +#!/usr/bin/env python3 +import gzip +import hashlib +import json +import os +import stat +import subprocess +import sys + +SKIP = {"proc", "sys", "dev", "run", "tmp", "var/tmp", "var/log", "var/cache/apt", "var/lib/apt/lists", + "etc/resolv.conf", "etc/machine-id", "var/lib/dbus/machine-id"} +META = "usr/share/droiddeck/desktop" + + +def walk(root): + out = {} + for top, dirs, files in os.walk(root): + rel_top = os.path.relpath(top, root) + rel_top = "" if rel_top == "." else rel_top + dirs[:] = [d for d in dirs if os.path.join(rel_top, d) not in SKIP] + for name in dirs + files: + rel = os.path.join(rel_top, name) + if rel in SKIP or name.startswith(".l2s."): + continue + st = os.lstat(os.path.join(root, rel)) + if stat.S_ISDIR(st.st_mode): + out[rel] = ("d", 0, st.st_mode & 0o7777, "", 0) + elif stat.S_ISLNK(st.st_mode): + out[rel] = ("l", 0, 0, os.readlink(os.path.join(root, rel)), 0) + elif stat.S_ISREG(st.st_mode): + out[rel] = ("f", st.st_size, st.st_mode & 0o7777, "%d.%d" % (st.st_ino, st.st_mtime_ns), 0) + return out + + +def sha256(path): + h = hashlib.sha256() + with open(path, "rb") as f: + for block in iter(lambda: f.read(1 << 20), b""): + h.update(block) + return h.hexdigest() + + +def save(manifest, path): + with open(path, "w") as f: + for rel, (kind, size, mode, extra, _) in sorted(manifest.items()): + f.write("%s\t%d\t%o\t%s\t%s\n" % (kind, size, mode, extra, rel)) + + +def load(path): + out = {} + with open(path) as f: + for line in f: + kind, size, mode, extra, rel = line.rstrip("\n").split("\t", 4) + if os.path.basename(rel).startswith(".l2s."): + continue + out[rel] = (kind, int(size), int(mode, 8), extra, 0) + return out + + +def describe(root, rel, entry): + kind, size, _, extra, _ = entry + if kind == "f": + return "F\t%d\t%s" % (size, sha256(os.path.join(root, rel))) + if kind == "l": + return "L\t0\t%s" % extra + return "D\t0\t-" + + +def pack(root, before_path, runtime_tar, out_tar, meta_root): + before = load(before_path) + after = walk(root) + added = sorted(p for p in after if p not in before) + changed = sorted(p for p in after if p in before and after[p][:4] != before[p][:4] and after[p][0] != "d") + removed = sorted(p for p in before if p not in after) + if any(p.startswith(META + "/") or p == META for p in added + changed + removed): + sys.exit("the desktop stage must not write " + META) + meta = os.path.join(meta_root, META) + originals = os.path.join(meta, "originals") + os.makedirs(originals, exist_ok=True) + restore = [p for p in changed + removed if before[p][0] != "d"] + if restore: + listing = os.path.join(meta_root, "restore.list") + with open(listing, "w") as f: + f.write("".join("./%s\n" % p for p in restore)) + subprocess.run(["tar", "-xf", runtime_tar, "-C", originals, "--numeric-owner", "--no-recursion", "-T", listing], check=True) + os.unlink(listing) + with gzip.open(os.path.join(meta, "files.tsv.gz"), "wt") as f: + for p in added: + f.write("N\t%s\t%s\n" % (describe(root, p, after[p]), p)) + for p in changed: + f.write("C\t%s\t%s\n" % (describe(root, p, after[p]), p)) + for p in removed: + f.write("R\t%s\t%s\n" % (describe(originals, p, before[p]) if before[p][0] != "d" else "D\t0\t-", p)) + listing = os.path.join(meta_root, "pack.list") + with open(listing, "w") as f: + f.write("".join("./%s\n" % p for p in added + changed)) + metalist = os.path.join(meta_root, "meta.list") + with open(metalist, "w") as f: + for top, dirs, files in os.walk(meta): + for name in dirs + files: + f.write("./%s\n" % os.path.relpath(os.path.join(top, name), meta_root)) + f.write("./%s\n" % META) + subprocess.run(["tar", "--numeric-owner", "--no-recursion", "--hard-dereference", "-cf", out_tar, "-C", root, "-T", listing, + "-C", meta_root, "-T", metalist], check=True) + os.unlink(listing) + os.unlink(metalist) + print("desktop pack: %d added, %d changed, %d removed" % (len(added), len(changed), len(removed))) + + +def describe_pack(archive, url, tag, out): + digest = sha256(archive) + size = os.path.getsize(archive) + os.makedirs(os.path.dirname(out), exist_ok=True) + with open(out, "w") as f: + json.dump({"tag": tag, "url": url, "sha256": digest, "size": size}, f, indent=2) + f.write("\n") + + +if __name__ == "__main__": + command = sys.argv[1] if len(sys.argv) > 1 else "" + if command == "manifest" and len(sys.argv) == 4: + save(walk(sys.argv[2]), sys.argv[3]) + elif command == "pack" and len(sys.argv) == 7: + pack(*sys.argv[2:]) + elif command == "describe" and len(sys.argv) == 6: + describe_pack(*sys.argv[2:]) + else: + sys.exit("usage: desktop-pack.py manifest ROOT OUT | pack ROOT BEFORE RUNTIME_TAR OUT_TAR META_ROOT | describe ARCHIVE URL TAG OUT_JSON") diff --git a/tools/ubuntu/mozilla.asc b/tools/ubuntu/mozilla.asc new file mode 100644 index 0000000000..1e2a71ed06 --- /dev/null +++ b/tools/ubuntu/mozilla.asc @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +xsBNBGCRt7MBCADkYJHHQQoL6tKrW/LbmfR9ljz7ib2aWno4JO3VKQvLwjyUMPpq +/SXXMOnx8jXwgWizpPxQYDRJ0SQXS9ULJ1hXRL/OgMnZAYvYDeV2jBnKsAIEdiG/ +e1qm8P4W9qpWJc+hNq7FOT13RzGWRx57SdLWSXo0KeY38r9lvjjOmT/cuOcmjwlD +T9XYf/RSO+yJ/AsyMdAr+ZbDeQUd9HYJiPdI04lGaGM02MjDMnx+monc+y54t+Z+ +ry1WtQdzoQt9dHlIPlV1tR+xV5DHHsejCZxu9TWzzSlL5wfBBeEz7R/OIzivGJpW +QdJzd+2QDXSRg9q2XYWP5ZVtSgjVVJjNlb6ZABEBAAHNVEFydGlmYWN0IFJlZ2lz +dHJ5IFJlcG9zaXRvcnkgU2lnbmVyIDxhcnRpZmFjdC1yZWdpc3RyeS1yZXBvc2l0 +b3J5LXNpZ25lckBnb29nbGUuY29tPsLAjgQTAQoAOBYhBDW6oLM+nrOW9ZyoOMC6 +XObcYxWjBQJgkbezAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEMC6XObc +YxWj+igIAMFh6DrAYMeq9sbZ1ZG6oAMrinUheGQbEqe76nIDQNsZnhDwZ2wWqgVC +7DgOMqlhQmOmzm7M6Nzmq2dvPwq3xC2OeI9fQyzjT72deBTzLP7PJok9PJFOMdLf +ILSsUnmMsheQt4DUO0jYAX2KUuWOIXXJaZ319QyoRNBPYa5qz7qXS7wHLOY89IDq +fHt6Aud8ER5zhyOyhytcYMeaGC1g1IKWmgewnhEq02FantMJGlmmFi2eA0EPD02G +C3742QGqRxLwjWsm5/TpyuU24EYKRGCRm7QdVIo3ugFSetKrn0byOxWGBvtu4fH8 +XWvZkRT+u+yzH1s5yFYBqc2JTrrJvRU= +=QnvN +-----END PGP PUBLIC KEY BLOCK----- diff --git a/tools/ubuntu/overlay-desktop/etc/dpkg/dpkg.cfg.d/droiddeck b/tools/ubuntu/overlay-desktop/etc/dpkg/dpkg.cfg.d/droiddeck new file mode 100644 index 0000000000..64326de6ce --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/dpkg/dpkg.cfg.d/droiddeck @@ -0,0 +1 @@ +path-exclude=/etc/skel/Desktop/* diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/autostart/droiddeck-apt-restore.desktop b/tools/ubuntu/overlay-desktop/etc/xdg/autostart/droiddeck-apt-restore.desktop new file mode 100644 index 0000000000..0a5a357cbd --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/autostart/droiddeck-apt-restore.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=DroidDeck software restore +Exec=/usr/share/droiddeck/apt/restore +NoDisplay=true +X-KDE-autostart-phase=2 +OnlyShowIn=KDE; diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/baloofilerc b/tools/ubuntu/overlay-desktop/etc/xdg/baloofilerc new file mode 100644 index 0000000000..1735f7a8d4 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/baloofilerc @@ -0,0 +1,2 @@ +[Basic Settings] +Indexing-Enabled=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/gtk-3.0/settings.ini b/tools/ubuntu/overlay-desktop/etc/xdg/gtk-3.0/settings.ini new file mode 100644 index 0000000000..3d33a8a939 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/gtk-3.0/settings.ini @@ -0,0 +1,5 @@ +[Settings] +gtk-theme-name=Breeze-Dark +gtk-icon-theme-name=breeze-dark +gtk-font-name=Noto Sans 11 +gtk-application-prefer-dark-theme=true diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kcminputrc b/tools/ubuntu/overlay-desktop/etc/xdg/kcminputrc new file mode 100644 index 0000000000..bdac20ee38 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kcminputrc @@ -0,0 +1,5 @@ +[Mouse] +cursorTheme=breeze_cursors + +[Libinput][Defaults] +PointerAccelerationProfile=1 diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kded6rc b/tools/ubuntu/overlay-desktop/etc/xdg/kded6rc new file mode 100644 index 0000000000..3db443cde1 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kded6rc @@ -0,0 +1,8 @@ +[Module-bluedevil] +autoload=false + +[Module-kded_bolt] +autoload=false + +[Module-smart] +autoload=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kdeglobals b/tools/ubuntu/overlay-desktop/etc/xdg/kdeglobals new file mode 100644 index 0000000000..d8ba273a48 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kdeglobals @@ -0,0 +1,24 @@ +[KDE] +LookAndFeelPackage=com.valve.vapor.desktop +SingleClick=false +widgetStyle=Breeze + +[General] +ColorScheme=Vapor +font=Noto Sans,11,-1,5,50,0,0,0,0,0 +menuFont=Noto Sans,11,-1,5,50,0,0,0,0,0 +smallestReadableFont=Noto Sans,9,-1,5,50,0,0,0,0,0 +toolBarFont=Noto Sans,11,-1,5,50,0,0,0,0,0 +fixed=Noto Sans Mono,11,-1,5,50,0,0,0,0,0 + +[Icons] +Theme=breeze-dark + +[KDE Action Restrictions][$i] +action/switch_user=false +action/start_new_session=false +action/lock_screen=false + +[KDE Control Module Restrictions][$i] +kcm_sddm.desktop=false +kcm_plymouth.desktop=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/konsolerc b/tools/ubuntu/overlay-desktop/etc/xdg/konsolerc new file mode 100644 index 0000000000..f93c61af6f --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/konsolerc @@ -0,0 +1,2 @@ +[Desktop Entry] +DefaultProfile=Vapor.profile diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kscreenlockerrc b/tools/ubuntu/overlay-desktop/etc/xdg/kscreenlockerrc new file mode 100644 index 0000000000..8a52bc54ce --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kscreenlockerrc @@ -0,0 +1,3 @@ +[Daemon] +Autolock=false +LockOnResume=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/ksmserverrc b/tools/ubuntu/overlay-desktop/etc/xdg/ksmserverrc new file mode 100644 index 0000000000..b47cc8917c --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/ksmserverrc @@ -0,0 +1,2 @@ +[General] +loginMode=emptySession diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/ksplashrc b/tools/ubuntu/overlay-desktop/etc/xdg/ksplashrc new file mode 100644 index 0000000000..c252676bf0 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/ksplashrc @@ -0,0 +1,3 @@ +[KSplash] +Engine=none +Theme=None diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kwalletrc b/tools/ubuntu/overlay-desktop/etc/xdg/kwalletrc new file mode 100644 index 0000000000..3f28331ef6 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kwalletrc @@ -0,0 +1,3 @@ +[Wallet] +Enabled=false +First Use=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kwinrc b/tools/ubuntu/overlay-desktop/etc/xdg/kwinrc new file mode 100644 index 0000000000..f9656dd00e --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kwinrc @@ -0,0 +1,12 @@ +[org.kde.kdecoration2] +library=org.kde.breeze + +[WindowSwitcher] +LayoutName=org.kde.breeze.desktop + +[DesktopSwitcher] +LayoutName=org.kde.breeze.desktop + +[Plugins] +blurEnabled=false +contrastEnabled=false diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/kwinrulesrc b/tools/ubuntu/overlay-desktop/etc/xdg/kwinrulesrc new file mode 100644 index 0000000000..bd7a15c1ad --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/kwinrulesrc @@ -0,0 +1,32 @@ +[$Version] +update_info=kwinrules.upd:replace-placement-string-to-enum,kwinrules.upd:use-virtual-desktop-ids + +[1] +Description=Window settings for Steam Keyboard +above=true +aboverule=2 +acceptfocusrule=2 +skiptaskbar=true +skiptaskbarrule=2 +title=Steam Keyboard +types=256 +typerule=2 +wmclass=steamwebhelper steam +wmclasscomplete=true +wmclassmatch=2 + +[9bd6e503-ac60-4e7b-9131-0b10c84b37eb] +Description=Window settings for Steam Keyboard +above=true +aboverule=2 +title=Steam Keyboard +titlematch=2 +type=16 +typerule=2 +wmclass=steam +wmclasscomplete=true +wmclassmatch=2 + +[General] +count=1 +rules=1 diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/plasmarc b/tools/ubuntu/overlay-desktop/etc/xdg/plasmarc new file mode 100644 index 0000000000..c2a661e5d6 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/plasmarc @@ -0,0 +1,2 @@ +[Theme] +name=Vapor diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/powerdevilrc b/tools/ubuntu/overlay-desktop/etc/xdg/powerdevilrc new file mode 100644 index 0000000000..98636006a3 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/powerdevilrc @@ -0,0 +1,20 @@ +[AC][Display] +DimDisplayWhenIdle=false +TurnOffDisplayWhenIdle=false + +[AC][SuspendAndShutdown] +AutoSuspendAction=0 + +[Battery][Display] +DimDisplayWhenIdle=false +TurnOffDisplayWhenIdle=false + +[Battery][SuspendAndShutdown] +AutoSuspendAction=0 + +[LowBattery][Display] +DimDisplayWhenIdle=false +TurnOffDisplayWhenIdle=false + +[LowBattery][SuspendAndShutdown] +AutoSuspendAction=0 diff --git a/tools/ubuntu/overlay-desktop/etc/xdg/startkderc b/tools/ubuntu/overlay-desktop/etc/xdg/startkderc new file mode 100644 index 0000000000..2ebf976ad5 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/etc/xdg/startkderc @@ -0,0 +1,2 @@ +[General] +systemdBoot=false diff --git a/tools/ubuntu/overlay-desktop/usr/local/bin/droiddeck-polkitd b/tools/ubuntu/overlay-desktop/usr/local/bin/droiddeck-polkitd new file mode 100755 index 0000000000..8d472afd65 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/local/bin/droiddeck-polkitd @@ -0,0 +1,92 @@ +#!/usr/bin/python3 +from gi.repository import Gio, GLib + +XML = """ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +""" + +REPLIES = { + "EnumerateActions": GLib.Variant("(a(ssssssuuua{ss}))", ([],)), + "CheckAuthorization": GLib.Variant("((bba{ss}))", ((True, False, {}),)), + "EnumerateTemporaryAuthorizations": GLib.Variant("(a(ss(sa{sv})tt))", ([],)), +} +PROPERTIES = { + "BackendName": GLib.Variant("s", "droiddeck"), + "BackendVersion": GLib.Variant("s", "1"), + "BackendFeatures": GLib.Variant("u", 1), +} + + +def call(connection, sender, path, interface, method, parameters, invocation): + invocation.return_value(REPLIES.get(method)) + + +def get_property(connection, sender, path, interface, name): + return PROPERTIES.get(name) + + +def acquired(connection, name): + info = Gio.DBusNodeInfo.new_for_xml(XML).interfaces[0] + connection.register_object("/org/freedesktop/PolicyKit1/Authority", info, call, get_property, None) + + +loop = GLib.MainLoop() +Gio.bus_own_name(Gio.BusType.SYSTEM, "org.freedesktop.PolicyKit1", Gio.BusNameOwnerFlags.NONE, + acquired, None, lambda *a: loop.quit()) +loop.run() diff --git a/tools/ubuntu/overlay-desktop/usr/share/applications/droiddeck-return-gaming.desktop b/tools/ubuntu/overlay-desktop/usr/share/applications/droiddeck-return-gaming.desktop new file mode 100644 index 0000000000..67f1d7f218 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/applications/droiddeck-return-gaming.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Return to Gaming Mode +Comment=Log out of the desktop and go back to Steam +Exec=dbus-send --session --type=method_call --dest=org.kde.Shutdown /Shutdown org.kde.Shutdown.logout +Icon=steamdeck-gaming-return +Terminal=false +Type=Application +StartupNotify=false +NoDisplay=true diff --git a/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-bigpicture.desktop b/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-bigpicture.desktop new file mode 100644 index 0000000000..98c3b27b10 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-bigpicture.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Steam Big Picture +Comment=The Steam client, full screen with a controller +Exec=/usr/local/bin/steamdeck-steam bigpicture +Icon=steam +Terminal=false +Categories=Game; diff --git a/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-steam.desktop b/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-steam.desktop new file mode 100644 index 0000000000..794c1e4482 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/applications/steamdeck-steam.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Steam +Comment=The Steam client, in a window +Exec=/usr/local/bin/steamdeck-steam desktop +Icon=steam +Terminal=false +Categories=Game; diff --git a/tools/ubuntu/overlay-desktop/usr/share/color-schemes/Vapor.colors b/tools/ubuntu/overlay-desktop/usr/share/color-schemes/Vapor.colors new file mode 100644 index 0000000000..820af1df32 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/color-schemes/Vapor.colors @@ -0,0 +1,119 @@ +[ColorEffects:Disabled] +Color=56,56,56 +ColorAmount=0 +ColorEffect=0 +ContrastAmount=0.65 +ContrastEffect=1 +IntensityAmount=0.1 +IntensityEffect=2 + +[ColorEffects:Inactive] +ChangeSelectionColor=true +Color=112,111,110 +ColorAmount=0.025 +ColorEffect=2 +ContrastAmount=0.1 +ContrastEffect=2 +Enable=false +IntensityAmount=0 +IntensityEffect=0 + +[Colors:Button] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Complementary] +BackgroundAlternate=59,64,69 +BackgroundNormal=49,54,59 +DecorationFocus=30,146,255 +DecorationHover=61,174,230 +ForegroundActive=246,116,0 +ForegroundInactive=175,176,179 +ForegroundLink=61,174,230 +ForegroundNegative=237,21,21 +ForegroundNeutral=201,206,59 +ForegroundNormal=239,240,241 +ForegroundPositive=17,209,22 +ForegroundVisited=61,174,230 + +[Colors:Selection] +BackgroundAlternate=29,153,243 +BackgroundNormal=86,159,204 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=252,252,252 +ForegroundInactive=239,240,241 +ForegroundLink=253,188,75 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=31,31,38 +ForegroundPositive=126,166,75 +ForegroundVisited=189,195,199 + +[Colors:Tooltip] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:View] +BackgroundAlternate=26,33,42 +BackgroundNormal=21,28,35 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Window] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=241,241,242 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[General] +ColorScheme=Breeze Dark +Name=Vapor +shadeSortColumn=true + +[KDE] +contrast=4 + +[WM] +activeBackground=36,39,47 +activeBlend=255,255,255 +activeForeground=239,240,241 +inactiveBackground=36,39,44 +inactiveBlend=74,83,101 +inactiveForeground=127,140,141 diff --git a/tools/ubuntu/overlay-desktop/usr/share/dbus-1/services/org.bluez.obex.service b/tools/ubuntu/overlay-desktop/usr/share/dbus-1/services/org.bluez.obex.service new file mode 100644 index 0000000000..5919feb45c --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/dbus-1/services/org.bluez.obex.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.bluez.obex +Exec=/bin/false diff --git a/tools/ubuntu/overlay-desktop/usr/share/droiddeck/kwin-compositor b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/kwin-compositor new file mode 100644 index 0000000000..a6797bf627 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/kwin-compositor @@ -0,0 +1 @@ +opengl diff --git a/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PackageKit.service b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PackageKit.service new file mode 100644 index 0000000000..b131073b50 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PackageKit.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.PackageKit +Exec=/usr/local/bin/droiddeck-root /usr/libexec/packagekitd diff --git a/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PolicyKit1.service b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PolicyKit1.service new file mode 100644 index 0000000000..0f9e5620d0 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/droiddeck/system-services/org.freedesktop.PolicyKit1.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.PolicyKit1 +Exec=/usr/local/bin/droiddeck-polkitd diff --git a/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/actions/steamdeck-gaming-return.svg b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/actions/steamdeck-gaming-return.svg new file mode 100644 index 0000000000..96d426607e --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/actions/steamdeck-gaming-return.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/apps/steam.svg b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/apps/steam.svg new file mode 100644 index 0000000000..d5926b262e --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/apps/steam.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/places/distributor-logo-steamdeck.svg b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/places/distributor-logo-steamdeck.svg new file mode 100644 index 0000000000..b0ac005cbe --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/icons/hicolor/scalable/places/distributor-logo-steamdeck.svg @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.colorscheme b/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.colorscheme new file mode 100644 index 0000000000..91f6921c8f --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.colorscheme @@ -0,0 +1,94 @@ +[Background] +Color=21,27,33 + +[BackgroundFaint] +Color=22,32,45 + +[BackgroundIntense] +Color=19,46,69 + +[Color0] +Color=21,27,33 + +[Color0Faint] +Color=49,54,59 + +[Color0Intense] +Color=127,140,141 + +[Color1] +Color=237,21,21 + +[Color1Faint] +Color=120,50,40 + +[Color1Intense] +Color=192,57,43 + +[Color2] +Color=71,146,176 + +[Color2Faint] +Color=52,108,146 + +[Color2Intense] +Color=171,207,228 + +[Color3] +Color=246,116,0 + +[Color3Faint] +Color=182,86,25 + +[Color3Intense] +Color=253,188,75 + +[Color4] +Color=29,153,243 + +[Color4Faint] +Color=27,102,143 + +[Color4Intense] +Color=61,174,233 + +[Color5] +Color=155,89,182 + +[Color5Faint] +Color=97,74,115 + +[Color5Intense] +Color=142,68,173 + +[Color6] +Color=227,255,194 + +[Color6Faint] +Color=91,118,56 + +[Color6Intense] +Color=141,189,85 + +[Color7] +Color=239,240,241 + +[Color7Faint] +Color=99,104,109 + +[Color7Intense] +Color=252,252,252 + +[Foreground] +Color=239,240,241 + +[ForegroundFaint] +Color=220,230,231 + +[ForegroundIntense] +Color=252,252,252 + +[General] +Description=SteamOS +Opacity=0.9 +Wallpaper= diff --git a/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.profile b/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.profile new file mode 100644 index 0000000000..b4557e15e1 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/konsole/Vapor.profile @@ -0,0 +1,6 @@ +[Appearance] +ColorScheme=Vapor + +[General] +Name=Vapor +Parent=FALLBACK/ diff --git a/tools/ubuntu/overlay-desktop/usr/share/licenses/droiddeck-desktop/NOTICE b/tools/ubuntu/overlay-desktop/usr/share/licenses/droiddeck-desktop/NOTICE new file mode 100644 index 0000000000..7a5fd044e8 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/licenses/droiddeck-desktop/NOTICE @@ -0,0 +1,19 @@ +Third-party files in DroidDeck's Ubuntu runtime (tools/ubuntu/overlay): + +- Vapor (color scheme, Plasma theme, look-and-feel package, Konsole profile and color scheme) and the + steamdeck-gaming-return / distributor-logo-steamdeck icons: Valve's steamdeck-kde-presets + (https://github.com/Jovian-Experiments/steamdeck-kde-presets), GPL-2.0-or-later (look-and-feel) + and GPL-3.0 (Plasma theme), as their metadata states. The look-and-feel package's defaults, setup + scripts and layout were adapted for DroidDeck; its Plasma 5 splash screen was left out. +- steam.svg: Papirus icon theme (https://github.com/PapirusDevelopmentTeam/papirus-icon-theme), + GPL-3.0. + +- KWin (kwin-wayland and related packages, version +droiddeck): Kubuntu's KWin source package, + GPL-2.0-or-later, rebuilt with tools/ubuntu/patches/kwin. Corresponding source: `apt source kwin` + plus those patches (https://github.com/Droid-Deck/DroidDeck/tree/main/tools/ubuntu/patches/kwin). +- Mesa (packages with version +droiddeck): Ubuntu's Mesa source package, MIT and others, rebuilt with + the freedreno KGSL kernel interface enabled (tools/ubuntu/build-debs.sh). Corresponding source: + `apt source mesa`. + +Everything else in the runtime is Ubuntu's own packages, under their own licenses +(/usr/share/doc/*/copyright). diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/colors b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/colors new file mode 100644 index 0000000000..673d46a284 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/colors @@ -0,0 +1,147 @@ +[ColorEffects:Disabled] +Color=56,56,56 +ColorAmount=0 +ColorEffect=0 +ContrastAmount=0.65 +ContrastEffect=1 +IntensityAmount=0.1 +IntensityEffect=2 + +[ColorEffects:Inactive] +ChangeSelectionColor=true +Color=112,111,110 +ColorAmount=0.025 +ColorEffect=2 +ContrastAmount=0.1 +ContrastEffect=2 +Enable=false +IntensityAmount=0 +IntensityEffect=0 + +[Colors:Button] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Complementary] +BackgroundAlternate=59,64,69 +BackgroundNormal=49,54,59 +DecorationFocus=30,146,255 +DecorationHover=61,174,230 +ForegroundActive=246,116,0 +ForegroundInactive=175,176,179 +ForegroundLink=61,174,230 +ForegroundNegative=237,21,21 +ForegroundNeutral=201,206,59 +ForegroundNormal=239,240,241 +ForegroundPositive=17,209,22 +ForegroundVisited=61,174,230 + +[Colors:Selection] +BackgroundAlternate=29,153,243 +BackgroundNormal=86,159,204 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=252,252,252 +ForegroundInactive=239,240,241 +ForegroundLink=253,188,75 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=31,31,38 +ForegroundPositive=126,166,75 +ForegroundVisited=189,195,199 + +[Colors:Tooltip] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:View] +BackgroundAlternate=26,33,42 +BackgroundNormal=21,28,35 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=239,240,241 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Window] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=241,241,242 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Header] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=241,241,242 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[Colors:Header][Inactive] +BackgroundAlternate=77,77,77 +BackgroundNormal=36,39,44 +DecorationFocus=52,108,146 +DecorationHover=85,161,205 +ForegroundActive=61,174,233 +ForegroundInactive=189,195,199 +ForegroundLink=41,128,185 +ForegroundNegative=218,68,83 +ForegroundNeutral=199,130,61 +ForegroundNormal=241,241,242 +ForegroundPositive=126,166,75 +ForegroundVisited=127,140,141 + +[General] +ColorScheme=Vapor +Name=Vapor +shadeSortColumn=true + +[KDE] +contrast=4 + +[WM] +activeBackground=36,39,47 +activeBlend=255,255,255 +activeForeground=239,240,241 +inactiveBackground=36,39,44 +inactiveBlend=74,83,101 +inactiveForeground=127,140,141 diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/metadata.json b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/metadata.json new file mode 100644 index 0000000000..53e9f86420 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/metadata.json @@ -0,0 +1,13 @@ +{ + "KPlugin": { + "Authors": [{ "Name": "Valve" }], + "Category": "Plasma Theme", + "Description": "Vapor - SteamOS Theme based on KDE Breeze and Breath", + "EnabledByDefault": true, + "Id": "Vapor", + "License": "GPL-3.0", + "Name": "Vapor", + "Version": "0.0.17" + }, + "X-Plasma-API": "5.0" +} diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/widgets/plasmoidheading.svg b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/widgets/plasmoidheading.svg new file mode 100644 index 0000000000..4d92847799 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/desktoptheme/Vapor/widgets/plasmoidheading.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/defaults b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/defaults new file mode 100644 index 0000000000..2e46cd938f --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/defaults @@ -0,0 +1,27 @@ +[kdeglobals][KDE] +widgetStyle=Breeze + +[kdeglobals][General] +ColorScheme=Vapor + +[kdeglobals][Icons] +Theme=breeze-dark + +[plasmarc][Theme] +name=Vapor + +[kcminputrc][Mouse] +cursorTheme=breeze_cursors + +[kwinrc][WindowSwitcher] +LayoutName=org.kde.breeze.desktop + +[kwinrc][DesktopSwitcher] +LayoutName=org.kde.breeze.desktop + +[kwinrc][org.kde.kdecoration2] +library=org.kde.breeze + +[KSplash] +Engine=none +Theme=None diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/icons/deck_icon.png b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/icons/deck_icon.png new file mode 100644 index 0000000000..7e596c00ca Binary files /dev/null and b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/icons/deck_icon.png differ diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js new file mode 100644 index 0000000000..37b6dc3bb7 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/layouts/org.kde.plasma.desktop-layout.js @@ -0,0 +1,53 @@ +var desktops = desktopsForActivity(currentActivity()); +for (var i = 0; i < desktops.length; i++) { + desktops[i].wallpaperPlugin = "org.kde.image"; + desktops[i].currentConfigGroup = ["Wallpaper", "org.kde.image", "General"]; + desktops[i].writeConfig("Image", "file:///usr/share/wallpapers/DroidDeck"); +} + +var dock = new Panel; +dock.location = "bottom"; +dock.height = 2 * Math.ceil(gridUnit * 2.5 / 2); + +var kickoff = dock.addWidget("org.kde.plasma.kickoff"); +kickoff.currentConfigGroup = ["Shortcuts"]; +kickoff.writeConfig("global", "Alt+F1"); +kickoff.currentConfigGroup = ["General"]; +kickoff.writeConfig("icon", "distributor-logo-steamdeck"); +kickoff.writeConfig("favorites", [ + "preferred://browser", + "applications:org.kde.dolphin.desktop", + "applications:org.kde.konsole.desktop", + "applications:org.kde.kate.desktop", + "applications:org.kde.discover.desktop", + "applications:systemsettings.desktop", +]); + +var tasks = dock.addWidget("org.kde.plasma.icontasks"); +tasks.currentConfigGroup = ["General"]; +tasks.writeConfig("launchers", [ + "applications:steamdeck-steam.desktop", + "preferred://filemanager", + "preferred://browser", + "applications:org.kde.konsole.desktop", + "applications:org.kde.kate.desktop", +]); + +var bar = new Panel; +bar.location = "top"; +bar.height = 2 * Math.ceil(gridUnit * 1.6 / 2); +bar.addWidget("org.kde.plasma.pager"); +bar.addWidget("org.kde.plasma.panelspacer"); +var clock = bar.addWidget("org.kde.plasma.digitalclock"); +clock.currentConfigGroup = ["Appearance"]; +clock.writeConfig("dateFormat", "isoDate"); +clock.writeConfig("showDate", true); +bar.addWidget("org.kde.plasma.panelspacer"); +var tray = bar.addWidget("org.kde.plasma.systemtray"); +var trayId = tray.readConfig("SystrayContainmentId"); +if (trayId) { + var trayContainment = desktopById(trayId); + trayContainment.currentConfigGroup = ["General"]; + trayContainment.writeConfig("scaleIconsToFit", true); +} +bar.addWidget("org.kde.plasma.showdesktop"); diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js new file mode 100644 index 0000000000..4baaa9a591 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js @@ -0,0 +1,4 @@ +applet.wallpaperPlugin = 'org.kde.image' +applet.currentConfigGroup = ["Wallpaper", "org.kde.image", "General"] +applet.writeConfig("Image", "file:///usr/share/wallpapers/DroidDeck") +applet.reloadConfig() diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js new file mode 100644 index 0000000000..2ef00cb570 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js @@ -0,0 +1,3 @@ +applet.currentConfigGroup = ["General"] +applet.writeConfig("icon", "distributor-logo-steamdeck") +applet.reloadConfig() diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js new file mode 100644 index 0000000000..7eaae7a1c7 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.systemtray.js @@ -0,0 +1,6 @@ +systemtrayId = applet.readConfig("SystrayContainmentId"); +if (systemtrayId) { + const systrayContainer = desktopById(systemtrayId); + systrayContainer.currentConfigGroup = ["General"]; + systrayContainer.writeConfig("scaleIconsToFit", true); +} diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/previews/preview.png b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/previews/preview.png new file mode 100644 index 0000000000..708bcf3126 Binary files /dev/null and b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/previews/preview.png differ diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/metadata.json b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/metadata.json new file mode 100644 index 0000000000..5a0cdc78b9 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/metadata.json @@ -0,0 +1,22 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "", + "Name": "Valve" + } + ], + "Category": "", + "Description": "Vapor - SteamOS theme variant of KDE BreezeDark", + "Id": "com.valve.vapor.desktop", + "License": "GPLv2+", + "Name": "Vapor", + "ServiceTypes": [ + "Plasma/LookAndFeel" + ], + "Version": "0.01", + "Website": "" + }, + "X-KDE-ParentApp": "", + "X-Plasma-MainScript": "defaults" +} diff --git a/tools/ubuntu/overlay-desktop/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js b/tools/ubuntu/overlay-desktop/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js new file mode 100644 index 0000000000..ee53846083 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/droiddeck-text-editor.js @@ -0,0 +1,11 @@ +panels().forEach(function (panel) { + panel.widgets("org.kde.plasma.icontasks").forEach(function (tasks) { + tasks.currentConfigGroup = ["General"]; + var launchers = tasks.readConfig("launchers"); + if (typeof launchers === "string") launchers = launchers.length ? launchers.split(",") : []; + if (launchers.indexOf("applications:org.kde.kate.desktop") < 0) { + launchers.push("applications:org.kde.kate.desktop"); + tasks.writeConfig("launchers", launchers); + } + }); +}); diff --git a/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/contents/images/1920x1080.svg b/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/contents/images/1920x1080.svg new file mode 100644 index 0000000000..2293971231 --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/contents/images/1920x1080.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/metadata.json b/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/metadata.json new file mode 100644 index 0000000000..c4431e01ca --- /dev/null +++ b/tools/ubuntu/overlay-desktop/usr/share/wallpapers/DroidDeck/metadata.json @@ -0,0 +1,8 @@ +{ + "KPlugin": { + "Authors": [{ "Name": "DroidDeck" }], + "Id": "DroidDeck", + "License": "GPL-3.0-or-later", + "Name": "DroidDeck" + } +} diff --git a/tools/ubuntu/overlay-runtime/etc/pulse/client.conf.d/droiddeck.conf b/tools/ubuntu/overlay-runtime/etc/pulse/client.conf.d/droiddeck.conf new file mode 100644 index 0000000000..207e152eb7 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/etc/pulse/client.conf.d/droiddeck.conf @@ -0,0 +1 @@ +autospawn = no diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/apt b/tools/ubuntu/overlay-runtime/usr/local/bin/apt new file mode 100755 index 0000000000..3a3cfe6857 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/apt @@ -0,0 +1,15 @@ +#!/bin/bash +if [ "$(id -u)" != 0 ]; then + skip=0 + for arg in "$@"; do + [ "$skip" = 1 ] && { skip=0; continue; } + case $arg in + -o|-t|-c|-a|--option|--target-release|--default-release|--config-file|--host-architecture) skip=1; continue ;; + -*) continue ;; + install|reinstall|remove|purge|upgrade|full-upgrade|dist-upgrade|update|autoremove|autopurge|autoclean|clean|build-dep|satisfy|edit-sources|markauto|unmarkauto|safe-upgrade|forget-new|hold|unhold|keep|keep-all) + exec /usr/local/bin/sudo /usr/bin/apt "$@" ;; + esac + break + done +fi +exec /usr/bin/apt "$@" diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/apt-get b/tools/ubuntu/overlay-runtime/usr/local/bin/apt-get new file mode 100755 index 0000000000..85cbc0289a --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/apt-get @@ -0,0 +1,15 @@ +#!/bin/bash +if [ "$(id -u)" != 0 ]; then + skip=0 + for arg in "$@"; do + [ "$skip" = 1 ] && { skip=0; continue; } + case $arg in + -o|-t|-c|-a|--option|--target-release|--default-release|--config-file|--host-architecture) skip=1; continue ;; + -*) continue ;; + install|reinstall|remove|purge|upgrade|full-upgrade|dist-upgrade|update|autoremove|autopurge|autoclean|clean|build-dep|satisfy|edit-sources|markauto|unmarkauto|safe-upgrade|forget-new|hold|unhold|keep|keep-all) + exec /usr/local/bin/sudo /usr/bin/apt-get "$@" ;; + esac + break + done +fi +exec /usr/bin/apt-get "$@" diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/aptitude b/tools/ubuntu/overlay-runtime/usr/local/bin/aptitude new file mode 100755 index 0000000000..1f14363c7b --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/aptitude @@ -0,0 +1,15 @@ +#!/bin/bash +if [ "$(id -u)" != 0 ]; then + skip=0 + for arg in "$@"; do + [ "$skip" = 1 ] && { skip=0; continue; } + case $arg in + -o|-t|-c|-a|--option|--target-release|--default-release|--config-file|--host-architecture) skip=1; continue ;; + -*) continue ;; + install|reinstall|remove|purge|upgrade|full-upgrade|dist-upgrade|update|autoremove|autopurge|autoclean|clean|build-dep|satisfy|edit-sources|markauto|unmarkauto|safe-upgrade|forget-new|hold|unhold|keep|keep-all) + exec /usr/local/bin/sudo /usr/bin/aptitude "$@" ;; + esac + break + done +fi +exec /usr/bin/aptitude "$@" diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/pkexec b/tools/ubuntu/overlay-runtime/usr/local/bin/pkexec new file mode 100755 index 0000000000..c447280d8b --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/pkexec @@ -0,0 +1,14 @@ +#!/bin/bash +while [ $# -gt 0 ]; do + case $1 in + --version) echo "pkexec version 126 (droiddeck)"; exit 0 ;; + --help) echo "usage: pkexec [--user username] [PROGRAM] [ARGUMENTS...]"; exit 0 ;; + --disable-internal-agent|--keep-cwd) shift ;; + --user) [ $# -ge 2 ] || exit 127; case $2 in root|0) ;; *) echo "pkexec: no user $2" >&2; exit 127 ;; esac; shift 2 ;; + --) shift; break ;; + *) break ;; + esac +done +[ $# -gt 0 ] || set -- "$(getent passwd root | cut -d: -f7)" +[ "$(id -u)" = 0 ] && exec "$@" +exec /usr/local/bin/droiddeck-root "$@" diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/su b/tools/ubuntu/overlay-runtime/usr/local/bin/su new file mode 100755 index 0000000000..ad520ee451 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/su @@ -0,0 +1,43 @@ +#!/bin/bash +login=0 command= shell= user= named=0 +while [ $# -gt 0 ]; do + case $1 in + -|-l|--login) login=1; shift ;; + -c|--command) [ $# -ge 2 ] || { echo "su: option requires an argument -- 'c'" >&2; exit 1; }; command=$2; shift 2 ;; + --command=*) command=${1#*=}; shift ;; + -s|--shell) [ $# -ge 2 ] || { echo "su: option requires an argument -- 's'" >&2; exit 1; }; shell=$2; shift 2 ;; + --shell=*) shell=${1#*=}; shift ;; + -m|-p|--preserve-environment|-P|--pty|-f|--fast) shift ;; + -h|--help) echo "usage: su [-] [-c command] [-s shell] [root]"; exit 0 ;; + -V|--version) echo "DroidDeck su: runs a root shell inside the DroidDeck desktop"; exit 0 ;; + --) shift; break ;; + -*) echo "su: invalid option -- '${1#-}'" >&2; exit 1 ;; + *) [ "$named" = 1 ] && break; user=$1; named=1; shift ;; + esac +done +if [ "$named" = 0 ] && [ $# -gt 0 ]; then user=$1; shift; fi +user=${user:-root} +me=$(id -un 2>/dev/null) +case $user in + root|0) ;; + "$me") + run=${shell:-${SHELL:-/bin/bash}} + if [ -n "$command" ]; then exec "$run" -c "$command" "$@"; fi + [ "$login" = 1 ] && exec "$run" -l "$@" + exec "$run" "$@" + ;; + *) echo "su: user $user does not exist or the user entry does not contain all the required fields" >&2; exit 1 ;; +esac +args=() +[ "$login" = 1 ] && args+=(-i) +if [ -n "$shell" ]; then + if [ -n "$command" ]; then exec /usr/local/bin/sudo "${args[@]}" "$shell" -c "$command" "$@"; fi + exec /usr/local/bin/sudo "${args[@]}" "$shell" "$@" +fi +if [ -n "$command" ]; then + [ $# -eq 0 ] && exec /usr/local/bin/sudo "${args[@]}" -s "$command" + exec /usr/local/bin/sudo "${args[@]}" /bin/bash -c "$command" "$@" +fi +[ $# -gt 0 ] && exec /usr/local/bin/sudo "${args[@]}" /bin/bash "$@" +[ "$login" = 1 ] && exec /usr/local/bin/sudo -i +exec /usr/local/bin/sudo -s diff --git a/tools/ubuntu/overlay-runtime/usr/local/bin/sudo b/tools/ubuntu/overlay-runtime/usr/local/bin/sudo new file mode 100755 index 0000000000..d6f0fb6dc4 --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/local/bin/sudo @@ -0,0 +1,90 @@ +#!/bin/bash +me=${0##*/} +usage() { + echo "usage: $me [-EHiknsSv] [-u user] [-g group] [-D directory] [--] command [arg ...]" + echo " $me -e file ..." +} +known_user() { + case $1 in + ''|root|0|'#0'|"$(id -un 2>/dev/null)"|"#$(id -ru 2>/dev/null)") return 0 ;; + esac + echo "$me: unknown user $1" >&2 + exit 1 +} + +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games +login=0 shell=0 edit=0 background=0 dir= +[ "$me" = sudoedit ] && edit=1 +while [ $# -gt 0 ]; do + case $1 in + --) shift; break ;; + -h|--help) usage; exit 0 ;; + -V|--version) echo "DroidDeck sudo: runs commands as root inside the DroidDeck desktop"; exit 0 ;; + -l|--list) echo "User $(id -un 2>/dev/null) may run the following commands on $(uname -n):"; echo " (ALL : ALL) ALL"; exit 0 ;; + -v|--validate|-K|--remove-timestamp) exit 0 ;; + -k|--reset-timestamp) shift; [ $# -eq 0 ] && exit 0 ;; + -i|--login) login=1; shift ;; + -s|--shell) shell=1; shift ;; + -e|--edit) edit=1; shift ;; + -b|--background) background=1; shift ;; + -E|--preserve-env|--preserve-env=*|-H|--set-home|-n|--non-interactive|-S|--stdin|-P|--preserve-groups|-A|--askpass|-B|--bell|-N|--no-update) shift ;; + -u|--user|-g|--group) [ $# -ge 2 ] || { usage >&2; exit 1; }; known_user "$2"; shift 2 ;; + --user=*|--group=*) known_user "${1#*=}"; shift ;; + -u*|-g*) known_user "${1:2}"; shift ;; + -D|--chdir) [ $# -ge 2 ] || { usage >&2; exit 1; }; dir=$2; shift 2 ;; + --chdir=*) dir=${1#*=}; shift ;; + -p|--prompt|-C|--close-from|-r|--role|-t|--type|-T|--command-timeout|-R|--chroot) [ $# -ge 2 ] || { usage >&2; exit 1; }; shift 2 ;; + --prompt=*|--close-from=*|--role=*|--type=*|--command-timeout=*) shift ;; + -[A-Za-z][A-Za-z]*) + flags=${1#-}; shift + split=() + while [ -n "$flags" ]; do + split+=("-${flags:0:1}") + case ${flags:0:1} in + u|g|D|p|C|r|t|T|R) [ -n "${flags:1}" ] && split+=("${flags:1}"); flags= ;; + *) flags=${flags:1} ;; + esac + done + set -- "${split[@]}" "$@" + ;; + -*) echo "$me: invalid option -- '${1#-}'" >&2; usage >&2; exit 1 ;; + *) break ;; + esac +done + +if [ "$edit" = 1 ]; then + [ $# -gt 0 ] || { usage >&2; exit 1; } + editor=${SUDO_EDITOR:-${VISUAL:-${EDITOR:-nano}}} + exec $editor "$@" +fi + +export SUDO_USER=${SUDO_USER:-$(id -un 2>/dev/null)} +export SUDO_UID=${SUDO_UID:-$(id -ru 2>/dev/null)} +export SUDO_GID=${SUDO_GID:-$(id -rg 2>/dev/null)} +export SUDO_COMMAND="$*" USER=root LOGNAME=root +[ -z "$dir" ] || cd "$dir" || exit 1 + +target_shell=$(getent passwd "$(id -un 2>/dev/null)" | cut -d: -f7) +target_shell=${target_shell:-/bin/bash} +if [ "$login" = 1 ]; then + cd "${HOME:-/root}" 2>/dev/null + if [ $# -gt 0 ]; then set -- "$target_shell" -l -c "$*"; else set -- "$target_shell" -l; fi +elif [ "$shell" = 1 ]; then + if [ $# -gt 0 ]; then set -- "${SHELL:-$target_shell}" -c "$*"; else set -- "${SHELL:-$target_shell}"; fi +elif [ $# -eq 0 ]; then + usage >&2 + exit 1 +elif ! command -v "$1" >/dev/null 2>&1; then + echo "$me: $1: command not found" >&2 + exit 1 +fi + +if [ "$(id -u)" = 0 ]; then + [ "$background" = 1 ] && { "$@" & exit 0; } + exec "$@" +fi +if [ "$background" = 1 ]; then + /usr/local/bin/droiddeck-root "$@" /dev/null) +if [ -e /etc/xdg/autostart/droiddeck-apt-restore.desktop ] && [ -s "$state/restored" ] && [ "$(cat "$state/restored")" != "$runtime" ] && [ "$(cat "$state/attempted" 2>/dev/null)" != "$runtime" ]; then + exit 0 +fi +mkdir -p "$state/sources" "$state/keyrings" 2>/dev/null || exit 0 +manual=$(apt-mark showmanual 2>/dev/null) || exit 0 +{ printf '%s\n' "$manual" | grep -vxF -f "$dir/system-manual.txt" || true; } > "$state/packages.txt.tmp" && mv -f "$state/packages.txt.tmp" "$state/packages.txt" +rm -f "$state/sources"/* "$state/keyrings"/* 2>/dev/null +for f in /etc/apt/sources.list /etc/apt/sources.list.d/* /etc/apt/keyrings/* /etc/apt/trusted.gpg.d/* /usr/share/keyrings/*; do + [ -f "$f" ] || continue + grep -qxF "$f $(sha256sum "$f" | cut -d' ' -f1)" "$dir/system-sources.txt" 2>/dev/null && continue + case $f in /etc/apt/sources.list|/etc/apt/sources.list.d/*) to=sources ;; *) to=keyrings ;; esac + name=${f#/etc/apt/} + cp -f "$f" "$state/$to/$(printf '%s' "${name#/}" | tr / _)" +done +[ -s "$state/restored" ] || cat "$dir/runtime-id" > "$state/restored" 2>/dev/null +exit 0 diff --git a/tools/ubuntu/overlay-runtime/usr/share/droiddeck/apt/restore b/tools/ubuntu/overlay-runtime/usr/share/droiddeck/apt/restore new file mode 100755 index 0000000000..6c374e2b8d --- /dev/null +++ b/tools/ubuntu/overlay-runtime/usr/share/droiddeck/apt/restore @@ -0,0 +1,62 @@ +#!/bin/bash +dir=/usr/share/droiddeck/apt +state=/root/.local/share/droiddeck/apt +log=/root/.cache/droiddeck/apt-restore.log +[ -r "$dir/runtime-id" ] || exit 0 +runtime=$(cat "$dir/runtime-id") +[ "$(cat "$state/restored" 2>/dev/null)" = "$runtime" ] && exit 0 +[ "$(cat "$state/attempted" 2>/dev/null)" = "$runtime" ] && exit 0 +mkdir -p "$state" "${log%/*}" +tries=$(cat "$state/tries" 2>/dev/null) +count=0 +[ "${tries% *}" = "$runtime" ] && count=${tries##* } +count=$((count + 1)) +echo "$runtime $count" > "$state/tries" +[ "$count" -ge 3 ] && echo "$runtime" > "$state/attempted" +mapfile -t wanted < <(grep -v '^$' "$state/packages.txt" 2>/dev/null) +have_sources=0 +for f in "$state"/sources/* "$state"/keyrings/*; do [ -f "$f" ] && have_sources=1; done +if [ ${#wanted[@]} -eq 0 ] && [ "$have_sources" = 0 ]; then + echo "$runtime" > "$state/restored" + exit 0 +fi +notify() { notify-send -a DroidDeck -i system-software-update "$@" 2>/dev/null; } +notify "$(droiddeck-text desktop_restore_title)" "$(droiddeck-text desktop_restore_body)" +{ + date + ok=1 + DROIDDECK_APT_RESTORING=1 /usr/local/bin/sudo /bin/bash -s "$state" <<'ROOT' || ok=0 +state=$1 +mapfile -t wanted < <(grep -v '^$' "$state/packages.txt" 2>/dev/null) +for f in "$state"/sources/*; do + [ -f "$f" ] || continue + case $(basename "$f") in + sources.list) cp -f "$f" /etc/apt/sources.list ;; + *) cp -n "$f" "/etc/apt/$(basename "$f" | sed 's#^sources.list.d_#sources.list.d/#')" ;; + esac +done +for f in "$state"/keyrings/*; do + [ -f "$f" ] || continue + name=$(basename "$f") + case $name in keyrings_*) mkdir -p /etc/apt/keyrings; cp -n "$f" "/etc/apt/keyrings/${name#keyrings_}" ;; trusted.gpg.d_*) cp -n "$f" "/etc/apt/trusted.gpg.d/${name#trusted.gpg.d_}" ;; usr_share_keyrings_*) mkdir -p /usr/share/keyrings; cp -n "$f" "/usr/share/keyrings/${name#usr_share_keyrings_}" ;; esac +done +apt-get update || exit 1 +[ ${#wanted[@]} -eq 0 ] && exit 0 +found=() unknown=() +for p in "${wanted[@]}"; do + if apt-cache show "$p" >/dev/null 2>&1; then found+=("$p"); else unknown+=("$p"); fi +done +if [ ${#found[@]} -gt 0 ]; then DEBIAN_FRONTEND=noninteractive apt-get install -y "${found[@]}" || exit 1; fi +if [ ${#unknown[@]} -gt 0 ]; then + printf 'not in any source: %s\n' "${unknown[*]}" + exit 1 +fi +ROOT +} >> "$log" 2>&1 +if [ "$ok" = 1 ]; then + echo "$runtime" > "$state/restored" + notify "$(droiddeck-text desktop_restore_done_title)" "$(droiddeck-text desktop_restore_done_body)" +else + [ ${#wanted[@]} -eq 0 ] || printf 'sudo apt install %s\n' "${wanted[*]}" >> "$log" + notify "$(droiddeck-text desktop_restore_failed_title)" "$(droiddeck-text desktop_restore_failed_body)" +fi diff --git a/tools/ubuntu/packages-desktop.txt b/tools/ubuntu/packages-desktop.txt new file mode 100644 index 0000000000..df725eab90 --- /dev/null +++ b/tools/ubuntu/packages-desktop.txt @@ -0,0 +1,259 @@ +alsa-base +alsa-utils +anacron +appstream +aptitude +ark +at-spi2-core +avahi-daemon +baloo6 +bc +bind9-dnsutils +bluedevil +bluez +bluez-cups +breeze +breeze-gtk-theme +cups +cups-bsd +cups-client +cups-filters +desktop-file-utils +dolphin +dolphin-plugins +drkonqi +e2fsprogs +elisa +fastfetch +ffmpegthumbs +fonts-liberation +fonts-noto-cjk +fonts-noto-extra- +fonts-noto-ui-core +fonts-noto-ui-extra- +fonts-ubuntu +foot +frameworkintegration6 +fwupd- +fwupd-signed- +gdb +genisoimage +ghostscript +gir1.2-gtk-3.0 +git +gstreamer1.0-gl +gstreamer1.0-libav +gstreamer1.0-pipewire +gstreamer1.0-plugins-bad +gstreamer1.0-plugins-base +gstreamer1.0-plugins-good +gstreamer1.0-plugins-ugly +gstreamer1.0-tools +gwenview +haruna +htop +im-config +init-system-helpers +iw +kaccounts-providers +kactivitymanagerd +kate +kcalc +kcharselect +kde-cli-tools +kde-config-gtk-style +kde-config-gtk-style-preview +kde-config-screenlocker +kde-config-tablet +kde-config-updates +kde-spectacle +kde-style-oxygen-qt6 +kdeconnect +kdegraphics-thumbnailers +kdenetwork-filesharing +kdialog +kgamma +khelpcenter +kimageformat6-plugins +kinfocenter +kio-admin +kio-audiocd +kio-extras +kio-fuse +kio6 +kmahjongg +kmenuedit +kmines +konsole +kpat +kscreen +ksshaskpass +ksudoku +ksystemlog +ksystemstats +kubuntu-settings-desktop +kubuntu-wallpapers +kwalletmanager +kwin-addons +kwin-common +kwin-decoration-oxygen +kwin-wayland +kwrited +language-selector-common +layer-shell-qt +libacl1 +libapt-pkg7.0 +libattr1 +libaudit-common +libaudit1 +libayatana-appindicator3-1 +libbsd0 +libcap-ng0 +libcrypt1 +libdb5.3t64 +libdebconfclient0 +libedit2 +libevent-2.1-7t64 +libext2fs2t64 +libfcft4t64 +libgcrypt20 +libglib2.0-bin +libgoogle-perftools4t64 +libgpg-error0 +libgraphene-1.0-0 +libgtk-4-1 +libgupnp-igd-1.6-0 +libhidapi-hidraw0 +libhidapi-libusb0 +liblz4-1 +libmd0 +libmpdec4 +libncursesw6 +libnice10 +libnotify-bin +libpam-modules +libpam-modules-bin +libpam-runtime +libpam0g +libproc2-0 +libqca-qt6-plugins +libqt6svg6 +libsasl2-modules +libsdl2-2.0-0 +libsdl3-0 +libsemanage-common +libsemanage2 +libsepol2 +libsmartcols1 +libspa-0.2-bluetooth +libss2 +libtcmalloc-minimal4t64 +libtinfo6 +libturbojpeg0 +libunwind8 +libutf8proc3 +libva-glx2 +libva-wayland2 +libwebpdecoder3 +libxcb-dri2-0 +libxcb-screensaver0 +libxcb-xf86dri0 +libxcb-xtest0 +libxcb-xvmc0 +libxxhash0 +logsave +man-db +mesa-utils +milou +mobile-broadband-provider-info +mount +neochat +network-manager +network-manager-openconnect +network-manager-openvpn +network-manager-pptp +okular +okular-extra-backends +orca +oxygen-sounds +packagekit +pastebinit +phonon4qt6-backend-vlc +phonon4settings +pinentry-qt +pipewire +pipewire-audio +plasma-browser-integration +plasma-calendar-addons +plasma-dataengines-addons +plasma-desktop +plasma-discover +plasma-discover-backend-flatpak +plasma-discover-backend-fwupd- +plasma-discover-backend-snap +plasma-discover-notifier +plasma-disks +plasma-integration +plasma-keyboard +plasma-nm +plasma-pa +plasma-runners-addons +plasma-session-wayland +plasma-systemmonitor +plasma-theme-oxygen +plasma-vault +plasma-wallpapers-addons +plasma-welcome +plasma-widgets-addons +plasma-workspace +plasma-workspace-wallpapers- +plasma5-integration +plocate +policykit-desktop-privileges +polkit-kde-agent-1 +power-profiles-daemon +powerdevil +ppa-purge +print-manager +python3-dbus +python3-launchpadlib +python3-setuptools +python3-yaml +qml6-module-org-kde-breeze +qml6-module-org-kde-desktop +qml6-module-org-kde-ksysguard +qml6-module-org-kde-pipewire +qml6-module-qt-labs-folderlistmodel +qml6-module-qt5compat-graphicaleffects +qml6-module-qtqml-xmllistmodel +qt6-image-formats-plugins +qt6-translations-l10n +qttranslations5-l10n +remmina +rfkill +signon-kwallet-extension +signon-plugin-oauth2 +signon-ui-qt +signon-ui-service +skanpage +snapd +software-properties-qt +squashfs-tools +synaptic +systemsettings +udisks2 +unrar-free +upower +va-driver-all +vim +vulkan-tools +wireplumber +wl-clipboard +wpasupplicant +xclip +xdg-desktop-portal +xdg-desktop-portal-gtk +xdg-desktop-portal-kde +xdg-user-dirs +xsettingsd +zsync diff --git a/tools/ubuntu/packages-runtime.txt b/tools/ubuntu/packages-runtime.txt new file mode 100644 index 0000000000..95861abeb9 --- /dev/null +++ b/tools/ubuntu/packages-runtime.txt @@ -0,0 +1,231 @@ +7zip +apt +base-files +base-passwd +bash +bsdextrautils +bsdutils +bubblewrap +ca-certificates +coreutils +curl +dash +dbus +dbus-daemon +dbus-x11 +debconf +debianutils +diffutils +dpkg +file +findutils +flatpak +fontconfig +fonts-dejavu-core +fonts-noto-color-emoji +fonts-noto-core +gamescope +gir1.2-flatpak-1.0 +gir1.2-glib-2.0 +gnu-coreutils +gnupg-agent +gpgv +grep +gzip +hostname +iproute2 +iputils-ping +less +libapparmor1 +libarchive-tools +libasound2t64 +libasyncns0 +libatk-bridge2.0-0t64 +libatk1.0-0t64 +libatomic1 +libatspi2.0-0t64 +libavahi-client3 +libavahi-common3 +libblkid1 +libbrotli1 +libbz2-1.0 +libc-bin +libc-gconv-modules-extra +libc6 +libcairo2 +libcap2 +libcom-err2 +libcups2t64 +libdatrie1 +libdbus-1-3 +libdecor-0-0 +libdisplay-info3 +libdrm2 +libegl-mesa0 +libegl1 +libeis1 +libevdev2 +libexpat1 +libffi8 +libflac14 +libfmt10 +libfontconfig1 +libfreetype6 +libfribidi0 +libgbm1 +libgcc-s1 +libgdk-pixbuf-2.0-0 +libgl1 +libgl1-mesa-dri +libgles2 +libglib2.0-0t64 +libglvnd0 +libglx-mesa0 +libglx0 +libglycin-2-0 +libgmp10 +libgnutls30t64 +libgraphite2-3 +libgssapi-krb5-2 +libgtk2.0-0t64 +libgudev-1.0-0 +libharfbuzz0b +libhogweed6t64 +libibus-1.0-5 +libice6 +libidn2-0 +libinput10 +libjsoncpp26 +libk5crypto3 +libkeyutils1 +libkrb5-3 +libkrb5support0 +liblcms2-2 +libliftoff0 +liblua5.4-0 +libluajit-5.1-2 +liblzma5 +libmount1 +libmp3lame0 +libmpg123-0t64 +libmtdev1t64 +libnettle8t64 +libnghttp2-14 +libnm0 +libnspr4 +libnss-mdns +libnss-myhostname +libnss3 +libopenal1 +libopenvr-api2 +libopus0 +libp11-kit0 +libpango-1.0-0 +libpangocairo-1.0-0 +libpangoft2-1.0-0 +libpcre2-8-0 +libpipewire-0.3-0t64 +libpixman-1-0 +libpng16-16t64 +libpulse0 +libsamplerate0 +libsdl2-classic +libseat1 +libseccomp2 +libselinux1 +libsm6 +libsndfile1 +libssh2-1t64 +libssl3t64 +libstdc++6 +libsystemd0 +libtasn1-6 +libthai0 +libudev1 +libunistring5 +libuuid1 +libva2 +libvdpau1 +libvulkan1 +libwacom9 +libwayland-client0 +libwayland-cursor0 +libwayland-egl1 +libwayland-server0 +libwlroots-0.19 +libx11-6 +libx11-xcb1 +libxau6 +libxcb-composite0 +libxcb-dri3-0 +libxcb-errors0 +libxcb-ewmh2 +libxcb-icccm4 +libxcb-present0 +libxcb-render-util0 +libxcb-render0 +libxcb-res0 +libxcb-shm0 +libxcb-xfixes0 +libxcb-xinput0 +libxcb1 +libxcomposite1 +libxcursor1 +libxdamage1 +libxdmcp6 +libxext6 +libxfixes3 +libxi6 +libxinerama1 +libxkbcommon0 +libxml2-16 +libxmu6 +libxrandr2 +libxrender1 +libxres1 +libxss1 +libxt6t64 +libxtst6 +libxxf86vm1 +libzstd1 +locales +locales-all +login +login.defs +lsof +mawk +mesa-libgallium +mesa-vulkan-drivers +nano +ncurses-base +ncurses-bin +openssl-provider-legacy +passwd +perl-base +procps +psmisc +pulseaudio-utils +python3 +python3-gi +python3-zstandard +sed +sensible-utils +strace +sysvinit-utils +tar +tzdata +ubuntu-keyring +unzip +util-linux +util-linux-extra +wayland-utils +wget +x11-utils +x11-xserver-utils +xdg-utils +xkb-data +xwayland +xz-utils +zip +zlib1g +zstd diff --git a/tools/ubuntu/patches/kwin/0001-respect-nested-desktop-scale.patch b/tools/ubuntu/patches/kwin/0001-respect-nested-desktop-scale.patch new file mode 100644 index 0000000000..592cfbf13d --- /dev/null +++ b/tools/ubuntu/patches/kwin/0001-respect-nested-desktop-scale.patch @@ -0,0 +1,183 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 07:28:38 -0400 +Subject: [PATCH] Respect nested desktop scale + +--- + src/backends/wayland/wayland_backend.cpp | 34 +++++++++++++++++++++++----- + src/backends/wayland/wayland_egl_backend.cpp | 4 +++- + src/backends/wayland/wayland_layer.cpp | 2 +- + src/backends/wayland/wayland_output.cpp | 26 ++++++++++++++++---- + src/backends/wayland/wayland_output.h | 2 ++ + 5 files changed, 55 insertions(+), 13 deletions(-) + +diff --git a/src/backends/wayland/wayland_backend.cpp b/src/backends/wayland/wayland_backend.cpp +index 557156e..1f88013 100644 +--- a/src/backends/wayland/wayland_backend.cpp ++++ b/src/backends/wayland/wayland_backend.cpp +@@ -105,8 +105,10 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::Pointer *pointer, Wayla + WaylandOutput *output = m_seat->backend()->findOutput(m_pointer->enteredSurface()); + Q_ASSERT(output); + const auto subsurface = m_seat->backend()->findSubSurface(m_pointer->enteredSurface()); +- const QPointF absolutePos = output->position() + relativeToSurface +- + (subsurface ? subsurface->position() : QPoint()); ++ const QPointF hostPosition = relativeToSurface + (subsurface ? subsurface->position() : QPoint()); ++ const QPointF absolutePos = qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ++ ? output->mapToOutput(hostPosition) ++ : output->position() + hostPosition; + Q_EMIT pointerMotionAbsolute(absolutePos, std::chrono::milliseconds(time), this); + }); + connect(pointer, &Pointer::buttonStateChanged, this, [this](quint32 serial, quint32 time, quint32 button, Pointer::ButtonState nativeState) { +@@ -180,7 +182,15 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::RelativePointer *relati + , m_relativePointer(relativePointer) + { + connect(relativePointer, &RelativePointer::relativeMotion, this, [this](const QSizeF &delta, const QSizeF &deltaNonAccelerated, quint64 timestamp) { +- Q_EMIT pointerMotion(sizeToPoint(delta), sizeToPoint(deltaNonAccelerated), std::chrono::microseconds(timestamp), this); ++ const auto pointer = m_seat->pointerDevice(); ++ const auto output = pointer && pointer->m_pointer ++ ? m_seat->backend()->findOutput(pointer->m_pointer->enteredSurface()) : nullptr; ++ const auto toOutput = [output](const QSizeF &hostDelta) { ++ return output && qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ++ ? output->mapToOutput(sizeToPoint(hostDelta)) - output->mapToOutput(QPointF()) ++ : sizeToPoint(hostDelta); ++ }; ++ Q_EMIT pointerMotion(toOutput(delta), toOutput(deltaNonAccelerated), std::chrono::microseconds(timestamp), this); + }); + } + +@@ -197,13 +207,21 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::Touch *touch, WaylandSe + connect(touch, &Touch::sequenceStarted, this, [this](TouchPoint *tp) { + auto o = m_seat->backend()->findOutput(tp->surface()); + Q_ASSERT(o); +- const QPointF position = o->position() + tp->position(); ++ const auto subsurface = m_seat->backend()->findSubSurface(tp->surface()); ++ const QPointF hostPosition = tp->position() + (subsurface ? subsurface->position() : QPoint()); ++ const QPointF position = qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ++ ? o->mapToOutput(hostPosition) ++ : o->position() + tp->position(); + Q_EMIT touchDown(tp->id(), position, std::chrono::milliseconds(tp->time()), this); + }); + connect(touch, &Touch::pointAdded, this, [this](TouchPoint *tp) { + auto o = m_seat->backend()->findOutput(tp->surface()); + Q_ASSERT(o); +- const QPointF position = o->position() + tp->position(); ++ const auto subsurface = m_seat->backend()->findSubSurface(tp->surface()); ++ const QPointF hostPosition = tp->position() + (subsurface ? subsurface->position() : QPoint()); ++ const QPointF position = qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ++ ? o->mapToOutput(hostPosition) ++ : o->position() + tp->position(); + Q_EMIT touchDown(tp->id(), position, std::chrono::milliseconds(tp->time()), this); + }); + connect(touch, &Touch::pointRemoved, this, [this](TouchPoint *tp) { +@@ -212,7 +230,11 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::Touch *touch, WaylandSe + connect(touch, &Touch::pointMoved, this, [this](TouchPoint *tp) { + auto o = m_seat->backend()->findOutput(tp->surface()); + Q_ASSERT(o); +- const QPointF position = o->position() + tp->position(); ++ const auto subsurface = m_seat->backend()->findSubSurface(tp->surface()); ++ const QPointF hostPosition = tp->position() + (subsurface ? subsurface->position() : QPoint()); ++ const QPointF position = qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ++ ? o->mapToOutput(hostPosition) ++ : o->position() + tp->position(); + Q_EMIT touchMotion(tp->id(), position, std::chrono::milliseconds(tp->time()), this); + }); + } +diff --git a/src/backends/wayland/wayland_egl_backend.cpp b/src/backends/wayland/wayland_egl_backend.cpp +index 66ae1b2..fb17c31 100644 +--- a/src/backends/wayland/wayland_egl_backend.cpp ++++ b/src/backends/wayland/wayland_egl_backend.cpp +@@ -204,7 +204,9 @@ bool WaylandEglCursorLayer::doEndFrame(const Region &renderedDeviceRegion, const + wl_buffer *buffer = m_backend->backend()->importBuffer(m_buffer->buffer()); + Q_ASSERT(buffer); + +- static_cast(m_output.get())->cursor()->update(buffer, m_buffer->buffer()->size() / m_output->scale(), (hotspot() / m_output->scale()).toPoint()); ++ auto output = static_cast(m_output.get()); ++ output->cursor()->update(buffer, m_buffer->buffer()->size() / output->presentationScale(), ++ (hotspot() / output->presentationScale()).toPoint()); + + EGLNativeFence releaseFence{m_backend->eglDisplayObject()}; + m_swapchain->release(m_buffer, releaseFence.takeFileDescriptor()); +diff --git a/src/backends/wayland/wayland_layer.cpp b/src/backends/wayland/wayland_layer.cpp +index 1bc003e..15b1624 100644 +--- a/src/backends/wayland/wayland_layer.cpp ++++ b/src/backends/wayland/wayland_layer.cpp +@@ -93,7 +93,7 @@ void WaylandLayer::commit(PresentationMode presentationMode) + // this is a bit annoying, we need a new Wayland protocol + // to do this properly with fractional scaling. Until we + // have that, it may cause blurriness in some cases! +- const Rect logicalTarget = targetRect().scaled(1.0 / m_output->scale()).rounded(); ++ const Rect logicalTarget = targetRect().scaled(1.0 / static_cast(m_output.get())->presentationScale()).rounded(); + if (m_viewport) { + m_viewport->setSource(sourceRect()); + m_viewport->setDestination(logicalTarget.size()); +diff --git a/src/backends/wayland/wayland_output.cpp b/src/backends/wayland/wayland_output.cpp +index e435266..2bc8ee9 100644 +--- a/src/backends/wayland/wayland_output.cpp ++++ b/src/backends/wayland/wayland_output.cpp +@@ -312,7 +312,7 @@ bool WaylandOutput::present(const QList &layersToUpdate, const st + m_surface->attachBuffer(buffer); + m_mapped = true; + } +- m_viewport->setDestination(QSize(std::round(modeSize().width() / scale()), std::round(modeSize().height() / scale()))); ++ m_viewport->setDestination(QSize(std::round(modeSize().width() / presentationScale()), std::round(modeSize().height() / presentationScale()))); + m_surface->setScale(1); + // commit the subsurfaces before the main surface + for (OutputLayer *layer : layersToUpdate) { +@@ -375,9 +375,10 @@ void WaylandOutput::applyChanges(const OutputConfiguration &config) + next.enabled = props->enabled.value_or(m_state.enabled); + next.transform = props->transform.value_or(m_state.transform); + next.position = props->pos.value_or(m_state.position); +- // intentionally ignored, as it would get overwritten +- // with the fractional scale protocol anyways +- // next.scale = props->scale.value_or(m_state.scale); ++ if (qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE")) { ++ next.scale = props->scale.value_or(m_state.scale); ++ next.scaleSetting = props->scaleSetting.value_or(m_state.scaleSetting); ++ } + next.desiredModeSize = props->desiredModeSize.value_or(m_state.desiredModeSize); + next.desiredModeRefreshRate = props->desiredModeRefreshRate.value_or(m_state.desiredModeRefreshRate); + next.desiredModeFlags = props->desiredModeFlags.value_or(m_state.desiredModeFlags); +@@ -395,6 +396,19 @@ void WaylandOutput::applyChanges(const OutputConfiguration &config) + setState(next); + } + ++qreal WaylandOutput::presentationScale() const ++{ ++ return qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE") ? m_pendingScale : scale(); ++} ++ ++QPointF WaylandOutput::mapToOutput(const QPointF &hostPosition) const ++{ ++ const QPointF inPanel = hostPosition * presentationScale() / scale(); ++ const QSizeF panelSize = QSize(std::round(modeSize().width() / scale()), ++ std::round(modeSize().height() / scale())); ++ return position() + transform().inverted().map(inPanel, panelSize); ++} ++ + bool WaylandOutput::isReady() const + { + return m_ready; +@@ -468,7 +482,9 @@ void WaylandOutput::applyConfigure(const QSize &size, quint32 serial) + State next = m_state; + next.modes = {mode}; + next.currentMode = mode; +- next.scale = m_pendingScale; ++ if (!qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE")) { ++ next.scale = m_pendingScale; ++ } + setState(next); + + Q_EMIT m_backend->outputsQueried(); +diff --git a/src/backends/wayland/wayland_output.h b/src/backends/wayland/wayland_output.h +index 7c30ce3..d9dcb0c 100644 +--- a/src/backends/wayland/wayland_output.h ++++ b/src/backends/wayland/wayland_output.h +@@ -86,6 +86,8 @@ public: + + void init(const QSize &pixelSize, qreal scale, bool fullscreen); + ++ qreal presentationScale() const; ++ QPointF mapToOutput(const QPointF &hostPosition) const; + bool isReady() const; + KWayland::Client::Surface *surface() const; + WaylandCursor *cursor() const; diff --git a/tools/ubuntu/patches/kwin/0002-select-explicit-nested-render-node.patch b/tools/ubuntu/patches/kwin/0002-select-explicit-nested-render-node.patch new file mode 100644 index 0000000000..ba31e80c54 --- /dev/null +++ b/tools/ubuntu/patches/kwin/0002-select-explicit-nested-render-node.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 07:28:38 -0400 +Subject: [PATCH] Select explicit nested render node + +--- + src/backends/wayland/wayland_backend.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/backends/wayland/wayland_backend.cpp b/src/backends/wayland/wayland_backend.cpp +index e07e146..54f5a70 100644 +--- a/src/backends/wayland/wayland_backend.cpp ++++ b/src/backends/wayland/wayland_backend.cpp +@@ -455,6 +455,15 @@ bool WaylandBackend::initialize() + + if (WaylandClient::LinuxDmabufV1 *dmabuf = m_display->linuxDmabuf()) { + m_drmDevice = DrmDevice::open(dmabuf->mainDevice()); ++ if (!m_drmDevice && qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE")) { ++ const QStringList nodes = qEnvironmentVariable("KWIN_RENDER_NODES").split(QLatin1Char(':'), Qt::SkipEmptyParts); ++ if (nodes.size() == 1) { ++ m_drmDevice = DrmDevice::open(nodes.constFirst()); ++ if (m_drmDevice) { ++ qCWarning(KWIN_WAYLAND_BACKEND) << "Using explicitly selected nested render node" << nodes.constFirst(); ++ } ++ } ++ } + if (!m_drmDevice) { + qCWarning(KWIN_WAYLAND_BACKEND) << "Failed to open drm render node" << dmabuf->mainDevice(); + } diff --git a/tools/ubuntu/patches/kwin/0003-forward-nested-scroll-source.patch b/tools/ubuntu/patches/kwin/0003-forward-nested-scroll-source.patch new file mode 100644 index 0000000000..a624b94159 --- /dev/null +++ b/tools/ubuntu/patches/kwin/0003-forward-nested-scroll-source.patch @@ -0,0 +1,78 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 07:28:45 -0400 +Subject: [PATCH] Forward nested scroll source + +--- + src/backends/wayland/wayland_backend.cpp | 42 +++++++++++++++++++++--- + 1 file changed, 38 insertions(+), 4 deletions(-) + +diff --git a/src/backends/wayland/wayland_backend.cpp b/src/backends/wayland/wayland_backend.cpp +index 54f5a70..25bd0d0 100644 +--- a/src/backends/wayland/wayland_backend.cpp ++++ b/src/backends/wayland/wayland_backend.cpp +@@ -29,6 +29,9 @@ + + #include + ++#include ++#include ++ + #include + #include + #include +@@ -123,8 +126,31 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::Pointer *pointer, Wayla + } + Q_EMIT pointerButtonChanged(button, state, std::chrono::milliseconds(time), this); + }); +- // TODO: Send discreteDelta and source as well. +- connect(pointer, &Pointer::axisChanged, this, [this](quint32 time, Pointer::Axis nativeAxis, qreal delta) { ++ auto axisSource = std::make_shared(PointerAxisSource::Unknown); ++ auto axisDiscrete = std::make_shared>(); ++ connect(pointer, &Pointer::axisSourceChanged, this, [axisSource](Pointer::AxisSource source) { ++ switch (source) { ++ case Pointer::AxisSource::Wheel: ++ *axisSource = PointerAxisSource::Wheel; ++ break; ++ case Pointer::AxisSource::Finger: ++ *axisSource = PointerAxisSource::Finger; ++ break; ++ case Pointer::AxisSource::Continuous: ++ *axisSource = PointerAxisSource::Continuous; ++ break; ++ case Pointer::AxisSource::WheelTilt: ++ *axisSource = PointerAxisSource::WheelTilt; ++ break; ++ default: ++ *axisSource = PointerAxisSource::Unknown; ++ break; ++ } ++ }); ++ connect(pointer, &Pointer::axisDiscreteChanged, this, [axisDiscrete](Pointer::Axis nativeAxis, qint32 discreteDelta) { ++ (*axisDiscrete)[nativeAxis == Pointer::Axis::Vertical ? 0 : 1] = discreteDelta * 120; ++ }); ++ connect(pointer, &Pointer::axisChanged, this, [this, axisSource, axisDiscrete](quint32 time, Pointer::Axis nativeAxis, qreal delta) { + PointerAxis axis; + switch (nativeAxis) { + case Pointer::Axis::Horizontal: +@@ -136,10 +162,18 @@ WaylandInputDevice::WaylandInputDevice(KWayland::Client::Pointer *pointer, Wayla + default: + Q_UNREACHABLE(); + } +- Q_EMIT pointerAxisChanged(axis, delta, 0, PointerAxisSource::Unknown, false, std::chrono::milliseconds(time), this); ++ qint32 &discrete = (*axisDiscrete)[nativeAxis == Pointer::Axis::Vertical ? 0 : 1]; ++ Q_EMIT pointerAxisChanged(axis, delta, discrete, *axisSource, false, std::chrono::milliseconds(time), this); ++ discrete = 0; ++ }); ++ connect(pointer, &Pointer::axisStopped, this, [this, axisSource](quint32 time, Pointer::Axis nativeAxis) { ++ const PointerAxis axis = nativeAxis == Pointer::Axis::Vertical ? PointerAxis::Vertical : PointerAxis::Horizontal; ++ Q_EMIT pointerAxisChanged(axis, 0, 0, *axisSource, false, std::chrono::milliseconds(time), this); + }); + +- connect(pointer, &Pointer::frame, this, [this]() { ++ connect(pointer, &Pointer::frame, this, [this, axisSource, axisDiscrete]() { ++ *axisSource = PointerAxisSource::Unknown; ++ axisDiscrete->fill(0); + Q_EMIT pointerFrame(this); + }); + diff --git a/tools/ubuntu/patches/kwin/0004-keep-tranches-of-the-main-device.patch b/tools/ubuntu/patches/kwin/0004-keep-tranches-of-the-main-device.patch new file mode 100644 index 0000000000..5e4050e626 --- /dev/null +++ b/tools/ubuntu/patches/kwin/0004-keep-tranches-of-the-main-device.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 10:02:00 -0400 +Subject: [PATCH] Keep dmabuf tranches that target the main device + +--- + src/wayland-client/linuxdmabuf.cpp | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/src/wayland-client/linuxdmabuf.cpp b/src/wayland-client/linuxdmabuf.cpp +--- a/src/wayland-client/linuxdmabuf.cpp ++++ b/src/wayland-client/linuxdmabuf.cpp +@@ -130,15 +130,17 @@ + drmFreeDevice(&mainDevice); + drmFreeDevice(&trancheDevice); + }); +- if (drmGetDeviceFromDevId(feedback->m_mainDeviceId, 0, &mainDevice) != 0 +- || drmGetDeviceFromDevId(feedback->m_trancheDeviceId, 0, &trancheDevice) != 0) { +- qCWarning(KWIN_WAYLAND_CLIENT, "drmGetDeviceFromDevId() failed"); +- return; +- } +- if (!drmDevicesEqual(mainDevice, trancheDevice)) { +- // TODO take multi GPU handling into account as well +- qCDebug(KWIN_WAYLAND_CLIENT, "Ignoring tranche from non-main device"); +- return; ++ if (feedback->m_mainDeviceId != feedback->m_trancheDeviceId) { ++ if (drmGetDeviceFromDevId(feedback->m_mainDeviceId, 0, &mainDevice) != 0 ++ || drmGetDeviceFromDevId(feedback->m_trancheDeviceId, 0, &trancheDevice) != 0) { ++ qCWarning(KWIN_WAYLAND_CLIENT, "drmGetDeviceFromDevId() failed"); ++ return; ++ } ++ if (!drmDevicesEqual(mainDevice, trancheDevice)) { ++ // TODO take multi GPU handling into account as well ++ qCDebug(KWIN_WAYLAND_CLIENT, "Ignoring tranche from non-main device"); ++ return; ++ } + } + + struct linux_dmabuf_feedback_v1_table_entry diff --git a/tools/ubuntu/patches/mesa/0001-turnip-kgsl-allow-khr-display.patch b/tools/ubuntu/patches/mesa/0001-turnip-kgsl-allow-khr-display.patch new file mode 100644 index 0000000000..16a72ae829 --- /dev/null +++ b/tools/ubuntu/patches/mesa/0001-turnip-kgsl-allow-khr-display.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 09:30:00 -0400 +Subject: [PATCH] turnip/kgsl: keep the GPU when VK_KHR_display is enabled + +KGSL has no DRM display node, so the display WSI has nothing to list. +Refusing the whole physical device left instances that enable +VK_KHR_display (vulkaninfo, vkcube, SDL) with no GPU at all. +--- + src/freedreno/vulkan/tu_knl_kgsl.cc | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/freedreno/vulkan/tu_knl_kgsl.cc b/src/freedreno/vulkan/tu_knl_kgsl.cc +--- a/src/freedreno/vulkan/tu_knl_kgsl.cc ++++ b/src/freedreno/vulkan/tu_knl_kgsl.cc +@@ -1757,11 +1757,6 @@ tu_kgsl_get_raytracing(int fd) + VkResult + tu_knl_kgsl_load(struct tu_instance *instance, int fd) + { +- if (instance->vk.enabled_extensions.KHR_display) { +- return vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED, +- "I can't KHR_display"); +- } +- + struct tu_physical_device *device = (struct tu_physical_device *) + vk_zalloc(&instance->vk.alloc, sizeof(*device), 8, + VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE); diff --git a/tools/ubuntu/patches/mesa/0002-turnip-kgsl-accept-ubwc-5-and-6.patch b/tools/ubuntu/patches/mesa/0002-turnip-kgsl-accept-ubwc-5-and-6.patch new file mode 100644 index 0000000000..1bdc8be424 --- /dev/null +++ b/tools/ubuntu/patches/mesa/0002-turnip-kgsl-accept-ubwc-5-and-6.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 13:30:00 -0400 +Subject: [PATCH] turnip/kgsl: accept UBWC 5 and 6 + +Backport of upstream Mesa's KGSL_UBWC_5_0/6_0 handling so Adreno 8xx +(UBWC 6) is found by the KGSL backend. +--- +--- a/src/freedreno/vulkan/msm_kgsl.h 2026-10-28 13:27:57.698671357 -0400 ++++ b/src/freedreno/vulkan/msm_kgsl.h 2026-10-28 13:27:57.700490261 -0400 +@@ -247,6 +247,8 @@ + #define KGSL_UBWC_2_0 2 + #define KGSL_UBWC_3_0 3 + #define KGSL_UBWC_4_0 4 ++#define KGSL_UBWC_5_0 5 ++#define KGSL_UBWC_6_0 6 + + /* + * Reset status values for context +--- a/src/freedreno/vulkan/tu_knl_kgsl.cc 2026-10-28 13:27:57.697821704 -0400 ++++ b/src/freedreno/vulkan/tu_knl_kgsl.cc 2026-10-28 13:27:57.710313562 -0400 +@@ -1884,6 +1884,8 @@ + device->ubwc_config.macrotile_mode = FDL_MACROTILE_4_CHANNEL; + break; + case KGSL_UBWC_4_0: ++ case KGSL_UBWC_5_0: ++ case KGSL_UBWC_6_0: + device->ubwc_config.bank_swizzle_levels = 0x6; + device->ubwc_config.macrotile_mode = FDL_MACROTILE_8_CHANNEL; + break; diff --git a/tools/ubuntu/patches/mesa/0003-turnip-kgsl-report-device-numbers-for-wsi.patch b/tools/ubuntu/patches/mesa/0003-turnip-kgsl-report-device-numbers-for-wsi.patch new file mode 100644 index 0000000000..5d09c46d80 --- /dev/null +++ b/tools/ubuntu/patches/mesa/0003-turnip-kgsl-report-device-numbers-for-wsi.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: maxjivi05 +Date: Wed, 28 Oct 2026 15:00:00 -0400 +Subject: [PATCH] turnip/kgsl: report the KGSL device numbers for WSI + +Expose VK_EXT_physical_device_drm with the kgsl-3d0 device numbers so a +nested compositor such as gamescope can advertise dma-buf feedback and +Vulkan swapchains work without the software WSI. Ported from +Droid-Deck/Drivers (patches/scripts/linux_kgsl_wsi.py). +--- +--- a/src/freedreno/vulkan/tu_device.cc 2026-10-28 14:41:54.161481991 -0400 ++++ b/src/freedreno/vulkan/tu_device.cc 2026-10-28 14:41:54.174757117 -0400 +@@ -312,7 +312,7 @@ + .EXT_mutable_descriptor_type = true, + .EXT_nested_command_buffer = true, + .EXT_non_seamless_cube_map = true, +- .EXT_physical_device_drm = !is_kgsl(device->instance), ++ .EXT_physical_device_drm = !is_kgsl(device->instance) || device->has_local, + .EXT_pipeline_creation_cache_control = true, + .EXT_pipeline_creation_feedback = true, + .EXT_primitive_topology_list_restart = true, +--- a/src/freedreno/vulkan/tu_knl_kgsl.cc 2026-10-28 14:41:54.159481934 -0400 ++++ b/src/freedreno/vulkan/tu_knl_kgsl.cc 2026-10-28 14:41:54.174233883 -0400 +@@ -11,6 +11,8 @@ + #include + #include + #include ++#include ++#include + #include + + #define __user +@@ -1907,6 +1909,13 @@ + + instance->knl = &kgsl_knl_funcs; + ++ struct stat kgsl_st; ++ if (fstat(fd, &kgsl_st) == 0 && S_ISCHR(kgsl_st.st_mode)) { ++ device->has_local = device->has_master = true; ++ device->local_major = device->master_major = major(kgsl_st.st_rdev); ++ device->local_minor = device->master_minor = minor(kgsl_st.st_rdev); ++ } ++ + result = tu_physical_device_init(device, instance); + if (result != VK_SUCCESS) + goto fail; diff --git a/tools/ubuntu/proc/cap_last_cap b/tools/ubuntu/proc/cap_last_cap new file mode 100644 index 0000000000..425151f3a4 --- /dev/null +++ b/tools/ubuntu/proc/cap_last_cap @@ -0,0 +1 @@ +40 diff --git a/tools/ubuntu/proc/loadavg b/tools/ubuntu/proc/loadavg new file mode 100644 index 0000000000..376825638f --- /dev/null +++ b/tools/ubuntu/proc/loadavg @@ -0,0 +1 @@ +0.00 0.00 0.00 1/100 1 diff --git a/tools/ubuntu/proc/overflowgid b/tools/ubuntu/proc/overflowgid new file mode 100644 index 0000000000..e8f3792bb6 --- /dev/null +++ b/tools/ubuntu/proc/overflowgid @@ -0,0 +1 @@ +65534 diff --git a/tools/ubuntu/proc/overflowuid b/tools/ubuntu/proc/overflowuid new file mode 100644 index 0000000000..e8f3792bb6 --- /dev/null +++ b/tools/ubuntu/proc/overflowuid @@ -0,0 +1 @@ +65534 diff --git a/tools/ubuntu/proc/stat b/tools/ubuntu/proc/stat new file mode 100644 index 0000000000..9ea5a5eebf --- /dev/null +++ b/tools/ubuntu/proc/stat @@ -0,0 +1,8 @@ +cpu 0 0 0 0 0 0 0 0 0 0 +cpu0 0 0 0 0 0 0 0 0 0 0 +intr 0 +ctxt 0 +btime 0 +processes 1 +procs_running 1 +procs_blocked 0 diff --git a/tools/ubuntu/proc/uptime b/tools/ubuntu/proc/uptime new file mode 100644 index 0000000000..d8ccf3fa07 --- /dev/null +++ b/tools/ubuntu/proc/uptime @@ -0,0 +1 @@ +100.00 100.00 diff --git a/tools/ubuntu/proc/version b/tools/ubuntu/proc/version new file mode 100644 index 0000000000..5e6716a598 --- /dev/null +++ b/tools/ubuntu/proc/version @@ -0,0 +1 @@ +Linux version 6.1.0 (bannerlator@android) (gcc version 12.0) #1 SMP PREEMPT diff --git a/tools/ubuntu/proc/vmstat b/tools/ubuntu/proc/vmstat new file mode 100644 index 0000000000..f137971993 --- /dev/null +++ b/tools/ubuntu/proc/vmstat @@ -0,0 +1 @@ +nr_free_pages 0 diff --git a/tools/ubuntu/protected-desktop.txt b/tools/ubuntu/protected-desktop.txt new file mode 100644 index 0000000000..038f1e8042 --- /dev/null +++ b/tools/ubuntu/protected-desktop.txt @@ -0,0 +1,11 @@ +dolphin +kde-cli-tools +konsole +kwin-wayland +pipewire +pipewire-pulse +plasma-desktop +plasma-discover +plasma-workspace +wireplumber +xdg-desktop-portal-kde diff --git a/tools/ubuntu/protected-runtime.txt b/tools/ubuntu/protected-runtime.txt new file mode 100644 index 0000000000..6462252206 --- /dev/null +++ b/tools/ubuntu/protected-runtime.txt @@ -0,0 +1,19 @@ +apt +bash +coreutils +dbus-daemon +dpkg +flatpak +fontconfig +gamescope +libegl-mesa0 +libgl1-mesa-dri +libluajit-5.1-2 +libseat1 +libvulkan1 +locales-all +mesa-libgallium +mesa-vulkan-drivers +python3 +python3-gi +xwayland diff --git a/tools/ubuntu/setup.sh b/tools/ubuntu/setup.sh new file mode 100755 index 0000000000..66bb6c8e94 --- /dev/null +++ b/tools/ubuntu/setup.sh @@ -0,0 +1,182 @@ +#!/bin/bash +set -euo pipefail +umask 022 +here=$(cd "$(dirname "$0")" && pwd) +debs=${1:?directory with the DroidDeck-built .deb files} +runtime_id=${2:?runtime id} +stage=${3:?runtime or desktop} +export DEBIAN_FRONTEND=noninteractive DROIDDECK_APT_RESTORING=1 LANG=C.UTF-8 LC_ALL=C.UTF-8 +repo=/var/lib/droiddeck/apt + +install_held() { + local held=() deb name + for deb in "$repo"/*.deb; do + name=$(dpkg-deb -f "$deb" Package) + dpkg-query -W -f '${Status}' "$name" 2>/dev/null | grep -q ' ok installed' || continue + held+=("$name=$(dpkg-deb -f "$deb" Version)") + done + [ ${#held[@]} -gt 0 ] || return 0 + apt-get install -y --no-install-recommends --allow-downgrades "${held[@]}" + apt-mark hold "${held[@]%%=*}" >/dev/null +} + +build_package() { + local name=$1 overlay=$2 protected=$3 summary=$4 pkg depends + pkg=$(mktemp -d) + mkdir -p "$pkg/DEBIAN" + cp -r "$overlay/." "$pkg/" + rm -rf "$pkg/usr/local" + [ -d "$overlay/usr/local" ] && cp -r "$overlay/usr/local/." /usr/local/ + (cd "$pkg" && find . -path ./DEBIAN -prune -o \( -type f -o -type l \) -print | sed 's#^\.##') | sort > "$pkg.files" + { + echo '#!/bin/sh' + echo 'set -e' + echo 'if [ "$1" = install ] || [ "$1" = upgrade ]; then' + echo ' :' + while read -r path; do + owner=$(dpkg-query -S "$path" 2>/dev/null | grep -v '^diversion' | cut -d: -f1 | head -1) || true + [ -n "$owner" ] && [ "$owner" != "$name" ] && echo " dpkg-divert --package $name --rename --divert '$path.distrib' --add '$path'" + done < "$pkg.files" + echo 'fi' + } > "$pkg/DEBIAN/preinst" + { + echo '#!/bin/sh' + echo 'set -e' + echo 'if [ "$1" = remove ] || [ "$1" = purge ]; then' + echo " dpkg-divert --list $name | awk '{print \$3}' | while read -r f; do rm -f \"\$f\"; dpkg-divert --package $name --rename --remove \"\$f\"; done" + echo 'fi' + } > "$pkg/DEBIAN/postrm" + chmod 755 "$pkg/DEBIAN/preinst" "$pkg/DEBIAN/postrm" + depends=$(grep -v '^$' "$protected" | paste -sd, | sed 's/,/, /g') + cat > "$pkg/DEBIAN/control" < +Protected: yes +Priority: required +Depends: $depends +Section: admin +Description: $summary + DroidDeck needs these files and packages inside its Ubuntu runtime. + Removing them would break it, so apt refuses to. +EOF + dpkg-deb --root-owner-group -b "$pkg" "/tmp/$name.deb" + dpkg -i "/tmp/$name.deb" + rm -rf "$pkg" "$pkg.files" "/tmp/$name.deb" +} + +install_turnip() { + local multiarch=/usr/lib/aarch64-linux-gnu work + source "$here/base.env" + work=$(mktemp -d) + curl -fsSL --proto '=https' --proto-redir '=https' --retry 6 --retry-delay 5 --retry-all-errors -o "$work/turnip.zip" "$DD_TURNIP_URL" + echo "$DD_TURNIP_SHA256 $work/turnip.zip" | sha256sum -c - >/dev/null + unzip -q "$work/turnip.zip" -d "$work/turnip" + dpkg-divert --package droiddeck-runtime --rename --divert "$multiarch/libvulkan_freedreno.so.distrib" --add "$multiarch/libvulkan_freedreno.so" + install -m 644 "$work/turnip/linux/libvulkan_freedreno.so" "$multiarch/libvulkan_freedreno.so" + mkdir -p /usr/share/licenses/dd-turnip + cp -r "$work/turnip/LICENSES" "$work/turnip/NOTICE" "$work/turnip/linux/meta.json" /usr/share/licenses/dd-turnip/ + rm -rf "$work" +} + +divert_to() { + local path=$1 target=$2 owner=$3 + [ -e "$path" ] || [ -L "$path" ] || return 0 + dpkg-divert --package "$owner" --rename --divert "$path.distrib" --add "$path" + ln -sf "$target" "$path" +} + +record_apt_state() { + mkdir -p /usr/share/droiddeck/apt + apt-mark showmanual > /usr/share/droiddeck/apt/system-manual.txt + for f in /etc/apt/sources.list /etc/apt/sources.list.d/* /etc/apt/keyrings/* /etc/apt/trusted.gpg.d/* /usr/share/keyrings/*; do + [ -f "$f" ] && echo "$f $(sha256sum "$f" | cut -d' ' -f1)" + done > /usr/share/droiddeck/apt/system-sources.txt +} + +finish() { + sed -i 's/^Types: deb deb-src$/Types: deb/' /etc/apt/sources.list.d/ubuntu.sources + record_apt_state + apt-get clean + rm -rf /var/lib/apt/lists/* /var/cache/apt/*.bin /var/log/apt/* /var/log/dpkg.log /var/tmp/* + find /tmp -mindepth 1 -maxdepth 1 ! -name droiddeck -exec rm -rf {} + + rm -f /etc/machine-id /var/lib/dbus/machine-id /etc/ssh/ssh_host_* + : > /etc/machine-id +} + +if [ "$stage" = runtime ]; then + printf '#!/bin/sh\nexit 101\n' > /usr/sbin/policy-rc.d + chmod 755 /usr/sbin/policy-rc.d + cp -r "$here/apt/." /etc/apt/ + sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources + echo 'man-db man-db/auto-update boolean false' | debconf-set-selections + apt-get update + apt-get -y full-upgrade + + mkdir -p "$repo" + cp "$debs"/*.deb "$repo/" + apt-get install -y --no-install-recommends apt-utils ca-certificates + (cd "$repo" && apt-ftparchive packages . > Packages && apt-ftparchive release . > Release) + echo "deb [trusted=yes lang=none] file:$repo ./" > /etc/apt/sources.list.d/droiddeck.list + built=$(for deb in "$repo"/*.deb; do dpkg-deb -f "$deb" Package; done | sort -u | paste -sd' ') + printf 'Package: %s\nPin: version /\\+droiddeck/\nPin-Priority: 1001\n' "$built" > /etc/apt/preferences.d/droiddeck-built + apt-get update + + grep -v '^$' "$here/packages-runtime.txt" | xargs apt-get install -y --no-install-recommends + install_held + build_package droiddeck-runtime "$here/overlay-runtime" "$here/protected-runtime.txt" "DroidDeck's Ubuntu runtime" + + update-alternatives --install /usr/bin/sudo sudo /usr/local/bin/sudo 1000 + update-alternatives --set sudo /usr/local/bin/sudo + divert_to /usr/bin/su /usr/local/bin/su droiddeck-runtime + multiarch=/usr/lib/aarch64-linux-gnu + ln -sf liblua5.4.so.0 "$multiarch/liblua.so.5.4" + divert_to "$multiarch/gamescope/libVkLayer_FROG_gamescope_wsi_aarch64.so" ../../libVkLayer_FROG_gamescope_wsi_aarch64.so droiddeck-runtime + install_turnip + + mkdir -p /var/cache/droiddeck-flatpak /usr/share/droiddeck/apt /etc/droiddeck/proc /etc/droiddeck/empty /root/Desktop + touch /var/cache/droiddeck-flatpak/installed + cp -r "$here/proc/." /etc/droiddeck/proc/ + echo "$runtime_id" > /usr/share/droiddeck/apt/runtime-id + + echo "LANG=C.UTF-8" > /etc/default/locale + printf 'DroidDeck\n' > /etc/hostname + . /etc/os-release + printf 'NAME="%s"\nVERSION="%s"\nID=%s\nID_LIKE=debian\nPRETTY_NAME="%s"\nVERSION_ID="%s"\nVERSION_CODENAME=%s\nUBUNTU_CODENAME=%s\nHOME_URL="https://github.com/Droid-Deck/DroidDeck"\nSUPPORT_URL="https://github.com/Droid-Deck/DroidDeck/issues"\nBUG_REPORT_URL="https://github.com/Droid-Deck/DroidDeck/issues"\nLOGO=distributor-logo-steamdeck\nVARIANT="DroidDeck"\nVARIANT_ID=droiddeck\n' \ + "$NAME" "$VERSION" "$ID" "$PRETTY_NAME" "$VERSION_ID" "$VERSION_CODENAME" "$UBUNTU_CODENAME" > /etc/os-release.droiddeck + dpkg-divert --package droiddeck-runtime --rename --divert /usr/lib/os-release.distrib --add /usr/lib/os-release + mv /etc/os-release.droiddeck /usr/lib/os-release + ln -sf ../usr/lib/os-release /etc/os-release + finish + exit 0 +fi + +[ "$stage" = desktop ] || { echo "unknown stage $stage" >&2; exit 1; } +sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources +install -d -m 0755 /etc/apt/keyrings +install -m 0644 "$here/mozilla.asc" /etc/apt/keyrings/packages.mozilla.org.asc +cat > /etc/apt/sources.list.d/mozilla.sources <<'EOF' +Types: deb +URIs: https://packages.mozilla.org/apt +Suites: mozilla +Components: main +Signed-By: /etc/apt/keyrings/packages.mozilla.org.asc +EOF +cat > /etc/apt/preferences.d/mozilla <<'EOF' +Package: firefox* thunderbird* +Pin: origin packages.mozilla.org +Pin-Priority: 1000 +EOF +apt-get update +[[ $(apt-cache policy firefox) == *packages.mozilla.org* ]] || { echo "packages.mozilla.org is unreachable" >&2; exit 1; } + +grep -v '^$' "$here/packages-desktop.txt" | xargs apt-get install -y firefox +install_held +build_package droiddeck-desktop "$here/overlay-desktop" "$here/protected-desktop.txt" "DroidDeck's Plasma desktop" + +divert_to /usr/bin/pkexec /usr/local/bin/pkexec droiddeck-desktop +divert_to /usr/lib/snapd/snap-confine /usr/local/bin/droiddeck-snap-confine droiddeck-desktop +mkdir -p /snap/bin /var/lib/snapd/desktop/applications +rm -rf /etc/skel/Desktop +finish